Rename additional header files to avoid conflicts with KDE4

17 files changed, 29 insertions, 29 deletions

diff --git a/sip/kabc/resource.sip b/sip/kabc/resource.sip
index 1218fa0..f5ed27b 100644
--- a/sip/kabc/resource.sip
+++ b/sip/kabc/resource.sip
@@ -29,7 +29,7 @@ namespace KABC
 class Ticket
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
@@ -47,7 +47,7 @@ private:
 class Resource : KRES::Resource
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
@@ -99,7 +99,7 @@ protected:
 class Resource : KABC::Plugin
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
@@ -135,7 +135,7 @@ protected:
 class Resource
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
diff --git a/sip/kabc/resourceselectdialog.sip b/sip/kabc/resourceselectdialog.sip
index 56f8d73..d7c0a64 100644
--- a/sip/kabc/resourceselectdialog.sip
+++ b/sip/kabc/resourceselectdialog.sip
@@ -33,7 +33,7 @@ class ResourceSelectDialog
 %TypeHeaderCode
 #include <tqwidget.h>
 #include <resourceselectdialog.h>
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 %End
 
 
diff --git a/sip/kabc/stdaddressbook.sip b/sip/kabc/stdaddressbook.sip
index 4de04df..e2e9109 100644
--- a/sip/kabc/stdaddressbook.sip
+++ b/sip/kabc/stdaddressbook.sip
@@ -29,7 +29,7 @@ namespace KABC
 class StdAddressBook : KABC::AddressBook
 {
 %TypeHeaderCode
-#include <kabc/resource.h>
+#include <tdeabc/resource.h>
 #include <addressee.h>
 #include <addressbook.h>
 #include <stdaddressbook.h>
diff --git a/sip/tdecore/kglobal.sip b/sip/tdecore/kglobal.sip
index 645ca68..948bb9d 100644
--- a/sip/tdecore/kglobal.sip
+++ b/sip/tdecore/kglobal.sip
@@ -27,7 +27,7 @@
 class TDEGlobal
 {
 %TypeHeaderCode
-#include <kglobal.h>
+#include <tdeglobal.h>
 %End
 
 
diff --git a/sip/tdecore/kglobalsettings.sip b/sip/tdecore/kglobalsettings.sip
index 8140043..7763820 100644
--- a/sip/tdecore/kglobalsettings.sip
+++ b/sip/tdecore/kglobalsettings.sip
@@ -27,7 +27,7 @@
 class TDEGlobalSettings
 {
 %TypeHeaderCode
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 %End
 
 
diff --git a/sip/tdecore/klocale.sip b/sip/tdecore/klocale.sip
index e1a17bc..ee5367b 100644
--- a/sip/tdecore/klocale.sip
+++ b/sip/tdecore/klocale.sip
@@ -27,7 +27,7 @@
 class TDELocale
 {
 %TypeHeaderCode
-#include <klocale.h>
+#include <tdelocale.h>
 %End
 
 
@@ -235,7 +235,7 @@ private:
 
 
 %ModuleCode
-#include <klocale.h>
+#include <tdelocale.h>
 %End
 
 TQString              i18n (const char*);
diff --git a/sip/tdecore/kstartupinfo.sip b/sip/tdecore/kstartupinfo.sip
index 53dfa03..95e6e16 100644
--- a/sip/tdecore/kstartupinfo.sip
+++ b/sip/tdecore/kstartupinfo.sip
@@ -27,7 +27,7 @@
 class TDEStartupInfo : TQObject
 {
 %TypeHeaderCode
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 %End
 
 
@@ -108,7 +108,7 @@ protected:
 class TDEStartupInfoId
 {
 %TypeHeaderCode
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 %End
 
 
@@ -145,7 +145,7 @@ private:
 class TDEStartupInfoData
 {
 %TypeHeaderCode
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 %End
 
 
diff --git a/sip/tdecore/ktempfile.sip b/sip/tdecore/ktempfile.sip
index 93aba49..3e5efc2 100644
--- a/sip/tdecore/ktempfile.sip
+++ b/sip/tdecore/ktempfile.sip
@@ -27,7 +27,7 @@
 class KTempFile
 {
 %TypeHeaderCode
-#include <ktempfile.h>
+#include <tdetempfile.h>
 %End
 
 
diff --git a/sip/tdecore/tdecoremod.sip.in b/sip/tdecore/tdecoremod.sip.in
index 796dbc9..01f1fde 100644
--- a/sip/tdecore/tdecoremod.sip.in
+++ b/sip/tdecore/tdecoremod.sip.in
@@ -52,9 +52,9 @@
 %Include kcrash.sip
 %Include kdcoppropertyproxy.sip
 %Include kdesktopfile.sip
-%Include kglobal.sip
+%Include tdeglobal.sip
 %Include kglobalaccel.sip
-%Include kglobalsettings.sip
+%Include tdeglobalsettings.sip
 %Include kiconeffect.sip
 %Include kiconloader.sip
 %Include kicontheme.sip
@@ -63,7 +63,7 @@
 %Include kkeynative.sip
 %Include kkeyserver_x11.sip
 %Include klibloader.sip
-%Include klocale.sip
+%Include tdelocale.sip
 %Include kmdcodec.sip
 %Include kmimesourcefactory.sip
 %Include tdemultipledrag.sip
@@ -83,13 +83,13 @@
 %Include tdeshortcutlist.sip
 %Include ksimpleconfig.sip
 %Include ksock.sip
-%Include kstartupinfo.sip
+%Include tdestartupinfo.sip
 %Include kstaticdeleter.sip
 %Include tdestdaccel.sip
 %Include kstddirs.sip
 %Include kstringhandler.sip
 %Include ktempdir.sip
-%Include ktempfile.sip
+%Include tdetempfile.sip
 %Include kuniqueapplication.sip
 %Include kurl.sip
 %Include twin.sip
diff --git a/sip/tdefile/kdiroperator.sip b/sip/tdefile/kdiroperator.sip
index 225a53d..88dde85 100644
--- a/sip/tdefile/kdiroperator.sip
+++ b/sip/tdefile/kdiroperator.sip
@@ -27,7 +27,7 @@
 class KDirOperator : TQWidget
 {
 %TypeHeaderCode
-#include <kdiroperator.h>
+#include <tdediroperator.h>
 %End
 
 
diff --git a/sip/tdefile/tdefilemod.sip.in b/sip/tdefile/tdefilemod.sip.in
index 158dfbf..a07b0f3 100644
--- a/sip/tdefile/tdefilemod.sip.in
+++ b/sip/tdefile/tdefilemod.sip.in
@@ -37,7 +37,7 @@
 %Import tdeiomod.sip
 
 %Include kcombiview.sip
-%Include kdiroperator.sip
+%Include tdediroperator.sip
 %Include kdirselectdialog.sip
 %Include kdirsize.sip
 %Include tdefile.sip
diff --git a/sip/tdeio/kemailsettings.sip b/sip/tdeio/kemailsettings.sip
index 20635b6..f63c99b 100644
--- a/sip/tdeio/kemailsettings.sip
+++ b/sip/tdeio/kemailsettings.sip
@@ -27,7 +27,7 @@
 class KEMailSettings
 {
 %TypeHeaderCode
-#include <kemailsettings.h>
+#include <tdeemailsettings.h>
 %End
 
 
diff --git a/sip/tdeio/kprotocolmanager.sip b/sip/tdeio/kprotocolmanager.sip
index e1afd9b..0170aa0 100644
--- a/sip/tdeio/kprotocolmanager.sip
+++ b/sip/tdeio/kprotocolmanager.sip
@@ -27,7 +27,7 @@
 class KProtocolManager
 {
 %TypeHeaderCode
-#include <kprotocolmanager.h>
+#include <tdeprotocolmanager.h>
 %End
 
 
diff --git a/sip/tdeio/tdeiomod.sip.in b/sip/tdeio/tdeiomod.sip.in
index 800c0b7..17d91ff 100644
--- a/sip/tdeio/tdeiomod.sip.in
+++ b/sip/tdeio/tdeiomod.sip.in
@@ -48,7 +48,7 @@
 %Include kdirlister.sip
 %Include kdirnotify.sip
 %Include kdirwatch.sip
-%Include kemailsettings.sip
+%Include tdeemailsettings.sip
 %Include tdefilefilter.sip
 %Include tdefileitem.sip
 %Include tdefilemetainfo.sip
@@ -58,7 +58,7 @@
 %Include kmimemagic.sip
 %Include kmimetype.sip
 %Include kprotocolinfo.sip
-%Include kprotocolmanager.sip
+%Include tdeprotocolmanager.sip
 %Include krun.sip
 %Include kscan.sip
 %Include kservice.sip
diff --git a/sip/tdeui/kmenubar.sip b/sip/tdeui/kmenubar.sip
index 0ff0b58..8027757 100644
--- a/sip/tdeui/kmenubar.sip
+++ b/sip/tdeui/kmenubar.sip
@@ -27,7 +27,7 @@
 class KMenuBar : TQMenuBar
 {
 %TypeHeaderCode
-#include <kmenubar.h>
+#include <tdemenubar.h>
 %End
 
 
diff --git a/sip/tdeui/kmessagebox.sip b/sip/tdeui/kmessagebox.sip
index 68a1bcd..b5a75fc 100644
--- a/sip/tdeui/kmessagebox.sip
+++ b/sip/tdeui/kmessagebox.sip
@@ -27,7 +27,7 @@
 class KMessageBox
 {
 %TypeHeaderCode
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 %End
 
 
diff --git a/sip/tdeui/tdeuimod.sip.in b/sip/tdeui/tdeuimod.sip.in
index a8d915d..1985230 100644
--- a/sip/tdeui/tdeuimod.sip.in
+++ b/sip/tdeui/tdeuimod.sip.in
@@ -82,8 +82,8 @@
 %Include tdelistview.sip
 %Include tdemainwindow.sip
 %Include tdemainwindowiface.sip
-%Include kmenubar.sip
-%Include kmessagebox.sip
+%Include tdemenubar.sip
+%Include tdemessagebox.sip
 %Include knuminput.sip
 %Include knumvalidator.sip
 %Include kpanelapplet.sip