twin-styles: twin3_ to twin_ conversion

Related to TDE/tdebase#364

Signed-off-by: Mavridis Philippe <[email protected]>

27 files changed, 66 insertions, 66 deletions

diff --git a/twin-styles/cde/CMakeLists.txt b/twin-styles/cde/CMakeLists.txt
index b9d5b69f..8fa6fb73 100644
--- a/twin-styles/cde/CMakeLists.txt
+++ b/twin-styles/cde/CMakeLists.txt
@@ -30,9 +30,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_cde ##################################
+##### twin_cde ##################################
 
-tde_add_kpart( twin3_cde AUTOMOC
+tde_add_kpart( twin_cde AUTOMOC
   SOURCES cdeclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/cde/Makefile.am b/twin-styles/cde/Makefile.am
index 32f2c987..f00e3d73 100644
--- a/twin-styles/cde/Makefile.am
+++ b/twin-styles/cde/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config
 
-kde_module_LTLIBRARIES = twin3_cde.la
+kde_module_LTLIBRARIES = twin_cde.la
 
-twin3_cde_la_SOURCES = cdeclient.cpp
-twin3_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_cde_la_LIBADD = -ltdecorations
+twin_cde_la_SOURCES = cdeclient.cpp
+twin_cde_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_cde_la_LIBADD = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = cdeclient.h
diff --git a/twin-styles/cde/cde.desktop b/twin-styles/cde/cde.desktop
index 955f51ea..fb1db621 100644
--- a/twin-styles/cde/cde.desktop
+++ b/twin-styles/cde/cde.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=CDE
-X-TDE-Library=twin3_cde
+X-TDE-Library=twin_cde
diff --git a/twin-styles/glow/CMakeLists.txt b/twin-styles/glow/CMakeLists.txt
index c2964870..7020246a 100644
--- a/twin-styles/glow/CMakeLists.txt
+++ b/twin-styles/glow/CMakeLists.txt
@@ -31,9 +31,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_glow ################################
+##### twin_glow ################################
 
-tde_add_kpart( twin3_glow AUTOMOC
+tde_add_kpart( twin_glow AUTOMOC
   SOURCES glowbutton.cpp glowclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/glow/Makefile.am b/twin-styles/glow/Makefile.am
index ef4ae58b..dc27fbed 100644
--- a/twin-styles/glow/Makefile.am
+++ b/twin-styles/glow/Makefile.am
@@ -3,11 +3,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config themes
 
-kde_module_LTLIBRARIES = twin3_glow.la
+kde_module_LTLIBRARIES = twin_glow.la
 
-twin3_glow_la_SOURCES = glowclient.cpp glowbutton.cpp
-twin3_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_glow_la_LIBADD  = $(LIB_TDECORE) -ltdecorations
+twin_glow_la_SOURCES = glowclient.cpp glowbutton.cpp
+twin_glow_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_glow_la_LIBADD  = $(LIB_TDECORE) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = glowclient.h glowbutton.h resources.h
diff --git a/twin-styles/glow/glow.desktop b/twin-styles/glow/glow.desktop
index 88895ca3..962d3adc 100644
--- a/twin-styles/glow/glow.desktop
+++ b/twin-styles/glow/glow.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Glow
-X-TDE-Library=twin3_glow
+X-TDE-Library=twin_glow
diff --git a/twin-styles/icewm/CMakeLists.txt b/twin-styles/icewm/CMakeLists.txt
index e710a977..38b7494f 100644
--- a/twin-styles/icewm/CMakeLists.txt
+++ b/twin-styles/icewm/CMakeLists.txt
@@ -31,9 +31,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_icewm ###############################
+##### twin_icewm ###############################
 
-tde_add_kpart( twin3_icewm AUTOMOC
+tde_add_kpart( twin_icewm AUTOMOC
   SOURCES icewm.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/icewm/Makefile.am b/twin-styles/icewm/Makefile.am
index 711b9088..a36011b6 100644
--- a/twin-styles/icewm/Makefile.am
+++ b/twin-styles/icewm/Makefile.am
@@ -2,11 +2,11 @@ INCLUDES = $(all_includes)
 
 SUBDIRS = . config icewm-themes
 
-kde_module_LTLIBRARIES = twin3_icewm.la
+kde_module_LTLIBRARIES = twin_icewm.la
 
-twin3_icewm_la_SOURCES = icewm.cpp
-twin3_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_icewm_la_LIBADD  = $(LIB_TDEUI) -ltdecorations
+twin_icewm_la_SOURCES = icewm.cpp
+twin_icewm_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_icewm_la_LIBADD  = $(LIB_TDEUI) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = icewm.h
diff --git a/twin-styles/icewm/icewm.desktop b/twin-styles/icewm/icewm.desktop
index 5cfbe97d..c877cfe4 100644
--- a/twin-styles/icewm/icewm.desktop
+++ b/twin-styles/icewm/icewm.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=IceWM
-X-TDE-Library=twin3_icewm
+X-TDE-Library=twin_icewm
diff --git a/twin-styles/kde1/CMakeLists.txt b/twin-styles/kde1/CMakeLists.txt
index d8319f10..c4c6b3ae 100644
--- a/twin-styles/kde1/CMakeLists.txt
+++ b/twin-styles/kde1/CMakeLists.txt
@@ -28,9 +28,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_cde ##################################
+##### twin_cde ##################################
 
-tde_add_kpart( twin3_kde1 AUTOMOC
+tde_add_kpart( twin_kde1 AUTOMOC
   SOURCES kde1client.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/kde1/Makefile.am b/twin-styles/kde1/Makefile.am
index 16b2c0b3..3a7498dc 100644
--- a/twin-styles/kde1/Makefile.am
+++ b/twin-styles/kde1/Makefile.am
@@ -1,11 +1,11 @@
 
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = twin3_kde1.la
+kde_module_LTLIBRARIES = twin_kde1.la
 
-twin3_kde1_la_SOURCES = kde1client.cpp
-twin3_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_kde1_la_LIBADD  = -ltdecorations
+twin_kde1_la_SOURCES = kde1client.cpp
+twin_kde1_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_kde1_la_LIBADD  = -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = kde1client.h
diff --git a/twin-styles/kde1/kde1.desktop b/twin-styles/kde1/kde1.desktop
index 4aa40c5c..085783b8 100644
--- a/twin-styles/kde1/kde1.desktop
+++ b/twin-styles/kde1/kde1.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=KDE 1
-X-TDE-Library=twin3_kde1
+X-TDE-Library=twin_kde1
diff --git a/twin-styles/kstep/CMakeLists.txt b/twin-styles/kstep/CMakeLists.txt
index a47ddd3c..cfc77261 100644
--- a/twin-styles/kstep/CMakeLists.txt
+++ b/twin-styles/kstep/CMakeLists.txt
@@ -28,9 +28,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_kstep ###############################
+##### twin_kstep ###############################
 
-tde_add_kpart( twin3_kstep AUTOMOC
+tde_add_kpart( twin_kstep AUTOMOC
   SOURCES nextclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/kstep/Makefile.am b/twin-styles/kstep/Makefile.am
index bfda21da..e6c1f0ce 100644
--- a/twin-styles/kstep/Makefile.am
+++ b/twin-styles/kstep/Makefile.am
@@ -1,12 +1,12 @@
 
 INCLUDES = $(all_includes) 
 
-kde_module_LTLIBRARIES = twin3_kstep.la
+kde_module_LTLIBRARIES = twin_kstep.la
 
-twin3_kstep_la_SOURCES = nextclient.cpp
-twin3_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_kstep_la_SOURCES = nextclient.cpp
+twin_kstep_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
 #twin_kstep_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-twin3_kstep_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin_kstep_la_LIBADD = $(LIB_TDEUI) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = nextclient.h
diff --git a/twin-styles/kstep/kstep.desktop b/twin-styles/kstep/kstep.desktop
index cc7a8639..f966140a 100644
--- a/twin-styles/kstep/kstep.desktop
+++ b/twin-styles/kstep/kstep.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=KStep
-X-TDE-Library=twin3_kstep
+X-TDE-Library=twin_kstep
diff --git a/twin-styles/openlook/CMakeLists.txt b/twin-styles/openlook/CMakeLists.txt
index a6d9e152..8551f19b 100644
--- a/twin-styles/openlook/CMakeLists.txt
+++ b/twin-styles/openlook/CMakeLists.txt
@@ -29,9 +29,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_openlook ############################
+##### twin_openlook ############################
 
-tde_add_kpart( twin3_openlook AUTOMOC
+tde_add_kpart( twin_openlook AUTOMOC
   SOURCES OpenLook.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/openlook/Makefile.am b/twin-styles/openlook/Makefile.am
index 5d6c4f7a..743c3f20 100644
--- a/twin-styles/openlook/Makefile.am
+++ b/twin-styles/openlook/Makefile.am
@@ -1,10 +1,10 @@
 INCLUDES                    = $(all_includes)
 
-kde_module_LTLIBRARIES      = twin3_openlook.la
+kde_module_LTLIBRARIES      = twin_openlook.la
 
-twin3_openlook_la_SOURCES   = OpenLook.cpp
-twin3_openlook_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_openlook_la_LIBADD    = -ltdecorations
+twin_openlook_la_SOURCES   = OpenLook.cpp
+twin_openlook_la_LDFLAGS   = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_openlook_la_LIBADD    = -ltdecorations
 
 noinst_HEADERS              = OpenLook.h
 METASOURCES                 = AUTO
diff --git a/twin-styles/openlook/openlook.desktop b/twin-styles/openlook/openlook.desktop
index 13c2a91f..70eb225f 100644
--- a/twin-styles/openlook/openlook.desktop
+++ b/twin-styles/openlook/openlook.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=OpenLook
-X-TDE-Library=twin3_openlook
+X-TDE-Library=twin_openlook
diff --git a/twin-styles/riscos/CMakeLists.txt b/twin-styles/riscos/CMakeLists.txt
index b20d6856..3ceca2f7 100644
--- a/twin-styles/riscos/CMakeLists.txt
+++ b/twin-styles/riscos/CMakeLists.txt
@@ -33,10 +33,10 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_riscos ###############################
+##### twin_riscos ###############################
 
 
-set( target twin3_riscos )
+set( target twin_riscos )
 
 set( ${target}_SRCS
   AboveButton.cpp Button.cpp
diff --git a/twin-styles/riscos/Makefile.am b/twin-styles/riscos/Makefile.am
index d23ba191..0a8d5e62 100644
--- a/twin-styles/riscos/Makefile.am
+++ b/twin-styles/riscos/Makefile.am
@@ -19,8 +19,8 @@ noinst_HEADERS = AboveButton.h \
                  Static.h \
                  StickyButton.h
 
-kde_module_LTLIBRARIES = twin3_riscos.la
-twin3_riscos_la_SOURCES = AboveButton.cpp \
+kde_module_LTLIBRARIES = twin_riscos.la
+twin_riscos_la_SOURCES = AboveButton.cpp \
                           Button.cpp \
                           CloseButton.cpp \
                           HelpButton.cpp \
@@ -31,9 +31,9 @@ twin3_riscos_la_SOURCES = AboveButton.cpp \
                           Static.cpp \
                           StickyButton.cpp
 
-twin3_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_riscos_la_LIBADD = $(LIB_TDEUI) -ltdecorations
-twin3_riscos_la_METASOURCES = AUTO
+twin_riscos_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_riscos_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin_riscos_la_METASOURCES = AUTO
 
 EXTRA_DIST = $(twin_DATA)
 
diff --git a/twin-styles/riscos/riscos.desktop b/twin-styles/riscos/riscos.desktop
index 9e37b38f..1e3554e7 100644
--- a/twin-styles/riscos/riscos.desktop
+++ b/twin-styles/riscos/riscos.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=RISC OS
-X-TDE-Library=twin3_riscos
+X-TDE-Library=twin_riscos
diff --git a/twin-styles/smooth-blend/client/CMakeLists.txt b/twin-styles/smooth-blend/client/CMakeLists.txt
index d44bda47..f9d3e063 100644
--- a/twin-styles/smooth-blend/client/CMakeLists.txt
+++ b/twin-styles/smooth-blend/client/CMakeLists.txt
@@ -34,9 +34,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_smoothblend ##########################
+##### twin_smoothblend ##########################
 
-tde_add_kpart( twin3_smoothblend AUTOMOC
+tde_add_kpart( twin_smoothblend AUTOMOC
   SOURCES smoothblend.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/smooth-blend/client/Makefile.am b/twin-styles/smooth-blend/client/Makefile.am
index 4470d8f5..dd471274 100644
--- a/twin-styles/smooth-blend/client/Makefile.am
+++ b/twin-styles/smooth-blend/client/Makefile.am
@@ -11,10 +11,10 @@ twin_DATA = smoothblend.desktop
 
 noinst_HEADERS = smoothblend.h buttons.h
 
-kde_module_LTLIBRARIES = twin3_smoothblend.la
-twin3_smoothblend_la_SOURCES = smoothblend.cpp
-twin3_smoothblend_la_LIBADD = -ltdecorations
-twin3_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
-twin3_smoothblend_la_METASOURCES = AUTO
+kde_module_LTLIBRARIES = twin_smoothblend.la
+twin_smoothblend_la_SOURCES = smoothblend.cpp
+twin_smoothblend_la_LIBADD = -ltdecorations
+twin_smoothblend_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -ltdecore -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_smoothblend_la_METASOURCES = AUTO
 
-DISTCLEANFILES = $(twin3_smoothblend_la_METASOURCES)
+DISTCLEANFILES = $(twin_smoothblend_la_METASOURCES)
diff --git a/twin-styles/smooth-blend/client/smoothblend.desktop b/twin-styles/smooth-blend/client/smoothblend.desktop
index 97500996..35eb4efa 100644
--- a/twin-styles/smooth-blend/client/smoothblend.desktop
+++ b/twin-styles/smooth-blend/client/smoothblend.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=Smooth Blend
-X-TDE-Library=twin3_smoothblend
+X-TDE-Library=twin_smoothblend
diff --git a/twin-styles/system/CMakeLists.txt b/twin-styles/system/CMakeLists.txt
index 726adaa2..264317ab 100644
--- a/twin-styles/system/CMakeLists.txt
+++ b/twin-styles/system/CMakeLists.txt
@@ -28,9 +28,9 @@ tde_create_translated_desktop(
 )
 
 
-##### twin3_system ###############################
+##### twin_system ###############################
 
-tde_add_kpart( twin3_system AUTOMOC
+tde_add_kpart( twin_system AUTOMOC
   SOURCES systemclient.cpp
   LINK tdecorations-shared
   DESTINATION ${PLUGIN_INSTALL_DIR}
diff --git a/twin-styles/system/Makefile.am b/twin-styles/system/Makefile.am
index c50034f4..04fa2963 100644
--- a/twin-styles/system/Makefile.am
+++ b/twin-styles/system/Makefile.am
@@ -1,12 +1,12 @@
 
 INCLUDES = $(all_includes)
 
-kde_module_LTLIBRARIES = twin3_system.la
+kde_module_LTLIBRARIES = twin_system.la
 
-twin3_system_la_SOURCES = systemclient.cpp
-twin3_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
+twin_system_la_SOURCES = systemclient.cpp
+twin_system_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module $(LIB_TQT) $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx
 #twin_system_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS)
-twin3_system_la_LIBADD = $(LIB_TDEUI) -ltdecorations
+twin_system_la_LIBADD = $(LIB_TDEUI) -ltdecorations
 
 METASOURCES = AUTO
 noinst_HEADERS = systemclient.h
diff --git a/twin-styles/system/system.desktop b/twin-styles/system/system.desktop
index c5136bba..a759e65d 100644
--- a/twin-styles/system/system.desktop
+++ b/twin-styles/system/system.desktop
@@ -1,3 +1,3 @@
 [Desktop Entry]
 Name=System++
-X-TDE-Library=twin3_system
+X-TDE-Library=twin_system