diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-02-15 21:59:01 -0600 |
| commit | 0e88a100de93641e5aeacd8c65e8076c948a5c20 (patch) | |
| tree | 54cce3e6ae07c4fc8921244b1397c75cc21a2997 /kopete/protocols | |
| parent | 5497356b6c12e5854b297bfa0d9c2a9f20cb4ca0 (diff) | |
| download | tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.tar.gz tdenetwork-0e88a100de93641e5aeacd8c65e8076c948a5c20.zip | |
Rename additional header files to avoid conflicts with KDE4
Diffstat (limited to 'kopete/protocols')
150 files changed, 238 insertions, 238 deletions
diff --git a/kopete/protocols/gadu/gaduaccount.cpp b/kopete/protocols/gadu/gaduaccount.cpp index 5ca54870..f82f20ee 100644 --- a/kopete/protocols/gadu/gaduaccount.cpp +++ b/kopete/protocols/gadu/gaduaccount.cpp @@ -39,11 +39,11 @@ #include <kpassdlg.h> #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/netaccess.h> #include <tqapplication.h> diff --git a/kopete/protocols/gadu/gaduaddcontactpage.cpp b/kopete/protocols/gadu/gaduaddcontactpage.cpp index 99867508..aeed83b3 100644 --- a/kopete/protocols/gadu/gaduaddcontactpage.cpp +++ b/kopete/protocols/gadu/gaduaddcontactpage.cpp @@ -29,7 +29,7 @@ #include "gaducontact.h" #include "gaducontactlist.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kopetecontactlist.h> #include <kopetegroup.h> diff --git a/kopete/protocols/gadu/gaduaway.cpp b/kopete/protocols/gadu/gaduaway.cpp index 2be2a2aa..2678106c 100644 --- a/kopete/protocols/gadu/gaduaway.cpp +++ b/kopete/protocols/gadu/gaduaway.cpp @@ -27,7 +27,7 @@ #include "kopeteonlinestatus.h" #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> diff --git a/kopete/protocols/gadu/gaducommands.cpp b/kopete/protocols/gadu/gaducommands.cpp index 104e1b01..e167ffd7 100644 --- a/kopete/protocols/gadu/gaducommands.cpp +++ b/kopete/protocols/gadu/gaducommands.cpp @@ -32,7 +32,7 @@ #include <tqtextcodec.h> #include <tqimage.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <errno.h> diff --git a/kopete/protocols/gadu/gaducontact.cpp b/kopete/protocols/gadu/gaducontact.cpp index bedb3f55..40d06c52 100644 --- a/kopete/protocols/gadu/gaducontact.cpp +++ b/kopete/protocols/gadu/gaducontact.cpp @@ -20,11 +20,11 @@ // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA // 02110-1301, USA. -#include <klocale.h> +#include <tdelocale.h> #include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "gaduaccount.h" #include "gaduprotocol.h" diff --git a/kopete/protocols/gadu/gadudcctransaction.cpp b/kopete/protocols/gadu/gadudcctransaction.cpp index a6568ff6..34be220a 100644 --- a/kopete/protocols/gadu/gadudcctransaction.cpp +++ b/kopete/protocols/gadu/gadudcctransaction.cpp @@ -27,8 +27,8 @@ #include <netinet/in.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kopetetransfermanager.h" #include "kopetemetacontact.h" diff --git a/kopete/protocols/gadu/gadueditaccount.cpp b/kopete/protocols/gadu/gadueditaccount.cpp index 08987c16..75001746 100644 --- a/kopete/protocols/gadu/gadueditaccount.cpp +++ b/kopete/protocols/gadu/gadueditaccount.cpp @@ -36,9 +36,9 @@ #include <tqgroupbox.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> #include "kopetepasswordwidget.h" diff --git a/kopete/protocols/gadu/gadueditcontact.cpp b/kopete/protocols/gadu/gadueditcontact.cpp index 985a9874..b3a5ae68 100644 --- a/kopete/protocols/gadu/gadueditcontact.cpp +++ b/kopete/protocols/gadu/gadueditcontact.cpp @@ -28,7 +28,7 @@ #include "gaduadd.h" #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kopetegroup.h> #include <kopetecontactlist.h> diff --git a/kopete/protocols/gadu/gadupubdir.cpp b/kopete/protocols/gadu/gadupubdir.cpp index 92f53b48..00ba18ed 100644 --- a/kopete/protocols/gadu/gadupubdir.cpp +++ b/kopete/protocols/gadu/gadupubdir.cpp @@ -38,7 +38,7 @@ #include <krestrictedline.h> #include <klineedit.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> GaduPublicDir::GaduPublicDir( GaduAccount* account, TQWidget* parent, const char* name ) : KDialogBase( parent, name, false, TQString(), User1|User2|User3|Cancel, User2 ) diff --git a/kopete/protocols/gadu/gaduregisteraccount.cpp b/kopete/protocols/gadu/gaduregisteraccount.cpp index 6f622b7d..f70feb60 100644 --- a/kopete/protocols/gadu/gaduregisteraccount.cpp +++ b/kopete/protocols/gadu/gaduregisteraccount.cpp @@ -25,11 +25,11 @@ #include <tqlabel.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> +#include <tdeglobal.h> #include "gaduregisteraccountui.h" #include "gaduregisteraccount.h" diff --git a/kopete/protocols/gadu/gadusession.cpp b/kopete/protocols/gadu/gadusession.cpp index 7fded85a..6789a6ff 100644 --- a/kopete/protocols/gadu/gadusession.cpp +++ b/kopete/protocols/gadu/gadusession.cpp @@ -25,7 +25,7 @@ #include "gadusession.h" -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include "kopetemessage.h" diff --git a/kopete/protocols/groupwise/gwaccount.cpp b/kopete/protocols/groupwise/gwaccount.cpp index 622311c3..f102b3f9 100644 --- a/kopete/protocols/groupwise/gwaccount.cpp +++ b/kopete/protocols/groupwise/gwaccount.cpp @@ -28,8 +28,8 @@ #include <kdebug.h> #include <kdialogbase.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpassivepopup.h> #include <kopeteuiglobal.h> diff --git a/kopete/protocols/groupwise/gwcontact.cpp b/kopete/protocols/groupwise/gwcontact.cpp index 3bc505d7..c356e14e 100644 --- a/kopete/protocols/groupwise/gwcontact.cpp +++ b/kopete/protocols/groupwise/gwcontact.cpp @@ -29,7 +29,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kopetemetacontact.h> #include <kopeteuiglobal.h> diff --git a/kopete/protocols/groupwise/gwmessagemanager.cpp b/kopete/protocols/groupwise/gwmessagemanager.cpp index 583c525f..cf0c3225 100644 --- a/kopete/protocols/groupwise/gwmessagemanager.cpp +++ b/kopete/protocols/groupwise/gwmessagemanager.cpp @@ -16,9 +16,9 @@ #include <kdialogbase.h> #include <kiconloader.h> #include <kinputdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdemainwindow.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeshortcut.h> diff --git a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp index ba2a2a58..f61161d3 100644 --- a/kopete/protocols/groupwise/libgroupwise/gwerror.cpp +++ b/kopete/protocols/groupwise/libgroupwise/gwerror.cpp @@ -15,7 +15,7 @@ ************************************************************************* */ -#include <klocale.h> +#include <tdelocale.h> #include "gwerror.h" diff --git a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp index 5ece3882..b0ace3d0 100644 --- a/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp +++ b/kopete/protocols/groupwise/ui/gwaddcontactpage.cpp @@ -32,7 +32,7 @@ #include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopeteaccount.h" #include "kopetemetacontact.h" diff --git a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp index 1cfee7ee..45dd9ec2 100644 --- a/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatpropsdialog.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "gwerror.h" #include "gwchatpropswidget.h" diff --git a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp index 8d61cda1..3cf58e7d 100644 --- a/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwchatsearchdialog.cpp @@ -23,7 +23,7 @@ #include <kpushbutton.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "client.h" #include "chatroommanager.h" diff --git a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp index 94be6350..48b69e2d 100644 --- a/kopete/protocols/groupwise/ui/gwcontactproperties.cpp +++ b/kopete/protocols/groupwise/ui/gwcontactproperties.cpp @@ -27,7 +27,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <kopeteglobal.h> #include <kopeteonlinestatus.h> #include <kopetemetacontact.h> diff --git a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp index 62ff00ae..37a1f26e 100644 --- a/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp +++ b/kopete/protocols/groupwise/ui/gweditaccountwidget.cpp @@ -27,8 +27,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpassdlg.h> #include "kopetepasswordedaccount.h" #include "kopetepasswordwidget.h" diff --git a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp index 80daff71..208e99fb 100644 --- a/kopete/protocols/groupwise/ui/gwprivacydialog.cpp +++ b/kopete/protocols/groupwise/ui/gwprivacydialog.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "client.h" #include "gwaccount.h" diff --git a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp index 4c51487f..4dbbe45b 100644 --- a/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp +++ b/kopete/protocols/groupwise/ui/gwreceiveinvitationdialog.cpp @@ -20,7 +20,7 @@ #include <tqlabel.h> #include <tdeconfig.h> -#include <klocale.h> +#include <tdelocale.h> #include <kopetecontact.h> #include <kopeteglobal.h> #include <kopetemetacontact.h> diff --git a/kopete/protocols/groupwise/ui/gwsearch.cpp b/kopete/protocols/groupwise/ui/gwsearch.cpp index b3f2428e..addb54cd 100644 --- a/kopete/protocols/groupwise/ui/gwsearch.cpp +++ b/kopete/protocols/groupwise/ui/gwsearch.cpp @@ -24,7 +24,7 @@ //#include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kopetemetacontact.h> diff --git a/kopete/protocols/irc/ircaccount.cpp b/kopete/protocols/irc/ircaccount.cpp index 2b8dc549..e586dd6a 100644 --- a/kopete/protocols/irc/ircaccount.cpp +++ b/kopete/protocols/irc/ircaccount.cpp @@ -46,11 +46,11 @@ #include <tdeconfig.h> #include <tdecompletionbox.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinputdialog.h> #include <klineedit.h> #include <klineeditdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <tdepopupmenu.h> diff --git a/kopete/protocols/irc/ircaddcontactpage.cpp b/kopete/protocols/irc/ircaddcontactpage.cpp index 6b19721c..35bc4fc2 100644 --- a/kopete/protocols/irc/ircaddcontactpage.cpp +++ b/kopete/protocols/irc/ircaddcontactpage.cpp @@ -28,8 +28,8 @@ #include <tqframe.h> #include <tqtabwidget.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> IRCAddContactPage::IRCAddContactPage( TQWidget *parent, IRCAccount *a ) : AddContactPage(parent, 0) { diff --git a/kopete/protocols/irc/ircchannelcontact.cpp b/kopete/protocols/irc/ircchannelcontact.cpp index 91b7459f..c11aec03 100644 --- a/kopete/protocols/irc/ircchannelcontact.cpp +++ b/kopete/protocols/irc/ircchannelcontact.cpp @@ -34,8 +34,8 @@ #include <kinputdialog.h> #include <tdeapplication.h> #include <tdeaboutdata.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/irccontact.cpp b/kopete/protocols/irc/irccontact.cpp index c45b5303..1df631f9 100644 --- a/kopete/protocols/irc/irccontact.cpp +++ b/kopete/protocols/irc/irccontact.cpp @@ -18,7 +18,7 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqregexp.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/ircguiclient.cpp b/kopete/protocols/irc/ircguiclient.cpp index 3724781d..9ce7f73a 100644 --- a/kopete/protocols/irc/ircguiclient.cpp +++ b/kopete/protocols/irc/ircguiclient.cpp @@ -14,7 +14,7 @@ ************************************************************************* */ -#include <klocale.h> +#include <tdelocale.h> #include <tdeversion.h> #if KDE_IS_VERSION( 3, 1, 90 ) diff --git a/kopete/protocols/irc/ircprotocol.cpp b/kopete/protocols/irc/ircprotocol.cpp index 8c8e6291..2c35d737 100644 --- a/kopete/protocols/irc/ircprotocol.cpp +++ b/kopete/protocols/irc/ircprotocol.cpp @@ -45,10 +45,10 @@ #include <kcharsets.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kinputdialog.h> #include <kiconloader.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> #include <kuser.h> diff --git a/kopete/protocols/irc/ircservercontact.cpp b/kopete/protocols/irc/ircservercontact.cpp index e5018ccd..7c7a9d50 100644 --- a/kopete/protocols/irc/ircservercontact.cpp +++ b/kopete/protocols/irc/ircservercontact.cpp @@ -26,7 +26,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/ircusercontact.cpp b/kopete/protocols/irc/ircusercontact.cpp index 07515c75..1254b9d9 100644 --- a/kopete/protocols/irc/ircusercontact.cpp +++ b/kopete/protocols/irc/ircusercontact.cpp @@ -29,7 +29,7 @@ #include <tdeaction.h> #include <kdebug.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/libkirc/kircengine.cpp b/kopete/protocols/irc/libkirc/kircengine.cpp index 79bc56df..4ca09bfc 100644 --- a/kopete/protocols/irc/libkirc/kircengine.cpp +++ b/kopete/protocols/irc/libkirc/kircengine.cpp @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kextsock.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <tqtextcodec.h> diff --git a/kopete/protocols/irc/libkirc/kircmessage.cpp b/kopete/protocols/irc/libkirc/kircmessage.cpp index 8a48ce52..7eb7b7b0 100644 --- a/kopete/protocols/irc/libkirc/kircmessage.cpp +++ b/kopete/protocols/irc/libkirc/kircmessage.cpp @@ -24,8 +24,8 @@ #include <kdebug.h> #include <kextsock.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> using namespace KIRC; diff --git a/kopete/protocols/irc/libkirc/kirctransfer.cpp b/kopete/protocols/irc/libkirc/kirctransfer.cpp index 68e28f0c..cbcb6682 100644 --- a/kopete/protocols/irc/libkirc/kirctransfer.cpp +++ b/kopete/protocols/irc/libkirc/kirctransfer.cpp @@ -17,7 +17,7 @@ #include <kdebug.h> #include <kextsock.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqtimer.h> diff --git a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp index 3a5ef27c..c86124cb 100644 --- a/kopete/protocols/irc/libkirc/kirctransferhandler.cpp +++ b/kopete/protocols/irc/libkirc/kirctransferhandler.cpp @@ -15,8 +15,8 @@ ************************************************************************* */ -#include <kglobal.h> -#include <klocale.h> +#include <tdeglobal.h> +#include <tdelocale.h> #include <kextsock.h> #include <tqfile.h> diff --git a/kopete/protocols/irc/libkirc/ksslsocket.cpp b/kopete/protocols/irc/libkirc/ksslsocket.cpp index 8d248152..23e7a10c 100644 --- a/kopete/protocols/irc/libkirc/ksslsocket.cpp +++ b/kopete/protocols/irc/libkirc/ksslsocket.cpp @@ -19,7 +19,7 @@ #include <tqsocketnotifier.h> #include <dcopclient.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> #include <kssl.h> #include <ksslinfodlg.h> @@ -27,7 +27,7 @@ #include <ksslcertchain.h> #include <ksslcertificatecache.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "ksslsocket.h" diff --git a/kopete/protocols/irc/ui/channellist.cpp b/kopete/protocols/irc/ui/channellist.cpp index 6f26b0e4..9ee7bbcb 100644 --- a/kopete/protocols/irc/ui/channellist.cpp +++ b/kopete/protocols/irc/ui/channellist.cpp @@ -19,8 +19,8 @@ #include "kircengine.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tqvariant.h> #include <tqlabel.h> diff --git a/kopete/protocols/irc/ui/irceditaccountwidget.cpp b/kopete/protocols/irc/ui/irceditaccountwidget.cpp index 0b357726..854eff97 100644 --- a/kopete/protocols/irc/ui/irceditaccountwidget.cpp +++ b/kopete/protocols/irc/ui/irceditaccountwidget.cpp @@ -27,13 +27,13 @@ #include "kopetepasswordwidget.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdelistview.h> #include <kdebug.h> #include <kextsock.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kcharsets.h> #include <tqlabel.h> diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp index 29e542be..cf4999fc 100644 --- a/kopete/protocols/jabber/jabberaccount.cpp +++ b/kopete/protocols/jabber/jabberaccount.cpp @@ -39,8 +39,8 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <tdeapplication.h> #include <tdeaboutdata.h> #include <tdesocketbase.h> diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp index ec4b869f..7f2dca11 100644 --- a/kopete/protocols/jabber/jabberbasecontact.cpp +++ b/kopete/protocols/jabber/jabberbasecontact.cpp @@ -17,13 +17,13 @@ */ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kstandarddirs.h> #include <tqtimer.h> #include <tqimage.h> #include <tqregexp.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeio/netaccess.h> diff --git a/kopete/protocols/jabber/jabberbookmarks.cpp b/kopete/protocols/jabber/jabberbookmarks.cpp index 8167a1c7..ba8d1779 100644 --- a/kopete/protocols/jabber/jabberbookmarks.cpp +++ b/kopete/protocols/jabber/jabberbookmarks.cpp @@ -21,7 +21,7 @@ #include <kdebug.h> #include <tdeaction.h> -#include <klocale.h> +#include <tdelocale.h> #include "xmpp_tasks.h" diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp index 71b2c7d6..1f347412 100644 --- a/kopete/protocols/jabber/jabberchatsession.cpp +++ b/kopete/protocols/jabber/jabberchatsession.cpp @@ -27,7 +27,7 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopetechatsessionmanager.h" #include "kopetemessage.h" #include "kopeteviewplugin.h" diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp index d019a734..92bad45f 100644 --- a/kopete/protocols/jabber/jabbercontact.cpp +++ b/kopete/protocols/jabber/jabbercontact.cpp @@ -29,8 +29,8 @@ #include <tqbuffer.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdefiledialog.h> #include <tdeaction.h> #include <tdeapplication.h> diff --git a/kopete/protocols/jabber/jabbercontactpool.cpp b/kopete/protocols/jabber/jabbercontactpool.cpp index 43724d28..5f68b9dc 100644 --- a/kopete/protocols/jabber/jabbercontactpool.cpp +++ b/kopete/protocols/jabber/jabbercontactpool.cpp @@ -20,7 +20,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kopeteaccountmanager.h> #include <kopetecontactlist.h> #include "kopeteuiglobal.h" diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp index e60116e5..c172b30f 100644 --- a/kopete/protocols/jabber/jabberfiletransfer.cpp +++ b/kopete/protocols/jabber/jabberfiletransfer.cpp @@ -19,8 +19,8 @@ #include <im.h> #include <xmpp.h> #include "jabberfiletransfer.h" -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include "kopeteuiglobal.h" #include "kopetemetacontact.h" diff --git a/kopete/protocols/jabber/jabbergroupchatmanager.cpp b/kopete/protocols/jabber/jabbergroupchatmanager.cpp index e098fdad..f746c0af 100644 --- a/kopete/protocols/jabber/jabbergroupchatmanager.cpp +++ b/kopete/protocols/jabber/jabbergroupchatmanager.cpp @@ -19,7 +19,7 @@ #include <tqptrlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopetechatsessionmanager.h" #include "kopeteview.h" #include "jabberprotocol.h" diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp index b110b521..fde5e300 100644 --- a/kopete/protocols/jabber/jabbergroupcontact.cpp +++ b/kopete/protocols/jabber/jabbergroupcontact.cpp @@ -19,7 +19,7 @@ #include "jabbergroupcontact.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include <kinputdialog.h> #include "jabberprotocol.h" diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp index 3bbc7a94..35b06c09 100644 --- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp +++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp @@ -18,7 +18,7 @@ #include "jabbergroupmembercontact.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdefiledialog.h> #include "jabberprotocol.h" #include "jabberaccount.h" diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp index 4de868a7..7cc3be7a 100644 --- a/kopete/protocols/jabber/jabberprotocol.cpp +++ b/kopete/protocols/jabber/jabberprotocol.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <kgenericfactory.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kiconloader.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp index 94bbb5b2..e503008e 100644 --- a/kopete/protocols/jabber/jabbertransport.cpp +++ b/kopete/protocols/jabber/jabbertransport.cpp @@ -33,7 +33,7 @@ #include <tqtimer.h> #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include "xmpp_tasks.h" diff --git a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp index 86fc606f..dc2b2c8d 100644 --- a/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp +++ b/kopete/protocols/jabber/jingle/jinglevoicesessiondialog.cpp @@ -27,7 +27,7 @@ #include "voicecaller.h" // KDE includes -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> // Kopete includes diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp index a075bbde..c3091248 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -25,9 +25,9 @@ #include <tqcstring.h> #include <tqthread.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeapplication.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <xmpp_tasks.h> #include "jabberclient.h" diff --git a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp index be558388..10c11b0f 100644 --- a/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberbrowse.cpp @@ -21,8 +21,8 @@ #include <tqtable.h> #include <tqlabel.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "jabberaccount.h" #include "jabberprotocol.h" diff --git a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp index 948a594e..c665bf94 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchangepassword.cpp @@ -20,9 +20,9 @@ #include "dlgjabberchangepassword.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpassdlg.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqlineedit.h> #include <kopetepassword.h> diff --git a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp index 9d69beae..46071122 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatjoin.cpp @@ -17,7 +17,7 @@ ***************************************************************************/ #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqlineedit.h> #include <tqpushbutton.h> diff --git a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp index 1803a013..3afea298 100644 --- a/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberchatroomslist.cpp @@ -9,8 +9,8 @@ // Copyright: See COPYING file that comes with this distribution // // -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqtable.h> diff --git a/kopete/protocols/jabber/ui/dlgjabberregister.cpp b/kopete/protocols/jabber/ui/dlgjabberregister.cpp index ff324085..0f6f55f4 100644 --- a/kopete/protocols/jabber/ui/dlgjabberregister.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberregister.cpp @@ -18,8 +18,8 @@ #include <tqpushbutton.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "jabberaccount.h" #include "jabberprotocol.h" diff --git a/kopete/protocols/jabber/ui/dlgjabberservices.cpp b/kopete/protocols/jabber/ui/dlgjabberservices.cpp index 1bd1310c..bf0eaa27 100644 --- a/kopete/protocols/jabber/ui/dlgjabberservices.cpp +++ b/kopete/protocols/jabber/ui/dlgjabberservices.cpp @@ -16,8 +16,8 @@ * * ***************************************************************************/ -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include <tqpushbutton.h> diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp index 34a2eb35..0092742e 100644 --- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp +++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp @@ -32,9 +32,9 @@ #include <kdebug.h> #include <kpushbutton.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurllabel.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <tdeio/netaccess.h> #include <tdefiledialog.h> diff --git a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp index 076b92b8..3542cb0f 100644 --- a/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp +++ b/kopete/protocols/jabber/ui/jabberaddcontactpage.cpp @@ -22,7 +22,7 @@ #include <tqlayout.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kopeteaccount.h> #include <tqlabel.h> #include <kopetegroup.h> diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp index 77356c55..9221b2c4 100644 --- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp +++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp @@ -20,7 +20,7 @@ #include "jabberchooseserver.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp index a07c8f1d..4fecd6c4 100644 --- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp +++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp @@ -26,8 +26,8 @@ #include <tqlabel.h> #include <tdeconfig.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kpassdlg.h> #include <kopetepassword.h> #include <kopetepasswordedaccount.h> diff --git a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp index e18adbf9..febad40c 100644 --- a/kopete/protocols/jabber/ui/jabberregisteraccount.cpp +++ b/kopete/protocols/jabber/ui/jabberregisteraccount.cpp @@ -20,10 +20,10 @@ #include "jabberregisteraccount.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> -#include <kglobal.h> -#include <kmessagebox.h> +#include <tdeglobal.h> +#include <tdemessagebox.h> #include <klineedit.h> #include <kpassdlg.h> #include <knuminput.h> diff --git a/kopete/protocols/meanwhile/meanwhileaccount.cpp b/kopete/protocols/meanwhile/meanwhileaccount.cpp index 7350b425..d38f0df5 100644 --- a/kopete/protocols/meanwhile/meanwhileaccount.cpp +++ b/kopete/protocols/meanwhile/meanwhileaccount.cpp @@ -27,11 +27,11 @@ #include <tdeaction.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfigbase.h> #include "kopeteaway.h" #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqdict.h> MeanwhileAccount::MeanwhileAccount( diff --git a/kopete/protocols/meanwhile/meanwhilecontact.cpp b/kopete/protocols/meanwhile/meanwhilecontact.cpp index e594dd57..0c7a2db7 100644 --- a/kopete/protocols/meanwhile/meanwhilecontact.cpp +++ b/kopete/protocols/meanwhile/meanwhilecontact.cpp @@ -17,7 +17,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopeteaccount.h" #include "kopetechatsessionmanager.h" diff --git a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp index 8f795724..77955782 100644 --- a/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp +++ b/kopete/protocols/meanwhile/meanwhileeditaccountwidget.cpp @@ -23,8 +23,8 @@ #include <kdebug.h> #include <kopeteaccount.h> #include <kopetepasswordwidget.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include "meanwhileprotocol.h" #include "meanwhileaccount.h" #include "meanwhileeditaccountwidget.h" diff --git a/kopete/protocols/meanwhile/meanwhilesession.cpp b/kopete/protocols/meanwhile/meanwhilesession.cpp index 3b880932..bacf49c6 100644 --- a/kopete/protocols/meanwhile/meanwhilesession.cpp +++ b/kopete/protocols/meanwhile/meanwhilesession.cpp @@ -18,8 +18,8 @@ #include <string.h> #include <stdlib.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kopetepassword.h> #include <kopetechatsession.h> diff --git a/kopete/protocols/msn/dispatcher.cpp b/kopete/protocols/msn/dispatcher.cpp index f81ef8cc..70d43a14 100644 --- a/kopete/protocols/msn/dispatcher.cpp +++ b/kopete/protocols/msn/dispatcher.cpp @@ -34,7 +34,7 @@ using P2P::OutgoingTransfer; #include <kdebug.h> #include <kmdcodec.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> // TQt includes #include <tqdatastream.h> diff --git a/kopete/protocols/msn/incomingtransfer.cpp b/kopete/protocols/msn/incomingtransfer.cpp index a4f31216..0da4a04c 100644 --- a/kopete/protocols/msn/incomingtransfer.cpp +++ b/kopete/protocols/msn/incomingtransfer.cpp @@ -22,10 +22,10 @@ using P2P::Message; // Kde includes #include <kbufferedsocket.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kserversocket.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> using namespace KNetwork; // TQt includes diff --git a/kopete/protocols/msn/msnaccount.cpp b/kopete/protocols/msn/msnaccount.cpp index 6c7dbb41..c987bf1d 100644 --- a/kopete/protocols/msn/msnaccount.cpp +++ b/kopete/protocols/msn/msnaccount.cpp @@ -25,11 +25,11 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kinputdialog.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <kstandarddirs.h> #include <kmdcodec.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqfile.h> #include <tqregexp.h> @@ -54,7 +54,7 @@ #if !defined NDEBUG #include "msndebugrawcmddlg.h" -#include <kglobal.h> +#include <tdeglobal.h> #endif #if MSN_WEBCAM diff --git a/kopete/protocols/msn/msnaddcontactpage.cpp b/kopete/protocols/msn/msnaddcontactpage.cpp index 8bdf77a1..74102e1d 100644 --- a/kopete/protocols/msn/msnaddcontactpage.cpp +++ b/kopete/protocols/msn/msnaddcontactpage.cpp @@ -16,8 +16,8 @@ #include <tqlayout.h> #include <tqlineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "msnadd.h" #include "msnaddcontactpage.h" diff --git a/kopete/protocols/msn/msnchatsession.cpp b/kopete/protocols/msn/msnchatsession.cpp index 6137e17b..fabd62ab 100644 --- a/kopete/protocols/msn/msnchatsession.cpp +++ b/kopete/protocols/msn/msnchatsession.cpp @@ -27,10 +27,10 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdemainwindow.h> #include <tdetoolbar.h> #include <krun.h> diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 25041d72..40d45b51 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -28,13 +28,13 @@ #include <kdebug.h> #include <tdefiledialog.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <tqregexp.h> #include <tdeio/job.h> diff --git a/kopete/protocols/msn/msndebugrawcmddlg.cpp b/kopete/protocols/msn/msndebugrawcmddlg.cpp index 48c4050e..b2a4ebbd 100644 --- a/kopete/protocols/msn/msndebugrawcmddlg.cpp +++ b/kopete/protocols/msn/msndebugrawcmddlg.cpp @@ -25,7 +25,7 @@ #include <tqlineedit.h> #include <ktextedit.h> -#include <klocale.h> +#include <tdelocale.h> MSNDebugRawCmdDlg::MSNDebugRawCmdDlg( TQWidget *parent ) : KDialogBase( parent, 0L, true, diff --git a/kopete/protocols/msn/msnfiletransfersocket.cpp b/kopete/protocols/msn/msnfiletransfersocket.cpp index 3c480092..b7121c30 100644 --- a/kopete/protocols/msn/msnfiletransfersocket.cpp +++ b/kopete/protocols/msn/msnfiletransfersocket.cpp @@ -28,7 +28,7 @@ #include <kserversocket.h> #include <kbufferedsocket.h> #include <tdefiledialog.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopetetransfermanager.h" #include "kopetecontact.h" diff --git a/kopete/protocols/msn/msnnotifysocket.cpp b/kopete/protocols/msn/msnnotifysocket.cpp index 5f20d9ca..ec9b27c8 100644 --- a/kopete/protocols/msn/msnnotifysocket.cpp +++ b/kopete/protocols/msn/msnnotifysocket.cpp @@ -34,11 +34,11 @@ #include <kdebug.h> #include <tdeversion.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <krun.h> #include <tdeio/job.h> #include <tqfile.h> diff --git a/kopete/protocols/msn/msnsocket.cpp b/kopete/protocols/msn/msnsocket.cpp index 32b3d17a..2bb33c97 100644 --- a/kopete/protocols/msn/msnsocket.cpp +++ b/kopete/protocols/msn/msnsocket.cpp @@ -31,8 +31,8 @@ #include <kbufferedsocket.h> #include <kserversocket.h> #include <kresolver.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kurl.h> #include "kopeteuiglobal.h" diff --git a/kopete/protocols/msn/msnswitchboardsocket.cpp b/kopete/protocols/msn/msnswitchboardsocket.cpp index 179b45e3..77b7b550 100644 --- a/kopete/protocols/msn/msnswitchboardsocket.cpp +++ b/kopete/protocols/msn/msnswitchboardsocket.cpp @@ -35,14 +35,14 @@ // kde #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeapplication.h> #include <tdeaboutdata.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeconfig.h> #include <kmdcodec.h> #include <kstandarddirs.h> -#include <ktempfile.h> +#include <tdetempfile.h> // for the display picture #include <msncontact.h> diff --git a/kopete/protocols/msn/outgoingtransfer.cpp b/kopete/protocols/msn/outgoingtransfer.cpp index ce34f4a9..5d66c495 100644 --- a/kopete/protocols/msn/outgoingtransfer.cpp +++ b/kopete/protocols/msn/outgoingtransfer.cpp @@ -21,7 +21,7 @@ // Kde includes #include <kbufferedsocket.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kmdcodec.h> using namespace KNetwork; diff --git a/kopete/protocols/msn/ui/msneditaccountwidget.cpp b/kopete/protocols/msn/ui/msneditaccountwidget.cpp index 57022e6d..41a007f9 100644 --- a/kopete/protocols/msn/ui/msneditaccountwidget.cpp +++ b/kopete/protocols/msn/ui/msneditaccountwidget.cpp @@ -32,8 +32,8 @@ #include <kautoconfig.h> #include <tdefiledialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kstandarddirs.h> #include <tdeio/netaccess.h> #include <kdebug.h> diff --git a/kopete/protocols/msn/webcam.cpp b/kopete/protocols/msn/webcam.cpp index b7f991cd..60046d17 100644 --- a/kopete/protocols/msn/webcam.cpp +++ b/kopete/protocols/msn/webcam.cpp @@ -20,9 +20,9 @@ #include <kdebug.h> #include <tqregexp.h> #include <kbufferedsocket.h> -#include <klocale.h> +#include <tdelocale.h> #include <kserversocket.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tqlabel.h> #include <tqguardedptr.h> #include <tqtimer.h> diff --git a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp index 39b7049b..f10d6abe 100644 --- a/kopete/protocols/msn/webcam/msnwebcamdialog.cpp +++ b/kopete/protocols/msn/webcam/msnwebcamdialog.cpp @@ -23,7 +23,7 @@ #include <tqobject.h> #include <tqwidget.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> diff --git a/kopete/protocols/oscar/aim/aimaccount.cpp b/kopete/protocols/oscar/aim/aimaccount.cpp index 37bfb1dc..f6be26b7 100644 --- a/kopete/protocols/oscar/aim/aimaccount.cpp +++ b/kopete/protocols/oscar/aim/aimaccount.cpp @@ -19,9 +19,9 @@ #include <kdebug.h> #include <tdeconfig.h> #include <kdialogbase.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kmdcodec.h> #include "kopeteawayaction.h" diff --git a/kopete/protocols/oscar/aim/aimcontact.cpp b/kopete/protocols/oscar/aim/aimcontact.cpp index fcd51501..2fa79bf1 100644 --- a/kopete/protocols/oscar/aim/aimcontact.cpp +++ b/kopete/protocols/oscar/aim/aimcontact.cpp @@ -23,9 +23,9 @@ #include <tdeapplication.h> #include <tdeactionclasses.h> -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kopeteaway.h" #include "kopetechatsession.h" diff --git a/kopete/protocols/oscar/aim/aimjoinchat.cpp b/kopete/protocols/oscar/aim/aimjoinchat.cpp index 2ccec9b2..bc4a3edf 100644 --- a/kopete/protocols/oscar/aim/aimjoinchat.cpp +++ b/kopete/protocols/oscar/aim/aimjoinchat.cpp @@ -21,7 +21,7 @@ #include <tqlineedit.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> #include "aimjoinchatbase.h" #include "aimaccount.h" diff --git a/kopete/protocols/oscar/aim/aimprotocol.cpp b/kopete/protocols/oscar/aim/aimprotocol.cpp index 0b70ac89..f71e1848 100644 --- a/kopete/protocols/oscar/aim/aimprotocol.cpp +++ b/kopete/protocols/oscar/aim/aimprotocol.cpp @@ -17,7 +17,7 @@ #include <tqstringlist.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "aimprotocol.h" @@ -34,7 +34,7 @@ #include "kopetemetacontact.h" #include <kdialogbase.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kimageio.h> typedef KGenericFactory<AIMProtocol> AIMProtocolFactory; diff --git a/kopete/protocols/oscar/aim/aimuserinfo.cpp b/kopete/protocols/oscar/aim/aimuserinfo.cpp index eb013a4a..0cce3a5c 100644 --- a/kopete/protocols/oscar/aim/aimuserinfo.cpp +++ b/kopete/protocols/oscar/aim/aimuserinfo.cpp @@ -27,7 +27,7 @@ #include <tqpushbutton.h> #include <tqtimer.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstandarddirs.h> #include <ktextbrowser.h> #include <kdebug.h> diff --git a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp index f00741c9..c6612027 100644 --- a/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp +++ b/kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp @@ -22,8 +22,8 @@ #include <tqlayout.h> #include <tqlineedit.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> AIMAddContactPage::AIMAddContactPage(bool connected, TQWidget *parent, const char *name ) diff --git a/kopete/protocols/oscar/icq/icqaccount.cpp b/kopete/protocols/oscar/icq/icqaccount.cpp index 53ca409a..d7a5a529 100644 --- a/kopete/protocols/oscar/icq/icqaccount.cpp +++ b/kopete/protocols/oscar/icq/icqaccount.cpp @@ -19,10 +19,10 @@ #include <tdeconfig.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include <kmdcodec.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kopeteawayaction.h" #include "kopetemessage.h" diff --git a/kopete/protocols/oscar/icq/icqcontact.cpp b/kopete/protocols/oscar/icq/icqcontact.cpp index a6bd9b83..7971bd8f 100644 --- a/kopete/protocols/oscar/icq/icqcontact.cpp +++ b/kopete/protocols/oscar/icq/icqcontact.cpp @@ -26,8 +26,8 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kiconloader.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <knotifyclient.h> #include <kpassivepopup.h> #include <kinputdialog.h> diff --git a/kopete/protocols/oscar/icq/icqpresence.cpp b/kopete/protocols/oscar/icq/icqpresence.cpp index b0a051d7..8fca2441 100644 --- a/kopete/protocols/oscar/icq/icqpresence.cpp +++ b/kopete/protocols/oscar/icq/icqpresence.cpp @@ -18,7 +18,7 @@ #include <vector> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstaticdeleter.h> #include <kopeteonlinestatus.h> diff --git a/kopete/protocols/oscar/icq/icqprotocol.cpp b/kopete/protocols/oscar/icq/icqprotocol.cpp index 26284a35..a54c82b0 100644 --- a/kopete/protocols/oscar/icq/icqprotocol.cpp +++ b/kopete/protocols/oscar/icq/icqprotocol.cpp @@ -39,9 +39,9 @@ */ #include <kgenericfactory.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <ksimpleconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kopeteglobal.h" #include "kopeteuiglobal.h" diff --git a/kopete/protocols/oscar/icq/icqreadaway.cpp b/kopete/protocols/oscar/icq/icqreadaway.cpp index 772650fb..962b97e5 100644 --- a/kopete/protocols/oscar/icq/icqreadaway.cpp +++ b/kopete/protocols/oscar/icq/icqreadaway.cpp @@ -23,7 +23,7 @@ #include <tqvbox.h> #include <ktextbrowser.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <assert.h> diff --git a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp index a5071753..719b0bd7 100644 --- a/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp +++ b/kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp @@ -29,9 +29,9 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "icqadd.h" #include "icqaccount.h" diff --git a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp index 9041a131..a6f4b7d4 100644 --- a/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp @@ -18,7 +18,7 @@ #include "icqauthreplydialog.h" #include "icqauthreplyui.h" -#include <klocale.h> +#include <tdelocale.h> #include <tqlabel.h> #include <tqradiobutton.h> diff --git a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp index edcf03ce..f441317a 100644 --- a/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp @@ -28,7 +28,7 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kdialog.h> -#include <klocale.h> +#include <tdelocale.h> #include <kiconloader.h> #include <kjanuswidget.h> #include <kurllabel.h> diff --git a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp index 59cf7e92..1fa26280 100644 --- a/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp +++ b/kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp @@ -27,9 +27,9 @@ #include <kdebug.h> #include <kiconloader.h> #include <tdelistview.h> -#include <klocale.h> +#include <tdelocale.h> #include <kpushbutton.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kopeteuiglobal.h" diff --git a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp index 32eeb9b9..db2761b8 100644 --- a/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp +++ b/kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp @@ -27,10 +27,10 @@ #include <kdatewidget.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <klocale.h> +#include <tdelocale.h> #include "icqgeneralinfo.h" #include "icqcontact.h" diff --git a/kopete/protocols/oscar/liboscar/aimlogintask.cpp b/kopete/protocols/oscar/liboscar/aimlogintask.cpp index 9c669dcd..a371b0df 100644 --- a/kopete/protocols/oscar/liboscar/aimlogintask.cpp +++ b/kopete/protocols/oscar/liboscar/aimlogintask.cpp @@ -19,7 +19,7 @@ #include <stdlib.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "connection.h" #include "oscartypes.h" #include "oscarutils.h" diff --git a/kopete/protocols/oscar/liboscar/client.cpp b/kopete/protocols/oscar/liboscar/client.cpp index f0073b47..fe24fdb3 100644 --- a/kopete/protocols/oscar/liboscar/client.cpp +++ b/kopete/protocols/oscar/liboscar/client.cpp @@ -24,7 +24,7 @@ #include <tqtextcodec.h> #include <kdebug.h> //for kdDebug() -#include <klocale.h> +#include <tdelocale.h> #include "buddyicontask.h" #include "clientreadytask.h" diff --git a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp index 3b062b2a..338d1125 100644 --- a/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp +++ b/kopete/protocols/oscar/liboscar/closeconnectiontask.cpp @@ -21,7 +21,7 @@ #include <tqstring.h> #include <tqvaluelist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "connection.h" #include "transfer.h" #include "oscarutils.h" diff --git a/kopete/protocols/oscar/liboscar/logintask.cpp b/kopete/protocols/oscar/liboscar/logintask.cpp index f7b55531..73379e40 100644 --- a/kopete/protocols/oscar/liboscar/logintask.cpp +++ b/kopete/protocols/oscar/liboscar/logintask.cpp @@ -20,7 +20,7 @@ #include <tqtimer.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "aimlogintask.h" #include "connection.h" diff --git a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp index 80a9346c..6392bb9c 100644 --- a/kopete/protocols/oscar/liboscar/ssimodifytask.cpp +++ b/kopete/protocols/oscar/liboscar/ssimodifytask.cpp @@ -21,7 +21,7 @@ #include "ssimodifytask.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqstring.h> #include "connection.h" #include "oscarutils.h" diff --git a/kopete/protocols/oscar/liboscar/userdetails.cpp b/kopete/protocols/oscar/liboscar/userdetails.cpp index f8737026..c88bc54b 100644 --- a/kopete/protocols/oscar/liboscar/userdetails.cpp +++ b/kopete/protocols/oscar/liboscar/userdetails.cpp @@ -22,7 +22,7 @@ #include <sys/socket.h> #include <netinet/in.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tqptrlist.h> #include "oscarutils.h" #include "oscardebug.h" diff --git a/kopete/protocols/oscar/oscaraccount.cpp b/kopete/protocols/oscar/oscaraccount.cpp index 76c46be2..af2b8ba5 100644 --- a/kopete/protocols/oscar/oscaraccount.cpp +++ b/kopete/protocols/oscar/oscaraccount.cpp @@ -43,8 +43,8 @@ #include <kdebug.h> #include <tdeconfig.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <kpassivepopup.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/oscar/oscarcontact.cpp b/kopete/protocols/oscar/oscarcontact.cpp index f9bf5fae..f2b27360 100644 --- a/kopete/protocols/oscar/oscarcontact.cpp +++ b/kopete/protocols/oscar/oscarcontact.cpp @@ -23,8 +23,8 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdeversion.h> diff --git a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp index 7a1826cb..d6a8ea2f 100644 --- a/kopete/protocols/oscar/oscarencodingselectiondialog.cpp +++ b/kopete/protocols/oscar/oscarencodingselectiondialog.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tqcombobox.h> -#include <klocale.h> +#include <tdelocale.h> OscarEncodingSelectionDialog::OscarEncodingSelectionDialog( TQWidget* parent, int initialEncoding ) : KDialogBase( parent, 0, false, i18n( "Select Encoding" ), Ok | Cancel ) diff --git a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp index 4529f562..b185770b 100644 --- a/kopete/protocols/oscar/oscarlistnonservercontacts.cpp +++ b/kopete/protocols/oscar/oscarlistnonservercontacts.cpp @@ -22,7 +22,7 @@ #include "oscarlistcontactsbase.h" #include <tqstringlist.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> OscarListNonServerContacts::OscarListNonServerContacts(TQWidget* parent) : KDialogBase( parent, 0, false, i18n( "Add Contacts to Server List" ), diff --git a/kopete/protocols/oscar/oscarmyselfcontact.cpp b/kopete/protocols/oscar/oscarmyselfcontact.cpp index 28aeb8f2..56612d5b 100644 --- a/kopete/protocols/oscar/oscarmyselfcontact.cpp +++ b/kopete/protocols/oscar/oscarmyselfcontact.cpp @@ -14,7 +14,7 @@ ************************************************************************* */ -#include <klocale.h> +#include <tdelocale.h> #include "kopetecontactlist.h" diff --git a/kopete/protocols/oscar/oscarversionupdater.cpp b/kopete/protocols/oscar/oscarversionupdater.cpp index e7cb0a7a..ab899883 100644 --- a/kopete/protocols/oscar/oscarversionupdater.cpp +++ b/kopete/protocols/oscar/oscarversionupdater.cpp @@ -22,7 +22,7 @@ #include <kdebug.h> #include <tdeio/job.h> #include <tdeconfig.h> -#include <kglobal.h> +#include <tdeglobal.h> TQMutex updateMutex; diff --git a/kopete/protocols/oscar/oscarvisibilitydialog.cpp b/kopete/protocols/oscar/oscarvisibilitydialog.cpp index f6d38f6c..235693e1 100644 --- a/kopete/protocols/oscar/oscarvisibilitydialog.cpp +++ b/kopete/protocols/oscar/oscarvisibilitydialog.cpp @@ -19,7 +19,7 @@ #include <tqstringlist.h> #include <tqpushbutton.h> -#include <klocale.h> +#include <tdelocale.h> #include "oscarvisibilitybase.h" #include "client.h" diff --git a/kopete/protocols/sms/serviceloader.cpp b/kopete/protocols/sms/serviceloader.cpp index 0ebbe7fa..bbd1b396 100644 --- a/kopete/protocols/sms/serviceloader.cpp +++ b/kopete/protocols/sms/serviceloader.cpp @@ -16,8 +16,8 @@ #include "config.h" -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdebug.h> #include "serviceloader.h" diff --git a/kopete/protocols/sms/services/gsmlib.cpp b/kopete/protocols/sms/services/gsmlib.cpp index e8a83d69..cdbf44ed 100644 --- a/kopete/protocols/sms/services/gsmlib.cpp +++ b/kopete/protocols/sms/services/gsmlib.cpp @@ -23,9 +23,9 @@ #include <tqthread.h> #include <tqcheckbox.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kdebug.h> #include <tdeconfigbase.h> diff --git a/kopete/protocols/sms/services/smsclient.cpp b/kopete/protocols/sms/services/smsclient.cpp index c459bdd0..3391a8d1 100644 --- a/kopete/protocols/sms/services/smsclient.cpp +++ b/kopete/protocols/sms/services/smsclient.cpp @@ -17,9 +17,9 @@ #include <tqcombobox.h> #include <tqlayout.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kprocess.h> #include <kdebug.h> #include <tdeconfigbase.h> diff --git a/kopete/protocols/sms/services/smssend.cpp b/kopete/protocols/sms/services/smssend.cpp index 93e7e033..cd2afc52 100644 --- a/kopete/protocols/sms/services/smssend.cpp +++ b/kopete/protocols/sms/services/smssend.cpp @@ -22,9 +22,9 @@ #include <tdeconfigbase.h> #include <klineedit.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> #include "kopeteaccount.h" diff --git a/kopete/protocols/sms/services/smssendprovider.cpp b/kopete/protocols/sms/services/smssendprovider.cpp index 40a60baa..b478d89d 100644 --- a/kopete/protocols/sms/services/smssendprovider.cpp +++ b/kopete/protocols/sms/services/smssendprovider.cpp @@ -21,9 +21,9 @@ #include <tdeconfigbase.h> #include <kprocess.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopeteaccount.h" #include "kopeteuiglobal.h" diff --git a/kopete/protocols/sms/smsaccount.cpp b/kopete/protocols/sms/smsaccount.cpp index 4cfd4788..2e596025 100644 --- a/kopete/protocols/sms/smsaccount.cpp +++ b/kopete/protocols/sms/smsaccount.cpp @@ -21,8 +21,8 @@ #include <tdepopupmenu.h> #include <kprocess.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kopetemetacontact.h> #include <kopetecontactlist.h> diff --git a/kopete/protocols/sms/smscontact.cpp b/kopete/protocols/sms/smscontact.cpp index e15861ee..127cc516 100644 --- a/kopete/protocols/sms/smscontact.cpp +++ b/kopete/protocols/sms/smscontact.cpp @@ -18,8 +18,8 @@ #include <tdeconfigbase.h> #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include "kopetechatsessionmanager.h" #include "kopeteaccount.h" diff --git a/kopete/protocols/sms/smseditaccountwidget.cpp b/kopete/protocols/sms/smseditaccountwidget.cpp index f1872a21..e8a358d1 100644 --- a/kopete/protocols/sms/smseditaccountwidget.cpp +++ b/kopete/protocols/sms/smseditaccountwidget.cpp @@ -23,8 +23,8 @@ #include <tqradiobutton.h> #include <tdeconfigbase.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <krestrictedline.h> #include "kopeteuiglobal.h" diff --git a/kopete/protocols/sms/smsprotocol.cpp b/kopete/protocols/sms/smsprotocol.cpp index f232edc3..29170791 100644 --- a/kopete/protocols/sms/smsprotocol.cpp +++ b/kopete/protocols/sms/smsprotocol.cpp @@ -17,7 +17,7 @@ #include <kgenericfactory.h> #include <kdebug.h> #include <tdeconfig.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include "kopeteaccountmanager.h" #include "kopeteonlinestatusmanager.h" diff --git a/kopete/protocols/sms/smsuserpreferences.cpp b/kopete/protocols/sms/smsuserpreferences.cpp index 7c3e799c..f0942eb7 100644 --- a/kopete/protocols/sms/smsuserpreferences.cpp +++ b/kopete/protocols/sms/smsuserpreferences.cpp @@ -16,7 +16,7 @@ #include <tqlabel.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include "smsuserpreferences.h" diff --git a/kopete/protocols/testbed/testbedaccount.cpp b/kopete/protocols/testbed/testbedaccount.cpp index bf33a02f..267f452b 100644 --- a/kopete/protocols/testbed/testbedaccount.cpp +++ b/kopete/protocols/testbed/testbedaccount.cpp @@ -18,7 +18,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdepopupmenu.h> #include "kopetemetacontact.h" diff --git a/kopete/protocols/testbed/testbedcontact.cpp b/kopete/protocols/testbed/testbedcontact.cpp index 56513f14..00ec27ba 100644 --- a/kopete/protocols/testbed/testbedcontact.cpp +++ b/kopete/protocols/testbed/testbedcontact.cpp @@ -18,7 +18,7 @@ #include <tdeaction.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include "kopeteaccount.h" #include "kopetechatsessionmanager.h" diff --git a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp index 14e45dc3..6022d8cb 100644 --- a/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp +++ b/kopete/protocols/testbed/ui/testbedwebcamdialog.cpp @@ -25,7 +25,7 @@ #include <tqlayout.h> #include <tqvbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> TestbedWebcamDialog::TestbedWebcamDialog( const TQString &contactId, TQWidget * parent, const char * name ) : KDialogBase( KDialogBase::Plain, TQt::WDestructiveClose, parent, name, false, i18n( "Webcam for %1" ).arg( contactId ), diff --git a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp index 605315fa..fee40b3f 100644 --- a/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp +++ b/kopete/protocols/winpopup/libwinpopup/libwinpopup.cpp @@ -23,8 +23,8 @@ // KDE Includes #include <tdeapplication.h> #include <kdebug.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> #include <kdirlister.h> // Kopete Includes diff --git a/kopete/protocols/winpopup/wpaccount.cpp b/kopete/protocols/winpopup/wpaccount.cpp index 5d212fdd..a1a285c4 100644 --- a/kopete/protocols/winpopup/wpaccount.cpp +++ b/kopete/protocols/winpopup/wpaccount.cpp @@ -24,7 +24,7 @@ // KDE Includes #include <kdebug.h> #include <tdepopupmenu.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> // Kopete Includes diff --git a/kopete/protocols/winpopup/wpaddcontact.cpp b/kopete/protocols/winpopup/wpaddcontact.cpp index e5912c14..10f7df71 100644 --- a/kopete/protocols/winpopup/wpaddcontact.cpp +++ b/kopete/protocols/winpopup/wpaddcontact.cpp @@ -25,8 +25,8 @@ #include <kdebug.h> #include <kiconloader.h> #include <kurlrequester.h> -#include <kmessagebox.h> -#include <klocale.h> +#include <tdemessagebox.h> +#include <tdelocale.h> // Kopete Includes #include <addcontactpage.h> diff --git a/kopete/protocols/winpopup/wpeditaccount.cpp b/kopete/protocols/winpopup/wpeditaccount.cpp index c66094fe..bf4e7555 100644 --- a/kopete/protocols/winpopup/wpeditaccount.cpp +++ b/kopete/protocols/winpopup/wpeditaccount.cpp @@ -27,11 +27,11 @@ // KDE Includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kurlrequester.h> #include <knuminput.h> #include <klineedit.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <tdeconfig.h> #include <tdeapplication.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/winpopup/wpprotocol.cpp b/kopete/protocols/winpopup/wpprotocol.cpp index c3f3a038..ee639ca7 100644 --- a/kopete/protocols/winpopup/wpprotocol.cpp +++ b/kopete/protocols/winpopup/wpprotocol.cpp @@ -26,7 +26,7 @@ #include <tdeapplication.h> #include <kdebug.h> #include <kgenericfactory.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/winpopup/wpuserinfo.cpp b/kopete/protocols/winpopup/wpuserinfo.cpp index 39651475..4ecc2156 100644 --- a/kopete/protocols/winpopup/wpuserinfo.cpp +++ b/kopete/protocols/winpopup/wpuserinfo.cpp @@ -23,7 +23,7 @@ // KDE Includes #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <klineedit.h> #include <ksimpleconfig.h> diff --git a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp index 668e29c3..b81d5b29 100644 --- a/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/modifyyabtask.cpp @@ -24,7 +24,7 @@ #include <tqstring.h> #include <tqdatastream.h> #include <tqdom.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> diff --git a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp index 07c3d225..c24f8a20 100644 --- a/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/picturenotifiertask.cpp @@ -22,7 +22,7 @@ #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> PictureNotifierTask::PictureNotifierTask(Task* parent) : Task(parent) diff --git a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp index 532e21bf..d56666cd 100644 --- a/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/receivefiletask.cpp @@ -23,7 +23,7 @@ #include <tqtimer.h> #include <tqfile.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> diff --git a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp index 4cb17847..e50f420a 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendfiletask.cpp @@ -23,7 +23,7 @@ #include <tqtimer.h> #include <tdeapplication.h> // for random() #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <kstreamsocket.h> #include <tdeio/global.h> diff --git a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp index 828c6832..3f37cac0 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendmessagetask.cpp @@ -21,7 +21,7 @@ #include "client.h" #include <tqstring.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> SendMessageTask::SendMessageTask(Task* parent) : Task(parent) { diff --git a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp index 95193241..2fcc1d7e 100644 --- a/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/sendpicturetask.cpp @@ -27,7 +27,7 @@ #include <tdeio/jobclasses.h> #include <kbufferedsocket.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KNetwork; diff --git a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp index ddb249bd..d1c4926e 100644 --- a/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/statusnotifiertask.cpp @@ -22,7 +22,7 @@ #include <tqstring.h> #include <tqstringlist.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> StatusNotifierTask::StatusNotifierTask(Task* parent) : Task(parent) { diff --git a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp index 8a14b354..5856fa10 100644 --- a/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/webcamtask.cpp @@ -25,11 +25,11 @@ #include <tqfile.h> #include <tqtimer.h> #include <tqpixmap.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <kprocess.h> #include <kstreamsocket.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> using namespace KNetwork; diff --git a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp index 98df4ef0..c48a2549 100644 --- a/kopete/protocols/yahoo/libkyahoo/yabtask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yabtask.cpp @@ -25,7 +25,7 @@ #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> -#include <klocale.h> +#include <tdelocale.h> YABTask::YABTask(Task* parent) : Task(parent) { diff --git a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp index 96f96389..569a4e45 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoobuddyiconloader.cpp @@ -20,13 +20,13 @@ // KDE Includes #include <kdebug.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> #include <kurl.h> #include <kstandarddirs.h> -#include <klocale.h> +#include <tdelocale.h> #include "yahootypes.h" #include "client.h" diff --git a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp index 96cc20c5..9e5d7cd1 100644 --- a/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp +++ b/kopete/protocols/yahoo/libkyahoo/yahoochattask.cpp @@ -21,7 +21,7 @@ #include "yahootypes.h" #include "client.h" #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> diff --git a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp index 023b50b5..f98b80a4 100644 --- a/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoouserinfodialog.cpp @@ -29,10 +29,10 @@ #include <kdatewidget.h> #include <kdebug.h> -#include <kglobal.h> +#include <tdeglobal.h> #include <kiconloader.h> #include <kjanuswidget.h> -#include <klocale.h> +#include <tdelocale.h> #include "yahooworkinfowidget.h" #include "yahoogeneralinfowidget.h" diff --git a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp index caa3c75a..a6f8cb1b 100644 --- a/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp +++ b/kopete/protocols/yahoo/ui/yahoowebcamdialog.cpp @@ -23,7 +23,7 @@ #include <tqlayout.h> #include <tqvbox.h> #include <kdebug.h> -#include <klocale.h> +#include <tdelocale.h> #include <webcamwidget.h> diff --git a/kopete/protocols/yahoo/yahooaccount.cpp b/kopete/protocols/yahoo/yahooaccount.cpp index 8a1f5a4e..56b71cc9 100644 --- a/kopete/protocols/yahoo/yahooaccount.cpp +++ b/kopete/protocols/yahoo/yahooaccount.cpp @@ -32,12 +32,12 @@ #include <tqfileinfo.h> // KDE -#include <klocale.h> +#include <tdelocale.h> #include <tdeconfig.h> #include <kdebug.h> #include <tdeaction.h> #include <tdepopupmenu.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <kstandarddirs.h> diff --git a/kopete/protocols/yahoo/yahoochatsession.cpp b/kopete/protocols/yahoo/yahoochatsession.cpp index e59c5062..38c9c04f 100644 --- a/kopete/protocols/yahoo/yahoochatsession.cpp +++ b/kopete/protocols/yahoo/yahoochatsession.cpp @@ -24,10 +24,10 @@ #include <tdeconfig.h> #include <kdebug.h> #include <kinputdialog.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tdemainwindow.h> #include <tdetoolbar.h> #include <krun.h> diff --git a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp index c96d52da..244d2b4c 100644 --- a/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp +++ b/kopete/protocols/yahoo/yahooconferencemessagemanager.cpp @@ -18,8 +18,8 @@ #include <kdebug.h> #include <klineeditdlg.h> -#include <klocale.h> -#include <kmessagebox.h> +#include <tdelocale.h> +#include <tdemessagebox.h> #include <tdepopupmenu.h> #include <tdeconfig.h> diff --git a/kopete/protocols/yahoo/yahoocontact.cpp b/kopete/protocols/yahoo/yahoocontact.cpp index 77e03b27..86f89076 100644 --- a/kopete/protocols/yahoo/yahoocontact.cpp +++ b/kopete/protocols/yahoo/yahoocontact.cpp @@ -47,11 +47,11 @@ #include <kdebug.h> #include <tdeaction.h> #include <tdeapplication.h> -#include <klocale.h> +#include <tdelocale.h> #include <krun.h> #include <tdeshortcut.h> -#include <kmessagebox.h> -#include <ktempfile.h> +#include <tdemessagebox.h> +#include <tdetempfile.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <kurl.h> diff --git a/kopete/protocols/yahoo/yahooeditaccount.cpp b/kopete/protocols/yahoo/yahooeditaccount.cpp index 8913eba3..b5d61768 100644 --- a/kopete/protocols/yahoo/yahooeditaccount.cpp +++ b/kopete/protocols/yahoo/yahooeditaccount.cpp @@ -27,9 +27,9 @@ #include <tqspinbox.h> // KDE Includes -#include <klocale.h> +#include <tdelocale.h> #include <kdebug.h> -#include <kmessagebox.h> +#include <tdemessagebox.h> #include <krun.h> #include <kurl.h> #include <tdefiledialog.h> diff --git a/kopete/protocols/yahoo/yahooverifyaccount.cpp b/kopete/protocols/yahoo/yahooverifyaccount.cpp index 62dde427..55999195 100644 --- a/kopete/protocols/yahoo/yahooverifyaccount.cpp +++ b/kopete/protocols/yahoo/yahooverifyaccount.cpp @@ -21,8 +21,8 @@ // KDE Includes #include <kdebug.h> #include <klineedit.h> -#include <ktempfile.h> -#include <klocale.h> +#include <tdetempfile.h> +#include <tdelocale.h> #include <tdeio/global.h> #include <tdeio/job.h> #include <tdeio/jobclasses.h> diff --git a/kopete/protocols/yahoo/yahoowebcam.cpp b/kopete/protocols/yahoo/yahoowebcam.cpp index 0ddf8a45..51d7b1bf 100644 --- a/kopete/protocols/yahoo/yahoowebcam.cpp +++ b/kopete/protocols/yahoo/yahoowebcam.cpp @@ -15,7 +15,7 @@ #include <kdebug.h> #include <kprocess.h> -#include <ktempfile.h> +#include <tdetempfile.h> #include <tqtimer.h> #include "client.h" |