summaryrefslogtreecommitdiffstats
path: root/kblackbox
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:20:33 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:20:33 -0600
commit41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6 (patch)
tree63976c277d171292373b91b4f23aeb84c4712e9e /kblackbox
parent58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff)
downloadtdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz
tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kblackbox')
-rw-r--r--kblackbox/kbbgame.cpp2
-rw-r--r--kblackbox/kbbgame.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kblackbox/kbbgame.cpp b/kblackbox/kbbgame.cpp
index a8c51100..ccb0dcde 100644
--- a/kblackbox/kbbgame.cpp
+++ b/kblackbox/kbbgame.cpp
@@ -26,7 +26,7 @@
#include <kmenubar.h>
#include <kiconloader.h>
#include <khelpmenu.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kstatusbar.h>
#include <kstdgameaction.h>
diff --git a/kblackbox/kbbgame.h b/kblackbox/kbbgame.h
index de73cb9e..94837871 100644
--- a/kblackbox/kbbgame.h
+++ b/kblackbox/kbbgame.h
@@ -15,7 +15,7 @@
#include "kbbgfx.h"
#include "util.h"
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <krandomsequence.h>
class TDESelectAction;