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

1 files changed, 14 insertions, 14 deletions

diff --git a/src/styles/qwindowsstyle.h b/src/styles/qwindowsstyle.h
index 4ffc849..2cb3283 100644
--- a/src/styles/qwindowsstyle.h
+++ b/src/styles/qwindowsstyle.h
@@ -61,20 +61,20 @@ public:
     QWindowsStyle();
     ~QWindowsStyle();
 
-    void applicationPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
-    void applicationUnPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void applicationPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+    void applicationUnPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
-    void polish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
-    void unPolish(QStyleControlElementData ceData, ControlElementFlags elementFlags, void *);
+    void polish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
+    void unPolish(const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void *);
 
     void polish( QPalette & );
 
-    virtual void polishPopupMenu( QStyleControlElementData ceData, ControlElementFlags elementFlags, void * );
+    virtual void polishPopupMenu( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void * );
 
     // new stuff
     void drawPrimitive( PrimitiveElement pe,
 			QPainter *p,
-			QStyleControlElementData ceData,
+			const QStyleControlElementData &ceData,
 			ControlElementFlags elementFlags,
 			const QRect &r,
 			const QColorGroup &cg,
@@ -83,7 +83,7 @@ public:
 
     void drawControl( ControlElement element,
 		      QPainter *p,
-		      QStyleControlElementData ceData,
+		      const QStyleControlElementData &ceData,
 		      ControlElementFlags elementFlags,
 		      const QRect &r,
 		      const QColorGroup &cg,
@@ -93,7 +93,7 @@ public:
 
     void drawComplexControl( ComplexControl control,
 			     QPainter* p,
-			     QStyleControlElementData ceData,
+			     const QStyleControlElementData &ceData,
 			     ControlElementFlags elementFlags,
 			     const QRect& r,
 			     const QColorGroup& cg,
@@ -108,29 +108,29 @@ public:
 			     const QWidget* widget = 0 ) const;
 
     int pixelMetric( PixelMetric metric,
-		     QStyleControlElementData ceData,
+		     const QStyleControlElementData &ceData,
 		     ControlElementFlags elementFlags,
 		     const QWidget *widget = 0 ) const;
 
     QSize sizeFromContents( ContentsType contents,
-			    QStyleControlElementData ceData,
+			    const QStyleControlElementData &ceData,
 			    ControlElementFlags elementFlags,
 			    const QSize &contentsSize,
 			    const QStyleOption& = QStyleOption::Default,
 			    const QWidget *widget = 0 ) const;
 
-    int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
+    int styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption & = QStyleOption::Default,
 		  QStyleHintReturn* = 0, const QWidget* = 0) const;
 
     QPixmap stylePixmap( StylePixmap stylepixmap,
-			 QStyleControlElementData ceData,
+			 const QStyleControlElementData &ceData,
 			 ControlElementFlags elementFlags,
 			 const QStyleOption& = QStyleOption::Default,
 			 const QWidget *widget = 0 ) const;
 
-    QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
+    QRect subRect( SubRect r, const QStyleControlElementData &ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const;
 
-    bool objectEventHandler( QStyleControlElementData ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
+    bool objectEventHandler( const QStyleControlElementData &ceData, ControlElementFlags elementFlags, void* source, QEvent *e );
 
 private:
     class Private;