diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:37 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:03:37 -0600 |
| commit | 2e25fa39cd67cca2472d3eabdb478feb517d72a5 (patch) | |
| tree | 63725962f632d152cbf20709191d39f6fc865966 /kview/config | |
| parent | 190d88dfc662f3fc466c9d1f53acbbea65f33c49 (diff) | |
| download | tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.tar.gz tdegraphics-2e25fa39cd67cca2472d3eabdb478feb517d72a5.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kview/config')
| -rw-r--r-- | kview/config/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kview/config/Makefile.am | 2 | ||||
| -rw-r--r-- | kview/config/kviewconfmodules.cpp | 2 | ||||
| -rw-r--r-- | kview/config/plugins/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kview/config/plugins/Makefile.am | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/kview/config/CMakeLists.txt b/kview/config/CMakeLists.txt index 53b97f03..d2649a1c 100644 --- a/kview/config/CMakeLists.txt +++ b/kview/config/CMakeLists.txt @@ -24,7 +24,7 @@ link_directories( ##### other data ################################ -install( FILES kviewgeneralconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kviewgeneralconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) install( FILES kview.setdlg DESTINATION ${DATA_INSTALL_DIR}/kview ) diff --git a/kview/config/Makefile.am b/kview/config/Makefile.am index 5d09eee8..0c97cb33 100644 --- a/kview/config/Makefile.am +++ b/kview/config/Makefile.am @@ -12,7 +12,7 @@ kcm_kviewgeneralconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcm_kviewgeneralconfig_la_LIBADD = $(LIB_TDEUI) kcm_kviewgeneralconfig_DATA = kviewgeneralconfig.desktop -kcm_kviewgeneralconfigdir = $(kde_servicesdir)/kconfiguredialog +kcm_kviewgeneralconfigdir = $(kde_servicesdir)/tdeconfiguredialog kviewappdatadir = $(kde_datadir)/kview kviewappdata_DATA = kview.setdlg diff --git a/kview/config/kviewconfmodules.cpp b/kview/config/kviewconfmodules.cpp index f36da30c..2316c920 100644 --- a/kview/config/kviewconfmodules.cpp +++ b/kview/config/kviewconfmodules.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdialog.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kgenericfactory.h> #include <tqwhatsthis.h> diff --git a/kview/config/plugins/CMakeLists.txt b/kview/config/plugins/CMakeLists.txt index f7c4672a..1b1fbec4 100644 --- a/kview/config/plugins/CMakeLists.txt +++ b/kview/config/plugins/CMakeLists.txt @@ -22,7 +22,7 @@ link_directories( ##### other data ################################ -install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) +install( FILES kviewpluginsconfig.desktop DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kcm_kviewpluginsconfig (module) ########### diff --git a/kview/config/plugins/Makefile.am b/kview/config/plugins/Makefile.am index d2169a9d..239504dd 100644 --- a/kview/config/plugins/Makefile.am +++ b/kview/config/plugins/Makefile.am @@ -11,7 +11,7 @@ kcm_kviewpluginsconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcm_kviewpluginsconfig_la_LIBADD = $(LIB_KUTILS) kcm_kviewpluginsconfig_DATA = kviewpluginsconfig.desktop -kcm_kviewpluginsconfigdir = $(kde_servicesdir)/kconfiguredialog +kcm_kviewpluginsconfigdir = $(kde_servicesdir)/tdeconfiguredialog messages: rc.cpp $(XGETTEXT) *.cpp *.h -o $(podir)/kcm_kviewpluginsconfig.pot |