summaryrefslogtreecommitdiffstats
path: root/kshisen
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:10 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-15 21:57:10 -0600
commit6946130bb142337c633a25f34f11f9cd0e12d5de (patch)
treee4d2629cabc5254b98c1c0095d1f45e793edf226 /kshisen
parent8a9553c17f4228afc6e0642c259a83d8dd37027d (diff)
downloadtdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz
tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kshisen')
-rw-r--r--kshisen/app.cpp4
-rw-r--r--kshisen/board.cpp4
-rw-r--r--kshisen/tileset.cpp4
3 files changed, 6 insertions, 6 deletions
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index c392fe65..d84352f3 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -38,7 +38,7 @@
#include <tdeapplication.h>
#include <kseparator.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <tdeconfig.h>
#include <tdeaction.h>
#include <kstdgameaction.h>
@@ -47,7 +47,7 @@
#include <kkeydialog.h>
#include <tdepopupmenu.h>
#include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kpushbutton.h>
#include <kstdguiitem.h>
#include <tdeconfigdialog.h>
diff --git a/kshisen/board.cpp b/kshisen/board.cpp
index 110460d2..ce8c9150 100644
--- a/kshisen/board.cpp
+++ b/kshisen/board.cpp
@@ -37,9 +37,9 @@
*/
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <kdebug.h>
#include <tqpainter.h>
diff --git a/kshisen/tileset.cpp b/kshisen/tileset.cpp
index 30f055e9..45497576 100644
--- a/kshisen/tileset.cpp
+++ b/kshisen/tileset.cpp
@@ -23,8 +23,8 @@
#include <tdeapplication.h>
#include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
#include <kdebug.h>
#include <tqimage.h>