diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:58 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:58 -0600 |
| commit | b10a61b1fd2fe561ba61a384d4a344bae2a4aa29 (patch) | |
| tree | 99dc6b2584265b2df91f7dbc1dcbf7a54efd205e /kopete/plugins/alias | |
| 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/alias')
| -rw-r--r-- | kopete/plugins/alias/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kopete/plugins/alias/Makefile.am | 2 | ||||
| -rw-r--r-- | kopete/plugins/alias/aliaspreferences.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kopete/plugins/alias/CMakeLists.txt b/kopete/plugins/alias/CMakeLists.txt index d8ca2088..dfbc7c1b 100644 --- a/kopete/plugins/alias/CMakeLists.txt +++ b/kopete/plugins/alias/CMakeLists.txt @@ -26,7 +26,7 @@ link_directories( ##### other data ################################ install( FILES kopete_alias.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) -install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kopete_alias_config.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kopete_alias (module) ##################### diff --git a/kopete/plugins/alias/Makefile.am b/kopete/plugins/alias/Makefile.am index 2172da71..ee84eb0c 100644 --- a/kopete/plugins/alias/Makefile.am +++ b/kopete/plugins/alias/Makefile.am @@ -15,5 +15,5 @@ service_DATA = kopete_alias.desktop servicedir = $(kde_servicesdir) kcm_DATA = kopete_alias_config.desktop -kcmdir = $(kde_servicesdir)/kconfiguredialog +kcmdir = $(kde_servicesdir)/tdeconfiguredialog diff --git a/kopete/plugins/alias/aliaspreferences.cpp b/kopete/plugins/alias/aliaspreferences.cpp index 4ffa9d27..f81da475 100644 --- a/kopete/plugins/alias/aliaspreferences.cpp +++ b/kopete/plugins/alias/aliaspreferences.cpp @@ -14,7 +14,7 @@ #include <kglobal.h> #include <kgenericfactory.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqregexp.h> #include <tqlayout.h> #include <kplugininfo.h> |