diff options
author | Alexander Volkov <a.volkov@rusbitech.ru> | 2016-10-08 22:32:49 +0300 |
---|---|---|
committer | J-P Nurmi <jpnurmi@qt.io> | 2016-10-21 21:51:15 +0000 |
commit | ee567fa93bfc0e2aa3e5432f7c5f1ed0d08b24a2 (patch) | |
tree | 4a48225d2a6f3edf0a3e115b7d9be9faa08f4141 /src | |
parent | 31d53bdec6c3183ea72d7636b2fcf058a4aca536 (diff) |
Add Q_DECL_OVERRIDE
Change-Id: Ic2c19bb404ea829d3187fa88b0a98141fb0305ea
Reviewed-by: J-P Nurmi <jpnurmi@qt.io>
Diffstat (limited to 'src')
-rw-r--r-- | src/plugins/styles/bb10style/qbb10brightstyle.h | 10 | ||||
-rw-r--r-- | src/plugins/styles/bb10style/qbb10darkstyle.h | 10 | ||||
-rw-r--r-- | src/plugins/styles/bb10style/qbb10styleplugin.h | 2 | ||||
-rw-r--r-- | src/plugins/styles/cleanlooks/qcleanlooksstyle.h | 46 | ||||
-rw-r--r-- | src/plugins/styles/motif/qcdestyle.h | 10 | ||||
-rw-r--r-- | src/plugins/styles/motif/qmotifstyle.h | 38 | ||||
-rw-r--r-- | src/plugins/styles/plastique/qplastiquestyle.h | 40 |
7 files changed, 78 insertions, 78 deletions
diff --git a/src/plugins/styles/bb10style/qbb10brightstyle.h b/src/plugins/styles/bb10style/qbb10brightstyle.h index 0a4b91d..d9a00be 100644 --- a/src/plugins/styles/bb10style/qbb10brightstyle.h +++ b/src/plugins/styles/bb10style/qbb10brightstyle.h @@ -46,15 +46,15 @@ public: QBB10BrightStyle(); ~QBB10BrightStyle(); - void polish(QApplication *application); - void polish(QWidget *widget); + void polish(QApplication *application) Q_DECL_OVERRIDE; + void polish(QWidget *widget) Q_DECL_OVERRIDE; - QPalette standardPalette() const; + QPalette standardPalette() const Q_DECL_OVERRIDE; void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const; + QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget) const; + QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; }; QT_END_NAMESPACE diff --git a/src/plugins/styles/bb10style/qbb10darkstyle.h b/src/plugins/styles/bb10style/qbb10darkstyle.h index 8008152..cd75b94 100644 --- a/src/plugins/styles/bb10style/qbb10darkstyle.h +++ b/src/plugins/styles/bb10style/qbb10darkstyle.h @@ -46,15 +46,15 @@ public: QBB10DarkStyle(); ~QBB10DarkStyle(); - void polish(QApplication *application); - void polish(QWidget *widget); + void polish(QApplication *application) Q_DECL_OVERRIDE; + void polish(QWidget *widget) Q_DECL_OVERRIDE; - QPalette standardPalette() const; + QPalette standardPalette() const Q_DECL_OVERRIDE; void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const; + QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget) const; + QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; }; QT_END_NAMESPACE diff --git a/src/plugins/styles/bb10style/qbb10styleplugin.h b/src/plugins/styles/bb10style/qbb10styleplugin.h index 8058e48..e013926 100644 --- a/src/plugins/styles/bb10style/qbb10styleplugin.h +++ b/src/plugins/styles/bb10style/qbb10styleplugin.h @@ -47,7 +47,7 @@ public: QBB10StylePlugin(); ~QBB10StylePlugin(); - QStyle *create(const QString &key); + QStyle *create(const QString &key) Q_DECL_OVERRIDE; QStringList keys() const; }; diff --git a/src/plugins/styles/cleanlooks/qcleanlooksstyle.h b/src/plugins/styles/cleanlooks/qcleanlooksstyle.h index f93f063..76023bf 100644 --- a/src/plugins/styles/cleanlooks/qcleanlooksstyle.h +++ b/src/plugins/styles/cleanlooks/qcleanlooksstyle.h @@ -59,46 +59,46 @@ public: QCleanlooksStyle(); ~QCleanlooksStyle(); - QPalette standardPalette () const; + QPalette standardPalette () const Q_DECL_OVERRIDE; void drawPrimitive(PrimitiveElement elem, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const; + QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter, - const QWidget *widget) const; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const; + const QWidget *widget) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget) const; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const; + QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &size, const QWidget *widget) const; + const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const; + const QPoint &pt, const QWidget *w = 0) const Q_DECL_OVERRIDE; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget) const; + SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *opt) const; + const QStyleOption *opt) const Q_DECL_OVERRIDE; int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const; - QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const; + QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; + QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const Q_DECL_OVERRIDE; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawItemPixmap(QPainter *painter, const QRect &rect, - int alignment, const QPixmap &pixmap) const; + int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled, - const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const; - void polish(QWidget *widget); - void polish(QApplication *app); - void polish(QPalette &pal); - void unpolish(QWidget *widget); - void unpolish(QApplication *app); + const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; + void polish(QWidget *widget) Q_DECL_OVERRIDE; + void polish(QApplication *app) Q_DECL_OVERRIDE; + void polish(QPalette &pal) Q_DECL_OVERRIDE; + void unpolish(QWidget *widget) Q_DECL_OVERRIDE; + void unpolish(QApplication *app) Q_DECL_OVERRIDE; protected: - void timerEvent(QTimerEvent *); - bool eventFilter(QObject *o, QEvent *e); + void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; void startProgressAnimation(QObject *o, QProgressBar *bar); void stopProgressAnimation(QObject *o, QProgressBar *bar); diff --git a/src/plugins/styles/motif/qcdestyle.h b/src/plugins/styles/motif/qcdestyle.h index 90188ed..19d1f35 100644 --- a/src/plugins/styles/motif/qcdestyle.h +++ b/src/plugins/styles/motif/qcdestyle.h @@ -57,14 +57,14 @@ public: virtual ~QCDEStyle(); int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = 0) const Q_DECL_OVERRIDE; void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; - QPalette standardPalette() const; + const QWidget *w = 0) const Q_DECL_OVERRIDE; + QPalette standardPalette() const Q_DECL_OVERRIDE; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; }; QT_END_NAMESPACE diff --git a/src/plugins/styles/motif/qmotifstyle.h b/src/plugins/styles/motif/qmotifstyle.h index 218b18d..a19d015 100644 --- a/src/plugins/styles/motif/qmotifstyle.h +++ b/src/plugins/styles/motif/qmotifstyle.h @@ -65,47 +65,47 @@ public: void setUseHighlightColors(bool); bool useHighlightColors() const; - void polish(QPalette&); - void polish(QWidget*); - void unpolish(QWidget*); - void polish(QApplication*); - void unpolish(QApplication*); + void polish(QPalette&) Q_DECL_OVERRIDE; + void polish(QWidget*) Q_DECL_OVERRIDE; + void unpolish(QWidget*) Q_DECL_OVERRIDE; + void polish(QApplication*) Q_DECL_OVERRIDE; + void unpolish(QApplication*) Q_DECL_OVERRIDE; void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = 0) const Q_DECL_OVERRIDE; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = 0) const Q_DECL_OVERRIDE; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const; + const QWidget *w = 0) const Q_DECL_OVERRIDE; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget = 0) const; + SubControl sc, const QWidget *widget = 0) const Q_DECL_OVERRIDE; int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = 0) const; + const QSize &contentsSize, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const; + QRect subElementRect(SubElement r, const QStyleOption *opt,const QWidget *widget = 0) const Q_DECL_OVERRIDE; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const; + QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; - bool event(QEvent *); - QPalette standardPalette() const; + bool event(QEvent *) Q_DECL_OVERRIDE; + QPalette standardPalette() const Q_DECL_OVERRIDE; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; protected: QPointer<QFocusFrame> focus; - void timerEvent(QTimerEvent *event); - bool eventFilter(QObject *o, QEvent *e); + void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; private: bool highlightCols; diff --git a/src/plugins/styles/plastique/qplastiquestyle.h b/src/plugins/styles/plastique/qplastiquestyle.h index 3cd7c90..4ed6a4e 100644 --- a/src/plugins/styles/plastique/qplastiquestyle.h +++ b/src/plugins/styles/plastique/qplastiquestyle.h @@ -60,47 +60,47 @@ public: ~QPlastiqueStyle(); void drawPrimitive(PrimitiveElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const; + QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget) const; + QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget) const; + QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &size, const QWidget *widget) const; + const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const; + QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget) const; + SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const; + QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, - const QPoint &pos, const QWidget *widget = 0) const; + const QPoint &pos, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; - void polish(QWidget *widget); - void polish(QApplication *app); - void polish(QPalette &pal); - void unpolish(QWidget *widget); - void unpolish(QApplication *app); + void polish(QWidget *widget) Q_DECL_OVERRIDE; + void polish(QApplication *app) Q_DECL_OVERRIDE; + void polish(QPalette &pal) Q_DECL_OVERRIDE; + void unpolish(QWidget *widget) Q_DECL_OVERRIDE; + void unpolish(QApplication *app) Q_DECL_OVERRIDE; - QPalette standardPalette() const; + QPalette standardPalette() const Q_DECL_OVERRIDE; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const; + const QWidget *widget = 0) const Q_DECL_OVERRIDE; protected: - bool eventFilter(QObject *watched, QEvent *event); - void timerEvent(QTimerEvent *event); + bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; private: int animateStep; |