diff options
| author | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
|---|---|---|
| committer | Timothy Pearson <[email protected]> | 2013-01-27 01:02:02 -0600 |
| commit | de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf (patch) | |
| tree | dbb3152c372f8620f9290137d461f3d9f9eba1cb /ksplashml/themeengine | |
| parent | 936d3cec490c13f2c5f7dd14f5e364fddaa6da71 (diff) | |
| download | tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.tar.gz tdebase-de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf.zip | |
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'ksplashml/themeengine')
| -rw-r--r-- | ksplashml/themeengine/default/themelegacy.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/objkstheme.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/redmond/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/redmond/themeredmond.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/standard/themestandard.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/themeengine.cpp | 2 | ||||
| -rw-r--r-- | ksplashml/themeengine/unified/themeunified.cpp | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp index 39839cca6..830516355 100644 --- a/ksplashml/themeengine/default/themelegacy.cpp +++ b/ksplashml/themeengine/default/themelegacy.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kglobalsettings.h> diff --git a/ksplashml/themeengine/objkstheme.cpp b/ksplashml/themeengine/objkstheme.cpp index df7556bac..ca00f3406 100644 --- a/ksplashml/themeengine/objkstheme.cpp +++ b/ksplashml/themeengine/objkstheme.cpp @@ -11,7 +11,7 @@ #include <kapplication.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <klocale.h> diff --git a/ksplashml/themeengine/redmond/CMakeLists.txt b/ksplashml/themeengine/redmond/CMakeLists.txt index b8947a0aa..a6e0b0229 100644 --- a/ksplashml/themeengine/redmond/CMakeLists.txt +++ b/ksplashml/themeengine/redmond/CMakeLists.txt @@ -33,6 +33,6 @@ install( FILES ksplashredmond.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) tde_add_kpart( ksplashredmond AUTOMOC SOURCES previewredmond.cpp themeredmond.cpp - LINK ksplashthemes-shared kio-shared + LINK ksplashthemes-shared tdeio-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/ksplashml/themeengine/redmond/themeredmond.cpp b/ksplashml/themeengine/redmond/themeredmond.cpp index 0328c0365..4b19a3012 100644 --- a/ksplashml/themeengine/redmond/themeredmond.cpp +++ b/ksplashml/themeengine/redmond/themeredmond.cpp @@ -14,7 +14,7 @@ #include <unistd.h> #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kdialogbase.h> #include <kfontcombo.h> diff --git a/ksplashml/themeengine/standard/themestandard.cpp b/ksplashml/themeengine/standard/themestandard.cpp index 26c47eea0..df8067ace 100644 --- a/ksplashml/themeengine/standard/themestandard.cpp +++ b/ksplashml/themeengine/standard/themestandard.cpp @@ -16,7 +16,7 @@ #include <kiconloader.h> #include <klocale.h> #include <kstandarddirs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <tqdesktopwidget.h> #include <tqlabel.h> diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp index b9a7c208f..ff069803a 100644 --- a/ksplashml/themeengine/themeengine.cpp +++ b/ksplashml/themeengine/themeengine.cpp @@ -15,7 +15,7 @@ #include <kapplication.h> #include <kcmdlineargs.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kglobal.h> #include <twin.h> diff --git a/ksplashml/themeengine/unified/themeunified.cpp b/ksplashml/themeengine/unified/themeunified.cpp index 21c899adc..611ddb345 100644 --- a/ksplashml/themeengine/unified/themeunified.cpp +++ b/ksplashml/themeengine/unified/themeunified.cpp @@ -10,7 +10,7 @@ ***************************************************************************/ #include <kapplication.h> -#include <kconfig.h> +#include <tdeconfig.h> #include <kdebug.h> #include <kgenericfactory.h> #include <kglobalsettings.h> |