From bd3c603465110b74a0ddcee72e6f020a78d44e59 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 22:00:22 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 parts/appwizard/appwizarddlg.cpp          | 10 +++++-----
 parts/appwizard/appwizardpart.cpp         |  4 ++--
 parts/appwizard/common/scons/admin/kde.py |  2 +-
 parts/appwizard/filepropspage.cpp         |  2 +-
 parts/appwizard/importdlg.cpp             |  4 ++--
 parts/appwizard/misc.cpp                  |  4 ++--
 6 files changed, 13 insertions(+), 13 deletions(-)

(limited to 'parts/appwizard')

diff --git a/parts/appwizard/appwizarddlg.cpp b/parts/appwizard/appwizarddlg.cpp
index ec876712..83247cf6 100644
--- a/parts/appwizard/appwizarddlg.cpp
+++ b/parts/appwizard/appwizarddlg.cpp
@@ -37,13 +37,13 @@
 #include <kiconview.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kiconloader.h>
 #include <tdefiledialog.h>
 #include <tdefile.h>
diff --git a/parts/appwizard/appwizardpart.cpp b/parts/appwizard/appwizardpart.cpp
index 6cec2631..09c3ea17 100644
--- a/parts/appwizard/appwizardpart.cpp
+++ b/parts/appwizard/appwizardpart.cpp
@@ -16,8 +16,8 @@
 #include "appwizardpart.h"
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprocess.h>
 #include <kdevcore.h>
 #include <kgenericfactory.h>
diff --git a/parts/appwizard/common/scons/admin/kde.py b/parts/appwizard/common/scons/admin/kde.py
index 579e0447..953a86e3 100644
--- a/parts/appwizard/common/scons/admin/kde.py
+++ b/parts/appwizard/common/scons/admin/kde.py
@@ -423,7 +423,7 @@ ie: """+BOLD+"""scons configure libdir=/usr/local/lib qtincludes=/usr/include/qt
 
 	## ui file processing
 	def uic_processing(target, source, env):
-		inc_kde  = '#include <klocale.h>\n#include <kdialog.h>\n'
+		inc_kde  = '#include <tdelocale.h>\n#include <kdialog.h>\n'
 		inc_moc  = '#include "%s"\n' % target[2].name
 		comp_h   = '$QT_UIC $QT_UIC_HFLAGS -o %s %s' % (target[0].path, source[0].path)
 		comp_c   = '$QT_UIC $QT_UIC_CFLAGS -impl %s %s' % (target[0].path, source[0].path)
diff --git a/parts/appwizard/filepropspage.cpp b/parts/appwizard/filepropspage.cpp
index 3e946abf..a084db13 100644
--- a/parts/appwizard/filepropspage.cpp
+++ b/parts/appwizard/filepropspage.cpp
@@ -2,7 +2,7 @@
 #include <tqlistbox.h>
 #include <klineedit.h>
 #include <tqtextview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlabel.h>
 #include <tqmultilineedit.h>
 
diff --git a/parts/appwizard/importdlg.cpp b/parts/appwizard/importdlg.cpp
index 9c38ccef..bd08198d 100644
--- a/parts/appwizard/importdlg.cpp
+++ b/parts/appwizard/importdlg.cpp
@@ -27,8 +27,8 @@
 #include <kdialog.h>
 #include <tdefiledialog.h>
 #include <kinstance.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <kcursor.h>
 #include <tdefile.h>
diff --git a/parts/appwizard/misc.cpp b/parts/appwizard/misc.cpp
index 5546b404..0a993345 100644
--- a/parts/appwizard/misc.cpp
+++ b/parts/appwizard/misc.cpp
@@ -12,12 +12,12 @@
 #include "misc.h"
 
 #include <tqstring.h>
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 
 #include <pwd.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 
-- 
cgit v1.2.1