diff options
| author | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-26 13:17:46 -0600 |
| commit | 48087e1d5650499b6093a6816356d467c8461802 (patch) | |
| tree | 00c39f978492596620df1374e8a91af507d8bac3 /kopete | |
| parent | ccfaeb9b831a41e93e777b041cdf33a7d40a0e0b (diff) | |
| download | tdenetwork-48087e1d5650499b6093a6816356d467c8461802.tar.gz tdenetwork-48087e1d5650499b6093a6816356d467c8461802.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kopete')
94 files changed, 161 insertions, 161 deletions
diff --git a/kopete/kopete/Makefile.am b/kopete/kopete/Makefile.am index b9ee1df9..ed4305c6 100644 --- a/kopete/kopete/Makefile.am +++ b/kopete/kopete/Makefile.am @@ -33,7 +33,7 @@ kopete_SOURCES = main.cpp kopeteapplication.cpp kopeteiface.cpp \ kimiface_DIR = $(kde_includes) -kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -lktexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP +kopete_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) -ltdetexteditor $(LIB_QT) $(LIB_TDECORE) -ltdefx -lDCOP kopete_LDADD = \ addcontactwizard/libkopeteaddcontactwizard.la \ addaccountwizard/libkopeteaddaccountwizard.la \ diff --git a/kopete/kopete/chatwindow/CMakeLists.txt b/kopete/kopete/chatwindow/CMakeLists.txt index c88678d6..9110a19a 100644 --- a/kopete/kopete/chatwindow/CMakeLists.txt +++ b/kopete/kopete/chatwindow/CMakeLists.txt @@ -46,7 +46,7 @@ tde_add_kpart( libkrichtexteditpart AUTOMOC tde_add_kpart( kopete_chatwindow AUTOMOC SOURCES chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp - LINK kopeteui-static kopetechatwindow-static kopete-shared khtml-shared + LINK kopeteui-static kopetechatwindow-static kopete-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) @@ -56,7 +56,7 @@ tde_add_kpart( kopete_chatwindow AUTOMOC tde_add_kpart( kopete_emailwindow AUTOMOC SOURCES kopeteemailwindow.cpp - LINK kopeteui-static kopetechatwindow-static kopete-shared khtml-shared + LINK kopeteui-static kopetechatwindow-static kopete-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/kopete/chatwindow/Makefile.am b/kopete/kopete/chatwindow/Makefile.am index e4784c73..a70cabd3 100644 --- a/kopete/kopete/chatwindow/Makefile.am +++ b/kopete/kopete/chatwindow/Makefile.am @@ -6,21 +6,21 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) -I$(top_srcdir)/kopet kopete_chatwindow_la_SOURCES = chatview.cpp kopetechatwindow.cpp chatmemberslistwidget.cpp kopete_chatwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +kopete_chatwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) kopete_emailwindow_la_SOURCES = kopeteemailwindow.cpp kopete_emailwindow_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +kopete_emailwindow_la_LIBADD = ../../libkopete/libkopete.la ./libkopetechatwindow.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) libkrichtexteditpart_la_SOURCES = krichtexteditpart.cpp libkrichtexteditpart_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(KDE_RPATH) -libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkrichtexteditpart_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KPARTS) $(LIB_KSPELL) $(LIB_TDEPRINT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor libkopetechatwindow_la_SOURCES = chatmessagepart.cpp emoticonselector.cpp kopeteemoticonaction.cpp \ chattexteditpart.cpp krichtexteditpart.cpp kopetechatwindowstylemanager.cpp \ kopetechatwindowstyle.cpp libkopetechatwindow_la_LDFLAGS = $(all_libraries) -no-undefined -libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KPARTS) +libkopetechatwindow_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KPARTS) partdir = $(kde_datadir)/kopeterichtexteditpart part_DATA = kopeterichtexteditpartfull.rc diff --git a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp index f7675a44..eed962f9 100644 --- a/kopete/kopete/chatwindow/chatmemberslistwidget.cpp +++ b/kopete/kopete/chatwindow/chatmemberslistwidget.cpp @@ -29,7 +29,7 @@ #include <kabc/addressee.h> #include <kabc/vcardconverter.h> #include <kdebug.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kpopupmenu.h> #include <tqheader.h> diff --git a/kopete/kopete/chatwindow/chatmessagepart.cpp b/kopete/kopete/chatwindow/chatmessagepart.cpp index a8bc1c9f..01361872 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.cpp +++ b/kopete/kopete/chatwindow/chatmessagepart.cpp @@ -51,10 +51,10 @@ #include <kdebug.h> #include <tdeversion.h> #include <kfiledialog.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <klocale.h> #include <kmessagebox.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kpopupmenu.h> #include <krun.h> #include <kstringhandler.h> @@ -86,7 +86,7 @@ #include "kopetechatwindowstylemanager.h" #if !(KDE_IS_VERSION(3,3,90)) -//From tdelibs/khtml/misc/htmltags.h +//From tdelibs/tdehtml/misc/htmltags.h // used in ChatMessagePart::copy() #define ID_BLOCKQUOTE 12 #define ID_BR 14 @@ -972,9 +972,9 @@ void ChatMessagePart::print() view()->print(); } -void ChatMessagePart::khtmlDrawContentsEvent( khtml::DrawContentsEvent * event) //virtual +void ChatMessagePart::tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * event) //virtual { - KHTMLPart::khtmlDrawContentsEvent(event); + KHTMLPart::tdehtmlDrawContentsEvent(event); //copy(true /*selection only*/); not needed anymore. } void ChatMessagePart::slotCloseView( bool force ) diff --git a/kopete/kopete/chatwindow/chatmessagepart.h b/kopete/kopete/chatwindow/chatmessagepart.h index 224e7c0c..10eacd11 100644 --- a/kopete/kopete/chatwindow/chatmessagepart.h +++ b/kopete/kopete/chatwindow/chatmessagepart.h @@ -19,7 +19,7 @@ #ifndef CHATMESSAGEPART_H #define CHATMESSAGEPART_H -#include <khtml_part.h> +#include <tdehtml_part.h> #include <dom/html_element.h> #include <tqvaluelist.h> @@ -166,7 +166,7 @@ private slots: void slotUpdateHeaderPhoto(); protected: - virtual void khtmlDrawContentsEvent( khtml::DrawContentsEvent * ); + virtual void tdehtmlDrawContentsEvent( tdehtml::DrawContentsEvent * ); private: void readOverrides(); diff --git a/kopete/kopete/chatwindow/chatview.cpp b/kopete/kopete/chatwindow/chatview.cpp index 97263b8a..34324b45 100644 --- a/kopete/kopete/chatwindow/chatview.cpp +++ b/kopete/kopete/chatwindow/chatview.cpp @@ -43,7 +43,7 @@ #include <kurldrag.h> #include <kglobalsettings.h> #include <kgenericfactory.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <ksyntaxhighlighter.h> #include <tqscrollview.h> #include <tqtimer.h> @@ -122,7 +122,7 @@ ChatView::ChatView( Kopete::ChatSession *mgr, ChatWindowPlugin *parent, const ch setView(viewDock); //It is possible to drag and drop on this widget. - // I had to disable the acceptDrop in the khtml widget to be able to intercept theses events. + // I had to disable the acceptDrop in the tdehtml widget to be able to intercept theses events. setAcceptDrops(true); viewDock->setAcceptDrops(false); diff --git a/kopete/kopete/chatwindow/kopetechatwindow.h b/kopete/kopete/chatwindow/kopetechatwindow.h index 4dbb3d1b..70c72b94 100644 --- a/kopete/kopete/chatwindow/kopetechatwindow.h +++ b/kopete/kopete/chatwindow/kopetechatwindow.h @@ -19,7 +19,7 @@ #ifndef KOPETECHATWINDOW_H #define KOPETECHATWINDOW_H -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> #include <tqmovie.h> #include "kopetecontact.h" #include "tdeversion.h" diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.cpp b/kopete/kopete/chatwindow/kopeteemailwindow.cpp index d3cef26e..7cb9a03f 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.cpp +++ b/kopete/kopete/chatwindow/kopeteemailwindow.cpp @@ -41,7 +41,7 @@ #include <kedittoolbar.h> #include <kfontdialog.h> #include <kglobalsettings.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <kiconloader.h> #include <kkeydialog.h> #include <klibloader.h> diff --git a/kopete/kopete/chatwindow/kopeteemailwindow.h b/kopete/kopete/chatwindow/kopeteemailwindow.h index a0f596f5..7d7991ca 100644 --- a/kopete/kopete/chatwindow/kopeteemailwindow.h +++ b/kopete/kopete/chatwindow/kopeteemailwindow.h @@ -23,7 +23,7 @@ #include "kopeteview.h" #include "kopeteviewplugin.h" #include <kmainwindow.h> -#include <kparts/mainwindow.h> +#include <tdeparts/mainwindow.h> namespace KParts { struct URLArgs; } class EmailWindowPlugin; diff --git a/kopete/kopete/chatwindow/krichtexteditpart.cpp b/kopete/kopete/chatwindow/krichtexteditpart.cpp index a42fd718..6f3bdf25 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.cpp +++ b/kopete/kopete/chatwindow/krichtexteditpart.cpp @@ -9,7 +9,7 @@ #include <tqapplication.h> #include <tqclipboard.h> #include <tqevent.h> -#include <kparts/genericfactory.h> +#include <tdeparts/genericfactory.h> #include <tqrichtext_p.h> #include "krichtexteditpart.h" diff --git a/kopete/kopete/chatwindow/krichtexteditpart.h b/kopete/kopete/chatwindow/krichtexteditpart.h index 32050cd6..e5159d0f 100644 --- a/kopete/kopete/chatwindow/krichtexteditpart.h +++ b/kopete/kopete/chatwindow/krichtexteditpart.h @@ -3,7 +3,7 @@ #ifndef KRICHTEXTEDITPART_H #define KRICHTEXTEDITPART_H -#include <kparts/part.h> +#include <tdeparts/part.h> #include <tqfont.h> #include <tqcolor.h> diff --git a/kopete/kopete/chatwindow/tests/Makefile.am b/kopete/kopete/chatwindow/tests/Makefile.am index 40a864d6..cb5b1e45 100644 --- a/kopete/kopete/chatwindow/tests/Makefile.am +++ b/kopete/kopete/chatwindow/tests/Makefile.am @@ -1,17 +1,17 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \ $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/kopete/chatwindow -I$(top_srcdir)/kopete/libkopete $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/kopete/chatwindow/tests\" METASOURCES = AUTO -check_LTLIBRARIES = kunittest_chatwindowstyle_test.la kunittest_chatwindowstylerendering_test.la +check_LTLIBRARIES = tdeunittest_chatwindowstyle_test.la tdeunittest_chatwindowstylerendering_test.la -kunittest_chatwindowstyle_test_la_SOURCES = chatwindowstyle_test.cpp -kunittest_chatwindowstyle_test_la_LIBADD = -lkunittest ../libkopetechatwindow.la -kunittest_chatwindowstyle_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_chatwindowstyle_test_la_SOURCES = chatwindowstyle_test.cpp +tdeunittest_chatwindowstyle_test_la_LIBADD = -ltdeunittest ../libkopetechatwindow.la +tdeunittest_chatwindowstyle_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_chatwindowstylerendering_test_la_SOURCES = chatwindowstylerendering_test.cpp -kunittest_chatwindowstylerendering_test_la_LIBADD = -lkunittest ../../../libkopete/libkopete.la ../libkopetechatwindow.la -kunittest_chatwindowstylerendering_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_chatwindowstylerendering_test_la_SOURCES = chatwindowstylerendering_test.cpp +tdeunittest_chatwindowstylerendering_test_la_LIBADD = -ltdeunittest ../../../libkopete/libkopete.la ../libkopetechatwindow.la +tdeunittest_chatwindowstylerendering_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) check-local: - kunittestmodrunner + tdeunittestmodrunner guicheck: - kunittestmod $(PWD) + tdeunittestmod $(PWD) diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp index cd44bc02..e095b458 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.cpp @@ -15,7 +15,7 @@ ************************************************************************* */ -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include "chatwindowstyle_test.h" #include <stdlib.h> @@ -25,7 +25,7 @@ #include <kopetechatwindowstyle.h> -KUNITTEST_MODULE( kunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite"); +KUNITTEST_MODULE( tdeunittest_chatwindowstyle_test, "KopeteChatWindowTestSuite"); KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyle_Test ); void ChatWindowStyle_Test::allTests() diff --git a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h index 7cf2b912..4e7b9b73 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h +++ b/kopete/kopete/chatwindow/tests/chatwindowstyle_test.h @@ -17,7 +17,7 @@ #ifndef CHATWINDOWSTYLE_TEST_H #define CHATWINDOWSTYLE_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> class ChatWindowStyle; diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp index d195434d..27d54264 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.cpp @@ -28,7 +28,7 @@ // KDE includes #include <kapplication.h> -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include <kinstance.h> #include <kdebug.h> #include <kglobal.h> @@ -46,7 +46,7 @@ using namespace Kopete; -KUNITTEST_MODULE( kunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite"); +KUNITTEST_MODULE( tdeunittest_chatwindowstylerendering_test, "KopeteChatWindowTestSuite"); KUNITTEST_MODULE_REGISTER_TESTER( ChatWindowStyleRendering_Test ); // Reimplement Kopete::Contact and its abstract method diff --git a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h index 992d00a4..3f213d40 100644 --- a/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h +++ b/kopete/kopete/chatwindow/tests/chatwindowstylerendering_test.h @@ -17,7 +17,7 @@ #ifndef CHATWINDOWSTYLERENDERING_TEST_H #define CHATWINDOWSTYLERENDERING_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> // HACK: Needed to access private methods of ChatMessagePart. #define private public diff --git a/kopete/kopete/config/accounts/Makefile.am b/kopete/kopete/config/accounts/Makefile.am index 772b771e..139d9b2e 100644 --- a/kopete/kopete/config/accounts/Makefile.am +++ b/kopete/kopete/config/accounts/Makefile.am @@ -8,7 +8,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(KOPETE_COMPAT_INCLUDES) $(all_includes) -I$(k kde_module_LTLIBRARIES = kcm_kopete_accountconfig.la kcm_kopete_accountconfig_la_SOURCES = kopeteaccountconfigbase.ui kopeteaccountconfig.cpp -kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_accountconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_accountconfig_la_LIBADD = ../../../libkopete/libkopete.la ../../addaccountwizard/libkopeteaddaccountwizard.la $(LIB_KOPETECOMPAT) $(LIB_KUTILS) service_DATA = kopete_accountconfig.desktop diff --git a/kopete/kopete/config/appearance/CMakeLists.txt b/kopete/kopete/config/appearance/CMakeLists.txt index f24d022b..a0bdcb54 100644 --- a/kopete/kopete/config/appearance/CMakeLists.txt +++ b/kopete/kopete/config/appearance/CMakeLists.txt @@ -38,6 +38,6 @@ tde_add_kpart( kcm_kopete_appearanceconfig AUTOMOC appearanceconfig_emoticons.ui emoticonseditdialog.cpp emoticonseditwidget.ui tooltipeditdialog.cpp tooltipeditwidget.ui - LINK kopetechatwindow-static kopete-shared khtml-shared knewstuff-shared + LINK kopetechatwindow-static kopete-shared tdehtml-shared knewstuff-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/kopete/config/appearance/Makefile.am b/kopete/kopete/config/appearance/Makefile.am index f349297c..a555ef57 100644 --- a/kopete/kopete/config/appearance/Makefile.am +++ b/kopete/kopete/config/appearance/Makefile.am @@ -13,7 +13,7 @@ kcm_kopete_appearanceconfig_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) \ $(all_libraries) kcm_kopete_appearanceconfig_la_LIBADD = ../../../libkopete/libkopete.la \ ../../../kopete/chatwindow/libkopetechatwindow.la \ - -lktexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF) + -ltdetexteditor $(LIB_KOPETECOMPAT) $(LIB_KUTILS) $(LIB_KNEWSTUFF) service_DATA = kopete_appearanceconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/config/appearance/appearanceconfig.cpp b/kopete/kopete/config/appearance/appearanceconfig.cpp index 106622c9..63c51b89 100644 --- a/kopete/kopete/config/appearance/appearanceconfig.cpp +++ b/kopete/kopete/config/appearance/appearanceconfig.cpp @@ -48,7 +48,7 @@ #include <kfontrequester.h> #include <kgenericfactory.h> #include <kio/netaccess.h> -#include <khtmlview.h> +#include <tdehtmlview.h> #include <klineedit.h> #include <klocale.h> #include <kmessagebox.h> diff --git a/kopete/kopete/config/avdevice/Makefile.am b/kopete/kopete/config/avdevice/Makefile.am index a2542902..24ace923 100644 --- a/kopete/kopete/config/avdevice/Makefile.am +++ b/kopete/kopete/config/avdevice/Makefile.am @@ -8,7 +8,7 @@ kde_module_LTLIBRARIES = kcm_kopete_avdeviceconfig.la kcm_kopete_avdeviceconfig_la_SOURCES = avdeviceconfig.cpp \ avdeviceconfig_videoconfig.ui -kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_avdeviceconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_avdeviceconfig_la_LIBADD = ../../../libkopete/libkopete.la \ ../../../libkopete/avdevice/libkopete_videodevice.la \ diff --git a/kopete/kopete/config/behavior/Makefile.am b/kopete/kopete/config/behavior/Makefile.am index 6c504186..ef04b4ff 100644 --- a/kopete/kopete/config/behavior/Makefile.am +++ b/kopete/kopete/config/behavior/Makefile.am @@ -7,7 +7,7 @@ kcm_kopete_behaviorconfig_la_SOURCES = \ kopeteawayconfigbase.ui \ behaviorconfig_chat.ui behaviorconfig_general.ui behaviorconfig_events.ui behaviorconfig.cpp -kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_behaviorconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_behaviorconfig_la_LIBADD = ../../../libkopete/libkopete.la \ $(LIB_KOPETECOMPAT) $(LIB_KUTILS) diff --git a/kopete/kopete/config/identity/Makefile.am b/kopete/kopete/config/identity/Makefile.am index fc3a876e..1aa6721d 100644 --- a/kopete/kopete/config/identity/Makefile.am +++ b/kopete/kopete/config/identity/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kcm_kopete_identityconfig.la kcm_kopete_identityconfig_la_SOURCES = kopeteidentityconfigbase.ui \ kopeteidentityconfig.cpp globalidentitiesmanager.cpp kopeteidentityconfigpreferences.kcfgc kcm_kopete_identityconfig_la_LDFLAGS = -no-undefined -module $(KDE_PLUGIN) $(all_libraries) -kcm_kopete_identityconfig_la_LIBADD = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_identityconfig_la_LIBADD = -lkabc ../../../libkopete/libkopete.la $(LIB_KOPETECOMPAT) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor service_DATA = kopete_identityconfig.desktop servicedir = $(kde_servicesdir) diff --git a/kopete/kopete/contactlist/kopetecontactlistview.cpp b/kopete/kopete/contactlist/kopetecontactlistview.cpp index 200dfaf2..e271801e 100644 --- a/kopete/kopete/contactlist/kopetecontactlistview.cpp +++ b/kopete/kopete/contactlist/kopetecontactlistview.cpp @@ -42,7 +42,7 @@ #include <kmessagebox.h> #include <kpopupmenu.h> #include <kurldrag.h> -#include <kmultipledrag.h> +#include <tdemultipledrag.h> #include <kabc/stdaddressbook.h> #include <kabc/vcardconverter.h> diff --git a/kopete/kopete/kconf_update/Makefile.am b/kopete/kopete/kconf_update/Makefile.am index 8d05b1a2..7ae291dd 100644 --- a/kopete/kopete/kconf_update/Makefile.am +++ b/kopete/kopete/kconf_update/Makefile.am @@ -17,15 +17,15 @@ kconf_PROGRAMS = kopete-account-kconf_update kopete-pluginloader2-kconf_update \ kconfdir = $(libdir)/kconf_update_bin kopete_account_kconf_update_SOURCES = kopete-account-kconf_update.cpp -kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_account_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_account_kconf_update_LDADD = $(LIB_QT) kopete_pluginloader2_kconf_update_SOURCES = kopete-pluginloader2.cpp -kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_pluginloader2_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_pluginloader2_kconf_update_LDADD = $(LIB_QT) kopete_nameTracking_kconf_update_SOURCES = kopete-nameTracking.cpp -kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_nameTracking_kconf_update_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_nameTracking_kconf_update_LDADD = $(LIB_QT) $(LIB_TDECORE) # vim: set noet: diff --git a/kopete/libkopete/CMakeLists.txt b/kopete/libkopete/CMakeLists.txt index d012c2aa..1fb766dd 100644 --- a/kopete/libkopete/CMakeLists.txt +++ b/kopete/libkopete/CMakeLists.txt @@ -86,6 +86,6 @@ tde_add_library( kopete SHARED AUTOMOC kopeteprefs.cpp kopetepicture.cpp webcamwidget.cpp VERSION 1.0.0 EMBED kopeteui-static - LINK kopeteprivate-static kabc-shared kutils-shared khtml-shared + LINK kopeteprivate-static kabc-shared tdeutils-shared tdehtml-shared DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kopete/libkopete/avdevice/Makefile.am b/kopete/libkopete/avdevice/Makefile.am index 1df830a1..474d6a67 100644 --- a/kopete/libkopete/avdevice/Makefile.am +++ b/kopete/libkopete/avdevice/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_COMPAT -DQT_NO_CAST_ASCII -DQT_NO_ASCII_CA METASOURCES = AUTO lib_LTLIBRARIES = libkopete_videodevice.la noinst_LTLIBRARIES = libkvideoio.la -libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +libkopete_videodevice_la_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor noinst_HEADERS = kxv.h qvideo.h qvideostream.h videocontrol.h videodevice.h \ videodevicemodelpool.h videodevicepool.h videoinput.h \ diff --git a/kopete/libkopete/kopetepassword.cpp b/kopete/libkopete/kopetepassword.cpp index 57ff7da3..e56e0f5d 100644 --- a/kopete/libkopete/kopetepassword.cpp +++ b/kopete/libkopete/kopetepassword.cpp @@ -19,7 +19,7 @@ #include "kopetepassworddialog.h" #include "kopetewalletmanager.h" -#include <kwallet.h> +#include <tdewallet.h> #include <tqapplication.h> #include <tqlabel.h> diff --git a/kopete/libkopete/kopeteplugin.h b/kopete/libkopete/kopeteplugin.h index 1b56eb1c..c3dacdac 100644 --- a/kopete/libkopete/kopeteplugin.h +++ b/kopete/libkopete/kopeteplugin.h @@ -177,7 +177,7 @@ public: signals: /** * Notify that the settings of a plugin were changed. - * These changes are passed on from the new KCDialog code in tdelibs/kutils. + * These changes are passed on from the new KCDialog code in tdelibs/tdeutils. */ void settingsChanged(); diff --git a/kopete/libkopete/kopetepluginmanager.cpp b/kopete/libkopete/kopetepluginmanager.cpp index 204e26f0..a98b0fc3 100644 --- a/kopete/libkopete/kopetepluginmanager.cpp +++ b/kopete/libkopete/kopetepluginmanager.cpp @@ -35,7 +35,7 @@ #include <kapplication.h> #include <kdebug.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <kplugininfo.h> #include <ksimpleconfig.h> #include <kstandarddirs.h> diff --git a/kopete/libkopete/kopetewalletmanager.cpp b/kopete/libkopete/kopetewalletmanager.cpp index f17c73b8..6ab2a5af 100644 --- a/kopete/libkopete/kopetewalletmanager.cpp +++ b/kopete/libkopete/kopetewalletmanager.cpp @@ -20,7 +20,7 @@ #include <kdebug.h> #include <kstaticdeleter.h> -#include <kwallet.h> +#include <tdewallet.h> #include <tqtimer.h> #include <tqwidget.h> diff --git a/kopete/libkopete/tests/Makefile.am b/kopete/libkopete/tests/Makefile.am index 417ce2a8..3bb06d3d 100644 --- a/kopete/libkopete/tests/Makefile.am +++ b/kopete/libkopete/tests/Makefile.am @@ -3,22 +3,22 @@ AM_CPPFLAGS = -DKDE_NO_COMPAT -DQT_NO_ASCII_CAST -DQT_NO_COMPAT \ $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/private -I$(top_srcdir)/kopete/libkopete/tests/mock $(all_includes) -DSRCDIR=\"$(top_srcdir)/kopete/libkopete/tests\" METASOURCES = AUTO -check_LTLIBRARIES = kunittest_kopetemessage_test.la kunittest_kopetepropertiestest.la kunittest_kopetecontactlist_test.la -noinst_LTLIBRARIES = kunittest_kopeteemoticontest.la +check_LTLIBRARIES = tdeunittest_kopetemessage_test.la tdeunittest_kopetepropertiestest.la tdeunittest_kopetecontactlist_test.la +noinst_LTLIBRARIES = tdeunittest_kopeteemoticontest.la check_PROGRAMS = kopetewallettest_program kopetepasswordtest_program -kunittest_kopetepropertiestest_la_SOURCES = kopetepropertiestest.cpp ../kopeteproperties.cpp -kunittest_kopetepropertiestest_la_LIBADD = -lkunittest ../libkopete.la -kunittest_kopetepropertiestest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopetepropertiestest_la_SOURCES = kopetepropertiestest.cpp ../kopeteproperties.cpp +tdeunittest_kopetepropertiestest_la_LIBADD = -ltdeunittest ../libkopete.la +tdeunittest_kopetepropertiestest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kopeteemoticontest_la_SOURCES = kopeteemoticontest.cpp -kunittest_kopeteemoticontest_la_LIBADD = -lkunittest ../libkopete.la -kunittest_kopeteemoticontest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopeteemoticontest_la_SOURCES = kopeteemoticontest.cpp +tdeunittest_kopeteemoticontest_la_LIBADD = -ltdeunittest ../libkopete.la +tdeunittest_kopeteemoticontest_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) -kunittest_kopetemessage_test_la_SOURCES = kopetemessage_test.cpp -kunittest_kopetemessage_test_la_LIBADD = -lkunittest mock/libkopete_mock.la -kunittest_kopetemessage_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopetemessage_test_la_SOURCES = kopetemessage_test.cpp +tdeunittest_kopetemessage_test_la_LIBADD = -ltdeunittest mock/libkopete_mock.la +tdeunittest_kopetemessage_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) kopetewallettest_program_SOURCES = kopetewallettest_program.cpp kopetewallettest_program_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) @@ -28,14 +28,14 @@ kopetepasswordtest_program_SOURCES = kopetepasswordtest_program.cpp kopetepasswordtest_program_LDFLAGS = -no-undefined $(all_libraries) $(KDE_RPATH) kopetepasswordtest_program_LDADD = ../libkopete.la -kunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp -kunittest_kopetecontactlist_test_la_LIBADD = -lkunittest mock/libkopete_mock.la -kunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) +tdeunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp +tdeunittest_kopetecontactlist_test_la_LIBADD = -ltdeunittest mock/libkopete_mock.la +tdeunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) noinst_HEADERS = kopetepropertiestest.h kopeteemoticontest.h check-local: - kunittestmodrunner + tdeunittestmodrunner guicheck: - kunittestmod $(PWD) + tdeunittestmod $(PWD) diff --git a/kopete/libkopete/tests/README b/kopete/libkopete/tests/README index ead9fbdc..c8ee619b 100644 --- a/kopete/libkopete/tests/README +++ b/kopete/libkopete/tests/README @@ -42,6 +42,6 @@ Add a new test quickly: Creating test for class Kopete::ContactList kopetecontactlist_test.h and kopetecontactlist_test.cpp writen. Please add the following to Makefile.am: - kunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp - kunittest_kopetecontactlist_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la - kunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) + tdeunittest_kopetecontactlist_test_la_SOURCES = kopetecontactlist_test.cpp + tdeunittest_kopetecontactlist_test_la_LIBADD = -ltdeunittest ../mock/libkopete_mock.la + tdeunittest_kopetecontactlist_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries) diff --git a/kopete/libkopete/tests/create_test.rb b/kopete/libkopete/tests/create_test.rb index 7951bf35..e29a3267 100755 --- a/kopete/libkopete/tests/create_test.rb +++ b/kopete/libkopete/tests/create_test.rb @@ -37,7 +37,7 @@ fileCpp.gsub!(/template/, className.downcase.gsub(/::/,"")) fileCpp.gsub!(/Template/, className.gsub(/::/,"")) fileCpp.gsub!(/some requirement/, className + " class.") -makefileAm = "kunittest_template_test_la_SOURCES = template_test.cpp\nkunittest_template_test_la_LIBADD = -lkunittest ../mock/libkopete_mock.la\nkunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" +makefileAm = "tdeunittest_template_test_la_SOURCES = template_test.cpp\ntdeunittest_template_test_la_LIBADD = -ltdeunittest ../mock/libkopete_mock.la\ntdeunittest_template_test_la_LDFLAGS = -module $(KDE_CHECK_PLUGIN) $(all_libraries)\n" makefileAm.gsub!(/template/, className.downcase.gsub(/::/,"")) hNew = hBase.gsub(/template/, className.downcase.gsub(/::/,"")) diff --git a/kopete/libkopete/tests/kopetecontactlist_test.cpp b/kopete/libkopete/tests/kopetecontactlist_test.cpp index 5e43126d..6fb0db26 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.cpp +++ b/kopete/libkopete/tests/kopetecontactlist_test.cpp @@ -18,12 +18,12 @@ #include <tqfile.h> #include <tqdir.h> #include <kstandarddirs.h> -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include "kopetecontactlist_test.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopetecontactlist_test, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopetecontactlist_test, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopeteContactList_Test ); void KopeteContactList_Test::allTests() diff --git a/kopete/libkopete/tests/kopetecontactlist_test.h b/kopete/libkopete/tests/kopetecontactlist_test.h index faab1e48..cd246b60 100644 --- a/kopete/libkopete/tests/kopetecontactlist_test.h +++ b/kopete/libkopete/tests/kopetecontactlist_test.h @@ -18,7 +18,7 @@ #ifndef KOPETECONTACTLIST_TEST_H #define KOPETECONTACTLIST_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> // change to SlotTester when it works class KopeteContactList_Test : public KUnitTest::Tester diff --git a/kopete/libkopete/tests/kopeteemoticontest.cpp b/kopete/libkopete/tests/kopeteemoticontest.cpp index 83c0e64c..fe1f8a35 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.cpp +++ b/kopete/libkopete/tests/kopeteemoticontest.cpp @@ -27,14 +27,14 @@ #include <kstandarddirs.h> #include <kdebug.h> -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include "kopeteemoticontest.h" #include "kopetemessage.h" #include "kopeteemoticons.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopeteemoticontest, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopeteemoticontest, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopeteEmoticonTest ); /* diff --git a/kopete/libkopete/tests/kopeteemoticontest.h b/kopete/libkopete/tests/kopeteemoticontest.h index a885b2c4..cfc6e2f0 100644 --- a/kopete/libkopete/tests/kopeteemoticontest.h +++ b/kopete/libkopete/tests/kopeteemoticontest.h @@ -19,7 +19,7 @@ #ifndef KOPETE_EMOTICON_TEST_H #define KOPETE_EMOTICON_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> // change to SlotTester when it works class KopeteEmoticonTest : public KUnitTest::Tester diff --git a/kopete/libkopete/tests/kopetemessage_test.cpp b/kopete/libkopete/tests/kopetemessage_test.cpp index ff18f587..238bdb57 100644 --- a/kopete/libkopete/tests/kopetemessage_test.cpp +++ b/kopete/libkopete/tests/kopetemessage_test.cpp @@ -25,7 +25,7 @@ #include <kstandarddirs.h> #include <kinstance.h> #include <kprocess.h> -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include <kdebug.h> #include "kopetemessage_test.h" @@ -37,7 +37,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopetemessage_test, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopetemessage_test, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopeteMessage_Test ); /* diff --git a/kopete/libkopete/tests/kopetemessage_test.h b/kopete/libkopete/tests/kopetemessage_test.h index 52d09fb8..a42a2d6b 100644 --- a/kopete/libkopete/tests/kopetemessage_test.h +++ b/kopete/libkopete/tests/kopetemessage_test.h @@ -19,7 +19,7 @@ #ifndef KOPETEMESSAGE_TEST_H #define KOPETEMESSAGE_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> #define private public #include "kopetemessage.h" diff --git a/kopete/libkopete/tests/kopetepropertiestest.cpp b/kopete/libkopete/tests/kopetepropertiestest.cpp index 76b8ae79..e9405c66 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.cpp +++ b/kopete/libkopete/tests/kopetepropertiestest.cpp @@ -16,7 +16,7 @@ ************************************************************************* */ -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include "kopeteproperties.h" @@ -32,7 +32,7 @@ using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_kopetepropertiestest, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_kopetepropertiestest, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( KopetePropertiesTest ); using namespace Kopete::Properties; diff --git a/kopete/libkopete/tests/kopetepropertiestest.h b/kopete/libkopete/tests/kopetepropertiestest.h index c997dd80..be4a8b27 100644 --- a/kopete/libkopete/tests/kopetepropertiestest.h +++ b/kopete/libkopete/tests/kopetepropertiestest.h @@ -19,7 +19,7 @@ #ifndef KOPETE_PROPERTIES_TEST_H #define KOPETE_PROPERTIES_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> // change to SlotTester when it works class KopetePropertiesTest : public KUnitTest::Tester diff --git a/kopete/libkopete/tests/kopetewallettest_program.cpp b/kopete/libkopete/tests/kopetewallettest_program.cpp index 63467d34..74380115 100644 --- a/kopete/libkopete/tests/kopetewallettest_program.cpp +++ b/kopete/libkopete/tests/kopetewallettest_program.cpp @@ -24,7 +24,7 @@ #include <kglobal.h> #include <kstandarddirs.h> #include <dcopclient.h> -#include <kwallet.h> +#include <tdewallet.h> #include "kopetewalletmanager.h" #include "kopetewallettest_program.h" diff --git a/kopete/libkopete/tests/template_test.cpp b/kopete/libkopete/tests/template_test.cpp index 8598f79f..919d25e0 100644 --- a/kopete/libkopete/tests/template_test.cpp +++ b/kopete/libkopete/tests/template_test.cpp @@ -15,12 +15,12 @@ ************************************************************************* */ -#include <kunittest/module.h> +#include <tdeunittest/module.h> #include "template_test.h" using namespace KUnitTest; -KUNITTEST_MODULE( kunittest_template_test, "KopeteSuite"); +KUNITTEST_MODULE( tdeunittest_template_test, "KopeteSuite"); KUNITTEST_MODULE_REGISTER_TESTER( Template_Test ); void Template_Test::allTests() diff --git a/kopete/libkopete/tests/template_test.h b/kopete/libkopete/tests/template_test.h index 4d0f1617..28c73ea3 100644 --- a/kopete/libkopete/tests/template_test.h +++ b/kopete/libkopete/tests/template_test.h @@ -18,7 +18,7 @@ #ifndef TEMPLATE_TEST_H #define TEMPLATE_TEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> // change to SlotTester when it works class Template_Test : public KUnitTest::Tester diff --git a/kopete/libkopete/ui/userinfodialog.cpp b/kopete/libkopete/ui/userinfodialog.cpp index 560abb97..99c306f8 100644 --- a/kopete/libkopete/ui/userinfodialog.cpp +++ b/kopete/libkopete/ui/userinfodialog.cpp @@ -18,7 +18,7 @@ #include "userinfodialog.h" #include "kopeteuiglobal.h" -#include <khtml_part.h> +#include <tdehtml_part.h> #include <ktextbrowser.h> #include <kapplication.h> #include <klineedit.h> diff --git a/kopete/plugins/addbookmarks/Makefile.am b/kopete/plugins/addbookmarks/Makefile.am index e4bcdb32..1a6d19df 100644 --- a/kopete/plugins/addbookmarks/Makefile.am +++ b/kopete/plugins/addbookmarks/Makefile.am @@ -6,11 +6,11 @@ noinst_HEADERS = addbookmarksplugin.h addbookmarkspreferences.h \ kde_module_LTLIBRARIES = kopete_addbookmarks.la kcm_kopete_addbookmarks.la -kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la kopete_addbookmarks_la_SOURCES = addbookmarksplugin.cpp addbookmarksprefssettings.cpp -kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_addbookmarks_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_addbookmarks_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) kcm_kopete_addbookmarks_la_SOURCES = addbookmarkspreferences.cpp addbookmarksprefsui.ui \ addbookmarksprefssettings.cpp diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am index e1cd60e6..2172da71 100644 --- a/kopete/plugins/alias/Makefile.am +++ b/kopete/plugins/alias/Makefile.am @@ -4,11 +4,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_alias.la kcm_kopete_alias.la kopete_alias_la_SOURCES = aliasplugin.cpp -kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_alias_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_alias_la_SOURCES = aliaspreferences.cpp aliasdialogbase.ui aliasdialog.ui editaliasdialog.cpp -kcm_kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_alias_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_alias_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) ../../libkopete/libkopete.la service_DATA = kopete_alias.desktop diff --git a/kopete/plugins/autoreplace/Makefile.am b/kopete/plugins/autoreplace/Makefile.am index 58a9b269..e6363ae3 100644 --- a/kopete/plugins/autoreplace/Makefile.am +++ b/kopete/plugins/autoreplace/Makefile.am @@ -6,11 +6,11 @@ SUBDIRS = icons kde_module_LTLIBRARIES = kopete_autoreplace.la kcm_kopete_autoreplace.la kopete_autoreplace_la_SOURCES = autoreplaceplugin.cpp autoreplaceconfig.cpp -kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_autoreplace_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_autoreplace_la_SOURCES = autoreplacepreferences.cpp autoreplaceconfig.cpp autoreplaceprefs.ui -kcm_kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_autoreplace_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_autoreplace_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_autoreplace.desktop diff --git a/kopete/plugins/connectionstatus/Makefile.am b/kopete/plugins/connectionstatus/Makefile.am index 88bfb0d4..11e3aee9 100644 --- a/kopete/plugins/connectionstatus/Makefile.am +++ b/kopete/plugins/connectionstatus/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_connectionstatus.la kopete_connectionstatus_la_SOURCES = connectionstatusplugin.cpp -kopete_connectionstatus_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_connectionstatus_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_connectionstatus_la_LIBADD = ../../libkopete/libkopete.la service_DATA = kopete_connectionstatus.desktop diff --git a/kopete/plugins/contactnotes/Makefile.am b/kopete/plugins/contactnotes/Makefile.am index 2791cf96..3e8705b6 100644 --- a/kopete/plugins/contactnotes/Makefile.am +++ b/kopete/plugins/contactnotes/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) 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) -lktexteditor +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 service_DATA = kopete_contactnotes.desktop diff --git a/kopete/plugins/cryptography/Makefile.am b/kopete/plugins/cryptography/Makefile.am index 863124d5..90c4c586 100644 --- a/kopete/plugins/cryptography/Makefile.am +++ b/kopete/plugins/cryptography/Makefile.am @@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_cryptography.la kcm_kopete_cryptography.la kopete_cryptography_la_SOURCES = cryptographyplugin.cpp kgpginterface.cpp cryptographyguiclient.cpp cryptographyselectuserkey.cpp cryptographyuserkey_ui.ui popuppublic.cpp kgpgselkey.cpp -kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_cryptography_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_cryptography_la_SOURCES = cryptographypreferences.cpp cryptographyprefsbase.ui kgpgselkey.cpp -kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_cryptography_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_cryptography_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_cryptography.desktop diff --git a/kopete/plugins/highlight/CMakeLists.txt b/kopete/plugins/highlight/CMakeLists.txt index 312252bf..78da77b7 100644 --- a/kopete/plugins/highlight/CMakeLists.txt +++ b/kopete/plugins/highlight/CMakeLists.txt @@ -47,6 +47,6 @@ tde_add_kpart( kcm_kopete_highlight AUTOMOC SOURCES highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/highlight/Makefile.am b/kopete/plugins/highlight/Makefile.am index f8ca5f88..489f911c 100644 --- a/kopete/plugins/highlight/Makefile.am +++ b/kopete/plugins/highlight/Makefile.am @@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_highlight.la kcm_kopete_highlight.la kopete_highlight_la_SOURCES = highlightplugin.cpp highlightconfig.cpp filter.cpp -kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_highlight_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_highlight_la_SOURCES = highlightprefsbase.ui highlightpreferences.cpp filter.cpp highlightconfig.cpp -kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_highlight_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_highlight_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) service_DATA = kopete_highlight.desktop diff --git a/kopete/plugins/highlight/highlightpreferences.cpp b/kopete/plugins/highlight/highlightpreferences.cpp index a96e1475..875a0dee 100644 --- a/kopete/plugins/highlight/highlightpreferences.cpp +++ b/kopete/plugins/highlight/highlightpreferences.cpp @@ -20,7 +20,7 @@ #include <kcombobox.h> #include <klineedit.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <klocale.h> #include <klistview.h> #include <kgenericfactory.h> diff --git a/kopete/plugins/history/CMakeLists.txt b/kopete/plugins/history/CMakeLists.txt index 4d118d91..aed227fc 100644 --- a/kopete/plugins/history/CMakeLists.txt +++ b/kopete/plugins/history/CMakeLists.txt @@ -39,7 +39,7 @@ tde_add_kpart( kopete_history AUTOMOC historyplugin.cpp historydialog.cpp historyviewer.ui historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc - LINK kopete-shared khtml-shared + LINK kopete-shared tdehtml-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am index 529defb1..c5139402 100644 --- a/kopete/plugins/history/Makefile.am +++ b/kopete/plugins/history/Makefile.am @@ -7,11 +7,11 @@ kde_module_LTLIBRARIES = kopete_history.la kcm_kopete_history.la kopete_history_la_SOURCES = historyplugin.cpp historydialog.cpp historyviewer.ui\ historylogger.cpp converter.cpp historyguiclient.cpp historyconfig.kcfgc -kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) $(LIB_KUTILS) +kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) $(LIB_KUTILS) kopete_history_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_history_la_SOURCES = historyprefsui.ui historypreferences.cpp historyconfig.kcfgc -kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) $(LIB_KUTILS) +kcm_kopete_history_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) $(LIB_KUTILS) kcm_kopete_history_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_history.desktop diff --git a/kopete/plugins/history/historydialog.cpp b/kopete/plugins/history/historydialog.cpp index 09c349f1..708b85fc 100644 --- a/kopete/plugins/history/historydialog.cpp +++ b/kopete/plugins/history/historydialog.cpp @@ -29,8 +29,8 @@ #include <dom/dom_element.h> #include <dom/html_document.h> #include <dom/html_element.h> -#include <khtml_part.h> -#include <khtmlview.h> +#include <tdehtml_part.h> +#include <tdehtmlview.h> #include <tqpushbutton.h> #include <tqlineedit.h> diff --git a/kopete/plugins/latex/CMakeLists.txt b/kopete/plugins/latex/CMakeLists.txt index d1739d2d..d71dc85d 100644 --- a/kopete/plugins/latex/CMakeLists.txt +++ b/kopete/plugins/latex/CMakeLists.txt @@ -48,6 +48,6 @@ tde_add_kpart( kopete_latex AUTOMOC tde_add_kpart( kcm_kopete_latex AUTOMOC SOURCES latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/latex/Makefile.am b/kopete/plugins/latex/Makefile.am index bede90cc..7d71f9f1 100644 --- a/kopete/plugins/latex/Makefile.am +++ b/kopete/plugins/latex/Makefile.am @@ -7,11 +7,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_latex.la kcm_kopete_latex.la kopete_latex_la_SOURCES = latexplugin.cpp latexconfig.kcfgc latexguiclient.cpp -kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_latex_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_latex_la_SOURCES = latexprefsbase.ui latexpreferences.cpp latexconfig.kcfgc -kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_latex_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_latex_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) service_DATA = kopete_latex.desktop diff --git a/kopete/plugins/latex/latexpreferences.cpp b/kopete/plugins/latex/latexpreferences.cpp index 09c388e7..9014fff1 100644 --- a/kopete/plugins/latex/latexpreferences.cpp +++ b/kopete/plugins/latex/latexpreferences.cpp @@ -16,7 +16,7 @@ */ #include <tqlayout.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <klocale.h> #include <kgenericfactory.h> #include <kdebug.h> diff --git a/kopete/plugins/motionautoaway/CMakeLists.txt b/kopete/plugins/motionautoaway/CMakeLists.txt index bc750e89..650766ef 100644 --- a/kopete/plugins/motionautoaway/CMakeLists.txt +++ b/kopete/plugins/motionautoaway/CMakeLists.txt @@ -46,6 +46,6 @@ tde_add_kpart( kcm_kopete_motionaway AUTOMOC SOURCES motionawayprefs.ui motionawaypreferences.cpp motionawayconfig.kcfgc - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/netmeeting/CMakeLists.txt b/kopete/plugins/netmeeting/CMakeLists.txt index 318b6724..a53e1ff2 100644 --- a/kopete/plugins/netmeeting/CMakeLists.txt +++ b/kopete/plugins/netmeeting/CMakeLists.txt @@ -51,6 +51,6 @@ tde_add_kpart( kopete_netmeeting AUTOMOC tde_add_kpart( kcm_kopete_netmeeting AUTOMOC SOURCES netmeetingprefs_ui.ui netmeetingpreferences.cpp - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/netmeeting/Makefile.am b/kopete/plugins/netmeeting/Makefile.am index 7e9f4088..1710f136 100644 --- a/kopete/plugins/netmeeting/Makefile.am +++ b/kopete/plugins/netmeeting/Makefile.am @@ -5,7 +5,7 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/msn $(all_incl kde_module_LTLIBRARIES = kopete_netmeeting.la kcm_kopete_netmeeting.la kopete_netmeeting_la_SOURCES = netmeetingplugin.cpp netmeetinginvitation.cpp netmeetingguiclient.cpp -kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_netmeeting_la_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la $(top_builddir)/kopete/protocols/msn/libkopete_msn_shared.la service_DATA = kopete_netmeeting.desktop @@ -15,7 +15,7 @@ mydatadir = $(kde_datadir)/kopete_netmeeting mydata_DATA = netmeetingchatui.rc kcm_kopete_netmeeting_la_SOURCES = netmeetingprefs_ui.ui netmeetingpreferences.cpp -kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_netmeeting_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_netmeeting_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp index d5d7f01b..9981351d 100644 --- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp +++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp @@ -19,7 +19,7 @@ #include <kcombobox.h> #include <klineedit.h> -#include <kparts/componentfactory.h> +#include <tdeparts/componentfactory.h> #include <klocale.h> #include <kconfig.h> #include <kglobal.h> diff --git a/kopete/plugins/nowlistening/CMakeLists.txt b/kopete/plugins/nowlistening/CMakeLists.txt index a236a7e2..55e1a5ca 100644 --- a/kopete/plugins/nowlistening/CMakeLists.txt +++ b/kopete/plugins/nowlistening/CMakeLists.txt @@ -52,6 +52,6 @@ tde_add_kpart( kcm_kopete_nowlistening AUTOMOC SOURCES nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc - LINK kutils-shared + LINK tdeutils-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/nowlistening/Makefile.am b/kopete/plugins/nowlistening/Makefile.am index 495e5533..8d991f3a 100644 --- a/kopete/plugins/nowlistening/Makefile.am +++ b/kopete/plugins/nowlistening/Makefile.am @@ -5,11 +5,11 @@ AM_CPPFLAGS = $(KOPETE_INCLUDES) $(XMMS_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_nowlistening.la kcm_kopete_nowlistening.la kopete_nowlistening_la_SOURCES = nowlisteningconfig.kcfgc nowlisteningplugin.cpp nlkscd.cpp nlnoatun.cpp nlxmms.cpp nowlisteningguiclient.cpp nljuk.cpp nlamarok.cpp nlkaffeine.cpp -kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_nowlistening_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_nowlistening_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_nowlistening_la_SOURCES = nowlisteningprefs.ui nowlisteningpreferences.cpp nowlisteningconfig.kcfgc -kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_nowlistening_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_nowlistening_la_LIBADD = $(LIB_KOPETECOMPAT) $(LIB_KUTILS) service_DATA = kopete_nowlistening.desktop diff --git a/kopete/plugins/smpppdcs/unittest/Makefile.am b/kopete/plugins/smpppdcs/unittest/Makefile.am index 093f425d..3fc4fcee 100644 --- a/kopete/plugins/smpppdcs/unittest/Makefile.am +++ b/kopete/plugins/smpppdcs/unittest/Makefile.am @@ -5,11 +5,11 @@ METASOURCES = AUTO check_PROGRAMS = smpppdcstests smpppdcstests_SOURCES = main.cpp clienttest.cpp -smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -lkunittestgui +smpppdcstests_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor +smpppdcstests_LDADD = ../libsmpppdclient/libsmpppdclient.la -ltdeunittestgui noinst_HEADERS = clienttest.h check: - kunittest ./smpppdcstests ClientTest + tdeunittest ./smpppdcstests ClientTest diff --git a/kopete/plugins/smpppdcs/unittest/clienttest.h b/kopete/plugins/smpppdcs/unittest/clienttest.h index 2892d572..2d46aebf 100644 --- a/kopete/plugins/smpppdcs/unittest/clienttest.h +++ b/kopete/plugins/smpppdcs/unittest/clienttest.h @@ -17,7 +17,7 @@ #ifndef CLIENTTEST_H #define CLIENTTEST_H -#include <kunittest/tester.h> +#include <tdeunittest/tester.h> /** @author Heiko Schäfer <[email protected]> diff --git a/kopete/plugins/smpppdcs/unittest/main.cpp b/kopete/plugins/smpppdcs/unittest/main.cpp index 41153444..5eda8cb2 100644 --- a/kopete/plugins/smpppdcs/unittest/main.cpp +++ b/kopete/plugins/smpppdcs/unittest/main.cpp @@ -19,7 +19,7 @@ #include <kcmdlineargs.h> #include <kcmdlineargs.h> #include <klocale.h> -#include <kunittest/runnergui.h> +#include <tdeunittest/runnergui.h> #include "clienttest.h" diff --git a/kopete/plugins/statistics/CMakeLists.txt b/kopete/plugins/statistics/CMakeLists.txt index 629aa9c7..3d6543a8 100644 --- a/kopete/plugins/statistics/CMakeLists.txt +++ b/kopete/plugins/statistics/CMakeLists.txt @@ -40,6 +40,6 @@ tde_add_kpart( kopete_statistics AUTOMOC SOURCES statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel - LINK kopete-shared khtml-shared ${SQLITE_LIBRARIES} + LINK kopete-shared tdehtml-shared ${SQLITE_LIBRARIES} DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kopete/plugins/statistics/Makefile.am b/kopete/plugins/statistics/Makefile.am index 49c24331..93a8e28a 100644 --- a/kopete/plugins/statistics/Makefile.am +++ b/kopete/plugins/statistics/Makefile.am @@ -6,7 +6,7 @@ kde_module_LTLIBRARIES = kopete_statistics.la kopete_statistics_la_SOURCES = statisticsplugin.cpp statisticsdb.cpp statisticsdialog.cpp statisticswidget.ui statisticscontact.cpp statisticsdcopiface.skel -kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor $(LIB_KHTML) +kopete_statistics_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) -lsqlite3 $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) kopete_statistics_la_LIBADD = ../../libkopete/libkopete.la -lsqlite3 service_DATA = kopete_statistics.desktop diff --git a/kopete/plugins/statistics/statisticsdialog.cpp b/kopete/plugins/statistics/statisticsdialog.cpp index a4bd07cf..ad7adb9e 100644 --- a/kopete/plugins/statistics/statisticsdialog.cpp +++ b/kopete/plugins/statistics/statisticsdialog.cpp @@ -26,7 +26,7 @@ #include "kdialogbase.h" #include "klocale.h" #include "klistview.h" -#include "khtml_part.h" +#include "tdehtml_part.h" #include "kstandarddirs.h" #include "kdatepicker.h" #include "ktimewidget.h" diff --git a/kopete/plugins/texteffect/Makefile.am b/kopete/plugins/texteffect/Makefile.am index 058b4c81..ee008e27 100644 --- a/kopete/plugins/texteffect/Makefile.am +++ b/kopete/plugins/texteffect/Makefile.am @@ -6,11 +6,11 @@ INCLUDES = $(KOPETE_INCLUDES) $(all_includes) kde_module_LTLIBRARIES = kopete_texteffect.la kcm_kopete_texteffect.la kopete_texteffect_la_SOURCES = texteffectplugin.cpp texteffectconfig.cpp -kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_texteffect_la_LIBADD = ../../libkopete/libkopete.la kcm_kopete_texteffect_la_SOURCES = texteffectconfig.cpp texteffectprefs.ui texteffectpreferences.cpp -kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_texteffect_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_texteffect_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_texteffect.desktop diff --git a/kopete/plugins/translator/Makefile.am b/kopete/plugins/translator/Makefile.am index ef44f573..679c1ed8 100644 --- a/kopete/plugins/translator/Makefile.am +++ b/kopete/plugins/translator/Makefile.am @@ -6,11 +6,11 @@ kde_module_LTLIBRARIES = kopete_translator.la kcm_kopete_translator.la kopete_translator_la_SOURCES = translatorplugin.cpp \ translatordialog.cpp translatorguiclient.cpp translatorlanguages.cpp -kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_translator_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KIO) kcm_kopete_translator_la_SOURCES = translatorprefsbase.ui translatorprefs.cpp translatorlanguages.cpp -kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_translator_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_translator_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_translator.desktop diff --git a/kopete/plugins/webpresence/Makefile.am b/kopete/plugins/webpresence/Makefile.am index 8dc0c1e9..6785efca 100644 --- a/kopete/plugins/webpresence/Makefile.am +++ b/kopete/plugins/webpresence/Makefile.am @@ -6,11 +6,11 @@ kde_module_LTLIBRARIES = kopete_webpresence.la kcm_kopete_webpresence.la kopete_webpresence_la_SOURCES = webpresenceplugin.cpp -kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_webpresence_la_LIBADD = ../../libkopete/libkopete.la $(LIBXML_LIBS) $(LIBXSLT_LIBS) kcm_kopete_webpresence_la_SOURCES = webpresencepreferences.cpp webpresenceprefs.ui -kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor +kcm_kopete_webpresence_la_LDFLAGS = -module -no-undefined $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kcm_kopete_webpresence_la_LIBADD = ../../libkopete/libkopete.la $(LIB_KUTILS) service_DATA = kopete_webpresence.desktop diff --git a/kopete/protocols/gadu/Makefile.am b/kopete/protocols/gadu/Makefile.am index 0bf17f76..442f8aea 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) -lktexteditor -lgadu +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_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 3e44ad06..51ac5463 100644 --- a/kopete/protocols/groupwise/Makefile.am +++ b/kopete/protocols/groupwise/Makefile.am @@ -12,7 +12,7 @@ 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) -lktexteditor + $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_groupwise_la_LIBADD = ui/libkopetegroupwiseui.la \ libgroupwise/libgroupwise.la ../../libkopete/libkopete.la $(LIB_KIO) diff --git a/kopete/protocols/irc/Makefile.am b/kopete/protocols/irc/Makefile.am index 730e5352..37e27bad 100644 --- a/kopete/protocols/irc/Makefile.am +++ b/kopete/protocols/irc/Makefile.am @@ -22,7 +22,7 @@ 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) -lktexteditor $(LIB_KHTML) +kopete_irc_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor $(LIB_KHTML) kopete_irc_la_LIBADD = ../../libkopete/libkopete.la \ ./ui/libkopeteircui.la \ ./libkirc/libkirc.la \ diff --git a/kopete/protocols/jabber/Makefile.am b/kopete/protocols/jabber/Makefile.am index f0c6486d..f1706949 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) -lktexteditor +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_LIBADD = $(top_builddir)/kopete/libkopete/libkopete.la \ ui/libkopetejabberui.la \ libiris/iris/include/libiris.la \ diff --git a/kopete/protocols/jabber/kioslave/Makefile.am b/kopete/protocols/jabber/kioslave/Makefile.am index 3f3c0345..be3b2112 100644 --- a/kopete/protocols/jabber/kioslave/Makefile.am +++ b/kopete/protocols/jabber/kioslave/Makefile.am @@ -14,7 +14,7 @@ kde_module_LTLIBRARIES = kio_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) -lktexteditor +kio_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/meanwhile/Makefile.am b/kopete/protocols/meanwhile/Makefile.am index 760200e3..54728267 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) -lktexteditor + $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -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 29f25337..da3fbcb1 100644 --- a/kopete/protocols/msn/Makefile.am +++ b/kopete/protocols/msn/Makefile.am @@ -26,12 +26,12 @@ libkopete_msn_shared_la_SOURCES = msnprotocol.cpp msnaccount.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) -lktexteditor -lkopete_videodevice -L../../libkopete/avdevice/ +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/ 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) -lktexteditor -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_KIO) -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 c136b6ef..b5e2026a 100644 --- a/kopete/protocols/msn/config/Makefile.am +++ b/kopete/protocols/msn/config/Makefile.am @@ -4,7 +4,7 @@ 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) -lktexteditor +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) service_DATA = kopete_msn_config.desktop diff --git a/kopete/protocols/oscar/aim/Makefile.am b/kopete/protocols/oscar/aim/Makefile.am index 1ecf5fe5..616a5501 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) -lktexteditor +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_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 3505909c..dc2e491a 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) -lktexteditor +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_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 57f993f2..2e1fad6a 100644 --- a/kopete/protocols/oscar/liboscar/tests/Makefile.am +++ b/kopete/protocols/oscar/liboscar/tests/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = $(all_includes) $(KOPETE_INCLUDES) -I$(top_srcdir)/kopete/protocols/oscar/liboscar METASOURCES = AUTO -check_PROGRAMS = kunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest +check_PROGRAMS = tdeunittest clientstream_test logintest userinfotest ssigrouptest redirecttest ipaddrtest -kunittest_SOURCES = main.cpp kunittest.cpp chatnavtests.cpp -kunittest_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor -kunittest_LDADD = $(LIB_TDECORE) ../liboscar.la +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_LDADD = $(LIB_TDECORE) ../liboscar.la clientstream_test_SOURCES = clientstream_test.cpp clientstream_test_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la @@ -24,5 +24,5 @@ redirecttest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la ipaddrtest_SOURCES = ipaddrtest.cpp ipaddrtest_LDADD = $(LIB_QT) $(LIB_TDECORE) ../liboscar.la -check: kunittest - @./kunittest 2>&1 | grep "tests:" +check: tdeunittest + @./tdeunittest 2>&1 | grep "tests:" diff --git a/kopete/protocols/oscar/liboscar/tests/main.cpp b/kopete/protocols/oscar/liboscar/tests/main.cpp index 49966924..03138cd1 100644 --- a/kopete/protocols/oscar/liboscar/tests/main.cpp +++ b/kopete/protocols/oscar/liboscar/tests/main.cpp @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "kunittest.h" +#include "tdeunittest.h" int main( int argc, char** argv ) { diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp index d40f0069..d634f5b9 100644 --- a/kopete/protocols/oscar/liboscar/tests/kunittest.cpp +++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.cpp @@ -1,5 +1,5 @@ /** - * kunittest.cpp + * tdeunittest.cpp * * Copyright (C) 2004 Zack Rusin <[email protected]> * @@ -24,7 +24,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include "kunittest.h" +#include "tdeunittest.h" #include "tester.h" #include "chatnavtests.h" @@ -164,4 +164,4 @@ void KUnitTest::qtesterDone( TQObject *obj ) // tqApp->quit(); } -#include "kunittest.moc" +#include "tdeunittest.moc" diff --git a/kopete/protocols/oscar/liboscar/tests/kunittest.h b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h index b5173e1a..d3ceee97 100644 --- a/kopete/protocols/oscar/liboscar/tests/kunittest.h +++ b/kopete/protocols/oscar/liboscar/tests/tdeunittest.h @@ -1,5 +1,5 @@ /** - * kunittest.h + * tdeunittest.h * * Copyright (C) 2004 Zack Rusin <[email protected]> * diff --git a/kopete/protocols/testbed/Makefile.am b/kopete/protocols/testbed/Makefile.am index e68fe392..f7da072c 100644 --- a/kopete/protocols/testbed/Makefile.am +++ b/kopete/protocols/testbed/Makefile.am @@ -7,7 +7,7 @@ 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) -lktexteditor +kopete_testbed_la_LDFLAGS = -module $(KDE_PLUGIN) $(all_libraries) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_testbed_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \ ui/libkopetetestbedui.la ../../libkopete/libkopete.la $(LIB_KIO) diff --git a/kopete/protocols/winpopup/Makefile.am b/kopete/protocols/winpopup/Makefile.am index e80e8265..2bb8a143 100644 --- a/kopete/protocols/winpopup/Makefile.am +++ b/kopete/protocols/winpopup/Makefile.am @@ -11,7 +11,7 @@ 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) -lktexteditor +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_LIBADD = ../../libkopete/libkopete.la ./ui/libkopetewpui.la \ ./libwinpopup/libwinpopup.la $(LIB_KIO) diff --git a/kopete/protocols/yahoo/Makefile.am b/kopete/protocols/yahoo/Makefile.am index ce246298..384188a9 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) -lktexteditor +kopete_yahoo_la_LDFLAGS = -module $(KDE_PLUGIN) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -ltdetexteditor kopete_yahoo_la_LIBADD = ../../libkopete/avdevice/libkopete_videodevice.la \ $(top_builddir)/kopete/libkopete/libkopete.la ui/libkopeteyahooui.la libkyahoo/libkyahoo.la |