diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:01:15 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:01:15 -0600 |
| commit | 3e6041732cea0c280e34e1fe6c202ee70555e220 (patch) | |
| tree | ee88b042be403046302761e9d0d5a2a166f3cd29 /tdescreensaver/kxsconfig | |
| parent | f227b175cfde01641e973641dd81f9f44dc9c4f0 (diff) | |
| download | tdeartwork-3e6041732cea0c280e34e1fe6c202ee70555e220.tar.gz tdeartwork-3e6041732cea0c280e34e1fe6c202ee70555e220.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tdescreensaver/kxsconfig')
| -rw-r--r-- | tdescreensaver/kxsconfig/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxsconfig.cpp | 2 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxscontrol.cpp | 2 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxsitem.h | 2 | ||||
| -rw-r--r-- | tdescreensaver/kxsconfig/kxsrun.cpp | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/tdescreensaver/kxsconfig/CMakeLists.txt b/tdescreensaver/kxsconfig/CMakeLists.txt index 99f44e54..9bb0249a 100644 --- a/tdescreensaver/kxsconfig/CMakeLists.txt +++ b/tdescreensaver/kxsconfig/CMakeLists.txt @@ -30,7 +30,7 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared ${X11_Xt_LIB} + LINK tdeio-shared ${X11_Xt_LIB} DESTINATION ${BIN_INSTALL_DIR} ) @@ -42,7 +42,7 @@ set( ${target}_SRCS tde_add_executable( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK kio-shared + LINK tdeio-shared DESTINATION ${BIN_INSTALL_DIR} ) diff --git a/tdescreensaver/kxsconfig/kxsconfig.cpp b/tdescreensaver/kxsconfig/kxsconfig.cpp index dbe3ea91..ab0b4373 100644 --- a/tdescreensaver/kxsconfig/kxsconfig.cpp +++ b/tdescreensaver/kxsconfig/kxsconfig.cpp @@ -45,7 +45,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdialogbase.h> #include <kprocess.h> #include <kstandarddirs.h> diff --git a/tdescreensaver/kxsconfig/kxscontrol.cpp b/tdescreensaver/kxsconfig/kxscontrol.cpp index 08f9b55c..594a0255 100644 --- a/tdescreensaver/kxsconfig/kxscontrol.cpp +++ b/tdescreensaver/kxsconfig/kxscontrol.cpp @@ -28,7 +28,7 @@ #include <tqpushbutton.h> #include <tqxml.h> #include <klocale.h> -#include <kfiledialog.h> +#include <tdefiledialog.h> #include "kxscontrol.h" //=========================================================================== diff --git a/tdescreensaver/kxsconfig/kxsitem.h b/tdescreensaver/kxsconfig/kxsitem.h index 9e4bed3e..4237e603 100644 --- a/tdescreensaver/kxsconfig/kxsitem.h +++ b/tdescreensaver/kxsconfig/kxsitem.h @@ -22,7 +22,7 @@ #ifndef __KXSITEM_H__ #define __KXSITEM_H__ -#include <kconfig.h> +#include <tdeconfig.h> class TQXmlAttributes; diff --git a/tdescreensaver/kxsconfig/kxsrun.cpp b/tdescreensaver/kxsconfig/kxsrun.cpp index 6ffa1b15..93789e90 100644 --- a/tdescreensaver/kxsconfig/kxsrun.cpp +++ b/tdescreensaver/kxsconfig/kxsrun.cpp @@ -31,7 +31,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include <klocale.h> #include <kcmdlineargs.h> |