summaryrefslogtreecommitdiffstats
path: root/twin4
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 /twin4
parent58a97ed3af5e4df6c4a58d043b0c267bd97056a9 (diff)
downloadtdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.tar.gz
tdegames-41ef6ae3bd30baee1f8a40f418bc2d63a8ce5ce6.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'twin4')
-rw-r--r--twin4/twin4/twin4.cpp2
-rw-r--r--twin4/twin4/twin4.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/twin4/twin4/twin4.cpp b/twin4/twin4/twin4.cpp
index 6a56bbb3..a0fe4661 100644
--- a/twin4/twin4/twin4.cpp
+++ b/twin4/twin4/twin4.cpp
@@ -34,7 +34,7 @@
#include <tdeconfig.h>
#include <kdebug.h>
#include <kstdaction.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tqpushbutton.h>
#include <kstatusbar.h>
#include <tdeconfigdialog.h>
diff --git a/twin4/twin4/twin4.h b/twin4/twin4/twin4.h
index b9663a50..c07c1687 100644
--- a/twin4/twin4/twin4.h
+++ b/twin4/twin4/twin4.h
@@ -18,7 +18,7 @@
#ifndef TWIN4_H
#define TWIN4_H
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
#include <kdialogbase.h>
#include "twin4doc.h"
#include <kdemacros.h>