diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:05:39 -0600 |
| commit | ff94d46e423398804d2ae63faeb114c2cf604fc4 (patch) | |
| tree | 4481ffd491d15ac15081cea46d7cc298ef6351a4 /kbugbuster/tderesources | |
| parent | b9553cef2a3cd9f5b89c8aca6f4b7781a079dbb7 (diff) | |
| download | tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.tar.gz tdesdk-ff94d46e423398804d2ae63faeb114c2cf604fc4.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'kbugbuster/tderesources')
| -rw-r--r-- | kbugbuster/tderesources/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | kbugbuster/tderesources/kcalresource.cpp | 2 | ||||
| -rw-r--r-- | kbugbuster/tderesources/kcalresource.h | 2 | ||||
| -rw-r--r-- | kbugbuster/tderesources/resourceprefs.kcfgc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kbugbuster/tderesources/CMakeLists.txt b/kbugbuster/tderesources/CMakeLists.txt index ec5956a3..52f67209 100644 --- a/kbugbuster/tderesources/CMakeLists.txt +++ b/kbugbuster/tderesources/CMakeLists.txt @@ -38,6 +38,6 @@ tde_add_kpart( kcal_bugzilla AUTOMOC SOURCES kcalresource.cpp kcalresourceconfig.cpp kcalresource_plugin.cpp resourceprefs.kcfgc - LINK kbbbackend_pic-static tdecore-shared kio-shared kabc kcal tderesources + LINK kbbbackend_pic-static tdecore-shared tdeio-shared kabc kcal tderesources DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/kbugbuster/tderesources/kcalresource.cpp b/kbugbuster/tderesources/kcalresource.cpp index 62051bc5..1eb04c9c 100644 --- a/kbugbuster/tderesources/kcalresource.cpp +++ b/kbugbuster/tderesources/kcalresource.cpp @@ -28,7 +28,7 @@ #include <kdebug.h> #include <kurl.h> -#include <kio/job.h> +#include <tdeio/job.h> #include <klocale.h> #include <kstandarddirs.h> diff --git a/kbugbuster/tderesources/kcalresource.h b/kbugbuster/tderesources/kcalresource.h index cfa4e2a6..4c8c7353 100644 --- a/kbugbuster/tderesources/kcalresource.h +++ b/kbugbuster/tderesources/kcalresource.h @@ -26,7 +26,7 @@ #include <tqdatetime.h> #include <kurl.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdirwatch.h> #include <incidence.h> diff --git a/kbugbuster/tderesources/resourceprefs.kcfgc b/kbugbuster/tderesources/resourceprefs.kcfgc index 88125829..7dbb3cea 100644 --- a/kbugbuster/tderesources/resourceprefs.kcfgc +++ b/kbugbuster/tderesources/resourceprefs.kcfgc @@ -1,4 +1,4 @@ -# Code generation options for kconfig_compiler +# Code generation options for tdeconfig_compiler File=tderesources_kcal_bugzilla.kcfg ClassName=ResourcePrefs NameSpace=KBB |