Fix FTBFS due to recent style API changes

2 files changed, 38 insertions, 38 deletions

diff --git a/src/gui/kdeext/klearlook.cpp b/src/gui/kdeext/klearlook.cpp
index 65d5577..837654a 100644
--- a/src/gui/kdeext/klearlook.cpp
+++ b/src/gui/kdeext/klearlook.cpp
@@ -518,7 +518,7 @@ hoverSect( TQTC_NO_SECT ) {
     shadeColors( tqApp->palette().active().button(), button );
 }
 
-void KlearlookStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) {
+void KlearlookStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
     if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
 	TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
 
@@ -588,7 +588,7 @@ void KlearlookStyle::polish( TQPalette &pal ) {
 
 static const char * kdeToolbarWidget = "kde toolbar widget";
 
-void KlearlookStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) {
+void KlearlookStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
 	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
@@ -631,7 +631,7 @@ void KlearlookStyle::polish( TQStyleControlElementData ceData, ControlElementFla
 	TDEStyle::polish( ceData, elementFlags, ptr );
 }
 		
-void KlearlookStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr ) {
+void KlearlookStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr ) {
 	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
 
@@ -675,7 +675,7 @@ void KlearlookStyle::unPolish( TQStyleControlElementData ceData, ControlElementF
 	TDEStyle::unPolish( ceData, elementFlags, ptr );
 }
 
-bool KlearlookStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) {
+bool KlearlookStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event ) {
 	if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
 		TQObject* object = reinterpret_cast<TQObject*>(source);
 
@@ -1296,7 +1296,7 @@ void KlearlookStyle::drawArrow( TQPainter *p, const TQRect &r, const TQColorGrou
     p->restore();
 }
 
-void KlearlookStyle::drawPrimitiveMenu( TQ_PrimitiveElement pe, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
+void KlearlookStyle::drawPrimitiveMenu( TQ_PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
                                         SFlags flags, const TQStyleOption &data ) const {
     switch ( pe ) {
         case PE_CheckMark:
@@ -1335,7 +1335,7 @@ void KlearlookStyle::drawPrimitiveMenu( TQ_PrimitiveElement pe, TQPainter *p, TQ
     }
 }
 
-void KlearlookStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
+void KlearlookStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg,
                                     SFlags flags, const TQStyleOption &data ) const {
     int x, y, w, h;
 
@@ -2053,7 +2053,7 @@ void KlearlookStyle::drawPrimitive( TQ_PrimitiveElement pe, TQPainter *p, TQStyl
     }
 }
 
-void KlearlookStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+void KlearlookStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
         const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt, const TQWidget *widget ) const {
     switch ( kpe ) {
         case KPE_ToolBarHandle:
@@ -2215,7 +2215,7 @@ void KlearlookStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter *p,
 void KlearlookStyle::drawControl(
     ControlElement control,
     TQPainter *p,
-    TQStyleControlElementData ceData,
+    const TQStyleControlElementData &ceData,
     ControlElementFlags elementFlags,
     const TQRect &r,
     const TQColorGroup &cg, SFlags flags, const TQStyleOption &data, const TQWidget *widget ) const
@@ -2988,7 +2988,7 @@ void KlearlookStyle::drawControl(
     }
 }
 
-void KlearlookStyle::drawControlMask( ControlElement control, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+void KlearlookStyle::drawControlMask( ControlElement control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
                                       const TQStyleOption &data, const TQWidget *widget ) const {
     switch ( control ) {
         case CE_PushButton:
@@ -3012,7 +3012,7 @@ void KlearlookStyle::drawControlMask( ControlElement control, TQPainter *p, TQSt
     }
 }
 
-void KlearlookStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQRect &r,
+void KlearlookStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r,
         const TQStyleOption &data, const TQWidget *widget ) const {
     switch ( control ) {
         case CC_ToolButton:
@@ -3024,7 +3024,7 @@ void KlearlookStyle::drawComplexControlMask( ComplexControl control, TQPainter *
     }
 }
 
-TQRect KlearlookStyle::subRect( SubRect subrect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const {
+TQRect KlearlookStyle::subRect( SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const {
     TQRect rect,
     wrect( widget->rect() );
 
@@ -3079,7 +3079,7 @@ TQRect KlearlookStyle::subRect( SubRect subrect, const TQStyleControlElementData
 void KlearlookStyle::drawComplexControl(
         ComplexControl control,
         TQPainter *p,
-        TQStyleControlElementData ceData,
+        const TQStyleControlElementData &ceData,
         ControlElementFlags elementFlags,
         const TQRect &r,
         const TQColorGroup &cg,
@@ -3371,7 +3371,7 @@ void KlearlookStyle::drawComplexControl(
     }
 }
 
-TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl sc,
+TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl sc,
         const TQStyleOption &data, const TQWidget *widget ) const {
     switch ( control ) {
         case CC_SpinWidget: {
@@ -3414,7 +3414,7 @@ TQRect KlearlookStyle::querySubControlMetrics( TQ_ComplexControl control, TQStyl
     }
 }
 
-int KlearlookStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const {
+int KlearlookStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const {
     switch ( metric ) {
         case PM_MenuButtonIndicator:
             return 7;
@@ -3490,7 +3490,7 @@ int KlearlookStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData c
     }
 }
 
-int KlearlookStyle::kPixelMetric( TDEStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const {
+int KlearlookStyle::kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const {
     switch ( kpm ) {
         case KPM_MenuItemSeparatorHeight:
             return 4;
@@ -3500,7 +3500,7 @@ int KlearlookStyle::kPixelMetric( TDEStylePixelMetric kpm, TQStyleControlElement
 }
 
 TQSize KlearlookStyle::sizeFromContents( ContentsType t,
-                                        TQStyleControlElementData ceData,
+                                        const TQStyleControlElementData &ceData,
                                         ControlElementFlags elementFlags,
                                         const TQSize &s,
                                         const TQStyleOption &opt,
@@ -3592,7 +3592,7 @@ TQSize KlearlookStyle::sizeFromContents( ContentsType t,
 
 
 
-int KlearlookStyle::styleHint( StyleHint stylehint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &option, TQStyleHintReturn *returnData, const TQWidget *widget ) const {
+int KlearlookStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &option, TQStyleHintReturn *returnData, const TQWidget *widget ) const {
     switch ( stylehint ) {
         case SH_EtchDisabledText:
         case SH_Slider_SnapToValue:
@@ -3839,7 +3839,7 @@ void KlearlookStyle::drawSliderHandle(
 
 void KlearlookStyle::drawSliderGroove
     ( TQPainter *p,
-      TQStyleControlElementData ceData,
+      const TQStyleControlElementData &ceData,
       ControlElementFlags elementFlags,
       const TQRect &r,
       TQStyle::SFlags flags,
@@ -3905,8 +3905,8 @@ bool KlearlookStyle::redrawHoverWidget() {
     if ( !hoverWidget )
         return false;
 
-    TQStyleControlElementData hoverCeData = populateControlElementDataFromWidget(hoverWidget, TQStyleOption());
-    ControlElementFlags hoverElementFlags = getControlElementFlagsForObject(hoverWidget, hoverCeData.widgetObjectTypes, TQStyleOption());
+    const TQStyleControlElementData &hoverCeData = populateControlElementDataFromWidget(hoverWidget, TQStyleOption());
+    ControlElementFlags hoverElementFlags = getControlElementFlagsForObject(hoverWidget, TQStyleOption());
 
     TQPoint cursor( TQCursor::pos() ),
     widgetZero( hoverWidget->mapToGlobal( TQPoint( 0, 0 ) ) );
diff --git a/src/gui/kdeext/klearlook.h b/src/gui/kdeext/klearlook.h
index 232c5a2..d68b41c 100644
--- a/src/gui/kdeext/klearlook.h
+++ b/src/gui/kdeext/klearlook.h
@@ -244,44 +244,44 @@ class KlearlookStyle : public TDEStyle {
 
         virtual ~KlearlookStyle() {}
 
-        void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr );
+        void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr );
         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 drawLightBevel( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, bool useGrad, ERound round,
                              const TQColor &fill, const TQColor *custom = NULL, bool light = false ) const;
         void drawLightBevelButton( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, bool useGrad, ERound round,
                                    const TQColor &fill, const TQColor *custom = NULL, bool light = false ) const;
         void drawArrow( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags, TQStyle::TQ_PrimitiveElement pe,
                         bool small = false, bool checkActive = false ) const;
-        void drawPrimitive( TQ_PrimitiveElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
+        void drawPrimitive( TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
                             const TQStyleOption & = TQStyleOption::Default ) const;
-        void drawPrimitiveMenu( TQ_PrimitiveElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
+        void drawPrimitiveMenu( TQ_PrimitiveElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &, SFlags = Style_Default,
                                 const TQStyleOption & = TQStyleOption::Default ) const;
-        void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+        void drawTDEStylePrimitive( TDEStylePrimitive kpe, TQPainter* p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
                                   const TQColorGroup &cg, SFlags flags, const TQStyleOption &opt, const TQWidget* widget = 0 ) const;
-        void drawControl( ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+        void drawControl( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
                           SFlags = Style_Default, const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-        void drawControlMask( ControlElement, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &,
+        void drawControlMask( ControlElement, TQPainter *, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &,
                               const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-        void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQRect &r,
+        void drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r,
                                      const TQStyleOption &data, const TQWidget *widget = 0 ) const;
-        TQRect subRect( SubRect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget * ) const;
-        void drawComplexControl( ComplexControl, TQPainter *, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &, const TQColorGroup &,
+        TQRect subRect( SubRect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget * ) const;
+        void drawComplexControl( 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;
-        int pixelMetric( PixelMetric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
-        int kPixelMetric( TDEStylePixelMetric kpm, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
-        TQSize sizeFromContents( ContentsType, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &,
+        int pixelMetric( PixelMetric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+        int kPixelMetric( TDEStylePixelMetric kpm, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+        TQSize sizeFromContents( ContentsType, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &,
                                 const TQStyleOption & = TQStyleOption::Default, const TQWidget * = 0 ) const;
-        int styleHint( StyleHint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+        int styleHint( StyleHint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
                        TQStyleHintReturn *returnData = 0, const TQWidget *widget = 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 );
         void drawPBarOrMenu( TQPainter *p, TQRect const &r, bool horiz, const TQColorGroup &cg, bool menu = false ) const;
         void drawPBarOrMenu2( TQPainter *p, TQRect const &r, bool horiz, const TQColorGroup &cg, bool menu = false ) const;
         void drawGradientWithBorder( TQPainter *p, TQRect const &r, bool horiz = true ) const;
@@ -292,7 +292,7 @@ class KlearlookStyle : public TDEStyle {
         void drawSliderHandle( TQPainter *p, const TQRect &r, const TQColorGroup &cg, TQStyle::SFlags flags ) const;
 	void drawPopupRect( TQPainter *p, const TQRect &r, const TQColorGroup &cg) const ;
 
-        void drawSliderGroove( TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, TQStyle::SFlags flags, const TQWidget *widget ) const;
+        void drawSliderGroove( TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, TQStyle::SFlags flags, const TQWidget *widget ) const;
 
 
     private: