Rename KDE_VERSION to TDE_VERSION

pull/1/head
Timothy Pearson 13 years ago
parent c43b4a953a
commit a194a574c8

@ -236,7 +236,7 @@ inline bool isSpecialHover(TQWidget *w)
::tqqt_cast<TQCheckBox *>(w) || ::tqqt_cast<TQCheckBox *>(w) ||
#endif #endif
::tqqt_cast<TQScrollBar *>(w) || ::tqqt_cast<TQScrollBar *>(w) ||
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 #if defined TDE_VERSION && TDE_VERSION >= 0x30400 && TDE_VERSION < 0x30500
::tqqt_cast<TQToolButton *>(w) || ::tqqt_cast<TQToolButton *>(w) ||
#endif #endif
@ -375,7 +375,7 @@ TQ_EXPORT_PLUGIN(TQtCurveStylePlugin)
#define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp) #define SKIP_TASKBAR (APP_SKIP_TASKBAR==itsThemedApp || APP_KPRINTER==itsThemedApp || APP_KDIALOG==itsThemedApp)
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
#include <tqfile.h> #include <tqfile.h>
#endif #endif
@ -393,7 +393,7 @@ TQ_EXPORT_PLUGIN(TQtCurveStylePlugin)
#define DW_BGND 105 #define DW_BGND 105
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
// Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent... // Try to read $KDEHOME/share/config/kickerrc to find out if kicker is transparent...
static bool kickerIsTrans() static bool kickerIsTrans()
@ -820,7 +820,7 @@ TQtCurveStyle::TQtCurveStyle()
itsMdiColors(0L), itsMdiColors(0L),
itsThemedApp(APP_OTHER), itsThemedApp(APP_OTHER),
itsPixmapCache(150000, 499), itsPixmapCache(150000, 499),
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
itsIsTransKicker(false), itsIsTransKicker(false),
#endif #endif
itsHover(HOVER_NONE), itsHover(HOVER_NONE),
@ -1161,7 +1161,7 @@ void TQtCurveStyle::polish(TQApplication *app)
if ("kicker"==appName || "appletproxy"==appName) if ("kicker"==appName || "appletproxy"==appName)
{ {
itsThemedApp=APP_KICKER; itsThemedApp=APP_KICKER;
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
itsIsTransKicker=kickerIsTrans(); itsIsTransKicker=kickerIsTrans();
#endif #endif
} }
@ -1196,7 +1196,7 @@ void TQtCurveStyle::polish(TQApplication *app)
else if ("korn"==appName) else if ("korn"==appName)
{ {
itsThemedApp=APP_KORN; itsThemedApp=APP_KORN;
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
itsIsTransKicker=kickerIsTrans(); itsIsTransKicker=kickerIsTrans();
#endif #endif
} }
@ -1567,7 +1567,7 @@ void TQtCurveStyle::polish(TQWidget *widget)
if(enableFilter) if(enableFilter)
{ {
widget->installEventFilter(this); widget->installEventFilter(this);
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 #if defined TDE_VERSION && TDE_VERSION >= 0x30400 && TDE_VERSION < 0x30500
widget->setMouseTracking(true); widget->setMouseTracking(true);
#endif #endif
} }
@ -1863,7 +1863,7 @@ void TQtCurveStyle::unPolish(TQWidget *widget)
if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget)) if(NoBackground!=widget->backgroundMode()) // && onToolBar(widget))
widget->setBackgroundMode(PaletteButton); widget->setBackgroundMode(PaletteButton);
widget->removeEventFilter(this); widget->removeEventFilter(this);
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 #if defined TDE_VERSION && TDE_VERSION >= 0x30400 && TDE_VERSION < 0x30500
widget->setMouseTracking(false); widget->setMouseTracking(false);
#endif #endif
} }
@ -3149,8 +3149,8 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
if(flags&Style_Down) if(flags&Style_Down)
flags=((flags|Style_Down)^Style_Down)| Style_Sunken; flags=((flags|Style_Down)^Style_Down)| Style_Sunken;
flags|=Style_Enabled; flags|=Style_Enabled;
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 #if defined TDE_VERSION && TDE_VERSION >= 0x30400 && TDE_VERSION < 0x30500
if(HOVER_KICKER==itsHover && itsHoverWidget) // && itsHoverWidget==p->device()) if(HOVER_KICKER==itsHover && itsHoverWidget) // && itsHoverWidget==p->device())
flags|=Style_MouseOver; flags|=Style_MouseOver;
#endif #endif
@ -3158,7 +3158,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
#endif #endif
drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL, drawLightBevel(p, r, cg, flags|Style_Horizontal, ROUNDED_ALL,
getFill(flags, use), use, true, false); getFill(flags, use), use, true, false);
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
itsFormMode=false; itsFormMode=false;
#endif #endif
} }
@ -3310,7 +3310,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
? cg.background().dark(DW_BGND) ? cg.background().dark(DW_BGND)
: */cg.background(), : */cg.background(),
p, r, cg, glassMod ? flags : flags|Style_Horizontal, p, r, cg, glassMod ? flags : flags|Style_Horizontal,
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
(APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) ||
#endif #endif
operaMdi || mdi operaMdi || mdi
@ -3342,7 +3342,7 @@ void TQtCurveStyle::tqdrawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, const
drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal, drawLightBevel(p, r, cg, glassMod ? flags : flags|Style_Horizontal,
flags&CHECK_BUTTON flags&CHECK_BUTTON
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
|| (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe) || (APP_KORN==itsThemedApp && itsIsTransKicker && PE_ButtonTool==pe)
#endif #endif
? ROUNDED_NONE : ROUNDED_ALL, ? ROUNDED_NONE : ROUNDED_ALL,
@ -5537,7 +5537,7 @@ void TQtCurveStyle::tqdrawComplexControl(ComplexControl control, TQPainter *p, c
bflags|=NO_ETCH_BUTTON; bflags|=NO_ETCH_BUTTON;
// If we're pressed, on, or raised... // If we're pressed, on, or raised...
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons) if(bflags &(Style_Down | Style_On | Style_Raised) || onControlButtons)
#else #else
if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) || if(bflags &(Style_Down | Style_On | Style_Raised | Style_MouseOver) ||
@ -8217,7 +8217,7 @@ bool TQtCurveStyle::redrawHoverWidget(const TQPoint &pos)
} }
else else
{ {
#if defined KDE_VERSION && KDE_VERSION >= 0x30400 && KDE_VERSION < 0x30500 #if defined TDE_VERSION && TDE_VERSION >= 0x30400 && TDE_VERSION < 0x30500
TQToolButton *tb(::tqqt_cast<TQToolButton *>(itsHoverWidget)); TQToolButton *tb(::tqqt_cast<TQToolButton *>(itsHoverWidget));
if(tb) if(tb)

@ -278,7 +278,7 @@ class TQtCurveStyle : public BASE_STYLE
mutable TQColor itsColoredBackgroundCols[TOTAL_SHADES+1]; mutable TQColor itsColoredBackgroundCols[TOTAL_SHADES+1];
EApp itsThemedApp; EApp itsThemedApp;
mutable TQCache<TQPixmap> itsPixmapCache; mutable TQCache<TQPixmap> itsPixmapCache;
#if defined TQTC_TQT_ONLY || !defined KDE_VERSION || KDE_VERSION >= 0x30200 #if defined TQTC_TQT_ONLY || !defined TDE_VERSION || TDE_VERSION >= 0x30200
bool itsIsTransKicker; bool itsIsTransKicker;
#endif #endif
EHover itsHover; EHover itsHover;

Loading…
Cancel
Save