summaryrefslogtreecommitdiffstats
path: root/twin-styles/icewm
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:01:15 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2013-01-27 01:01:15 -0600
commit3e6041732cea0c280e34e1fe6c202ee70555e220 (patch)
treeee88b042be403046302761e9d0d5a2a166f3cd29 /twin-styles/icewm
parentf227b175cfde01641e973641dd81f9f44dc9c4f0 (diff)
downloadtdeartwork-3e6041732cea0c280e34e1fe6c202ee70555e220.tar.gz
tdeartwork-3e6041732cea0c280e34e1fe6c202ee70555e220.zip
Rename a number of libraries and executables to avoid conflicts with KDE4
Diffstat (limited to 'twin-styles/icewm')
-rw-r--r--twin-styles/icewm/config/CMakeLists.txt2
-rw-r--r--twin-styles/icewm/config/config.h2
-rw-r--r--twin-styles/icewm/icewm.cpp4
3 files changed, 4 insertions, 4 deletions
diff --git a/twin-styles/icewm/config/CMakeLists.txt b/twin-styles/icewm/config/CMakeLists.txt
index 9e2e118d..4be08396 100644
--- a/twin-styles/icewm/config/CMakeLists.txt
+++ b/twin-styles/icewm/config/CMakeLists.txt
@@ -23,6 +23,6 @@ link_directories(
tde_add_kpart( twin_icewm_config AUTOMOC
SOURCES config.cpp
- LINK tdeui-shared kio-shared
+ LINK tdeui-shared tdeio-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
)
diff --git a/twin-styles/icewm/config/config.h b/twin-styles/icewm/config/config.h
index 89f98e0d..a28e75cf 100644
--- a/twin-styles/icewm/config/config.h
+++ b/twin-styles/icewm/config/config.h
@@ -33,7 +33,7 @@
#include <tqlistbox.h>
#include <tqlabel.h>
#include <kurllabel.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
class TQVBox;
diff --git a/twin-styles/icewm/icewm.cpp b/twin-styles/icewm/icewm.cpp
index 003ec3d5..495562d2 100644
--- a/twin-styles/icewm/icewm.cpp
+++ b/twin-styles/icewm/icewm.cpp
@@ -40,7 +40,7 @@
*/
-#include <kconfig.h>
+#include <tdeconfig.h>
#include <kstandarddirs.h>
#include <kglobal.h>
#include <klocale.h>
@@ -269,7 +269,7 @@ void ThemeHandler::initTheme()
if ( !themeName.isEmpty() )
themeName += "/";
- // We use kconfig to read icewm config files...
+ // We use tdeconfig to read icewm config files...
// this is easy since icewm uses key=value pairs!
TDEConfig config( locate("data", TQString("twin/icewm-themes/") +
themeName + TQString("default.theme")) );