From 45971e65a6114fbd1f91ae354da485450001166f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Tue, 3 Sep 2013 20:02:44 +0200 Subject: Additional k => tde renaming and fixes --- kopete/protocols/gadu/Makefile.am | 2 +- kopete/protocols/groupwise/Makefile.am | 4 +-- kopete/protocols/irc/Makefile.am | 4 +-- kopete/protocols/irc/libkirc/Makefile.am | 2 +- kopete/protocols/jabber/Makefile.am | 2 +- kopete/protocols/jabber/tdeioslave/Makefile.am | 4 +-- kopete/protocols/jabber/tdeioslave/jabberdisco.h | 2 +- .../jabber/tdeioslave/jabberdisco.protocol | 42 +++++++++++----------- kopete/protocols/meanwhile/Makefile.am | 2 +- kopete/protocols/msn/Makefile.am | 6 ++-- kopete/protocols/msn/config/Makefile.am | 4 +-- kopete/protocols/msn/msncontact.cpp | 2 +- kopete/protocols/msn/msnsecureloginhandler.h | 2 +- kopete/protocols/oscar/Makefile.am | 2 +- kopete/protocols/oscar/aim/Makefile.am | 2 +- kopete/protocols/oscar/icq/Makefile.am | 2 +- kopete/protocols/oscar/liboscar/tests/Makefile.am | 2 +- .../protocols/oscar/liboscar/tests/tdeunittest.h | 4 +-- kopete/protocols/sms/Makefile.am | 2 +- kopete/protocols/testbed/Makefile.am | 4 +-- kopete/protocols/winpopup/Makefile.am | 4 +-- kopete/protocols/yahoo/Makefile.am | 2 +- 22 files changed, 51 insertions(+), 51 deletions(-) (limited to 'kopete/protocols') diff --git a/kopete/protocols/gadu/Makefile.am b/kopete/protocols/gadu/Makefile.am index 442f8aea..f8741e94 100644 --- a/kopete/protocols/gadu/Makefile.am +++ b/kopete/protocols/gadu/Makefile.am @@ -22,7 +22,7 @@ kopete_gadu_la_SOURCES = gaduaway.cpp gadueditcontact.cpp gaducommands.cpp \ gaducontactlist.cpp gadurichtextformat.cpp \ gadudccserver.cpp gadudcctransaction.cpp gadudcc.cpp -kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lgadu +kopete_gadu_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lgadu kopete_gadu_la_LIBADD = ./ui/libgaduui.la \ $(top_builddir)/kopete/libkopete/libkopete.la \ $(GG_LIBS) diff --git a/kopete/protocols/groupwise/Makefile.am b/kopete/protocols/groupwise/Makefile.am index 51ac5463..955637aa 100644 --- a/kopete/protocols/groupwise/Makefile.am +++ b/kopete/protocols/groupwise/Makefile.am @@ -12,9 +12,9 @@ kde_module_LTLIBRARIES = kopete_groupwise.la kopete_groupwise_la_SOURCES = gwprotocol.cpp gwcontact.cpp gwaccount.cpp \ gwbytestream.cpp gwconnector.cpp gwmessagemanager.cpp gwcontactlist.cpp kopete_groupwise_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \ - $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor + $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \ - libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_KIO) + libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_TDEIO) service_DATA = kopete_groupwise.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/protocols/irc/Makefile.am b/kopete/protocols/irc/Makefile.am index 93b5d46f..fb386b8d 100644 --- a/kopete/protocols/irc/Makefile.am +++ b/kopete/protocols/irc/Makefile.am @@ -22,11 +22,11 @@ kopete_irc_la_SOURCES = \ kcodecaction.cpp \ ksparser.cpp -kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_TDEHTML) +kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor $(LIB_TDEHTML) kopete_irc_la_LIBADD = ../../libkopete/libkopete.la \ ./ui/libkopeteircui.la \ ./libkirc/libkirc.la \ - $(LIB_KIO) + $(LIB_TDEIO) service_DATA = kopete_irc.desktop irc.protocol servicedir = $(kde_servicesdir) diff --git a/kopete/protocols/irc/libkirc/Makefile.am b/kopete/protocols/irc/libkirc/Makefile.am index e2ebe543..e1f30df8 100644 --- a/kopete/protocols/irc/libkirc/Makefile.am +++ b/kopete/protocols/irc/libkirc/Makefile.am @@ -14,7 +14,7 @@ libkirc_la_SOURCES = \ kirctransferserver.cpp \ ksslsocket.cpp libkirc_la_LDFLAGS = -no-undefined $(KDE_PLUGIN) $(all_libraries) -libkirc_la_LIBADD = $(LIB_KIO) +libkirc_la_LIBADD = $(LIB_TDEIO) AM_CPPFLAGS = -I$(top_srcdir)/kopete/protocols/irc $(KOPETE_INCLUDES) $(all_includes) METASOURCES = AUTO diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am index 34337e63..40f24e0c 100644 --- a/kopete/protocols/jabber/Makefile.am +++ b/kopete/protocols/jabber/Makefile.am @@ -44,7 +44,7 @@ kopete_jabber_la_SOURCES = \ jabbertransport.cpp\ jabberbookmarks.cpp -kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_jabber_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_jabber_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \ ui/libkopetejabberui.la \ libiris/iris/include/libiris.la \ diff --git a/kopete/protocols/jabber/tdeioslave/Makefile.am b/kopete/protocols/jabber/tdeioslave/Makefile.am index af69843f..ed5b3da3 100644 --- a/kopete/protocols/jabber/tdeioslave/Makefile.am +++ b/kopete/protocols/jabber/tdeioslave/Makefile.am @@ -13,8 +13,8 @@ INCLUDES = \ kde_module_LTLIBRARIES = tdeio_jabberdisco.la 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 +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_TDEIO) +tdeio_jabberdisco_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor noinst_HEADERS = jabberdisco.h diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.h b/kopete/protocols/jabber/tdeioslave/jabberdisco.h index a2bc92a4..c5817ec6 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.h +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.h @@ -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 diff --git a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol index 7708d95f..bcdc35be 100644 --- a/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol +++ b/kopete/protocols/jabber/tdeioslave/jabberdisco.protocol @@ -12,42 +12,42 @@ Icon=remote Description=A TDEIO slave for Jabber Service Discovery 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[bs]=TDEIO slave za otkrivanje Jabber servisa +Description[ca]=Un esclau TDEIO pel servei de de descoberta del Jabber Description[cs]=Pomocný protokol pro zjišťování služeb Jabber Description[da]=En tdeioslave til at opdage jabber service Description[de]=Ein Ein-/Ausgabemodul zum Auffinden von Jabber-Diensten 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[et]=Jabberi teenuste tuvastamise TDEIO-moodul +Description[eu]=Jabber aurkikuntza zerbitzureako TDEIO morroi bat +Description[fa]=یک پیرو TDEIO برای خدمت اکتشافی 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[gl]=Un TDEIO slave para Jabber Service Discovery Description[hu]=KDE-protokoll a Jabber szolgáltatáskereső használatához 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[it]=Un TDEIO slave per il servizio di discovery per Jabber +Description[ja]=Jabber Service Discovery の TDEIO スレーブ +Description[ka]=TDEIO slave Jabber სერვისის დირექტორიისთვის +Description[kk]=Jabber қызметін байқау TDEIO slave қызметі +Description[km]=TDEIO slave មួយ​សម្រាប់​របក​គំហើញ​សេវា Jabber 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 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[nn]=Ein TDEIO-slave for Jabber-tenesteoppdaging +Description[pl]=Wtyczka protokołu TDEIO dla usługi odkrywania usług Jabbera (Jabber Service Discovery) 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 -Description[sl]=KIO slave za odkrivanje storitev za Jabber -Description[sr]=KIO слуга за Jabber Service Discovery -Description[sr@Latn]=KIO sluga za Jabber Service Discovery +Description[pt_BR]=Um TDEIO-Slave para a descoberta de serviço do Jabber +Description[ru]=Обработчик TDEIO для обнаружения служб Jabber +Description[sk]=TDEIO otrok pre Jabber Service Discovery +Description[sl]=TDEIO slave za odkrivanje storitev za Jabber +Description[sr]=TDEIO слуга за Jabber Service Discovery +Description[sr@Latn]=TDEIO sluga za Jabber Service Discovery Description[sv]=En I/O-slav för Jabber tjänstupptäckt 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_CN]=Jabber 服务发现的 TDEIO slave +Description[zh_HK]=用於發現 Jabber 服務的 TDEIO slave Description[zh_TW]=Jabber 服務的 tdeioslave diff --git a/kopete/protocols/meanwhile/Makefile.am b/kopete/protocols/meanwhile/Makefile.am index 54728267..20a03725 100644 --- a/kopete/protocols/meanwhile/Makefile.am +++ b/kopete/protocols/meanwhile/Makefile.am @@ -28,7 +28,7 @@ kopete_meanwhile_la_SOURCES = \ meanwhileplugin.cpp kopete_meanwhile_la_LDFLAGS = -no-undefined -module \ - $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor + $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_meanwhile_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \ ui/libkopetemeanwhileui.la $(MEANWHILE_LIBS) diff --git a/kopete/protocols/msn/Makefile.am b/kopete/protocols/msn/Makefile.am index da3fbcb1..5248d295 100644 --- a/kopete/protocols/msn/Makefile.am +++ b/kopete/protocols/msn/Makefile.am @@ -25,13 +25,13 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.cpp \ p2p.cpp messageformatter.cpp incomingtransfer.cpp outgoingtransfer.cpp \ webcam.cpp -libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_KIO) -libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/ +libkopete_msn_shared_la_LIBADD = ./ui/libkopetemsnui.la ../../libkopete/libkopete.la $(WEBCAM_LIBMINICWRAPPER) ../../libkopete/avdevice/libkopete_videodevice.la $(LIB_TDEIO) +libkopete_msn_shared_la_LDFLAGS = -version-info 0:0:0 -no-undefined $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/ kopete_msn_la_SOURCES = dummy.cpp webcam.cpp kopete_msn_la_LIBADD = libkopete_msn_shared.la -kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/ +kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -lkopete_videodevice -L../../libkopete/avdevice/ dummy.cpp: $(srcdir)/Makefile.am echo '#include "kdemacros.h"' > $@ diff --git a/kopete/protocols/msn/config/Makefile.am b/kopete/protocols/msn/config/Makefile.am index f01cb0f1..2d84950e 100644 --- a/kopete/protocols/msn/config/Makefile.am +++ b/kopete/protocols/msn/config/Makefile.am @@ -4,8 +4,8 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kcm_kopete_msn.la kcm_kopete_msn_la_SOURCES = msnprefs.ui msnpreferences.cpp -kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor -kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_KUTILS) +kcm_kopete_msn_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor +kcm_kopete_msn_la_LIBADD = ../../../libkopete/libkopete.la $(LIB_TDEUTILS) service_DATA = kopete_msn_config.desktop servicedir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/protocols/msn/msncontact.cpp b/kopete/protocols/msn/msncontact.cpp index 40d45b51..e58c3800 100644 --- a/kopete/protocols/msn/msncontact.cpp +++ b/kopete/protocols/msn/msncontact.cpp @@ -679,7 +679,7 @@ void MSNContact::setDisplayPicture(KTempFile *f) f->setAutoDelete(false); delete f; - //let the time to KIO to copy the file + //let the time to TDEIO to copy the file connect(j, TQT_SIGNAL(result(TDEIO::Job *)) , this, TQT_SLOT(slotEmitDisplayPictureChanged() )); } diff --git a/kopete/protocols/msn/msnsecureloginhandler.h b/kopete/protocols/msn/msnsecureloginhandler.h index ea7a87b0..5dc4a277 100644 --- a/kopete/protocols/msn/msnsecureloginhandler.h +++ b/kopete/protocols/msn/msnsecureloginhandler.h @@ -27,7 +27,7 @@ namespace TDEIO /** * This class handle the login process. It connect to the .NET Password service and retrive the ticket(tweener) to login. - * Use KIO. + * Use TDEIO. * * @author Michaël Larouche */ diff --git a/kopete/protocols/oscar/Makefile.am b/kopete/protocols/oscar/Makefile.am index c782e8c1..93f1f859 100644 --- a/kopete/protocols/oscar/Makefile.am +++ b/kopete/protocols/oscar/Makefile.am @@ -12,4 +12,4 @@ libkopete_oscar_la_SOURCES = oscaraccount.cpp oscarcontact.cpp oscarmyselfcontac oscarvisibilitybase.ui oscarvisibilitydialog.cpp \ oscarversionupdater.cpp libkopete_oscar_la_LDFLAGS = -no-undefined -version-info 2:0:0 $(all_libraries) -libkopete_oscar_la_LIBADD = $(LIB_KIO) $(top_builddir)/kopete/libkopete/libkopete.la ./liboscar/liboscar.la +libkopete_oscar_la_LIBADD = $(LIB_TDEIO) $(top_builddir)/kopete/libkopete/libkopete.la ./liboscar/liboscar.la diff --git a/kopete/protocols/oscar/aim/Makefile.am b/kopete/protocols/oscar/aim/Makefile.am index 616a5501..5d1cc8b6 100644 --- a/kopete/protocols/oscar/aim/Makefile.am +++ b/kopete/protocols/oscar/aim/Makefile.am @@ -10,7 +10,7 @@ kde_module_LTLIBRARIES = kopete_aim.la kopete_aim_la_SOURCES = aimprotocol.cpp aimaccount.cpp aimcontact.cpp aimuserinfo.cpp aimjoinchat.cpp aimchatsession.cpp -kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_aim_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_aim_la_LIBADD = ../libkopete_oscar.la ui/libkopeteaimui.la \ $(top_builddir)/kopete/libkopete/libkopete.la diff --git a/kopete/protocols/oscar/icq/Makefile.am b/kopete/protocols/oscar/icq/Makefile.am index dc2e491a..81d1f488 100644 --- a/kopete/protocols/oscar/icq/Makefile.am +++ b/kopete/protocols/oscar/icq/Makefile.am @@ -11,7 +11,7 @@ kde_module_LTLIBRARIES = kopete_icq.la kopete_icq_la_SOURCES = icqpresence.cpp icqaccount.cpp icqcontact.cpp icqprotocol.cpp # icquserinfo.cpp icqreadaway.cpp icqsendsmsdialog.cpp -kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_icq_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_icq_la_LIBADD = ../libkopete_oscar.la \ $(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteicqui.la diff --git a/kopete/protocols/oscar/liboscar/tests/Makefile.am b/kopete/protocols/oscar/liboscar/tests/Makefile.am index 2e1fad6a..72fd8d64 100644 --- a/kopete/protocols/oscar/liboscar/tests/Makefile.am +++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am @@ -3,7 +3,7 @@ METASOURCES = AUTO check_PROGRAMS = tdeunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest tdeunittest_SOURCES = main.cpp tdeunittest.cpp chatnavtests.cpp -tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +tdeunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor tdeunittest_LDADD = $(LIB_TDECORE) ../liboscar.la clientstream_test_SOURCES = clientstream_test.cpp diff --git a/kopete/protocols/oscar/liboscar/tests/tdeunittest.h b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h index d3ceee97..61f891e8 100644 --- a/kopete/protocols/oscar/liboscar/tests/tdeunittest.h +++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h @@ -24,8 +24,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#ifndef KUNITTEST_H -#define KUNITTEST_H +#ifndef TDEUNITTEST_H +#define TDEUNITTEST_H #include "tester.h" diff --git a/kopete/protocols/sms/Makefile.am b/kopete/protocols/sms/Makefile.am index 6a42aebc..9fbd17c5 100644 --- a/kopete/protocols/sms/Makefile.am +++ b/kopete/protocols/sms/Makefile.am @@ -15,7 +15,7 @@ kopete_sms_la_SOURCES = smsaddcontactpage.cpp smscontact.cpp smseditaccountwidge kopete_sms_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) kopete_sms_la_LIBADD = ./ui/libkopetesmsui.la \ ./services/libkopetesmsservices.la \ - ../../libkopete/libkopete.la $(LIB_KIO) + ../../libkopete/libkopete.la $(LIB_TDEIO) service_DATA = kopete_sms.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/protocols/testbed/Makefile.am b/kopete/protocols/testbed/Makefile.am index f7da072c..4bc8e209 100644 --- a/kopete/protocols/testbed/Makefile.am +++ b/kopete/protocols/testbed/Makefile.am @@ -7,9 +7,9 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(srcdir)/ui -Iui $(all_includes) noinst_HEADERS = testbedprotocol.h testbedcontact.h testbedaccount.h testbedaddcontactpage.h testbededitaccountwidget.h testbedfakeserver.h testbedincomingmessage.h kde_module_LTLIBRARIES = kopete_testbed.la kopete_testbed_la_SOURCES = testbedprotocol.cpp testbedcontact.cpp testbedaccount.cpp testbedaddcontactpage.cpp testbedaddui.ui testbededitaccountwidget.cpp testbedaccountpreferences.ui testbedfakeserver.cpp testbedincomingmessage.cpp -kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \ - ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_KIO) + ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_TDEIO) service_DATA = kopete_testbed.desktop servicedir= $(kde_servicesdir) diff --git a/kopete/protocols/winpopup/Makefile.am b/kopete/protocols/winpopup/Makefile.am index 2bb8a143..ac798166 100644 --- a/kopete/protocols/winpopup/Makefile.am +++ b/kopete/protocols/winpopup/Makefile.am @@ -11,9 +11,9 @@ kde_module_LTLIBRARIES = kopete_wp.la noinst_HEADERS = wpprotocol.h wpeditaccount.h wpaccount.h wpuserinfo.h wpcontact.h wpaddcontact.h kopete_wp_la_SOURCES = wpprotocol.cpp wpcontact.cpp wpaddcontact.cpp wpeditaccount.cpp wpaccount.cpp wpuserinfo.cpp -kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_wp_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_wp_la_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \ - ./libwinpopup/libwinpopup.la $(LIB_KIO) + ./libwinpopup/libwinpopup.la $(LIB_TDEIO) service_DATA = kopete_wp.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/protocols/yahoo/Makefile.am b/kopete/protocols/yahoo/Makefile.am index 384188a9..a0ef0fe7 100644 --- a/kopete/protocols/yahoo/Makefile.am +++ b/kopete/protocols/yahoo/Makefile.am @@ -12,7 +12,7 @@ kde_module_LTLIBRARIES = kopete_yahoo.la kopete_yahoo_la_SOURCES = yahooprotocol.cpp yahoocontact.cpp \ yahooaddcontact.cpp yahooaccount.cpp yahooeditaccount.cpp yahooconferencemessagemanager.cpp \ yahoochatsession.cpp yahooverifyaccount.cpp yahoowebcam.cpp -kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \ $(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la -- cgit v1.2.1