Rename a number of libraries and executables to avoid conflicts with KDE4

24 files changed, 54 insertions, 54 deletions

diff --git a/sip/tdecore/bytearray.sip b/sip/tdecore/bytearray.sip
index 507ef3c..743aff6 100644
--- a/sip/tdecore/bytearray.sip
+++ b/sip/tdecore/bytearray.sip
@@ -785,7 +785,7 @@ void dcop_add (TQDataStream& s, TQByteArray value)
 };
 
 
-//%MappedType TQMap<TQString,TQString> is available in tdecore/kconfig.sip
+//%MappedType TQMap<TQString,TQString> is available in tdecore/tdeconfig.sip
 
 
 %MappedType TQMap<TQString,TQByteArray>
diff --git a/sip/tdecore/kshortcutlist.sip b/sip/tdecore/kshortcutlist.sip
index 53ce168..e5eca23 100644
--- a/sip/tdecore/kshortcutlist.sip
+++ b/sip/tdecore/kshortcutlist.sip
@@ -27,7 +27,7 @@
 class KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
@@ -68,7 +68,7 @@ protected:
 class KAccelShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
@@ -104,7 +104,7 @@ namespace KStdAccel
 class ShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kshortcutlist.h>
 %End
diff --git a/sip/tdecore/kconfig.sip b/sip/tdecore/tdeconfig.sip
index 1e30b31..c60c002 100644
--- a/sip/tdecore/kconfig.sip
+++ b/sip/tdecore/tdeconfig.sip
@@ -27,7 +27,7 @@
 class TDEConfig : TDEConfigBase
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 
@@ -82,7 +82,7 @@ protected:
 class KSharedConfig : TDEConfig, KShared
 {
 %TypeHeaderCode
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 
@@ -197,7 +197,7 @@ private:
 {
 %TypeHeaderCode
 #include <ksharedptr.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/kconfigbackend.sip b/sip/tdecore/tdeconfigbackend.sip
index 2df5316..1afa8e2 100644
--- a/sip/tdecore/kconfigbackend.sip
+++ b/sip/tdecore/tdeconfigbackend.sip
@@ -27,7 +27,7 @@
 class TDEConfigBackEnd
 {
 %TypeHeaderCode
-#include <kconfigbackend.h>
+#include <tdeconfigbackend.h>
 %End
 
 
@@ -66,8 +66,8 @@ protected:
 class TDEConfigINIBackEnd : TDEConfigBackEnd
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
-#include <kconfigbackend.h>
+#include <tdeconfigdata.h>
+#include <tdeconfigbackend.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigbase.sip b/sip/tdecore/tdeconfigbase.sip
index 2f9d9c9..53b36a2 100644
--- a/sip/tdecore/kconfigbase.sip
+++ b/sip/tdecore/tdeconfigbase.sip
@@ -33,7 +33,7 @@ typedef unsigned long long ulonglong;
 class TDEConfigBase : TQObject
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
@@ -212,7 +212,7 @@ protected:
 class TDEConfigGroupSaver
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
@@ -231,7 +231,7 @@ private:
 class TDEConfigGroup : TDEConfigBase
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigdata.sip b/sip/tdecore/tdeconfigdata.sip
index 96a22cf..6c20ab9 100644
--- a/sip/tdecore/kconfigdata.sip
+++ b/sip/tdecore/tdeconfigdata.sip
@@ -27,7 +27,7 @@
 class KEntry
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 
@@ -51,7 +51,7 @@ public:
 class KEntryKey
 {
 %TypeHeaderCode
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 
@@ -90,7 +90,7 @@ KEntryMap            testKEntryMap (SIP_PYOBJECT) [KEntryMap (KEntryMap)];
 {
 %TypeHeaderCode
 #include <tqmap.h>
-#include <kconfigdata.h>
+#include <tdeconfigdata.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/kconfigdialogmanager.sip b/sip/tdecore/tdeconfigdialogmanager.sip
index cec0949..52e4951 100644
--- a/sip/tdecore/kconfigdialogmanager.sip
+++ b/sip/tdecore/tdeconfigdialogmanager.sip
@@ -29,7 +29,7 @@
 class TDEConfigDialogManager : TQObject
 {
 %TypeHeaderCode
-#include <kconfigdialogmanager.h>
+#include <tdeconfigdialogmanager.h>
 %End
 
 
diff --git a/sip/tdecore/kconfigskeleton.sip b/sip/tdecore/tdeconfigskeleton.sip
index 61e9b52..6e588c1 100644
--- a/sip/tdecore/kconfigskeleton.sip
+++ b/sip/tdecore/tdeconfigskeleton.sip
@@ -30,7 +30,7 @@ class TDEConfigSkeletonItem
 {
 %TypeHeaderCode
 #include <typeinfo>
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 %End
 
 
@@ -122,7 +122,7 @@ protected:
 class TDEConfigSkeleton
 {
 %TypeHeaderCode
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 typedef TQValueList<int> IntList;
 %End
 
@@ -1080,7 +1080,7 @@ public:
 %MappedType TQValueList<TDEConfigSkeleton::ItemEnum::Choice>
 {
 %TypeHeaderCode
-#include <kconfigskeleton.h>
+#include <tdeconfigskeleton.h>
 %End
 
 %ConvertFromTypeCode
diff --git a/sip/tdecore/tdecore-kde320.diff b/sip/tdecore/tdecore-kde320.diff
index 91d9a2c..5bce785 100644
--- a/sip/tdecore/tdecore-kde320.diff
+++ b/sip/tdecore/tdecore-kde320.diff
@@ -1,8 +1,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde321.diff b/sip/tdecore/tdecore-kde321.diff
index 70ae29c..1e2c244 100644
--- a/sip/tdecore/tdecore-kde321.diff
+++ b/sip/tdecore/tdecore-kde321.diff
@@ -1,8 +1,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde322.diff b/sip/tdecore/tdecore-kde322.diff
index 2114627..a4eb42c 100644
--- a/sip/tdecore/tdecore-kde322.diff
+++ b/sip/tdecore/tdecore-kde322.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde323.diff b/sip/tdecore/tdecore-kde323.diff
index 2114627..a4eb42c 100644
--- a/sip/tdecore/tdecore-kde323.diff
+++ b/sip/tdecore/tdecore-kde323.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include kmacroexpander.sip
diff --git a/sip/tdecore/tdecore-kde330.diff b/sip/tdecore/tdecore-kde330.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde330.diff
+++ b/sip/tdecore/tdecore-kde330.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde331.diff b/sip/tdecore/tdecore-kde331.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde331.diff
+++ b/sip/tdecore/tdecore-kde331.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde332.diff b/sip/tdecore/tdecore-kde332.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde332.diff
+++ b/sip/tdecore/tdecore-kde332.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde340.diff b/sip/tdecore/tdecore-kde340.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde340.diff
+++ b/sip/tdecore/tdecore-kde340.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde341.diff b/sip/tdecore/tdecore-kde341.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde341.diff
+++ b/sip/tdecore/tdecore-kde341.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde342.diff b/sip/tdecore/tdecore-kde342.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde342.diff
+++ b/sip/tdecore/tdecore-kde342.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde343.diff b/sip/tdecore/tdecore-kde343.diff
index 335a5f4..906da95 100644
--- a/sip/tdecore/tdecore-kde343.diff
+++ b/sip/tdecore/tdecore-kde343.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde350.diff b/sip/tdecore/tdecore-kde350.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde350.diff
+++ b/sip/tdecore/tdecore-kde350.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde351.diff b/sip/tdecore/tdecore-kde351.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde351.diff
+++ b/sip/tdecore/tdecore-kde351.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde352.diff b/sip/tdecore/tdecore-kde352.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde352.diff
+++ b/sip/tdecore/tdecore-kde352.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecore-kde353.diff b/sip/tdecore/tdecore-kde353.diff
index 72166a8..1d1dca9 100644
--- a/sip/tdecore/tdecore-kde353.diff
+++ b/sip/tdecore/tdecore-kde353.diff
@@ -2,8 +2,8 @@
 + %Include kcalendarsystem.sip
 + %Include kcalendarsystemfactory.sip
 + %Include kclipboard.sip
-+ %Include kconfigdialogmanager.sip
-+ %Include kconfigskeleton.sip
++ %Include tdeconfigdialogmanager.sip
++ %Include tdeconfigskeleton.sip
 + %Include tdeversion.sip
 + %Include kidna.sip
 + %Include klockfile.sip
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 27f0764..28b89d6 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -45,10 +45,10 @@
 %Include kcharsets.sip
 %Include kcmdlineargs.sip
 %Include kcompletion.sip
-%Include kconfig.sip
-%Include kconfigbackend.sip
-%Include kconfigbase.sip
-%Include kconfigdata.sip
+%Include tdeconfig.sip
+%Include tdeconfigbackend.sip
+%Include tdeconfigbase.sip
+%Include tdeconfigdata.sip
 %Include kcrash.sip
 %Include kdcoppropertyproxy.sip
 %Include kdesktopfile.sip