summaryrefslogtreecommitdiffstats
path: root/kshisen
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:33 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:20:33 -0600
commit41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 (patch)
tree63976c277d171292373b91b4f23aeb84c4712e9e /kshisen
parent58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff)
downloadtdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz
tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kshisen')
-rw-r--r--kshisen/app.cpp4
-rw-r--r--kshisen/app.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/kshisen/app.cpp b/kshisen/app.cpp
index 87d14fae..e8c3f932 100644
--- a/kshisen/app.cpp
+++ b/kshisen/app.cpp
@@ -40,12 +40,12 @@
#include <kseparator.h>
#include <kmessagebox.h>
#include <tdeconfig.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdgameaction.h>
#include <khighscore.h>
#include <kdebug.h>
#include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstatusbar.h>
#include <klocale.h>
#include <kpushbutton.h>
diff --git a/kshisen/app.h b/kshisen/app.h
index 06ac6957..72112570 100644
--- a/kshisen/app.h
+++ b/kshisen/app.h
@@ -43,7 +43,7 @@
// Should this get the whole HAVE_SYS_TIME_H TIME_WITH_SYS_TIME treatment?
#include <time.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include "board.h"
class KHighscore;