summaryrefslogtreecommitdiffstats
path: root/libksirtet/base
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 /libksirtet/base
parent8a9553c17f4228afc6e0642c259a83d8dd37027d (diff)
downloadtdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.tar.gz
tdegames-6946130bb142337c633a25f34f11f9cd0e12d5de.zip
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'libksirtet/base')
-rw-r--r--libksirtet/base/board.cpp2
-rw-r--r--libksirtet/base/factory.cpp4
-rw-r--r--libksirtet/base/field.cpp2
-rw-r--r--libksirtet/base/kzoommainwindow.cpp2
-rw-r--r--libksirtet/base/main.cpp4
-rw-r--r--libksirtet/base/piece.cpp2
-rw-r--r--libksirtet/base/settings.cpp2
7 files changed, 9 insertions, 9 deletions
diff --git a/libksirtet/base/board.cpp b/libksirtet/base/board.cpp
index 12193e31..f29bdb15 100644
--- a/libksirtet/base/board.cpp
+++ b/libksirtet/base/board.cpp
@@ -2,7 +2,7 @@
#include "board.moc"
#include <knotifyclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kzoommainwindow.h>
#include "piece.h"
diff --git a/libksirtet/base/factory.cpp b/libksirtet/base/factory.cpp
index 00b8874d..d76da791 100644
--- a/libksirtet/base/factory.cpp
+++ b/libksirtet/base/factory.cpp
@@ -3,8 +3,8 @@
#include <tdeaboutdata.h>
#include <tdeapplication.h>
#include <tdecmdlineargs.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
#include "settings.h"
diff --git a/libksirtet/base/field.cpp b/libksirtet/base/field.cpp
index f31ec06c..f443c96c 100644
--- a/libksirtet/base/field.cpp
+++ b/libksirtet/base/field.cpp
@@ -5,7 +5,7 @@
#include <tqlabel.h>
#include <tqpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <kcanvasrootpixmap.h>
#include <knotifyclient.h>
#include <kgamelcd.h>
diff --git a/libksirtet/base/kzoommainwindow.cpp b/libksirtet/base/kzoommainwindow.cpp
index 8c3fef13..758d73d6 100644
--- a/libksirtet/base/kzoommainwindow.cpp
+++ b/libksirtet/base/kzoommainwindow.cpp
@@ -22,7 +22,7 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kcmenumngr.h>
KZoomMainWindow::KZoomMainWindow(uint min, uint max, uint step, const char *name)
diff --git a/libksirtet/base/main.cpp b/libksirtet/base/main.cpp
index bda4982e..8f5479f1 100644
--- a/libksirtet/base/main.cpp
+++ b/libksirtet/base/main.cpp
@@ -3,11 +3,11 @@
#include <tdeaction.h>
#include <kstdaction.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
#include <kstdgameaction.h>
#include <kcmenumngr.h>
#include <kkeydialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knotifyclient.h>
#include <knotifydialog.h>
#include <kexthighscore.h>
diff --git a/libksirtet/base/piece.cpp b/libksirtet/base/piece.cpp
index d423473c..061088fb 100644
--- a/libksirtet/base/piece.cpp
+++ b/libksirtet/base/piece.cpp
@@ -1,6 +1,6 @@
#include "piece.h"
-#include <kglobal.h>
+#include <tdeglobal.h>
#include <krandomsequence.h>
#include "baseprefs.h"
diff --git a/libksirtet/base/settings.cpp b/libksirtet/base/settings.cpp
index 83c1a7a6..5b2735b5 100644
--- a/libksirtet/base/settings.cpp
+++ b/libksirtet/base/settings.cpp
@@ -7,7 +7,7 @@
#include <tqcheckbox.h>
#include <tqhgroupbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
#include <knuminput.h>
#include <kcolorbutton.h>
#include <tdeapplication.h>