Rename additional header files to avoid conflicts with KDE4

14 files changed, 18 insertions, 18 deletions

diff --git a/src/common/common/number.cpp b/src/common/common/number.cpp
index 39a9c73..0766ba5 100644
--- a/src/common/common/number.cpp
+++ b/src/common/common/number.cpp
@@ -11,7 +11,7 @@
 #include "common/global/global.h"
 #include "misc.h"
 #if !defined(NO_KDE)
-#  include <kglobal.h>
+#  include <tdeglobal.h>
 #endif
 
 //-----------------------------------------------------------------------------
diff --git a/src/common/global/global.h b/src/common/global/global.h
index 8dee015..10dfb0c 100644
--- a/src/common/global/global.h
+++ b/src/common/global/global.h
@@ -25,16 +25,16 @@
 #if defined(NO_KDE)
 #  include "tqt_config.h"
 #  include "common/nokde/nokde_kurl.h"
-#  include "common/nokde/nokde_klocale.h"
+#  include "common/nokde/nokde_tdelocale.h"
 #  include "common/nokde/nokde_tdeaboutdata.h"
 #  include "common/nokde/nokde_tdecmdlineargs.h"
 #else
 #  include "config.h"
 #  include <tdeapplication.h>
-#  include <klocale.h>
+#  include <tdelocale.h>
 #  include <tdeaboutdata.h>
 #  include <tdecmdlineargs.h>
-#  include <ktempfile.h>
+#  include <tdetempfile.h>
 #  include <tdeconfigbackend.h>
 #endif
 
diff --git a/src/common/global/xml_data_file.cpp b/src/common/global/xml_data_file.cpp
index bae7f17..5fa4bff 100644
--- a/src/common/global/xml_data_file.cpp
+++ b/src/common/global/xml_data_file.cpp
@@ -11,7 +11,7 @@
 #include <tqfile.h>
 #include <tqstringlist.h>
 #include <ksimpleconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include "common/global/pfile.h"
 
 XmlDataFile::XmlDataFile(const PURL::Url &url, const TQString &name)
diff --git a/src/common/gui/editlistbox.cpp b/src/common/gui/editlistbox.cpp
index 126f996..3dcfe70 100644
--- a/src/common/gui/editlistbox.cpp
+++ b/src/common/gui/editlistbox.cpp
@@ -24,7 +24,7 @@
 #include <tqheader.h>
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <knotifyclient.h>
 #include <kiconloader.h>
diff --git a/src/common/gui/misc_gui.cpp b/src/common/gui/misc_gui.cpp
index 9808492..5c7edf0 100644
--- a/src/common/gui/misc_gui.cpp
+++ b/src/common/gui/misc_gui.cpp
@@ -21,7 +21,7 @@
 
 #include <kcursor.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <ktabbar.h>
 
diff --git a/src/common/gui/misc_gui.h b/src/common/gui/misc_gui.h
index 8befca1..5df7382 100644
--- a/src/common/gui/misc_gui.h
+++ b/src/common/gui/misc_gui.h
@@ -16,7 +16,7 @@
 #include <tqcombobox.h>
 #include <tqwidgetstack.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 #include <ktabwidget.h>
 #include <ktabbar.h>
diff --git a/src/common/gui/pfile_ext.cpp b/src/common/gui/pfile_ext.cpp
index b210643..1ace10f 100644
--- a/src/common/gui/pfile_ext.cpp
+++ b/src/common/gui/pfile_ext.cpp
@@ -10,7 +10,7 @@
 
 #include <tqfile.h>
 #include <tdeio/netaccess.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include "common/gui/misc_gui.h"
 
 //-----------------------------------------------------------------------------
diff --git a/src/common/gui/purl_ext.cpp b/src/common/gui/purl_ext.cpp
index 82348b5..11d7ecb 100644
--- a/src/common/gui/purl_ext.cpp
+++ b/src/common/gui/purl_ext.cpp
@@ -12,7 +12,7 @@
 #include <tqapplication.h>
 #include <tdeio/netaccess.h>
 #include <tdefileitem.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeconfigbackend.h>
 
 #include "common/global/pfile.h"
diff --git a/src/common/gui/purl_gui.h b/src/common/gui/purl_gui.h
index c487d86..d7dd012 100644
--- a/src/common/gui/purl_gui.h
+++ b/src/common/gui/purl_gui.h
@@ -11,7 +11,7 @@
 
 #include <tqvgroupbox.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 
 #include "common/global/purl.h"
diff --git a/src/common/nokde/nokde.pro b/src/common/nokde/nokde.pro
index ab37fbd..14dac2f 100644
--- a/src/common/nokde/nokde.pro
+++ b/src/common/nokde/nokde.pro
@@ -2,7 +2,7 @@ STOPDIR = ../../..
 include($${STOPDIR}/lib.pro)
 
 TARGET   = nokde
-HEADERS += nokde_klocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h
-SOURCES += nokde_klocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp
+HEADERS += nokde_tdelocale.h nokde_tdeaboutdata.h nokde_tdecmdlineargs.h nokde_kprocess.h
+SOURCES += nokde_tdelocale.cpp nokde_tdeaboutdata.cpp nokde_tdecmdlineargs.cpp nokde_kprocess.cpp
 win32:HEADERS += win32_utils.h
 win32:SOURCES += win32_utils.c
\ No newline at end of file
diff --git a/src/common/nokde/nokde_klocale.cpp b/src/common/nokde/nokde_klocale.cpp
index aa6cb26..327851b 100644
--- a/src/common/nokde/nokde_klocale.cpp
+++ b/src/common/nokde/nokde_klocale.cpp
@@ -1,4 +1,4 @@
-#include "nokde_klocale.h"
+#include "nokde_tdelocale.h"
 
 TQString i18n(const TQString &, const TQString &text) { return text; }
 TQString locate(const TQString &, const TQString &) { return TQString(); }
diff --git a/src/common/nokde/nokde_tdeaboutdata.h b/src/common/nokde/nokde_tdeaboutdata.h
index 93a7768..7c49444 100644
--- a/src/common/nokde/nokde_tdeaboutdata.h
+++ b/src/common/nokde/nokde_tdeaboutdata.h
@@ -32,7 +32,7 @@
 #include <tqstring.h>
 //#include <tqimage.h>
 
-#include "nokde_klocale.h"
+#include "nokde_tdelocale.h"
 
 #ifndef _KABOUTDATA_H_
 #define _KABOUTDATA_H_
diff --git a/src/common/nokde/nokde_tdecmdlineargs.cpp b/src/common/nokde/nokde_tdecmdlineargs.cpp
index 4480077..613a118 100644
--- a/src/common/nokde/nokde_tdecmdlineargs.cpp
+++ b/src/common/nokde/nokde_tdecmdlineargs.cpp
@@ -54,9 +54,9 @@
 
 #include "nokde_tdecmdlineargs.h"
 #include "nokde_tdeaboutdata.h"
-#include "nokde_klocale.h"
+#include "nokde_tdelocale.h"
 //#include <tdeapplication.h>
-//#include <kglobal.h>
+//#include <tdeglobal.h>
 //#include <kstringhandler.h>
 //#include <kstaticdeleter.h>
 
diff --git a/src/common/nokde/nokde_tdecmdlineargs.h b/src/common/nokde/nokde_tdecmdlineargs.h
index 58931a6..fde841d 100644
--- a/src/common/nokde/nokde_tdecmdlineargs.h
+++ b/src/common/nokde/nokde_tdecmdlineargs.h
@@ -21,7 +21,7 @@
 #ifndef _KCMDLINEARGS_H_
 #define _KCMDLINEARGS_H_
 
-#include "nokde_klocale.h"
+#include "nokde_tdelocale.h"
 #include "nokde_kurl.h"
 
 #  if [[[TQT_VERSION IS DEPRECATED]]]<0x040000