Rename a number of libraries and executables to avoid conflicts with KDE4

5 files changed, 9 insertions, 9 deletions

diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt
index 808d65e06..9a0ce88da 100644
--- a/twin/data/CMakeLists.txt
+++ b/twin/data/CMakeLists.txt
@@ -45,7 +45,7 @@ install( FILES
 tde_add_executable( twin_update_window_settings
   SOURCES update_window_settings.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
 
 
@@ -54,5 +54,5 @@ tde_add_executable( twin_update_window_settings
 tde_add_executable( twin_update_default_rules
   SOURCES update_default_rules.cpp
   LINK tdecore-shared
-  DESTINATION ${LIB_INSTALL_DIR}/kconf_update_bin
+  DESTINATION ${LIB_INSTALL_DIR}/tdeconf_update_bin
 )
diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am
index 81bc0db43..0a2dab482 100644
--- a/twin/data/Makefile.am
+++ b/twin/data/Makefile.am
@@ -1,5 +1,5 @@
-kconf_PROGRAMS = twin_update_window_settings twin_update_default_rules
-kconfdir = $(libdir)/kconf_update_bin
+tdeconf_PROGRAMS = twin_update_window_settings twin_update_default_rules
+tdeconfdir = $(libdir)/tdeconf_update_bin
 
 twin_update_window_settings_SOURCES = update_window_settings.cpp
 twin_update_window_settings_LDADD   = $(LIB_TDECORE) $(KDE_RPATH)
@@ -19,7 +19,7 @@ sound_DATA = pop.wav
 update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \
         twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd
 update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh
-updatedir = $(kde_datadir)/kconf_update
+updatedir = $(kde_datadir)/tdeconf_update
 
 twin_default_rules_DATA = fsp_workarounds_1.twinrules
 twin_default_rulesdir = $(kde_datadir)/twin/default_rules
diff --git a/twin/data/twin_focus1.sh b/twin/data/twin_focus1.sh
index 6ffe0e039..afb05acac 100644
--- a/twin/data/twin_focus1.sh
+++ b/twin/data/twin_focus1.sh
@@ -2,12 +2,12 @@
 was=
 while read line; do
     if echo "$line" | grep '^IgnoreFocusStealingClasses=' >/dev/null 2>/dev/null; then
-        echo "$line" | sed 's/\(^IgnoreFocusStealingClasses=.*$\)/\1,kio_uiserver/'
+        echo "$line" | sed 's/\(^IgnoreFocusStealingClasses=.*$\)/\1,tdeio_uiserver/'
         was=1
     else
         echo "$line"
     fi
 done
 if test -z "$was"; then
-    echo "IgnoreFocusStealingClasses=kio_uiserver"
+    echo "IgnoreFocusStealingClasses=tdeio_uiserver"
 fi
diff --git a/twin/data/update_default_rules.cpp b/twin/data/update_default_rules.cpp
index 61b03d3c4..1afde0bee 100644
--- a/twin/data/update_default_rules.cpp
+++ b/twin/data/update_default_rules.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // read addtional window rules and add them to twinrulesrc
 
 #include <dcopclient.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kdebug.h>
 #include <kinstance.h>
 #include <kstandarddirs.h>
diff --git a/twin/data/update_window_settings.cpp b/twin/data/update_window_settings.cpp
index 40b25db9c..e52f8c760 100644
--- a/twin/data/update_window_settings.cpp
+++ b/twin/data/update_window_settings.cpp
@@ -11,7 +11,7 @@ License. See the file "COPYING" for the exact licensing terms.
 // updates per-window settings from KDE3.2 to KDE3.3
 
 #include <netwm_def.h>
-#include <kconfig.h>
+#include <tdeconfig.h>
 #include <kinstance.h>
 #include <dcopclient.h>