8 files changed, 24 insertions, 24 deletions
diff --git a/kwin/clients/plastik/CMakeLists.txt b/kwin/clients/plastik/CMakeLists.txt
index cc9aaa347..d782413ce 100644
--- a/kwin/clients/plastik/CMakeLists.txt
+++ b/kwin/clients/plastik/CMakeLists.txt
@@ -15,7 +15,7 @@ add_definitions( -DQT_PLUGIN )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kwin/lib
+  ${CMAKE_SOURCE_DIR}/twin/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -27,12 +27,12 @@ link_directories(
 
 ##### other data ################################
 
-install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES plastik.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
 
 
-##### kwin3_plastik (module) ####################
+##### twin3_plastik (module) ####################
 
-tde_add_kpart( kwin3_plastik AUTOMOC
+tde_add_kpart( twin3_plastik AUTOMOC
   SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
   LINK tdecorations-shared tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/plastik/Makefile.am b/kwin/clients/plastik/Makefile.am
index cb3f5f447..c1757891d 100644
--- a/kwin/clients/plastik/Makefile.am
+++ b/kwin/clients/plastik/Makefile.am
@@ -6,14 +6,14 @@ KDE_CXXFLAGS = -DQT_PLUGIN
 
 INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
-kwindir = $(kde_datadir)/kwin/
-kwin_DATA = plastik.desktop
+twindir = $(kde_datadir)/twin/
+twin_DATA = plastik.desktop
 
-kde_module_LTLIBRARIES = kwin3_plastik.la
-kwin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
-kwin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
-kwin3_plastik_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin3_plastik.la
+twin3_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp
+twin3_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin3_plastik_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(kwin3_plastik_la_METASOURCES)
+DISTCLEANFILES = $(twin3_plastik_la_METASOURCES)
 
diff --git a/kwin/clients/plastik/config/CMakeLists.txt b/kwin/clients/plastik/config/CMakeLists.txt
index 4e3c2ac2b..49066000e 100644
--- a/kwin/clients/plastik/config/CMakeLists.txt
+++ b/kwin/clients/plastik/config/CMakeLists.txt
@@ -24,9 +24,9 @@ link_directories(
 install( FILES  DESTINATION ${XDG_APPS_INSTALL_DIR} )
 
 
-##### kwin_plastik_config (module) ##############
+##### twin_plastik_config (module) ##############
 
-tde_add_kpart( kwin_plastik_config AUTOMOC
+tde_add_kpart( twin_plastik_config AUTOMOC
   SOURCES config.cpp configdialog.ui
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/plastik/config/Makefile.am b/kwin/clients/plastik/config/Makefile.am
index a7b50219b..b21a1d26b 100644
--- a/kwin/clients/plastik/config/Makefile.am
+++ b/kwin/clients/plastik/config/Makefile.am
@@ -1,14 +1,14 @@
 INCLUDES                     = $(all_includes)
 
-kde_module_LTLIBRARIES       = kwin_plastik_config.la
+kde_module_LTLIBRARIES       = twin_plastik_config.la
 
-kwin_plastik_config_la_SOURCES = config.cpp configdialog.ui
-kwin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_plastik_config_la_LIBADD  = $(LIB_TDEUI)
+twin_plastik_config_la_SOURCES = config.cpp configdialog.ui
+twin_plastik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_plastik_config_la_LIBADD  = $(LIB_TDEUI)
 
 METASOURCES                  = AUTO
 noinst_HEADERS               = config.h
 DISTCLEANFILES               = $(METASOURCES)
 
-lnkdir                       = $(kde_datadir)/kwin
+lnkdir                       = $(kde_datadir)/twin
 
diff --git a/kwin/clients/plastik/config/config.cpp b/kwin/clients/plastik/config/config.cpp
index 0352bff91..aa1c7bd0f 100644
--- a/kwin/clients/plastik/config/config.cpp
+++ b/kwin/clients/plastik/config/config.cpp
@@ -38,8 +38,8 @@ PlastikConfig::PlastikConfig(KConfig* config, TQWidget* parent)
     : TQObject(parent), m_config(0), m_dialog(0)
 {
     // create the configuration object
-    m_config = new KConfig("kwinplastikrc");
-    KGlobal::locale()->insertCatalogue("kwin_clients");
+    m_config = new KConfig("twinplastikrc");
+    KGlobal::locale()->insertCatalogue("twin_clients");
 
     // create and show the configuration dialog
     m_dialog = new ConfigDialog(parent);
diff --git a/kwin/clients/plastik/plastik.cpp b/kwin/clients/plastik/plastik.cpp
index 3f0ceab85..9faf73df0 100644
--- a/kwin/clients/plastik/plastik.cpp
+++ b/kwin/clients/plastik/plastik.cpp
@@ -162,7 +162,7 @@ bool PlastikHandler::supports( Ability ability )
 void PlastikHandler::readConfig()
 {
     // create a config object
-    KConfig config("kwinplastikrc");
+    KConfig config("twinplastikrc");
     config.setGroup("General");
 
     // grab settings
diff --git a/kwin/clients/plastik/plastik.desktop b/kwin/clients/plastik/plastik.desktop
index 55800ad9b..874719191 100644
--- a/kwin/clients/plastik/plastik.desktop
+++ b/kwin/clients/plastik/plastik.desktop
@@ -34,4 +34,4 @@ Name[uk]=Пластик
 Name[uz@cyrillic]=Пластик
 Name[vi]=Chất dẻo
 Name[zh_CN]=塑料
-X-KDE-Library=kwin3_plastik
+X-KDE-Library=twin3_plastik
diff --git a/kwin/clients/plastik/plastikbutton.cpp b/kwin/clients/plastik/plastikbutton.cpp
index 795a384d2..5f81033cb 100644
--- a/kwin/clients/plastik/plastikbutton.cpp
+++ b/kwin/clients/plastik/plastikbutton.cpp
@@ -20,7 +20,7 @@
   Boston, MA 02110-1301, USA.
  */
 
-// #include <kwin/options.h>
+// #include <twin/options.h>
 
 #include <tqbitmap.h>
 #include <tqpainter.h>