summaryrefslogtreecommitdiffstats
path: root/kbattleship
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 /kbattleship
parent58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff)
downloadtdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz
tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kbattleship')
-rw-r--r--kbattleship/kbattleship/kbattleship.h4
-rw-r--r--kbattleship/kbattleship/kbattleshipview.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/kbattleship/kbattleship/kbattleship.h b/kbattleship/kbattleship/kbattleship.h
index 47a2f4d7..a47dd72b 100644
--- a/kbattleship/kbattleship/kbattleship.h
+++ b/kbattleship/kbattleship/kbattleship.h
@@ -18,12 +18,12 @@
#ifndef KBATTLESHIP_H
#define KBATTLESHIP_H
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <tdeconfig.h>
#include <kiconloader.h>
#include <klocale.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kmenubar.h>
#include <kmessagebox.h>
#include <kstdaction.h>
diff --git a/kbattleship/kbattleship/kbattleshipview.h b/kbattleship/kbattleship/kbattleshipview.h
index 53e0a243..399931ae 100644
--- a/kbattleship/kbattleship/kbattleshipview.h
+++ b/kbattleship/kbattleship/kbattleshipview.h
@@ -18,7 +18,7 @@
#ifndef KBATTLESHIPVIEW_H
#define KBATTLESHIPVIEW_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <tqpainter.h>
#include <tqptrlist.h>