From f7f497fd05150ee34a84e2eb91c8f509ee01ec93 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Wed, 14 Nov 2012 23:46:54 -0600 Subject: Update to latest style API --- tdefx/kstyle.cpp | 32 ++++++++++++++++---------------- tdefx/kstyle.h | 32 ++++++++++++++++---------------- 2 files changed, 32 insertions(+), 32 deletions(-) (limited to 'tdefx') diff --git a/tdefx/kstyle.cpp b/tdefx/kstyle.cpp index 9f4b4a921..dde47eeb2 100644 --- a/tdefx/kstyle.cpp +++ b/tdefx/kstyle.cpp @@ -261,7 +261,7 @@ TQString KStyle::defaultStyle() return TQString("light, 3rd revision"); } -void KStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void KStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget* widget = reinterpret_cast(ptr); @@ -285,7 +285,7 @@ void KStyle::polish( TQStyleControlElementData ceData, ControlElementFlags eleme } -void KStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void KStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget* widget = reinterpret_cast(ptr); @@ -304,7 +304,7 @@ void KStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags ele // Style changes (should) always re-polish popups. -void KStyle::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void KStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { if ( !(ceData.windowState & WState_Polished ) ) { widgetActionRequest(ceData, elementFlags, ptr, WAR_SetCheckable); @@ -357,7 +357,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, void KStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -543,7 +543,7 @@ void KStyle::drawKStylePrimitive( KStylePrimitive kpe, } -int KStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const +int KStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const { int value; switch(kpm) @@ -573,7 +573,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceDat //void KStyle::drawPrimitive( TQ_ControlElement pe, // TQPainter* p, -// TQStyleControlElementData ceData, +// const TQStyleControlElementData &ceData, // ControlElementFlags elementFlags, // const TQRect &r, // const TQColorGroup &cg, @@ -593,7 +593,7 @@ int KStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceDat void KStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -688,7 +688,7 @@ void KStyle::drawPrimitive( TQ_PrimitiveElement pe, void KStyle::drawControl( TQ_ControlElement element, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -988,7 +988,7 @@ void KStyle::drawControl( TQ_ControlElement element, } -TQRect KStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const +TQRect KStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const { switch(r) { @@ -1010,7 +1010,7 @@ TQRect KStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const } -int KStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget) const +int KStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget) const { switch(m) { @@ -1134,7 +1134,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) void KStyle::drawComplexControl( TQ_ComplexControl control, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1439,7 +1439,7 @@ void KStyle::drawComplexControl( TQ_ComplexControl control, TQStyle::SubControl KStyle::querySubControl( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption &opt, @@ -1457,7 +1457,7 @@ TQStyle::SubControl KStyle::querySubControl( TQ_ComplexControl control, TQRect KStyle::querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption &opt, @@ -1843,7 +1843,7 @@ static const char* const critical_xpm[]={ ".............aaaaaaa............"}; TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& opt, const TQWidget* widget) const @@ -1876,7 +1876,7 @@ TQPixmap KStyle::stylePixmap( StylePixmap stylepixmap, } -int KStyle::styleHint( TQ_StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, +int KStyle::styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn* shr, const TQWidget* w) const { switch (sh) @@ -1935,7 +1935,7 @@ int KStyle::styleHint( TQ_StyleHint sh, TQStyleControlElementData ceData, Contro } -bool KStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) +bool KStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { TQObject* object = reinterpret_cast(source); diff --git a/tdefx/kstyle.h b/tdefx/kstyle.h index f73fc2dd8..c8a704381 100644 --- a/tdefx/kstyle.h +++ b/tdefx/kstyle.h @@ -258,7 +258,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle */ virtual void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -279,17 +279,17 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle KPM_ListViewBranchThickness = 0x00000100 }; - int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; + int kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; // --------------------------------------------------------------------------- - void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ); + void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); void drawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -300,7 +300,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle // void drawPrimitive( TQ_ControlElement pe, // TQPainter* p, -// TQStyleControlElementData ceData, +// const TQStyleControlElementData &ceData, // ControlElementFlags elementFlags, // const TQRect &r, // const TQColorGroup &cg, @@ -311,7 +311,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle void drawControl( TQ_ControlElement element, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -321,7 +321,7 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle void drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -332,39 +332,39 @@ class TDEFX_EXPORT KStyle: public TQCommonStyle const TQWidget* widget = 0 ) const; SubControl querySubControl( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption& = TQStyleOption::SO_Default, const TQWidget* widget = 0 ) const; TQRect querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption& = TQStyleOption::SO_Default, const TQWidget* widget = 0 ) const; - int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; - TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, + TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; TQPixmap stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::SO_Default, const TQWidget* widget = 0 ) const; - int styleHint( TQ_StyleHint sh, TQStyleControlElementData ceData, + int styleHint( TQ_StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt = TQStyleOption::SO_Default, TQStyleHintReturn* shr = 0, const TQWidget* w = 0 ) const; protected: - virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); + virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); private: // Disable copy constructor and = operator -- cgit v1.2.1