5 files changed, 22 insertions, 22 deletions

diff --git a/kwin/clients/default/CMakeLists.txt b/kwin/clients/default/CMakeLists.txt
index 5ad3d2def..142a9b783 100644
--- a/kwin/clients/default/CMakeLists.txt
+++ b/kwin/clients/default/CMakeLists.txt
@@ -13,7 +13,7 @@ add_subdirectory( config )
 
 include_directories(
   ${CMAKE_CURRENT_BINARY_DIR}
-  ${CMAKE_SOURCE_DIR}/kwin/lib
+  ${CMAKE_SOURCE_DIR}/twin/lib
   ${TDE_INCLUDE_DIR}
   ${TQT_INCLUDE_DIRS}
 )
@@ -23,9 +23,9 @@ link_directories(
 )
 
 
-##### kwin3_default (module) ####################
+##### twin3_default (module) ####################
 
-tde_add_kpart( kwin3_default AUTOMOC
+tde_add_kpart( twin3_default AUTOMOC
   SOURCES kdedefault.cpp
   LINK tdecorations-shared tdecore-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/default/Makefile.am b/kwin/clients/default/Makefile.am
index 331f87822..3e687a2a6 100644
--- a/kwin/clients/default/Makefile.am
+++ b/kwin/clients/default/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = kwin3_default.la
+kde_module_LTLIBRARIES = twin3_default.la
 
-kwin3_default_la_SOURCES = kdedefault.cpp
-kwin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_default_la_LIBADD  = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin3_default_la_SOURCES = kdedefault.cpp
+twin3_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_default_la_LIBADD  = $(LIB_TDECORE) ../../lib/libtdecorations.la
 
 METASOURCES = AUTO
 noinst_HEADERS = kdedefault.h
diff --git a/kwin/clients/default/config/CMakeLists.txt b/kwin/clients/default/config/CMakeLists.txt
index 4f6c76835..5814e011f 100644
--- a/kwin/clients/default/config/CMakeLists.txt
+++ b/kwin/clients/default/config/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
 )
 
 
-##### kwin_default_config (module) ##############
+##### twin_default_config (module) ##############
 
-tde_add_kpart( kwin_default_config AUTOMOC
+tde_add_kpart( twin_default_config AUTOMOC
   SOURCES config.cpp
   LINK tdeui-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/default/config/Makefile.am b/kwin/clients/default/config/Makefile.am
index 0c6084226..3a1df8aa2 100644
--- a/kwin/clients/default/config/Makefile.am
+++ b/kwin/clients/default/config/Makefile.am
@@ -1,15 +1,15 @@
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = kwin_default_config.la
+kde_module_LTLIBRARIES = twin_default_config.la
 
-kwin_default_config_la_SOURCES = config.cpp
-kwin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_default_config_la_LIBADD = $(LIB_TDEUI)
+twin_default_config_la_SOURCES = config.cpp
+twin_default_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_default_config_la_LIBADD = $(LIB_TDEUI)
 
 METASOURCES = AUTO
 noinst_HEADERS = config.h
 
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
 
 ###KMAKE-start (don't edit or delete this block)
 
diff --git a/kwin/clients/default/config/config.cpp b/kwin/clients/default/config/config.cpp
index c98fb1366..eac4ef4e4 100644
--- a/kwin/clients/default/config/config.cpp
+++ b/kwin/clients/default/config/config.cpp
@@ -24,15 +24,15 @@ extern "C"
 }
 
 // NOTE:
-// 'conf' is a pointer to the kwindecoration modules open kwin config,
+// 'conf' is a pointer to the twindecoration modules open twin config,
 //		  and is by default set to the "Style" group.
 // 'parent' is the parent of the TQObject, which is a VBox inside the
-//		  Configure tab in kwindecoration
+//		  Configure tab in twindecoration
 
 KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
 	: TQObject( parent )
 {
-	KGlobal::locale()->insertCatalogue("kwin_clients");
+	KGlobal::locale()->insertCatalogue("twin_clients");
 	highcolor = TQPixmap::defaultDepth() > 8;
 	gb = new TQVBox( parent );
         gb->setSpacing( KDialog::spacingHint() );
@@ -69,7 +69,7 @@ KDEDefaultConfig::KDEDefaultConfig( KConfig* conf, TQWidget* parent )
 		connect( cbUseGradients, TQT_SIGNAL(clicked()), 
 				 this, TQT_SLOT(slotSelectionChanged()) );
 
-	// Make the widgets visible in kwindecoration
+	// Make the widgets visible in twindecoration
 	gb->show();
 }
 
@@ -86,8 +86,8 @@ void KDEDefaultConfig::slotSelectionChanged()
 }
 
 
-// Loads the configurable options from the kwinrc config file
-// It is passed the open config from kwindecoration to improve efficiency
+// Loads the configurable options from the twinrc config file
+// It is passed the open config from twindecoration to improve efficiency
 void KDEDefaultConfig::load( KConfig* conf )
 {
 	conf->setGroup("KDEDefault");
@@ -104,7 +104,7 @@ void KDEDefaultConfig::load( KConfig* conf )
 }
 
 
-// Saves the configurable options to the kwinrc config file
+// Saves the configurable options to the twinrc config file
 void KDEDefaultConfig::save( KConfig* conf )
 {
 	conf->setGroup("KDEDefault");
@@ -113,7 +113,7 @@ void KDEDefaultConfig::save( KConfig* conf )
 
 	if (highcolor)
 		conf->writeEntry( "UseGradients", cbUseGradients->isChecked() );
-	// No need to conf->sync() - kwindecoration will do it for us
+	// No need to conf->sync() - twindecoration will do it for us
 }