diff --git a/scheck/scheck.cpp b/scheck/scheck.cpp
index a80f908b..5189b25b 100644
--- a/scheck/scheck.cpp
+++ b/scheck/scheck.cpp
@@ -934,7 +934,7 @@ void StyleCheckStyle::slotAccelManage()
 }
 
 
-void StyleCheckStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void StyleCheckStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
 	/* Having a global view on the widget makes accel
 	   easier to catch. However, just intruding on the main window
@@ -972,7 +972,7 @@ void StyleCheckStyle::polish(TQStyleControlElementData ceData, ControlElementFla
 }
 
 
-void StyleCheckStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void StyleCheckStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
 	if (ceData.widgetObjectTypes.contains(TQWIDGET_OBJECT_NAME_STRING)) {
 		TQWidget *widget = reinterpret_cast<TQWidget*>(ptr);
@@ -1000,7 +1000,7 @@ void StyleCheckStyle::unPolish(TQStyleControlElementData ceData, ControlElementF
 // This function draws primitive elements as well as their masks.
 void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 									TQPainter *p,
-									TQStyleControlElementData ceData,
+									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
 									const TQRect &r,
 									const TQColorGroup &cg,
@@ -1536,7 +1536,7 @@ void StyleCheckStyle::drawPrimitive( PrimitiveElement pe,
 
 void StyleCheckStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 										  TQPainter* p,
-										  TQStyleControlElementData ceData,
+										  const TQStyleControlElementData &ceData,
 										  ControlElementFlags elementFlags,
 										  const TQRect &r,
 										  const TQColorGroup &cg,
@@ -1717,7 +1717,7 @@ void StyleCheckStyle::drawTDEStylePrimitive( TDEStylePrimitive kpe,
 
 void StyleCheckStyle::drawControl( ControlElement element,
 								  TQPainter *p,
-								  TQStyleControlElementData ceData,
+								  const TQStyleControlElementData &ceData,
 								  ControlElementFlags elementFlags,
 								  const TQRect &r,
 								  const TQColorGroup &cg,
@@ -2183,7 +2183,7 @@ void StyleCheckStyle::drawControl( ControlElement element,
 
 void StyleCheckStyle::drawControlMask( ControlElement element,
 								  	  TQPainter *p,
-								  	  TQStyleControlElementData ceData,
+								  	  const TQStyleControlElementData &ceData,
 								  	  ControlElementFlags elementFlags,
 								  	  const TQRect &r,
 								  	  const TQStyleOption& opt,
@@ -2211,7 +2211,7 @@ void StyleCheckStyle::drawControlMask( ControlElement element,
 
 void StyleCheckStyle::drawComplexControl( ComplexControl control,
                                          TQPainter *p,
-                                         TQStyleControlElementData ceData,
+                                         const TQStyleControlElementData &ceData,
                                          ControlElementFlags elementFlags,
                                          const TQRect &r,
                                          const TQColorGroup &cg,
@@ -2402,7 +2402,7 @@ void StyleCheckStyle::drawComplexControl( ComplexControl control,
 
 void StyleCheckStyle::drawComplexControlMask( ComplexControl control,
 											 TQPainter *p,
-											 const TQStyleControlElementData ceData,
+											 const TQStyleControlElementData &ceData,
 											 const ControlElementFlags elementFlags,
 											 const TQRect &r,
 											 const TQStyleOption& opt,
@@ -2429,7 +2429,7 @@ void StyleCheckStyle::drawComplexControlMask( ComplexControl control,
 }
 
 
-TQRect StyleCheckStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect StyleCheckStyle::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 TQt3 defaults to be similar to TQt 2's defaults.
@@ -2456,7 +2456,7 @@ TQRect StyleCheckStyle::subRect(SubRect r, const TQStyleControlElementData ceDat
 }
 
 
-int StyleCheckStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int StyleCheckStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
 	switch(m)
 	{
@@ -2489,7 +2489,7 @@ int StyleCheckStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData
 
 
 TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
-										TQStyleControlElementData ceData,
+										const TQStyleControlElementData &ceData,
 										ControlElementFlags elementFlags,
 										const TQSize &contentSize,
 										const TQStyleOption& opt,
@@ -2593,7 +2593,7 @@ TQSize StyleCheckStyle::sizeFromContents( ContentsType contents,
 
 // Fix TQt's wacky image alignment
 TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap,
-									TQStyleControlElementData ceData,
+									const TQStyleControlElementData &ceData,
 									ControlElementFlags elementFlags,
 									const TQStyleOption& opt,
 									const TQWidget* widget) const
@@ -2611,7 +2611,7 @@ TQPixmap StyleCheckStyle::stylePixmap(StylePixmap stylepixmap,
 }
 
 
-bool StyleCheckStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
+bool StyleCheckStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
 	if (TDEStyle::objectEventHandler( ceData, elementFlags, source, event ))
 		return true;
diff --git a/scheck/scheck.h b/scheck/scheck.h
index 06ab3599..550fd3a7 100644
--- a/scheck/scheck.h
+++ b/scheck/scheck.h
@@ -76,13 +76,13 @@ class StyleCheckStyle : public TDEStyle
 		StyleCheckStyle( );
 		virtual ~StyleCheckStyle();
 
-		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 drawTDEStylePrimitive( TDEStylePrimitive kpe,
 					TQPainter* p,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
@@ -92,7 +92,7 @@ class StyleCheckStyle : public TDEStyle
 
 		void drawPrimitive( PrimitiveElement pe,
 					TQPainter* p,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
@@ -101,7 +101,7 @@ class StyleCheckStyle : public TDEStyle
 
 		void drawControl( ControlElement element,
 					TQPainter *p,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
@@ -111,7 +111,7 @@ class StyleCheckStyle : public TDEStyle
 
 		void drawControlMask( ControlElement element,
 					TQPainter *p,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQStyleOption& = TQStyleOption::Default,
@@ -119,7 +119,7 @@ class StyleCheckStyle : public TDEStyle
 
 		void drawComplexControl( ComplexControl control,
 					TQPainter *p,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
@@ -131,32 +131,32 @@ class StyleCheckStyle : public TDEStyle
 
 		void drawComplexControlMask( 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,
+		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;
 
-		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 TQt3's wacky image positions
 		TQPixmap stylePixmap( StylePixmap stylepixmap,
-					TQStyleControlElementData ceData, ControlElementFlags elementFlags,
+					const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 					const TQStyleOption& = TQStyleOption::Default, 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 renderGradient( TQPainter* p,
 					const TQRect& r,