From 88ea716029699830af75615bb9a0cbaf213a01ba Mon Sep 17 00:00:00 2001 From: Mavridis Philippe Date: Thu, 22 Jun 2023 15:07:49 +0300 Subject: KWin: rename client libraries twin3_* -> twin_* Signed-off-by: Mavridis Philippe --- twin/clients/PORTING | 4 ---- twin/clients/b2/CMakeLists.txt | 4 ++-- twin/clients/b2/Makefile.am | 8 ++++---- twin/clients/b2/b2.desktop | 2 +- twin/clients/default/CMakeLists.txt | 4 ++-- twin/clients/default/Makefile.am | 8 ++++---- twin/clients/keramik/CMakeLists.txt | 4 ++-- twin/clients/keramik/Makefile.am | 12 ++++++------ twin/clients/keramik/keramik.desktop | 2 +- twin/clients/kwmtheme/Makefile.am | 8 ++++---- twin/clients/kwmtheme/kwmtheme.desktop | 2 +- twin/clients/laptop/CMakeLists.txt | 4 ++-- twin/clients/laptop/Makefile.am | 8 ++++---- twin/clients/laptop/laptop.desktop | 2 +- twin/clients/modernsystem/CMakeLists.txt | 4 ++-- twin/clients/modernsystem/Makefile.am | 8 ++++---- twin/clients/modernsystem/modernsystem.desktop | 2 +- twin/clients/plastik/CMakeLists.txt | 4 ++-- twin/clients/plastik/Makefile.am | 12 ++++++------ twin/clients/plastik/plastik.desktop | 2 +- twin/clients/quartz/CMakeLists.txt | 4 ++-- twin/clients/quartz/Makefile.am | 8 ++++---- twin/clients/quartz/quartz.desktop | 2 +- twin/clients/redmond/CMakeLists.txt | 4 ++-- twin/clients/redmond/Makefile.am | 8 ++++---- twin/clients/redmond/redmond.desktop | 2 +- twin/clients/test/Makefile.am | 8 ++++---- twin/clients/test/test.desktop | 2 +- twin/clients/web/CMakeLists.txt | 4 ++-- twin/clients/web/Makefile.am | 8 ++++---- twin/clients/web/web.desktop | 2 +- twin/data/CMakeLists.txt | 4 ++-- twin/data/Makefile.am | 4 ++-- twin/data/twin3_plugin.pl | 8 -------- twin/data/twin3_plugin.upd | 4 ---- twin/lib/kdecoration_plugins_p.cpp | 2 +- twin/plugins.cpp | 2 +- twin/tools/decobenchmark/main.cpp | 2 +- 38 files changed, 83 insertions(+), 99 deletions(-) delete mode 100644 twin/data/twin3_plugin.pl delete mode 100644 twin/data/twin3_plugin.upd (limited to 'twin') diff --git a/twin/clients/PORTING b/twin/clients/PORTING index 0c0c1a6ea..e6a18a7a1 100644 --- a/twin/clients/PORTING +++ b/twin/clients/PORTING @@ -2,14 +2,10 @@ 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 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)/twin/ ). -.desktop file: -- Change twin_ to twin3_ in X-TDE-Library. - Sources: - There are no twin/something.h includes, and don't use the KWinInternal namespace. - Use QToolTip instead of KWinToolTip. diff --git a/twin/clients/b2/CMakeLists.txt b/twin/clients/b2/CMakeLists.txt index cd08f4d99..ba946ba75 100644 --- a/twin/clients/b2/CMakeLists.txt +++ b/twin/clients/b2/CMakeLists.txt @@ -32,9 +32,9 @@ tde_create_translated_desktop( ) -##### twin3_b2 (module) ######################### +##### twin_b2 (module) ######################### -tde_add_kpart( twin3_b2 AUTOMOC +tde_add_kpart( twin_b2 AUTOMOC SOURCES b2client.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/b2/Makefile.am b/twin/clients/b2/Makefile.am index ccd7f39fa..71bbbb556 100644 --- a/twin/clients/b2/Makefile.am +++ b/twin/clients/b2/Makefile.am @@ -3,12 +3,12 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = twin3_b2.la +kde_module_LTLIBRARIES = twin_b2.la -twin3_b2_la_SOURCES = b2client.cpp -twin3_b2_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_b2_la_SOURCES = b2client.cpp +twin_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 +twin_b2_la_LIBADD = ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = b2client.h diff --git a/twin/clients/b2/b2.desktop b/twin/clients/b2/b2.desktop index b5eacefa9..767e9bfc4 100644 --- a/twin/clients/b2/b2.desktop +++ b/twin/clients/b2/b2.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=B II -X-TDE-Library=twin3_b2 +X-TDE-Library=twin_b2 diff --git a/twin/clients/default/CMakeLists.txt b/twin/clients/default/CMakeLists.txt index 142a9b783..56bae72f9 100644 --- a/twin/clients/default/CMakeLists.txt +++ b/twin/clients/default/CMakeLists.txt @@ -23,9 +23,9 @@ link_directories( ) -##### twin3_default (module) #################### +##### twin_default (module) #################### -tde_add_kpart( twin3_default AUTOMOC +tde_add_kpart( twin_default AUTOMOC SOURCES kdedefault.cpp LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/default/Makefile.am b/twin/clients/default/Makefile.am index 3e687a2a6..2b609988b 100644 --- a/twin/clients/default/Makefile.am +++ b/twin/clients/default/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = twin3_default.la +kde_module_LTLIBRARIES = twin_default.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 +twin_default_la_SOURCES = kdedefault.cpp +twin_default_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_default_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = kdedefault.h diff --git a/twin/clients/keramik/CMakeLists.txt b/twin/clients/keramik/CMakeLists.txt index 6eade7074..736d3dc3a 100644 --- a/twin/clients/keramik/CMakeLists.txt +++ b/twin/clients/keramik/CMakeLists.txt @@ -32,12 +32,12 @@ tde_create_translated_desktop( ) -##### twin3_keramik (module) #################### +##### twin_keramik (module) #################### set_source_files_properties( keramik.cpp PROPERTIES OBJECT_DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/tiles.h ) -tde_add_kpart( twin3_keramik AUTOMOC +tde_add_kpart( twin_keramik AUTOMOC SOURCES keramik.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/keramik/Makefile.am b/twin/clients/keramik/Makefile.am index 2ed77cac7..3fe2162ed 100644 --- a/twin/clients/keramik/Makefile.am +++ b/twin/clients/keramik/Makefile.am @@ -10,13 +10,13 @@ embedtool_SOURCES = embedtool.cpp embedtool_LDADD = $(LIB_TQT) embedtool_LDFLAGS = $(all_libraries) $(KDE_RPATH) $(LIB_TQT) -lDCOP $(LIB_TDECORE) $(LIB_TDEUI) -ltdefx $(LIB_TDEIO) -ltdetexteditor -kde_module_LTLIBRARIES = twin3_keramik.la +kde_module_LTLIBRARIES = twin_keramik.la -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) +twin_keramik_la_SOURCES = keramik.cpp +twin_keramik_la_COMPILE_FIRST = tiles.h +twin_keramik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_keramik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +#twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO noinst_headers = keramik.h tiles.h diff --git a/twin/clients/keramik/keramik.desktop b/twin/clients/keramik/keramik.desktop index fa51c6ea1..fde07b804 100644 --- a/twin/clients/keramik/keramik.desktop +++ b/twin/clients/keramik/keramik.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Keramik -X-TDE-Library=twin3_keramik +X-TDE-Library=twin_keramik diff --git a/twin/clients/kwmtheme/Makefile.am b/twin/clients/kwmtheme/Makefile.am index e9d3c36b8..6a201bccf 100644 --- a/twin/clients/kwmtheme/Makefile.am +++ b/twin/clients/kwmtheme/Makefile.am @@ -1,11 +1,11 @@ SUBDIRS=cli_installer INCLUDES = $(all_includes) -kde_module_LTLIBRARIES = twin3_kwmtheme.la +kde_module_LTLIBRARIES = twin_kwmtheme.la -twin3_kwmtheme_la_SOURCES = kwmthemeclient.cpp -twin3_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_kwmtheme_la_LIBADD = -ltdecorations +twin_kwmtheme_la_SOURCES = kwmthemeclient.cpp +twin_kwmtheme_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_kwmtheme_la_LIBADD = -ltdecorations METASOURCES = AUTO noinst_HEADERS = kwmthemeclient.h diff --git a/twin/clients/kwmtheme/kwmtheme.desktop b/twin/clients/kwmtheme/kwmtheme.desktop index 69e066f63..b18ce962b 100644 --- a/twin/clients/kwmtheme/kwmtheme.desktop +++ b/twin/clients/kwmtheme/kwmtheme.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=KWM Theme -X-TDE-Library=twin3_kwmtheme +X-TDE-Library=twin_kwmtheme diff --git a/twin/clients/laptop/CMakeLists.txt b/twin/clients/laptop/CMakeLists.txt index 479de7a84..9fe25af3a 100644 --- a/twin/clients/laptop/CMakeLists.txt +++ b/twin/clients/laptop/CMakeLists.txt @@ -30,9 +30,9 @@ tde_create_translated_desktop( ) -##### twin3_laptop (module) ##################### +##### twin_laptop (module) ##################### -tde_add_kpart( twin3_laptop AUTOMOC +tde_add_kpart( twin_laptop AUTOMOC SOURCES laptopclient.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/laptop/Makefile.am b/twin/clients/laptop/Makefile.am index ccf1d359b..1788a8691 100644 --- a/twin/clients/laptop/Makefile.am +++ b/twin/clients/laptop/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = twin3_laptop.la +kde_module_LTLIBRARIES = twin_laptop.la -twin3_laptop_la_SOURCES = laptopclient.cpp -twin3_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_laptop_la_LIBADD = ../../lib/libtdecorations.la +twin_laptop_la_SOURCES = laptopclient.cpp +twin_laptop_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_laptop_la_LIBADD = ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = laptopclient.h diff --git a/twin/clients/laptop/laptop.desktop b/twin/clients/laptop/laptop.desktop index 27f569634..060b0cce2 100644 --- a/twin/clients/laptop/laptop.desktop +++ b/twin/clients/laptop/laptop.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Laptop -X-TDE-Library=twin3_laptop +X-TDE-Library=twin_laptop diff --git a/twin/clients/modernsystem/CMakeLists.txt b/twin/clients/modernsystem/CMakeLists.txt index 5bb92031e..166e3aae5 100644 --- a/twin/clients/modernsystem/CMakeLists.txt +++ b/twin/clients/modernsystem/CMakeLists.txt @@ -31,9 +31,9 @@ tde_create_translated_desktop( ) -##### twin3_modernsys (module) ################## +##### twin_modernsys (module) ################## -tde_add_kpart( twin3_modernsys +tde_add_kpart( twin_modernsys SOURCES modernsys.cpp LINK tdecorations-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/modernsystem/Makefile.am b/twin/clients/modernsystem/Makefile.am index e4c21d7a3..902669685 100644 --- a/twin/clients/modernsystem/Makefile.am +++ b/twin/clients/modernsystem/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = config -kde_module_LTLIBRARIES = twin3_modernsys.la +kde_module_LTLIBRARIES = twin_modernsys.la -twin3_modernsys_la_SOURCES = modernsys.cpp -twin3_modernsys_la_LIBADD = ../../lib/libtdecorations.la -twin3_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_modernsys_la_SOURCES = modernsys.cpp +twin_modernsys_la_LIBADD = ../../lib/libtdecorations.la +twin_modernsys_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module METASOURCES = AUTO noinst_HEADERS = modernsys.h diff --git a/twin/clients/modernsystem/modernsystem.desktop b/twin/clients/modernsystem/modernsystem.desktop index 85a301733..76601f9f2 100644 --- a/twin/clients/modernsystem/modernsystem.desktop +++ b/twin/clients/modernsystem/modernsystem.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Modern System -X-TDE-Library=twin3_modernsys +X-TDE-Library=twin_modernsys diff --git a/twin/clients/plastik/CMakeLists.txt b/twin/clients/plastik/CMakeLists.txt index 695468994..8e920bdc2 100644 --- a/twin/clients/plastik/CMakeLists.txt +++ b/twin/clients/plastik/CMakeLists.txt @@ -34,9 +34,9 @@ tde_create_translated_desktop( ) -##### twin3_plastik (module) #################### +##### twin_plastik (module) #################### -tde_add_kpart( twin3_plastik AUTOMOC +tde_add_kpart( twin_plastik AUTOMOC SOURCES plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/plastik/Makefile.am b/twin/clients/plastik/Makefile.am index c1757891d..0afee676a 100644 --- a/twin/clients/plastik/Makefile.am +++ b/twin/clients/plastik/Makefile.am @@ -9,11 +9,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) twindir = $(kde_datadir)/twin/ twin_DATA = plastik.desktop -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 +kde_module_LTLIBRARIES = twin_plastik.la +twin_plastik_la_SOURCES = plastik.cpp plastikclient.cpp plastikbutton.cpp misc.cpp +twin_plastik_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_plastik_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin_plastik_la_METASOURCES = AUTO -DISTCLEANFILES = $(twin3_plastik_la_METASOURCES) +DISTCLEANFILES = $(twin_plastik_la_METASOURCES) diff --git a/twin/clients/plastik/plastik.desktop b/twin/clients/plastik/plastik.desktop index cbe609785..564f33e5c 100644 --- a/twin/clients/plastik/plastik.desktop +++ b/twin/clients/plastik/plastik.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Plastik -X-TDE-Library=twin3_plastik +X-TDE-Library=twin_plastik diff --git a/twin/clients/quartz/CMakeLists.txt b/twin/clients/quartz/CMakeLists.txt index 49d56d419..70d9fb49a 100644 --- a/twin/clients/quartz/CMakeLists.txt +++ b/twin/clients/quartz/CMakeLists.txt @@ -32,9 +32,9 @@ tde_create_translated_desktop( ) -##### twin3_quartz (module) ##################### +##### twin_quartz (module) ##################### -tde_add_kpart( twin3_quartz AUTOMOC +tde_add_kpart( twin_quartz AUTOMOC SOURCES quartz.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/quartz/Makefile.am b/twin/clients/quartz/Makefile.am index 3a5709773..ae69a53a6 100644 --- a/twin/clients/quartz/Makefile.am +++ b/twin/clients/quartz/Makefile.am @@ -3,11 +3,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) SUBDIRS = . config -kde_module_LTLIBRARIES = twin3_quartz.la +kde_module_LTLIBRARIES = twin_quartz.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 +twin_quartz_la_SOURCES = quartz.cpp +twin_quartz_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_quartz_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = quartz.h diff --git a/twin/clients/quartz/quartz.desktop b/twin/clients/quartz/quartz.desktop index 8083eec1f..ef69ddda3 100644 --- a/twin/clients/quartz/quartz.desktop +++ b/twin/clients/quartz/quartz.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Quartz -X-TDE-Library=twin3_quartz +X-TDE-Library=twin_quartz diff --git a/twin/clients/redmond/CMakeLists.txt b/twin/clients/redmond/CMakeLists.txt index 7240233a0..17a13bac9 100644 --- a/twin/clients/redmond/CMakeLists.txt +++ b/twin/clients/redmond/CMakeLists.txt @@ -30,9 +30,9 @@ tde_create_translated_desktop( ) -##### twin3_redmond (module) #################### +##### twin_redmond (module) #################### -tde_add_kpart( twin3_redmond AUTOMOC +tde_add_kpart( twin_redmond AUTOMOC SOURCES redmond.cpp LINK tdecorations-shared tdecore-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/redmond/Makefile.am b/twin/clients/redmond/Makefile.am index 39985f347..c00af257e 100644 --- a/twin/clients/redmond/Makefile.am +++ b/twin/clients/redmond/Makefile.am @@ -1,11 +1,11 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = twin3_redmond.la +kde_module_LTLIBRARIES = twin_redmond.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 +twin_redmond_la_SOURCES = redmond.cpp +twin_redmond_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_redmond_la_LIBADD = $(LIB_TDECORE) ../../lib/libtdecorations.la METASOURCES = AUTO noinst_HEADERS = redmond.h diff --git a/twin/clients/redmond/redmond.desktop b/twin/clients/redmond/redmond.desktop index d6bf0a9b0..68a360be0 100644 --- a/twin/clients/redmond/redmond.desktop +++ b/twin/clients/redmond/redmond.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Redmond -X-TDE-Library=twin3_redmond +X-TDE-Library=twin_redmond diff --git a/twin/clients/test/Makefile.am b/twin/clients/test/Makefile.am index 07ac72c02..f25bc0b3e 100644 --- a/twin/clients/test/Makefile.am +++ b/twin/clients/test/Makefile.am @@ -1,10 +1,10 @@ INCLUDES = -I$(srcdir)/../../lib $(all_includes) -kde_module_LTLIBRARIES = twin3_test.la +kde_module_LTLIBRARIES = twin_test.la -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_test_la_SOURCES = test.cpp +twin_test_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_test_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la #twin_keramik_la_LDFLAGS = $(all_libraries) -avoid-version -module $(KDE_RPATH) $(KDE_MT_LDFLAGS) METASOURCES = AUTO diff --git a/twin/clients/test/test.desktop b/twin/clients/test/test.desktop index 04e9ebaeb..17a13bad8 100644 --- a/twin/clients/test/test.desktop +++ b/twin/clients/test/test.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=KWin test -X-TDE-Library=twin3_test +X-TDE-Library=twin_test diff --git a/twin/clients/web/CMakeLists.txt b/twin/clients/web/CMakeLists.txt index 6045bcbb0..5547dabe7 100644 --- a/twin/clients/web/CMakeLists.txt +++ b/twin/clients/web/CMakeLists.txt @@ -29,9 +29,9 @@ tde_create_translated_desktop( ) -##### twin3_web (module) ######################## +##### twin_web (module) ######################## -tde_add_kpart( twin3_web AUTOMOC +tde_add_kpart( twin_web AUTOMOC SOURCES Web.cpp WebButton.cpp LINK tdecorations-shared tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} diff --git a/twin/clients/web/Makefile.am b/twin/clients/web/Makefile.am index 4855602ca..ba3efcb59 100644 --- a/twin/clients/web/Makefile.am +++ b/twin/clients/web/Makefile.am @@ -1,12 +1,12 @@ INCLUDES = -I$(top_srcdir) $(all_includes) -kde_module_LTLIBRARIES = twin3_web.la +kde_module_LTLIBRARIES = twin_web.la -twin3_web_la_SOURCES = Web.cpp WebButton.cpp +twin_web_la_SOURCES = Web.cpp WebButton.cpp noinst_HEADERS = Web.h WebButton.h -twin3_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module -twin3_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la +twin_web_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN) -module +twin_web_la_LIBADD = $(LIB_TDEUI) ../../lib/libtdecorations.la METASOURCES = AUTO linkdir = $(kde_datadir)/twin/ diff --git a/twin/clients/web/web.desktop b/twin/clients/web/web.desktop index 10a05ccf1..e850418a4 100644 --- a/twin/clients/web/web.desktop +++ b/twin/clients/web/web.desktop @@ -1,3 +1,3 @@ [Desktop Entry] Name=Web -X-TDE-Library=twin3_web +X-TDE-Library=twin_web diff --git a/twin/data/CMakeLists.txt b/twin/data/CMakeLists.txt index 840c5afcf..df0b79f88 100644 --- a/twin/data/CMakeLists.txt +++ b/twin/data/CMakeLists.txt @@ -22,13 +22,13 @@ link_directories( ##### other data ################################ install( FILES - twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd + twin.upd twinsticky.upd twiniconify.upd twin_focus1.upd twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( PROGRAMS - pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh + pluginlibFix.pl twin_focus1.sh twin_focus2.sh DESTINATION ${KCONF_UPDATE_INSTALL_DIR} ) install( FILES diff --git a/twin/data/Makefile.am b/twin/data/Makefile.am index 0a2dab482..64ce6ab81 100644 --- a/twin/data/Makefile.am +++ b/twin/data/Makefile.am @@ -16,9 +16,9 @@ METASOURCES = AUTO sounddir= $(kde_sounddir) sound_DATA = pop.wav -update_DATA = twin.upd twinsticky.upd twiniconify.upd twin3_plugin.upd twin_focus1.upd \ +update_DATA = twin.upd twinsticky.upd twiniconify.upd twin_focus1.upd \ twinupdatewindowsettings.upd twin_focus2.upd twin_fsp_workarounds_1.upd -update_SCRIPTS = pluginlibFix.pl twin3_plugin.pl twin_focus1.sh twin_focus2.sh +update_SCRIPTS = pluginlibFix.pl twin_focus1.sh twin_focus2.sh updatedir = $(kde_datadir)/tdeconf_update twin_default_rules_DATA = fsp_workarounds_1.twinrules diff --git a/twin/data/twin3_plugin.pl b/twin/data/twin3_plugin.pl deleted file mode 100644 index f5234bcce..000000000 --- a/twin/data/twin3_plugin.pl +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/perl -foreach (<>) { - if(/^PluginLib=twin_(.*)$/) { - print "PluginLib=twin3_$1\n"; - next; - } - print $_; -} diff --git a/twin/data/twin3_plugin.upd b/twin/data/twin3_plugin.upd deleted file mode 100644 index 7194b5641..000000000 --- a/twin/data/twin3_plugin.upd +++ /dev/null @@ -1,4 +0,0 @@ -Id=trinity.2 -File=twinrc -Options=overwrite -Script=twin3_plugin.pl,perl diff --git a/twin/lib/kdecoration_plugins_p.cpp b/twin/lib/kdecoration_plugins_p.cpp index 5f6cdd8f5..31de52e6d 100644 --- a/twin/lib/kdecoration_plugins_p.cpp +++ b/twin/lib/kdecoration_plugins_p.cpp @@ -42,7 +42,7 @@ KDecorationPlugins::KDecorationPlugins( TDEConfig* cfg ) fact( NULL ), old_library( NULL ), old_fact( NULL ), - pluginStr( "twin3_undefined " ), + pluginStr( "twin_undefined " ), config( cfg ) { } diff --git a/twin/plugins.cpp b/twin/plugins.cpp index 5f20b7018..bb995de22 100644 --- a/twin/plugins.cpp +++ b/twin/plugins.cpp @@ -23,7 +23,7 @@ PluginMgr::PluginMgr() : KDecorationPlugins( TDEGlobal::config()) { defaultPlugin = (TQPixmap::defaultDepth() > 8) ? - "twin3_plastik" : "twin3_quartz"; + "twin_plastik" : "twin_quartz"; loadPlugin( "" ); // load the plugin specified in cfg file } diff --git a/twin/tools/decobenchmark/main.cpp b/twin/tools/decobenchmark/main.cpp index 341b7ce44..c4efddace 100644 --- a/twin/tools/decobenchmark/main.cpp +++ b/twin/tools/decobenchmark/main.cpp @@ -39,7 +39,7 @@ static TDECmdLineOptions options[] = { - { "+decoration", "Decoration library to use, such as twin3_plastik.", 0 }, + { "+decoration", "Decoration library to use, such as twin_plastik.", 0 }, { "+tests", "Which test should be executed ('all', 'repaint', 'caption', 'resize', 'recreation')", 0 }, { "+repetitions", "Number of test repetitions.", 0 }, { 0, 0, 0 } -- cgit v1.2.1