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 --- kstyles/asteroid/asteroid.cpp | 32 ++++++++++++++-------------- kstyles/asteroid/asteroid.h | 34 ++++++++++++++--------------- kstyles/highcolor/highcolor.cpp | 28 ++++++++++++------------ kstyles/highcolor/highcolor.h | 28 ++++++++++++------------ kstyles/highcontrast/highcontrast.cpp | 30 +++++++++++++------------- kstyles/highcontrast/highcontrast.h | 30 +++++++++++++------------- kstyles/keramik/keramik.cpp | 40 +++++++++++++++++------------------ kstyles/keramik/keramik.h | 38 ++++++++++++++++----------------- kstyles/kthemestyle/kthemebase.h | 16 +++++++------- kstyles/kthemestyle/kthemestyle.cpp | 30 +++++++++++++------------- kstyles/kthemestyle/kthemestyle.h | 28 ++++++++++++------------ kstyles/light/lightstyle-v2.cpp | 24 ++++++++++----------- kstyles/light/lightstyle-v2.h | 24 ++++++++++----------- kstyles/light/lightstyle-v3.cpp | 24 ++++++++++----------- kstyles/light/lightstyle-v3.h | 24 ++++++++++----------- kstyles/plastik/plastik.cpp | 30 +++++++++++++------------- kstyles/plastik/plastik.h | 30 +++++++++++++------------- 17 files changed, 245 insertions(+), 245 deletions(-) (limited to 'kstyles') diff --git a/kstyles/asteroid/asteroid.cpp b/kstyles/asteroid/asteroid.cpp index a14574bb0..11a06f29a 100644 --- a/kstyles/asteroid/asteroid.cpp +++ b/kstyles/asteroid/asteroid.cpp @@ -106,7 +106,7 @@ AsteroidStyle::~AsteroidStyle() * get deleted here. */ } -void AsteroidStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void AsteroidStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *w = reinterpret_cast(ptr); @@ -143,7 +143,7 @@ void AsteroidStyle::polish(TQStyleControlElementData ceData, ControlElementFlags } } -void AsteroidStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void AsteroidStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { KStyle::unPolish(ceData, elementFlags, ptr); } @@ -154,7 +154,7 @@ void AsteroidStyle::unPolish(TQStyleControlElementData ceData, ControlElementFla Changes some application-wide settings */ void -AsteroidStyle::applicationPolish(TQStyleControlElementData, ControlElementFlags, void *) +AsteroidStyle::applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *) { TQPalette wp = TQApplication::palette(); wp.setColor(TQColorGroup::Dark, TQColor(128, 128, 128)); @@ -165,7 +165,7 @@ AsteroidStyle::applicationPolish(TQStyleControlElementData, ControlElementFlags, /*! \reimp */ void -AsteroidStyle::applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *) +AsteroidStyle::applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *) { } @@ -181,7 +181,7 @@ void AsteroidStyle::renderMenuBlendPixmap(KPixmap &pix, void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -295,7 +295,7 @@ void AsteroidStyle::drawKStylePrimitive(KStylePrimitive ksp, } int AsteroidStyle::styleHint( TQ_StyleHint stylehint, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, TQStyleHintReturn* returnData, @@ -326,7 +326,7 @@ int AsteroidStyle::styleHint( TQ_StyleHint stylehint, void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -982,7 +982,7 @@ void AsteroidStyle::drawPrimitive(TQ_PrimitiveElement pe, void AsteroidStyle::drawControl(TQ_ControlElement ce, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1723,7 +1723,7 @@ void AsteroidStyle::drawControl(TQ_ControlElement ce, void AsteroidStyle::drawControlMask(TQ_ControlElement ce, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &o, @@ -1770,7 +1770,7 @@ void AsteroidStyle::drawControlMask(TQ_ControlElement ce, void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -2186,7 +2186,7 @@ void AsteroidStyle::drawComplexControl(TQ_ComplexControl cc, void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &o, @@ -2209,7 +2209,7 @@ void AsteroidStyle::drawComplexControlMask(TQ_ComplexControl cc, } } -int AsteroidStyle::pixelMetric(PixelMetric pm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *w) const +int AsteroidStyle::pixelMetric(PixelMetric pm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *w) const { switch (pm) { /* PixelMetrics available are: @@ -2340,7 +2340,7 @@ int AsteroidStyle::pixelMetric(PixelMetric pm, TQStyleControlElementData ceData, } } -TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *w) const +TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *w) const { switch (sr) { /* SubRects to calculate are: @@ -2385,7 +2385,7 @@ TQRect AsteroidStyle::subRect(SubRect sr, const TQStyleControlElementData ceData } TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc, const TQStyleOption &o, @@ -2488,7 +2488,7 @@ TQRect AsteroidStyle::querySubControlMetrics(TQ_ComplexControl cc, } TQSize AsteroidStyle::sizeFromContents(ContentsType ct, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &s, const TQStyleOption &o, @@ -2624,7 +2624,7 @@ void AsteroidStyle::paletteChanged() { } -bool AsteroidStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) +bool AsteroidStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) { /* Win2K has this interesting behaviour where it sets the current default button to whatever pushbutton the user presses the mouse diff --git a/kstyles/asteroid/asteroid.h b/kstyles/asteroid/asteroid.h index d6b05e8ae..7bd652a12 100644 --- a/kstyles/asteroid/asteroid.h +++ b/kstyles/asteroid/asteroid.h @@ -17,10 +17,10 @@ public: AsteroidStyle(); virtual ~AsteroidStyle(); - void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); - void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); - void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); - void applicationUnPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); + void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); + void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); + void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); + void applicationUnPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); void renderSliderHandle(TQPainter *p, @@ -36,7 +36,7 @@ public: void drawKStylePrimitive(KStylePrimitive, TQPainter *, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, @@ -44,14 +44,14 @@ public: 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; void drawPrimitive(TQ_PrimitiveElement, TQPainter *, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, @@ -60,7 +60,7 @@ public: void drawControl(TQ_ControlElement, TQPainter *, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, @@ -70,7 +70,7 @@ public: void drawControlMask(TQ_ControlElement, TQPainter *, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, @@ -78,7 +78,7 @@ public: void drawComplexControl(TQ_ComplexControl, TQPainter *, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, @@ -90,33 +90,33 @@ public: void drawComplexControlMask(TQ_ComplexControl, TQPainter *, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption & = 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; - int kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) const; + int kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* /* widget */) 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; TQRect querySubControlMetrics(TQ_ComplexControl, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0) const; TQSize sizeFromContents(ContentsType, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &, const TQStyleOption &, const TQWidget * = 0) const; - virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); + virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); protected slots: void paletteChanged(); diff --git a/kstyles/highcolor/highcolor.cpp b/kstyles/highcolor/highcolor.cpp index e296c4196..0dc02e7ec 100644 --- a/kstyles/highcolor/highcolor.cpp +++ b/kstyles/highcolor/highcolor.cpp @@ -188,7 +188,7 @@ HighColorStyle::~HighColorStyle() } -void HighColorStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void HighColorStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -213,7 +213,7 @@ void HighColorStyle::polish(TQStyleControlElementData ceData, ControlElementFlag } -void HighColorStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void HighColorStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -253,7 +253,7 @@ void HighColorStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg // This function draws primitive elements as well as their masks. void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -967,7 +967,7 @@ void HighColorStyle::drawPrimitive( TQ_PrimitiveElement pe, void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1146,7 +1146,7 @@ void HighColorStyle::drawKStylePrimitive( KStylePrimitive kpe, void HighColorStyle::drawControl( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1522,7 +1522,7 @@ void HighColorStyle::drawControl( TQ_ControlElement element, void HighColorStyle::drawControlMask( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, @@ -1550,7 +1550,7 @@ void HighColorStyle::drawControlMask( TQ_ControlElement element, void HighColorStyle::drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1737,7 +1737,7 @@ void HighColorStyle::drawComplexControl( TQ_ComplexControl control, void HighColorStyle::drawComplexControlMask( TQ_ComplexControl control, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, @@ -1791,7 +1791,7 @@ void HighColorStyle::drawItem( TQPainter *p, } -TQRect HighColorStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const +TQRect HighColorStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const { // We want the focus rect for buttons to be adjusted from // the Qt3 defaults to be similar to Qt 2's defaults. @@ -1817,7 +1817,7 @@ TQRect HighColorStyle::subRect(SubRect r, const TQStyleControlElementData ceData } -int HighColorStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const +int HighColorStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const { switch(m) { @@ -1861,7 +1861,7 @@ int HighColorStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, } /*! \reimp */ -int HighColorStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const +int HighColorStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const { int ret; @@ -1886,7 +1886,7 @@ int HighColorStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, Co } TQSize HighColorStyle::sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentSize, const TQStyleOption& opt, @@ -1991,7 +1991,7 @@ TQSize HighColorStyle::sizeFromContents( ContentsType contents, // Fix Qt's wacky image alignment TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& opt, const TQWidget* widget) const @@ -2009,7 +2009,7 @@ TQPixmap HighColorStyle::stylePixmap(StylePixmap stylepixmap, } -bool HighColorStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) +bool HighColorStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { if (KStyle::objectEventHandler( ceData, elementFlags, source, event )) return true; diff --git a/kstyles/highcolor/highcolor.h b/kstyles/highcolor/highcolor.h index 7f3d7a8e8..5f58b3f9c 100644 --- a/kstyles/highcolor/highcolor.h +++ b/kstyles/highcolor/highcolor.h @@ -65,15 +65,15 @@ class HighColorStyle : public KStyle HighColorStyle( StyleType ); virtual ~HighColorStyle(); - void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); - void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); + void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); + void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, const TQPopupMenu* popup ) const; void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -83,7 +83,7 @@ class HighColorStyle : public KStyle void drawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -92,7 +92,7 @@ class HighColorStyle : public KStyle void drawControl( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -102,7 +102,7 @@ class HighColorStyle : public KStyle void drawControlMask( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, @@ -110,7 +110,7 @@ class HighColorStyle : public KStyle void drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -122,7 +122,7 @@ class HighColorStyle : public KStyle void drawComplexControlMask( TQ_ComplexControl control, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, @@ -138,31 +138,31 @@ class HighColorStyle : public KStyle int len = -1, const TQColor *penColor = 0 ) const; - int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentSize, const TQStyleOption& opt, const TQWidget *widget ) const; - TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, + TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const; // Fix Qt3's wacky image positions TQPixmap stylePixmap( StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 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; - virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); + virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); protected: diff --git a/kstyles/highcontrast/highcontrast.cpp b/kstyles/highcontrast/highcontrast.cpp index 971c6549a..d212f7445 100644 --- a/kstyles/highcontrast/highcontrast.cpp +++ b/kstyles/highcontrast/highcontrast.cpp @@ -152,7 +152,7 @@ void HighContrastStyle::polish( TQPalette& pal ) } -void HighContrastStyle::polish (TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void HighContrastStyle::polish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -179,7 +179,7 @@ void HighContrastStyle::polish (TQStyleControlElementData ceData, ControlElement } -void HighContrastStyle::unPolish (TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void HighContrastStyle::unPolish (const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -339,7 +339,7 @@ void HighContrastStyle::drawArrow (TQPainter* p, TQRect r, TQ_PrimitiveElement a // This function draws primitive elements void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -695,7 +695,7 @@ void HighContrastStyle::drawPrimitive (TQ_PrimitiveElement pe, void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -786,7 +786,7 @@ void HighContrastStyle::drawKStylePrimitive (KStylePrimitive kpe, void HighContrastStyle::drawControl (TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1164,7 +1164,7 @@ void HighContrastStyle::drawControl (TQ_ControlElement element, void HighContrastStyle::drawControlMask (TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &opt, @@ -1209,7 +1209,7 @@ static TQListViewItem* nextVisibleSibling(TQListViewItem* item) void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1492,7 +1492,7 @@ void HighContrastStyle::drawComplexControl (TQ_ComplexControl control, void HighContrastStyle::drawComplexControlMask(TQ_ComplexControl c, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &o, @@ -1536,7 +1536,7 @@ void HighContrastStyle::drawItem( TQPainter *p, } TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt, @@ -1589,7 +1589,7 @@ TQRect HighContrastStyle::querySubControlMetrics( TQ_ComplexControl control, } -int HighContrastStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const +int HighContrastStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const { //### TODO: Use the tab metrics changes from Ker. switch(m) @@ -1683,7 +1683,7 @@ int HighContrastStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceDa } } -int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const +int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const { switch (kpm) { case KPM_ListViewBranchThickness: @@ -1696,7 +1696,7 @@ int HighContrastStyle::kPixelMetric( KStylePixelMetric kpm, TQStyleControlElemen } TQSize HighContrastStyle::sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentSize, const TQStyleOption& opt, @@ -1821,7 +1821,7 @@ TQSize HighContrastStyle::sizeFromContents( ContentsType contents, } } -TQRect HighContrastStyle::subRect (SubRect subrect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const +TQRect HighContrastStyle::subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const { switch (subrect) { case SR_ProgressBarGroove: @@ -1833,13 +1833,13 @@ TQRect HighContrastStyle::subRect (SubRect subrect, const TQStyleControlElementD } } -bool HighContrastStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) +bool HighContrastStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { return KStyle::objectEventHandler (ceData, elementFlags, source, event); } /*! \reimp */ -int HighContrastStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const +int HighContrastStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const { int ret; diff --git a/kstyles/highcontrast/highcontrast.h b/kstyles/highcontrast/highcontrast.h index a01f733d7..89a716dc1 100644 --- a/kstyles/highcontrast/highcontrast.h +++ b/kstyles/highcontrast/highcontrast.h @@ -56,12 +56,12 @@ class HighContrastStyle : public KStyle void polish( TQPalette& pal ); - void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); + void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -71,7 +71,7 @@ class HighContrastStyle : public KStyle void drawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -80,7 +80,7 @@ class HighContrastStyle : public KStyle void drawControl( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -90,7 +90,7 @@ class HighContrastStyle : public KStyle void drawControlMask( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, @@ -98,7 +98,7 @@ class HighContrastStyle : public KStyle void drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -110,14 +110,14 @@ class HighContrastStyle : public KStyle void drawComplexControlMask( TQ_ComplexControl control, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; TQRect querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt = TQStyleOption::Default, @@ -134,27 +134,27 @@ class HighContrastStyle : public KStyle int len = -1, const TQColor *penColor = 0 ) const; - int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; - int kPixelMetric( KStylePixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + int kPixelMetric( KStylePixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentSize, const TQStyleOption& opt, const TQWidget *widget = 0 ) const; - TQRect subRect (SubRect subrect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget * widget) const; + TQRect subRect (SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * widget) 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; 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: void setColorsNormal (TQPainter* p, const TQColorGroup& cg, int flags = Style_Enabled, int highlight = Style_Down|Style_MouseOver) const; diff --git a/kstyles/keramik/keramik.cpp b/kstyles/keramik/keramik.cpp index 2c558b5b1..7105d81c5 100644 --- a/kstyles/keramik/keramik.cpp +++ b/kstyles/keramik/keramik.cpp @@ -189,7 +189,7 @@ void KeramikStyle::renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, } // XXX -TQRect KeramikStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const +TQRect KeramikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const { // We want the focus rect for buttons to be adjusted from // the Qt3 defaults to be similar to Qt 2's defaults. @@ -243,7 +243,7 @@ TQRect KeramikStyle::subRect(SubRect r, const TQStyleControlElementData ceData, TQPixmap KeramikStyle::stylePixmap(StylePixmap stylepixmap, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& opt, const TQWidget* widget) const @@ -327,7 +327,7 @@ KeramikStyle::~KeramikStyle() KeramikDbCleanup(); } -void KeramikStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags, void *ptr) +void KeramikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { TQApplication *app = reinterpret_cast(ptr); @@ -337,7 +337,7 @@ void KeramikStyle::applicationPolish(TQStyleControlElementData ceData, ControlEl } } -void KeramikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void KeramikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -382,7 +382,7 @@ void KeramikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags KStyle::polish(ceData, elementFlags, ptr); } -void KeramikStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void KeramikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -479,7 +479,7 @@ static void renderToolbarEntryBackground(TQPainter* paint, toolWidth, toolHeight); } -static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleControlElementData ceData, const TQStyle::ControlElementFlags elementFlags, const TQWidget* widget) +static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleControlElementData &ceData, const TQStyle::ControlElementFlags elementFlags, const TQWidget* widget) { // Draw a gradient background for custom widgets in the toolbar // that have specified a "kde toolbar widget" name, or @@ -545,7 +545,7 @@ static void renderToolbarWidgetBackground(TQPainter* painter, const TQStyleContr // This function draws primitive elements as well as their masks. void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1222,7 +1222,7 @@ void KeramikStyle::drawPrimitive( TQ_PrimitiveElement pe, void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1354,7 +1354,7 @@ void KeramikStyle::drawKStylePrimitive( KStylePrimitive kpe, } } -bool KeramikStyle::isFormWidget(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const +bool KeramikStyle::isFormWidget(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const { if (widget) { //Form widgets are in the KHTMLView, but that has 2 further inner levels @@ -1381,7 +1381,7 @@ bool KeramikStyle::isFormWidget(const TQStyleControlElementData ceData, const Co void KeramikStyle::drawControl( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1964,7 +1964,7 @@ void KeramikStyle::drawControl( TQ_ControlElement element, void KeramikStyle::drawControlMask( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, @@ -1976,7 +1976,7 @@ void KeramikStyle::drawControlMask( TQ_ControlElement element, maskMode = false; } -bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQComboBox* combo) const +bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQComboBox* combo) const { if (ceData.rect.width() >= 80) return false; @@ -1996,7 +1996,7 @@ bool KeramikStyle::isSizeConstrainedCombo(const TQStyleControlElementData ceData void KeramikStyle::drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -2362,7 +2362,7 @@ void KeramikStyle::drawComplexControl( TQ_ComplexControl control, void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, @@ -2382,7 +2382,7 @@ void KeramikStyle::drawComplexControlMask( TQ_ComplexControl control, } -int KeramikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const +int KeramikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const { switch(m) { @@ -2463,7 +2463,7 @@ int KeramikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, C TQSize KeramikStyle::sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentSize, const TQStyleOption& opt, @@ -2574,7 +2574,7 @@ TQSize KeramikStyle::sizeFromContents( ContentsType contents, TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, const TQStyleOption& opt, @@ -2594,7 +2594,7 @@ TQStyle::SubControl KeramikStyle::querySubControl( TQ_ComplexControl control, } TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt, @@ -2789,7 +2789,7 @@ TQRect KeramikStyle::querySubControlMetrics( TQ_ComplexControl control, #undef KeyRelease #endif -bool KeramikStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) +bool KeramikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { if (KStyle::objectEventHandler( ceData, elementFlags, source, event )) return true; @@ -2973,7 +2973,7 @@ bool KeramikStyle::objectEventHandler( TQStyleControlElementData ceData, Control } /*! \reimp */ -int KeramikStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const +int KeramikStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const { int ret; diff --git a/kstyles/keramik/keramik.h b/kstyles/keramik/keramik.h index 53c06a3b4..5acaabf8d 100644 --- a/kstyles/keramik/keramik.h +++ b/kstyles/keramik/keramik.h @@ -48,16 +48,16 @@ public: virtual ~KeramikStyle(); void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup &cg, const TQPopupMenu* ) const; - TQPixmap stylePixmap(StylePixmap stylepixmap, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption& opt, const TQWidget* widget = 0) const; + TQPixmap stylePixmap(StylePixmap stylepixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& opt, const TQWidget* widget = 0) const; - void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); + void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void polish( TQPalette& ); - void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); + void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQColorGroup& cg, @@ -67,7 +67,7 @@ public: void drawPrimitive( TQ_PrimitiveElement pe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQColorGroup& cg, @@ -76,7 +76,7 @@ public: void drawControl( TQ_ControlElement element, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQColorGroup& cg, @@ -86,7 +86,7 @@ public: void drawControlMask( TQ_ControlElement element, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQStyleOption& opt = TQStyleOption::Default, @@ -94,7 +94,7 @@ public: void drawComplexControl( TQ_ComplexControl control, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect& r, const TQColorGroup& cg, @@ -106,36 +106,36 @@ public: void drawComplexControlMask( TQ_ComplexControl control, TQPainter* p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect& r, const TQStyleOption& = TQStyleOption::Default, const TQWidget* widget = 0 ) const; - int pixelMetric( PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; + int pixelMetric( PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget* widget = 0 ) const; TQSize sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize& contentSize, const TQStyleOption& opt, const TQWidget* widget = 0 ) const; SubControl querySubControl( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint& point, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 0 ) const; TQRect querySubControlMetrics( TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget* widget = 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; @@ -146,8 +146,8 @@ private slots: private: - bool isSizeConstrainedCombo(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQComboBox* widget) const; - bool isFormWidget (const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const; + bool isSizeConstrainedCombo(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQComboBox* widget) const; + bool isFormWidget (const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const; ///Configuration settings bool animateProgressBar; @@ -181,7 +181,7 @@ private: //Animation support. TQMap progAnimWidgets; - virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); + virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); Keramik::TilePainter::PaintMode pmode() const { @@ -213,7 +213,7 @@ private: // For progress bar animation TQTimer *animationTimer; - TQRect subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const; + TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const; // Disable copy constructor and = operator KeramikStyle( const KeramikStyle& ); diff --git a/kstyles/kthemestyle/kthemebase.h b/kstyles/kthemestyle/kthemebase.h index b0ebbfaff..3e2019383 100644 --- a/kstyles/kthemestyle/kthemebase.h +++ b/kstyles/kthemestyle/kthemebase.h @@ -508,12 +508,12 @@ protected: /** These are included for fuuture extension purposes.. */ - virtual int pixelMetric ( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const + virtual int pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const { return KStyle::pixelMetric( metric, ceData, elementFlags, widget ); } - virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg, + virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg, SFlags flags = Style_Default, const TQStyleOption& option = TQStyleOption::Default ) const { @@ -524,7 +524,7 @@ protected: virtual void drawControl( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -538,7 +538,7 @@ protected: virtual void drawControlMask( TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt = TQStyleOption::Default, @@ -550,7 +550,7 @@ protected: virtual void drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -566,7 +566,7 @@ protected: virtual void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -580,7 +580,7 @@ protected: } - virtual int styleHint( StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, + virtual int styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& opt = TQStyleOption::Default, TQStyleHintReturn* returnData = 0, const TQWidget *widget = 0 ) const @@ -594,7 +594,7 @@ protected: } virtual TQSize sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleOption& opt = TQStyleOption::Default, diff --git a/kstyles/kthemestyle/kthemestyle.cpp b/kstyles/kthemestyle/kthemestyle.cpp index d6da82173..ff7199939 100644 --- a/kstyles/kthemestyle/kthemestyle.cpp +++ b/kstyles/kthemestyle/kthemestyle.cpp @@ -161,7 +161,7 @@ public: KDE_Q_EXPORT_PLUGIN( KThemeStylePlugin ) -void kDrawWindowsArrow ( TQPainter *p, const TQStyleControlElementData ceData, const TQStyle::ControlElementFlags elementFlags, const TQStyle* style, TQStyle::PrimitiveElement pe, bool down, +void kDrawWindowsArrow ( TQPainter *p, const TQStyleControlElementData &ceData, const TQStyle::ControlElementFlags elementFlags, const TQStyle* style, TQStyle::PrimitiveElement pe, bool down, int x, int y, int w, int h, const TQColorGroup &cg, bool enabled ) { @@ -213,7 +213,7 @@ void kDrawWindowsArrow ( TQPainter *p, const TQStyleControlElementData ceData, c TQSize KThemeStyle::sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentSize, const TQStyleOption& opt, @@ -311,7 +311,7 @@ TQSize KThemeStyle::sizeFromContents( ContentsType contents, } -TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const +TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget* widget) const { if (sr == SR_CheckBoxFocusRect) { @@ -333,7 +333,7 @@ TQRect KThemeStyle::subRect(SubRect sr, const TQStyleControlElementData ceData, return KStyle::subRect(sr, ceData, elementFlags, widget); } -int KThemeStyle::pixelMetric ( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * widget ) const +int KThemeStyle::pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget ) const { switch ( metric ) { @@ -420,7 +420,7 @@ KThemeStyle::~KThemeStyle() } -void KThemeStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags, void *ptr ) +void KThemeStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) { if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { TQApplication *app = reinterpret_cast(ptr); @@ -468,7 +468,7 @@ void KThemeStyle::paletteChanged() } -void KThemeStyle::applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags, void *ptr ) +void KThemeStyle::applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) { if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { TQApplication *app = reinterpret_cast(ptr); @@ -476,7 +476,7 @@ void KThemeStyle::applicationUnPolish( TQStyleControlElementData ceData, Control } } -bool KThemeStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) +bool KThemeStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) { if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) { TQObject* object = reinterpret_cast(source); @@ -518,7 +518,7 @@ bool KThemeStyle::objectEventHandler( TQStyleControlElementData ceData, ControlE return KStyle::objectEventHandler(ceData, elementFlags, source, event); } -void KThemeStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void KThemeStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *w = reinterpret_cast(ptr); @@ -629,7 +629,7 @@ void KThemeStyle::polish( TQStyleControlElementData ceData, ControlElementFlags KStyle::polish( ceData, elementFlags, ptr ); } -void KThemeStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) +void KThemeStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *w = reinterpret_cast(ptr); @@ -727,7 +727,7 @@ void KThemeStyle::drawBaseButton( TQPainter *p, int x, int y, int w, int h, p->setPen( oldPen ); } -void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & g_base, +void KThemeStyle::drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & g_base, SFlags flags, const TQStyleOption & opt ) const { bool handled = false; @@ -1163,7 +1163,7 @@ TQPixmap* KThemeStyle::makeMenuBarCache(int w, int h) const void KThemeStyle::drawControl( ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1801,7 +1801,7 @@ void KThemeStyle::drawControl( ControlElement element, void KThemeStyle::drawControlMask( ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, @@ -1833,7 +1833,7 @@ void KThemeStyle::drawControlMask( ControlElement element, void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -2013,7 +2013,7 @@ void KThemeStyle::drawKStylePrimitive( KStylePrimitive kpe, -void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, +void KThemeStyle::drawComplexControl ( TQ_ComplexControl control, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & g, SFlags how , SCFlags controls, SCFlags active, const TQStyleOption & opt, const TQWidget * widget ) const @@ -2247,7 +2247,7 @@ void KThemeStyle::drawBaseMask( TQPainter *p, int x, int y, int w, int h, p->fillRect( x, y, w, h, fillBrush ); } -int KThemeStyle::styleHint( StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *shr, const TQWidget *w ) const +int KThemeStyle::styleHint( StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *shr, const TQWidget *w ) const { switch ( sh ) { diff --git a/kstyles/kthemestyle/kthemestyle.h b/kstyles/kthemestyle/kthemestyle.h index d6e28afc2..457064a56 100644 --- a/kstyles/kthemestyle/kthemestyle.h +++ b/kstyles/kthemestyle/kthemestyle.h @@ -79,15 +79,15 @@ public: KThemeStyle( const TQString& configDir, const TQString &configFile = TQString::null ); ~KThemeStyle(); - virtual int pixelMetric ( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const; + virtual int pixelMetric ( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget * widget = 0 ) const; - virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg, + virtual void drawPrimitive ( PrimitiveElement pe, TQPainter * p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect & r, const TQColorGroup & cg, SFlags flags = Style_Default, const TQStyleOption& = TQStyleOption::Default ) const; virtual void drawControl( ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -97,7 +97,7 @@ public: virtual void drawControlMask( ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& = TQStyleOption::Default, @@ -106,7 +106,7 @@ public: virtual void drawComplexControl( TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -118,7 +118,7 @@ public: virtual void drawKStylePrimitive( KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -128,30 +128,30 @@ public: virtual int styleHint( StyleHint sh, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, TQStyleHintReturn* returnData = 0, const TQWidget *widget = 0 ) const; virtual TQSize sizeFromContents( ContentsType contents, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - virtual TQRect subRect(SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *) const; + virtual TQRect subRect(SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *) const; - virtual void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - virtual void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); + virtual void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + virtual void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); /** * By default this just sets the background brushes to the pixmapped * background. */ - virtual void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); - virtual void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ); + virtual void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); + virtual void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ); /** \internal */ // to make it possible for derived classes to overload this function 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; diff --git a/kstyles/plastik/plastik.cpp b/kstyles/plastik/plastik.cpp index 9910db013..6828b8870 100644 --- a/kstyles/plastik/plastik.cpp +++ b/kstyles/plastik/plastik.cpp @@ -223,7 +223,7 @@ PlastikStyle::~PlastikStyle() delete verticalLine; } -void PlastikStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags, void *ptr) +void PlastikStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) { TQApplication *app = reinterpret_cast(ptr); @@ -235,7 +235,7 @@ void PlastikStyle::applicationPolish(TQStyleControlElementData ceData, ControlEl } } -void PlastikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void PlastikStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -278,7 +278,7 @@ void PlastikStyle::polish(TQStyleControlElementData ceData, ControlElementFlags KStyle::polish(ceData, elementFlags, ptr); } -void PlastikStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr) +void PlastikStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr) { if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) { TQWidget *widget = reinterpret_cast(ptr); @@ -1200,7 +1200,7 @@ void PlastikStyle::renderTab(TQPainter *p, void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -1453,7 +1453,7 @@ void PlastikStyle::drawKStylePrimitive(KStylePrimitive kpe, void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -2183,7 +2183,7 @@ void PlastikStyle::drawPrimitive(TQ_PrimitiveElement pe, void PlastikStyle::drawControl(TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -2740,7 +2740,7 @@ void PlastikStyle::drawControl(TQ_ControlElement element, void PlastikStyle::drawControlMask(TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &opt, @@ -2762,7 +2762,7 @@ void PlastikStyle::drawControlMask(TQ_ControlElement element, void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &o, @@ -2785,7 +2785,7 @@ void PlastikStyle::drawComplexControlMask(TQ_ComplexControl c, void PlastikStyle::drawComplexControl(TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -3180,7 +3180,7 @@ void PlastikStyle::drawComplexControl(TQ_ComplexControl control, } -TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const +TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const { switch (r) { case SR_ComboBoxFocusRect: { @@ -3205,7 +3205,7 @@ TQRect PlastikStyle::subRect(SubRect r, const TQStyleControlElementData ceData, } TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption &opt, @@ -3275,7 +3275,7 @@ TQRect PlastikStyle::querySubControlMetrics(TQ_ComplexControl control, } } -int PlastikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const +int PlastikStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const { switch(m) { // TABS @@ -3383,7 +3383,7 @@ int PlastikStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, C TQSize PlastikStyle::sizeFromContents(ContentsType t, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &s, const TQStyleOption &opt, @@ -3471,7 +3471,7 @@ TQSize PlastikStyle::sizeFromContents(ContentsType t, } int PlastikStyle::styleHint( TQ_StyleHint stylehint, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, TQStyleHintReturn* returnData, @@ -3497,7 +3497,7 @@ int PlastikStyle::styleHint( TQ_StyleHint stylehint, } } -bool PlastikStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev ) +bool PlastikStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *ev ) { if (KStyle::objectEventHandler(ceData, elementFlags, source, ev) ) return true; diff --git a/kstyles/plastik/plastik.h b/kstyles/plastik/plastik.h index fb8c0a2de..708666a7f 100644 --- a/kstyles/plastik/plastik.h +++ b/kstyles/plastik/plastik.h @@ -62,13 +62,13 @@ public: PlastikStyle(); virtual ~PlastikStyle(); - void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); - void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); - void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *); + void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); + void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); + void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *); void drawKStylePrimitive(KStylePrimitive kpe, TQPainter* p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -78,7 +78,7 @@ public: void drawPrimitive(TQ_PrimitiveElement pe, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -87,7 +87,7 @@ public: void drawControl(TQ_ControlElement element, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -95,11 +95,11 @@ public: const TQStyleOption& = TQStyleOption::Default, const TQWidget *widget = 0 ) const; - void drawControlMask( TQ_ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; + void drawControlMask( TQ_ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQStyleOption &, const TQWidget * = 0) const; void drawComplexControl(TQ_ComplexControl control, TQPainter *p, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, @@ -109,14 +109,14 @@ public: const TQStyleOption& = TQStyleOption::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 ) const; TQRect querySubControlMetrics(TQ_ComplexControl control, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption &opt = TQStyleOption::Default, @@ -124,20 +124,20 @@ public: void drawComplexControlMask(TQStyle::TQ_ComplexControl c, TQPainter *p, - const TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption &o=TQStyleOption::Default, const TQWidget *w = 0) const; TQSize sizeFromContents(TQStyle::ContentsType t, - TQStyleControlElementData ceData, + const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &s, const TQStyleOption &o, const TQWidget *w = 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; @@ -266,7 +266,7 @@ protected: virtual void renderMenuBlendPixmap( KPixmap& pix, const TQColorGroup& cg, const TQPopupMenu* popup ) const; - virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); + virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ); protected slots: void khtmlWidgetDestroyed(TQObject* w); -- cgit v1.2.1