diff options
Diffstat (limited to 'kopete/plugins')
30 files changed, 45 insertions, 45 deletions
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 |