summaryrefslogtreecommitdiffstats
path: root/examples/widgets/mainwindows/mainwindow
diff options
context:
space:
mode:
Diffstat (limited to 'examples/widgets/mainwindows/mainwindow')
-rw-r--r--examples/widgets/mainwindows/mainwindow/colorswatch.cpp6
-rw-r--r--examples/widgets/mainwindows/mainwindow/colorswatch.h12
-rw-r--r--examples/widgets/mainwindows/mainwindow/mainwindow.h2
-rw-r--r--examples/widgets/mainwindows/mainwindow/toolbar.h4
4 files changed, 12 insertions, 12 deletions
diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
index b39c45118c..e481a71409 100644
--- a/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
+++ b/examples/widgets/mainwindows/mainwindow/colorswatch.cpp
@@ -101,8 +101,8 @@ class ColorDock : public QFrame
public:
ColorDock(const QString &c, QWidget *parent);
- virtual QSize sizeHint() const;
- virtual QSize minimumSizeHint() const;
+ virtual QSize sizeHint() const Q_DECL_OVERRIDE;
+ virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE;
void setCustomSizeHint(const QSize &size);
@@ -110,7 +110,7 @@ public slots:
void changeSizeHints();
protected:
- void paintEvent(QPaintEvent *);
+ void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE;
QString color;
QSize szHint, minSzHint;
};
diff --git a/examples/widgets/mainwindows/mainwindow/colorswatch.h b/examples/widgets/mainwindows/mainwindow/colorswatch.h
index b83a6ba76a..73f3fbdaa6 100644
--- a/examples/widgets/mainwindows/mainwindow/colorswatch.h
+++ b/examples/widgets/mainwindows/mainwindow/colorswatch.h
@@ -85,8 +85,8 @@ public:
void setCustomSizeHint(const QSize &size);
protected:
- virtual void contextMenuEvent(QContextMenuEvent *event);
- virtual void resizeEvent(QResizeEvent *e);
+ virtual void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE;
+ virtual void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE;
private:
void allow(Qt::DockWidgetArea area, bool allow);
@@ -120,11 +120,11 @@ class BlueTitleBar : public QWidget
public:
BlueTitleBar(QWidget *parent = 0);
- QSize sizeHint() const { return minimumSizeHint(); }
- QSize minimumSizeHint() const;
+ QSize sizeHint() const Q_DECL_OVERRIDE { return minimumSizeHint(); }
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE;
protected:
- void paintEvent(QPaintEvent *event);
- void mouseReleaseEvent(QMouseEvent *event);
+ void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE;
+ void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE;
public slots:
void updateMask();
diff --git a/examples/widgets/mainwindows/mainwindow/mainwindow.h b/examples/widgets/mainwindows/mainwindow/mainwindow.h
index 4f8b65ab3a..d61cd4e267 100644
--- a/examples/widgets/mainwindows/mainwindow/mainwindow.h
+++ b/examples/widgets/mainwindows/mainwindow/mainwindow.h
@@ -67,7 +67,7 @@ public:
QWidget *parent = 0, Qt::WindowFlags flags = 0);
protected:
- void showEvent(QShowEvent *event);
+ void showEvent(QShowEvent *event) Q_DECL_OVERRIDE;
public slots:
void actionTriggered(QAction *action);
diff --git a/examples/widgets/mainwindows/mainwindow/toolbar.h b/examples/widgets/mainwindows/mainwindow/toolbar.h
index 1060e32ce1..b773227eac 100644
--- a/examples/widgets/mainwindows/mainwindow/toolbar.h
+++ b/examples/widgets/mainwindows/mainwindow/toolbar.h
@@ -84,8 +84,8 @@ public:
QMenu *menu;
protected:
- void enterEvent(QEvent*);
- void leaveEvent(QEvent*);
+ void enterEvent(QEvent*) Q_DECL_OVERRIDE;
+ void leaveEvent(QEvent*) Q_DECL_OVERRIDE;
private:
void allow(Qt::ToolBarArea area, bool allow);