diff options
Diffstat (limited to 'tdefx/tdestyle.h')
| -rw-r--r-- | tdefx/tdestyle.h | 49 |
1 files changed, 18 insertions, 31 deletions
diff --git a/tdefx/tdestyle.h b/tdefx/tdestyle.h index 505682b32..c9cd11f88 100644 --- a/tdefx/tdestyle.h +++ b/tdefx/tdestyle.h @@ -56,7 +56,7 @@ struct TDEStylePrivate; */ class TDEFX_EXPORT TDEStyle: public TQCommonStyle { - Q_OBJECT + TQ_OBJECT public: @@ -245,15 +245,15 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default ) const; + const TQStyleOption& = TQStyleOption::Default ) const; /** - * This function is identical to Qt's TQStyle::tqdrawPrimitive(), except that + * This function is identical to Qt's TQStyle::drawPrimitive(), except that * it adds one further parameter, 'widget', that can be used to determine * the widget state of the TDEStylePrimitive in question. * * @see TDEStyle::TDEStylePrimitive - * @see TQStyle::tqdrawPrimitive + * @see TQStyle::drawPrimitive * @see TQStyle::drawComplexControl */ virtual void drawTDEStylePrimitive( TDEStylePrimitive kpe, @@ -263,7 +263,7 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; @@ -287,39 +287,26 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive( TQ_PrimitiveElement pe, + void drawPrimitive( PrimitiveElement pe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default ) const; + const TQStyleOption& = TQStyleOption::Default ) const; -// #ifdef USE_QT4 // tdebindings / smoke needs this function declaration available at all times. Furthermore I don't think it would hurt to have the declaration available at all times...so leave these commented out for now - -// void drawPrimitive( TQ_ControlElement pe, -// TQPainter* p, -// const TQStyleControlElementData &ceData, -// ControlElementFlags elementFlags, -// const TQRect &r, -// const TQColorGroup &cg, -// SFlags flags = Style_Default, -// const TQStyleOption& = TQStyleOption::SO_Default ) const; - -// #endif // USE_QT4 - - void drawControl( TQ_ControlElement element, + void drawControl( ControlElement element, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags = Style_Default, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - void drawComplexControl( TQ_ComplexControl control, + void drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -328,21 +315,21 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle SFlags flags = Style_Default, SCFlags controls = SC_All, SCFlags active = SC_None, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - SubControl querySubControl( TQ_ComplexControl control, + SubControl querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - TQRect querySubControlMetrics( TQ_ComplexControl control, + TQRect querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, @@ -354,12 +341,12 @@ class TDEFX_EXPORT TDEStyle: public TQCommonStyle TQPixmap stylePixmap( StylePixmap stylepixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQStyleOption& = TQStyleOption::SO_Default, + const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - int styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, + int styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, - const TQStyleOption &opt = TQStyleOption::SO_Default, + const TQStyleOption &opt = TQStyleOption::Default, TQStyleHintReturn* shr = 0, const TQWidget* w = 0 ) const; |