From de7e5867a65e0a46f1388e3e50bc7eeddd1aecbf Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sun, 27 Jan 2013 01:02:02 -0600 Subject: Rename a number of libraries and executables to avoid conflicts with KDE4 --- twin/clients/keramik/config/CMakeLists.txt | 2 +- twin/clients/keramik/config/Makefile.am | 4 +- twin/clients/keramik/config/config.h | 4 +- twin/clients/keramik/config/keramikconfig.ui | 76 -------------------------- twin/clients/keramik/config/keramitdeconfig.ui | 76 ++++++++++++++++++++++++++ twin/clients/keramik/keramik.cpp | 2 +- 6 files changed, 82 insertions(+), 82 deletions(-) delete mode 100644 twin/clients/keramik/config/keramikconfig.ui create mode 100644 twin/clients/keramik/config/keramitdeconfig.ui (limited to 'twin/clients/keramik') diff --git a/twin/clients/keramik/config/CMakeLists.txt b/twin/clients/keramik/config/CMakeLists.txt index 7b5bdb339..6fce6dfaf 100644 --- a/twin/clients/keramik/config/CMakeLists.txt +++ b/twin/clients/keramik/config/CMakeLists.txt @@ -23,7 +23,7 @@ link_directories( ##### twin_keramik_config (module) ############## tde_add_kpart( twin_keramik_config AUTOMOC - SOURCES config.cpp keramikconfig.ui + SOURCES config.cpp keramitdeconfig.ui LINK tdeui-shared DESTINATION ${PLUGIN_INSTALL_DIR} ) diff --git a/twin/clients/keramik/config/Makefile.am b/twin/clients/keramik/config/Makefile.am index 19ee4f27d..aa6014cf5 100644 --- a/twin/clients/keramik/config/Makefile.am +++ b/twin/clients/keramik/config/Makefile.am @@ -2,12 +2,12 @@ INCLUDES = $(all_includes) kde_module_LTLIBRARIES = twin_keramik_config.la -twin_keramik_config_la_SOURCES = config.cpp keramikconfig.ui +twin_keramik_config_la_SOURCES = config.cpp keramitdeconfig.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 +noinst_HEADERS = config.h keramitdeconfig.h lnkdir = $(kde_datadir)/twin diff --git a/twin/clients/keramik/config/config.h b/twin/clients/keramik/config/config.h index 4138fe958..7907f28e5 100644 --- a/twin/clients/keramik/config/config.h +++ b/twin/clients/keramik/config/config.h @@ -25,9 +25,9 @@ #ifndef __KWIN_KERAMIK_CONFIG_H #define __KWIN_KERAMIK_CONFIG_H -#include +#include -#include "keramikconfig.h" +#include "keramitdeconfig.h" class KeramikConfig: public TQObject { diff --git a/twin/clients/keramik/config/keramikconfig.ui b/twin/clients/keramik/config/keramikconfig.ui deleted file mode 100644 index dda8d5b5f..000000000 --- a/twin/clients/keramik/config/keramikconfig.ui +++ /dev/null @@ -1,76 +0,0 @@ - -KeramikConfigUI - - - KeramikConfigUI - - - - 0 - 0 - 295 - 104 - - - - Keramik - - - - unnamed - - - 0 - - - - showAppIcons - - - Display the window &icon in the caption bubble - - - Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text. - - - - - smallCaptions - - - Draw &small caption bubbles on active windows - - - Check this option if you want the caption bubble to have the same size on active windows that it has on inactive ones. This option is useful for laptops or low resolution displays where you want maximize the amount of space available to the window contents. - - - - - largeGrabBars - - - Draw g&rab bars below windows - - - Check this option if you want a grab bar to be drawn below windows. When this option is not selected only a thin border will be drawn in its place. - - - - - useShadowedText - - - Use shadowed &text - - - Check this option if you want the titlebar text to have a 3D look with a shadow behind it. - - - - - - kdialog.h - - - - diff --git a/twin/clients/keramik/config/keramitdeconfig.ui b/twin/clients/keramik/config/keramitdeconfig.ui new file mode 100644 index 000000000..dda8d5b5f --- /dev/null +++ b/twin/clients/keramik/config/keramitdeconfig.ui @@ -0,0 +1,76 @@ + +KeramikConfigUI + + + KeramikConfigUI + + + + 0 + 0 + 295 + 104 + + + + Keramik + + + + unnamed + + + 0 + + + + showAppIcons + + + Display the window &icon in the caption bubble + + + Check this option if you want the window icon to be displayed in the caption bubble next to the titlebar text. + + + + + smallCaptions + + + Draw &small caption bubbles on active windows + + + Check this option if you want the caption bubble to have the same size on active windows that it has on inactive ones. This option is useful for laptops or low resolution displays where you want maximize the amount of space available to the window contents. + + + + + largeGrabBars + + + Draw g&rab bars below windows + + + Check this option if you want a grab bar to be drawn below windows. When this option is not selected only a thin border will be drawn in its place. + + + + + useShadowedText + + + Use shadowed &text + + + Check this option if you want the titlebar text to have a 3D look with a shadow behind it. + + + + + + kdialog.h + + + + diff --git a/twin/clients/keramik/keramik.cpp b/twin/clients/keramik/keramik.cpp index 3825a851a..d90291ad2 100644 --- a/twin/clients/keramik/keramik.cpp +++ b/twin/clients/keramik/keramik.cpp @@ -20,7 +20,7 @@ * Boston, MA 02110-1301, USA. */ -#include +#include #include #include -- cgit v1.2.1