summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/oscar
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/oscar')
-rw-r--r--kopete/protocols/oscar/aim/aimaccount.cpp4
-rw-r--r--kopete/protocols/oscar/aim/aimcontact.cpp4
-rw-r--r--kopete/protocols/oscar/aim/aimjoinchat.cpp2
-rw-r--r--kopete/protocols/oscar/aim/aimprotocol.cpp4
-rw-r--r--kopete/protocols/oscar/aim/aimuserinfo.cpp2
-rw-r--r--kopete/protocols/oscar/aim/ui/aimaddcontactpage.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqaccount.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqcontact.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqpresence.cpp2
-rw-r--r--kopete/protocols/oscar/icq/icqprotocol.cpp4
-rw-r--r--kopete/protocols/oscar/icq/icqreadaway.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqaddcontactpage.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icqauthreplydialog.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqeditaccountwidget.cpp2
-rw-r--r--kopete/protocols/oscar/icq/ui/icqsearchdialog.cpp4
-rw-r--r--kopete/protocols/oscar/icq/ui/icquserinfowidget.cpp4
-rw-r--r--kopete/protocols/oscar/liboscar/aimlogintask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/client.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/closeconnectiontask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/logintask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/ssimodifytask.cpp2
-rw-r--r--kopete/protocols/oscar/liboscar/userdetails.cpp2
-rw-r--r--kopete/protocols/oscar/oscaraccount.cpp4
-rw-r--r--kopete/protocols/oscar/oscarcontact.cpp4
-rw-r--r--kopete/protocols/oscar/oscarencodingselectiondialog.cpp2
-rw-r--r--kopete/protocols/oscar/oscarlistnonservercontacts.cpp2
-rw-r--r--kopete/protocols/oscar/oscarmyselfcontact.cpp2
-rw-r--r--kopete/protocols/oscar/oscarversionupdater.cpp2
-rw-r--r--kopete/protocols/oscar/oscarvisibilitydialog.cpp2
29 files changed, 41 insertions, 41 deletions
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"