diff options
| author | Darrell Anderson <[email protected]> | 2012-08-08 15:38:38 -0500 |
|---|---|---|
| committer | Darrell Anderson <[email protected]> | 2012-08-08 15:38:38 -0500 |
| commit | a236ea2ad383387255621fc8eaddc3c5d17f1e30 (patch) | |
| tree | ecacdf1f8c9c02f545e06f8a430a145998fe11ea /src/styles/qcdestyle.h | |
| parent | 92b8aca467ad650f9b77a5b6a0f56c27ecbfe80a (diff) | |
| parent | 47132557a4c58d4ad69bc2898bb2bd9c424b3b64 (diff) | |
| download | qt3-a236ea2ad383387255621fc8eaddc3c5d17f1e30.tar.gz qt3-a236ea2ad383387255621fc8eaddc3c5d17f1e30.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/styles/qcdestyle.h')
| -rw-r--r-- | src/styles/qcdestyle.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/styles/qcdestyle.h b/src/styles/qcdestyle.h index a94f620..3dee332 100644 --- a/src/styles/qcdestyle.h +++ b/src/styles/qcdestyle.h @@ -62,18 +62,22 @@ public: QCDEStyle( bool useHighlightCols = FALSE ); virtual ~QCDEStyle(); - int pixelMetric( PixelMetric metric, const QWidget *widget = 0 ) const; + int pixelMetric( PixelMetric metric, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; void drawControl( ControlElement element, QPainter *p, - const QWidget *widget, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags how = Style_Default, - const QStyleOption& = QStyleOption::Default ) const; + const QStyleOption& = QStyleOption::Default, + const QWidget *widget = 0 ) const; void drawPrimitive( PrimitiveElement pe, QPainter *p, + QStyleControlElementData ceData, + ControlElementFlags elementFlags, const QRect &r, const QColorGroup &cg, SFlags flags = Style_Default, |