summaryrefslogtreecommitdiffstats
path: root/tdeui/khelpmenu.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-02-01 23:21:04 -0600
commitd1e0cc99a202cef3306b90b8839a6726e89f201e (patch)
treea0d01a91644fd94aa6da5d8944e052b67461faad /tdeui/khelpmenu.cpp
parent3e3559f2d4f4c4ffa3caa0374928c8a12be29bf3 (diff)
downloadtdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.tar.gz
tdelibs-d1e0cc99a202cef3306b90b8839a6726e89f201e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'tdeui/khelpmenu.cpp')
-rw-r--r--tdeui/khelpmenu.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 33e6210ff..ed329493c 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -30,7 +30,7 @@
#include <kaboutapplication.h>
#include <kaboutdata.h>
#include <kaboutkde.h>
-#include <kaction.h>
+#include <tdeaction.h>
#include <kapplication.h>
#include <kbugreport.h>
#include <kdialogbase.h>
@@ -38,8 +38,8 @@
#include <kiconloader.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kpopupmenu.h>
-#include <kstdaccel.h>
+#include <tdepopupmenu.h>
+#include <tdestdaccel.h>
#include <kstdaction.h>
#include <kstandarddirs.h>