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

---
 tdeio/misc/kpac/discovery.cpp            | 2 +-
 tdeio/misc/kpac/downloader.cpp           | 4 ++--
 tdeio/misc/kpac/proxyscout.cpp           | 4 ++--
 tdeio/misc/kssld/kssld.cpp               | 2 +-
 tdeio/misc/tdefile/fileprops.cpp         | 2 +-
 tdeio/misc/tdemailservice.cpp            | 2 +-
 tdeio/misc/tdesendbugmail/main.cpp       | 4 ++--
 tdeio/misc/tdetelnetservice.cpp          | 4 ++--
 tdeio/misc/tdewalletd/tdewalletd.cpp     | 6 +++---
 tdeio/misc/tdewalletd/tdewalletwizard.ui | 2 +-
 tdeio/misc/uiserver.cpp                  | 6 +++---
 11 files changed, 19 insertions(+), 19 deletions(-)

(limited to 'tdeio/misc')

diff --git a/tdeio/misc/kpac/discovery.cpp b/tdeio/misc/kpac/discovery.cpp
index 4f33d1389..533c4fcca 100644
--- a/tdeio/misc/kpac/discovery.cpp
+++ b/tdeio/misc/kpac/discovery.cpp
@@ -41,7 +41,7 @@
 
 #include <tqtimer.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocio.h>
 #include <kurl.h>
 
diff --git a/tdeio/misc/kpac/downloader.cpp b/tdeio/misc/kpac/downloader.cpp
index c94cc9b72..483e836cb 100644
--- a/tdeio/misc/kpac/downloader.cpp
+++ b/tdeio/misc/kpac/downloader.cpp
@@ -24,8 +24,8 @@
 #include <tqtextcodec.h>
 
 #include <kcharsets.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 
 #include "downloader.moc"
diff --git a/tdeio/misc/kpac/proxyscout.cpp b/tdeio/misc/kpac/proxyscout.cpp
index a010d328e..dfb682005 100644
--- a/tdeio/misc/kpac/proxyscout.cpp
+++ b/tdeio/misc/kpac/proxyscout.cpp
@@ -23,9 +23,9 @@
 
 #include <dcopclient.h>
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knotifyclient.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 #include "proxyscout.moc"
 #include "discovery.h"
diff --git a/tdeio/misc/kssld/kssld.cpp b/tdeio/misc/kssld/kssld.cpp
index d41041636..d47845bbb 100644
--- a/tdeio/misc/kssld/kssld.cpp
+++ b/tdeio/misc/kssld/kssld.cpp
@@ -42,7 +42,7 @@
 #include <unistd.h>
 #include <tqfile.h>
 #include <tqsortedlist.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
 #include <tqdatetime.h>
diff --git a/tdeio/misc/tdefile/fileprops.cpp b/tdeio/misc/tdefile/fileprops.cpp
index df210fa4d..aa6590ef5 100644
--- a/tdeio/misc/tdefile/fileprops.cpp
+++ b/tdeio/misc/tdefile/fileprops.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdefilemetainfo.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpropertiesdialog.h>
 
 #include "fileprops.h"
diff --git a/tdeio/misc/tdemailservice.cpp b/tdeio/misc/tdemailservice.cpp
index 2d256c5c9..23066d633 100644
--- a/tdeio/misc/tdemailservice.cpp
+++ b/tdeio/misc/tdemailservice.cpp
@@ -17,7 +17,7 @@
 */
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 
 static const TDECmdLineOptions options[] =
diff --git a/tdeio/misc/tdesendbugmail/main.cpp b/tdeio/misc/tdesendbugmail/main.cpp
index aaffd3b65..32465039d 100644
--- a/tdeio/misc/tdesendbugmail/main.cpp
+++ b/tdeio/misc/tdesendbugmail/main.cpp
@@ -9,8 +9,8 @@
 #include <tqtextstream.h>
 
 #include <tdeapplication.h>
-#include <kemailsettings.h>
-#include <klocale.h>
+#include <tdeemailsettings.h>
+#include <tdelocale.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <kdebug.h>
diff --git a/tdeio/misc/tdetelnetservice.cpp b/tdeio/misc/tdetelnetservice.cpp
index 99260d8d0..bf175bdc9 100644
--- a/tdeio/misc/tdetelnetservice.cpp
+++ b/tdeio/misc/tdetelnetservice.cpp
@@ -22,10 +22,10 @@
 // $Id$
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <ksimpleconfig.h>
 
diff --git a/tdeio/misc/tdewalletd/tdewalletd.cpp b/tdeio/misc/tdewalletd/tdewalletd.cpp
index 364197b72..126f0ce2b 100644
--- a/tdeio/misc/tdewalletd/tdewalletd.cpp
+++ b/tdeio/misc/tdewalletd/tdewalletd.cpp
@@ -32,9 +32,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdirwatch.h>
-#include <kglobal.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kpassdlg.h>
 #include <kstandarddirs.h>
 #include <tdewalletentry.h>
diff --git a/tdeio/misc/tdewalletd/tdewalletwizard.ui b/tdeio/misc/tdewalletd/tdewalletwizard.ui
index aa3a1c09d..c31062c2a 100644
--- a/tdeio/misc/tdewalletd/tdewalletwizard.ui
+++ b/tdeio/misc/tdewalletd/tdewalletwizard.ui
@@ -531,7 +531,7 @@
 </tabstops>
 <includes>
     <include location="global" impldecl="in declaration">tqcheckbox.h</include>
-    <include location="global" impldecl="in implementation">klocale.h</include>
+    <include location="global" impldecl="in implementation">tdelocale.h</include>
     <include location="local" impldecl="in implementation">tdewalletwizard.ui.h</include>
 </includes>
 <Q_SLOTS>
diff --git a/tdeio/misc/uiserver.cpp b/tdeio/misc/uiserver.cpp
index 107b57c64..c23628eae 100644
--- a/tdeio/misc/uiserver.cpp
+++ b/tdeio/misc/uiserver.cpp
@@ -31,12 +31,12 @@
 #include <kuniqueapplication.h>
 #include <tdeaboutdata.h>
 #include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <kstatusbar.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesu/client.h>
 #include <twin.h>
 #include <kdialog.h>
-- 
cgit v1.2.1