From cfb328d59024a251690b6e47c9f8d343fd8c241c Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Fri, 15 Feb 2013 21:59:38 -0600
Subject: Rename additional header files to avoid conflicts with KDE4

---
 kontact/interfaces/core.cpp                          | 2 +-
 kontact/interfaces/plugin.cpp                        | 2 +-
 kontact/interfaces/uniqueapphandler.cpp              | 4 ++--
 kontact/plugins/akregator/akregator_plugin.cpp       | 2 +-
 kontact/plugins/akregator/akregator_plugin.h         | 2 +-
 kontact/plugins/kaddressbook/kaddressbook_plugin.cpp | 6 +++---
 kontact/plugins/kaddressbook/kaddressbook_plugin.h   | 2 +-
 kontact/plugins/karm/karm_plugin.h                   | 2 +-
 kontact/plugins/kitchensync/kitchensync_plugin.cpp   | 2 +-
 kontact/plugins/kitchensync/kitchensync_plugin.h     | 2 +-
 kontact/plugins/kmail/kcmkmailsummary.cpp            | 2 +-
 kontact/plugins/kmail/kmail_plugin.cpp               | 4 ++--
 kontact/plugins/kmail/kmail_plugin.h                 | 2 +-
 kontact/plugins/kmail/summarywidget.cpp              | 4 ++--
 kontact/plugins/knode/knode_plugin.h                 | 2 +-
 kontact/plugins/knotes/knotes_part.cpp               | 2 +-
 kontact/plugins/knotes/knotes_part.h                 | 2 +-
 kontact/plugins/knotes/knotes_part_p.h               | 4 ++--
 kontact/plugins/knotes/knotes_plugin.h               | 2 +-
 kontact/plugins/knotes/knotetip.cpp                  | 2 +-
 kontact/plugins/knotes/summarywidget.cpp             | 4 ++--
 kontact/plugins/korganizer/journalplugin.cpp         | 2 +-
 kontact/plugins/korganizer/journalplugin.h           | 2 +-
 kontact/plugins/korganizer/kcmkorgsummary.cpp        | 2 +-
 kontact/plugins/korganizer/korg_uniqueapp.cpp        | 2 +-
 kontact/plugins/korganizer/korganizerplugin.cpp      | 6 +++---
 kontact/plugins/korganizer/korganizerplugin.h        | 2 +-
 kontact/plugins/korganizer/summarywidget.cpp         | 4 ++--
 kontact/plugins/korganizer/todoplugin.cpp            | 6 +++---
 kontact/plugins/korganizer/todoplugin.h              | 2 +-
 kontact/plugins/korganizer/todosummarywidget.cpp     | 4 ++--
 kontact/plugins/kpilot/summarywidget.cpp             | 8 ++++----
 kontact/plugins/newsticker/kcmkontactknt.cpp         | 2 +-
 kontact/plugins/newsticker/newsticker_plugin.cpp     | 2 +-
 kontact/plugins/newsticker/summarywidget.cpp         | 4 ++--
 kontact/plugins/specialdates/kcmsdsummary.cpp        | 2 +-
 kontact/plugins/specialdates/sdsummarywidget.cpp     | 6 +++---
 kontact/plugins/specialdates/specialdates_plugin.cpp | 2 +-
 kontact/plugins/summary/kcmkontactsummary.cpp        | 2 +-
 kontact/plugins/summary/summaryview_part.cpp         | 8 ++++----
 kontact/plugins/summary/summaryview_plugin.h         | 2 +-
 kontact/plugins/test/test_part.cpp                   | 4 ++--
 kontact/plugins/test/test_plugin.cpp                 | 2 +-
 kontact/plugins/weather/summarywidget.cpp            | 6 +++---
 kontact/src/aboutdialog.cpp                          | 2 +-
 kontact/src/iconsidepane.cpp                         | 2 +-
 kontact/src/kcmkontact.cpp                           | 2 +-
 kontact/src/main.cpp                                 | 4 ++--
 kontact/src/mainwindow.cpp                           | 6 +++---
 kontact/src/profiledialog.cpp                        | 4 ++--
 kontact/src/profilemanager.cpp                       | 2 +-
 51 files changed, 80 insertions(+), 80 deletions(-)

(limited to 'kontact')

diff --git a/kontact/interfaces/core.cpp b/kontact/interfaces/core.cpp
index 772ecc814..edaf86da4 100644
--- a/kontact/interfaces/core.cpp
+++ b/kontact/interfaces/core.cpp
@@ -27,7 +27,7 @@
 #include <tdeparts/componentfactory.h>
 #include <kdebug.h>
 #include <tqtimer.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 using namespace Kontact;
 
diff --git a/kontact/interfaces/plugin.cpp b/kontact/interfaces/plugin.cpp
index a14a50db9..ed81dcb65 100644
--- a/kontact/interfaces/plugin.cpp
+++ b/kontact/interfaces/plugin.cpp
@@ -24,7 +24,7 @@
 
 #include <dcopclient.h>
 #include <tdeaboutdata.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <tdeparts/componentfactory.h>
 #include <kdebug.h>
 #include <kinstance.h>
diff --git a/kontact/interfaces/uniqueapphandler.cpp b/kontact/interfaces/uniqueapphandler.cpp
index 11b7bc5f1..98a5d45b0 100644
--- a/kontact/interfaces/uniqueapphandler.cpp
+++ b/kontact/interfaces/uniqueapphandler.cpp
@@ -20,14 +20,14 @@
 */
 
 #include "uniqueapphandler.h"
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include "core.h"
 #include <twin.h>
 #include <dcopclient.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kuniqueapplication.h>
 
 /*
diff --git a/kontact/plugins/akregator/akregator_plugin.cpp b/kontact/plugins/akregator/akregator_plugin.cpp
index bf59486c2..01997690c 100644
--- a/kontact/plugins/akregator/akregator_plugin.cpp
+++ b/kontact/plugins/akregator/akregator_plugin.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 
 #include <core.h>
diff --git a/kontact/plugins/akregator/akregator_plugin.h b/kontact/plugins/akregator/akregator_plugin.h
index 82ae6ea18..479ca8967 100644
--- a/kontact/plugins/akregator/akregator_plugin.h
+++ b/kontact/plugins/akregator/akregator_plugin.h
@@ -25,7 +25,7 @@
 #ifndef AKREGATOR_PLUGIN_H
 #define AKREGATOR_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <tdeparts/part.h>
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
index 86a75ed06..cb20a3ca7 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.cpp
@@ -30,12 +30,12 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 
 #include <kaddrbook.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <dcopclient.h>
 #include "kmailIface_stub.h"
diff --git a/kontact/plugins/kaddressbook/kaddressbook_plugin.h b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
index f9a7fff3b..b3a8fee86 100644
--- a/kontact/plugins/kaddressbook/kaddressbook_plugin.h
+++ b/kontact/plugins/kaddressbook/kaddressbook_plugin.h
@@ -25,7 +25,7 @@
 #ifndef KADDRESSBOOK_PLUGIN_H
 #define KADDRESSBOOK_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "kaddressbookiface_stub.h"
diff --git a/kontact/plugins/karm/karm_plugin.h b/kontact/plugins/karm/karm_plugin.h
index 1b4c80bd4..e65f8ff90 100644
--- a/kontact/plugins/karm/karm_plugin.h
+++ b/kontact/plugins/karm/karm_plugin.h
@@ -26,7 +26,7 @@
 #ifndef KARM_PLUGIN_H
 #define KARM_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include "karmdcopiface_stub.h"
 
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.cpp b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
index 1240687a2..48e33627b 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.cpp
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.cpp
@@ -30,7 +30,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 
 #include "core.h"
diff --git a/kontact/plugins/kitchensync/kitchensync_plugin.h b/kontact/plugins/kitchensync/kitchensync_plugin.h
index e14ee9a0e..5e9610365 100644
--- a/kontact/plugins/kitchensync/kitchensync_plugin.h
+++ b/kontact/plugins/kitchensync/kitchensync_plugin.h
@@ -25,7 +25,7 @@
 #ifndef KITCHENSYNC_PLUGIN_H
 #define KITCHENSYNC_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "plugin.h"
diff --git a/kontact/plugins/kmail/kcmkmailsummary.cpp b/kontact/plugins/kmail/kcmkmailsummary.cpp
index 3a4500172..497e27803 100644
--- a/kontact/plugins/kmail/kcmkmailsummary.cpp
+++ b/kontact/plugins/kmail/kcmkmailsummary.cpp
@@ -33,7 +33,7 @@
 #include <kdebug.h>
 #include <kdialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcmkmailsummary.h"
 
diff --git a/kontact/plugins/kmail/kmail_plugin.cpp b/kontact/plugins/kmail/kmail_plugin.cpp
index 90d7b6ddd..1fa5fc9fc 100644
--- a/kontact/plugins/kmail/kmail_plugin.cpp
+++ b/kontact/plugins/kmail/kmail_plugin.cpp
@@ -31,9 +31,9 @@
 #include <tdeparts/componentfactory.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
-#include <kabc/addressee.h>
+#include <tdeabc/addressee.h>
 
 #include <libkcal/vcaldrag.h>
 #include <libkcal/icaldrag.h>
diff --git a/kontact/plugins/kmail/kmail_plugin.h b/kontact/plugins/kmail/kmail_plugin.h
index d2c5f4a31..eb1914ec4 100644
--- a/kontact/plugins/kmail/kmail_plugin.h
+++ b/kontact/plugins/kmail/kmail_plugin.h
@@ -24,7 +24,7 @@
 #ifndef KMAIL_PLUGIN_H
 #define KMAIL_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "kmailIface_stub.h"
diff --git a/kontact/plugins/kmail/summarywidget.cpp b/kontact/plugins/kmail/summarywidget.cpp
index b203c3628..9ac186028 100644
--- a/kontact/plugins/kmail/summarywidget.cpp
+++ b/kontact/plugins/kmail/summarywidget.cpp
@@ -30,9 +30,9 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "core.h"
diff --git a/kontact/plugins/knode/knode_plugin.h b/kontact/plugins/knode/knode_plugin.h
index 1062ff628..460e06032 100644
--- a/kontact/plugins/knode/knode_plugin.h
+++ b/kontact/plugins/knode/knode_plugin.h
@@ -25,7 +25,7 @@
 #ifndef KNODE_PLUGIN_H
 #define KNODE_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "knodeiface_stub.h"
diff --git a/kontact/plugins/knotes/knotes_part.cpp b/kontact/plugins/knotes/knotes_part.cpp
index 5cac9cafa..7c3b456f5 100644
--- a/kontact/plugins/knotes/knotes_part.cpp
+++ b/kontact/plugins/knotes/knotes_part.cpp
@@ -25,7 +25,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeaction.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <libtdepim/infoextension.h>
 #include <libtdepim/sidebarextension.h>
diff --git a/kontact/plugins/knotes/knotes_part.h b/kontact/plugins/knotes/knotes_part.h
index cda762eba..023a78b92 100644
--- a/kontact/plugins/knotes/knotes_part.h
+++ b/kontact/plugins/knotes/knotes_part.h
@@ -25,7 +25,7 @@
 #include <tqdict.h>
 
 #include <kiconview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include <libkcal/journal.h>
diff --git a/kontact/plugins/knotes/knotes_part_p.h b/kontact/plugins/knotes/knotes_part_p.h
index ab386d1a9..aa5b602cb 100644
--- a/kontact/plugins/knotes/knotes_part_p.h
+++ b/kontact/plugins/knotes/knotes_part_p.h
@@ -36,9 +36,9 @@
 #include <tqlabel.h>
 
 #include <tdeactioncollection.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconview.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <kiconeffect.h>
 #include <klineedit.h>
diff --git a/kontact/plugins/knotes/knotes_plugin.h b/kontact/plugins/knotes/knotes_plugin.h
index fe17bad52..01606fba2 100644
--- a/kontact/plugins/knotes/knotes_plugin.h
+++ b/kontact/plugins/knotes/knotes_plugin.h
@@ -21,7 +21,7 @@
 #ifndef KNOTES_PLUGIN_H
 #define KNOTES_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "plugin.h"
 
diff --git a/kontact/plugins/knotes/knotetip.cpp b/kontact/plugins/knotes/knotetip.cpp
index dc0a3fa75..97bd771f1 100644
--- a/kontact/plugins/knotes/knotetip.cpp
+++ b/kontact/plugins/knotes/knotetip.cpp
@@ -34,7 +34,7 @@
 #include <tqtextedit.h>
 
 #include <tdeapplication.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 
 #include "knotetip.h"
 #include "knotes_part_p.h"
diff --git a/kontact/plugins/knotes/summarywidget.cpp b/kontact/plugins/knotes/summarywidget.cpp
index ff517a43f..ca0f6ae5f 100644
--- a/kontact/plugins/knotes/summarywidget.cpp
+++ b/kontact/plugins/knotes/summarywidget.cpp
@@ -30,9 +30,9 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <kstandarddirs.h>
 
diff --git a/kontact/plugins/korganizer/journalplugin.cpp b/kontact/plugins/korganizer/journalplugin.cpp
index 4b017af94..ac3b77357 100644
--- a/kontact/plugins/korganizer/journalplugin.cpp
+++ b/kontact/plugins/korganizer/journalplugin.cpp
@@ -29,7 +29,7 @@
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 
diff --git a/kontact/plugins/korganizer/journalplugin.h b/kontact/plugins/korganizer/journalplugin.h
index e8cb60518..f7d0a4653 100644
--- a/kontact/plugins/korganizer/journalplugin.h
+++ b/kontact/plugins/korganizer/journalplugin.h
@@ -24,7 +24,7 @@
 #ifndef KONTACT_JOURNALPLUGIN_H
 #define KONTACT_JOURNALPLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "kcalendariface_stub.h"
diff --git a/kontact/plugins/korganizer/kcmkorgsummary.cpp b/kontact/plugins/korganizer/kcmkorgsummary.cpp
index 43d027d4d..0f17435cc 100644
--- a/kontact/plugins/korganizer/kcmkorgsummary.cpp
+++ b/kontact/plugins/korganizer/kcmkorgsummary.cpp
@@ -33,7 +33,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcmkorgsummary.h"
 
diff --git a/kontact/plugins/korganizer/korg_uniqueapp.cpp b/kontact/plugins/korganizer/korg_uniqueapp.cpp
index 6131206e0..c83605833 100644
--- a/kontact/plugins/korganizer/korg_uniqueapp.cpp
+++ b/kontact/plugins/korganizer/korg_uniqueapp.cpp
@@ -25,7 +25,7 @@
 #include "core.h"
 #include <dcopref.h>
 #include <tdeapplication.h>
-#include <kstartupinfo.h>
+#include <tdestartupinfo.h>
 #include <twin.h>
 
 void KOrganizerUniqueAppHandler::loadCommandLineOptions()
diff --git a/kontact/plugins/korganizer/korganizerplugin.cpp b/kontact/plugins/korganizer/korganizerplugin.cpp
index 1cc6fb527..8628f4128 100644
--- a/kontact/plugins/korganizer/korganizerplugin.cpp
+++ b/kontact/plugins/korganizer/korganizerplugin.cpp
@@ -28,15 +28,15 @@
 #include <tqdragobject.h>
 
 #include <tdeapplication.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 #include <tdeaction.h>
 #include <dcopref.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <dcopclient.h>
 
diff --git a/kontact/plugins/korganizer/korganizerplugin.h b/kontact/plugins/korganizer/korganizerplugin.h
index 3dd21fb3f..65a4d0531 100644
--- a/kontact/plugins/korganizer/korganizerplugin.h
+++ b/kontact/plugins/korganizer/korganizerplugin.h
@@ -25,7 +25,7 @@
 #ifndef KORGANIZER_PLUGIN_H
 #define KORGANIZER_PLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "kcalendariface_stub.h"
diff --git a/kontact/plugins/korganizer/summarywidget.cpp b/kontact/plugins/korganizer/summarywidget.cpp
index 16aba3778..96957fb31 100644
--- a/kontact/plugins/korganizer/summarywidget.cpp
+++ b/kontact/plugins/korganizer/summarywidget.cpp
@@ -27,9 +27,9 @@
 #include <tqtooltip.h>
 
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/kontact/plugins/korganizer/todoplugin.cpp b/kontact/plugins/korganizer/todoplugin.cpp
index a0208f539..b12772c61 100644
--- a/kontact/plugins/korganizer/todoplugin.cpp
+++ b/kontact/plugins/korganizer/todoplugin.cpp
@@ -27,15 +27,15 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kabc/vcardconverter.h>
+#include <tdeabc/vcardconverter.h>
 #include <tdeaction.h>
 #include <kdebug.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 
 #include <libkcal/calendarlocal.h>
 #include <libkcal/icaldrag.h>
diff --git a/kontact/plugins/korganizer/todoplugin.h b/kontact/plugins/korganizer/todoplugin.h
index 8fd453912..4d62a72d7 100644
--- a/kontact/plugins/korganizer/todoplugin.h
+++ b/kontact/plugins/korganizer/todoplugin.h
@@ -24,7 +24,7 @@
 #ifndef KONTACT_TODOPLUGIN_H
 #define KONTACT_TODOPLUGIN_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include "kcalendariface_stub.h"
diff --git a/kontact/plugins/korganizer/todosummarywidget.cpp b/kontact/plugins/korganizer/todosummarywidget.cpp
index 16aced52d..c6c594611 100644
--- a/kontact/plugins/korganizer/todosummarywidget.cpp
+++ b/kontact/plugins/korganizer/todosummarywidget.cpp
@@ -27,9 +27,9 @@
 #include <tqtooltip.h>
 
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/kontact/plugins/kpilot/summarywidget.cpp b/kontact/plugins/kpilot/summarywidget.cpp
index ec17c1f32..9ab256d2f 100644
--- a/kontact/plugins/kpilot/summarywidget.cpp
+++ b/kontact/plugins/kpilot/summarywidget.cpp
@@ -35,13 +35,13 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 #include <kdialogbase.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "pilotDaemonDCOP_stub.h"
 
diff --git a/kontact/plugins/newsticker/kcmkontactknt.cpp b/kontact/plugins/newsticker/kcmkontactknt.cpp
index 5c388f2aa..577bc992a 100644
--- a/kontact/plugins/newsticker/kcmkontactknt.cpp
+++ b/kontact/plugins/newsticker/kcmkontactknt.cpp
@@ -38,7 +38,7 @@
 #include <kdebug.h>
 #include <kdialogbase.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kpushbutton.h>
 
 #include "kcmkontactknt.h"
diff --git a/kontact/plugins/newsticker/newsticker_plugin.cpp b/kontact/plugins/newsticker/newsticker_plugin.cpp
index 79e03770d..b00cc0ac3 100644
--- a/kontact/plugins/newsticker/newsticker_plugin.cpp
+++ b/kontact/plugins/newsticker/newsticker_plugin.cpp
@@ -19,7 +19,7 @@
 */
 
 #include <kgenericfactory.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include "core.h"
 
diff --git a/kontact/plugins/newsticker/summarywidget.cpp b/kontact/plugins/newsticker/summarywidget.cpp
index 8fff21806..f385b269c 100644
--- a/kontact/plugins/newsticker/summarywidget.cpp
+++ b/kontact/plugins/newsticker/summarywidget.cpp
@@ -34,9 +34,9 @@
 #include <kcharsets.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurllabel.h>
 
 #include "summarywidget.h"
diff --git a/kontact/plugins/specialdates/kcmsdsummary.cpp b/kontact/plugins/specialdates/kcmsdsummary.cpp
index e375c7946..93c7bd8bc 100644
--- a/kontact/plugins/specialdates/kcmsdsummary.cpp
+++ b/kontact/plugins/specialdates/kcmsdsummary.cpp
@@ -35,7 +35,7 @@
 #include <tdeconfig.h>
 #include <kdebug.h>
 #include <kdialogbase.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "kcmsdsummary.h"
 
diff --git a/kontact/plugins/specialdates/sdsummarywidget.cpp b/kontact/plugins/specialdates/sdsummarywidget.cpp
index a378a1218..8918f8c1a 100644
--- a/kontact/plugins/specialdates/sdsummarywidget.cpp
+++ b/kontact/plugins/specialdates/sdsummarywidget.cpp
@@ -30,13 +30,13 @@
 
 #include <dcopclient.h>
 #include <dcopref.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include <korganizer/stdcalendar.h>
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 #include <tdepopupmenu.h>
 #include <kstandarddirs.h>
diff --git a/kontact/plugins/specialdates/specialdates_plugin.cpp b/kontact/plugins/specialdates/specialdates_plugin.cpp
index fbbdfe0a1..58c830c83 100644
--- a/kontact/plugins/specialdates/specialdates_plugin.cpp
+++ b/kontact/plugins/specialdates/specialdates_plugin.cpp
@@ -25,7 +25,7 @@
 #include <tdeaboutdata.h>
 #include <kgenericfactory.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 
 #include "core.h"
diff --git a/kontact/plugins/summary/kcmkontactsummary.cpp b/kontact/plugins/summary/kcmkontactsummary.cpp
index 8b2999f4d..3877827d2 100644
--- a/kontact/plugins/summary/kcmkontactsummary.cpp
+++ b/kontact/plugins/summary/kcmkontactsummary.cpp
@@ -28,7 +28,7 @@
 #include <kdialog.h>
 #include <kiconloader.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <plugin.h>
 #include <kplugininfo.h>
 #include <ktrader.h>
diff --git a/kontact/plugins/summary/summaryview_part.cpp b/kontact/plugins/summary/summaryview_part.cpp
index 4ba14d2eb..b55256839 100644
--- a/kontact/plugins/summary/summaryview_part.cpp
+++ b/kontact/plugins/summary/summaryview_part.cpp
@@ -33,14 +33,14 @@
 #include <kdcopservicestarter.h>
 #include <kdebug.h>
 #include <kdialog.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kservice.h>
 #include <ktrader.h>
 #include <kstandarddirs.h>
 #include <tqscrollview.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <kcmultidialog.h>
 
 #include <tdeparts/componentfactory.h>
diff --git a/kontact/plugins/summary/summaryview_plugin.h b/kontact/plugins/summary/summaryview_plugin.h
index ad14ce2ec..08055ba48 100644
--- a/kontact/plugins/summary/summaryview_plugin.h
+++ b/kontact/plugins/summary/summaryview_plugin.h
@@ -23,7 +23,7 @@
 #define SUMMARYVIEW_PLUGIN_H
 #include "plugin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/part.h>
 
 #include <tqmap.h>
diff --git a/kontact/plugins/test/test_part.cpp b/kontact/plugins/test/test_part.cpp
index bd5fed431..2e712ae82 100644
--- a/kontact/plugins/test/test_part.cpp
+++ b/kontact/plugins/test/test_part.cpp
@@ -30,8 +30,8 @@
 
 #include "sidebarextension.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdeaction.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
diff --git a/kontact/plugins/test/test_plugin.cpp b/kontact/plugins/test/test_plugin.cpp
index db375d278..631d91cb8 100644
--- a/kontact/plugins/test/test_plugin.cpp
+++ b/kontact/plugins/test/test_plugin.cpp
@@ -21,7 +21,7 @@
     with any edition of TQt, and distribute the resulting executable,
     without including the source code for TQt in the source distribution.
 */
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kgenericfactory.h>
 #include <kstatusbar.h>
diff --git a/kontact/plugins/weather/summarywidget.cpp b/kontact/plugins/weather/summarywidget.cpp
index 65d0e73b3..37fbe74d0 100644
--- a/kontact/plugins/weather/summarywidget.cpp
+++ b/kontact/plugins/weather/summarywidget.cpp
@@ -29,10 +29,10 @@
 #include <dcopref.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprocess.h>
 #include <kurllabel.h>
 
diff --git a/kontact/src/aboutdialog.cpp b/kontact/src/aboutdialog.cpp
index ca3bc265a..9059d09ba 100644
--- a/kontact/src/aboutdialog.cpp
+++ b/kontact/src/aboutdialog.cpp
@@ -27,7 +27,7 @@
 #include "core.h"
 #include "plugin.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeaboutdata.h>
 #include <kactivelabel.h>
diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index d4eb6d3d1..39deb330c 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -39,7 +39,7 @@
 #include <tdepopupmenu.h>
 #include <tdeapplication.h>
 #include <kdialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <sidebarextension.h>
 
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 61628bf9d..622d597b1 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -29,7 +29,7 @@
 #include <tdeaboutdata.h>
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktrader.h>
 
 #include <tqbuttongroup.h>
diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
index 268acb897..a243db711 100644
--- a/kontact/src/main.cpp
+++ b/kontact/src/main.cpp
@@ -26,8 +26,8 @@
 #include <tdecmdlineargs.h>
 #include <kdebug.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kstartupinfo.h>
+#include <tdelocale.h>
+#include <tdestartupinfo.h>
 #include <kuniqueapplication.h>
 #include <twin.h>
 #include <kstandarddirs.h>
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index e36cd8270..d1a054edb 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -44,8 +44,8 @@
 #include <kkeydialog.h>
 #include <klibloader.h>
 #include <tdelistbox.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeparts/componentfactory.h>
 #include <kplugininfo.h>
 #include <tdepopupmenu.h>
@@ -66,7 +66,7 @@
 #include <kcursor.h>
 #include <krun.h>
 #include <tdeaboutdata.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdestdaccel.h>
 #include <kcmultidialog.h>
 #include <kipc.h>
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index 328848401..e85d90c51 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -27,8 +27,8 @@
 
 #include <tdefiledialog.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqlayout.h>
 #include <tqpushbutton.h>
diff --git a/kontact/src/profilemanager.cpp b/kontact/src/profilemanager.cpp
index 80fdc8139..0d87b9bf7 100644
--- a/kontact/src/profilemanager.cpp
+++ b/kontact/src/profilemanager.cpp
@@ -28,7 +28,7 @@
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kstaticdeleter.h>
 #include <kurl.h>
-- 
cgit v1.2.1