summaryrefslogtreecommitdiffstats
path: root/korganizer/actionmanager.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:55 -0600
commitd318087925a540a204c9d3820d5a09fbda58b8b2 (patch)
treeb8dde6aa5d6559b81c6667d8364a4364c27bcba4 /korganizer/actionmanager.cpp
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'korganizer/actionmanager.cpp')
-rw-r--r--korganizer/actionmanager.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/korganizer/actionmanager.cpp b/korganizer/actionmanager.cpp
index 7eef7539c..30f2c262f 100644
--- a/korganizer/actionmanager.cpp
+++ b/korganizer/actionmanager.cpp
@@ -55,12 +55,12 @@
#include <libkmime/kmime_message.h>
#include <dcopclient.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <tdefiledialog.h>
#include <kiconloader.h>
#include <tdeio/netaccess.h>
#include <kkeydialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <kstandarddirs.h>
#include <ktip.h>
#include <ktempfile.h>
@@ -69,7 +69,7 @@
#include <knotifyclient.h>
#include <kstdguiitem.h>
#include <tdeversion.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
#include <kcmdlineargs.h>
#include <tqapplication.h>