Rename additional header files to avoid conflicts with KDE4

9 files changed, 11 insertions, 11 deletions

diff --git a/kicker-applets/mediacontrol/configfrontend.h b/kicker-applets/mediacontrol/configfrontend.h
index bbae0bb..665facc 100644
--- a/kicker-applets/mediacontrol/configfrontend.h
+++ b/kicker-applets/mediacontrol/configfrontend.h
@@ -22,7 +22,7 @@
 #define CONFIGFRONTEND_H
 
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 class ConfigFrontend : public TQObject
 {
diff --git a/kicker-applets/mediacontrol/kscdInterface.cpp b/kicker-applets/mediacontrol/kscdInterface.cpp
index 0256de6..3d48204 100644
--- a/kicker-applets/mediacontrol/kscdInterface.cpp
+++ b/kicker-applets/mediacontrol/kscdInterface.cpp
@@ -24,7 +24,7 @@
 #include <tqstringlist.h>
 #include <tqstrlist.h>
 #include <kurldrag.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define TIMER_FAST  250
 
diff --git a/kicker-applets/mediacontrol/mediacontrol.cpp b/kicker-applets/mediacontrol/mediacontrol.cpp
index e003d3f..e3f5c43 100644
--- a/kicker-applets/mediacontrol/mediacontrol.cpp
+++ b/kicker-applets/mediacontrol/mediacontrol.cpp
@@ -46,7 +46,7 @@
 
 #include <tdeapplication.h>
 #include <kipc.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <knotifyclient.h>
 #include <kbugreport.h>
diff --git a/kicker-applets/mediacontrol/mediacontrol.h b/kicker-applets/mediacontrol/mediacontrol.h
index 561e58a..36898fc 100644
--- a/kicker-applets/mediacontrol/mediacontrol.h
+++ b/kicker-applets/mediacontrol/mediacontrol.h
@@ -22,7 +22,7 @@
 #include <config.h>
 #endif
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpanelapplet.h>
 #include <kdebug.h>
 #include <kstandarddirs.h>
diff --git a/kicker-applets/mediacontrol/mediacontrolconfig.cpp b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
index d86b110..9df7362 100644
--- a/kicker-applets/mediacontrol/mediacontrolconfig.cpp
+++ b/kicker-applets/mediacontrol/mediacontrolconfig.cpp
@@ -35,10 +35,10 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kstandarddirs.h>
 
diff --git a/kicker-applets/mediacontrol/mpdInterface.cpp b/kicker-applets/mediacontrol/mpdInterface.cpp
index 98ba0cb..0f0e1c6 100644
--- a/kicker-applets/mediacontrol/mpdInterface.cpp
+++ b/kicker-applets/mediacontrol/mpdInterface.cpp
@@ -25,7 +25,7 @@
 
 #include <tqregexp.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kurldrag.h>
 
diff --git a/kicker-applets/mediacontrol/mpdInterface.h b/kicker-applets/mediacontrol/mpdInterface.h
index 5e1a0bd..6128330 100644
--- a/kicker-applets/mediacontrol/mpdInterface.h
+++ b/kicker-applets/mediacontrol/mpdInterface.h
@@ -24,7 +24,7 @@
 
 #include "playerInterface.h"
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqsocket.h>
 #include <tqmutex.h>
 
diff --git a/kicker-applets/mediacontrol/playerInterface.cpp b/kicker-applets/mediacontrol/playerInterface.cpp
index 1b90cf0..9ada948 100644
--- a/kicker-applets/mediacontrol/playerInterface.cpp
+++ b/kicker-applets/mediacontrol/playerInterface.cpp
@@ -18,8 +18,8 @@
 #include "playerInterface.h"
 #include "playerInterface.moc"
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 PlayerInterface::PlayerInterface() { }   // Constructor
 PlayerInterface::~PlayerInterface() { }  // Destructor
diff --git a/kicker-applets/mediacontrol/simplebutton.cpp b/kicker-applets/mediacontrol/simplebutton.cpp
index e81abe4..d15ac36 100644
--- a/kicker-applets/mediacontrol/simplebutton.cpp
+++ b/kicker-applets/mediacontrol/simplebutton.cpp
@@ -26,7 +26,7 @@
 #include <tdeapplication.h>
 #include <kcursor.h>
 #include <kdialog.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kiconeffect.h>
 #include <kicontheme.h>
 #include <kipc.h>