Update to latest style API

2 files changed, 34 insertions, 34 deletions

diff --git a/styles/phase/phasestyle.cpp b/styles/phase/phasestyle.cpp
index 2dde4151..86c6729e 100644
--- a/styles/phase/phasestyle.cpp
+++ b/styles/phase/phasestyle.cpp
@@ -136,7 +136,7 @@ PhaseStyle::~PhaseStyle()
 // --------
 // Initialize application specific
 
-void PhaseStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags, void *ptr)
+void PhaseStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr)
 {
     if (ceData.widgetObjectTypes.contains(TQAPPLICATION_OBJECT_NAME_STRING)) {
         TQApplication *app = reinterpret_cast<TQApplication*>(ptr);
@@ -149,7 +149,7 @@ void PhaseStyle::applicationPolish(TQStyleControlElementData ceData, ControlElem
 // --------
 // Initialize the appearance of a widget
 
-void PhaseStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void PhaseStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@@ -211,7 +211,7 @@ void PhaseStyle::polish(TQPalette &pal)
 // ----------
 // Undo the initialization of a widget's appearance
 
-void PhaseStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void PhaseStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 	TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@@ -412,7 +412,7 @@ void PhaseStyle::drawPhasePanel(TQPainter *painter,
 void PhaseStyle::drawPhaseTab(TQPainter *painter,
                               int x, int y, int w, int h,
                               const TQColorGroup &group,
-                              TQStyleControlElementData ceData,
+                              const TQStyleControlElementData &ceData,
                               ControlElementFlags /*elementFlags*/,
                               const TQStyleOption &option,
                               SFlags flags) const
@@ -578,7 +578,7 @@ void PhaseStyle::drawPhaseTab(TQPainter *painter,
 
 void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
                                TQPainter *painter,
-                               TQStyleControlElementData ceData,
+                               const TQStyleControlElementData &ceData,
                                ControlElementFlags elementFlags,
                                const TQRect &rect,
                                const TQColorGroup &group,
@@ -1036,7 +1036,7 @@ void PhaseStyle::drawPrimitive(TQ_PrimitiveElement element,
 
 void PhaseStyle::drawKStylePrimitive(KStylePrimitive element,
                                      TQPainter *painter,
-                                     TQStyleControlElementData ceData,
+                                     const TQStyleControlElementData &ceData,
                                      ControlElementFlags elementFlags,
                                      const TQRect &rect,
                                      const TQColorGroup &group,
@@ -1155,7 +1155,7 @@ void PhaseStyle::drawKStylePrimitive(KStylePrimitive element,
 
 void PhaseStyle::drawControl(TQ_ControlElement element,
                              TQPainter *painter,
-                             TQStyleControlElementData ceData,
+                             const TQStyleControlElementData &ceData,
                              ControlElementFlags elementFlags,
                              const TQRect &rect,
                              const TQColorGroup &group,
@@ -1599,7 +1599,7 @@ void PhaseStyle::drawControl(TQ_ControlElement element,
 
 void PhaseStyle::drawControlMask(TQ_ControlElement element,
                                  TQPainter *painter,
-                                 TQStyleControlElementData ceData,
+                                 const TQStyleControlElementData &ceData,
                                  ControlElementFlags elementFlags,
                                  const TQRect &rect,
                                  const TQStyleOption &option,
@@ -1623,7 +1623,7 @@ void PhaseStyle::drawControlMask(TQ_ControlElement element,
 
 void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
                                     TQPainter *painter,
-                                    TQStyleControlElementData ceData,
+                                    const TQStyleControlElementData &ceData,
                                     ControlElementFlags elementFlags,
                                     const TQRect &rect,
                                     const TQColorGroup &group,
@@ -1921,7 +1921,7 @@ void PhaseStyle::drawComplexControl(TQ_ComplexControl control,
 
 void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control,
                                         TQPainter *painter,
-                                        const TQStyleControlElementData ceData,
+                                        const TQStyleControlElementData &ceData,
                                         const ControlElementFlags elementFlags,
                                         const TQRect &rect,
                                         const TQStyleOption &option,
@@ -1945,7 +1945,7 @@ void PhaseStyle::drawComplexControlMask(TQ_ComplexControl control,
 // -------------
 // Get the pixel metric for metric
 
-int PhaseStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int PhaseStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     // not using widget's font, so that all metrics are uniform
     int em = TQMAX(TQApplication::fontMetrics().strikeOutPos() * 3, 17);
@@ -2010,7 +2010,7 @@ int PhaseStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData
 // ---------
 // Return subrect for the widget in logical coordinates
 
-TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     switch (rect) {
       case SR_ComboBoxFocusRect: {
@@ -2031,7 +2031,7 @@ TQRect PhaseStyle::subRect(SubRect rect, const TQStyleControlElementData ceData,
 // Get metrics for subcontrols of complex controls
 
 TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control,
-                                         TQStyleControlElementData ceData,
+                                         const TQStyleControlElementData &ceData,
                                          ControlElementFlags elementFlags,
                                          SubControl subcontrol,
                                          const TQStyleOption &option,
@@ -2129,7 +2129,7 @@ TQRect PhaseStyle::querySubControlMetrics(TQ_ComplexControl control,
 // Returns the size of widget based on the contentsize
 
 TQSize PhaseStyle::sizeFromContents(ContentsType contents,
-                                   TQStyleControlElementData ceData,
+                                   const TQStyleControlElementData &ceData,
                                    ControlElementFlags elementFlags,
                                    const TQSize &contentsize,
                                    const TQStyleOption &option,
@@ -2220,7 +2220,7 @@ TQSize PhaseStyle::sizeFromContents(ContentsType contents,
 // -------------
 // Is the toolbar "flat"
 
-bool PhaseStyle::flatToolbar(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const
+bool PhaseStyle::flatToolbar(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const
 {
     if (!toolbar) return true; // not on a toolbar
     if (!toolbar->isMovingEnabled()) return true; // immobile toolbars are flat
@@ -2230,7 +2230,7 @@ bool PhaseStyle::flatToolbar(const TQStyleControlElementData ceData, const Contr
     return false;
 }
 
-int PhaseStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
+int PhaseStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
 {
 	int ret;
 
@@ -2259,7 +2259,7 @@ int PhaseStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, Contro
 // Grab events we are interested in. Most of this routine is to handle the
 // exceptions to the normal styling rules.
 
-bool PhaseStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
+bool PhaseStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
     if (ceData.widgetObjectTypes.contains(TQOBJECT_OBJECT_NAME_STRING)) {
 	TQObject* object = reinterpret_cast<TQObject*>(source);
diff --git a/styles/phase/phasestyle.h b/styles/phase/phasestyle.h
index f24e3eaa..4cf7fabf 100644
--- a/styles/phase/phasestyle.h
+++ b/styles/phase/phasestyle.h
@@ -62,14 +62,14 @@ class PhaseStyle : public KStyle
 		PhaseStyle();
 		virtual ~PhaseStyle();
 	
-		void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
-		void polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+		void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+		void polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 		void polish(TQPalette &pal);
-		void unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+		void unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 	
 		void drawPrimitive(TQ_PrimitiveElement element,
 			TQPainter *painter,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &rect,
 			const TQColorGroup &group,
@@ -78,7 +78,7 @@ class PhaseStyle : public KStyle
 		
 		void drawKStylePrimitive(KStylePrimitive element,
 			TQPainter *painter,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &rect,
 			const TQColorGroup &group,
@@ -88,7 +88,7 @@ class PhaseStyle : public KStyle
 	
 		void drawControl(TQ_ControlElement element,
 			TQPainter *painter,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &rect,
 			const TQColorGroup &group,
@@ -98,7 +98,7 @@ class PhaseStyle : public KStyle
 		
 		void drawControlMask(TQ_ControlElement element,
 			TQPainter *painter,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &rect,
 			const TQStyleOption &option = TQStyleOption::Default,
@@ -106,7 +106,7 @@ class PhaseStyle : public KStyle
 		
 		void drawComplexControl(TQ_ComplexControl control,
 			TQPainter *painter,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &rect,
 			const TQColorGroup &group,
@@ -118,32 +118,32 @@ class PhaseStyle : public KStyle
 		
 		void drawComplexControlMask(TQ_ComplexControl control,
 			TQPainter *painter,
-			const TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			const ControlElementFlags elementFlags,
 			const TQRect &rect,
 			const TQStyleOption &option = TQStyleOption::Default,
 			const TQWidget *widget = 0) const;
 	
-		int pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
+		int pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 			const TQWidget *widget = 0) const;
 	
-		TQRect subRect(SubRect rect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
+		TQRect subRect(SubRect rect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
 	
 		TQRect querySubControlMetrics(TQ_ComplexControl control,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			SubControl subcontrol,
 			const TQStyleOption &option = TQStyleOption::Default,
 			const TQWidget *widget = 0) const;
 	
 		TQSize sizeFromContents(ContentsType contents,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQSize &contentsize,
 			const TQStyleOption& option = 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;
 
@@ -174,7 +174,7 @@ class PhaseStyle : public KStyle
 		void drawPhaseTab(TQPainter *painter,
 			int x, int y, int w, int h,
 			const TQColorGroup &group,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQStyleOption &option,
 			const SFlags flags) const;
@@ -187,9 +187,9 @@ class PhaseStyle : public KStyle
 			int pw=-1, int ph=-1,
 			bool reverse=false) const;
 	
-		bool flatToolbar(const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const;
+		bool flatToolbar(const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQToolBar *toolbar) const;
 		
-		bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+		bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 	private:
 		TQMap<unsigned int, TQIntDict<GradientSet> > * gradients;