Rename additional header files to avoid conflicts with KDE4

19 files changed, 28 insertions, 28 deletions

diff --git a/kcontrol/tdeio/cache.cpp b/kcontrol/tdeio/cache.cpp
index 990770a2a..42c0fc28f 100644
--- a/kcontrol/tdeio/cache.cpp
+++ b/kcontrol/tdeio/cache.cpp
@@ -28,7 +28,7 @@
 #include <tqradiobutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <knuminput.h>
 
diff --git a/kcontrol/tdeio/fakeuaprovider.cpp b/kcontrol/tdeio/fakeuaprovider.cpp
index e13c680b8..b48d19738 100644
--- a/kcontrol/tdeio/fakeuaprovider.cpp
+++ b/kcontrol/tdeio/fakeuaprovider.cpp
@@ -21,7 +21,7 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "fakeuaprovider.h"
diff --git a/kcontrol/tdeio/kcookiesmain.cpp b/kcontrol/tdeio/kcookiesmain.cpp
index 24aff4fe0..417eb9e46 100644
--- a/kcontrol/tdeio/kcookiesmain.cpp
+++ b/kcontrol/tdeio/kcookiesmain.cpp
@@ -6,9 +6,9 @@
 #include <tqlayout.h>
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <dcopref.h>
 
diff --git a/kcontrol/tdeio/kcookiesmanagement.cpp b/kcontrol/tdeio/kcookiesmanagement.cpp
index 0fc8e9941..1a9314d91 100644
--- a/kcontrol/tdeio/kcookiesmanagement.cpp
+++ b/kcontrol/tdeio/kcookiesmanagement.cpp
@@ -31,13 +31,13 @@
 
 #include <kidna.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopref.h>
 
 #include "kcookiesmain.h"
diff --git a/kcontrol/tdeio/kcookiespolicies.cpp b/kcontrol/tdeio/kcookiespolicies.cpp
index 7e9b39f65..a39773cf1 100644
--- a/kcontrol/tdeio/kcookiespolicies.cpp
+++ b/kcontrol/tdeio/kcookiespolicies.cpp
@@ -34,10 +34,10 @@
 
 #include <kiconloader.h>
 #include <kidna.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <dcopref.h>
 
diff --git a/kcontrol/tdeio/kenvvarproxydlg.cpp b/kcontrol/tdeio/kenvvarproxydlg.cpp
index 22accb4e9..e8d1c0e47 100644
--- a/kcontrol/tdeio/kenvvarproxydlg.cpp
+++ b/kcontrol/tdeio/kenvvarproxydlg.cpp
@@ -28,9 +28,9 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "envvarproxy_ui.h"
 #include "kenvvarproxydlg.h"
diff --git a/kcontrol/tdeio/kmanualproxydlg.cpp b/kcontrol/tdeio/kmanualproxydlg.cpp
index 9a3bf46c7..6c1786aff 100644
--- a/kcontrol/tdeio/kmanualproxydlg.cpp
+++ b/kcontrol/tdeio/kmanualproxydlg.cpp
@@ -27,13 +27,13 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <tdelistbox.h>
 #include <klineedit.h>
 #include <kicontheme.h>
 #include <kurifilter.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <tdeio/ioslave_defaults.h>
diff --git a/kcontrol/tdeio/kproxydlg.cpp b/kcontrol/tdeio/kproxydlg.cpp
index a165f9576..7bd082eda 100644
--- a/kcontrol/tdeio/kproxydlg.cpp
+++ b/kcontrol/tdeio/kproxydlg.cpp
@@ -28,9 +28,9 @@
 #include <tqradiobutton.h>
 #include <tqtabwidget.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "ksaveioconfig.h"
 #include "kenvvarproxydlg.h"
diff --git a/kcontrol/tdeio/kproxydlgbase.h b/kcontrol/tdeio/kproxydlgbase.h
index 06ffa8753..8454f2f38 100644
--- a/kcontrol/tdeio/kproxydlgbase.h
+++ b/kcontrol/tdeio/kproxydlgbase.h
@@ -27,7 +27,7 @@
 #include <tqstringlist.h>
 
 #include <kdialogbase.h>
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 class KProxyData
 {
diff --git a/kcontrol/tdeio/ksaveioconfig.cpp b/kcontrol/tdeio/ksaveioconfig.cpp
index 845184158..8ab676ada 100644
--- a/kcontrol/tdeio/ksaveioconfig.cpp
+++ b/kcontrol/tdeio/ksaveioconfig.cpp
@@ -19,8 +19,8 @@
 
 #include <dcopref.h>
 #include <tdeconfig.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstaticdeleter.h>
 #include <tdeio/ioslave_defaults.h>
 
diff --git a/kcontrol/tdeio/ksaveioconfig.h b/kcontrol/tdeio/ksaveioconfig.h
index f14e98e22..6bfe9e1f4 100644
--- a/kcontrol/tdeio/ksaveioconfig.h
+++ b/kcontrol/tdeio/ksaveioconfig.h
@@ -20,7 +20,7 @@
 #ifndef KSAVEIO_CONFIG_H_
 #define KSAVEIO_CONFIG_H_
 
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 
 class TQWidget;
 class KSaveIOConfigPrivate;
diff --git a/kcontrol/tdeio/main.cpp b/kcontrol/tdeio/main.cpp
index 3fe2fd8a0..878624393 100644
--- a/kcontrol/tdeio/main.cpp
+++ b/kcontrol/tdeio/main.cpp
@@ -26,7 +26,7 @@
 #include <tqtabwidget.h>
 
 #include <tdecmoduleloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcookiesmain.h"
 #include "netpref.h"
diff --git a/kcontrol/tdeio/main.h b/kcontrol/tdeio/main.h
index a208b942a..23451b2b7 100644
--- a/kcontrol/tdeio/main.h
+++ b/kcontrol/tdeio/main.h
@@ -22,7 +22,7 @@
 #define MYMAIN_H
 
 #include <tdecmodule.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 class TQTabWidget;
 
diff --git a/kcontrol/tdeio/netpref.cpp b/kcontrol/tdeio/netpref.cpp
index ea3de857c..acde5635e 100644
--- a/kcontrol/tdeio/netpref.cpp
+++ b/kcontrol/tdeio/netpref.cpp
@@ -5,7 +5,7 @@
 
 #include <tdeio/ioslave_defaults.h>
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdeconfig.h>
 
diff --git a/kcontrol/tdeio/policydlg.cpp b/kcontrol/tdeio/policydlg.cpp
index 44862f51e..c45dd837e 100644
--- a/kcontrol/tdeio/policydlg.cpp
+++ b/kcontrol/tdeio/policydlg.cpp
@@ -24,7 +24,7 @@
 
 #include <klineedit.h>
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "policydlg.h"
 #include "policydlg_ui.h"
diff --git a/kcontrol/tdeio/smbrodlg.cpp b/kcontrol/tdeio/smbrodlg.cpp
index 617c27b98..ccb070e33 100644
--- a/kcontrol/tdeio/smbrodlg.cpp
+++ b/kcontrol/tdeio/smbrodlg.cpp
@@ -22,9 +22,9 @@
 #include <tqlabel.h>
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kcharsets.h>
 #include <kcombobox.h>
 #include <kdialog.h>
diff --git a/kcontrol/tdeio/socks.cpp b/kcontrol/tdeio/socks.cpp
index bf0e6410d..91d8cfd5c 100644
--- a/kcontrol/tdeio/socks.cpp
+++ b/kcontrol/tdeio/socks.cpp
@@ -27,7 +27,7 @@
 
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksocks.h>
 #include <tdeapplication.h>
 
diff --git a/kcontrol/tdeio/uagentproviderdlg.cpp b/kcontrol/tdeio/uagentproviderdlg.cpp
index 9e945948d..5e5cbd233 100644
--- a/kcontrol/tdeio/uagentproviderdlg.cpp
+++ b/kcontrol/tdeio/uagentproviderdlg.cpp
@@ -23,7 +23,7 @@
 #include <tqpushbutton.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kurllabel.h>
diff --git a/kcontrol/tdeio/useragentdlg.cpp b/kcontrol/tdeio/useragentdlg.cpp
index c325d2bce..7b1f4b3d7 100644
--- a/kcontrol/tdeio/useragentdlg.cpp
+++ b/kcontrol/tdeio/useragentdlg.cpp
@@ -33,9 +33,9 @@
 
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <ksimpleconfig.h>
 #include <tdeio/http_slave_defaults.h>