summaryrefslogtreecommitdiffstats
path: root/kwin/clients
diff options
context:
space:
mode:
Diffstat (limited to 'kwin/clients')
-rw-r--r--kwin/clients/Makefile.am2
-rw-r--r--kwin/clients/PORTING10
-rw-r--r--kwin/clients/b2/CMakeLists.txt8
-rw-r--r--kwin/clients/b2/Makefile.am12
-rw-r--r--kwin/clients/b2/b2.desktop2
-rw-r--r--kwin/clients/b2/b2client.cpp4
-rw-r--r--kwin/clients/b2/config/CMakeLists.txt4
-rw-r--r--kwin/clients/b2/config/Makefile.am10
-rw-r--r--kwin/clients/b2/config/config.cpp16
-rw-r--r--kwin/clients/default/CMakeLists.txt6
-rw-r--r--kwin/clients/default/Makefile.am8
-rw-r--r--kwin/clients/default/config/CMakeLists.txt4
-rw-r--r--kwin/clients/default/config/Makefile.am10
-rw-r--r--kwin/clients/default/config/config.cpp16
-rw-r--r--kwin/clients/keramik/CMakeLists.txt8
-rw-r--r--kwin/clients/keramik/Makefile.am14
-rw-r--r--kwin/clients/keramik/config/CMakeLists.txt4
-rw-r--r--kwin/clients/keramik/config/Makefile.am10
-rw-r--r--kwin/clients/keramik/config/config.cpp14
-rw-r--r--kwin/clients/keramik/keramik.cpp2
-rw-r--r--kwin/clients/keramik/keramik.desktop2
-rw-r--r--kwin/clients/kwmtheme/Makefile.am10
-rw-r--r--kwin/clients/kwmtheme/cli_installer/main.cpp4
-rw-r--r--kwin/clients/kwmtheme/kwmtheme.desktop2
-rw-r--r--kwin/clients/kwmtheme/kwmthemeclient.cpp32
-rw-r--r--kwin/clients/laptop/CMakeLists.txt8
-rw-r--r--kwin/clients/laptop/Makefile.am10
-rw-r--r--kwin/clients/laptop/laptop.desktop2
-rw-r--r--kwin/clients/modernsystem/CMakeLists.txt8
-rw-r--r--kwin/clients/modernsystem/Makefile.am10
-rw-r--r--kwin/clients/modernsystem/config/CMakeLists.txt4
-rw-r--r--kwin/clients/modernsystem/config/Makefile.am10
-rw-r--r--kwin/clients/modernsystem/config/config.cpp8
-rw-r--r--kwin/clients/modernsystem/modernsys.cpp2
-rw-r--r--kwin/clients/modernsystem/modernsystem.desktop2
-rw-r--r--kwin/clients/plastik/CMakeLists.txt8
-rw-r--r--kwin/clients/plastik/Makefile.am16
-rw-r--r--kwin/clients/plastik/config/CMakeLists.txt4
-rw-r--r--kwin/clients/plastik/config/Makefile.am10
-rw-r--r--kwin/clients/plastik/config/config.cpp4
-rw-r--r--kwin/clients/plastik/plastik.cpp2
-rw-r--r--kwin/clients/plastik/plastik.desktop2
-rw-r--r--kwin/clients/plastik/plastikbutton.cpp2
-rw-r--r--kwin/clients/quartz/CMakeLists.txt8
-rw-r--r--kwin/clients/quartz/Makefile.am10
-rw-r--r--kwin/clients/quartz/config/CMakeLists.txt4
-rw-r--r--kwin/clients/quartz/config/Makefile.am10
-rw-r--r--kwin/clients/quartz/config/config.cpp16
-rw-r--r--kwin/clients/quartz/quartz.cpp2
-rw-r--r--kwin/clients/quartz/quartz.desktop2
-rw-r--r--kwin/clients/redmond/CMakeLists.txt8
-rw-r--r--kwin/clients/redmond/Makefile.am10
-rw-r--r--kwin/clients/redmond/redmond.desktop2
-rw-r--r--kwin/clients/redmond/redmond.h2
-rw-r--r--kwin/clients/test/Makefile.am16
-rw-r--r--kwin/clients/test/test.desktop2
-rw-r--r--kwin/clients/web/CMakeLists.txt6
-rw-r--r--kwin/clients/web/Makefile.am10
-rw-r--r--kwin/clients/web/Web.cpp4
-rw-r--r--kwin/clients/web/Web.h2
-rw-r--r--kwin/clients/web/WebButton.cpp2
-rw-r--r--kwin/clients/web/WebButton.h2
-rw-r--r--kwin/clients/web/web.desktop2
63 files changed, 223 insertions, 223 deletions
diff --git a/kwin/clients/Makefile.am b/kwin/clients/Makefile.am
index 6d00b0001..c62b21019 100644
--- a/kwin/clients/Makefile.am
+++ b/kwin/clients/Makefile.am
@@ -4,5 +4,5 @@ SUBDIRS = plastik b2 default keramik laptop modernsystem quartz redmond web
messages: rc.cpp
$(EXTRACTRC) `find . -name \*.ui` >> rc.cpp
- $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/kwin_clients.pot
+ $(XGETTEXT) `find . -name \*.cpp` -o $(podir)/twin_clients.pot
-rm rc.cpp
diff --git a/kwin/clients/PORTING b/kwin/clients/PORTING
index f6233beb9..b5fc6500f 100644
--- a/kwin/clients/PORTING
+++ b/kwin/clients/PORTING
@@ -2,16 +2,16 @@ It's suggested you check sources of some KDE CVS decoration if in doubts or in n
Also, the API is documented in the .h header files.
Makefile.am:
-- Change kwin_ to kwin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
+- Change twin_ to twin3_ (in LDFLAGS, LIBADD, kde_module_LTLIBRARIES, SOURCES).
- Make sure LDFLAGS contains $(KDE_PLUGIN) and -module .
- Add -ltdecorations to LIBADD.
-- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/kwin/ ).
+- Do NOT rename the directory where the .desktop file is installed ( $(kde_datadir)/twin/ ).
.desktop file:
-- Change kwin_ to kwin3_ in X-KDE-Library.
+- Change twin_ to twin3_ in X-KDE-Library.
Sources:
-- There are no kwin/something.h includes, and don't use the KWinInternal namespace.
+- There are no twin/something.h includes, and don't use the KWinInternal namespace.
- Use QToolTip instead of KWinToolTip.
- Use QButton instead of KWinButton, QToolButton instead of KWinToolButton and QWidget
instead of KWinWidgetButton.
@@ -154,6 +154,6 @@ extern "C"
- Review mousePosition() if it's implemented. Position constants need 'Position' prepended,
e.g. Top -> PositionTop.
- Note that you cannot use "appdata" with KStandardDirs, as the decoration will be used
- also in other applications than kwin.
+ also in other applications than twin.
- Implement all missing pure virtual functions. For mousePosition(), you may call
KDecoration::mousePosition() if it's sufficient.
diff --git a/kwin/clients/b2/CMakeLists.txt b/kwin/clients/b2/CMakeLists.txt
index 2395ecc84..c7f4bdb9d 100644
--- a/kwin/clients/b2/CMakeLists.txt
+++ b/kwin/clients/b2/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}
)
@@ -25,12 +25,12 @@ link_directories(
##### other data ################################
-install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES b2.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_b2 (module) #########################
+##### twin3_b2 (module) #########################
-tde_add_kpart( kwin3_b2 AUTOMOC
+tde_add_kpart( twin3_b2 AUTOMOC
SOURCES b2client.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/b2/Makefile.am b/kwin/clients/b2/Makefile.am
index 32e68eeea..ccd7f39fa 100644
--- a/kwin/clients/b2/Makefile.am
+++ b/kwin/clients/b2/Makefile.am
@@ -3,17 +3,17 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config
-kde_module_LTLIBRARIES = kwin3_b2.la
+kde_module_LTLIBRARIES = twin3_b2.la
-kwin3_b2_la_SOURCES = b2client.cpp
-kwin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-# kwin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-kwin3_b2_la_LIBADD = ../../lib/libtdecorations.la
+twin3_b2_la_SOURCES = b2client.cpp
+twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+# twin_b2_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin3_b2_la_LIBADD = ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = b2client.h
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
lnk_DATA = b2.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/b2/b2.desktop b/kwin/clients/b2/b2.desktop
index c368d7fa7..3a1fa3b4a 100644
--- a/kwin/clients/b2/b2.desktop
+++ b/kwin/clients/b2/b2.desktop
@@ -4,4 +4,4 @@ Name[hi]=बी II
Name[lo]= B II
Name[te]=బి II
Name[th]=ชุดตกแต่ง B II
-X-KDE-Library=kwin3_b2
+X-KDE-Library=twin3_b2
diff --git a/kwin/clients/b2/b2client.cpp b/kwin/clients/b2/b2client.cpp
index 179eee0eb..c5786146a 100644
--- a/kwin/clients/b2/b2client.cpp
+++ b/kwin/clients/b2/b2client.cpp
@@ -103,7 +103,7 @@ static void read_config(B2ClientFactory *f)
buttonSize = (TQFontMetrics(options()->font(true)).height() + 1) & 0x3e;
if (buttonSize < 16) buttonSize = 16;
- KConfig conf("kwinb2rc");
+ KConfig conf("twinb2rc");
conf.setGroup("General");
colored_frame = conf.readBoolEntry("UseTitleBarBorderColors", false);
do_draw_handle = conf.readBoolEntry("DrawGrabHandle", true);
@@ -167,7 +167,7 @@ static void drawB2Rect(KPixmap *pix, const TQColor &primary, bool down)
}
-TQPixmap* kwin_get_menu_pix_hack()
+TQPixmap* twin_get_menu_pix_hack()
{
//return menu_pix; FIXME
return PIXMAP_A(P_MENU);
diff --git a/kwin/clients/b2/config/CMakeLists.txt b/kwin/clients/b2/config/CMakeLists.txt
index f319ac8f6..0785fb176 100644
--- a/kwin/clients/b2/config/CMakeLists.txt
+++ b/kwin/clients/b2/config/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
)
-##### kwin_b2_config (module) ###################
+##### twin_b2_config (module) ###################
-tde_add_kpart( kwin_b2_config AUTOMOC
+tde_add_kpart( twin_b2_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/b2/config/Makefile.am b/kwin/clients/b2/config/Makefile.am
index 0a508a3c1..4319b5375 100644
--- a/kwin/clients/b2/config/Makefile.am
+++ b/kwin/clients/b2/config/Makefile.am
@@ -1,15 +1,15 @@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_b2_config.la
+kde_module_LTLIBRARIES = twin_b2_config.la
-kwin_b2_config_la_SOURCES = config.cpp
-kwin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_b2_config_la_LIBADD = $(LIB_TDEUI)
+twin_b2_config_la_SOURCES = config.cpp
+twin_b2_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_b2_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/b2/config/config.cpp b/kwin/clients/b2/config/config.cpp
index ca1dccc65..956f55bb4 100644
--- a/kwin/clients/b2/config/config.cpp
+++ b/kwin/clients/b2/config/config.cpp
@@ -23,18 +23,18 @@ 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
*/
B2Config::B2Config( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
- KGlobal::locale()->insertCatalogue("kwin_b2_config");
- b2Config = new KConfig("kwinb2rc");
+ KGlobal::locale()->insertCatalogue("twin_b2_config");
+ b2Config = new KConfig("twinb2rc");
gb = new TQVBox(parent);
cbColorBorder = new TQCheckBox(
@@ -76,7 +76,7 @@ B2Config::B2Config( KConfig* conf, TQWidget* parent )
this, TQT_SLOT(slotSelectionChanged()));
connect(menuDblClickOp, TQT_SIGNAL(activated(int)),
this, TQT_SLOT(slotSelectionChanged()));
- // Make the widgets visible in kwindecoration
+ // Make the widgets visible in twindecoration
gb->show();
}
@@ -94,8 +94,8 @@ void B2Config::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 B2Config::load(KConfig * /*conf*/)
{
b2Config->setGroup("General");
@@ -140,7 +140,7 @@ static TQString opToString(int op)
}
-// Saves the configurable options to the kwinrc config file
+// Saves the configurable options to the twinrc config file
void B2Config::save(KConfig * /*conf*/)
{
b2Config->setGroup("General");
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
}
diff --git a/kwin/clients/keramik/CMakeLists.txt b/kwin/clients/keramik/CMakeLists.txt
index e4da85e84..67e739d48 100644
--- a/kwin/clients/keramik/CMakeLists.txt
+++ b/kwin/clients/keramik/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}
)
@@ -25,15 +25,15 @@ link_directories(
##### other data ################################
-install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES keramik.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_keramik (module) ####################
+##### twin3_keramik (module) ####################
set_source_files_properties( keramik.cpp
PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h )
-tde_add_kpart( kwin3_keramik AUTOMOC
+tde_add_kpart( twin3_keramik AUTOMOC
SOURCES keramik.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/keramik/Makefile.am b/kwin/clients/keramik/Makefile.am
index 993c9d9ba..4c7c6e10c 100644
--- a/kwin/clients/keramik/Makefile.am
+++ b/kwin/clients/keramik/Makefile.am
@@ -10,18 +10,18 @@ embedtool_SOURCES = embedtool.cpp
embedtool_LDADD = $(LIB_QT)
embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_QT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_KIO) -lktexteditor
-kde_module_LTLIBRARIES = kwin3_keramik.la
+kde_module_LTLIBRARIES = twin3_keramik.la
-kwin3_keramik_la_SOURCES = keramik.cpp
-kwin3_keramik_la_COMPILE_FIRST = tiles.h
-kwin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
-#kwin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin3_keramik_la_SOURCES = keramik.cpp
+twin3_keramik_la_COMPILE_FIRST = tiles.h
+twin3_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+#twin3_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO
noinst_headers = keramik.h tiles.h
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
lnk_DATA = keramik.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/keramik/config/CMakeLists.txt b/kwin/clients/keramik/config/CMakeLists.txt
index febfa0d44..7b5bdb339 100644
--- a/kwin/clients/keramik/config/CMakeLists.txt
+++ b/kwin/clients/keramik/config/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
)
-##### kwin_keramik_config (module) ##############
+##### twin_keramik_config (module) ##############
-tde_add_kpart( kwin_keramik_config AUTOMOC
+tde_add_kpart( twin_keramik_config AUTOMOC
SOURCES config.cpp keramikconfig.ui
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/keramik/config/Makefile.am b/kwin/clients/keramik/config/Makefile.am
index d4ffce144..19ee4f27d 100644
--- a/kwin/clients/keramik/config/Makefile.am
+++ b/kwin/clients/keramik/config/Makefile.am
@@ -1,13 +1,13 @@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_keramik_config.la
+kde_module_LTLIBRARIES = twin_keramik_config.la
-kwin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
-kwin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_keramik_config_la_LIBADD = $(LIB_TDEUI)
+twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui
+twin_keramik_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_keramik_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h keramikconfig.h
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
diff --git a/kwin/clients/keramik/config/config.cpp b/kwin/clients/keramik/config/config.cpp
index b4b6ced9b..1852eadd8 100644
--- a/kwin/clients/keramik/config/config.cpp
+++ b/kwin/clients/keramik/config/config.cpp
@@ -41,18 +41,18 @@ 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
*/
KeramikConfig::KeramikConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
- KGlobal::locale()->insertCatalogue("kwin_clients");
- c = new KConfig( "kwinkeramikrc" );
+ KGlobal::locale()->insertCatalogue("twin_clients");
+ c = new KConfig( "twinkeramikrc" );
ui = new KeramikConfigUI( parent );
connect( ui->showAppIcons, TQT_SIGNAL(clicked()), TQT_SIGNAL(changed()) );
@@ -72,8 +72,8 @@ KeramikConfig::~KeramikConfig()
}
-// 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 KeramikConfig::load( KConfig* )
{
c->setGroup("General");
@@ -84,7 +84,7 @@ void KeramikConfig::load( KConfig* )
}
-// Saves the configurable options to the kwinrc config file
+// Saves the configurable options to the twinrc config file
void KeramikConfig::save( KConfig* )
{
c->setGroup( "General" );
diff --git a/kwin/clients/keramik/keramik.cpp b/kwin/clients/keramik/keramik.cpp
index 5edf98230..e514e3a20 100644
--- a/kwin/clients/keramik/keramik.cpp
+++ b/kwin/clients/keramik/keramik.cpp
@@ -562,7 +562,7 @@ void KeramikHandler::pretile( TQPixmap *&pix, int size, Qt::Orientation dir )
void KeramikHandler::readConfig()
{
- KConfig *c = new KConfig( "kwinkeramikrc" );
+ KConfig *c = new KConfig( "twinkeramikrc" );
c->setGroup( "General" );
showIcons = c->readBoolEntry( "ShowAppIcons", true );
diff --git a/kwin/clients/keramik/keramik.desktop b/kwin/clients/keramik/keramik.desktop
index c58f8d522..7ef21f47d 100644
--- a/kwin/clients/keramik/keramik.desktop
+++ b/kwin/clients/keramik/keramik.desktop
@@ -27,5 +27,5 @@ Name[uk]=Керамік
Name[uz]=Keramika
Name[uz@cyrillic]=Керамика
Name[vi]=Gốm
-X-KDE-Library=kwin3_keramik
+X-KDE-Library=twin3_keramik
diff --git a/kwin/clients/kwmtheme/Makefile.am b/kwin/clients/kwmtheme/Makefile.am
index a3a91080a..e9d3c36b8 100644
--- a/kwin/clients/kwmtheme/Makefile.am
+++ b/kwin/clients/kwmtheme/Makefile.am
@@ -1,15 +1,15 @@
SUBDIRS=cli_installer
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin3_kwmtheme.la
+kde_module_LTLIBRARIES = twin3_kwmtheme.la
-kwin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
-kwin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_kwmtheme_la_LIBADD = -ltdecorations
+twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp
+twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_kwmtheme_la_LIBADD = -ltdecorations
METASOURCES = AUTO
noinst_HEADERS = kwmthemeclient.h
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
lnk_DATA = kwmtheme.desktop
diff --git a/kwin/clients/kwmtheme/cli_installer/main.cpp b/kwin/clients/kwmtheme/cli_installer/main.cpp
index 56de8c9fe..4533cf3e8 100644
--- a/kwin/clients/kwmtheme/cli_installer/main.cpp
+++ b/kwin/clients/kwmtheme/cli_installer/main.cpp
@@ -57,10 +57,10 @@ int main(int argc, char **argv)
return(2);
}
- TQStringList appDirs = KGlobal::dirs()->findDirs("data", "kwin");
+ TQStringList appDirs = KGlobal::dirs()->findDirs("data", "twin");
TQString localDirStr = *(appDirs.end());
if(localDirStr.isEmpty()){
- localDirStr = KGlobal::dirs()->saveLocation("data", "kwin");
+ localDirStr = KGlobal::dirs()->saveLocation("data", "twin");
}
localDirStr += "/pics/";
if(!TQFile::exists(localDirStr))
diff --git a/kwin/clients/kwmtheme/kwmtheme.desktop b/kwin/clients/kwmtheme/kwmtheme.desktop
index caa8a6ea8..b34affaa7 100644
--- a/kwin/clients/kwmtheme/kwmtheme.desktop
+++ b/kwin/clients/kwmtheme/kwmtheme.desktop
@@ -78,4 +78,4 @@ Name[xh]=Umxholo we KWM
Name[zh_CN]=KWM 主题
Name[zh_TW]=KWM 主題
Name[zu]=Ingqikithi ye-KWM
-X-KDE-Library=kwin3_kwmtheme
+X-KDE-Library=twin3_kwmtheme
diff --git a/kwin/clients/kwmtheme/kwmthemeclient.cpp b/kwin/clients/kwmtheme/kwmthemeclient.cpp
index 9f51c0edf..5d5e462f7 100644
--- a/kwin/clients/kwmtheme/kwmthemeclient.cpp
+++ b/kwin/clients/kwmtheme/kwmthemeclient.cpp
@@ -90,7 +90,7 @@ static void create_pixmaps()
for(int i=0; i < 8; ++i)
{
framePixmaps[i] = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry(keys[i], " ")));
+ "twin/pics/"+config->readEntry(keys[i], " ")));
if(framePixmaps[i]->isNull())
kdWarning() << "Unable to load frame pixmap for " << keys[i] << endl;
}
@@ -111,33 +111,33 @@ static void create_pixmaps()
maxExtent++;
menuPix = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry("menu", " ")));
+ "twin/pics/"+config->readEntry("menu", " ")));
iconifyPix = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry("iconify", " ")));
+ "twin/pics/"+config->readEntry("iconify", " ")));
maxPix = new TQPixmap(locate("appdata",
"pics/"+config->readEntry("maximize", " ")));
minmaxPix = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry("maximizedown", " ")));
+ "twin/pics/"+config->readEntry("maximizedown", " ")));
closePix = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry("close", " ")));
+ "twin/pics/"+config->readEntry("close", " ")));
pinupPix = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry("pinup", " ")));
+ "twin/pics/"+config->readEntry("pinup", " ")));
pindownPix = new TQPixmap(locate("data",
- "kwin/pics/"+config->readEntry("pindown", " ")));
+ "twin/pics/"+config->readEntry("pindown", " ")));
if(menuPix->isNull())
- menuPix->load(locate("data", "kwin/pics/menu.png"));
+ menuPix->load(locate("data", "twin/pics/menu.png"));
if(iconifyPix->isNull())
- iconifyPix->load(locate("data", "kwin/pics/iconify.png"));
+ iconifyPix->load(locate("data", "twin/pics/iconify.png"));
if(maxPix->isNull())
- maxPix->load(locate("data", "kwin/pics/maximize.png"));
+ maxPix->load(locate("data", "twin/pics/maximize.png"));
if(minmaxPix->isNull())
- minmaxPix->load(locate("data", "kwin/pics/maximizedown.png"));
+ minmaxPix->load(locate("data", "twin/pics/maximizedown.png"));
if(closePix->isNull())
- closePix->load(locate("data", "kwin/pics/close.png"));
+ closePix->load(locate("data", "twin/pics/close.png"));
if(pinupPix->isNull())
- pinupPix->load(locate("data", "kwin/pics/pinup.png"));
+ pinupPix->load(locate("data", "twin/pics/pinup.png"));
if(pindownPix->isNull())
- pindownPix->load(locate("data", "kwin/pics/pindown.png"));
+ pindownPix->load(locate("data", "twin/pics/pindown.png"));
tmpStr = config->readEntry("TitleAlignment");
if(tmpStr == "right")
@@ -186,14 +186,14 @@ static void create_pixmaps()
tmpStr = config->readEntry("TitlebarPixmapActive", "");
if(!tmpStr.isEmpty()){
aTitlePix = new KPixmap;
- aTitlePix->load(locate("data", "kwin/pics/" + tmpStr));
+ aTitlePix->load(locate("data", "twin/pics/" + tmpStr));
}
else
aTitlePix = NULL;
tmpStr = config->readEntry("TitlebarPixmapInactive", "");
if(!tmpStr.isEmpty()){
iTitlePix = new KPixmap;
- iTitlePix->load(locate("data", "kwin/pics/" + tmpStr));
+ iTitlePix->load(locate("data", "twin/pics/" + tmpStr));
}
else
iTitlePix = NULL;
diff --git a/kwin/clients/laptop/CMakeLists.txt b/kwin/clients/laptop/CMakeLists.txt
index e4ae404c5..a06afdafc 100644
--- a/kwin/clients/laptop/CMakeLists.txt
+++ b/kwin/clients/laptop/CMakeLists.txt
@@ -11,7 +11,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kwin/lib
+ ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -23,12 +23,12 @@ link_directories(
##### other data ################################
-install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES laptop.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_laptop (module) #####################
+##### twin3_laptop (module) #####################
-tde_add_kpart( kwin3_laptop AUTOMOC
+tde_add_kpart( twin3_laptop AUTOMOC
SOURCES laptopclient.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/laptop/Makefile.am b/kwin/clients/laptop/Makefile.am
index cc21c569a..ccf1d359b 100644
--- a/kwin/clients/laptop/Makefile.am
+++ b/kwin/clients/laptop/Makefile.am
@@ -1,16 +1,16 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes)
-kde_module_LTLIBRARIES = kwin3_laptop.la
+kde_module_LTLIBRARIES = twin3_laptop.la
-kwin3_laptop_la_SOURCES = laptopclient.cpp
-kwin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_laptop_la_LIBADD = ../../lib/libtdecorations.la
+twin3_laptop_la_SOURCES = laptopclient.cpp
+twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_laptop_la_LIBADD = ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = laptopclient.h
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
lnk_DATA = laptop.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/laptop/laptop.desktop b/kwin/clients/laptop/laptop.desktop
index 38c5386f1..640637546 100644
--- a/kwin/clients/laptop/laptop.desktop
+++ b/kwin/clients/laptop/laptop.desktop
@@ -66,4 +66,4 @@ Name[xh]=Umphezulu osongiweyo
Name[zh_CN]=笔记本电脑
Name[zh_TW]=筆記型電腦
Name[zu]=Ikhomputha ephathwayo eyisicaba
-X-KDE-Library=kwin3_laptop
+X-KDE-Library=twin3_laptop
diff --git a/kwin/clients/modernsystem/CMakeLists.txt b/kwin/clients/modernsystem/CMakeLists.txt
index 723ddffe1..62c2d766c 100644
--- a/kwin/clients/modernsystem/CMakeLists.txt
+++ b/kwin/clients/modernsystem/CMakeLists.txt
@@ -12,7 +12,7 @@
add_subdirectory( config )
include_directories(
- ${CMAKE_SOURCE_DIR}/kwin/lib
+ ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -24,12 +24,12 @@ link_directories(
##### other data ################################
-install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES modernsystem.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_modernsys (module) ##################
+##### twin3_modernsys (module) ##################
-tde_add_kpart( kwin3_modernsys
+tde_add_kpart( twin3_modernsys
SOURCES modernsys.cpp
LINK tdecorations-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/modernsystem/Makefile.am b/kwin/clients/modernsystem/Makefile.am
index 7850663ba..e4c21d7a3 100644
--- a/kwin/clients/modernsystem/Makefile.am
+++ b/kwin/clients/modernsystem/Makefile.am
@@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = config
-kde_module_LTLIBRARIES = kwin3_modernsys.la
+kde_module_LTLIBRARIES = twin3_modernsys.la
-kwin3_modernsys_la_SOURCES = modernsys.cpp
-kwin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
-kwin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_modernsys_la_SOURCES = modernsys.cpp
+twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la
+twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
METASOURCES = AUTO
noinst_HEADERS = modernsys.h
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
lnk_DATA = modernsystem.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/modernsystem/config/CMakeLists.txt b/kwin/clients/modernsystem/config/CMakeLists.txt
index e2468db33..8a6d6db43 100644
--- a/kwin/clients/modernsystem/config/CMakeLists.txt
+++ b/kwin/clients/modernsystem/config/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
)
-##### kwin_modernsys_config (module) ############
+##### twin_modernsys_config (module) ############
-tde_add_kpart( kwin_modernsys_config AUTOMOC
+tde_add_kpart( twin_modernsys_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/modernsystem/config/Makefile.am b/kwin/clients/modernsystem/config/Makefile.am
index 55a695684..aaae38b2a 100644
--- a/kwin/clients/modernsystem/config/Makefile.am
+++ b/kwin/clients/modernsystem/config/Makefile.am
@@ -1,14 +1,14 @@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_modernsys_config.la
+kde_module_LTLIBRARIES = twin_modernsys_config.la
-kwin_modernsys_config_la_SOURCES = config.cpp
-kwin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_modernsys_config_la_LIBADD = $(LIB_TDEUI)
+twin_modernsys_config_la_SOURCES = config.cpp
+twin_modernsys_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_modernsys_config_la_LIBADD = $(LIB_TDEUI)
METASOURCES = AUTO
noinst_HEADERS = config.h
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
diff --git a/kwin/clients/modernsystem/config/config.cpp b/kwin/clients/modernsystem/config/config.cpp
index f5260ba7d..136ff3492 100644
--- a/kwin/clients/modernsystem/config/config.cpp
+++ b/kwin/clients/modernsystem/config/config.cpp
@@ -19,16 +19,16 @@ extern "C"
}
-// '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
ModernSysConfig::ModernSysConfig(KConfig* conf, TQWidget* parent) : TQObject(parent)
{
- clientrc = new KConfig("kwinmodernsysrc");
- KGlobal::locale()->insertCatalogue("kwin_clients");
+ clientrc = new KConfig("twinmodernsysrc");
+ KGlobal::locale()->insertCatalogue("twin_clients");
mainw = new TQWidget(parent);
vbox = new TQVBoxLayout(mainw);
vbox->setSpacing(6);
diff --git a/kwin/clients/modernsystem/modernsys.cpp b/kwin/clients/modernsystem/modernsys.cpp
index 30344d75c..b6e7cda01 100644
--- a/kwin/clients/modernsystem/modernsys.cpp
+++ b/kwin/clients/modernsystem/modernsys.cpp
@@ -217,7 +217,7 @@ void ModernSysFactory::read_config()
bool showh;
int hsize, hwidth, bwidth, theight;
- KConfig c("kwinmodernsysrc");
+ KConfig c("twinmodernsysrc");
c.setGroup("General");
showh = c.readBoolEntry("ShowHandle", true);
diff --git a/kwin/clients/modernsystem/modernsystem.desktop b/kwin/clients/modernsystem/modernsystem.desktop
index d6247a390..994fd2860 100644
--- a/kwin/clients/modernsystem/modernsystem.desktop
+++ b/kwin/clients/modernsystem/modernsystem.desktop
@@ -66,4 +66,4 @@ Name[vi]=Hệ thống Hiện đại
Name[wa]=Sistinme modiene
Name[zh_CN]=现代系统
Name[zh_TW]=現代系統
-X-KDE-Library=kwin3_modernsys
+X-KDE-Library=twin3_modernsys
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>
diff --git a/kwin/clients/quartz/CMakeLists.txt b/kwin/clients/quartz/CMakeLists.txt
index 160a3cd52..c521bc19c 100644
--- a/kwin/clients/quartz/CMakeLists.txt
+++ b/kwin/clients/quartz/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}
)
@@ -25,12 +25,12 @@ link_directories(
##### other data ################################
-install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES quartz.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_quartz (module) #####################
+##### twin3_quartz (module) #####################
-tde_add_kpart( kwin3_quartz AUTOMOC
+tde_add_kpart( twin3_quartz AUTOMOC
SOURCES quartz.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/quartz/Makefile.am b/kwin/clients/quartz/Makefile.am
index adfc59968..3a5709773 100644
--- a/kwin/clients/quartz/Makefile.am
+++ b/kwin/clients/quartz/Makefile.am
@@ -3,16 +3,16 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes)
SUBDIRS = . config
-kde_module_LTLIBRARIES = kwin3_quartz.la
+kde_module_LTLIBRARIES = twin3_quartz.la
-kwin3_quartz_la_SOURCES = quartz.cpp
-kwin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin3_quartz_la_SOURCES = quartz.cpp
+twin3_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = quartz.h
-lnkdir = $(kde_datadir)/kwin/
+lnkdir = $(kde_datadir)/twin/
lnk_DATA = quartz.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/quartz/config/CMakeLists.txt b/kwin/clients/quartz/config/CMakeLists.txt
index 3142505c7..e5554bb40 100644
--- a/kwin/clients/quartz/config/CMakeLists.txt
+++ b/kwin/clients/quartz/config/CMakeLists.txt
@@ -20,9 +20,9 @@ link_directories(
)
-##### kwin_quartz_config (module) ###############
+##### twin_quartz_config (module) ###############
-tde_add_kpart( kwin_quartz_config AUTOMOC
+tde_add_kpart( twin_quartz_config AUTOMOC
SOURCES config.cpp
LINK tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/quartz/config/Makefile.am b/kwin/clients/quartz/config/Makefile.am
index 525db9fe1..8a96e85a3 100644
--- a/kwin/clients/quartz/config/Makefile.am
+++ b/kwin/clients/quartz/config/Makefile.am
@@ -1,15 +1,15 @@
INCLUDES = $(all_includes)
-kde_module_LTLIBRARIES = kwin_quartz_config.la
+kde_module_LTLIBRARIES = twin_quartz_config.la
-kwin_quartz_config_la_SOURCES = config.cpp
-kwin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin_quartz_config_la_LIBADD = $(LIB_TDEUI)
+twin_quartz_config_la_SOURCES = config.cpp
+twin_quartz_config_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin_quartz_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/quartz/config/config.cpp b/kwin/clients/quartz/config/config.cpp
index d15eb4da1..c4c8e5cba 100644
--- a/kwin/clients/quartz/config/config.cpp
+++ b/kwin/clients/quartz/config/config.cpp
@@ -23,18 +23,18 @@ 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
*/
QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
: TQObject( parent )
{
- quartzConfig = new KConfig("kwinquartzrc");
- KGlobal::locale()->insertCatalogue("kwin_clients");
+ quartzConfig = new KConfig("twinquartzrc");
+ KGlobal::locale()->insertCatalogue("twin_clients");
gb = new TQVBox( parent );
cbColorBorder = new TQCheckBox(
i18n("Draw window frames using &titlebar colors"), gb );
@@ -52,7 +52,7 @@ QuartzConfig::QuartzConfig( KConfig* conf, TQWidget* parent )
connect( cbColorBorder, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
connect( cbExtraSmall, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotSelectionChanged()) );
- // Make the widgets visible in kwindecoration
+ // Make the widgets visible in twindecoration
gb->show();
}
@@ -70,8 +70,8 @@ void QuartzConfig::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 QuartzConfig::load( KConfig* /*conf*/ )
{
quartzConfig->setGroup("General");
@@ -82,7 +82,7 @@ void QuartzConfig::load( KConfig* /*conf*/ )
}
-// Saves the configurable options to the kwinrc config file
+// Saves the configurable options to the twinrc config file
void QuartzConfig::save( KConfig* /*conf*/ )
{
quartzConfig->setGroup("General");
diff --git a/kwin/clients/quartz/quartz.cpp b/kwin/clients/quartz/quartz.cpp
index 2bb0205ae..d0b8974cf 100644
--- a/kwin/clients/quartz/quartz.cpp
+++ b/kwin/clients/quartz/quartz.cpp
@@ -201,7 +201,7 @@ bool QuartzHandler::supports( Ability ability )
void QuartzHandler::readConfig()
{
- KConfig conf("kwinquartzrc");
+ KConfig conf("twinquartzrc");
conf.setGroup("General");
coloredFrame = conf.readBoolEntry( "UseTitleBarBorderColors", true );
extraSlim = conf.readBoolEntry( "UseQuartzExtraSlim", false );
diff --git a/kwin/clients/quartz/quartz.desktop b/kwin/clients/quartz/quartz.desktop
index 30a177973..d84c1d4dd 100644
--- a/kwin/clients/quartz/quartz.desktop
+++ b/kwin/clients/quartz/quartz.desktop
@@ -36,4 +36,4 @@ Name[uz@cyrillic]=Чақмоқтош
Name[ven]=Musuku
Name[vi]=Thạch anh
Name[zh_TW]=石英
-X-KDE-Library=kwin3_quartz
+X-KDE-Library=twin3_quartz
diff --git a/kwin/clients/redmond/CMakeLists.txt b/kwin/clients/redmond/CMakeLists.txt
index 5be11e2f9..b382af454 100644
--- a/kwin/clients/redmond/CMakeLists.txt
+++ b/kwin/clients/redmond/CMakeLists.txt
@@ -11,7 +11,7 @@
include_directories(
${CMAKE_CURRENT_BINARY_DIR}
- ${CMAKE_SOURCE_DIR}/kwin/lib
+ ${CMAKE_SOURCE_DIR}/twin/lib
${TDE_INCLUDE_DIR}
${TQT_INCLUDE_DIRS}
)
@@ -23,12 +23,12 @@ link_directories(
##### other data ################################
-install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES redmond.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_redmond (module) ####################
+##### twin3_redmond (module) ####################
-tde_add_kpart( kwin3_redmond AUTOMOC
+tde_add_kpart( twin3_redmond AUTOMOC
SOURCES redmond.cpp
LINK tdecorations-shared tdecore-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/redmond/Makefile.am b/kwin/clients/redmond/Makefile.am
index 7580887b8..39985f347 100644
--- a/kwin/clients/redmond/Makefile.am
+++ b/kwin/clients/redmond/Makefile.am
@@ -1,16 +1,16 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes)
-kde_module_LTLIBRARIES = kwin3_redmond.la
+kde_module_LTLIBRARIES = twin3_redmond.la
-kwin3_redmond_la_SOURCES = redmond.cpp
-kwin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
+twin3_redmond_la_SOURCES = redmond.cpp
+twin3_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la
METASOURCES = AUTO
noinst_HEADERS = redmond.h
-lnkdir = $(kde_datadir)/kwin
+lnkdir = $(kde_datadir)/twin
lnk_DATA = redmond.desktop
EXTRA_DIST = $(lnk_DATA)
diff --git a/kwin/clients/redmond/redmond.desktop b/kwin/clients/redmond/redmond.desktop
index ae7628876..398a7f651 100644
--- a/kwin/clients/redmond/redmond.desktop
+++ b/kwin/clients/redmond/redmond.desktop
@@ -16,4 +16,4 @@ Name[te]=రెడ్ మండ్
Name[tg]=Райдмонд
Name[th]=แบบเรดมอนด์
Name[uz@cyrillic]=Редмонд
-X-KDE-Library=kwin3_redmond
+X-KDE-Library=twin3_redmond
diff --git a/kwin/clients/redmond/redmond.h b/kwin/clients/redmond/redmond.h
index fdc5047bc..e5f15b8ba 100644
--- a/kwin/clients/redmond/redmond.h
+++ b/kwin/clients/redmond/redmond.h
@@ -3,7 +3,7 @@
* Redmond KWin client
*
* Copyright 2001-2003
- * Ported to kwin_iii by Chris Lee <clee@kde.org>
+ * Ported to twin_iii by Chris Lee <clee@kde.org>
* Karol Szwed <gallium@kde.org>
* http://gallium.n3.net/
*
diff --git a/kwin/clients/test/Makefile.am b/kwin/clients/test/Makefile.am
index b63377889..07ac72c02 100644
--- a/kwin/clients/test/Makefile.am
+++ b/kwin/clients/test/Makefile.am
@@ -1,15 +1,15 @@
INCLUDES = -I$(srcdir)/../../lib $(all_includes)
-kde_module_LTLIBRARIES = kwin3_test.la
+kde_module_LTLIBRARIES = twin3_test.la
-kwin3_test_la_SOURCES = test.cpp
-kwin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
-#kwin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
+twin3_test_la_SOURCES = test.cpp
+twin3_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+#twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
METASOURCES = AUTO
-kwin_test_lnkdir = $(kde_datadir)/kwin
-kwin_test_lnk_DATA = test.desktop
+twin_test_lnkdir = $(kde_datadir)/twin
+twin_test_lnk_DATA = test.desktop
-EXTRA_DIST = $(kwin_test_lnk_DATA)
+EXTRA_DIST = $(twin_test_lnk_DATA)
diff --git a/kwin/clients/test/test.desktop b/kwin/clients/test/test.desktop
index ed340f573..c6cd1e8fa 100644
--- a/kwin/clients/test/test.desktop
+++ b/kwin/clients/test/test.desktop
@@ -64,4 +64,4 @@ Name[vi]=Thử KWin
Name[wa]=Saye KPurnea
Name[zh_CN]=KWin 测试
Name[zh_TW]=KWin 測試
-X-KDE-Library=kwin3_test
+X-KDE-Library=twin3_test
diff --git a/kwin/clients/web/CMakeLists.txt b/kwin/clients/web/CMakeLists.txt
index 6a6d1088d..badbd0467 100644
--- a/kwin/clients/web/CMakeLists.txt
+++ b/kwin/clients/web/CMakeLists.txt
@@ -22,12 +22,12 @@ link_directories(
##### other data ################################
-install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/kwin )
+install( FILES web.desktop DESTINATION ${DATA_INSTALL_DIR}/twin )
-##### kwin3_web (module) ########################
+##### twin3_web (module) ########################
-tde_add_kpart( kwin3_web AUTOMOC
+tde_add_kpart( twin3_web AUTOMOC
SOURCES Web.cpp WebButton.cpp
LINK tdecorations-shared tdeui-shared
DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/kwin/clients/web/Makefile.am b/kwin/clients/web/Makefile.am
index bb5080889..4855602ca 100644
--- a/kwin/clients/web/Makefile.am
+++ b/kwin/clients/web/Makefile.am
@@ -1,15 +1,15 @@
INCLUDES = -I$(top_srcdir) $(all_includes)
-kde_module_LTLIBRARIES = kwin3_web.la
+kde_module_LTLIBRARIES = twin3_web.la
-kwin3_web_la_SOURCES = Web.cpp WebButton.cpp
+twin3_web_la_SOURCES = Web.cpp WebButton.cpp
noinst_HEADERS = Web.h WebButton.h
-kwin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
-kwin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
+twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module
+twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la
METASOURCES = AUTO
-linkdir = $(kde_datadir)/kwin/
+linkdir = $(kde_datadir)/twin/
link_DATA = web.desktop
EXTRA_DIST = $(link_DATA)
diff --git a/kwin/clients/web/Web.cpp b/kwin/clients/web/Web.cpp
index 9b5e434da..793b406af 100644
--- a/kwin/clients/web/Web.cpp
+++ b/kwin/clients/web/Web.cpp
@@ -1,5 +1,5 @@
/*
- 'Web' kwin client
+ 'Web' twin client
Copyright (C) 2005 Sandro Giessl <sandro@giessl.com>
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
@@ -183,7 +183,7 @@ WebClient::init()
if (0 != titleHeight_ % 2)
titleHeight_ += 1;
- KConfig c("kwinwebrc");
+ KConfig c("twinwebrc");
c.setGroup("General");
tqshape_ = c.readBoolEntry("Shape", true);
diff --git a/kwin/clients/web/Web.h b/kwin/clients/web/Web.h
index 565fe8125..c2c18b0bd 100644
--- a/kwin/clients/web/Web.h
+++ b/kwin/clients/web/Web.h
@@ -1,5 +1,5 @@
/*
- 'Web' kwin client
+ 'Web' twin client
Copyright (C) 2005 Sandro Giessl <sandro@giessl.com>
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
diff --git a/kwin/clients/web/WebButton.cpp b/kwin/clients/web/WebButton.cpp
index c58a7e75d..bf1f54af4 100644
--- a/kwin/clients/web/WebButton.cpp
+++ b/kwin/clients/web/WebButton.cpp
@@ -1,5 +1,5 @@
/*
- 'Web' kwin client
+ 'Web' twin client
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
diff --git a/kwin/clients/web/WebButton.h b/kwin/clients/web/WebButton.h
index b24136868..108aa2a52 100644
--- a/kwin/clients/web/WebButton.h
+++ b/kwin/clients/web/WebButton.h
@@ -1,5 +1,5 @@
/*
- 'Web' kwin client
+ 'Web' twin client
Copyright (C) 2001 Rik Hemsley (rikkus) <rik@kde.org>
diff --git a/kwin/clients/web/web.desktop b/kwin/clients/web/web.desktop
index 12ced34f4..e08748011 100644
--- a/kwin/clients/web/web.desktop
+++ b/kwin/clients/web/web.desktop
@@ -44,4 +44,4 @@ Name[vi]=Mạng
Name[wa]=Waibe
Name[zh_TW]=網頁
Name[zu]=I-Web
-X-KDE-Library=kwin3_web
+X-KDE-Library=twin3_web