diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-14 23:46:54 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-11-14 23:46:54 -0600 |
commit | f7f497fd05150ee34a84e2eb91c8f509ee01ec93 (patch) | |
tree | 4df5e55cbdc04a5e97d5159be4dfee62d8e5f65b /kstyles/light | |
parent | 189c12d0b1d3362f490f26cc0fcd3005af8b426c (diff) | |
download | tdelibs-f7f497fd05150ee34a84e2eb91c8f509ee01ec93.tar.gz tdelibs-f7f497fd05150ee34a84e2eb91c8f509ee01ec93.zip |
Update to latest style API
Diffstat (limited to 'kstyles/light')
-rw-r--r-- | kstyles/light/lightstyle-v2.cpp | 24 | ||||
-rw-r--r-- | kstyles/light/lightstyle-v2.h | 24 | ||||
-rw-r--r-- | kstyles/light/lightstyle-v3.cpp | 24 | ||||
-rw-r--r-- | kstyles/light/lightstyle-v3.h | 24 |
4 files changed, 48 insertions, 48 deletions
diff --git a/kstyles/light/lightstyle-v2.cpp b/kstyles/light/lightstyle-v2.cpp index 0a41317f4..ef71e3c7f 100644 --- a/kstyles/light/lightstyle-v2.cpp +++ b/kstyles/light/lightstyle-v2.cpp @@ -83,7 +83,7 @@ LightStyleV2::~LightStyleV2() } } -void LightStyleV2::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void LightStyleV2::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { KStyle::polishPopupMenu(ceData, elementFlags, ptr); } @@ -131,7 +131,7 @@ static void drawLightBevel(TQPainter *p, const TQRect &r, const TQColorGroup &cg void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -644,7 +644,7 @@ void LightStyleV2::drawPrimitive( TQ_PrimitiveElement pe, void LightStyleV2::drawControl( TQ_ControlElement control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1001,7 +1001,7 @@ void LightStyleV2::drawControl( TQ_ControlElement control, void LightStyleV2::drawControlMask( TQ_ControlElement control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &data, @@ -1018,7 +1018,7 @@ void LightStyleV2::drawControlMask( TQ_ControlElement control, } } -TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const +TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const { TQRect rect, wrect(ceData.rect); @@ -1047,7 +1047,7 @@ TQRect LightStyleV2::subRect(SubRect subrect, const TQStyleControlElementData ce void LightStyleV2::drawComplexControl( TQ_ComplexControl control, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQColorGroup& cg, @@ -1330,7 +1330,7 @@ void LightStyleV2::drawComplexControl( TQ_ComplexControl control, } TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption &data, @@ -1425,7 +1425,7 @@ TQRect LightStyleV2::querySubControlMetrics( TQ_ComplexControl control, } TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption &data, @@ -1442,7 +1442,7 @@ TQStyle::SubControl LightStyleV2::querySubControl( TQ_ComplexControl control, return ret; } -int LightStyleV2::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, +int LightStyleV2::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const { int ret; @@ -1520,7 +1520,7 @@ int LightStyleV2::pixelMetric( PixelMetric metric, TQStyleControlElementData ceD } TQSize LightStyleV2::sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleOption &data, @@ -1626,7 +1626,7 @@ TQSize LightStyleV2::sizeFromContents( ContentsType contents, } int LightStyleV2::styleHint( TQ_StyleHint stylehint, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, TQStyleHintReturn* returnData, @@ -1669,7 +1669,7 @@ int LightStyleV2::styleHint( TQ_StyleHint stylehint, } TQPixmap LightStyleV2::stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &data, const TQWidget *widget ) const diff --git a/kstyles/light/lightstyle-v2.h b/kstyles/light/lightstyle-v2.h index d4b805eb0..3141ad978 100644 --- a/kstyles/light/lightstyle-v2.h +++ b/kstyles/light/lightstyle-v2.h @@ -42,42 +42,42 @@ public: LightStyleV2(); virtual ~LightStyleV2(); - void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ); + void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - void drawControlMask(TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *) const; + TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - void drawComplexControl(TQ_ComplexControl, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, + void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - TQRect querySubControlMetrics(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl, + TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - SubControl querySubControl(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQPoint &, + SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; - int pixelMetric(PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; + int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; - TQSize sizeFromContents(ContentsType, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &, + TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; TQPixmap stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; diff --git a/kstyles/light/lightstyle-v3.cpp b/kstyles/light/lightstyle-v3.cpp index bf39f451a..bf0163029 100644 --- a/kstyles/light/lightstyle-v3.cpp +++ b/kstyles/light/lightstyle-v3.cpp @@ -59,7 +59,7 @@ LightStyleV3::~LightStyleV3() delete basestyle; } -void LightStyleV3::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void LightStyleV3::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { KStyle::polishPopupMenu(ceData, elementFlags, ptr); // empty to satisy pure virtual requirements @@ -214,7 +214,7 @@ static void drawLightBevel( TQPainter *p, void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -832,7 +832,7 @@ void LightStyleV3::drawPrimitive( TQ_PrimitiveElement pe, void LightStyleV3::drawControl( TQ_ControlElement control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1116,7 +1116,7 @@ void LightStyleV3::drawControl( TQ_ControlElement control, void LightStyleV3::drawControlMask( TQ_ControlElement control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &data, @@ -1133,7 +1133,7 @@ void LightStyleV3::drawControlMask( TQ_ControlElement control, } } -TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const +TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const { TQRect rect; @@ -1180,7 +1180,7 @@ TQRect LightStyleV3::subRect(SubRect subrect, const TQStyleControlElementData ce void LightStyleV3::drawComplexControl( TQ_ComplexControl control, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQColorGroup& cg, @@ -1456,7 +1456,7 @@ void LightStyleV3::drawComplexControl( TQ_ComplexControl control, } TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption &data, @@ -1607,7 +1607,7 @@ TQRect LightStyleV3::querySubControlMetrics( TQ_ComplexControl control, } TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption &data, @@ -1625,7 +1625,7 @@ TQStyle::SubControl LightStyleV3::querySubControl( TQ_ComplexControl control, return ret; } -int LightStyleV3::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, +int LightStyleV3::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const { int ret; @@ -1736,7 +1736,7 @@ int LightStyleV3::pixelMetric( PixelMetric metric, TQStyleControlElementData ceD } TQSize LightStyleV3::sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleOption &data, @@ -1855,7 +1855,7 @@ TQSize LightStyleV3::sizeFromContents( ContentsType contents, } int LightStyleV3::styleHint( TQ_StyleHint stylehint, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, TQStyleHintReturn* returnData, @@ -1902,7 +1902,7 @@ int LightStyleV3::styleHint( TQ_StyleHint stylehint, } TQPixmap LightStyleV3::stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &data, const TQWidget *widget ) const diff --git a/kstyles/light/lightstyle-v3.h b/kstyles/light/lightstyle-v3.h index 02059350c..ccda6cada 100644 --- a/kstyles/light/lightstyle-v3.h +++ b/kstyles/light/lightstyle-v3.h @@ -46,43 +46,43 @@ public: LightStyleV3(); virtual ~LightStyleV3(); - void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ); + void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ); - void drawPrimitive(TQ_PrimitiveElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, + void drawPrimitive(TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default ) const; - void drawControl(TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControl(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - void drawControlMask(TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, + void drawControlMask(TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; - TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *) const; + TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - void drawComplexControl(TQ_ComplexControl, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, + void drawComplexControl(TQ_ComplexControl, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default, SCFlags = SC_All, SCFlags = SC_None, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - TQRect querySubControlMetrics(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl, + TQRect querySubControlMetrics(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - SubControl querySubControl(TQ_ComplexControl, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQPoint &, + SubControl querySubControl(TQ_ComplexControl, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &, const TQStyleOption &data = TQStyleOption::Default, const TQWidget * = 0 ) const; - int pixelMetric(PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; + int pixelMetric(PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * = 0 ) const; - TQSize sizeFromContents(ContentsType, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &, + TQSize sizeFromContents(ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const; - int styleHint(TQ_StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + int styleHint(TQ_StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default, TQStyleHintReturn * = 0, const TQWidget * = 0 ) const; TQPixmap stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; |