Rename additional header files to avoid conflicts with KDE4

6 files changed, 13 insertions, 13 deletions

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