summaryrefslogtreecommitdiffstats
path: root/kwin/clients/b2
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-07 20:26:07 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-11-07 20:26:07 -0600
commit43d99cc2477266cb9072e179137f0e8485370b3d (patch)
tree0d4d47e5497a1a1465edf8263f57b72725577239 /kwin/clients/b2
parent6354e6b3babad3ed0f5e314735bbbc01d1988eb2 (diff)
downloadtdebase-43d99cc2477266cb9072e179137f0e8485370b3d.tar.gz
tdebase-43d99cc2477266cb9072e179137f0e8485370b3d.zip
Rename kwin to twin (part 1 of 2)
Diffstat (limited to 'kwin/clients/b2')
-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
7 files changed, 28 insertions, 28 deletions
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");