diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 00:52:32 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 00:52:32 -0600 |
| commit | 91726329ab9745105638d8b74cfd9f000cd13af4 (patch) | |
| tree | 2e8be3b7edc2ecf47e6ee4e5a63cb45ca6819c4c /kbfxlib | |
| parent | d6cfa98becda3f9648dcda4dafd3de99b8733901 (diff) | |
| download | kbfx-91726329ab9745105638d8b74cfd9f000cd13af4.tar.gz kbfx-91726329ab9745105638d8b74cfd9f000cd13af4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbfxlib')
| -rw-r--r-- | kbfxlib/common/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kbfxlib/common/kbfxconfig.h | 4 | ||||
| -rw-r--r-- | kbfxlib/common/kbfxkiodownload.h | 2 | ||||
| -rw-r--r-- | kbfxlib/common/kbfxthemesdata.h | 2 | ||||
| -rw-r--r-- | kbfxlib/data/CMakeLists.txt | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/kbfxlib/common/CMakeLists.txt b/kbfxlib/common/CMakeLists.txt index 297dac9..6df4f68 100644 --- a/kbfxlib/common/CMakeLists.txt +++ b/kbfxlib/common/CMakeLists.txt @@ -35,7 +35,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) diff --git a/kbfxlib/common/kbfxconfig.h b/kbfxlib/common/kbfxconfig.h index 8de6886..e92a151 100644 --- a/kbfxlib/common/kbfxconfig.h +++ b/kbfxlib/common/kbfxconfig.h @@ -32,8 +32,8 @@ #include <tqstring.h> #include <kapplication.h> -#include <kconfig.h> -#include <kconfigskeleton.h> +#include <tdeconfig.h> +#include <tdeconfigskeleton.h> #include <kdebug.h> #include <kglobal.h> #include <kiconloader.h> diff --git a/kbfxlib/common/kbfxkiodownload.h b/kbfxlib/common/kbfxkiodownload.h index 9646176..3e9df44 100644 --- a/kbfxlib/common/kbfxkiodownload.h +++ b/kbfxlib/common/kbfxkiodownload.h @@ -22,7 +22,7 @@ #ifndef KBFX_KIO_DOWNLOAD_H #define KBFX_KIO_DOWNLOAD_H -#include <kio/job.h> +#include <tdeio/job.h> #include <ktempfile.h> #include <kdebug.h> diff --git a/kbfxlib/common/kbfxthemesdata.h b/kbfxlib/common/kbfxthemesdata.h index 19e494e..cb70efa 100644 --- a/kbfxlib/common/kbfxthemesdata.h +++ b/kbfxlib/common/kbfxthemesdata.h @@ -24,7 +24,7 @@ #include <kdebug.h> #include <tqstringlist.h> -#include <kio/netaccess.h> +#include <tdeio/netaccess.h> #include <kstandarddirs.h> #include <tqmap.h> #include <tqdir.h> diff --git a/kbfxlib/data/CMakeLists.txt b/kbfxlib/data/CMakeLists.txt index bd2e102..4be93b4 100644 --- a/kbfxlib/data/CMakeLists.txt +++ b/kbfxlib/data/CMakeLists.txt @@ -36,7 +36,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} # VERSION 4.2.0 - LINK DCOP-shared tdecore-shared tdeui-shared kio-shared tdehtml-shared ${M_LIBRARY} + LINK DCOP-shared tdecore-shared tdeui-shared tdeio-shared tdehtml-shared ${M_LIBRARY} DESTINATION ${LIB_INSTALL_DIR} ) |