Update to latest style API

3 files changed, 37 insertions, 37 deletions

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<TQApplication*>(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<TQApplication*>(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<TQObject*>(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<TQWidget*>(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<TQWidget*>(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