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/plugins/history | |
| 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/plugins/history')
| -rw-r--r-- | kopete/plugins/history/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/Makefile.am | 4 | ||||
| -rw-r--r-- | kopete/plugins/history/historydialog.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
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> |