diff options
Diffstat (limited to 'kopete')
-rw-r--r-- | kopete/libkopete/Makefile.am | 2 | ||||
-rw-r--r-- | kopete/plugins/contactnotes/Makefile.am | 2 | ||||
-rw-r--r-- | kopete/protocols/irc/irctransferhandler.cpp | 6 | ||||
-rw-r--r-- | kopete/protocols/irc/irctransferhandler.h | 2 | ||||
-rw-r--r-- | kopete/protocols/jabber/tdeioslave/CMakeLists.txt | 4 | ||||
-rw-r--r-- | kopete/protocols/jabber/tdeioslave/Makefile.am | 8 | ||||
-rw-r--r-- | kopete/protocols/jabber/tdeioslave/jabberdisco.cpp | 8 | ||||
-rw-r--r-- | kopete/protocols/jabber/tdeioslave/jabberdisco.protocol | 4 |
8 files changed, 18 insertions, 18 deletions
diff --git a/kopete/libkopete/Makefile.am b/kopete/libkopete/Makefile.am index 7e90bfc7..53462b8d 100644 --- a/kopete/libkopete/Makefile.am +++ b/kopete/libkopete/Makefile.am @@ -5,7 +5,7 @@ endif include ../../admin/Doxyfile.am -DOXYGEN_REFERENCES = kio tdecore tdeui +DOXYGEN_REFERENCES = tdeio tdecore tdeui DOXYGEN_EXCLUDE = compat DOXYGEN_SET_PROJECT_NAME = libkopete diff --git a/kopete/plugins/contactnotes/Makefile.am b/kopete/plugins/contactnotes/Makefile.am index 3e8705b6..95a1e6b7 100644 --- a/kopete/plugins/contactnotes/Makefile.am +++ b/kopete/plugins/contactnotes/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_contactnotes.la kopete_contactnotes_la_SOURCES = contactnotesplugin.cpp contactnotesedit.cpp kopete_contactnotes_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kopete_contactnotes_la_LIBADD = ../../libkopete/libkopete.la -lkio +kopete_contactnotes_la_LIBADD = ../../libkopete/libkopete.la -ltdeio service_DATA = kopete_contactnotes.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/protocols/irc/irctransferhandler.cpp b/kopete/protocols/irc/irctransferhandler.cpp index 5c676e52..fd004985 100644 --- a/kopete/protocols/irc/irctransferhandler.cpp +++ b/kopete/protocols/irc/irctransferhandler.cpp @@ -139,18 +139,18 @@ void IRCTransferHandler::connectKopeteTransfer(Kopete::Transfer *kt, KIRC::Trans // t, TQT_SLOT(slotKopeteTransferDestroyed())); connect(kt, TQT_SIGNAL(result(TDEIO::Job *)), - this , TQT_SLOT(kioresult(TDEIO::Job *))); + this , TQT_SLOT(tdeioresult(TDEIO::Job *))); t->initiate(); } } -void IRCTransferHandler::kioresult(TDEIO::Job *job) +void IRCTransferHandler::tdeioresult(TDEIO::Job *job) { Kopete::Transfer *kt= (Kopete::Transfer *)job; // FIXME: move to *_cast if(!kt) { - kdDebug(14120) << k_funcinfo << "Kopete::Transfer not found from kio:" << job << endl; + kdDebug(14120) << k_funcinfo << "Kopete::Transfer not found from tdeio:" << job << endl; return; } diff --git a/kopete/protocols/irc/irctransferhandler.h b/kopete/protocols/irc/irctransferhandler.h index 32618120..59d57382 100644 --- a/kopete/protocols/irc/irctransferhandler.h +++ b/kopete/protocols/irc/irctransferhandler.h @@ -47,7 +47,7 @@ private slots: void transferAccepted(Kopete::Transfer *kt, const TQString&file); void transferRefused(const Kopete::FileTransferInfo &info); - void kioresult(TDEIO::Job *job); + void tdeioresult(TDEIO::Job *job); private: IRCTransferHandler(); diff --git a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt index aaf788bd..4736203b 100644 --- a/kopete/protocols/jabber/tdeioslave/CMakeLists.txt +++ b/kopete/protocols/jabber/tdeioslave/CMakeLists.txt @@ -30,9 +30,9 @@ link_directories( install( FILES jabberdisco.protocol DESTINATION ${SERVICES_INSTALL_DIR} ) -##### kio_jabberdisco (module) ################## +##### tdeio_jabberdisco (module) ################## -tde_add_kpart( kio_jabberdisco AUTOMOC +tde_add_kpart( tdeio_jabberdisco AUTOMOC SOURCES jabberdisco.cpp LINK jabberclient-static diff --git a/kopete/protocols/jabber/tdeioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am index f8b9c651..af69843f 100644 --- a/kopete/protocols/jabber/tdeioslave/Makefile.am +++ b/kopete/protocols/jabber/tdeioslave/Makefile.am @@ -10,11 +10,11 @@ INCLUDES = \ -I$(srcdir)/../libiris/cutestuff/network \ $(all_includes) -kde_module_LTLIBRARIES = kio_jabberdisco.la +kde_module_LTLIBRARIES = tdeio_jabberdisco.la -kio_jabberdisco_la_SOURCES = jabberdisco.cpp -kio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) -kio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeio_jabberdisco_la_SOURCES = jabberdisco.cpp +tdeio_jabberdisco_la_LIBADD = ../libjabberclient.la ../libiris/qca/src/libqca.la ../libiris/iris/include/libiris.la ../libiris/iris/xmpp-im/libiris_xmpp_im.la ../libiris/iris/xmpp-core/libiris_xmpp_core.la ../libiris/iris/jabber/libiris_jabber.la ../libiris/cutestuff/util/libcutestuff_util.la ../libiris/cutestuff/network/libcutestuff_network.la $(LIB_KIO) +tdeio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = jabberdisco.h diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp index 311cfafd..18cb9319 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.cpp @@ -1,6 +1,6 @@ /*************************************************************************** - Jabber Service Discovery KIO Slave + Jabber Service Discovery TDEIO Slave ------------------- begin : Wed June 1 2005 copyright : (C) 2005 by Till Gerken <till@tantalo.net> @@ -33,7 +33,7 @@ #include "jabberclient.h" JabberDiscoProtocol::JabberDiscoProtocol ( const TQCString &pool_socket, const TQCString &app_socket ) - : TDEIO::SlaveBase ( "kio_jabberdisco", pool_socket, app_socket ) + : TDEIO::SlaveBase ( "tdeio_jabberdisco", pool_socket, app_socket ) { kdDebug ( JABBER_DISCO_DEBUG ) << k_funcinfo << "Slave launched." << endl; @@ -380,13 +380,13 @@ extern "C" int kdemain ( int argc, char **argv ) { - TDEApplication app(argc, argv, "kio_jabberdisco", false, true); + TDEApplication app(argc, argv, "tdeio_jabberdisco", false, true); kdDebug(JABBER_DISCO_DEBUG) << k_funcinfo << endl; if ( argc != 4 ) { - kdDebug(JABBER_DISCO_DEBUG) << "Usage: kio_jabberdisco protocol domain-socket1 domain-socket2" << endl; + kdDebug(JABBER_DISCO_DEBUG) << "Usage: tdeio_jabberdisco protocol domain-socket1 domain-socket2" << endl; exit(-1); } diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol index fcc0161b..7708d95f 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol @@ -1,5 +1,5 @@ [Protocol] -exec=kio_jabberdisco +exec=tdeio_jabberdisco protocol=jabber input=none output=filesystem @@ -9,7 +9,7 @@ makedir=false linking=false moving=false Icon=remote -Description=A KIO slave for Jabber Service Discovery +Description=A TDEIO slave for Jabber Service Discovery Description[be]=Модуль tdeioslave для пошуку сервісаў Jabber Description[bn]=Jabber সার্ভিস ডিসকভারির জন্য একটি কে-আই-ও স্লেভ Description[bs]=KIO slave za otkrivanje Jabber servisa |