Rename additional header files to avoid conflicts with KDE4

konversation/src/alias_preferences.cpp

@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 

konversation/src/autoreplace_preferences.cpp

@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 #include <tdeparts/componentfactory.h>

konversation/src/awaymanager.cpp

@@ -21,7 +21,7 @@
 
 #include <dcopref.h>
 #include <tdeaction.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <kdebug.h>
 

konversation/src/channel.cpp

@@ -22,8 +22,8 @@
 #include "ircinput.h"
 #include "ircviewbox.h"
 #include "ircview.h"
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 #include "common.h"
 #include "topiclabel.h"
 #include "channeloptionsdialog.h"
@@ -56,11 +56,11 @@
 #include <klineedit.h>
 #include <kinputdialog.h>
 #include <kpassdlg.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <tdeversion.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <twin.h>
 

konversation/src/channeldialog.cpp

@@ -16,8 +16,8 @@
 #include <tqlabel.h>
 #include <tqlineedit.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation

konversation/src/channellistpanel.cpp

@@ -33,10 +33,10 @@
 #include <krun.h>
 #include <tdelistview.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <tdeversion.h>
 

konversation/src/channelnick.cpp

@@ -20,7 +20,7 @@
 #include "channel.h"
 #include "server.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 ChannelNick::ChannelNick(const NickInfoPtr& nickInfo, const bool& isop, const bool& isadmin,

konversation/src/channeloptionsdialog.cpp

@@ -22,7 +22,7 @@
 #include <tqheader.h>
 #include <tqtoolbutton.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <ktextedit.h>
 #include <klineedit.h>

konversation/src/chatwindow.cpp

@@ -24,7 +24,7 @@
 #include <tqtooltip.h>
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <kdebug.h>
 #include <tdeactioncollection.h>

konversation/src/common.cpp

@@ -20,7 +20,7 @@
 #include <tqpixmap.h>
 #include <tqbitmap.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Konversation

konversation/src/config/konversation.kcfg

@@ -7,7 +7,7 @@
   <include>tqsize.h</include>
   <include>kdialog.h</include>
   <include>kuser.h</include>
-  <include>kglobalsettings.h</include>
+  <include>tdeglobalsettings.h</include>
   <kcfgfile name="konversationrc" />
 
   <group name="Appearance">

konversation/src/config/preferences.cpp

@@ -26,7 +26,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kuser.h>
 

konversation/src/connectionmanager.cpp

@@ -20,8 +20,8 @@
 
 #include <tqregexp.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 ConnectionManager::ConnectionManager(TQObject* parent) : TQObject(parent)

konversation/src/dcc_preferences.cpp

@@ -14,7 +14,7 @@
 
 #include <tqcombobox.h>
 #include <tqlineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 DCC_Config::DCC_Config(TQWidget *parent, const char* name) :

konversation/src/dccchat.cpp

@@ -34,8 +34,8 @@
 #include <tqpopupmenu.h>
 
 #include <klineedit.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
 #include <kserversocket.h>
 #include <tdesocketaddress.h>

konversation/src/dcccommon.cpp

@@ -18,7 +18,7 @@
 
 #include <tqhostaddress.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kresolver.h>
 #include <kserversocket.h>
 

konversation/src/dccrecipientdialog.cpp

@@ -17,7 +17,7 @@
 #include <tqlayout.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 

konversation/src/dccresumedialog.cpp

@@ -19,7 +19,7 @@
 #include <tqvbox.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurlrequester.h>
 

konversation/src/dcctransferdetailedinfopanel.cpp

@@ -23,7 +23,7 @@
 #include <tqtimer.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kprogress.h>
 #include <krun.h>
 #include <kurlrequester.h>

konversation/src/dcctransferpanel.cpp

@@ -29,12 +29,12 @@
 #include <kdebug.h>
 #include <tdeversion.h>
 #include <kdialog.h>
-#include <kglobal.h>
-#include <kglobalsettings.h>
+#include <tdeglobal.h>
+#include <tdeglobalsettings.h>
 #include <kiconloader.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdepopupmenu.h>
 #include <krun.h>
 #include <tdeapplication.h>

konversation/src/dcctransferpanelitem.cpp

@@ -25,11 +25,11 @@
 
 #include <kdebug.h>
 #include <tdefilemetainfo.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 #include <tdeio/job.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <krun.h>
 

konversation/src/dcctransferrecv.cpp

@@ -25,8 +25,8 @@
 #include <kdebug.h>
 #include <tdefileitem.h>
 #include <kiconloader.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kserversocket.h>
 #include <kstandarddirs.h>
 #include <kstreamsocket.h>

konversation/src/dcctransfersend.cpp

@@ -34,7 +34,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kserversocket.h>
 #include <tdesocketaddress.h>
 #include <kstreamsocket.h>

konversation/src/editnotifydialog.cpp

@@ -22,7 +22,7 @@
 #include <klineedit.h>
 #include <kcombobox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 EditNotifyDialog::EditNotifyDialog(TQWidget* parent,

konversation/src/highlight_preferences.cpp

@@ -22,14 +22,14 @@
 #include <tqtooltip.h>
 #include <tqtoolbutton.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kurlrequester.h>
 #include <tdefiledialog.h>
 #include <tdelistview.h>
 #include <klineedit.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeparts/componentfactory.h>
 #include <kregexpeditorinterface.h>
 #include <kiconloader.h>

konversation/src/identity.cpp

@@ -18,7 +18,7 @@
 #include <tqtextcodec.h>
 
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 int Identity::s_availableId = 0;

konversation/src/identitydialog.cpp

@@ -28,11 +28,11 @@
 #include <tqwhatsthis.h>
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kiconloader.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kuser.h>
 
 

konversation/src/ignore_preferences.cpp

@@ -15,7 +15,7 @@
 #include "ignore.h"
 #include "preferences.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 #include <tqlistview.h>
 #include <tqlineedit.h>

konversation/src/ignorelistviewitem.cpp

@@ -14,7 +14,7 @@
 #include "ignorelistviewitem.h"
 #include "ignore.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 

konversation/src/inputfilter.cpp

@@ -28,7 +28,7 @@
 #include <tqdatetime.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeversion.h>
 #include <kstringhandler.h>
 #include <config.h>

konversation/src/insertchardialog.cpp

@@ -12,7 +12,7 @@
 #include "insertchardialog.h"
 
 #include <kcharselect.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kguiitem.h>
 
 

konversation/src/irccharsets.cpp

@@ -15,7 +15,7 @@
 #include <tqtextcodec.h>
 #include <kcharsets.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstaticdeleter.h>
 
 #include <tqlocale.h>

konversation/src/irccolorchooser.cpp

@@ -19,7 +19,7 @@
 #include <tqlabel.h>
 #include <tqpixmap.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 
 

konversation/src/ircinput.cpp

@@ -28,8 +28,8 @@
 #include <tqpopupmenu.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <tdecompletionbox.h>
 
 #define MAXHISTORY 100

konversation/src/ircview.cpp

@@ -45,8 +45,8 @@
 
 #include <dcopref.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kurl.h>
 #include <kurldrag.h>
 #include <kbookmark.h>
@@ -59,13 +59,13 @@
 #include <kshell.h>
 #include <tdepopupmenu.h>
 #include <tdeaction.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kdebug.h>
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <tdefiledialog.h>
 #include <tdeio/job.h>
 #include <tdestdaccel.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 
 IRCView::IRCView(TQWidget* parent, Server* newServer) : KTextBrowser(parent)

konversation/src/ircviewbox.cpp

@@ -13,7 +13,7 @@
 #include "ircview.h"
 #include "searchbar.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
 #include <tqpixmap.h>

konversation/src/joinchanneldialog.cpp

@@ -17,7 +17,7 @@
 
 #include <tqlabel.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 

konversation/src/konsolepanel.cpp

@@ -15,7 +15,7 @@
 
 #include <kdebug.h>
 #include <klibloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KonsolePanel::KonsolePanel(TQWidget *p) : ChatWindow( p ), k_part (0)

konversation/src/konvdcop.cpp

@@ -23,7 +23,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 KonvDCOP::KonvDCOP() : DCOPObject("irc"), TQObject(0, "irc")

konversation/src/konversationapplication.cpp

@@ -41,8 +41,8 @@
 #include <dcopclient.h>
 #include <tdeversion.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 
 

konversation/src/konversationmainwindow.cpp

@@ -39,20 +39,20 @@
 #include <kstdaction.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
-#include <kmenubar.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
+#include <tdemenubar.h>
 #include <kkeydialog.h>
 #include <tdeversion.h>
 #include <kedittoolbar.h>
 #include <tdepopupmenu.h>
 #include <twin.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <dcopclient.h>
 #include <scriptmanager.h>
-#include <kabc/addressbook.h>
-#include <kabc/errorhandler.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/errorhandler.h>
 
 #include <config.h>
 #ifdef  USE_KNOTIFY

konversation/src/konversationstatusbar.cpp

@@ -19,7 +19,7 @@
 #include <tqtooltip.h>
 
 #include <kstatusbar.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <ksqueezedtextlabel.h>
 

konversation/src/konviconfigdialog.cpp

@@ -40,7 +40,7 @@
 
 #include <tdeconfigskeleton.h>
 #include <tdeconfigdialogmanager.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <kdebug.h>
 

konversation/src/konvisettingsdialog.cpp

@@ -37,7 +37,7 @@
 #include <tqsplitter.h>
 #include <tqcombobox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kiconloader.h>
 #include <tdelistview.h>

konversation/src/linkaddressbook/addressbook.cpp

@@ -22,8 +22,8 @@
 #include <tqstringlist.h>
 #include "tqwidget.h"
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
 #include <twin.h>

konversation/src/linkaddressbook/addressbook.h

@@ -15,8 +15,8 @@
 #ifndef ADDRESSBOOK_H
 #define ADDRESSBOOK_H
 
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 #include <kstaticdeleter.h>
 #include <tqobject.h>

konversation/src/linkaddressbook/addressbook_base.cpp

@@ -20,12 +20,12 @@
 
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstringhandler.h>
 #include <krun.h>
 #include <tdeapplication.h>
 #include <dcopclient.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 namespace Konversation
 {

konversation/src/linkaddressbook/addressbook_base.h

@@ -25,8 +25,8 @@
 #include <config.h>
 
 
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 
 namespace Konversation

konversation/src/linkaddressbook/addresseeitem.cpp

@@ -23,7 +23,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <tqgroupbox.h>
 #include <tqregexp.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 

konversation/src/linkaddressbook/addresseeitem.h

@@ -26,7 +26,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 #include <klineedit.h>
 #include <tdelistview.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 /**
   @short Special ListViewItem

konversation/src/linkaddressbook/linkaddressbookui.cpp

@@ -34,7 +34,7 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
 #include <tdeversion.h>
 #include <kinputdialog.h>
@@ -43,8 +43,8 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <tdelistviewsearchline.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 
 LinkAddressbookUI::LinkAddressbookUI( TQWidget *parent, const char *name, const TQString &ircnick, const TQString &servername, const TQString &servergroup, const TQString &suggested_realname )

konversation/src/linkaddressbook/linkaddressbookui.h

@@ -30,7 +30,7 @@ Kopete    (c) 2002-2004 by the Kopete developers  <kopete-devel@kde.org>
 
 #include <kdialogbase.h>
 #include <kdebug.h>
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 class TQCheckListItem;
 class LinkAddressbookUI_Base;

konversation/src/linkaddressbook/nicklisttooltip.cpp

@@ -18,7 +18,7 @@
 #include "../nickinfo.h"
 #include "../common.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
 

konversation/src/linkaddressbook/nicklisttooltip.h

@@ -22,7 +22,7 @@
 #include <tqpoint.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class NickListView;

konversation/src/linkaddressbook/nicksonlinetooltip.cpp

@@ -19,7 +19,7 @@
 #include "../nickinfo.h"
 #include "../nicksonline.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqtooltip.h>
 #include <tqlistview.h>
 #include <tdelistview.h>

konversation/src/linkaddressbook/nicksonlinetooltip.h

@@ -22,7 +22,7 @@
 #include <tqpoint.h>
 #include <tqstring.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class NicksOnline;

konversation/src/logfilereader.cpp

@@ -30,9 +30,9 @@
 
 #include <kdialog.h>
 #include <tdetoolbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/jobclasses.h>
 

konversation/src/main.cpp

@@ -15,7 +15,7 @@
 #include <tdeapplication.h>
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <dcopclient.h>
 #include <dcopref.h>
 #include <kdebug.h>

konversation/src/multilineedit.cpp

@@ -15,7 +15,7 @@
 
 #include <tqlayout.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 TQString MultilineEdit::returnText;                // static

konversation/src/nick.cpp

@@ -18,8 +18,8 @@
 
 #include <kdebug.h>
 #include <tdelistview.h>
-#include <klocale.h>
-#include <kabc/phonenumber.h>
+#include <tdelocale.h>
+#include <tdeabc/phonenumber.h>
 
 #include "konversationapplication.h"
 #include "preferences.h"

konversation/src/nickinfo.cpp

@@ -28,7 +28,7 @@
 
 #include <tqtooltip.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 NickInfo::NickInfo(const TQString& nick, Server* server): TDEShared()

konversation/src/nickinfo.h

@@ -19,7 +19,7 @@
 #include <tqdatetime.h>
 #include <ksharedptr.h>
 
-#include <kabc/addressbook.h>
+#include <tdeabc/addressbook.h>
 
 
 class Server;

konversation/src/nicklistbehavior_preferences.cpp

@@ -18,7 +18,7 @@
 #include <tqheader.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 NictdelistBehavior_Config::NictdelistBehavior_Config(TQWidget *parent, const char *name)

konversation/src/nicklistview.cpp

@@ -18,7 +18,7 @@
 #include "linkaddressbook/addressbook.h"
 
 #include <tdepopupmenu.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqtooltip.h>
 #include <tqtimer.h>

konversation/src/nicksonline.cpp

@@ -39,12 +39,12 @@
 
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdialog.h>
 #include <tdelistview.h>
 #include <kiconloader.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 NicksOnline::NicksOnline(TQWidget* parent): ChatWindow(parent)

konversation/src/notificationhandler.cpp

@@ -23,7 +23,7 @@
 
 #include <knotifyclient.h>
 #include <kstringhandler.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Konversation

konversation/src/osd.cpp

@@ -24,7 +24,7 @@ the Free Software Foundation; either version 2 of the License, or
 #include <dcopclient.h>
 #include <tdeapplication.h>
 #include <kdebug.h>
-#include <kglobalsettings.h>                      //unsetColors()
+#include <tdeglobalsettings.h>                      //unsetColors()
 
 #include <X11/Xlib.h>                             //reposition()
 
@@ -312,7 +312,7 @@ void OSDWidget::reposition( TQSize newSize )
 //////  OSDPreviewWidget below /////////////////////
 
 #include <kcursor.h>                              //previewWidget
-#include <klocale.h>
+#include <tdelocale.h>
 
 OSDPreviewWidget::OSDPreviewWidget( const TQString &appName, TQWidget *parent, const char *name )
 : OSDWidget( appName, parent, name )

konversation/src/outputfilter.cpp

@@ -31,7 +31,7 @@
 #include <tqvaluelist.h>
 #include <tqtextcodec.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdeio/passdlg.h>
 #include <tdeconfig.h>
@@ -40,7 +40,7 @@
 #include <tdesocketaddress.h>
 #include <kresolver.h>
 #include <kreverseresolver.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation

konversation/src/query.cpp

@@ -32,10 +32,10 @@
 #include <tqwhatsthis.h>
 #include <tqsplitter.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kiconloader.h>
 #include <kstringhandler.h>
 #include <tdepopupmenu.h>

konversation/src/queuetuner.cpp

@@ -26,9 +26,9 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstdguiitem.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 QueueTuner::QueueTuner(TQWidget* parent, ViewContainer *container)

konversation/src/quickbuttons_preferences.cpp

@@ -20,7 +20,7 @@
 #include <tdeapplication.h>
 #include <kdebug.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistview.h>
 

konversation/src/quickconnectdialog.cpp

@@ -21,7 +21,7 @@
 #include <tqcheckbox.h>
 
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 QuickConnectDialog::QuickConnectDialog(TQWidget *parent)

konversation/src/rawlog.cpp

@@ -19,7 +19,7 @@
 #include "server.h"
 #include "konversationapplication.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 

konversation/src/searchbar.cpp

@@ -28,7 +28,7 @@
 #include <kiconloader.h>
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #define SEARCH_FORWARD_MENU 1
 #define MATCH_CASE_MENU 2

konversation/src/server.cpp

@@ -48,11 +48,11 @@
 #include <tqdatetime.h>
 
 #include <tdeapplication.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kresolver.h>
 #include <tdesocketdevice.h>
 #include <tdeaction.h>

konversation/src/serverdialog.cpp

@@ -20,8 +20,8 @@
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation

konversation/src/servergroupdialog.cpp

@@ -33,9 +33,9 @@
 #include <tqcheckbox.h>
 #include <tqwhatsthis.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kcombobox.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>

konversation/src/serverison.cpp

@@ -25,8 +25,8 @@
 #include <tqmap.h>
 #include <tqstring.h>
 #include <tqstringlist.h>
-#include <kabc/addressbook.h>
-#include <kabc/stdaddressbook.h>
+#include <tdeabc/addressbook.h>
+#include <tdeabc/stdaddressbook.h>
 
 
 ServerISON::ServerISON(Server* server) : m_server(server)

konversation/src/serverlistdialog.cpp

@@ -24,10 +24,10 @@
 #include <tqheader.h>
 #include <tqcheckbox.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kguiitem.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 namespace Konversation

konversation/src/sslsocket.cpp

@@ -17,14 +17,14 @@
 
 #include "sslsocket.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kssl.h>
 #include <ksslinfodlg.h>
 #include <ksslpeerinfo.h>
 #include <ksslcertchain.h>
 #include <ksslcertificatecache.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdesocketdevice.h>
 
 

konversation/src/statuspanel.cpp

@@ -26,8 +26,8 @@
 #include <tqlineedit.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 
 StatusPanel::StatusPanel(TQWidget* parent) : ChatWindow(parent)

konversation/src/theme_preferences.cpp

@@ -32,9 +32,9 @@
 #include <tdelistbox.h>
 #include <kurl.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdeio/job.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>

konversation/src/topiclabel.cpp

@@ -26,7 +26,7 @@
 #include <kshell.h>
 #include <kurldrag.h>
 #include <kstringhandler.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 #include <tdepopupmenu.h>
 #include <kiconloader.h>

konversation/src/topiclabel.h

@@ -14,7 +14,7 @@
 #define KONVERSATIONTOPICLABEL_H
 
 #include <kactivelabel.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 class TQFontMetrics;

konversation/src/trayicon.cpp

@@ -22,9 +22,9 @@
 #include <tqtimer.h>
 #include <tqtooltip.h>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 
 namespace Konversation

konversation/src/urlcatcher.cpp

@@ -27,7 +27,7 @@
 
 #include <tdeapplication.h>
 #include <tdeactionclasses.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tdelistview.h>
 #include <krun.h>

konversation/src/viewcontainer.cpp

@@ -38,12 +38,12 @@
 #include <tqpopupmenu.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <ktabwidget.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <kmessagebox.h>
-#include <kglobalsettings.h>
+#include <tdemessagebox.h>
+#include <tdeglobalsettings.h>
 
 
 ViewContainer::ViewContainer(KonversationMainWindow* window):

konversation/src/viewtree.cpp

@@ -27,8 +27,8 @@
 #include <tqtooltip.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobalsettings.h>
+#include <tdelocale.h>
+#include <tdeglobalsettings.h>
 #include <tdeapplication.h>
 
 

konversation/src/viewtreeitem.cpp

@@ -22,7 +22,7 @@
 #include <tqtimer.h>
 
 #include <kdebug.h>
-#include <kglobalsettings.h>
+#include <tdeglobalsettings.h>
 #include <kstringhandler.h>
 
 

konversation/src/warnings_preferences.cpp

@@ -20,7 +20,7 @@
 #include <kdebug.h>
 #include <tdeapplication.h>
 #include <tdeconfig.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistview.h>
 
 

konversation/src/watchednicknames_preferences.cpp

@@ -24,7 +24,7 @@
 #include <tdeconfig.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>