diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:04:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:04:58 -0600 |
| commit | b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch) | |
| tree | 99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete/plugins/history | |
| parent | 64c3be47ff36e40035ead93f913aeeb1e4f85e4b (diff) | |
| download | tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.tar.gz tdenetwork-b10a61b1fd2fe561ba61a384d4a344bae2a4aa29.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 | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/converter.cpp | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyconfig.kcfgc | 2 | ||||
| -rw-r--r-- | kopete/plugins/history/historyplugin.cpp | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kopete/plugins/history/CMakeLists.txt b/kopete/plugins/history/CMakeLists.txt index aed227fc..8f44c108 100644 --- a/kopete/plugins/history/CMakeLists.txt +++ b/kopete/plugins/history/CMakeLists.txt @@ -28,7 +28,7 @@ link_directories( install( FILES kopete_history.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) install( FILES historyui.rc historychatui.rc DESTINATION ${DATA_INSTALL_DIR}/kopete_history ) -install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_history_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES historyconfig.kcfg DESTINATION ${KCFG_INSTALL_DIR} ) diff --git a/kopete/plugins/history/Makefile.am b/kopete/plugins/history/Makefile.am index c5139402..b43b8ed4 100644 --- a/kopete/plugins/history/Makefile.am +++ b/kopete/plugins/history/Makefile.am @@ -21,6 +21,6 @@ mydatadir = $(kde_datadir)/kopete_history mydata_DATA = historyui.rc historychatui.rc kcm_DATA = kopete_history_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog kde_kcfg_DATA = historyconfig.kcfg diff --git a/kopete/plugins/history/converter.cpp b/kopete/plugins/history/converter.cpp index 1c5c573d..34d2a426 100644 --- a/kopete/plugins/history/converter.cpp +++ b/kopete/plugins/history/converter.cpp @@ -20,7 +20,7 @@ #include "kopeteprotocol.h" #include "kopeteuiglobal.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/kopete/plugins/history/historyconfig.kcfgc b/kopete/plugins/history/historyconfig.kcfgc index 1e985622..8439dc23 100644 --- a/kopete/plugins/history/historyconfig.kcfgc +++ b/kopete/plugins/history/historyconfig.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=historyconfig.kcfg ClassName=HistoryConfig Singleton=true diff --git a/kopete/plugins/history/historyplugin.cpp b/kopete/plugins/history/historyplugin.cpp index ce579ea8..c9dc5fd6 100644 --- a/kopete/plugins/history/historyplugin.cpp +++ b/kopete/plugins/history/historyplugin.cpp @@ -19,7 +19,7 @@ #include <kaboutdata.h> #include <kaction.h> #include <kmessagebox.h> -//#include <kconfig.h> +//#include <tdeconfig.h> #include <kplugininfo.h> #include <tdeversion.h> |