20 files changed, 255 insertions, 237 deletions
diff --git a/src/kernel/ntqstyle.h b/src/kernel/ntqstyle.h
index 3e59bc027..bee3bd207 100644
--- a/src/kernel/ntqstyle.h
+++ b/src/kernel/ntqstyle.h
@@ -228,6 +228,10 @@ class TQStyleControlElementTabBarData {
 
 class Q_EXPORT TQStyleControlElementData {
 	public:
+		TQStyleControlElementData();
+
+	public:
+		bool isNull;
 		TQStringList widgetObjectTypes;
 		bool allDataPopulated;
 		TQt::WFlags wflags;
@@ -286,9 +290,6 @@ class Q_EXPORT TQStyleControlElementData {
 		TQString caption;
 		TQStyleControlElementGenericWidgetData topLevelWidgetData;
 		TQ_UINT32 topLevelWidgetFlags;
-
-	public:
-		TQStyleControlElementData();
 };
 
 class Q_EXPORT TQStyleWidgetActionRequestData {
@@ -360,28 +361,28 @@ public:
     virtual void polish( TQWidget * );
 
     // New API
-    virtual void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    virtual void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     // Old API
     // DEPRECATED
     virtual void unPolish( TQWidget * );
 
     // New API
-    virtual void unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    virtual void unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     // Old API
     // DEPRECATED
     virtual void polish( TQApplication * );
 
     // New API
-    virtual void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    virtual void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     // Old API
     // DEPRECATED
     virtual void unPolish( TQApplication * );
 
     // New API
-    virtual void applicationUnPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    virtual void applicationUnPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     virtual void polish( TQPalette & );
 
@@ -390,7 +391,7 @@ public:
     virtual void polishPopupMenu( TQPopupMenu* );
 
     // New API
-    virtual void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * ) = 0;
+    virtual void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * ) = 0;
 
     virtual TQRect itemRect( TQPainter *p, const TQRect &r,
 			    int flags, bool enabled,
@@ -521,7 +522,7 @@ public:
     // New API
     virtual void drawPrimitive( PrimitiveElement pe,
 				TQPainter *p,
-				TQStyleControlElementData ceData,
+				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQColorGroup &cg,
@@ -576,7 +577,7 @@ public:
     // New API
     virtual void drawControl( ControlElement element,
 			      TQPainter *p,
-			      TQStyleControlElementData ceData,
+			      const TQStyleControlElementData &ceData,
 			      ControlElementFlags elementFlags,
 			      const TQRect &r,
 			      const TQColorGroup &cg,
@@ -595,7 +596,7 @@ public:
     // New API
     virtual void drawControlMask( ControlElement element,
 				  TQPainter *p,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  const TQRect &r,
 				  const TQStyleOption& = TQStyleOption::Default,
@@ -646,7 +647,7 @@ public:
     virtual TQRect subRect( SubRect r, const TQWidget *widget ) const;
 
     // New API
-    virtual TQRect subRect( SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const = 0;
+    virtual TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const = 0;
 
 
     enum ComplexControl{
@@ -728,7 +729,7 @@ public:
 
     virtual void drawComplexControl( ComplexControl control,
 				     TQPainter *p,
-				     TQStyleControlElementData ceData,
+				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
 				     const TQRect &r,
 				     const TQColorGroup &cg,
@@ -753,7 +754,7 @@ public:
     // New API
     virtual void drawComplexControlMask( ComplexControl control,
 					 TQPainter *p,
-					 const TQStyleControlElementData ceData,
+					 const TQStyleControlElementData &ceData,
 					 const ControlElementFlags elementFlags,
 					 const TQRect &r,
 					 const TQStyleOption& = TQStyleOption::Default,
@@ -768,7 +769,7 @@ public:
 
     // New API
     virtual TQRect querySubControlMetrics( ComplexControl control,
-					  TQStyleControlElementData ceData,
+					  const TQStyleControlElementData &ceData,
 					  ControlElementFlags elementFlags,
 					  SubControl sc,
 					  const TQStyleOption& = TQStyleOption::Default,
@@ -783,7 +784,7 @@ public:
 
     // New API
     virtual SubControl querySubControl( ComplexControl control,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQPoint &pos,
 					const TQStyleOption& = TQStyleOption::Default,
@@ -872,7 +873,7 @@ public:
 
     // New API
     virtual int pixelMetric( PixelMetric metric,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQWidget *widget = 0 ) const = 0;
 
@@ -909,7 +910,7 @@ public:
 				    const TQStyleOption& = TQStyleOption::Default ) const;
 
     virtual TQSize sizeFromContents( ContentsType contents,
-				    TQStyleControlElementData ceData,
+				    const TQStyleControlElementData &ceData,
 				    ControlElementFlags elementFlags,
 				    const TQSize &contentsSize,
 				    const TQStyleOption& = TQStyleOption::Default,
@@ -1083,7 +1084,7 @@ public:
 
     // New API
     virtual int styleHint( StyleHint stylehint,
-			   TQStyleControlElementData ceData,
+			   const TQStyleControlElementData &ceData,
 			   ControlElementFlags elementFlags,
 			   const TQStyleOption& = TQStyleOption::Default,
 			   TQStyleHintReturn* returnData = 0,
@@ -1115,7 +1116,7 @@ public:
 				 const TQStyleOption& = TQStyleOption::Default ) const;
 
     virtual TQPixmap stylePixmap( StylePixmap stylepixmap,
-				 TQStyleControlElementData ceData,
+				 const TQStyleControlElementData &ceData,
 				 ControlElementFlags elementFlags,
 				 const TQStyleOption& = TQStyleOption::Default,
 				 const TQWidget *widget = 0 ) const = 0;
@@ -1126,7 +1127,7 @@ public:
     static TQRect visualRect( const TQRect &logical, const TQWidget *w );
 
     // New API
-    static TQRect visualRect( const TQRect &logical, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags );
+    static TQRect visualRect( const TQRect &logical, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags );
 
     static TQRect visualRect( const TQRect &logical, const TQRect &bounding );
 
@@ -1135,13 +1136,13 @@ public:
     typedef TQMap<void*, TQStyle*> ObjectEventSourceToHandlerMap;
     typedef TQMap<void*, TQStyleControlElementData> ObjectEventSourceDataToHandlerMap;
     typedef TQMap<void*, ControlElementFlags> ObjectEventSourceFlagsToHandlerMap;
-    typedef bool (*EventHandlerInstallationHook)(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler);
-    typedef bool (*EventHandlerRemovalHook)(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler);
-    void installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
-    void removeObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
+    typedef bool (*EventHandlerInstallationHook)(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler);
+    typedef bool (*EventHandlerRemovalHook)(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler);
+    void installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
+    void removeObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
     void setEventHandlerInstallationHook( EventHandlerInstallationHook );
     void setEventHandlerRemovalHook( EventHandlerRemovalHook hook );
-    virtual bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+    virtual bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
     enum WidgetActionRequest {
 	WAR_Repaint,
@@ -1165,37 +1166,40 @@ public:
 	WAR_SendPaintEvent
     };
 
-    typedef bool (*WidgetActionRequestHook)(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, TQStyleWidgetActionRequestData requestData);
+    typedef bool (*WidgetActionRequestHook)(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, TQStyleWidgetActionRequestData requestData);
     void setWidgetActionRequestHook( WidgetActionRequestHook );
-    virtual bool widgetActionRequest( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, TQStyleWidgetActionRequestData requestData = TQStyleWidgetActionRequestData() );
+    virtual bool widgetActionRequest( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, TQStyleWidgetActionRequestData requestData = TQStyleWidgetActionRequestData() );
 
     enum ApplicationActionRequest {
 	AAR_SetPalette,
 	AAR_SetFont
     };
 
-    typedef bool (*ApplicationActionRequestHook)(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, TQStyleApplicationActionRequestData requestData);
+    typedef bool (*ApplicationActionRequestHook)(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, TQStyleApplicationActionRequestData requestData);
     void setApplicationActionRequestHook( ApplicationActionRequestHook );
-    virtual bool applicationActionRequest( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, TQStyleApplicationActionRequestData requestData = TQStyleApplicationActionRequestData() );
+    virtual bool applicationActionRequest( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, TQStyleApplicationActionRequestData requestData = TQStyleApplicationActionRequestData() );
 
     // Old 2.x TQStyle API
 
 #ifndef QT_NO_COMPAT
     int defaultFrameWidth() const
     {
-	return pixelMetric( PM_DefaultFrameWidth, TQStyleControlElementData(), CEF_None );
+	TQStyleControlElementData ceData;
+	return pixelMetric( PM_DefaultFrameWidth, ceData, CEF_None );
     }
     void tabbarMetrics( const TQWidget* t,
 			int& hf, int& vf, int& ov ) const
     {
-	hf = pixelMetric( PM_TabBarTabHSpace, TQStyleControlElementData(), CEF_None, t );
-	vf = pixelMetric( PM_TabBarTabVSpace, TQStyleControlElementData(), CEF_None, t );
-	ov = pixelMetric( PM_TabBarBaseOverlap, TQStyleControlElementData(), CEF_None, t );
+	TQStyleControlElementData ceData;
+	hf = pixelMetric( PM_TabBarTabHSpace, ceData, CEF_None, t );
+	vf = pixelMetric( PM_TabBarTabVSpace, ceData, CEF_None, t );
+	ov = pixelMetric( PM_TabBarBaseOverlap, ceData, CEF_None, t );
     }
     TQSize scrollBarExtent() const
     {
-	return TQSize(pixelMetric(PM_ScrollBarExtent, TQStyleControlElementData(), CEF_None),
-		     pixelMetric(PM_ScrollBarExtent, TQStyleControlElementData(), CEF_None));
+	TQStyleControlElementData ceData;
+	return TQSize(pixelMetric(PM_ScrollBarExtent, ceData, CEF_None),
+		     pixelMetric(PM_ScrollBarExtent, ceData, CEF_None));
     }
 #endif
 
diff --git a/src/kernel/ntqwidget.h b/src/kernel/ntqwidget.h
index d7c8cb583..bac3d6bc9 100644
--- a/src/kernel/ntqwidget.h
+++ b/src/kernel/ntqwidget.h
@@ -63,6 +63,7 @@ class TQFocusData;
 class TQCursor;
 class TQWSRegionManager;
 class TQStyle;
+class TQStyleControlElementData;
 
 class Q_EXPORT TQWidget : public TQObject, public TQPaintDevice
 {
@@ -1086,6 +1087,7 @@ struct Q_EXPORT TQWExtra {
 #endif
     TQRect micro_focus_hint;			// micro focus hint
     TQSizePolicy size_policy;
+    TQStyleControlElementData* m_ceData;
 };
 
 #define Q_DEFINED_QWIDGET
diff --git a/src/kernel/qstyle.cpp b/src/kernel/qstyle.cpp
index df83f00eb..845c2f150 100644
--- a/src/kernel/qstyle.cpp
+++ b/src/kernel/qstyle.cpp
@@ -54,7 +54,6 @@
 
 #include <limits.h>
 
-
 class TQStylePrivate
 {
 public:
@@ -495,7 +494,7 @@ void TQStyle::unPolish( TQWidget *widget ) {
 
     \sa unPolish()
 */
-void TQStyle::polish( TQStyleControlElementData ceData, ControlElementFlags, void *ptr ) {
+void TQStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) {
 	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		// Enable dynamic hide/show of accelerator shortcuts
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
@@ -513,7 +512,7 @@ void TQStyle::polish( TQStyleControlElementData ceData, ControlElementFlags, voi
 
     \sa polish()
 */
-void TQStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags, void *ptr ) {
+void TQStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags, void *ptr ) {
 	if (ceData.widgetObjectTypes.contains("TQWidget")) {
 		// Disable dynamic hide/show of accelerator shortcuts
 		TQWidget* widget = reinterpret_cast<TQWidget*>(ptr);
@@ -555,7 +554,7 @@ void TQStyle::unPolish( TQApplication *app ) {
 
     \sa unPolish()
 */
-void TQStyle::applicationPolish( TQStyleControlElementData, ControlElementFlags, void * ) {
+void TQStyle::applicationPolish( const TQStyleControlElementData&, ControlElementFlags, void * ) {
 	//
 }
 
@@ -571,7 +570,7 @@ void TQStyle::applicationPolish( TQStyleControlElementData, ControlElementFlags,
 
     \sa polish()
 */
-void TQStyle::applicationUnPolish( TQStyleControlElementData, ControlElementFlags, void * ) {
+void TQStyle::applicationUnPolish( const TQStyleControlElementData&, ControlElementFlags, void * ) {
 	//
 }
 
@@ -605,7 +604,7 @@ void TQStyle::polishPopupMenu( TQPopupMenu *pm ) {
     (\l{TQPopupMenu::setMouseTracking()}) and whether the menu is
     checkable by default (\l{TQPopupMenu::setCheckable()}).
 */
-void TQStyle::polishPopupMenu( TQStyleControlElementData, ControlElementFlags, void * )
+void TQStyle::polishPopupMenu( const TQStyleControlElementData&, ControlElementFlags, void * )
 {
 }
 
@@ -909,7 +908,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn void TQStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags, const TQStyleOption& opt) const
+    \fn void TQStyle::drawPrimitive( PrimitiveElement pe, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags flags, const TQStyleOption& opt) const
 
     Draws the style PrimitiveElement \a pe using the painter \a p in
     the area \a r. Colors are used from the color group \a cg.
@@ -1042,7 +1041,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn void TQStyle::drawControl( ControlElement element, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how, const TQStyleOption& opt, const TQWidget *widget) const
+    \fn void TQStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how, const TQStyleOption& opt, const TQWidget *widget) const
 
     Draws the ControlElement \a element using the painter \a p in the
     area \a r. Colors are used from the color group \a cg.
@@ -1201,7 +1200,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn void TQStyle::drawControlMask( ControlElement element, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, const TQWidget *widget) const
+    \fn void TQStyle::drawControlMask( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, const TQWidget *widget) const
 
     Draw a bitmask for the ControlElement \a element using the painter
     \a p in the area \a r. See drawControl() for an explanation of the
@@ -1274,7 +1273,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn TQRect TQStyle::subRect( SubRect subrect, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
+    \fn TQRect TQStyle::subRect( SubRect subrect, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget ) const;
 
     Returns the sub-area \a subrect for the \a widget in logical
     coordinates.
@@ -1406,7 +1405,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn void TQStyle::drawComplexControl( ComplexControl control, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how, SCFlags sub, SCFlags subActive, const TQStyleOption& opt, const TQWidget *widget ) const
+    \fn void TQStyle::drawComplexControl( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r, const TQColorGroup &cg, SFlags how, SCFlags sub, SCFlags subActive, const TQStyleOption& opt, const TQWidget *widget ) const
 
     Draws the ComplexControl \a control using the painter \a p in the
     area \a r. Colors are used from the color group \a cg. The \a sub
@@ -1504,7 +1503,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn void TQStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, const TQWidget *widget) const
+    \fn void TQStyle::drawComplexControlMask( ComplexControl control, TQPainter *p, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQRect &r, const TQStyleOption& opt, const TQWidget *widget) const
 
     Draw a bitmask for the ComplexControl \a control using the painter
     \a p in the area \a r. See drawComplexControl() for an explanation
@@ -1524,7 +1523,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn TQRect TQStyle::querySubControlMetrics( ComplexControl control, TQStyleControlElementData ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
+    \fn TQRect TQStyle::querySubControlMetrics( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, SubControl subcontrol, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
 
     Returns the rect for the SubControl \a subcontrol for \a widget in
     logical coordinates.
@@ -1546,7 +1545,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn SubControl TQStyle::querySubControl( ComplexControl control, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
+    \fn SubControl TQStyle::querySubControl( ComplexControl control, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQPoint &pos, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
 
     Returns the SubControl for \a widget at the point \a pos. The \a
     widget argument is a pointer to a TQWidget or one of its
@@ -1672,7 +1671,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn int TQStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+    \fn int TQStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
 
     Returns the pixel metric for \a metric.
 
@@ -1734,7 +1733,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn TQSize TQStyle::sizeFromContents( ContentsType contents, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
+    \fn TQSize TQStyle::sizeFromContents( ContentsType contents, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQSize &contentsSize, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
 
     Returns the size of \a widget based on the contents size \a
     contentsSize.
@@ -1924,7 +1923,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn int TQStyle::styleHint( StyleHint stylehint, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt = TQStyleOption::Default, TQStyleHintReturn *returnData = 0, const TQWidget *widget = 0 ) const;
+    \fn int TQStyle::styleHint( StyleHint stylehint, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt = TQStyleOption::Default, TQStyleHintReturn *returnData = 0, const TQWidget *widget = 0 ) const;
 
     Returns the style hint \a stylehint for \a widget. Currently, \a
     widget, \a opt, and \a returnData are unused; they're included to
@@ -1971,7 +1970,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
 */
 
 /*!
-    \fn TQPixmap TQStyle::stylePixmap( StylePixmap stylepixmap, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
+    \fn TQPixmap TQStyle::stylePixmap( StylePixmap stylepixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& opt = TQStyleOption::Default, const TQWidget *widget = 0 ) const;
 
     Returns a pixmap for \a stylepixmap.
 
@@ -2011,7 +2010,7 @@ void TQStyle::drawItem( TQPainter *p, const TQRect &r,
     function is provided to aid style implementors in supporting
     right-to-left mode.
 
-    Note that this function is deprecated in favor of visualRect( const TQRect &logical, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags );
+    Note that this function is deprecated in favor of visualRect( const TQRect &logical, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags );
 
     \sa TQApplication::reverseLayout()
 */
@@ -2023,7 +2022,7 @@ TQRect TQStyle::visualRect( const TQRect &logical, const TQWidget *w )
 }
 
 /*!
-    \fn TQRect TQStyle::visualRect( const TQRect &logical, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags );
+    \fn TQRect TQStyle::visualRect( const TQRect &logical, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags );
 
     Returns the rect \a logical in screen coordinates. The bounding
     rect for the widget described by \a ceData and \a elementFlags
@@ -2033,7 +2032,7 @@ TQRect TQStyle::visualRect( const TQRect &logical, const TQWidget *w )
 
     \sa TQApplication::reverseLayout()
 */
-TQRect TQStyle::visualRect( const TQRect &logical, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags )
+TQRect TQStyle::visualRect( const TQRect &logical, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags )
 {
     Q_UNUSED(elementFlags)
 
@@ -2065,15 +2064,15 @@ TQRect TQStyle::visualRect( const TQRect &logical, const TQRect &boundingRect )
 }
 
 /*!
-    \fn void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
+    \fn void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
 
     Intercepts events generated by \a source and sends them to \a handler via
-    the bool TQStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) virtual method.
+    the bool TQStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) virtual method.
 
     \sa void TQStyle::removeObjectEventHandler( TQObject* source, TQStyle* handler )
-    \sa bool TQStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e )
+    \sa bool TQStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e )
 */
-void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ) {
+void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ) {
 	bool cbret = false;
 	if (m_eventHandlerInstallationHook) {
 		cbret = (*m_eventHandlerInstallationHook)(ceData, elementFlags, source, handler);
@@ -2090,13 +2089,13 @@ void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, Contr
 }
 
 /*!
-    \fn void TQStyle::removeObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
+    \fn void TQStyle::removeObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler );
 
     Stops intercepting events generated by \a source.
 
-    \sa void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
 */
-void TQStyle::removeObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ) {
+void TQStyle::removeObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ) {
 	bool cbret = false;
 	if (m_eventHandlerRemovalHook) {
 		cbret = (*m_eventHandlerRemovalHook)(ceData, elementFlags, source, handler);
@@ -2117,9 +2116,9 @@ void TQStyle::removeObjectEventHandler( TQStyleControlElementData ceData, Contro
 
     Sets a callback function \a hook which will be called whenever a new intercept request
     is made via the TQStyle::installObjectEventHandler method.  The callback function must
-    use this definition: bool callbackFunction( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
+    use this definition: bool callbackFunction( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
 
-    \sa void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
 */
 void TQStyle::setEventHandlerInstallationHook( EventHandlerInstallationHook hook ) {
 	m_eventHandlerInstallationHook = hook;
@@ -2130,24 +2129,24 @@ void TQStyle::setEventHandlerInstallationHook( EventHandlerInstallationHook hook
 
     Sets a callback function \a hook which will be called whenever a new intercept deactivation request
     is made via the TQStyle::removeObjectEventHandler method.  The callback function must
-    use this definition: bool callbackFunction( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
+    use this definition: bool callbackFunction( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
 
-    \sa void TQStyle::removeObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::removeObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
 */
 void TQStyle::setEventHandlerRemovalHook( EventHandlerRemovalHook hook ) {
 	m_eventHandlerRemovalHook = hook;
 }
 
 /*!
-    \fn bool TQStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+    \fn bool TQStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
     Override this virtual function to intercept events requested by a previous call to
     TQStyle::installObjectEventHandler.
 
-    \sa void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
-    \sa void TQStyle::removeObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::removeObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
 */
-bool TQStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) {
+bool TQStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) {
 	Q_UNUSED(ceData);
 	Q_UNUSED(elementFlags);
 	Q_UNUSED(source);
@@ -2193,20 +2192,20 @@ bool TQStyle::eventFilter(TQObject *o, TQEvent *e) {
 
     Sets a callback function \a hook which will be called whenever a new widget action request
     is made via the TQStyle::installObjectEventHandler method.  The callback function must
-    use this definition: bool callbackFunction( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
+    use this definition: bool callbackFunction( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
 
-    \sa void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
 */
 void TQStyle::setWidgetActionRequestHook( WidgetActionRequestHook hook ) {
 	m_widgetActionRequestHook = hook;
 }
 
 /*!
-    \fn bool widgetActionRequestHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request );
+    \fn bool widgetActionRequestHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request );
 
     Handles widget action requests.  Return FALSE to continue processing in base classes, TRUE to eat the request and halt processing.
 */
-bool TQStyle::widgetActionRequest( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, TQStyleWidgetActionRequestData requestData ) {
+bool TQStyle::widgetActionRequest( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, WidgetActionRequest request, TQStyleWidgetActionRequestData requestData ) {
 	bool cbret = false;
 	if (m_widgetActionRequestHook) {
 		cbret = (*m_widgetActionRequestHook)(ceData, elementFlags, source, request, requestData);
@@ -2327,20 +2326,20 @@ bool TQStyle::widgetActionRequest( TQStyleControlElementData ceData, ControlElem
 
     Sets a callback function \a hook which will be called whenever a new application action request
     is made via the TQStyle::installObjectEventHandler method.  The callback function must
-    use this definition: bool callbackFunction( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
+    use this definition: bool callbackFunction( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler ).
 
-    \sa void TQStyle::installObjectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
+    \sa void TQStyle::installObjectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQStyle* handler )
 */
 void TQStyle::setApplicationActionRequestHook( ApplicationActionRequestHook hook ) {
 	m_applicationActionRequestHook = hook;
 }
 
 /*!
-    \fn bool applicationActionRequestHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request );
+    \fn bool applicationActionRequestHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request );
 
     Handles application action requests.  Return FALSE to continue processing in base classes, TRUE to eat the request and halt processing.
 */
-bool TQStyle::applicationActionRequest( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, TQStyleApplicationActionRequestData requestData ) {
+bool TQStyle::applicationActionRequest( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, ApplicationActionRequest request, TQStyleApplicationActionRequestData requestData ) {
 	bool cbret = false;
 	if (m_applicationActionRequestHook) {
 		cbret = (*m_applicationActionRequestHook)(ceData, elementFlags, source, request, requestData);
@@ -2609,6 +2608,7 @@ TQPixmap TQStyle::stylePixmap(StylePixmap sp, const TQWidget *w, const TQStyleOp
 */
 
 TQStyleControlElementData::TQStyleControlElementData() {
+	isNull = true;
 	activePainter = 0;
 	tickMarkSetting = 0;
 	comboBoxLineEditFlags = 0;
diff --git a/src/kernel/qwidget.cpp b/src/kernel/qwidget.cpp
index a29036c1f..f7ed299fb 100644
--- a/src/kernel/qwidget.cpp
+++ b/src/kernel/qwidget.cpp
@@ -1184,6 +1184,9 @@ void TQWidget::createExtra()
 #endif
 	extra->size_policy = TQSizePolicy( TQSizePolicy::Preferred,
 					  TQSizePolicy::Preferred );
+
+	extra->m_ceData = NULL;
+
 	createSysExtra();
     }
 }
@@ -3591,7 +3594,15 @@ bool TQWidget::isActiveWindow() const
     if(tlw == tqApp->activeWindow() || ( isVisible() && tlw->isPopup() ))
 	return TRUE;
 #ifndef QT_NO_STYLE
-    if(style().styleHint(TQStyle::SH_Widget_ShareActivation, this )) {
+    const_cast<TQWidget*>(this)->createExtra();
+    if (!extra->m_ceData) {
+        const_cast<TQWidget*>(this)->extra->m_ceData = new TQStyleControlElementData();
+    }
+    //extra->m_ceData->widgetObjectTypes = getObjectTypeListForObject(this);
+    extra->m_ceData->widgetObjectTypes.clear();
+    extra->m_ceData->allDataPopulated = false;
+    //if(style().styleHint(TQStyle::SH_Widget_ShareActivation, *extra->m_ceData, getControlElementFlagsForObject(this, extra->m_ceData->widgetObjectTypes, TQStyleOption(), false), TQStyleOption(), NULL, this)) {
+    if(style().styleHint(TQStyle::SH_Widget_ShareActivation, *extra->m_ceData, TQStyle::CEF_None, TQStyleOption(), NULL, this)) {
         if((tlw->isDialog() || (tlw->testWFlags(TQt::WStyle_Tool) && !tlw->isPopup())) &&
            !tlw->testWFlags(TQt::WShowModal) &&
            (!tlw->parentWidget() || tlw->parentWidget()->isActiveWindow()))
diff --git a/src/styles/ntqcdestyle.h b/src/styles/ntqcdestyle.h
index 13b2c024e..5f169118c 100644
--- a/src/styles/ntqcdestyle.h
+++ b/src/styles/ntqcdestyle.h
@@ -62,11 +62,11 @@ public:
     TQCDEStyle( bool useHighlightCols = FALSE );
     virtual ~TQCDEStyle();
 
-    int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+    int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      TQStyleControlElementData ceData,
+		      const TQStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
@@ -76,7 +76,7 @@ public:
 
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
diff --git a/src/styles/ntqcommonstyle.h b/src/styles/ntqcommonstyle.h
index 8fe9ecfa1..cb04fa717 100644
--- a/src/styles/ntqcommonstyle.h
+++ b/src/styles/ntqcommonstyle.h
@@ -58,7 +58,7 @@ public:
     // New API
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -68,7 +68,7 @@ public:
     // New API
     void drawControl( ControlElement element,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -79,19 +79,19 @@ public:
     // New API
     void drawControlMask( ControlElement element,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQStyleOption& = TQStyleOption::Default,
 			const TQWidget *widget = 0 ) const;
 
     // New API
-    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;
 
     // New API
     void drawComplexControl( ComplexControl control,
 			     TQPainter *p,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQRect &r,
 			     const TQColorGroup &cg,
@@ -108,7 +108,7 @@ public:
     // New API
     void drawComplexControlMask( ComplexControl control,
 				 TQPainter *p,
-				 const TQStyleControlElementData ceData,
+				 const TQStyleControlElementData &ceData,
 				 const ControlElementFlags elementFlags,
 				 const TQRect &r,
 				 const TQStyleOption& = TQStyleOption::Default,
@@ -116,7 +116,7 @@ public:
 
     // New API
     TQRect querySubControlMetrics( ComplexControl control,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  SubControl sc,
 				  const TQStyleOption& = TQStyleOption::Default,
@@ -124,29 +124,29 @@ public:
 
     // New API
     SubControl querySubControl( ComplexControl control,
-				TQStyleControlElementData ceData,
+				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
 				const TQPoint &pos,
 				const TQStyleOption& = TQStyleOption::Default,
 				const TQWidget *widget = 0 ) const;
 
     // New API
-    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;
 
     // New API
     TQSize sizeFromContents( ContentsType s,
-			    TQStyleControlElementData ceData,
+			    const TQStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const TQSize &contentsSize,
 			    const TQStyleOption& = TQStyleOption::Default,
 			    const TQWidget *widget = 0 ) const;
 
     // New API
-    int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const;
+    int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const;
 
     // New API
     TQPixmap stylePixmap( StylePixmap sp,
-			 TQStyleControlElementData ceData,
+			 const TQStyleControlElementData &ceData,
 			 ControlElementFlags elementFlags,
 			 const TQStyleOption& = TQStyleOption::Default,
 			 const TQWidget *widget = 0 ) const;
diff --git a/src/styles/ntqcompactstyle.h b/src/styles/ntqcompactstyle.h
index cc8c7e947..13a442021 100644
--- a/src/styles/ntqcompactstyle.h
+++ b/src/styles/ntqcompactstyle.h
@@ -58,21 +58,21 @@ class Q_EXPORT_STYLE_COMPACT TQCompactStyle : public TQWindowsStyle
 public:
     TQCompactStyle();
 
-    int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 );
+    int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 );
 
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
 			SFlags flags = Style_Default,
 			const TQStyleOption& = TQStyleOption::Default ) const;
 
-    void drawControl( ControlElement element, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+    void drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
 		      const TQColorGroup &cg, SFlags how = Style_Default, const TQStyleOption& = TQStyleOption::Default, const TQWidget *w = 0 );
 
-    int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
+    int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
 
 private:	// Disabled copy constructor and operator=
 #if defined(TQ_DISABLE_COPY)
diff --git a/src/styles/ntqmotifplusstyle.h b/src/styles/ntqmotifplusstyle.h
index 8027b9339..16dbf1762 100644
--- a/src/styles/ntqmotifplusstyle.h
+++ b/src/styles/ntqmotifplusstyle.h
@@ -63,15 +63,15 @@ public:
     virtual ~TQMotifPlusStyle();
 
     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 applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
-    void applicationUnPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+    void applicationUnPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -80,7 +80,7 @@ public:
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      TQStyleControlElementData ceData,
+		      const TQStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
@@ -88,11 +88,11 @@ public:
 		      const TQStyleOption& = TQStyleOption::Default,
 		      const TQWidget *widget = 0 ) const;
 
-    TQRect subRect(SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const;
+    TQRect subRect(SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const;
 
     void drawComplexControl(ComplexControl control,
 			    TQPainter *p,
-			    TQStyleControlElementData ceData,
+			    const TQStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const TQRect &r,
 			    const TQColorGroup &cg,
@@ -107,18 +107,18 @@ public:
 			    const TQWidget *widget = 0 ) const;
 
     TQRect querySubControlMetrics(ComplexControl control,
-				 TQStyleControlElementData ceData,
+				 const TQStyleControlElementData &ceData,
 				 ControlElementFlags elementFlags,
 				 SubControl subcontrol,
 				 const TQStyleOption& = TQStyleOption::Default,
 				 const TQWidget *widget = 0) const;
 
-    int pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
+    int pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0) const;
 
-    int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+    int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
 		  TQStyleHintReturn* = 0, const TQWidget * = 0) const;
 
-    bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+    bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 
 private:
diff --git a/src/styles/ntqmotifstyle.h b/src/styles/ntqmotifstyle.h
index ec55406cc..664208de6 100644
--- a/src/styles/ntqmotifstyle.h
+++ b/src/styles/ntqmotifstyle.h
@@ -67,15 +67,15 @@ public:
     bool useHighlightColors() const;
 
     void polish( TQPalette& );
-    void polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
-    void applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
+    void applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
-    void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     // new style API
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -84,7 +84,7 @@ public:
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      TQStyleControlElementData ceData,
+		      const TQStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
@@ -94,7 +94,7 @@ public:
 
     void drawComplexControl( ComplexControl control,
 			     TQPainter *p,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQRect& r,
 			     const TQColorGroup& cg,
@@ -109,26 +109,26 @@ public:
 			     const TQWidget* widget = 0 ) const;
 
     TQRect querySubControlMetrics( ComplexControl control,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  SubControl sc,
 				  const TQStyleOption& = TQStyleOption::Default,
 				  const TQWidget *widget = 0 ) const;
 
-    int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+    int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
 
     TQSize sizeFromContents( ContentsType contents,
-			    TQStyleControlElementData ceData,
+			    const TQStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const TQSize &contentsSize,
 			    const TQStyleOption& = TQStyleOption::Default,
 			    const TQWidget *widget = 0 ) const;
 
-    TQRect subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+    TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
 
-    TQPixmap stylePixmap(StylePixmap, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget * = 0) const;
+    TQPixmap stylePixmap(StylePixmap, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption& = TQStyleOption::Default, const TQWidget * = 0) const;
 
-    int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+    int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
 		  TQStyleHintReturn* = 0, const TQWidget * = 0) const;
 
 private:
diff --git a/src/styles/ntqplatinumstyle.h b/src/styles/ntqplatinumstyle.h
index f0b0ec7ec..968fbb1d4 100644
--- a/src/styles/ntqplatinumstyle.h
+++ b/src/styles/ntqplatinumstyle.h
@@ -65,7 +65,7 @@ public:
     // new Style Stuff
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -74,7 +74,7 @@ public:
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      TQStyleControlElementData ceData,
+		      const TQStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
@@ -84,7 +84,7 @@ public:
 
     void drawComplexControl( ComplexControl control,
 			     TQPainter *p,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQRect &r,
 			     const TQColorGroup &cg,
@@ -99,15 +99,15 @@ public:
 			     const TQWidget *widget = 0 ) const;
 
     TQRect querySubControlMetrics( ComplexControl control,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  SubControl sc,
 				  const TQStyleOption& = TQStyleOption::Default,
 				  const TQWidget *widget = 0 ) const;
 
-    int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+    int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
 
-    TQRect subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+    TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
 
 protected:
      TQColor mixedColor(const TQColor &, const TQColor &) const;
diff --git a/src/styles/ntqsgistyle.h b/src/styles/ntqsgistyle.h
index bca63f282..dfeda72a7 100644
--- a/src/styles/ntqsgistyle.h
+++ b/src/styles/ntqsgistyle.h
@@ -67,14 +67,14 @@ public:
 #if !defined(Q_NO_USING_KEYWORD)
     using TQMotifStyle::polish;
 #endif
-    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 drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -83,7 +83,7 @@ public:
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      TQStyleControlElementData ceData,
+		      const TQStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
@@ -93,7 +93,7 @@ public:
 
     void drawComplexControl( ComplexControl control,
 			     TQPainter *p,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQRect& r,
 			     const TQColorGroup& cg,
@@ -107,26 +107,26 @@ public:
 			     const TQStyleOption& = TQStyleOption::Default,
 			     const TQWidget* widget = 0 ) const;
 
-    int pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
+    int pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget = 0 ) const;
 
     TQSize sizeFromContents( ContentsType contents,
-			    TQStyleControlElementData ceData,
+			    const TQStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const TQSize &contentsSize,
 			    const TQStyleOption& = TQStyleOption::Default,
 			    const TQWidget *widget = 0 ) const;
 
-    TQRect subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
+    TQRect subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const;
     TQRect querySubControlMetrics( ComplexControl control,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  SubControl sc,
 				  const TQStyleOption& = TQStyleOption::Default,
 				  const TQWidget *widget = 0 ) const;
 
-    int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
+    int styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget *) const;
 
-    bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+    bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 private:
     TQSGIStylePrivate *d;
diff --git a/src/styles/ntqwindowsstyle.h b/src/styles/ntqwindowsstyle.h
index 7220eacef..eaee7ca98 100644
--- a/src/styles/ntqwindowsstyle.h
+++ b/src/styles/ntqwindowsstyle.h
@@ -61,20 +61,20 @@ public:
     TQWindowsStyle();
     ~TQWindowsStyle();
 
-    void applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
-    void applicationUnPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+    void applicationUnPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
-    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 & );
 
-    virtual void polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    virtual void polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     // new stuff
     void drawPrimitive( PrimitiveElement pe,
 			TQPainter *p,
-			TQStyleControlElementData ceData,
+			const TQStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const TQRect &r,
 			const TQColorGroup &cg,
@@ -83,7 +83,7 @@ public:
 
     void drawControl( ControlElement element,
 		      TQPainter *p,
-		      TQStyleControlElementData ceData,
+		      const TQStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const TQRect &r,
 		      const TQColorGroup &cg,
@@ -93,7 +93,7 @@ public:
 
     void drawComplexControl( ComplexControl control,
 			     TQPainter* p,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQRect& r,
 			     const TQColorGroup& cg,
@@ -108,29 +108,29 @@ public:
 			     const TQWidget* widget = 0 ) const;
 
     int pixelMetric( PixelMetric metric,
-		     TQStyleControlElementData ceData,
+		     const TQStyleControlElementData &ceData,
 		     ControlElementFlags elementFlags,
 		     const TQWidget *widget = 0 ) const;
 
     TQSize sizeFromContents( ContentsType contents,
-			    TQStyleControlElementData ceData,
+			    const TQStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const TQSize &contentsSize,
 			    const TQStyleOption& = TQStyleOption::Default,
 			    const TQWidget *widget = 0 ) const;
 
-    int styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption & = TQStyleOption::Default,
+    int styleHint(StyleHint sh, 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;
 
-    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;
 
-    bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+    bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 private:
     class Private;
diff --git a/src/styles/qcdestyle.cpp b/src/styles/qcdestyle.cpp
index 1b01c81d1..931aa2d47 100644
--- a/src/styles/qcdestyle.cpp
+++ b/src/styles/qcdestyle.cpp
@@ -87,7 +87,7 @@ TQCDEStyle::~TQCDEStyle()
 
 /*!\reimp
 */
-int TQCDEStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int TQCDEStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
     int ret;
 
@@ -112,7 +112,7 @@ int TQCDEStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceDat
 */
 void TQCDEStyle::drawControl( ControlElement element,
 			     TQPainter *p,
-			     TQStyleControlElementData ceData,
+			     const TQStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const TQRect &r,
 			     const TQColorGroup &cg,
@@ -144,7 +144,7 @@ void TQCDEStyle::drawControl( ControlElement element,
 */
 void TQCDEStyle::drawPrimitive( PrimitiveElement pe,
 			       TQPainter *p,
-			       TQStyleControlElementData ceData,
+			       const TQStyleControlElementData &ceData,
 			       ControlElementFlags elementFlags,
 			       const TQRect &r,
 			       const TQColorGroup &cg,
diff --git a/src/styles/qcommonstyle.cpp b/src/styles/qcommonstyle.cpp
index 1bc1d0373..41ed19d0b 100644
--- a/src/styles/qcommonstyle.cpp
+++ b/src/styles/qcommonstyle.cpp
@@ -258,6 +258,7 @@ TQStyleControlElementData populateControlElementDataFromWidget(const TQWidget* w
 	TQStyleControlElementData ceData;
 
 	if (widget) {
+		ceData.isNull = false;
 		ceData.widgetObjectTypes = getObjectTypeListForObject(widget);
 		ceData.allDataPopulated = populateReliantFields & populateMinimumNumberOfFields;
 		if (!populateMinimumNumberOfFields) {
@@ -695,7 +696,7 @@ TQStyleControlElementData populateControlElementDataFromApplication(const TQAppl
 /*! \reimp */
 void TQCommonStyle::drawPrimitive( PrimitiveElement pe,
 				  TQPainter *p,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  const TQRect &r,
 				  const TQColorGroup &cg,
@@ -1173,7 +1174,7 @@ void qt_style_erase_region(TQPainter* p, const TQRegion& region, TQStyleControlE
 /*! \reimp */
 void TQCommonStyle::drawControl( ControlElement element,
 				TQPainter *p,
-				TQStyleControlElementData ceData,
+				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQColorGroup &cg,
@@ -1619,7 +1620,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 	{
 	    TQRect rect = r;
 
-	    TQIconSet* icon = &ceData.iconSet;
+	    const TQIconSet* icon = &ceData.iconSet;
 	    if ( icon ) {
 		TQPixmap pixmap = icon->pixmap( TQIconSet::Small,
 					       flags & Style_Enabled ?
@@ -1653,7 +1654,7 @@ void TQCommonStyle::drawControl( ControlElement element,
 /*! \reimp */
 void TQCommonStyle::drawControlMask( ControlElement control,
 				TQPainter *p,
-				TQStyleControlElementData ceData,
+				const TQStyleControlElementData &ceData,
 				ControlElementFlags elementFlags,
 				const TQRect &r,
 				const TQStyleOption& opt,
@@ -1689,7 +1690,7 @@ void TQCommonStyle::drawControlMask( ControlElement control,
 }
 
 /*! \reimp */
-TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     TQRect rect, wrect(ceData.rect);
 
@@ -1985,7 +1986,7 @@ TQRect TQCommonStyle::subRect(SubRect r, const TQStyleControlElementData ceData,
 /*
   I really need this and I don't want to expose it in TQRangeControl..
 */
-static int qPositionFromValue( TQStyleControlElementData ceData, int logical_val,
+static int qPositionFromValue( const TQStyleControlElementData &ceData, int logical_val,
 			       int span )
 {
     if ( span <= 0 || logical_val < ceData.minSteps ||
@@ -2018,7 +2019,7 @@ static int qPositionFromValue( TQStyleControlElementData ceData, int logical_val
 /*! \reimp */
 void TQCommonStyle::drawComplexControl( ComplexControl control,
 				       TQPainter *p,
-				       TQStyleControlElementData ceData,
+				       const TQStyleControlElementData &ceData,
 				       ControlElementFlags elementFlags,
 				       const TQRect &r,
 				       const TQColorGroup &cg,
@@ -2420,7 +2421,7 @@ void TQCommonStyle::drawComplexControl( ComplexControl control,
 /*! \reimp */
 void TQCommonStyle::drawComplexControlMask( ComplexControl control,
 					   TQPainter *p,
-					   const TQStyleControlElementData ceData,
+					   const TQStyleControlElementData &ceData,
 					   const ControlElementFlags elementFlags,
 					   const TQRect &r,
 					   const TQStyleOption& opt,
@@ -2437,7 +2438,7 @@ void TQCommonStyle::drawComplexControlMask( ComplexControl control,
 
 /*! \reimp */
 TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
-					    TQStyleControlElementData ceData,
+					    const TQStyleControlElementData &ceData,
 					    ControlElementFlags elementFlags,
 					    SubControl sc,
 					    const TQStyleOption &opt,
@@ -2671,7 +2672,7 @@ TQRect TQCommonStyle::querySubControlMetrics( ComplexControl control,
 
 /*! \reimp */
 TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
-						 TQStyleControlElementData ceData,
+						 const TQStyleControlElementData &ceData,
 						 ControlElementFlags elementFlags,
 						 const TQPoint &pos,
 						 const TQStyleOption& opt,
@@ -2746,7 +2747,7 @@ TQStyle::SubControl TQCommonStyle::querySubControl(ComplexControl control,
 }
 
 /*! \reimp */
-int TQCommonStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int TQCommonStyle::pixelMetric(PixelMetric m, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     int ret;
 
@@ -2970,7 +2971,7 @@ int TQCommonStyle::pixelMetric(PixelMetric m, TQStyleControlElementData ceData,
 
 /*! \reimp */
 TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
-				     TQStyleControlElementData ceData,
+				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
 				     const TQSize &contentsSize,
 				     const TQStyleOption& opt,
@@ -3140,7 +3141,7 @@ TQSize TQCommonStyle::sizeFromContents(ContentsType contents,
 }
 
 /*! \reimp */
-int TQCommonStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const
+int TQCommonStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &, TQStyleHintReturn *, const TQWidget * w) const
 {
     Q_UNUSED(w);
 
@@ -3223,7 +3224,7 @@ int TQCommonStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, Con
 }
 
 /*! \reimp */
-TQPixmap TQCommonStyle::stylePixmap(StylePixmap, TQStyleControlElementData, ControlElementFlags, const TQStyleOption&, const TQWidget *) const
+TQPixmap TQCommonStyle::stylePixmap(StylePixmap, const TQStyleControlElementData&, ControlElementFlags, const TQStyleOption&, const TQWidget *) const
 {
     return TQPixmap();
 }
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp
index f2038a38c..8ec016e9e 100644
--- a/src/styles/qcompactstyle.cpp
+++ b/src/styles/qcompactstyle.cpp
@@ -55,7 +55,7 @@ TQCompactStyle::TQCompactStyle()
 }
 
 /*! \reimp */
-int TQCompactStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget )
+int TQCompactStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget )
 {
     int ret;
     switch ( metric ) {
@@ -151,7 +151,7 @@ void drawPopupMenuItem( TQPainter*, bool,
 }
 
 /*! \reimp */
-void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQRect &r,
+void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQRect &r,
 		  const TQColorGroup &g, SFlags flags, const TQStyleOption& opt, const TQWidget *widget )
 {
     switch ( element ) {
@@ -312,7 +312,7 @@ void TQCompactStyle::drawControl( ControlElement element, TQPainter *p, TQStyleC
 /*! \reimp */
 void TQCompactStyle::drawPrimitive( PrimitiveElement pe,
 				  TQPainter *p,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  const TQRect &r,
 				  const TQColorGroup &cg,
@@ -368,7 +368,7 @@ void TQCompactStyle::drawPrimitive( PrimitiveElement pe,
 }
 
 /*! \reimp */
-int TQCompactStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
+int TQCompactStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
 {
 	int ret;
 
diff --git a/src/styles/qmotifplusstyle.cpp b/src/styles/qmotifplusstyle.cpp
index 6b56a3462..90a8f6339 100644
--- a/src/styles/qmotifplusstyle.cpp
+++ b/src/styles/qmotifplusstyle.cpp
@@ -175,7 +175,7 @@ void TQMotifPlusStyle::polish(TQPalette &)
 
 
 /*! \reimp */
-void TQMotifPlusStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQMotifPlusStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     if (ceData.widgetObjectTypes.contains("TQWidget")) {
 #ifndef QT_NO_FRAME
@@ -212,7 +212,7 @@ void TQMotifPlusStyle::polish(TQStyleControlElementData ceData, ControlElementFl
 
 
 /*! \reimp */
-void TQMotifPlusStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQMotifPlusStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     removeObjectEventHandler(ceData, elementFlags, ptr, this);
     TQMotifStyle::unPolish(ceData, elementFlags, ptr);
@@ -220,19 +220,19 @@ void TQMotifPlusStyle::unPolish(TQStyleControlElementData ceData, ControlElement
 
 
 /*! \reimp */
-void TQMotifPlusStyle::applicationPolish(TQStyleControlElementData, ControlElementFlags, void *)
+void TQMotifPlusStyle::applicationPolish(const TQStyleControlElementData&, ControlElementFlags, void *)
 {
 }
 
 
 /*! \reimp */
-void TQMotifPlusStyle::applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *)
+void TQMotifPlusStyle::applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *)
 {
 }
 
 
 /*! \reimp */
-int TQMotifPlusStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int TQMotifPlusStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     int ret;
 
@@ -282,7 +282,7 @@ int TQMotifPlusStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData
 /*! \reimp */
 void TQMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
 				     TQPainter *p,
-				     TQStyleControlElementData ceData,
+				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
 				     const TQRect &r,
 				     const TQColorGroup &cg,
@@ -700,7 +700,7 @@ void TQMotifPlusStyle::drawPrimitive( PrimitiveElement pe,
 */
 void TQMotifPlusStyle::drawControl( ControlElement element,
 				   TQPainter *p,
-				   TQStyleControlElementData ceData,
+				   const TQStyleControlElementData &ceData,
 				   ControlElementFlags elementFlags,
 				   const TQRect &r,
 				   const TQColorGroup &cg,
@@ -1047,7 +1047,7 @@ void TQMotifPlusStyle::drawControl( ControlElement element,
 
 /*! \reimp
 */
-TQRect TQMotifPlusStyle::subRect(SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect TQMotifPlusStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     TQRect rect;
 
@@ -1136,7 +1136,7 @@ TQRect TQMotifPlusStyle::subRect(SubRect r, TQStyleControlElementData ceData, Co
 /*! \reimp */
 void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
 			    TQPainter *p,
-			    TQStyleControlElementData ceData,
+			    const TQStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const TQRect &r,
 			    const TQColorGroup &cg,
@@ -1426,7 +1426,7 @@ void TQMotifPlusStyle::drawComplexControl(ComplexControl control,
 /*! \reimp
 */
 TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
-					      TQStyleControlElementData ceData,
+					      const TQStyleControlElementData &ceData,
 					      ControlElementFlags elementFlags,
 					      SubControl subcontrol,
 					      const TQStyleOption& opt,
@@ -1524,7 +1524,7 @@ TQRect TQMotifPlusStyle::querySubControlMetrics(ComplexControl control,
 
 
 /*! \reimp */
-bool TQMotifPlusStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
+bool TQMotifPlusStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *event )
 {
     switch(event->type()) {
     case TQEvent::MouseButtonPress:
@@ -1596,7 +1596,7 @@ bool TQMotifPlusStyle::objectEventHandler( TQStyleControlElementData ceData, Con
 
 /*! \reimp */
 int TQMotifPlusStyle::styleHint(StyleHint hint,
-			       TQStyleControlElementData ceData,
+			       const TQStyleControlElementData &ceData,
 			       ControlElementFlags elementFlags,
 			       const TQStyleOption &opt,
 			       TQStyleHintReturn *returnData,
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 3225e0e29..2902faa4b 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -171,7 +171,7 @@ void TQMotifStyle::polish( TQPalette& pal )
  \internal
  Keep TQStyle::polish() visible.
 */
-void TQMotifStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQMotifStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
     TQStyle::polish(ceData, elementFlags, ptr);
 }
@@ -181,7 +181,7 @@ void TQMotifStyle::polish( TQStyleControlElementData ceData, ControlElementFlags
  \internal
  Keep TQStyle::polish() visible.
 */
-void TQMotifStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQMotifStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
     TQStyle::applicationPolish(ceData, elementFlags, ptr);
 }
@@ -204,7 +204,7 @@ static void rot(TQPointArray& a, int n)
 */
 void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
 				 TQPainter *p,
-				 TQStyleControlElementData ceData,
+				 const TQStyleControlElementData &ceData,
 				 ControlElementFlags elementFlags,
 				 const TQRect &r,
 				 const TQColorGroup &cg,
@@ -821,7 +821,7 @@ void TQMotifStyle::drawPrimitive( PrimitiveElement pe,
 */
 void TQMotifStyle::drawControl( ControlElement element,
 			       TQPainter *p,
-			       TQStyleControlElementData ceData,
+			       const TQStyleControlElementData &ceData,
 			       ControlElementFlags elementFlags,
 			       const TQRect &r,
 			       const TQColorGroup &cg,
@@ -1257,7 +1257,7 @@ static void get_combo_parameters( const TQRect &r,
 */
 void TQMotifStyle::drawComplexControl( ComplexControl control,
 				     TQPainter *p,
-				     TQStyleControlElementData ceData,
+				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
 				     const TQRect &r,
 				     const TQColorGroup &cg,
@@ -1500,7 +1500,7 @@ void TQMotifStyle::drawComplexControl( ComplexControl control,
 
 
 /*! \reimp */
-int TQMotifStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int TQMotifStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
      int ret;
 
@@ -1595,7 +1595,7 @@ int TQMotifStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceD
 /*!\reimp
 */
 TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
-					   TQStyleControlElementData ceData,
+					   const TQStyleControlElementData &ceData,
 					   ControlElementFlags elementFlags,
 					   SubControl sc,
 					   const TQStyleOption& opt,
@@ -1766,7 +1766,7 @@ TQRect TQMotifStyle::querySubControlMetrics( ComplexControl control,
 /*!\reimp
 */
 TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
-				     TQStyleControlElementData ceData,
+				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
 				     const TQSize &contentsSize,
 				     const TQStyleOption& opt,
@@ -1846,7 +1846,7 @@ TQSize TQMotifStyle::sizeFromContents( ContentsType contents,
 
 /*!\reimp
 */
-TQRect TQMotifStyle::subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+TQRect TQMotifStyle::subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
     TQRect rect;
     TQRect wrect = ceData.rect;
@@ -1953,7 +1953,7 @@ TQRect TQMotifStyle::subRect( SubRect r, TQStyleControlElementData ceData, Contr
 
 /*! \reimp
 */
-void TQMotifStyle::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQMotifStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 #ifndef QT_NO_POPUPMENU
     if ( !(ceData.windowState & WState_Polished ) ) {
@@ -2269,7 +2269,7 @@ static const char *const question_xpm[] = {
  \reimp
  */
 TQPixmap TQMotifStyle::stylePixmap(StylePixmap sp,
-				 TQStyleControlElementData ceData,
+				 const TQStyleControlElementData &ceData,
 				 ControlElementFlags elementFlags,
 				 const TQStyleOption& opt,
 				 const TQWidget *widget) const
@@ -2355,7 +2355,7 @@ TQPixmap TQMotifStyle::stylePixmap(StylePixmap sp,
 
 /*! \reimp */
 int TQMotifStyle::styleHint(StyleHint hint,
-			   TQStyleControlElementData ceData,
+			   const TQStyleControlElementData &ceData,
 			   ControlElementFlags elementFlags,
 			   const TQStyleOption &opt,
 			   TQStyleHintReturn *returnData,
diff --git a/src/styles/qplatinumstyle.cpp b/src/styles/qplatinumstyle.cpp
index 2bc0e4590..173d3003a 100644
--- a/src/styles/qplatinumstyle.cpp
+++ b/src/styles/qplatinumstyle.cpp
@@ -86,7 +86,7 @@ TQPlatinumStyle::~TQPlatinumStyle()
  */
 void TQPlatinumStyle::drawPrimitive( PrimitiveElement pe,
 				    TQPainter *p,
-				    TQStyleControlElementData ceData,
+				    const TQStyleControlElementData &ceData,
 				    ControlElementFlags elementFlags,
 				    const TQRect &r,
 				    const TQColorGroup &cg,
@@ -742,7 +742,7 @@ void TQPlatinumStyle::drawPrimitive( PrimitiveElement pe,
  */
 void TQPlatinumStyle::drawControl( ControlElement element,
 				  TQPainter *p,
-				  TQStyleControlElementData ceData,
+				  const TQStyleControlElementData &ceData,
 				  ControlElementFlags elementFlags,
 				  const TQRect &r,
 				  const TQColorGroup &cg,
@@ -932,7 +932,7 @@ void TQPlatinumStyle::drawControl( ControlElement element,
  */
 void TQPlatinumStyle::drawComplexControl( ComplexControl control,
 					 TQPainter *p,
-					 TQStyleControlElementData ceData,
+					 const TQStyleControlElementData &ceData,
 					 ControlElementFlags elementFlags,
 					 const TQRect &r,
 					 const TQColorGroup &cg,
@@ -1320,7 +1320,7 @@ void TQPlatinumStyle::drawComplexControl( ComplexControl control,
 /*!\reimp
  */
 TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
-					      TQStyleControlElementData ceData,
+					      const TQStyleControlElementData &ceData,
 					      ControlElementFlags elementFlags,
 					      SubControl sc,
 					      const TQStyleOption& opt,
@@ -1432,7 +1432,7 @@ TQRect TQPlatinumStyle::querySubControlMetrics( ComplexControl control,
 
 /*!\reimp
  */
-int TQPlatinumStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags,
+int TQPlatinumStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags,
 				 const TQWidget *widget ) const
 {
     int ret;
@@ -1469,7 +1469,7 @@ int TQPlatinumStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData
 
 /*!\reimp
  */
-TQRect TQPlatinumStyle::subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+TQRect TQPlatinumStyle::subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
     TQRect rect;
     switch ( r ) {
diff --git a/src/styles/qsgistyle.cpp b/src/styles/qsgistyle.cpp
index aa00c57f0..aa88a6c95 100644
--- a/src/styles/qsgistyle.cpp
+++ b/src/styles/qsgistyle.cpp
@@ -136,7 +136,7 @@ TQSGIStyle::~TQSGIStyle()
     bold italic font for menu options.
 */
 void
-TQSGIStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+TQSGIStyle::applicationPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
     isApplicationStyle = 1;
     TQMotifStyle::polish( ceData, elementFlags, ptr );
@@ -181,7 +181,7 @@ TQSGIStyle::applicationPolish( TQStyleControlElementData ceData, ControlElementF
 /*! \reimp
 */
 void
-TQSGIStyle::applicationUnPolish( TQStyleControlElementData, ControlElementFlags, void * )
+TQSGIStyle::applicationUnPolish( const TQStyleControlElementData&, ControlElementFlags, void * )
 {
     TQFont f = TQApplication::font();
     TQApplication::setFont( f, TRUE ); // get rid of the special fonts for special widget classes
@@ -194,7 +194,7 @@ TQSGIStyle::applicationUnPolish( TQStyleControlElementData, ControlElementFlags,
     hovering.
 */
 void
-TQSGIStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+TQSGIStyle::polish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
     TQMotifStyle::polish(ceData, elementFlags, ptr);
 
@@ -269,7 +269,7 @@ TQSGIStyle::polish( TQStyleControlElementData ceData, ControlElementFlags elemen
 
 /*! \reimp */
 void
-TQSGIStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+TQSGIStyle::unPolish( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
     if ( (ceData.widgetObjectTypes.contains("TQButton")) || (ceData.widgetObjectTypes.contains("TQSlider")) || (ceData.widgetObjectTypes.contains("TQScrollBar")) ) {
         removeObjectEventHandler(ceData, elementFlags, ptr, this);
@@ -286,7 +286,7 @@ TQSGIStyle::unPolish( TQStyleControlElementData ceData, ControlElementFlags elem
 }
 
 /*! \reimp */
-bool TQSGIStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e )
+bool TQSGIStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e )
 {
     if ( (!(ceData.widgetObjectTypes.contains("TQWidget"))) || (e->type() == TQEvent::Paint) )
 	return TQMotifStyle::objectEventHandler( ceData, elementFlags, source, e );
@@ -375,7 +375,7 @@ static const int sgiTabSpacing 		= 12;   // space between text and tab
 static const int sgiCheckMarkSpace      = 20;
 
 /*! \reimp */
-int TQSGIStyle::pixelMetric( PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+int TQSGIStyle::pixelMetric( PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
     switch ( metric ) {
     case PM_DefaultFrameWidth:
@@ -560,7 +560,7 @@ static void get_combo_parameters( const TQRect &r,
 /*! \reimp */
 void TQSGIStyle::drawPrimitive( PrimitiveElement pe,
 		    TQPainter *p,
-		    TQStyleControlElementData ceData,
+		    const TQStyleControlElementData &ceData,
 		    ControlElementFlags elementFlags,
 		    const TQRect &r,
 		    const TQColorGroup &cg,
@@ -943,7 +943,7 @@ void TQSGIStyle::drawPrimitive( PrimitiveElement pe,
 /*! \reimp */
 void TQSGIStyle::drawControl( ControlElement element,
 		  TQPainter *p,
-		  TQStyleControlElementData ceData,
+		  const TQStyleControlElementData &ceData,
 		  ControlElementFlags elementFlags,
 		  const TQRect &r,
 		  const TQColorGroup &cg,
@@ -1186,7 +1186,7 @@ void TQSGIStyle::drawControl( ControlElement element,
 /*! \reimp */
 void TQSGIStyle::drawComplexControl( ComplexControl control,
 			 TQPainter *p,
-			 TQStyleControlElementData ceData,
+			 const TQStyleControlElementData &ceData,
 			 ControlElementFlags elementFlags,
 			 const TQRect& r,
 			 const TQColorGroup& cg,
@@ -1407,7 +1407,7 @@ void TQSGIStyle::drawComplexControl( ComplexControl control,
 /*!\reimp
 */
 TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
-				     TQStyleControlElementData ceData,
+				     const TQStyleControlElementData &ceData,
 				     ControlElementFlags elementFlags,
 				     const TQSize &contentsSize,
 				     const TQStyleOption& opt,
@@ -1447,7 +1447,7 @@ TQSize TQSGIStyle::sizeFromContents( ContentsType contents,
 }
 
 /*! \reimp */
-TQRect TQSGIStyle::subRect( SubRect r, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
+TQRect TQSGIStyle::subRect( SubRect r, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget ) const
 {
     TQRect rect;
 
@@ -1472,7 +1472,7 @@ TQRect TQSGIStyle::subRect( SubRect r, TQStyleControlElementData ceData, Control
 
 /*! \reimp */
 TQRect TQSGIStyle::querySubControlMetrics( ComplexControl control,
-					   TQStyleControlElementData ceData,
+					   const TQStyleControlElementData &ceData,
 					   ControlElementFlags elementFlags,
 					   SubControl sub,
 					   const TQStyleOption& opt,
@@ -1512,7 +1512,7 @@ TQRect TQSGIStyle::querySubControlMetrics( ComplexControl control,
 }
 
 /*! \reimp */
-int TQSGIStyle::styleHint(StyleHint sh, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
+int TQSGIStyle::styleHint(StyleHint sh, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQStyleOption &opt, TQStyleHintReturn *returnData, const TQWidget *w) const
 {
 	int ret;
 
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index 1c049b0d8..e7de564d2 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -95,7 +95,7 @@ class TQWindowsStyle::Private : public TQObject
 public:
     Private(TQWindowsStyle *parent);
 
-    bool objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
+    bool objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e );
 
 private:
     int menuBarTimer;
@@ -107,7 +107,7 @@ TQWindowsStyle::Private::Private(TQWindowsStyle *parent)
 }
 
 // Records Alt- and Focus events
-bool TQWindowsStyle::Private::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags, void* source, TQEvent *e )
+bool TQWindowsStyle::Private::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags, void* source, TQEvent *e )
 {
     if (!(ceData.widgetObjectTypes.contains("TQWidget"))) {
 	return TRUE;
@@ -173,7 +173,7 @@ TQWindowsStyle::~TQWindowsStyle()
 }
 
 /*! \reimp */
-bool TQWindowsStyle::objectEventHandler( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) {
+bool TQWindowsStyle::objectEventHandler( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, TQEvent *e ) {
     if (d) {
         return d->objectEventHandler(ceData, elementFlags, source, e);
     }
@@ -181,7 +181,7 @@ bool TQWindowsStyle::objectEventHandler( TQStyleControlElementData ceData, Contr
 }
 
 /*! \reimp */
-void TQWindowsStyle::applicationPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQWindowsStyle::applicationPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     // We only need the overhead when shortcuts are sometimes hidden
     if (styleHint(SH_UnderlineAccelerator, TQStyleControlElementData(), CEF_None, 0) && styleHint(SH_HideUnderlineAcceleratorWhenAltUp, TQStyleControlElementData(), CEF_None, 0)) {
@@ -191,20 +191,20 @@ void TQWindowsStyle::applicationPolish(TQStyleControlElementData ceData, Control
 }
 
 /*! \reimp */
-void TQWindowsStyle::applicationUnPolish(TQStyleControlElementData, ControlElementFlags, void *)
+void TQWindowsStyle::applicationUnPolish(const TQStyleControlElementData&, ControlElementFlags, void *)
 {
     delete d;
     d = 0;
 }
 
 /*! \reimp */
-void TQWindowsStyle::polish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQWindowsStyle::polish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     TQCommonStyle::polish(ceData, elementFlags, ptr);
 }
 
 /*! \reimp */
-void TQWindowsStyle::unPolish(TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr)
+void TQWindowsStyle::unPolish(const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr)
 {
     TQCommonStyle::polish(ceData, elementFlags, ptr);
 }
@@ -218,7 +218,7 @@ void TQWindowsStyle::polish( TQPalette &pal )
 /*! \reimp */
 void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
 				   TQPainter *p,
-				   TQStyleControlElementData ceData,
+				   const TQStyleControlElementData &ceData,
 				   ControlElementFlags elementFlags,
 				   const TQRect &r,
 				   const TQColorGroup &cg,
@@ -688,7 +688,7 @@ void TQWindowsStyle::drawPrimitive( PrimitiveElement pe,
 */
 void TQWindowsStyle::drawControl( ControlElement element,
 				 TQPainter *p,
-				 TQStyleControlElementData ceData,
+				 const TQStyleControlElementData &ceData,
 				 ControlElementFlags elementFlags,
 				 const TQRect &r,
 				 const TQColorGroup &cg,
@@ -1019,7 +1019,7 @@ void TQWindowsStyle::drawControl( ControlElement element,
 /*!
   \reimp
 */
-int TQWindowsStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
+int TQWindowsStyle::pixelMetric(PixelMetric metric, const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     int ret;
 
@@ -1096,7 +1096,7 @@ int TQWindowsStyle::pixelMetric(PixelMetric metric, TQStyleControlElementData ce
   \reimp
 */
 TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
-				       TQStyleControlElementData ceData,
+				       const TQStyleControlElementData &ceData,
 				       ControlElementFlags elementFlags,
 				       const TQSize &contentsSize,
 				       const TQStyleOption& opt,
@@ -1196,7 +1196,7 @@ TQSize TQWindowsStyle::sizeFromContents( ContentsType contents,
 
 /*! \reimp
 */
-void TQWindowsStyle::polishPopupMenu( TQStyleControlElementData ceData, ControlElementFlags elementFlags, void *ptr )
+void TQWindowsStyle::polishPopupMenu( const TQStyleControlElementData &ceData, ControlElementFlags elementFlags, void *ptr )
 {
 #ifndef QT_NO_POPUPMENU
     if ( !(ceData.windowState & WState_Polished ) ) {
@@ -1488,7 +1488,7 @@ static const char *const question_xpm[] = {
  \reimp
  */
 TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
-				   TQStyleControlElementData ceData,
+				   const TQStyleControlElementData &ceData,
 				   ControlElementFlags elementFlags,
 				   const TQStyleOption& opt,
 				   const TQWidget *widget) const
@@ -1527,7 +1527,7 @@ TQPixmap TQWindowsStyle::stylePixmap(StylePixmap stylepixmap,
 /*!\reimp
 */
 void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
-					TQStyleControlElementData ceData,
+					const TQStyleControlElementData &ceData,
 					ControlElementFlags elementFlags,
 					const TQRect &r,
 					const TQColorGroup &cg,
@@ -1975,7 +1975,7 @@ void TQWindowsStyle::drawComplexControl( ComplexControl ctrl, TQPainter *p,
 
 /*! \reimp */
 int TQWindowsStyle::styleHint( StyleHint hint,
-			      TQStyleControlElementData ceData,
+			      const TQStyleControlElementData &ceData,
 			      ControlElementFlags elementFlags,
 			      const TQStyleOption &opt,
 			      TQStyleHintReturn *returnData,
@@ -2032,7 +2032,7 @@ int TQWindowsStyle::styleHint( StyleHint hint,
 }
 
 /*! \reimp */
-TQRect TQWindowsStyle::subRect(SubRect r, const TQStyleControlElementData ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
+TQRect TQWindowsStyle::subRect(SubRect r, const TQStyleControlElementData &ceData, const ControlElementFlags elementFlags, const TQWidget *widget) const
 {
     TQRect rect;