Rename many classes and header files to avoid conflicts with KDE4

28 files changed, 35 insertions, 35 deletions

diff --git a/languages/cpp/app_templates/kapp/app.cpp b/languages/cpp/app_templates/kapp/app.cpp
index f4c4cba2..9daebf13 100644
--- a/languages/cpp/app_templates/kapp/app.cpp
+++ b/languages/cpp/app_templates/kapp/app.cpp
@@ -13,7 +13,7 @@
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kstatusbar.h>
-#include <kaccel.h>
+#include <tdeaccel.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <tdeconfig.h>
@@ -21,8 +21,8 @@
 #include <kurldrag.h>
 #include <kurlrequesterdlg.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/kapp/app.h b/languages/cpp/app_templates/kapp/app.h
index 007a5db0..9f281120 100644
--- a/languages/cpp/app_templates/kapp/app.h
+++ b/languages/cpp/app_templates/kapp/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/app_templates/kateplugin/plugin_app.cpp b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
index b9d5a9b4..a1cb79d7 100644
--- a/languages/cpp/app_templates/kateplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin/plugin_app.cpp
@@ -2,7 +2,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 
diff --git a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
index 269a6b9e..888e76ab 100644
--- a/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
+++ b/languages/cpp/app_templates/kateplugin2/plugin_app.cpp
@@ -2,7 +2,7 @@
 
 #include "plugin_%{APPNAMELC}.h"
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <klocale.h>
 #include <kstandarddirs.h>
 #include <tdefiledialog.h>
diff --git a/languages/cpp/app_templates/kde4app/kapp4.cpp b/languages/cpp/app_templates/kde4app/kapp4.cpp
index 0cbd25ed..5cfd1342 100644
--- a/languages/cpp/app_templates/kde4app/kapp4.cpp
+++ b/languages/cpp/app_templates/kde4app/kapp4.cpp
@@ -10,8 +10,8 @@
 #include <tdeconfigdialog.h>
 #include <kstatusbar.h>
 
-#include <kaction.h>
-#include <kactioncollection.h>
+#include <tdeaction.h>
+#include <tdeactioncollection.h>
 #include <kstandardaction.h>
 
 #include <KDE/TDELocale>
diff --git a/languages/cpp/app_templates/kdedcop/app.cpp b/languages/cpp/app_templates/kdedcop/app.cpp
index 0548f6bd..d6508e90 100644
--- a/languages/cpp/app_templates/kdedcop/app.cpp
+++ b/languages/cpp/app_templates/kdedcop/app.cpp
@@ -4,7 +4,7 @@
 
 #include <tqlabel.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/kdedcop/app.h b/languages/cpp/app_templates/kdedcop/app.h
index 5e533c50..814fccad 100644
--- a/languages/cpp/app_templates/kdedcop/app.h
+++ b/languages/cpp/app_templates/kdedcop/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "mainclass.h"
 
diff --git a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
index ce011498..b0a33d94 100644
--- a/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
+++ b/languages/cpp/app_templates/kdevlang/kdevlang_part.cpp
@@ -10,7 +10,7 @@
 #include <kdevpartcontroller.h>
 #include <kdevplugininfo.h>
 #include <kdevproject.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kapplication.h>
 
diff --git a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
index 62ab3d94..e9843bd8 100644
--- a/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart/kdevpart_part.cpp
@@ -6,7 +6,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
index 62ab3d94..e9843bd8 100644
--- a/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
+++ b/languages/cpp/app_templates/kdevpart2/kdevpart_part.cpp
@@ -6,7 +6,7 @@
 #include <tqwhatsthis.h>
 
 #include <klocale.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdialogbase.h>
 #include <kiconloader.h>
 #include <kmessagebox.h>
diff --git a/languages/cpp/app_templates/khello/app.cpp b/languages/cpp/app_templates/khello/app.cpp
index 72b9e2dc..01373881 100644
--- a/languages/cpp/app_templates/khello/app.cpp
+++ b/languages/cpp/app_templates/khello/app.cpp
@@ -4,7 +4,7 @@
 
 #include <tqlabel.h>
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/khello/app.h b/languages/cpp/app_templates/khello/app.h
index a3e4bd31..11a9241f 100644
--- a/languages/cpp/app_templates/khello/app.h
+++ b/languages/cpp/app_templates/khello/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
  * @short Application Main Window
diff --git a/languages/cpp/app_templates/khello2/app.cpp b/languages/cpp/app_templates/khello2/app.cpp
index e506490b..a952bfb6 100644
--- a/languages/cpp/app_templates/khello2/app.cpp
+++ b/languages/cpp/app_templates/khello2/app.cpp
@@ -1,6 +1,6 @@
 %{CPP_TEMPLATE}
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <klocale.h>
 
 #include "%{APPNAMELC}.h"
diff --git a/languages/cpp/app_templates/khello2/app.h b/languages/cpp/app_templates/khello2/app.h
index a3e4bd31..11a9241f 100644
--- a/languages/cpp/app_templates/khello2/app.h
+++ b/languages/cpp/app_templates/khello2/app.h
@@ -7,7 +7,7 @@
 #include <config.h>
 #endif
 
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**
  * @short Application Main Window
diff --git a/languages/cpp/app_templates/kofficepart/kopart_view.cpp b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
index 26b70e3d..50633e04 100644
--- a/languages/cpp/app_templates/kofficepart/kopart_view.cpp
+++ b/languages/cpp/app_templates/kofficepart/kopart_view.cpp
@@ -8,7 +8,7 @@
 
 #include <tqpainter.h>
 #include <tqiconset.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <klocale.h>
 #include <kdebug.h>
diff --git a/languages/cpp/app_templates/kpartapp/app.cpp b/languages/cpp/app_templates/kpartapp/app.cpp
index 7e7dc64d..7c5154a6 100644
--- a/languages/cpp/app_templates/kpartapp/app.cpp
+++ b/languages/cpp/app_templates/kpartapp/app.cpp
@@ -8,7 +8,7 @@
 
 #include <kedittoolbar.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include <klibloader.h>
diff --git a/languages/cpp/app_templates/kpartapp/app_part.cpp b/languages/cpp/app_templates/kpartapp/app_part.cpp
index 0187646e..9fb19b18 100644
--- a/languages/cpp/app_templates/kpartapp/app_part.cpp
+++ b/languages/cpp/app_templates/kpartapp/app_part.cpp
@@ -2,7 +2,7 @@
 #include "%{APPNAMELC}_part.h"
 
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
index 3941fa56..25e8861a 100644
--- a/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
+++ b/languages/cpp/app_templates/kpartplugin/plugin_app.cpp
@@ -2,7 +2,7 @@
 #include "plugin_%{APPNAMELC}.h"
 
 #include <tdehtml_part.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kinstance.h>
 #include <kmessagebox.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/kscons_kxt/app.cpp b/languages/cpp/app_templates/kscons_kxt/app.cpp
index 6b37401d..dfd6024d 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.cpp
+++ b/languages/cpp/app_templates/kscons_kxt/app.cpp
@@ -21,8 +21,8 @@
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 %{APPNAME}::%{APPNAME}()
diff --git a/languages/cpp/app_templates/kscons_kxt/app.h b/languages/cpp/app_templates/kscons_kxt/app.h
index fd0e7fa1..f66896e9 100644
--- a/languages/cpp/app_templates/kscons_kxt/app.h
+++ b/languages/cpp/app_templates/kscons_kxt/app.h
@@ -9,7 +9,7 @@
 
 #include <dcopobject.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
index 87c66b54..73e1492d 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/app_part.cpp
@@ -4,7 +4,7 @@
 
 #include <tdeparts/genericfactory.h>
 #include <kinstance.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 #include <tdefiledialog.h>
 #include <kglobal.h>
diff --git a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
index bc36931c..4dcd8df5 100644
--- a/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
+++ b/languages/cpp/app_templates/kscons_tdemdi/apptdemdi.cpp
@@ -22,7 +22,7 @@
 #include <klibloader.h>
 #include <kaboutdata.h>
 #include <tdefiledialog.h>
-#include <kactionclasses.h>
+#include <tdeactionclasses.h>
 #include <kglobal.h>
 #include <klocale.h>
 #include <kiconloader.h>
@@ -34,8 +34,8 @@
 #include <ktabwidget.h>
 #include <kedittoolbar.h>
 #include <tdeversion.h>
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 #include "settings.h"
diff --git a/languages/cpp/app_templates/kxt/app.cpp b/languages/cpp/app_templates/kxt/app.cpp
index 183841ad..85df8854 100644
--- a/languages/cpp/app_templates/kxt/app.cpp
+++ b/languages/cpp/app_templates/kxt/app.cpp
@@ -20,8 +20,8 @@
 
 #include <kedittoolbar.h>
 
-#include <kstdaccel.h>
-#include <kaction.h>
+#include <tdestdaccel.h>
+#include <tdeaction.h>
 #include <kstdaction.h>
 
 %{APPNAMELC}::%{APPNAMELC}()
diff --git a/languages/cpp/app_templates/kxt/app.h b/languages/cpp/app_templates/kxt/app.h
index b56f3ae9..049e8ecb 100644
--- a/languages/cpp/app_templates/kxt/app.h
+++ b/languages/cpp/app_templates/kxt/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"
 
diff --git a/languages/cpp/app_templates/noatunui/plugin_impl.cpp b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
index 849f332a..7bb93d70 100644
--- a/languages/cpp/app_templates/noatunui/plugin_impl.cpp
+++ b/languages/cpp/app_templates/noatunui/plugin_impl.cpp
@@ -16,7 +16,7 @@
 #include <tqobjectlist.h>
 #include <tqobjectdict.h>
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/qtopia4app/app.pro b/languages/cpp/app_templates/qtopia4app/app.pro
index 05a0bb9c..e1367f82 100644
--- a/languages/cpp/app_templates/qtopia4app/app.pro
+++ b/languages/cpp/app_templates/qtopia4app/app.pro
@@ -2,7 +2,7 @@ qtopia_project(qtopia app) # see buildsystem.html for more project keywords
 TARGET=%{APPNAMELC}
 CONFIG+=qtopia_main
 CONFIG+=no_singleexec
-CONFIG+=no_quicklaunch
+CONFIG+=no_quictdelaunch
 CONFIG+=no_tr
 
 FORMS=%{APPNAMELC}base.ui
diff --git a/languages/cpp/app_templates/tdeconfig35/app.cpp b/languages/cpp/app_templates/tdeconfig35/app.cpp
index 41e30220..d9313146 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.cpp
+++ b/languages/cpp/app_templates/tdeconfig35/app.cpp
@@ -6,7 +6,7 @@
 
 #include <tqdragobject.h>
 
-#include <kaction.h>
+#include <tdeaction.h>
 #include <tdeconfigdialog.h>
 #include <kglobal.h>
 #include <klocale.h>
diff --git a/languages/cpp/app_templates/tdeconfig35/app.h b/languages/cpp/app_templates/tdeconfig35/app.h
index 67073ea3..cdcce5a5 100644
--- a/languages/cpp/app_templates/tdeconfig35/app.h
+++ b/languages/cpp/app_templates/tdeconfig35/app.h
@@ -8,7 +8,7 @@
 #endif
 
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 #include "%{APPNAMELC}view.h"