From e46eba349e7029d919b213b7130086503d1e042e Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 1 Feb 2013 23:22:07 -0600
Subject: Rename many classes and header files to avoid conflicts with KDE4

---
 kapptemplate/kapp/app.cpp               | 6 +++---
 kapptemplate/kapp/app.h                 | 2 +-
 kapptemplate/kpartapp/app.cpp           | 2 +-
 kapptemplate/kpartapp/app_part.cpp      | 2 +-
 kapptemplate/kpartplugin/plugin_app.cpp | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'kapptemplate')

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}()
diff --git a/kapptemplate/kapp/app.h b/kapptemplate/kapp/app.h
index bc96132f..40b3241a 100644
--- a/kapptemplate/kapp/app.h
+++ b/kapptemplate/kapp/app.h
@@ -8,7 +8,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/${APP_NAME_LC}.h
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "${APP_NAME_LC}view.h"
 
diff --git a/kapptemplate/kpartapp/app.cpp b/kapptemplate/kpartapp/app.cpp
index be995d83..e2610d96 100644
--- a/kapptemplate/kpartapp/app.cpp
+++ b/kapptemplate/kpartapp/app.cpp
@@ -14,7 +14,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}.cpp
 
 #include <kedittoolbar.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <klibloader.h>
diff --git a/kapptemplate/kpartapp/app_part.cpp b/kapptemplate/kpartapp/app_part.cpp
index c87f6be5..ee1a90e5 100644
--- a/kapptemplate/kpartapp/app_part.cpp
+++ b/kapptemplate/kpartapp/app_part.cpp
@@ -5,7 +5,7 @@ cat << EOF > $LOCATION_ROOT/${APP_NAME_LC}/${APP_NAME_LC}_part.cpp
 #include "${APP_NAME_LC}_part.moc"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <tdeparts/genericfactory.h>
diff --git a/kapptemplate/kpartplugin/plugin_app.cpp b/kapptemplate/kpartplugin/plugin_app.cpp
index 74de46f5..ccc7fecc 100644
--- a/kapptemplate/kpartplugin/plugin_app.cpp
+++ b/kapptemplate/kpartplugin/plugin_app.cpp
@@ -3,7 +3,7 @@ cat << EOF > $LOCATION_ROOT/$APP_NAME_LC/plugin_${APP_NAME_LC}.cpp
 #include "plugin_${APP_NAME_LC}.h"
 
 #include <tdehtml_part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
-- 
cgit v1.2.1