summaryrefslogtreecommitdiffstats
path: root/katapult/katapult/katapult.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:39 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:10:39 -0600
commit66bf73b75045120f34acc1034f3b43529931a736 (patch)
tree59d6f68a9d89978f35bd4cc97a69e0748fa58049 /katapult/katapult/katapult.cpp
parent06792503135e0aec3aa89075946feb38b981fbc6 (diff)
downloadkatapult-66bf73b75045120f34acc1034f3b43529931a736.tar.gz
katapult-66bf73b75045120f34acc1034f3b43529931a736.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'katapult/katapult/katapult.cpp')
-rw-r--r--katapult/katapult/katapult.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/katapult/katapult/katapult.cpp b/katapult/katapult/katapult.cpp
index 1d9bfc2..f6ef5ae 100644
--- a/katapult/katapult/katapult.cpp
+++ b/katapult/katapult/katapult.cpp
@@ -23,10 +23,10 @@
#include <kglobal.h>
#include <twin.h>
#include <kkeydialog.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdeparts/componentfactory.h>
#include <kpassivepopup.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <klocale.h>
#include <kaboutapplication.h>
#include <dcopclient.h>