From 538c0cd4b6f082695059552568ba5c9f7a3d3717 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Sun, 18 Aug 2013 10:23:52 -0500 Subject: [PATCH] Rename KStyle to TDEStyle to avoid conflicts with KDE4. --- README | 8 ++++---- common/common.h | 2 +- config/CMakeLists.txt | 4 ++-- config/qtcurveconfig.cpp | 2 +- style/CMakeLists.txt | 2 +- style/qtc_tdestyle.cpp | 24 ++++++++++++------------ style/qtc_tdestyle.h | 4 ++-- style/qtcurve.themerc | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/README b/README index 329d13a..f54a4bc 100644 --- a/README +++ b/README @@ -24,7 +24,7 @@ The following options may be supplied to cmake: -DQTC_STYLE_SUPPORT=true Support QtCurve style files. These are stored as - /share/apps/kstyle/themes/qtc_.themerc + /share/apps/tdestyle/themes/qtc_.themerc -DQTC_ENABLE_PARENTLESS_DIALOG_FIX_SUPPORT=true Enable support for the 'fixParentlessDialogs' config option. NOTE: This is @@ -51,9 +51,9 @@ format: ....rest of qtcurve settings... To use this theme, either copy qtc_.themerc to -$TDEHOME/share/apps/kstyle/themes/ (usually ~/.trinity/share/apps/kstyle/themes/) -or copy to /share/apps/kstyle/themes/ (usually -/usr/share/apps/kstyle/themes/) +$TDEHOME/share/apps/tdestyle/themes/ (usually ~/.trinity/share/apps/tdestyle/themes/) +or copy to /share/apps/tdestyle/themes/ (usually +/usr/share/apps/tdestyle/themes/) When KDE's style panel is restarted, your new theme should appear in the list. diff --git a/common/common.h b/common/common.h index 16ce48f..f39022a 100644 --- a/common/common.h +++ b/common/common.h @@ -104,7 +104,7 @@ typedef gchar ** Strings; /* qtc_.themerc support */ #define KDE_PREFIX(V) ((4==(V)) ? KDE4PREFIX : KDE3PREFIX) -#define THEME_DIR "/share/apps/kstyle/themes/" +#define THEME_DIR "/share/apps/tdestyle/themes/" #define THEME_DIR4 "/share/kde4/apps/kstyle/themes/" #define THEME_PREFIX "qtc_" #define THEME_SUFFIX ".themerc" diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index 54a008c..53fea24 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -24,9 +24,9 @@ link_directories( ) -##### kstyle_qtcurve_config ##################### +##### tdestyle_qtcurve_config ##################### -set( target kstyle_qtcurve_config ) +set( target tdestyle_qtcurve_config ) set( ${target}_SRCS qtcurveconfig.cpp exportthemedialog.cpp qtcurveconfigbase.ui diff --git a/config/qtcurveconfig.cpp b/config/qtcurveconfig.cpp index 446e79a..4eccf69 100644 --- a/config/qtcurveconfig.cpp +++ b/config/qtcurveconfig.cpp @@ -62,7 +62,7 @@ extern "C" { - TQWidget * allocate_kstyle_config(TQWidget *parent) + TQWidget * allocate_tdestyle_config(TQWidget *parent) { TDEGlobal::locale()->insertCatalogue("qtcurve"); return new QtCurveConfig(parent); diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt index 96f10a5..94e80f5 100644 --- a/style/CMakeLists.txt +++ b/style/CMakeLists.txt @@ -29,7 +29,7 @@ link_directories( ##### other data ################################ -install( FILES qtcurve.themerc DESTINATION ${DATA_INSTALL_DIR}/kstyle/themes ) +install( FILES qtcurve.themerc DESTINATION ${DATA_INSTALL_DIR}/tdestyle/themes ) ##### plastik ################################### diff --git a/style/qtc_tdestyle.cpp b/style/qtc_tdestyle.cpp index 00e4844..abe7bf4 100644 --- a/style/qtc_tdestyle.cpp +++ b/style/qtc_tdestyle.cpp @@ -1349,7 +1349,7 @@ TQRect TQtCTDEStyle::querySubControlMetrics( ComplexControl control, return ret; } -static const char * const kstyle_close_xpm[] = { +static const char * const tdestyle_close_xpm[] = { "12 12 2 1", "# c #000000", ". c None", @@ -1366,7 +1366,7 @@ static const char * const kstyle_close_xpm[] = { "............", "............"}; -static const char * const kstyle_maximize_xpm[]={ +static const char * const tdestyle_maximize_xpm[]={ "12 12 2 1", "# c #000000", ". c None", @@ -1384,7 +1384,7 @@ static const char * const kstyle_maximize_xpm[]={ "............"}; -static const char * const kstyle_minimize_xpm[] = { +static const char * const tdestyle_minimize_xpm[] = { "12 12 2 1", "# c #000000", ". c None", @@ -1401,7 +1401,7 @@ static const char * const kstyle_minimize_xpm[] = { "............", "............"}; -static const char * const kstyle_normalizeup_xpm[] = { +static const char * const tdestyle_normalizeup_xpm[] = { "12 12 2 1", "# c #000000", ". c None", @@ -1419,7 +1419,7 @@ static const char * const kstyle_normalizeup_xpm[] = { "............"}; -static const char * const kstyle_shade_xpm[] = { +static const char * const tdestyle_shade_xpm[] = { "12 12 2 1", "# c #000000", ". c None", @@ -1436,7 +1436,7 @@ static const char * const kstyle_shade_xpm[] = { "............", "............"}; -static const char * const kstyle_unshade_xpm[] = { +static const char * const tdestyle_unshade_xpm[] = { "12 12 2 1", "# c #000000", ". c None", @@ -1599,17 +1599,17 @@ TQPixmap TQtCTDEStyle::stylePixmap( StylePixmap stylepixmap, { switch (stylepixmap) { case SP_TitleBarShadeButton: - return TQPixmap(const_cast(kstyle_shade_xpm)); + return TQPixmap(const_cast(tdestyle_shade_xpm)); case SP_TitleBarUnshadeButton: - return TQPixmap(const_cast(kstyle_unshade_xpm)); + return TQPixmap(const_cast(tdestyle_unshade_xpm)); case SP_TitleBarNormalButton: - return TQPixmap(const_cast(kstyle_normalizeup_xpm)); + return TQPixmap(const_cast(tdestyle_normalizeup_xpm)); case SP_TitleBarMinButton: - return TQPixmap(const_cast(kstyle_minimize_xpm)); + return TQPixmap(const_cast(tdestyle_minimize_xpm)); case SP_TitleBarMaxButton: - return TQPixmap(const_cast(kstyle_maximize_xpm)); + return TQPixmap(const_cast(tdestyle_maximize_xpm)); case SP_TitleBarCloseButton: - return TQPixmap(const_cast(kstyle_close_xpm)); + return TQPixmap(const_cast(tdestyle_close_xpm)); case SP_DockWindowCloseButton: return TQPixmap(const_cast(dock_window_close_xpm )); case SP_MessageBoxInformation: diff --git a/style/qtc_tdestyle.h b/style/qtc_tdestyle.h index 28fa024..9d01a15 100644 --- a/style/qtc_tdestyle.h +++ b/style/qtc_tdestyle.h @@ -24,8 +24,8 @@ * Boston, MA 02110-1301, USA. */ -#ifndef __TQTC_KSTYLE_H -#define __TQTC_KSTYLE_H +#ifndef __TQTC_TDESTYLE_H +#define __TQTC_TDESTYLE_H // W A R N I N G // ------------- diff --git a/style/qtcurve.themerc b/style/qtcurve.themerc index 9e4febe..f3e53fc 100644 --- a/style/qtcurve.themerc +++ b/style/qtcurve.themerc @@ -1,6 +1,6 @@ [Misc] Name=QtCurve Comment=Highly configurable style -ConfigPage=kstyle_qtcurve_config +ConfigPage=tdestyle_qtcurve_config [KDE] WidgetStyle=QtCurve