diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2013-01-27 01:04:16 -0600 |
| commit | 5159cd2beb2e87806a5b54e9991b7895285c9d3e (patch) | |
| tree | 9b70e8be47a390f8f4d56ead812ab0c9dad88709 /tderesources | |
| parent | c17cb900dcf52b8bd6dc300d4f103392900ec2b4 (diff) | |
| download | tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.tar.gz tdelibs-5159cd2beb2e87806a5b54e9991b7895285c9d3e.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'tderesources')
| -rw-r--r-- | tderesources/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | tderesources/configwidget.h | 2 | ||||
| -rw-r--r-- | tderesources/factory.h | 4 | ||||
| -rw-r--r-- | tderesources/managerimpl.cpp | 2 | ||||
| -rw-r--r-- | tderesources/resource.cpp | 2 | ||||
| -rw-r--r-- | tderesources/resource.h | 4 | ||||
| -rw-r--r-- | tderesources/tderesources.desktop | 2 |
7 files changed, 12 insertions, 12 deletions
diff --git a/tderesources/CMakeLists.txt b/tderesources/CMakeLists.txt index 05ea5a5af..bb4e957e0 100644 --- a/tderesources/CMakeLists.txt +++ b/tderesources/CMakeLists.txt @@ -17,9 +17,9 @@ include_directories( ${CMAKE_SOURCE_DIR}/dcop ${CMAKE_SOURCE_DIR}/tdecore ${CMAKE_SOURCE_DIR}/tdeui - ${CMAKE_SOURCE_DIR}/kio - ${CMAKE_SOURCE_DIR}/kio/kio - ${CMAKE_SOURCE_DIR}/kio/kfile + ${CMAKE_SOURCE_DIR}/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdeio + ${CMAKE_SOURCE_DIR}/tdeio/tdefile ) link_directories( @@ -57,7 +57,7 @@ set( ${target}_SRCS tde_add_library( ${target} SHARED AUTOMOC SOURCES ${${target}_SRCS} VERSION 1.2.0 - LINK kio-shared + LINK tdeio-shared DESTINATION ${LIB_INSTALL_DIR} DEPENDENCIES dcopidl ) diff --git a/tderesources/configwidget.h b/tderesources/configwidget.h index 30ebf2a5a..a5b114344 100644 --- a/tderesources/configwidget.h +++ b/tderesources/configwidget.h @@ -24,7 +24,7 @@ #include "resource.h" -#include <kconfig.h> +#include <tdeconfig.h> #include <tqwidget.h> diff --git a/tderesources/factory.h b/tderesources/factory.h index e4b9f0af1..6bb075a88 100644 --- a/tderesources/factory.h +++ b/tderesources/factory.h @@ -27,7 +27,7 @@ #include <tqdict.h> #include <tqstring.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klibloader.h> #include <ktrader.h> @@ -48,7 +48,7 @@ namespace KRES { * KABC::Factory *factory = KABC::Factory::self( "contact" ); * * // to allow a transparent configuration of resources, we have - * // to use a kconfig object. + * // to use a tdeconfig object. * TDEConfig config( "tst" ); * config.writePathEntry( "FileName", "/home/foobar/test.vcf" );// resource dependend * config.writeEntry( "FileFormat", "vcard" ); // resource dependend diff --git a/tderesources/managerimpl.cpp b/tderesources/managerimpl.cpp index 43c39964e..467f049e9 100644 --- a/tderesources/managerimpl.cpp +++ b/tderesources/managerimpl.cpp @@ -26,7 +26,7 @@ #include <kaboutdata.h> #include <kapplication.h> #include <kdebug.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kstandarddirs.h> #include "resource.h" diff --git a/tderesources/resource.cpp b/tderesources/resource.cpp index 00cdb8768..2a16ee159 100644 --- a/tderesources/resource.cpp +++ b/tderesources/resource.cpp @@ -23,7 +23,7 @@ #include <kdebug.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <klocale.h> #include "resource.h" diff --git a/tderesources/resource.h b/tderesources/resource.h index 65578bcd1..506ef0eaf 100644 --- a/tderesources/resource.h +++ b/tderesources/resource.h @@ -66,7 +66,7 @@ class ConfigWidget; <B>resourceexample.h</B>: \code -#include <kconfig.h> +#include <tdeconfig.h> #include <tderesources/resource.h> class ResourceExample : public KRES::Resource @@ -84,7 +84,7 @@ class ResourceExample : public KRES::Resource <B>resourceexample.cpp</B>: \code -#include <kconfig.h> +#include <tdeconfig.h> #include "resourceexample.h" diff --git a/tderesources/tderesources.desktop b/tderesources/tderesources.desktop index 0d907e0e0..245981de7 100644 --- a/tderesources/tderesources.desktop +++ b/tderesources/tderesources.desktop @@ -1,5 +1,5 @@ [Desktop Entry] -Exec=kcmshell tderesources +Exec=tdecmshell tderesources Icon=about_kde Type=Application Terminal=false |