summaryrefslogtreecommitdiffstats
path: root/knotes/knote.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 /knotes/knote.cpp
parent6cc5f72b33f1d281de3e1bf809b1b5e77d5c96cf (diff)
downloadtdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.tar.gz
tdepim-d318087925a540a204c9d3820d5a09fbda58b8b2.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'knotes/knote.cpp')
-rw-r--r--knotes/knote.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/knotes/knote.cpp b/knotes/knote.cpp
index ea96d4c80..c19b1ec10 100644
--- a/knotes/knote.cpp
+++ b/knotes/knote.cpp
@@ -34,11 +34,11 @@
#include <kapplication.h>
#include <kdebug.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kstdaction.h>
#include <kcombobox.h>
-#include <ktoolbar.h>
-#include <kpopupmenu.h>
+#include <tdetoolbar.h>
+#include <tdepopupmenu.h>
#include <kxmlguibuilder.h>
#include <kxmlguifactory.h>
#include <kcolordrag.h>