summaryrefslogtreecommitdiffstats
path: root/kjots/KJotsMain.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:22:31 -0600
commitbd11bce76f195adf4f3806cef8cf2e0737c99ff2 (patch)
treee3c1714d74f67cc51cd04162cd4afa927dd7f7d4 /kjots/KJotsMain.cpp
parent2d7591be424ae10d974d01e0e2f781d19ef07cd6 (diff)
downloadtdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.tar.gz
tdeutils-bd11bce76f195adf4f3806cef8cf2e0737c99ff2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kjots/KJotsMain.cpp')
-rw-r--r--kjots/KJotsMain.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kjots/KJotsMain.cpp b/kjots/KJotsMain.cpp
index 95fe7d7..4d42209 100644
--- a/kjots/KJotsMain.cpp
+++ b/kjots/KJotsMain.cpp
@@ -24,7 +24,7 @@
#include <tdeio/netaccess.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kbookmarkmenu.h>
#include <tdeconfigdialog.h>
@@ -34,10 +34,10 @@
#include <kglobalsettings.h>
#include <kinputdialog.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
#include <krun.h>
#include <kstandarddirs.h>
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
#include <ktextbrowser.h>
#include "KJotsMain.h"