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

---
 kded/kbuildimageiofactory.cpp      | 4 ++--
 kded/kbuildprotocolinfofactory.cpp | 4 ++--
 kded/kbuildservicefactory.cpp      | 4 ++--
 kded/kbuildservicegroupfactory.cpp | 4 ++--
 kded/kbuildservicetypefactory.cpp  | 4 ++--
 kded/kded.cpp                      | 4 ++--
 kded/khostname.cpp                 | 4 ++--
 kded/tde-menu.cpp                  | 4 ++--
 kded/tdebuildsycoca.cpp            | 6 +++---
 kded/vfolder_menu.cpp              | 2 +-
 10 files changed, 20 insertions(+), 20 deletions(-)

(limited to 'kded')

diff --git a/kded/kbuildimageiofactory.cpp b/kded/kbuildimageiofactory.cpp
index 267af31f6..b5873cad8 100644
--- a/kded/kbuildimageiofactory.cpp
+++ b/kded/kbuildimageiofactory.cpp
@@ -20,10 +20,10 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 #include <kimageiofactory.h>
diff --git a/kded/kbuildprotocolinfofactory.cpp b/kded/kbuildprotocolinfofactory.cpp
index f3fe698d4..921e55ab9 100644
--- a/kded/kbuildprotocolinfofactory.cpp
+++ b/kded/kbuildprotocolinfofactory.cpp
@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildProtocolInfoFactory::KBuildProtocolInfoFactory() :
diff --git a/kded/kbuildservicefactory.cpp b/kded/kbuildservicefactory.cpp
index 7d9406d36..6f127caf2 100644
--- a/kded/kbuildservicefactory.cpp
+++ b/kded/kbuildservicefactory.cpp
@@ -23,10 +23,10 @@
 #include "kresourcelist.h"
 #include "kmimetype.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <assert.h>
 
diff --git a/kded/kbuildservicegroupfactory.cpp b/kded/kbuildservicegroupfactory.cpp
index 76f27ba57..3903a6b39 100644
--- a/kded/kbuildservicegroupfactory.cpp
+++ b/kded/kbuildservicegroupfactory.cpp
@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 
 KBuildServiceGroupFactory::KBuildServiceGroupFactory() :
diff --git a/kded/kbuildservicetypefactory.cpp b/kded/kbuildservicetypefactory.cpp
index 351b7847a..da2863347 100644
--- a/kded/kbuildservicetypefactory.cpp
+++ b/kded/kbuildservicetypefactory.cpp
@@ -21,11 +21,11 @@
 #include "tdesycocadict.h"
 #include "kresourcelist.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kmessageboxwrapper.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <assert.h>
 #include <kdesktopfile.h>
 
diff --git a/kded/kded.cpp b/kded/kded.cpp
index b6e6b523f..947d3b816 100644
--- a/kded/kded.cpp
+++ b/kded/kded.cpp
@@ -38,8 +38,8 @@
 #include <kuniqueapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kprocess.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
diff --git a/kded/khostname.cpp b/kded/khostname.cpp
index 7585e0ad0..c78152b97 100644
--- a/kded/khostname.cpp
+++ b/kded/khostname.cpp
@@ -30,9 +30,9 @@
 
 #include <tdecmdlineargs.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kprocess.h>
 #include <kde_file.h>
diff --git a/kded/tde-menu.cpp b/kded/tde-menu.cpp
index 4ad6bc3db..4cf7a843e 100644
--- a/kded/tde-menu.cpp
+++ b/kded/tde-menu.cpp
@@ -26,8 +26,8 @@
 #include "tdeaboutdata.h"
 #include "tdeapplication.h"
 #include "tdecmdlineargs.h"
-#include "kglobal.h"
-#include "klocale.h"
+#include "tdeglobal.h"
+#include "tdelocale.h"
 #include "kservice.h"
 #include "kservicegroup.h"
 #include "kstandarddirs.h"
diff --git a/kded/tdebuildsycoca.cpp b/kded/tdebuildsycoca.cpp
index aa03c2c94..4325162f7 100644
--- a/kded/tdebuildsycoca.cpp
+++ b/kded/tdebuildsycoca.cpp
@@ -42,12 +42,12 @@
 #include <assert.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
 #include <kstandarddirs.h>
 #include <ksavefile.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
 #include <kcrash.h>
@@ -55,7 +55,7 @@
 #ifdef KBUILDSYCOCA_GUI // KBUILDSYCOCA_GUI is used on win32 to build 
                         // GUI version of tdebuildsycoca, so-called "tdebuildsycocaw".
 # include <tqlabel.h>
-# include <kmessagebox.h>
+# include <tdemessagebox.h>
   bool silent;
   bool showprogress;
 #endif
diff --git a/kded/vfolder_menu.cpp b/kded/vfolder_menu.cpp
index e2dc603ba..408c6af9a 100644
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
@@ -23,7 +23,7 @@
 #include <stdlib.h> // getenv
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kservice.h>
 #include <kde_file.h>
-- 
cgit v1.2.1