diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:33 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 00:56:33 -0600 |
| commit | b668d5788ef4eed1056563cb3bfc2c808348c442 (patch) | |
| tree | 250d4e1e80e1bf6b693b6fceb8265f4490032c12 | |
| parent | 44c2ed06c4082d4607eb5ddbdd109d0f2912ef90 (diff) | |
| download | tde-style-qtcurve-b668d578.tar.gz tde-style-qtcurve-b668d578.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
| -rw-r--r-- | common/config_file.c | 4 | ||||
| -rw-r--r-- | common/config_file.c-orig | 4 | ||||
| -rw-r--r-- | config/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | config/exportthemedialog.cpp | 2 | ||||
| -rw-r--r-- | config/qtcurveconfig.cpp | 4 |
5 files changed, 8 insertions, 8 deletions
diff --git a/common/config_file.c b/common/config_file.c index dac1486..eb6da2e 100644 --- a/common/config_file.c +++ b/common/config_file.c @@ -664,8 +664,8 @@ static const char *qtcConfDir() #else /* Hmm... for 'root' dont bother to check env var, just set to ~/.config - - as problems would arise if "sudo kcmshell style", and then - "sudo su" / "kcmshell style". The 1st would write to ~/.config, but + - as problems would arise if "sudo tdecmshell style", and then + "sudo su" / "tdecmshell style". The 1st would write to ~/.config, but if root has a XDG_ set then that would be used on the second :-( */ #ifndef _WIN32 diff --git a/common/config_file.c-orig b/common/config_file.c-orig index 7b6a37d..44c61fd 100644 --- a/common/config_file.c-orig +++ b/common/config_file.c-orig @@ -329,8 +329,8 @@ static const char *xdgConfigFolder() #else /* Hmm... for 'root' dont bother to check env var, just set to ~/.config - - as problems would arise if "sudo kcmshell style", and then - "sudo su" / "kcmshell style". The 1st would write to ~/.config, but + - as problems would arise if "sudo tdecmshell style", and then + "sudo su" / "tdecmshell style". The 1st would write to ~/.config, but if root has a XDG_ set then that would be used on the second :-( */ char *env=0==getuid() ? NULL : getenv("XDG_CONFIG_HOME"); diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index e2a879c..54a008c 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -34,6 +34,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdeui-shared kio-shared + LINK tdeui-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/config/exportthemedialog.cpp b/config/exportthemedialog.cpp index 441348f..bad6ae1 100644 --- a/config/exportthemedialog.cpp +++ b/config/exportthemedialog.cpp @@ -23,7 +23,7 @@ #include <kurlrequester.h> #include <klineedit.h> #include <kmessagebox.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqdir.h> #include <tqlabel.h> #include <tqlayout.h> diff --git a/config/qtcurveconfig.cpp b/config/qtcurveconfig.cpp index 6f5c3e2..c02d51e 100644 --- a/config/qtcurveconfig.cpp +++ b/config/qtcurveconfig.cpp @@ -39,8 +39,8 @@ #include <tqwidgetstack.h> #include <klocale.h> #include <kcolorbutton.h> -#include <kconfig.h> -#include <kfiledialog.h> +#include <tdeconfig.h> +#include <tdefiledialog.h> #include <kmessagebox.h> #include <kpushbutton.h> #include <kcharselect.h> |