summaryrefslogtreecommitdiffstats
path: root/kopete/protocols/jabber
diff options
context:
space:
mode:
Diffstat (limited to 'kopete/protocols/jabber')
-rw-r--r--kopete/protocols/jabber/CMakeLists.txt2
-rw-r--r--kopete/protocols/jabber/Makefile.am2
-rw-r--r--kopete/protocols/jabber/jabberaccount.cpp2
-rw-r--r--kopete/protocols/jabber/jabberbasecontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabberchatsession.cpp4
-rw-r--r--kopete/protocols/jabber/jabbercontact.cpp4
-rw-r--r--kopete/protocols/jabber/jabberfiletransfer.cpp2
-rw-r--r--kopete/protocols/jabber/jabbergroupcontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabbergroupmembercontact.cpp2
-rw-r--r--kopete/protocols/jabber/jabberprotocol.cpp2
-rw-r--r--kopete/protocols/jabber/jabbertransport.cpp2
-rw-r--r--kopete/protocols/jabber/tdeioslave/CMakeLists.txt (renamed from kopete/protocols/jabber/kioslave/CMakeLists.txt)2
-rw-r--r--kopete/protocols/jabber/tdeioslave/Makefile.am (renamed from kopete/protocols/jabber/kioslave/Makefile.am)2
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.cpp (renamed from kopete/protocols/jabber/kioslave/jabberdisco.cpp)0
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.h (renamed from kopete/protocols/jabber/kioslave/jabberdisco.h)4
-rw-r--r--kopete/protocols/jabber/tdeioslave/jabberdisco.protocol (renamed from kopete/protocols/jabber/kioslave/jabberdisco.protocol)20
-rw-r--r--kopete/protocols/jabber/ui/dlgjabbervcard.cpp4
-rw-r--r--kopete/protocols/jabber/ui/jabberchooseserver.cpp6
-rw-r--r--kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp2
19 files changed, 33 insertions, 33 deletions
diff --git a/kopete/protocols/jabber/CMakeLists.txt b/kopete/protocols/jabber/CMakeLists.txt
index a5e53af2..61202e95 100644
--- a/kopete/protocols/jabber/CMakeLists.txt
+++ b/kopete/protocols/jabber/CMakeLists.txt
@@ -12,7 +12,7 @@
add_subdirectory( ui )
add_subdirectory( icons )
add_subdirectory( libiris )
-add_subdirectory( kioslave )
+add_subdirectory( tdeioslave )
if( WITH_JINGLE )
add_subdirectory( jingle )
diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am
index f1706949..34337e63 100644
--- a/kopete/protocols/jabber/Makefile.am
+++ b/kopete/protocols/jabber/Makefile.am
@@ -5,7 +5,7 @@ JINGLE_INCLUDES=-I$(srcdir)/jingle -I$(top_builddir)/kopete/protocols/jabber/jin
endif
METASOURCES = AUTO
-SUBDIRS = ui icons libiris $(JINGLE) . kioslave
+SUBDIRS = ui icons libiris $(JINGLE) . tdeioslave
AM_CPPFLAGS = $(KOPETE_INCLUDES) \
-I$(srcdir)/libiris/iris/include \
-I$(srcdir)/libiris/iris/xmpp-im \
diff --git a/kopete/protocols/jabber/jabberaccount.cpp b/kopete/protocols/jabber/jabberaccount.cpp
index 0a803927..23f947fc 100644
--- a/kopete/protocols/jabber/jabberaccount.cpp
+++ b/kopete/protocols/jabber/jabberaccount.cpp
@@ -37,7 +37,7 @@
#include <tqregexp.h>
#include <tqtimer.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <kmessagebox.h>
#include <klocale.h>
diff --git a/kopete/protocols/jabber/jabberbasecontact.cpp b/kopete/protocols/jabber/jabberbasecontact.cpp
index d994487f..ec4b869f 100644
--- a/kopete/protocols/jabber/jabberbasecontact.cpp
+++ b/kopete/protocols/jabber/jabberbasecontact.cpp
@@ -24,7 +24,7 @@
#include <tqimage.h>
#include <tqregexp.h>
#include <kmessagebox.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kopetegroup.h>
diff --git a/kopete/protocols/jabber/jabberchatsession.cpp b/kopete/protocols/jabber/jabberchatsession.cpp
index 75bcdd03..cbfc0eab 100644
--- a/kopete/protocols/jabber/jabberchatsession.cpp
+++ b/kopete/protocols/jabber/jabberchatsession.cpp
@@ -25,7 +25,7 @@
#include <tqiconset.h>
#include <tqregexp.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kdebug.h>
#include <klocale.h>
#include "kopetechatsessionmanager.h"
@@ -38,7 +38,7 @@
#include "jabbercontact.h"
#include "jabberresource.h"
#include "jabberresourcepool.h"
-#include "kioslave/jabberdisco.h"
+#include "tdeioslave/jabberdisco.h"
JabberChatSession::JabberChatSession ( JabberProtocol *protocol, const JabberBaseContact *user,
diff --git a/kopete/protocols/jabber/jabbercontact.cpp b/kopete/protocols/jabber/jabbercontact.cpp
index 58ca2409..1d7d2e3f 100644
--- a/kopete/protocols/jabber/jabbercontact.cpp
+++ b/kopete/protocols/jabber/jabbercontact.cpp
@@ -31,11 +31,11 @@
#include <kdebug.h>
#include <klocale.h>
#include <kmessagebox.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kaction.h>
#include <kapplication.h>
#include <kstandarddirs.h>
-#include <kio/netaccess.h>
+#include <tdeio/netaccess.h>
#include <kinputdialog.h>
#include <kopeteview.h>
diff --git a/kopete/protocols/jabber/jabberfiletransfer.cpp b/kopete/protocols/jabber/jabberfiletransfer.cpp
index 00ecd535..e60116e5 100644
--- a/kopete/protocols/jabber/jabberfiletransfer.cpp
+++ b/kopete/protocols/jabber/jabberfiletransfer.cpp
@@ -21,7 +21,7 @@
#include "jabberfiletransfer.h"
#include <klocale.h>
#include <kmessagebox.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "kopeteuiglobal.h"
#include "kopetemetacontact.h"
#include "kopetecontactlist.h"
diff --git a/kopete/protocols/jabber/jabbergroupcontact.cpp b/kopete/protocols/jabber/jabbergroupcontact.cpp
index 1fa6d884..96ab9bcd 100644
--- a/kopete/protocols/jabber/jabbergroupcontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupcontact.cpp
@@ -20,7 +20,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include <kinputdialog.h>
#include "jabberprotocol.h"
#include "jabberaccount.h"
diff --git a/kopete/protocols/jabber/jabbergroupmembercontact.cpp b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
index e9bae4c1..e1bbd04a 100644
--- a/kopete/protocols/jabber/jabbergroupmembercontact.cpp
+++ b/kopete/protocols/jabber/jabbergroupmembercontact.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kfiledialog.h>
+#include <tdefiledialog.h>
#include "jabberprotocol.h"
#include "jabberaccount.h"
#include "jabberfiletransfer.h"
diff --git a/kopete/protocols/jabber/jabberprotocol.cpp b/kopete/protocols/jabber/jabberprotocol.cpp
index a7cf3a78..9e9cdc9a 100644
--- a/kopete/protocols/jabber/jabberprotocol.cpp
+++ b/kopete/protocols/jabber/jabberprotocol.cpp
@@ -19,7 +19,7 @@
#include <kdebug.h>
#include <kgenericfactory.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <kiconloader.h>
#include <kpopupmenu.h>
diff --git a/kopete/protocols/jabber/jabbertransport.cpp b/kopete/protocols/jabber/jabbertransport.cpp
index 26d16b28..adc53b01 100644
--- a/kopete/protocols/jabber/jabbertransport.cpp
+++ b/kopete/protocols/jabber/jabbertransport.cpp
@@ -34,7 +34,7 @@
#include <kaction.h>
#include <kdebug.h>
#include <klocale.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include "xmpp_tasks.h"
diff --git a/kopete/protocols/jabber/kioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
index 24b4ce81..aaf788bd 100644
--- a/kopete/protocols/jabber/kioslave/CMakeLists.txt
+++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt
@@ -37,6 +37,6 @@ tde_add_kpart( kio_jabberdisco AUTOMOC
LINK
jabberclient-static
iris_xmpp_core-static iris_xmpp_im-static iris_jabber-static iris-static
- qca-static cutestuff_network-static cutestuff_util-static kio-shared idn
+ qca-static cutestuff_network-static cutestuff_util-static tdeio-shared idn
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/kopete/protocols/jabber/kioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am
index be3b2112..f8b9c651 100644
--- a/kopete/protocols/jabber/kioslave/Makefile.am
+++ b/kopete/protocols/jabber/tdeioslave/Makefile.am
@@ -22,4 +22,4 @@ protocol_DATA = jabberdisco.protocol
protocoldir = $(kde_servicesdir)
messages: rc.cpp
- $(XGETTEXT) *.cpp -o $(podir)/kio_jabberdisco.pot
+ $(XGETTEXT) *.cpp -o $(podir)/tdeio_jabberdisco.pot
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
index 311cfafd..311cfafd 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.cpp
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h
index 660ba269..a2bc92a4 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.h
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h
@@ -25,8 +25,8 @@
#include <tqcstring.h>
#include <kurl.h>
-#include <kio/global.h>
-#include <kio/slavebase.h>
+#include <tdeio/global.h>
+#include <tdeio/slavebase.h>
#include <jabberclient.h>
#define JABBER_DISCO_DEBUG 0
diff --git a/kopete/protocols/jabber/kioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
index 01237e73..fcc0161b 100644
--- a/kopete/protocols/jabber/kioslave/jabberdisco.protocol
+++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol
@@ -10,35 +10,35 @@ linking=false
moving=false
Icon=remote
Description=A KIO slave for Jabber Service Discovery
-Description[be]=Модуль kioslave для пошуку сервісаў Jabber
+Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber
Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ
Description[bs]=KIO slave za otkrivanje Jabber servisa
Description[ca]=Un esclau KIO pel servei de de descoberta del Jabber
Description[cs]=Pomocný protokol pro zjišťování služeb Jabber
-Description[da]=En kioslave til at opdage jabber service
+Description[da]=En tdeioslave til at opdage jabber service
Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten
-Description[el]=Ένα kioslave για την ανίχνευση υπηρεσίας Jabber
-Description[es]=Un «kioslave» para el servicio de descubrimiento jabber
+Description[el]=Ένα tdeioslave για την ανίχνευση υπηρεσίας Jabber
+Description[es]=Un «tdeioslave» para el servicio de descubrimiento jabber
Description[et]=Jabberi teenuste tuvastamise KIO-moodul
Description[eu]=Jabber aurkikuntza zerbitzureako KIO morroi bat
Description[fa]=یک پیرو KIO برای خدمت اکتشافی Jabber
Description[fr]=Un module d'entrée / sortie pour la recherche de service Jabber
Description[gl]=Un KIO slave para Jabber Service Discovery
Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához
-Description[is]=kioslave fyrir Jabber þjónustu uppgötvun
+Description[is]=tdeioslave fyrir Jabber þjónustu uppgötvun
Description[it]=Un KIO slave per il servizio di discovery per Jabber
Description[ja]=Jabber Service Discovery の KIO スレーブ
Description[ka]=KIO slave Jabber სერვისის დირექტორიისთვის
Description[kk]=Jabber қызметін байқау KIO slave қызметі
Description[km]=KIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber
-Description[lt]=Priedas (kioslave) FISH protokolui
-Description[nb]=En kioslave for Jabber tjenestesøk
+Description[lt]=Priedas (tdeioslave) FISH protokolui
+Description[nb]=En tdeioslave for Jabber tjenestesøk
Description[nds]=En In-/Utgaavmoduul för't Finnen vun Jabber-Deensten
Description[ne]=ज्याबर सेवा खोजीका लागि कियो स्लाभ
-Description[nl]=Een kioslave voor Jabber Service Discovery
+Description[nl]=Een tdeioslave voor Jabber Service Discovery
Description[nn]=Ein KIO-slave for Jabber-tenesteoppdaging
Description[pl]=Wtyczka protokołu KIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery)
-Description[pt]=Um 'kioslave' para a Descoberta de Serviços do Jabber
+Description[pt]=Um 'tdeioslave' para a Descoberta de Serviços do Jabber
Description[pt_BR]=Um KIO-Slave para a descoberta de serviço do Jabber
Description[ru]=Обработчик KIO для обнаружения служб Jabber
Description[sk]=KIO otrok pre Jabber Service Discovery
@@ -50,4 +50,4 @@ Description[tr]=Jabber Servis Bulucu için KIOSlave
Description[uk]=Підлеглий В/В для виявлення служби Jabber
Description[zh_CN]=Jabber 服务发现的 KIO slave
Description[zh_HK]=用於發現 Jabber 服務的 KIO slave
-Description[zh_TW]=Jabber 服務的 kioslave
+Description[zh_TW]=Jabber 服務的 tdeioslave
diff --git a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
index 2da7740e..34a2eb35 100644
--- a/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
+++ b/kopete/protocols/jabber/ui/dlgjabbervcard.cpp
@@ -36,8 +36,8 @@
#include <kurllabel.h>
#include <kmessagebox.h>
#include <krun.h>
-#include <kio/netaccess.h>
-#include <kfiledialog.h>
+#include <tdeio/netaccess.h>
+#include <tdefiledialog.h>
#include <kpixmapregionselectordialog.h>
#include <kstandarddirs.h>
diff --git a/kopete/protocols/jabber/ui/jabberchooseserver.cpp b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
index a9a00689..77356c55 100644
--- a/kopete/protocols/jabber/ui/jabberchooseserver.cpp
+++ b/kopete/protocols/jabber/ui/jabberchooseserver.cpp
@@ -21,9 +21,9 @@
#include <kdebug.h>
#include <klocale.h>
-#include <kio/global.h>
-#include <kio/job.h>
-#include <kio/jobclasses.h>
+#include <tdeio/global.h>
+#include <tdeio/job.h>
+#include <tdeio/jobclasses.h>
#include <tqtable.h>
#include <tqlabel.h>
#include "jabberprotocol.h"
diff --git a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
index 71ad871f..a07c8f1d 100644
--- a/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
+++ b/kopete/protocols/jabber/ui/jabbereditaccountwidget.cpp
@@ -25,7 +25,7 @@
#include <tqcombobox.h>
#include <tqlabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kmessagebox.h>
#include <klocale.h>
#include <kpassdlg.h>