summaryrefslogtreecommitdiffstats
path: root/katomic
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 /katomic
parent8a9553c17f4228afc6e0642c259a83d8dd37027d (diff)
downloadtdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz
tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'katomic')
-rw-r--r--katomic/configbox.cpp4
-rw-r--r--katomic/feld.cpp2
-rw-r--r--katomic/gamewidget.cpp8
-rw-r--r--katomic/main.cpp2
-rw-r--r--katomic/molek.cpp4
-rw-r--r--katomic/toplevel.cpp4
6 files changed, 12 insertions, 12 deletions
diff --git a/katomic/configbox.cpp b/katomic/configbox.cpp
index 0b8561d4..c8a9fcd5 100644
--- a/katomic/configbox.cpp
+++ b/katomic/configbox.cpp
@@ -5,8 +5,8 @@
*/
#include "configbox.h"
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
#include <tdeconfig.h>
#include <tqlayout.h>
#include <tqgroupbox.h>
diff --git a/katomic/feld.cpp b/katomic/feld.cpp
index b18f78ae..3411b7fb 100644
--- a/katomic/feld.cpp
+++ b/katomic/feld.cpp
@@ -13,7 +13,7 @@
// oder auch einfach bewegt wird
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
#include "molek.h"
diff --git a/katomic/gamewidget.cpp b/katomic/gamewidget.cpp
index c27cdeb3..4886cb41 100644
--- a/katomic/gamewidget.cpp
+++ b/katomic/gamewidget.cpp
@@ -31,12 +31,12 @@
#include <tdeapplication.h>
#include <kscoredialog.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
#include <kstandarddirs.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <ksimpleconfig.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
Options settings;
diff --git a/katomic/main.cpp b/katomic/main.cpp
index 0847e846..9d63150d 100644
--- a/katomic/main.cpp
+++ b/katomic/main.cpp
@@ -22,7 +22,7 @@
#include "toplevel.h"
#include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <tdecmdlineargs.h>
#include <tdeaboutdata.h>
diff --git a/katomic/molek.cpp b/katomic/molek.cpp
index 4a0562c2..46132502 100644
--- a/katomic/molek.cpp
+++ b/katomic/molek.cpp
@@ -16,10 +16,10 @@
#include "molek.moc"
#include <kiconloader.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <kstandarddirs.h>
#include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kdebug.h>
#include <ctype.h>
diff --git a/katomic/toplevel.cpp b/katomic/toplevel.cpp
index 30c369bd..5603f505 100644
--- a/katomic/toplevel.cpp
+++ b/katomic/toplevel.cpp
@@ -21,8 +21,8 @@
#include <tqgroupbox.h>
#include <tqlayout.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include <ksimpleconfig.h>
#include <kstandarddirs.h>
#include <tdeapplication.h>