Rename many classes and header files to avoid conflicts with KDE4

7 files changed, 21 insertions, 21 deletions

diff --git a/sip/tdecore/tdeaccel.sip b/sip/tdecore/tdeaccel.sip
index dfce48f..7522118 100644
--- a/sip/tdecore/tdeaccel.sip
+++ b/sip/tdecore/tdeaccel.sip
@@ -27,7 +27,7 @@
 class TDEAccel : TQAccel
 {
 %TypeHeaderCode
-#include <kaccel.h>
+#include <tdeaccel.h>
 %End
 
 
@@ -161,7 +161,7 @@ public:
 //converts a Python dict of int:TQString
 {
 %TypeHeaderCode
-#include <kaccel.h>
+#include <tdeaccel.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/tdeaccelaction.sip b/sip/tdecore/tdeaccelaction.sip
index 22e14ed..dff7dc4 100644
--- a/sip/tdecore/tdeaccelaction.sip
+++ b/sip/tdecore/tdeaccelaction.sip
@@ -27,7 +27,7 @@
 class TDEAccelAction
 {
 %TypeHeaderCode
-#include <kaccelaction.h>
+#include <tdeaccelaction.h>
 %End
 
 
@@ -76,7 +76,7 @@ protected:
 class TDEAccelActions
 {
 %TypeHeaderCode
-#include <kaccelaction.h>
+#include <tdeaccelaction.h>
 %End
 
 
diff --git a/sip/tdecore/tdeaccelbase.sip b/sip/tdecore/tdeaccelbase.sip
index 20139e5..ba8205a 100644
--- a/sip/tdecore/tdeaccelbase.sip
+++ b/sip/tdecore/tdeaccelbase.sip
@@ -27,7 +27,7 @@
 class TDEAccelBase
 {
 %TypeHeaderCode
-#include <kaccelbase.h>
+#include <tdeaccelbase.h>
 %End
 
 
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 28b89d6..09aeacb 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -33,9 +33,9 @@
 
 %Include bytearray.sip
 %Include kaboutdata.sip
-%Include kaccel.sip
-%Include kaccelaction.sip
-%Include kaccelbase.sip
+%Include tdeaccel.sip
+%Include tdeaccelaction.sip
+%Include tdeaccelbase.sip
 %Include kallocator.sip
 %Include kapplication.sip
 %Include kasyncio.sip
@@ -79,13 +79,13 @@
 %Include krootprop.sip
 %Include ksavefile.sip
 %Include ksharedptr.sip
-%Include kshortcut.sip
-%Include kshortcutlist.sip
+%Include tdeshortcut.sip
+%Include tdeshortcutlist.sip
 %Include ksimpleconfig.sip
 %Include ksock.sip
 %Include kstartupinfo.sip
 %Include kstaticdeleter.sip
-%Include kstdaccel.sip
+%Include tdestdaccel.sip
 %Include kstddirs.sip
 %Include kstringhandler.sip
 %Include ktempdir.sip
diff --git a/sip/tdecore/tdeshortcut.sip b/sip/tdecore/tdeshortcut.sip
index 4eb2d03..14b859b 100644
--- a/sip/tdecore/tdeshortcut.sip
+++ b/sip/tdecore/tdeshortcut.sip
@@ -27,7 +27,7 @@
 class KKey
 {
 %TypeHeaderCode
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 %End
 
 
@@ -127,7 +127,7 @@ public:
 class KKeySequence
 {
 %TypeHeaderCode
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 %End
 
 
@@ -185,7 +185,7 @@ public:
 class TDEShortcut
 {
 %TypeHeaderCode
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 %End
 
 
diff --git a/sip/tdecore/tdeshortcutlist.sip b/sip/tdecore/tdeshortcutlist.sip
index b1fb9bd..a87a122 100644
--- a/sip/tdecore/tdeshortcutlist.sip
+++ b/sip/tdecore/tdeshortcutlist.sip
@@ -28,8 +28,8 @@ class TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 %End
 
 
@@ -69,8 +69,8 @@ class TDEAccelShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 %End
 
 
@@ -105,8 +105,8 @@ class ShortcutList : TDEShortcutList
 {
 %TypeHeaderCode
 #include <tdeconfigbase.h>
-#include <kshortcut.h>
-#include <kshortcutlist.h>
+#include <tdeshortcut.h>
+#include <tdeshortcutlist.h>
 %End
 
 
diff --git a/sip/tdecore/tdestdaccel.sip b/sip/tdecore/tdestdaccel.sip
index 2af5526..05ccb2c 100644
--- a/sip/tdecore/tdestdaccel.sip
+++ b/sip/tdecore/tdestdaccel.sip
@@ -24,7 +24,7 @@
 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
 %ModuleHeaderCode
-#include <kstdaccel.h>
+#include <tdestdaccel.h>
 %End
 
 namespace TDEStdAccel