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/modules/presenter/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/modules/presenter/config')
| -rw-r--r-- | kview/modules/presenter/config/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kview/modules/presenter/config/Makefile.am | 2 | ||||
| -rw-r--r-- | kview/modules/presenter/config/kviewpresenterconfig.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/kview/modules/presenter/config/CMakeLists.txt b/kview/modules/presenter/config/CMakeLists.txt index b8dfc56a..e359bee9 100644 --- a/kview/modules/presenter/config/CMakeLists.txt +++ b/kview/modules/presenter/config/CMakeLists.txt @@ -24,7 +24,7 @@ link_directories( install( FILES kviewpresenterconfig.desktop - DESTINATION ${SERVICES_INSTALL_DIR}/kconfiguredialog ) + DESTINATION ${SERVICES_INSTALL_DIR}/tdeconfiguredialog ) ##### kcm_kviewpresenterconfig (module) ######### diff --git a/kview/modules/presenter/config/Makefile.am b/kview/modules/presenter/config/Makefile.am index 8c212e7f..88d3d479 100644 --- a/kview/modules/presenter/config/Makefile.am +++ b/kview/modules/presenter/config/Makefile.am @@ -9,7 +9,7 @@ kcm_kviewpresenterconfig_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN) kcm_kviewpresenterconfig_la_LIBADD = $(LIB_KUTILS) kcm_kviewpresenterconfig_DATA = kviewpresenterconfig.desktop -kcm_kviewpresenterconfigdir = $(kde_servicesdir)/kconfiguredialog +kcm_kviewpresenterconfigdir = $(kde_servicesdir)/tdeconfiguredialog METASOURCES = AUTO diff --git a/kview/modules/presenter/config/kviewpresenterconfig.cpp b/kview/modules/presenter/config/kviewpresenterconfig.cpp index 7ed447c2..c3682d5f 100644 --- a/kview/modules/presenter/config/kviewpresenterconfig.cpp +++ b/kview/modules/presenter/config/kviewpresenterconfig.cpp @@ -25,7 +25,7 @@ #include <klocale.h> #include <kdialog.h> #include <kglobal.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kgenericfactory.h> typedef KGenericFactory<KViewPresenterConfig, TQWidget> KViewPresenterConfigFactory; |