Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tqt3

1 files changed, 15 insertions, 14 deletions

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();
 }