Rename additional header files to avoid conflicts with KDE4

40 files changed, 52 insertions, 52 deletions

diff --git a/kitchensync/src/aboutpage.cpp b/kitchensync/src/aboutpage.cpp
index 726ffb14..f7dab2ac 100644
--- a/kitchensync/src/aboutpage.cpp
+++ b/kitchensync/src/aboutpage.cpp
@@ -27,7 +27,7 @@
 #include <tdehtml_part.h>
 #include <tdehtmlview.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <krun.h>
 #include <kstandarddirs.h>
 
diff --git a/kitchensync/src/addresseediffalgo.cpp b/kitchensync/src/addresseediffalgo.cpp
index 2ecbe02c..f91873bb 100644
--- a/kitchensync/src/addresseediffalgo.cpp
+++ b/kitchensync/src/addresseediffalgo.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 
 #include "addresseediffalgo.h"
 
diff --git a/kitchensync/src/addresseediffalgo.h b/kitchensync/src/addresseediffalgo.h
index 575a96e2..30154d1b 100644
--- a/kitchensync/src/addresseediffalgo.h
+++ b/kitchensync/src/addresseediffalgo.h
@@ -22,7 +22,7 @@
 #ifndef KSYNC_ADDRESSEEDIFFALGO_H
 #define KSYNC_ADDRESSEEDIFFALGO_H
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 #include <libtdepim/diffalgo.h>
 
 using namespace KPIM;
diff --git a/kitchensync/src/calendardiffalgo.cpp b/kitchensync/src/calendardiffalgo.cpp
index 7d3549e5..8d925322 100644
--- a/kitchensync/src/calendardiffalgo.cpp
+++ b/kitchensync/src/calendardiffalgo.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <libkcal/kcalversion.h>
 
diff --git a/kitchensync/src/configgui.cpp b/kitchensync/src/configgui.cpp
index 553b2f5e..6a41032e 100644
--- a/kitchensync/src/configgui.cpp
+++ b/kitchensync/src/configgui.cpp
@@ -42,7 +42,7 @@
 #include "memberinfo.h"
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 
 #include <tqlayout.h>
diff --git a/kitchensync/src/configguiblank.cpp b/kitchensync/src/configguiblank.cpp
index 3e9d47b6..b16c1f83 100644
--- a/kitchensync/src/configguiblank.cpp
+++ b/kitchensync/src/configguiblank.cpp
@@ -21,7 +21,7 @@
 
 #include "configguiblank.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kitchensync/src/configguievo2.cpp b/kitchensync/src/configguievo2.cpp
index 4d5c2edc..fb7116cb 100644
--- a/kitchensync/src/configguievo2.cpp
+++ b/kitchensync/src/configguievo2.cpp
@@ -30,7 +30,7 @@
 #include <kurl.h>
 #include <tdefile.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigGuiEvo2::ConfigGuiEvo2( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
diff --git a/kitchensync/src/configguifile.cpp b/kitchensync/src/configguifile.cpp
index 6a8b0402..22767ab8 100644
--- a/kitchensync/src/configguifile.cpp
+++ b/kitchensync/src/configguifile.cpp
@@ -22,7 +22,7 @@
 #include "configguifile.h"
 
 #include <kurlrequester.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 
 #include <tqlayout.h>
diff --git a/kitchensync/src/configguigcalendar.cpp b/kitchensync/src/configguigcalendar.cpp
index 8e800676..8fb4fd0e 100644
--- a/kitchensync/src/configguigcalendar.cpp
+++ b/kitchensync/src/configguigcalendar.cpp
@@ -22,7 +22,7 @@
 
 #include "configguigcalendar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 #include <tqlabel.h>
diff --git a/kitchensync/src/configguignokii.cpp b/kitchensync/src/configguignokii.cpp
index 38f2fbf3..cd392cb6 100644
--- a/kitchensync/src/configguignokii.cpp
+++ b/kitchensync/src/configguignokii.cpp
@@ -21,7 +21,7 @@
 
 #include "configguignokii.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kcombobox.h>
 
diff --git a/kitchensync/src/configguigpe.cpp b/kitchensync/src/configguigpe.cpp
index 1a5cdb14..4dce7d9b 100644
--- a/kitchensync/src/configguigpe.cpp
+++ b/kitchensync/src/configguigpe.cpp
@@ -30,7 +30,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigGuiGpe::ConfigGuiGpe( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
diff --git a/kitchensync/src/configguiirmc.cpp b/kitchensync/src/configguiirmc.cpp
index 721c82d7..331f9daa 100644
--- a/kitchensync/src/configguiirmc.cpp
+++ b/kitchensync/src/configguiirmc.cpp
@@ -21,12 +21,12 @@
 
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <kdebug.h>
 
diff --git a/kitchensync/src/configguijescs.cpp b/kitchensync/src/configguijescs.cpp
index 2b37ad42..c4167bb3 100644
--- a/kitchensync/src/configguijescs.cpp
+++ b/kitchensync/src/configguijescs.cpp
@@ -28,7 +28,7 @@
 
 #include <klineedit.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigGuiJescs::ConfigGuiJescs( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
diff --git a/kitchensync/src/configguildap.cpp b/kitchensync/src/configguildap.cpp
index 3ef451c3..f54bb8cf 100644
--- a/kitchensync/src/configguildap.cpp
+++ b/kitchensync/src/configguildap.cpp
@@ -30,7 +30,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigGuiLdap::ConfigGuiLdap( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index eea22f02..a5a76b78 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -23,7 +23,7 @@
 #define CONFIGGUILDAP_H
 
 #include "configgui.h"
-#include "kabc/ldapconfigwidget.h"
+#include "tdeabc/ldapconfigwidget.h"
 
 class TQCheckBox;
 class TQLabel;
diff --git a/kitchensync/src/configguimoto.cpp b/kitchensync/src/configguimoto.cpp
index a310692f..bcb9bd59 100644
--- a/kitchensync/src/configguimoto.cpp
+++ b/kitchensync/src/configguimoto.cpp
@@ -27,7 +27,7 @@
 
 #include <klineedit.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigGuiMoto::ConfigGuiMoto( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
diff --git a/kitchensync/src/configguiopie.cpp b/kitchensync/src/configguiopie.cpp
index 39a7ea77..33bf9e08 100644
--- a/kitchensync/src/configguiopie.cpp
+++ b/kitchensync/src/configguiopie.cpp
@@ -21,7 +21,7 @@
 
 #include "configguiopie.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqcombobox.h>
 #include <tqdom.h>
diff --git a/kitchensync/src/configguipalm.cpp b/kitchensync/src/configguipalm.cpp
index 03d87cdb..ee85ba29 100644
--- a/kitchensync/src/configguipalm.cpp
+++ b/kitchensync/src/configguipalm.cpp
@@ -22,7 +22,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqbuttongroup.h>
 #include <tqcheckbox.h>
diff --git a/kitchensync/src/configguisunbird.cpp b/kitchensync/src/configguisunbird.cpp
index 6a3b9aa6..7623e413 100644
--- a/kitchensync/src/configguisunbird.cpp
+++ b/kitchensync/src/configguisunbird.cpp
@@ -37,7 +37,7 @@
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefile.h>
 
 ConfigGuiSunbird::ConfigGuiSunbird( const QSync::Member &member, TQWidget *parent )
diff --git a/kitchensync/src/configguisynce.cpp b/kitchensync/src/configguisynce.cpp
index 6e521bee..8a09c385 100644
--- a/kitchensync/src/configguisynce.cpp
+++ b/kitchensync/src/configguisynce.cpp
@@ -28,7 +28,7 @@
 
 #include <klineedit.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 ConfigGuiSynce::ConfigGuiSynce( const QSync::Member &member, TQWidget *parent )
   : ConfigGui( member, parent )
diff --git a/kitchensync/src/configguisyncmlhttp.cpp b/kitchensync/src/configguisyncmlhttp.cpp
index 26a8c224..6f91d2fa 100644
--- a/kitchensync/src/configguisyncmlhttp.cpp
+++ b/kitchensync/src/configguisyncmlhttp.cpp
@@ -24,7 +24,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <tqcheckbox.h>
diff --git a/kitchensync/src/configguisyncmlobex.cpp b/kitchensync/src/configguisyncmlobex.cpp
index 372cf926..4074787a 100644
--- a/kitchensync/src/configguisyncmlobex.cpp
+++ b/kitchensync/src/configguisyncmlobex.cpp
@@ -25,7 +25,7 @@
 #include <kcombobox.h>
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurlrequester.h>
 
 #include <tqlayout.h>
diff --git a/kitchensync/src/connectionwidgets.cpp b/kitchensync/src/connectionwidgets.cpp
index ac5277fb..37844be3 100644
--- a/kitchensync/src/connectionwidgets.cpp
+++ b/kitchensync/src/connectionwidgets.cpp
@@ -21,12 +21,12 @@
 
 #include <kcombobox.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqapplication.h>
 #include <tqeventloop.h>
diff --git a/kitchensync/src/genericdiffalgo.cpp b/kitchensync/src/genericdiffalgo.cpp
index 21b83f45..5255c096 100644
--- a/kitchensync/src/genericdiffalgo.cpp
+++ b/kitchensync/src/genericdiffalgo.cpp
@@ -21,7 +21,7 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "genericdiffalgo.h"
 
diff --git a/kitchensync/src/groupconfig.cpp b/kitchensync/src/groupconfig.cpp
index 3be36964..9f961ddc 100644
--- a/kitchensync/src/groupconfig.cpp
+++ b/kitchensync/src/groupconfig.cpp
@@ -33,8 +33,8 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kjanuswidget.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 #include <tqlabel.h>
diff --git a/kitchensync/src/groupconfigcommon.cpp b/kitchensync/src/groupconfigcommon.cpp
index b418af56..a3f89844 100644
--- a/kitchensync/src/groupconfigcommon.cpp
+++ b/kitchensync/src/groupconfigcommon.cpp
@@ -22,7 +22,7 @@
 
 #include <kdialog.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include <tqlabel.h>
diff --git a/kitchensync/src/groupconfigdialog.cpp b/kitchensync/src/groupconfigdialog.cpp
index 4d8be65d..522e54b1 100644
--- a/kitchensync/src/groupconfigdialog.cpp
+++ b/kitchensync/src/groupconfigdialog.cpp
@@ -22,7 +22,7 @@
 
 #include "groupconfig.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlayout.h>
 
diff --git a/kitchensync/src/groupitem.cpp b/kitchensync/src/groupitem.cpp
index 09f6e345..d87ac37e 100644
--- a/kitchensync/src/groupitem.cpp
+++ b/kitchensync/src/groupitem.cpp
@@ -20,10 +20,10 @@
 
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpassivepopup.h>
 #include <kurllabel.h>
 
diff --git a/kitchensync/src/htmldiffalgodisplay.cpp b/kitchensync/src/htmldiffalgodisplay.cpp
index e6f23afd..d91b7590 100644
--- a/kitchensync/src/htmldiffalgodisplay.cpp
+++ b/kitchensync/src/htmldiffalgodisplay.cpp
@@ -19,7 +19,7 @@
     Boston, MA 02110-1301, USA.
 */
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "htmldiffalgodisplay.h"
 
diff --git a/kitchensync/src/kwidgetlist.cpp b/kitchensync/src/kwidgetlist.cpp
index 0990e479..f26f8d68 100644
--- a/kitchensync/src/kwidgetlist.cpp
+++ b/kitchensync/src/kwidgetlist.cpp
@@ -21,7 +21,7 @@
 
 #include <tqvbox.h>
 
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "kwidgetlist.h"
 
diff --git a/kitchensync/src/mainwidget.cpp b/kitchensync/src/mainwidget.cpp
index 2b71f907..7a665608 100644
--- a/kitchensync/src/mainwidget.cpp
+++ b/kitchensync/src/mainwidget.cpp
@@ -33,8 +33,8 @@
 #include <kdebug.h>
 #include <kinputdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstdaction.h>
 #include <kxmlguiclient.h>
 
diff --git a/kitchensync/src/mainwindow.cpp b/kitchensync/src/mainwindow.cpp
index 5df9fe21..a267956d 100644
--- a/kitchensync/src/mainwindow.cpp
+++ b/kitchensync/src/mainwindow.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstdaction.h>
 #include <tdetoolbar.h>
 
diff --git a/kitchensync/src/memberconfig.cpp b/kitchensync/src/memberconfig.cpp
index 37755a50..93e5f1ff 100644
--- a/kitchensync/src/memberconfig.cpp
+++ b/kitchensync/src/memberconfig.cpp
@@ -23,8 +23,8 @@
 #include "configgui.h"
 #include "memberinfo.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kitchensync/src/memberinfo.cpp b/kitchensync/src/memberinfo.cpp
index 39bb0098..87a17ec1 100644
--- a/kitchensync/src/memberinfo.cpp
+++ b/kitchensync/src/memberinfo.cpp
@@ -21,9 +21,9 @@
 
 #include "memberinfo.h"
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 MemberInfo::MemberInfo( const QSync::Member &member )
   : mMember( member )
diff --git a/kitchensync/src/multiconflictdialog.cpp b/kitchensync/src/multiconflictdialog.cpp
index 7d7805c4..608d33a8 100644
--- a/kitchensync/src/multiconflictdialog.cpp
+++ b/kitchensync/src/multiconflictdialog.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kwidgetlist.h>
 
 #include <tqlabel.h>
diff --git a/kitchensync/src/part.cpp b/kitchensync/src/part.cpp
index 027b3bcf..c52b28ae 100644
--- a/kitchensync/src/part.cpp
+++ b/kitchensync/src/part.cpp
@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <kinstance.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/genericfactory.h>
 
 #include "mainwidget.h"
diff --git a/kitchensync/src/pluginpicker.cpp b/kitchensync/src/pluginpicker.cpp
index a88689d3..0b869248 100644
--- a/kitchensync/src/pluginpicker.cpp
+++ b/kitchensync/src/pluginpicker.cpp
@@ -27,9 +27,9 @@
 #include <libqopensync/environment.h>
 
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kitchensync/src/singleconflictdialog.cpp b/kitchensync/src/singleconflictdialog.cpp
index 8975b6f9..bac94835 100644
--- a/kitchensync/src/singleconflictdialog.cpp
+++ b/kitchensync/src/singleconflictdialog.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqlayout.h>
diff --git a/kitchensync/src/syncprocess.cpp b/kitchensync/src/syncprocess.cpp
index 60310b80..4e9c46b6 100644
--- a/kitchensync/src/syncprocess.cpp
+++ b/kitchensync/src/syncprocess.cpp
@@ -22,7 +22,7 @@
 #include <libqopensync/environment.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "syncprocess.h"
 #include "syncprocessmanager.h"
diff --git a/kitchensync/src/syncprocessmanager.cpp b/kitchensync/src/syncprocessmanager.cpp
index 95c49748..0485e156 100644
--- a/kitchensync/src/syncprocessmanager.cpp
+++ b/kitchensync/src/syncprocessmanager.cpp
@@ -26,8 +26,8 @@
 #include <libqopensync/environment.h>
 
 #include <kstaticdeleter.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 
 static KStaticDeleter<SyncProcessManager> selfDeleter;