From ece35c015c54312eb13f583cc247cdd9a4051b4d Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:12:56 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kword/KWMailMergeDataBase.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kword/KWMailMergeDataBase.cpp')

diff --git a/kword/KWMailMergeDataBase.cpp b/kword/KWMailMergeDataBase.cpp
index db95cf5e4..8ef08e912 100644
--- a/kword/KWMailMergeDataBase.cpp
+++ b/kword/KWMailMergeDataBase.cpp
@@ -28,11 +28,11 @@
 #include <klocale.h>
 #include <kdebug.h>
 #include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kmessagebox.h>
 #include <kseparator.h>
 #include <kservice.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include <tqfile.h>
 #include <tqvbox.h>
-- 
cgit v1.2.3