diff options
| author | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-15 12:46:17 -0600 |
|---|---|---|
| committer | Darrell Anderson <humanreadable@yahoo.com> | 2012-11-15 12:46:17 -0600 |
| commit | c4fcfaa593835ff3568310c6937f47d69196f281 (patch) | |
| tree | d65fcc9cdf7182890ac0b3669be5f09c6968e6ce /src/styles/qcompactstyle.cpp | |
| parent | 6bcbe0a787127751122109caf4a3cd621e13004e (diff) | |
| parent | 5e04c37a6ce7a090adb9e6ea02a04761dea8a33e (diff) | |
| download | qt3-c4fcfaa593835ff3568310c6937f47d69196f281.tar.gz qt3-c4fcfaa593835ff3568310c6937f47d69196f281.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/styles/qcompactstyle.cpp')
| -rw-r--r-- | src/styles/qcompactstyle.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/styles/qcompactstyle.cpp b/src/styles/qcompactstyle.cpp index 63c5be5..e3236f2 100644 --- a/src/styles/qcompactstyle.cpp +++ b/src/styles/qcompactstyle.cpp @@ -55,7 +55,7 @@ QCompactStyle::QCompactStyle() } /*! \reimp */ -int QCompactStyle::pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget ) +int QCompactStyle::pixelMetric( PixelMetric metric, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QWidget *widget ) { int ret; switch ( metric ) { @@ -151,7 +151,7 @@ void drawPopupMenuItem( QPainter*, bool, } /*! \reimp */ -void QCompactStyle::drawControl( ControlElement element, QPainter *p, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QRect &r, +void QCompactStyle::drawControl( ControlElement element, QPainter *p, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &g, SFlags flags, const QStyleOption& opt, const QWidget *widget ) { switch ( element ) { @@ -312,7 +312,7 @@ void QCompactStyle::drawControl( ControlElement element, QPainter *p, QStyleCont /*! \reimp */ void QCompactStyle::drawPrimitive( PrimitiveElement pe, QPainter *p, - QStyleControlElementData ceData, + const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, @@ -368,7 +368,7 @@ void QCompactStyle::drawPrimitive( PrimitiveElement pe, } /*! \reimp */ -int QCompactStyle::styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &opt, QStyleHintReturn *returnData, const QWidget *w) const +int QCompactStyle::styleHint(StyleHint sh, const QStyleControlElementData &ceData, ControlElementFlags elementFlags, const QStyleOption &opt, QStyleHintReturn *returnData, const QWidget *w) const { int ret; |