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

---
 libtdegames/highscore/kexthighscore_gui.cpp      | 4 ++--
 libtdegames/highscore/kexthighscore_internal.cpp | 6 +++---
 libtdegames/highscore/kexthighscore_internal.h   | 2 +-
 libtdegames/highscore/kexthighscore_item.cpp     | 2 +-
 libtdegames/highscore/kexthighscore_tab.cpp      | 2 +-
 libtdegames/highscore/khighscore.cpp             | 6 +++---
 libtdegames/highscore/kscoredialog.cpp           | 2 +-
 libtdegames/kcarddialog.cpp                      | 2 +-
 libtdegames/kchat.cpp                            | 2 +-
 libtdegames/kchatbase.cpp                        | 2 +-
 libtdegames/kchatbase.h                          | 2 +-
 libtdegames/kchatdialog.cpp                      | 2 +-
 libtdegames/kgame/dialogs/kgameconnectdialog.cpp | 2 +-
 libtdegames/kgame/dialogs/kgamedebugdialog.cpp   | 2 +-
 libtdegames/kgame/dialogs/kgamedialog.cpp        | 2 +-
 libtdegames/kgame/dialogs/kgamedialogconfig.cpp  | 4 ++--
 libtdegames/kgame/dialogs/kgameerrordialog.cpp   | 4 ++--
 libtdegames/kgame/kgame.cpp                      | 2 +-
 libtdegames/kgame/kgamechat.cpp                  | 2 +-
 libtdegames/kgame/kgameerror.cpp                 | 2 +-
 libtdegames/kgame/kgamemessage.cpp               | 2 +-
 libtdegames/kgame/kgamepropertyhandler.cpp       | 2 +-
 libtdegames/kgame/kplayer.cpp                    | 2 +-
 libtdegames/kgamelcd.cpp                         | 2 +-
 libtdegames/kgamemisc.cpp                        | 2 +-
 libtdegames/kgrid2d.h                            | 2 +-
 libtdegames/kstdgameaction.cpp                   | 2 +-
 27 files changed, 34 insertions(+), 34 deletions(-)

(limited to 'libtdegames')

diff --git a/libtdegames/highscore/kexthighscore_gui.cpp b/libtdegames/highscore/kexthighscore_gui.cpp
index 1cdeb170..5b7e08c0 100644
--- a/libtdegames/highscore/kexthighscore_gui.cpp
+++ b/libtdegames/highscore/kexthighscore_gui.cpp
@@ -27,12 +27,12 @@
 #include <tqvgroupbox.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kurllabel.h>
 #include <kopenwith.h>
 #include <krun.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <kiconloader.h>
 
diff --git a/libtdegames/highscore/kexthighscore_internal.cpp b/libtdegames/highscore/kexthighscore_internal.cpp
index 05c51562..c43fd550 100644
--- a/libtdegames/highscore/kexthighscore_internal.cpp
+++ b/libtdegames/highscore/kexthighscore_internal.cpp
@@ -27,17 +27,17 @@
 #include <tqlayout.h>
 #include <tqdom.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeio/netaccess.h>
 #include <tdeio/job.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kmdcodec.h>
 #include <kdebug.h>
 
 #include "config.h"
 #include "kexthighscore.h"
 #include "kexthighscore_gui.h"
-#include "kemailsettings.h"
+#include "tdeemailsettings.h"
 
 
 namespace KExtHighscore
diff --git a/libtdegames/highscore/kexthighscore_internal.h b/libtdegames/highscore/kexthighscore_internal.h
index 5c5ab53b..c1d166bb 100644
--- a/libtdegames/highscore/kexthighscore_internal.h
+++ b/libtdegames/highscore/kexthighscore_internal.h
@@ -22,7 +22,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 
 #include "khighscore.h"
diff --git a/libtdegames/highscore/kexthighscore_item.cpp b/libtdegames/highscore/kexthighscore_item.cpp
index c7e294c1..58a1bad1 100644
--- a/libtdegames/highscore/kexthighscore_item.cpp
+++ b/libtdegames/highscore/kexthighscore_item.cpp
@@ -20,7 +20,7 @@
 #include "kexthighscore_item.h"
 
 #include <tqlayout.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdialogbase.h>
 #include <kdebug.h>
 
diff --git a/libtdegames/highscore/kexthighscore_tab.cpp b/libtdegames/highscore/kexthighscore_tab.cpp
index 13e32894..e48db436 100644
--- a/libtdegames/highscore/kexthighscore_tab.cpp
+++ b/libtdegames/highscore/kexthighscore_tab.cpp
@@ -29,7 +29,7 @@
 #include <kdialogbase.h>
 #include <tdelistview.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include "kexthighscore.h"
 #include "kexthighscore_internal.h"
diff --git a/libtdegames/highscore/khighscore.cpp b/libtdegames/highscore/khighscore.cpp
index 004c98fa..bfed1534 100644
--- a/libtdegames/highscore/khighscore.cpp
+++ b/libtdegames/highscore/khighscore.cpp
@@ -28,10 +28,10 @@
 
 #include <tdeapplication.h>
 #include <ksimpleconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kstaticdeleter.h>
 
diff --git a/libtdegames/highscore/kscoredialog.cpp b/libtdegames/highscore/kscoredialog.cpp
index aadb3fd1..518d0084 100644
--- a/libtdegames/highscore/kscoredialog.cpp
+++ b/libtdegames/highscore/kscoredialog.cpp
@@ -34,7 +34,7 @@ this software.
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kseparator.h>
 
 #include "kscoredialog.h"
diff --git a/libtdegames/kcarddialog.cpp b/libtdegames/kcarddialog.cpp
index a347e578..be1c7fef 100644
--- a/libtdegames/kcarddialog.cpp
+++ b/libtdegames/kcarddialog.cpp
@@ -32,7 +32,7 @@
 #include <tqwmatrix.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kiconview.h>
 #include <ksimpleconfig.h>
diff --git a/libtdegames/kchat.cpp b/libtdegames/kchat.cpp
index 797ee794..db35a8a0 100644
--- a/libtdegames/kchat.cpp
+++ b/libtdegames/kchat.cpp
@@ -17,7 +17,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kchat.h"
diff --git a/libtdegames/kchatbase.cpp b/libtdegames/kchatbase.cpp
index 386c005e..17f831a0 100644
--- a/libtdegames/kchatbase.cpp
+++ b/libtdegames/kchatbase.cpp
@@ -20,7 +20,7 @@
 #include "kchatbase.h"
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <tdeconfig.h>
 #include <tdeapplication.h>
diff --git a/libtdegames/kchatbase.h b/libtdegames/kchatbase.h
index 5f6f5d85..49d41558 100644
--- a/libtdegames/kchatbase.h
+++ b/libtdegames/kchatbase.h
@@ -23,7 +23,7 @@
 #include <tqstring.h>
 #include <tqlistbox.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdemacros.h>
 class TQListBoxItem;
 
diff --git a/libtdegames/kchatdialog.cpp b/libtdegames/kchatdialog.cpp
index c4756f44..eaa6c6fc 100644
--- a/libtdegames/kchatdialog.cpp
+++ b/libtdegames/kchatdialog.cpp
@@ -21,7 +21,7 @@
 
 #include "kchatbase.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefontdialog.h>
 
 #include <tqlayout.h>
diff --git a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp
index 3436d0dc..2de27a0e 100644
--- a/libtdegames/kgame/dialogs/kgameconnectdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgameconnectdialog.cpp
@@ -22,7 +22,7 @@
 #include "kgameconnectdialog.h"
 
 #include <knuminput.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlineedit.h>
 #include <tqcombobox.h>
diff --git a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
index b4de9985..1b172cf2 100644
--- a/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedebugdialog.cpp
@@ -27,7 +27,7 @@
 
 #include <tdelistview.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kstdguiitem.h>
diff --git a/libtdegames/kgame/dialogs/kgamedialog.cpp b/libtdegames/kgame/dialogs/kgamedialog.cpp
index 245b70f2..a2440355 100644
--- a/libtdegames/kgame/dialogs/kgamedialog.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialog.cpp
@@ -21,7 +21,7 @@
 #include <tqlayout.h>
 #include <tqvbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kgame.h"
 #include "kplayer.h"
diff --git a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
index 52a42151..a14abe73 100644
--- a/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
+++ b/libtdegames/kgame/dialogs/kgamedialogconfig.cpp
@@ -25,11 +25,11 @@
 #include "kgamechat.h"
 #include "kgameconnectdialog.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kdialog.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqhgroupbox.h>
diff --git a/libtdegames/kgame/dialogs/kgameerrordialog.cpp b/libtdegames/kgame/dialogs/kgameerrordialog.cpp
index 8ea1a0ea..468ca7c8 100644
--- a/libtdegames/kgame/dialogs/kgameerrordialog.cpp
+++ b/libtdegames/kgame/dialogs/kgameerrordialog.cpp
@@ -18,8 +18,8 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kgame.h"
diff --git a/libtdegames/kgame/kgame.cpp b/libtdegames/kgame/kgame.cpp
index 946830a6..fcd7e82b 100644
--- a/libtdegames/kgame/kgame.cpp
+++ b/libtdegames/kgame/kgame.cpp
@@ -41,7 +41,7 @@
 #include <tqptrqueue.h>
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krandomsequence.h>
 #include <kdebug.h>
 
diff --git a/libtdegames/kgame/kgamechat.cpp b/libtdegames/kgame/kgamechat.cpp
index 80ca84c2..80059e7b 100644
--- a/libtdegames/kgame/kgamechat.cpp
+++ b/libtdegames/kgame/kgamechat.cpp
@@ -26,7 +26,7 @@
 #include "kgameproperty.h"
 #include "kgamemessage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqmap.h>
diff --git a/libtdegames/kgame/kgameerror.cpp b/libtdegames/kgame/kgameerror.cpp
index 73145be8..500605fa 100644
--- a/libtdegames/kgame/kgameerror.cpp
+++ b/libtdegames/kgame/kgameerror.cpp
@@ -24,7 +24,7 @@
 #include "kgameerror.h"
 #include "kgamemessage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 TQByteArray KGameError::errVersion(int remoteVersion)
 {
diff --git a/libtdegames/kgame/kgamemessage.cpp b/libtdegames/kgame/kgamemessage.cpp
index ba79c639..c1505011 100644
--- a/libtdegames/kgame/kgamemessage.cpp
+++ b/libtdegames/kgame/kgamemessage.cpp
@@ -23,7 +23,7 @@
 
 #include "kgamemessage.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define MESSAGE_VERSION 2
 
diff --git a/libtdegames/kgame/kgamepropertyhandler.cpp b/libtdegames/kgame/kgamepropertyhandler.cpp
index 39b6fcf9..732c8bde 100644
--- a/libtdegames/kgame/kgamepropertyhandler.cpp
+++ b/libtdegames/kgame/kgamepropertyhandler.cpp
@@ -28,7 +28,7 @@
 #include <tqmap.h>
 #include <tqptrqueue.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <typeinfo>
 
 #define KPLAYERHANDLER_LOAD_COOKIE 6239
diff --git a/libtdegames/kgame/kplayer.cpp b/libtdegames/kgame/kplayer.cpp
index af975db1..5945f9cf 100644
--- a/libtdegames/kgame/kplayer.cpp
+++ b/libtdegames/kgame/kplayer.cpp
@@ -29,7 +29,7 @@
 #include "kgamepropertyhandler.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbuffer.h>
 
diff --git a/libtdegames/kgamelcd.cpp b/libtdegames/kgamelcd.cpp
index c957a0cc..5c9c1d85 100644
--- a/libtdegames/kgamelcd.cpp
+++ b/libtdegames/kgamelcd.cpp
@@ -24,7 +24,7 @@
 #include <tqlabel.h>
 #include <tqtimer.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 //-----------------------------------------------------------------------------
diff --git a/libtdegames/kgamemisc.cpp b/libtdegames/kgamemisc.cpp
index 97d97dab..8041ab8a 100644
--- a/libtdegames/kgamemisc.cpp
+++ b/libtdegames/kgamemisc.cpp
@@ -23,7 +23,7 @@
 #include <tqstringlist.h>
 
 #include <krandomsequence.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kgamemisc.h"
 
diff --git a/libtdegames/kgrid2d.h b/libtdegames/kgrid2d.h
index 8bafa7ca..1ad94a40 100644
--- a/libtdegames/kgrid2d.h
+++ b/libtdegames/kgrid2d.h
@@ -26,7 +26,7 @@
 #include <tqvaluelist.h>
 #include <tqvaluevector.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 //-----------------------------------------------------------------------------
diff --git a/libtdegames/kstdgameaction.cpp b/libtdegames/kstdgameaction.cpp
index 79797afd..ea963ef6 100644
--- a/libtdegames/kstdgameaction.cpp
+++ b/libtdegames/kstdgameaction.cpp
@@ -19,7 +19,7 @@
 
 #include "kstdgameaction.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdestdaccel.h>
 #include <tdeconfig.h>
-- 
cgit v1.2.1