summaryrefslogtreecommitdiffstats
path: root/kapptemplate/kapp/app.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2013-02-01 23:22:07 -0600
committerTimothy Pearson <[email protected]>2013-02-01 23:22:07 -0600
commite46eba349e7029d919b213b7130086503d1e042e (patch)
treec99ad6970d22aa80d905a7129d87aa627ae26801 /kapptemplate/kapp/app.cpp
parentdf726f3e9706e8264827dc1dc8338225c3b6434f (diff)
downloadtdesdk-e46eba349e7029d919b213b7130086503d1e042e.tar.gz
tdesdk-e46eba349e7029d919b213b7130086503d1e042e.zip
Rename many classes and header files to avoid conflicts with KDE4
Diffstat (limited to 'kapptemplate/kapp/app.cpp')
-rw-r--r--kapptemplate/kapp/app.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/kapptemplate/kapp/app.cpp b/kapptemplate/kapp/app.cpp
index 62f1a261..5785102e 100644
--- a/kapptemplate/kapp/app.cpp
+++ b/kapptemplate/kapp/app.cpp
@@ -19,7 +19,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
#include <kiconloader.h>
#include <kmenubar.h>
#include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
#include <tdeio/netaccess.h>
#include <tdefiledialog.h>
#include <tdeconfig.h>
@@ -29,8 +29,8 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
#include <kedittoolbar.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
#include <kstdaction.h>
${APP_NAME}::${APP_NAME}()