diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-26 13:17:21 -0600 |
| commit | dfe289850f068f19ba4a83ab4e7e22a7e09c13c9 (patch) | |
| tree | c297348a55df66c571de4525646e0b9762427353 /kabc/plugins/net | |
| parent | b7658a0d5eca24a9d37c6e04f88298ef02389db0 (diff) | |
| download | tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.tar.gz tdelibs-dfe289850f068f19ba4a83ab4e7e22a7e09c13c9.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kabc/plugins/net')
| -rw-r--r-- | kabc/plugins/net/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kabc/plugins/net/Makefile.am | 2 | ||||
| -rw-r--r-- | kabc/plugins/net/resourcenetconfig.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kabc/plugins/net/CMakeLists.txt b/kabc/plugins/net/CMakeLists.txt index 5433af217..365922d6c 100644 --- a/kabc/plugins/net/CMakeLists.txt +++ b/kabc/plugins/net/CMakeLists.txt @@ -39,7 +39,7 @@ install( FILES ##### other data ################################ -install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kresources/kabc ) +install( FILES net.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tderesources/kabc ) ##### kabc_net (library) ######################## diff --git a/kabc/plugins/net/Makefile.am b/kabc/plugins/net/Makefile.am index f4183d442..ca0ece015 100644 --- a/kabc/plugins/net/Makefile.am +++ b/kabc/plugins/net/Makefile.am @@ -22,7 +22,7 @@ messages: rc.cpp kabcincludedir = $(includedir)/kabc kabcinclude_HEADERS = resourcenet.h -servicedir = $(kde_servicesdir)/kresources/kabc +servicedir = $(kde_servicesdir)/tderesources/kabc service_DATA = net.desktop resourcenetplugin.lo: ../../addressee.h diff --git a/kabc/plugins/net/resourcenetconfig.h b/kabc/plugins/net/resourcenetconfig.h index e07937739..3c8986122 100644 --- a/kabc/plugins/net/resourcenetconfig.h +++ b/kabc/plugins/net/resourcenetconfig.h @@ -24,7 +24,7 @@ #include <kcombobox.h> #include <kurlrequester.h> -#include <kresources/configwidget.h> +#include <tderesources/configwidget.h> namespace KABC { |