From 5bfc9b73420d27acb719c10462366ea08470591c Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Thu, 12 Mar 2026 17:52:53 +0900 Subject: Remove use of TDE_VERSION Signed-off-by: Michele Calgaro --- common/config_file.c | 6 ++---- style/CMakeLists.txt | 2 +- style/qtcurve.cpp | 32 ++++++++++++++++++-------------- style/qtcurve.h | 5 ++--- 4 files changed, 23 insertions(+), 22 deletions(-) diff --git a/common/config_file.c b/common/config_file.c index 38ba3c3..23567a5 100644 --- a/common/config_file.c +++ b/common/config_file.c @@ -569,11 +569,9 @@ static const char * getHome() #ifdef __cplusplus -#if defined TQTC_TQT_ONLY || 0x039999 < 0x040000 -#if 0x039999 < 0x040000 +#if defined TQTC_TQT_ONLY #include #include -#endif // Take from TDEStandardDirs::makeDir static bool makeDir(const TQString& dir, int mode) { @@ -697,7 +695,7 @@ static const char *qtcConfDir() if(0!=lstat(cfgDir, &info)) { #ifdef __cplusplus -#if defined TQTC_TQT_ONLY || 0x039999 < 0x040000 +#if defined TQTC_TQT_ONLY makeDir(cfgDir, 0755); #else TDEStandardDirs::makeDir(cfgDir, 0755); diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt index fc14b38..db3ccdb 100644 --- a/style/CMakeLists.txt +++ b/style/CMakeLists.txt @@ -45,6 +45,6 @@ set( ${target}_SRCS tde_add_kpart( ${target} AUTOMOC SOURCES ${${target}_SRCS} - LINK tdefx-shared + LINK tdecore-shared tdefx-shared DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/styles ) diff --git a/style/qtcurve.cpp b/style/qtcurve.cpp index c530359..98af487 100644 --- a/style/qtcurve.cpp +++ b/style/qtcurve.cpp @@ -62,9 +62,6 @@ dimension, so as to draw the scrollbar at the correct size. #include #include "config.h" -#ifndef TQTC_TQT_ONLY -#include -#endif #include #include #include @@ -406,7 +403,7 @@ TQ_EXPORT_PLUGIN(QtCurveStylePlugin) #define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp) -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY #include #endif @@ -424,7 +421,7 @@ TQ_EXPORT_PLUGIN(QtCurveStylePlugin) #define DW_BGND 105 -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY // Try to read $TDEHOME/share/config/kickerrc to find out if kicker is transparent... static bool kickerIsTrans() @@ -869,7 +866,7 @@ QtCurveStyle::QtCurveStyle() itsMdiColors(0L), itsThemedApp(APP_OTHER), itsPixmapCache(150000, 499), -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY itsIsTransKicker(false), #endif itsHover(HOVER_NONE), @@ -1217,7 +1214,7 @@ void QtCurveStyle::applicationPolish(const TQStyleControlElementData &ceData, Co if ("kicker"==appName || "appletproxy"==appName) { itsThemedApp=APP_KICKER; - #if defined TQTC_TQT_ONLY || !defined TDE_VERSION + #if defined TQTC_TQT_ONLY itsIsTransKicker=kickerIsTrans(); #endif } @@ -1252,7 +1249,7 @@ void QtCurveStyle::applicationPolish(const TQStyleControlElementData &ceData, Co else if ("korn"==appName) { itsThemedApp=APP_KORN; - #if defined TQTC_TQT_ONLY || !defined TDE_VERSION + #if defined TQTC_TQT_ONLY itsIsTransKicker=kickerIsTrans(); #endif } @@ -3281,12 +3278,12 @@ void QtCurveStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyl if(flags&Style_Down) flags=((flags|Style_Down)^Style_Down)| Style_Sunken; flags|=Style_Enabled; -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY itsFormMode=itsIsTransKicker; #endif drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL, getFill(flags, use), use, true, false); -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY itsFormMode=false; #endif } @@ -3437,7 +3434,7 @@ void QtCurveStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyl ? cg.background().dark(DW_BGND) : */cg.background(), p, r, cg, glassMod ? flags : flags|Style_Horizontal, -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) || #endif operaMdi || mdi @@ -3469,7 +3466,7 @@ void QtCurveStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyl drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal, flags&CHECK_BUTTON -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) #endif ? ROUNDED_NONE : ROUNDED_ALL, @@ -3973,7 +3970,9 @@ void QtCurveStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyl // } // else { +#if defined TQTC_TQT_ONLY itsFormMode=itsIsTransKicker; +#endif if(sv && !opts.highlightScrollViews) flags&=~Style_HasFocus; if(sv && opts.etchEntry && ((TQFrame *)widget)->lineWidth()>2) @@ -3999,7 +3998,12 @@ void QtCurveStyle::drawPrimitive(PrimitiveElement pe, TQPainter *p, const TQStyl drawBorder(cg.background(), p, r, cg, (SFlags)(flags|Style_Horizontal|Style_Enabled), square ? ROUNDED_NONE : ROUNDED_ALL, use, sv ? WIDGET_SCROLLVIEW : WIDGET_OTHER, APP_KICKER!=itsThemedApp, - itsIsTransKicker ? BORDER_FLAT : (flags&Style_Sunken ? BORDER_SUNKEN : BORDER_RAISED) ); +#if defined TQTC_TQT_ONLY + itsIsTransKicker ? BORDER_FLAT : (flags&Style_Sunken ? BORDER_SUNKEN : BORDER_RAISED) +#else + (flags&Style_Sunken ? BORDER_SUNKEN : BORDER_RAISED) +#endif + ); } itsFormMode=false; } @@ -5810,7 +5814,7 @@ void QtCurveStyle::drawComplexControl(ComplexControl control, TQPainter *p, cons bflags|=NO_ETCH_BUTTON; // If we're pressed, on, or raised... -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION +#if defined TQTC_TQT_ONLY if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons || raised) #else if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) || onControlButtons || raised) diff --git a/style/qtcurve.h b/style/qtcurve.h index d59740d..b6ef8c4 100644 --- a/style/qtcurve.h +++ b/style/qtcurve.h @@ -52,9 +52,8 @@ #include "config.h" #ifdef TQTC_TQT_ONLY -#include "tqtc_tdestyle.h" +#include "qtc_tdestyle.h" #else -#include #include #endif #include @@ -288,7 +287,7 @@ class QtCurveStyle : public BASE_STYLE mutable TQColor itsColoredBackgroundCols[TOTAL_SHADES+1]; EApp itsThemedApp; mutable TQCache itsPixmapCache; -#if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200 +#if defined TQTC_TQT_ONLY bool itsIsTransKicker; #endif EHover itsHover; -- cgit v1.2.3