summaryrefslogtreecommitdiffstats
path: root/ksokoban
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-15 21:57:10 -0600
committerTimothy Pearson <[email protected]>2013-02-15 21:57:10 -0600
commit6946130bb142337c633a25f34f11f9cd0e12d5de (patch)
treee4d2629cabc5254b98c1c0095d1f45e793edf226 /ksokoban
parent8a9553c17f4228afc6e0642c259a83d8dd37027d (diff)
downloadtdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz
tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'ksokoban')
-rw-r--r--ksokoban/Bookmark.cpp2
-rw-r--r--ksokoban/InternalCollections.cpp2
-rw-r--r--ksokoban/MainWindow.cpp6
-rw-r--r--ksokoban/ModalLabel.cpp2
-rw-r--r--ksokoban/PlayField.cpp6
-rw-r--r--ksokoban/main.cpp2
6 files changed, 10 insertions, 10 deletions
diff --git a/ksokoban/Bookmark.cpp b/ksokoban/Bookmark.cpp
index 693a886c..d6262f3a 100644
--- a/ksokoban/Bookmark.cpp
+++ b/ksokoban/Bookmark.cpp
@@ -25,7 +25,7 @@
#include <tdeapplication.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <stdio.h>
diff --git a/ksokoban/InternalCollections.cpp b/ksokoban/InternalCollections.cpp
index 5b019f52..e54b8959 100644
--- a/ksokoban/InternalCollections.cpp
+++ b/ksokoban/InternalCollections.cpp
@@ -1,4 +1,4 @@
-#include <klocale.h>
+#include <tdelocale.h>
#include <stdio.h>
#include <stdlib.h>
#include <ctype.h>
diff --git a/ksokoban/MainWindow.cpp b/ksokoban/MainWindow.cpp
index 7c02c1d8..8ebef3f2 100644
--- a/ksokoban/MainWindow.cpp
+++ b/ksokoban/MainWindow.cpp
@@ -21,15 +21,15 @@
#include <tdeapplication.h>
#include <tdeconfig.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <tqpopupmenu.h>
#include <tqkeycode.h>
#include <assert.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqstring.h>
#include <tdefiledialog.h>
#include <tqframe.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
#include <kstandarddirs.h>
#include <tdeio/netaccess.h>
#include <kiconloader.h>
diff --git a/ksokoban/ModalLabel.cpp b/ksokoban/ModalLabel.cpp
index 4fd7b25c..8d5f43d7 100644
--- a/ksokoban/ModalLabel.cpp
+++ b/ksokoban/ModalLabel.cpp
@@ -22,7 +22,7 @@
#include <tqlabel.h>
#include <tqfont.h>
#include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
#include <tqwidgetlist.h>
#include <tqstring.h>
diff --git a/ksokoban/PlayField.cpp b/ksokoban/PlayField.cpp
index b5433ed9..1483aa44 100644
--- a/ksokoban/PlayField.cpp
+++ b/ksokoban/PlayField.cpp
@@ -25,10 +25,10 @@
#include <tqkeycode.h>
#include <tdeconfig.h>
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tqpainter.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
#include "PlayField.h"
#include "ModalLabel.h"
diff --git a/ksokoban/main.cpp b/ksokoban/main.cpp
index 5f589a8f..4dd605eb 100644
--- a/ksokoban/main.cpp
+++ b/ksokoban/main.cpp
@@ -20,7 +20,7 @@
// #include <kuniqueapplication.h>
#include <tdeapplication.h>
#include <kimageio.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>