diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 17:42:21 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-08-08 17:42:21 -0500 |
| commit | 8805afa8c607ac6028207434f78a7cd90a9df64b (patch) | |
| tree | 839aeaab6a6a79a4b4e04beabc65658354b179b1 /src/styles/qcommonstyle.h | |
| parent | 47132557a4c58d4ad69bc2898bb2bd9c424b3b64 (diff) | |
| download | qt3-8805afa8c607ac6028207434f78a7cd90a9df64b.tar.gz qt3-8805afa8c607ac6028207434f78a7cd90a9df64b.zip | |
Fix problems in prior style API changes
Diffstat (limited to 'src/styles/qcommonstyle.h')
| -rw-r--r-- | src/styles/qcommonstyle.h | 90 |
1 files changed, 0 insertions, 90 deletions
diff --git a/src/styles/qcommonstyle.h b/src/styles/qcommonstyle.h index e6378e6..c445740 100644 --- a/src/styles/qcommonstyle.h +++ b/src/styles/qcommonstyle.h @@ -55,15 +55,6 @@ public: QCommonStyle(); ~QCommonStyle(); - // Old API - // DEPRECATED - void drawPrimitive( PrimitiveElement pe, - QPainter *p, - const QRect &r, - const QColorGroup &cg, - SFlags flags = Style_Default, - const QStyleOption& = QStyleOption::Default ) const; - // New API void drawPrimitive( PrimitiveElement pe, QPainter *p, @@ -74,16 +65,6 @@ public: SFlags flags = Style_Default, const QStyleOption& = QStyleOption::Default ) const; - // Old API - // DEPRECATED - void drawControl( ControlElement element, - QPainter *p, - const QWidget *widget, - const QRect &r, - const QColorGroup &cg, - SFlags how = Style_Default, - const QStyleOption& = QStyleOption::Default ) const; - // New API void drawControl( ControlElement element, QPainter *p, @@ -95,14 +76,6 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - void drawControlMask( ControlElement element, - QPainter *p, - const QWidget *widget, - const QRect &r, - const QStyleOption& = QStyleOption::Default ) const; - // New API void drawControlMask( ControlElement element, QPainter *p, @@ -112,29 +85,9 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - QRect subRect( SubRect r, const QWidget *widget ) const; - // New API QRect subRect( SubRect r, const QStyleControlElementData ceData, const ControlElementFlags elementFlags, const QWidget *widget ) const; - // Old API - // DEPRECATED - void drawComplexControl( ComplexControl control, - QPainter *p, - const QWidget *widget, - const QRect &r, - const QColorGroup &cg, - SFlags how = Style_Default, -#ifdef Q_QDOC - SCFlags sub = SC_All, -#else - SCFlags sub = (uint)SC_All, -#endif - SCFlags subActive = SC_None, - const QStyleOption& = QStyleOption::Default ) const; - // New API void drawComplexControl( ComplexControl control, QPainter *p, @@ -152,14 +105,6 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - void drawComplexControlMask( ComplexControl control, - QPainter *p, - const QWidget *widget, - const QRect &r, - const QStyleOption& = QStyleOption::Default ) const; - // New API void drawComplexControlMask( ComplexControl control, QPainter *p, @@ -169,13 +114,6 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - QRect querySubControlMetrics( ComplexControl control, - const QWidget *widget, - SubControl sc, - const QStyleOption& = QStyleOption::Default ) const; - // New API QRect querySubControlMetrics( ComplexControl control, QStyleControlElementData ceData, @@ -184,13 +122,6 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - SubControl querySubControl( ComplexControl control, - const QWidget *widget, - const QPoint &pos, - const QStyleOption& = QStyleOption::Default ) const; - // New API SubControl querySubControl( ComplexControl control, QStyleControlElementData ceData, @@ -199,20 +130,9 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - int pixelMetric( PixelMetric m, const QWidget *widget = 0 ) const; - // New API int pixelMetric( PixelMetric m, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - QSize sizeFromContents( ContentsType s, - const QWidget *widget, - const QSize &contentsSize, - const QStyleOption& = QStyleOption::Default ) const; - // New API QSize sizeFromContents( ContentsType s, QStyleControlElementData ceData, @@ -221,19 +141,9 @@ public: const QStyleOption& = QStyleOption::Default, const QWidget *widget = 0 ) const; - // Old API - // DEPRECATED - int styleHint(StyleHint sh, const QWidget *, const QStyleOption &, QStyleHintReturn *) const; - // New API int styleHint(StyleHint sh, QStyleControlElementData ceData, ControlElementFlags elementFlags, const QStyleOption &, QStyleHintReturn *, const QWidget * w) const; - // Old API - // DEPRECATED - QPixmap stylePixmap( StylePixmap sp, - const QWidget *widget = 0, - const QStyleOption& = QStyleOption::Default ) const; - // New API QPixmap stylePixmap( StylePixmap sp, QStyleControlElementData ceData, |