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

---
 kicker-applets/kbinaryclock/datepicker.cpp         | 2 +-
 kicker-applets/kbinaryclock/kbinaryclock.cpp       | 2 +-
 kicker-applets/kbinaryclock/kbinaryclock.h         | 2 +-
 kicker-applets/kolourpicker/kolourpicker.cpp       | 6 +++---
 kicker-applets/kolourpicker/simplebutton.cpp       | 2 +-
 kicker-applets/ktimemon/confdlg.cc                 | 4 ++--
 kicker-applets/ktimemon/sample.cc                  | 4 ++--
 kicker-applets/ktimemon/timemon.cc                 | 6 +++---
 kicker-applets/math/mathapplet.cpp                 | 6 +++---
 kicker-applets/math/parser.cpp                     | 4 ++--
 kicker-applets/mediacontrol/configfrontend.h       | 2 +-
 kicker-applets/mediacontrol/kscdInterface.cpp      | 2 +-
 kicker-applets/mediacontrol/mediacontrol.cpp       | 2 +-
 kicker-applets/mediacontrol/mediacontrol.h         | 2 +-
 kicker-applets/mediacontrol/mediacontrolconfig.cpp | 4 ++--
 kicker-applets/mediacontrol/mpdInterface.cpp       | 2 +-
 kicker-applets/mediacontrol/mpdInterface.h         | 2 +-
 kicker-applets/mediacontrol/playerInterface.cpp    | 4 ++--
 kicker-applets/mediacontrol/simplebutton.cpp       | 2 +-
 19 files changed, 30 insertions(+), 30 deletions(-)

(limited to 'kicker-applets')

diff --git a/kicker-applets/kbinaryclock/datepicker.cpp b/kicker-applets/kbinaryclock/datepicker.cpp
index 3406e4a..1b66b04 100644
--- a/kicker-applets/kbinaryclock/datepicker.cpp
+++ b/kicker-applets/kbinaryclock/datepicker.cpp
@@ -26,7 +26,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 #include <kdatepicker.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <twin.h>
 
 DatePicker::DatePicker(TQWidget *parent, const TQDate& date)
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.cpp b/kicker-applets/kbinaryclock/kbinaryclock.cpp
index 9b940d1..4738e75 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.cpp
+++ b/kicker-applets/kbinaryclock/kbinaryclock.cpp
@@ -23,7 +23,7 @@
 #include <tdeconfigdialog.h>
 #include <tdeconfig.h>
 #include <kiconloader.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include <tqradiobutton.h>
 #include <kcolorbutton.h>
diff --git a/kicker-applets/kbinaryclock/kbinaryclock.h b/kicker-applets/kbinaryclock/kbinaryclock.h
index 695187e..0ada3f5 100644
--- a/kicker-applets/kbinaryclock/kbinaryclock.h
+++ b/kicker-applets/kbinaryclock/kbinaryclock.h
@@ -21,7 +21,7 @@
 
 #include <kpanelapplet.h>
 #include <tqevent.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeaboutdata.h>
 #include <tqdatetime.h>
 #include <tqtooltip.h>
diff --git a/kicker-applets/kolourpicker/kolourpicker.cpp b/kicker-applets/kolourpicker/kolourpicker.cpp
index ae4cb41..8f82fe2 100644
--- a/kicker-applets/kolourpicker/kolourpicker.cpp
+++ b/kicker-applets/kolourpicker/kolourpicker.cpp
@@ -30,14 +30,14 @@ $Id$
 #include <tqtooltip.h>
 #include <tqcursor.h>
 
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kinstance.h>
 #include <tdeconfig.h>
 #include <tdeaboutdata.h>
 #include <tdeaboutapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 #include "kolourpicker.h"
diff --git a/kicker-applets/kolourpicker/simplebutton.cpp b/kicker-applets/kolourpicker/simplebutton.cpp
index e81abe4..d15ac36 100644
--- a/kicker-applets/kolourpicker/simplebutton.cpp
+++ b/kicker-applets/kolourpicker/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>
diff --git a/kicker-applets/ktimemon/confdlg.cc b/kicker-applets/ktimemon/confdlg.cc
index df3fffe..337f5c5 100644
--- a/kicker-applets/ktimemon/confdlg.cc
+++ b/kicker-applets/ktimemon/confdlg.cc
@@ -22,8 +22,8 @@
 
 #include <kcolorbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kurlrequester.h>
 
 #include "confdlg.h"
diff --git a/kicker-applets/ktimemon/sample.cc b/kicker-applets/ktimemon/sample.cc
index 99ea20b..4a486f2 100644
--- a/kicker-applets/ktimemon/sample.cc
+++ b/kicker-applets/ktimemon/sample.cc
@@ -34,8 +34,8 @@
 #endif
 
 #include <tqwidget.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include "timemon.h"
 #include "sample.h"
diff --git a/kicker-applets/ktimemon/timemon.cc b/kicker-applets/ktimemon/timemon.cc
index ec90f08..8289b2d 100644
--- a/kicker-applets/ktimemon/timemon.cc
+++ b/kicker-applets/ktimemon/timemon.cc
@@ -18,12 +18,12 @@
 #include <tqtooltip.h>
 
 #include <tdeconfig.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <khelpmenu.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 
 #include "timemon.h"
diff --git a/kicker-applets/math/mathapplet.cpp b/kicker-applets/math/mathapplet.cpp
index a15fecc..83604ea 100644
--- a/kicker-applets/math/mathapplet.cpp
+++ b/kicker-applets/math/mathapplet.cpp
@@ -30,14 +30,14 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #include <tqhbox.h>
 
 #include <tdeapplication.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tdeconfig.h>
 #include <kcombobox.h>
 #include <kurifilter.h>
 #include <kdialog.h>
 #include <krun.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 
 #include "parser.h"
diff --git a/kicker-applets/math/parser.cpp b/kicker-applets/math/parser.cpp
index 8a58064..6dc928b 100644
--- a/kicker-applets/math/parser.cpp
+++ b/kicker-applets/math/parser.cpp
@@ -33,8 +33,8 @@
 
 //KDE includes
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 // local includes
 #include "parser.h"
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>
-- 
cgit v1.2.1