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

17 files changed, 18 insertions, 18 deletions

diff --git a/sip/tdeui/kactionshortcutlist.sip b/sip/tdeui/kactionshortcutlist.sip
index 2d5a0d7..22a07a4 100644
--- a/sip/tdeui/kactionshortcutlist.sip
+++ b/sip/tdeui/kactionshortcutlist.sip
@@ -27,7 +27,7 @@
 class KActionShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kaction.h>
 #include <kactionshortcutlist.h>
@@ -65,7 +65,7 @@ protected:
 class KActionPtrShortcutList : KShortcutList
 {
 %TypeHeaderCode
-#include <kconfigbase.h>
+#include <tdeconfigbase.h>
 #include <kshortcut.h>
 #include <kaction.h>
 #include <kactionshortcutlist.h>
diff --git a/sip/tdeui/kconfigdialog.sip b/sip/tdeui/tdeconfigdialog.sip
index 30a7234..ea5d046 100644
--- a/sip/tdeui/kconfigdialog.sip
+++ b/sip/tdeui/tdeconfigdialog.sip
@@ -29,7 +29,7 @@
 class TDEConfigDialog : KDialogBase
 {
 %TypeHeaderCode
-#include <kconfigdialog.h>
+#include <tdeconfigdialog.h>
 %End
 
 
diff --git a/sip/tdeui/tdeui-kde320.diff b/sip/tdeui/tdeui-kde320.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde320.diff
+++ b/sip/tdeui/tdeui-kde320.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde321.diff b/sip/tdeui/tdeui-kde321.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde321.diff
+++ b/sip/tdeui/tdeui-kde321.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde322.diff b/sip/tdeui/tdeui-kde322.diff
index 2e22393..f1c0755 100644
--- a/sip/tdeui/tdeui-kde322.diff
+++ b/sip/tdeui/tdeui-kde322.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde323.diff b/sip/tdeui/tdeui-kde323.diff
index a5989d4..18841bb 100644
--- a/sip/tdeui/tdeui-kde323.diff
+++ b/sip/tdeui/tdeui-kde323.diff
@@ -1,6 +1,6 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde330.diff b/sip/tdeui/tdeui-kde330.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde330.diff
+++ b/sip/tdeui/tdeui-kde330.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde331.diff b/sip/tdeui/tdeui-kde331.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde331.diff
+++ b/sip/tdeui/tdeui-kde331.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde332.diff b/sip/tdeui/tdeui-kde332.diff
index dfe8ea4..0e78196 100644
--- a/sip/tdeui/tdeui-kde332.diff
+++ b/sip/tdeui/tdeui-kde332.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kinputdialog.sip
diff --git a/sip/tdeui/tdeui-kde340.diff b/sip/tdeui/tdeui-kde340.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde340.diff
+++ b/sip/tdeui/tdeui-kde340.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde341.diff b/sip/tdeui/tdeui-kde341.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde341.diff
+++ b/sip/tdeui/tdeui-kde341.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde342.diff b/sip/tdeui/tdeui-kde342.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde342.diff
+++ b/sip/tdeui/tdeui-kde342.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde343.diff b/sip/tdeui/tdeui-kde343.diff
index 57d6793..a59386a 100644
--- a/sip/tdeui/tdeui-kde343.diff
+++ b/sip/tdeui/tdeui-kde343.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde350.diff b/sip/tdeui/tdeui-kde350.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde350.diff
+++ b/sip/tdeui/tdeui-kde350.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde351.diff b/sip/tdeui/tdeui-kde351.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde351.diff
+++ b/sip/tdeui/tdeui-kde351.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde352.diff b/sip/tdeui/tdeui-kde352.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde352.diff
+++ b/sip/tdeui/tdeui-kde352.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip
diff --git a/sip/tdeui/tdeui-kde353.diff b/sip/tdeui/tdeui-kde353.diff
index 381467e..b78a05a 100644
--- a/sip/tdeui/tdeui-kde353.diff
+++ b/sip/tdeui/tdeui-kde353.diff
@@ -1,7 +1,7 @@
 + %Include kactionclasses.sip
 + %Include kactioncollection.sip
 + %Include kactionselector.sip
-+ %Include kconfigdialog.sip
++ %Include tdeconfigdialog.sip
 + %Include kdatetimewidget.sip
 + %Include kfontrequester.sip
 + %Include kiconviewsearchline.sip