TDE
/
qt3
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/qt3
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove deprecation attributes from style functions, as they prevent smoke from functioning properly

Browse Source
pull/2/head
Timothy Pearson 12 years ago
parent 846bcc1a23
commit 47132557a4
2 changed files with 13 additions and 67 deletions
Show Stats Download Patch File Download Diff File

54
src/kernel/qstyle.h
Unescape View File

@ -52,9 +52,6 @@
#ifndef QT_NO_STYLE
/* DEV ONLY */
/* #define MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED 1 */
class QPopupMenu;
class QStylePrivate;
class QMenuItem;
@ -301,9 +298,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void polish( QWidget * );
// New API
@ -311,9 +305,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void unPolish( QWidget * );
// New API
@ -321,9 +312,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void polish( QApplication * );
// New API
@ -331,9 +319,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void unPolish( QApplication * );
// New API
@ -455,9 +440,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void drawPrimitive( PrimitiveElement pe,
QPainter *p,
const QRect &r,
@ -512,9 +494,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void drawControl( ControlElement element,
QPainter *p,
const QWidget *widget,
@ -536,9 +515,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void drawControlMask( ControlElement element,
QPainter *p,
const QWidget *widget,
@ -596,9 +572,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual QRect subRect( SubRect r, const QWidget *widget ) const = 0;
// New API
@ -668,9 +641,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void drawComplexControl( ComplexControl control,
QPainter *p,
const QWidget *widget,
@ -703,9 +673,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual void drawComplexControlMask( ComplexControl control,
QPainter *p,
const QWidget *widget,
@ -723,9 +690,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual QRect querySubControlMetrics( ComplexControl control,
const QWidget *widget,
SubControl sc,
@ -741,9 +705,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual SubControl querySubControl( ComplexControl control,
const QWidget *widget,
const QPoint &pos,
@ -828,9 +789,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual int pixelMetric( PixelMetric metric,
const QWidget *widget = 0 ) const = 0;
@ -867,9 +825,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual QSize sizeFromContents( ContentsType contents,
const QWidget *widget,
const QSize &contentsSize,
@ -1033,9 +988,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual int styleHint( StyleHint stylehint,
const QWidget *widget = 0,
const QStyleOption& = QStyleOption::Default,
@ -1071,9 +1023,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
virtual QPixmap stylePixmap( StylePixmap stylepixmap,
const QWidget *widget = 0,
const QStyleOption& = QStyleOption::Default ) const = 0;
@ -1087,9 +1036,6 @@ public:
// Old API
// DEPRECATED
#ifdef MARK_OLD_VIRTUAL_STYLE_API_CALLS_DEPRECATED
__attribute__ ((deprecated))
#endif
static QRect visualRect( const QRect &logical, const QWidget *w );
// New API

26
src/styles/qcommonstyle.h
Unescape View File

@ -57,7 +57,7 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) void drawPrimitive( PrimitiveElement pe,
void drawPrimitive( PrimitiveElement pe,
QPainter *p,
const QRect &r,
const QColorGroup &cg,
@ -76,7 +76,7 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) void drawControl( ControlElement element,
void drawControl( ControlElement element,
QPainter *p,
const QWidget *widget,
const QRect &r,
@ -97,7 +97,7 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) void drawControlMask( ControlElement element,
void drawControlMask( ControlElement element,
QPainter *p,
const QWidget *widget,
const QRect &r,
@ -114,14 +114,14 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) QRect subRect( SubRect r, const QWidget *widget ) const;
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
__attribute__ ((deprecated)) void drawComplexControl( ComplexControl control,
void drawComplexControl( ComplexControl control,
QPainter *p,
const QWidget *widget,
const QRect &r,
@ -152,9 +152,9 @@ public:
const QStyleOption& = QStyleOption::Default,
const QWidget *widget = 0 ) const;
// Old API
// Old API
// DEPRECATED
__attribute__ ((deprecated)) void drawComplexControlMask( ComplexControl control,
void drawComplexControlMask( ComplexControl control,
QPainter *p,
const QWidget *widget,
const QRect &r,
@ -171,7 +171,7 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) QRect querySubControlMetrics( ComplexControl control,
QRect querySubControlMetrics( ComplexControl control,
const QWidget *widget,
SubControl sc,
const QStyleOption& = QStyleOption::Default ) const;
@ -186,7 +186,7 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) SubControl querySubControl( ComplexControl control,
SubControl querySubControl( ComplexControl control,
const QWidget *widget,
const QPoint &pos,
const QStyleOption& = QStyleOption::Default ) const;
@ -201,14 +201,14 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) int pixelMetric( PixelMetric m, const QWidget *widget = 0 ) const;
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
__attribute__ ((deprecated)) QSize sizeFromContents( ContentsType s,
QSize sizeFromContents( ContentsType s,
const QWidget *widget,
const QSize &contentsSize,
const QStyleOption& = QStyleOption::Default ) const;
@ -223,14 +223,14 @@ public:
// Old API
// DEPRECATED
__attribute__ ((deprecated)) int styleHint(StyleHint sh, const QWidget *, const QStyleOption &, QStyleHintReturn *) const;
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
__attribute__ ((deprecated)) QPixmap stylePixmap( StylePixmap sp,
QPixmap stylePixmap( StylePixmap sp,
const QWidget *widget = 0,
const QStyleOption& = QStyleOption::Default ) const;

Write Preview
Loading…
Cancel
Save