summaryrefslogtreecommitdiff
path: root/examples
diff options
context:
space:
mode:
authorAlexander Volkov <a.volkov@rusbitech.ru>2016-12-02 02:02:02 +0300
committerAlexander Volkov <a.volkov@rusbitech.ru>2016-12-06 11:33:33 +0000
commit3538749faef918a52d4e186e98dd5bc8d829d287 (patch)
tree11f4fec10b9e1f2f84a86939860af40f1e9635a3 /examples
parent51ef7e2e9877fbcc8ac0f7dc4d2f17b767b7e765 (diff)
downloadqtsvg-3538749faef918a52d4e186e98dd5bc8d829d287.tar.gz
Examples: Add missing override and remove redundant virtual
Change-Id: I3292c8e35bdedeb42d9ca3b163587ead83236bf0 Reviewed-by: Edward Welbourne <edward.welbourne@qt.io> Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>
Diffstat (limited to 'examples')
-rw-r--r--examples/svg/draganddrop/delayedencoding/mimedata.h4
-rw-r--r--examples/svg/embedded/desktopservices/contenttab.h2
-rw-r--r--examples/svg/embedded/desktopservices/linktab.h6
-rw-r--r--examples/svg/embedded/fluidlauncher/fluidlauncher.h2
-rw-r--r--examples/svg/embedded/fluidlauncher/pictureflow.h14
-rw-r--r--examples/svg/embedded/fluidlauncher/slideshow.h14
-rw-r--r--examples/svg/embedded/weatherinfo/weatherinfo.cpp2
-rw-r--r--examples/svg/embeddedsvgviewer/embeddedsvgviewer.h8
-rw-r--r--examples/svg/network/bearercloud/bearercloud.h2
-rw-r--r--examples/svg/network/bearercloud/cloud.h10
-rw-r--r--examples/svg/network/bearercloud/main.cpp2
-rw-r--r--examples/svg/opengl/framebufferobject/glwidget.h12
-rw-r--r--examples/svg/richtext/textobject/svgtextobject.h4
-rw-r--r--examples/svg/svggenerator/displaywidget.h2
14 files changed, 42 insertions, 42 deletions
diff --git a/examples/svg/draganddrop/delayedencoding/mimedata.h b/examples/svg/draganddrop/delayedencoding/mimedata.h
index 9588ae8..70bc551 100644
--- a/examples/svg/draganddrop/delayedencoding/mimedata.h
+++ b/examples/svg/draganddrop/delayedencoding/mimedata.h
@@ -50,13 +50,13 @@ class MimeData : public QMimeData
public:
MimeData();
- QStringList formats() const;
+ QStringList formats() const override;
signals:
void dataRequested(const QString &mimeType) const;
protected:
- QVariant retrieveData(const QString &mimetype, QVariant::Type type) const;
+ QVariant retrieveData(const QString &mimetype, QVariant::Type type) const override;
};
//![0]
diff --git a/examples/svg/embedded/desktopservices/contenttab.h b/examples/svg/embedded/desktopservices/contenttab.h
index cda9f61..480376a 100644
--- a/examples/svg/embedded/desktopservices/contenttab.h
+++ b/examples/svg/embedded/desktopservices/contenttab.h
@@ -95,7 +95,7 @@ protected: // New Methods
virtual QUrl itemUrl(QListWidgetItem *item);
virtual void handleErrorInOpen(QListWidgetItem *item);
protected:
- void keyPressEvent(QKeyEvent *event);
+ void keyPressEvent(QKeyEvent *event) override;
public slots: // New Slots
virtual void openItem(QListWidgetItem *item);
diff --git a/examples/svg/embedded/desktopservices/linktab.h b/examples/svg/embedded/desktopservices/linktab.h
index cdd5ec1..b2f9c9c 100644
--- a/examples/svg/embedded/desktopservices/linktab.h
+++ b/examples/svg/embedded/desktopservices/linktab.h
@@ -78,9 +78,9 @@ public: // Constructors & Destructors
~LinkTab();
protected: // Derived Methods
- virtual void populateListWidget();
- virtual QUrl itemUrl(QListWidgetItem *item);
- virtual void handleErrorInOpen(QListWidgetItem *item);
+ void populateListWidget() override;
+ QUrl itemUrl(QListWidgetItem *item) override;
+ void handleErrorInOpen(QListWidgetItem *item) override;
private: // Used variables
QListWidgetItem *m_WebItem;
diff --git a/examples/svg/embedded/fluidlauncher/fluidlauncher.h b/examples/svg/embedded/fluidlauncher/fluidlauncher.h
index 051c723..5e3337c 100644
--- a/examples/svg/embedded/fluidlauncher/fluidlauncher.h
+++ b/examples/svg/embedded/fluidlauncher/fluidlauncher.h
@@ -75,7 +75,7 @@ public slots:
void demoFinished();
protected:
- void changeEvent(QEvent *event);
+ void changeEvent(QEvent *event) override;
private:
PictureFlow* pictureFlowWidget;
diff --git a/examples/svg/embedded/fluidlauncher/pictureflow.h b/examples/svg/embedded/fluidlauncher/pictureflow.h
index 8b2ae9c..b43857d 100644
--- a/examples/svg/embedded/fluidlauncher/pictureflow.h
+++ b/examples/svg/embedded/fluidlauncher/pictureflow.h
@@ -202,13 +202,13 @@ signals:
void inputReceived();
protected:
- void paintEvent(QPaintEvent *event);
- void keyPressEvent(QKeyEvent* event);
- void mouseMoveEvent(QMouseEvent* event);
- void mousePressEvent(QMouseEvent* event);
- void mouseReleaseEvent(QMouseEvent* event);
- void resizeEvent(QResizeEvent* event);
- void timerEvent(QTimerEvent* event);
+ void paintEvent(QPaintEvent *event) override;
+ void keyPressEvent(QKeyEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
+ void resizeEvent(QResizeEvent *event) override;
+ void timerEvent(QTimerEvent *event) override;
private:
PictureFlowPrivate* d;
diff --git a/examples/svg/embedded/fluidlauncher/slideshow.h b/examples/svg/embedded/fluidlauncher/slideshow.h
index db37e82..d5847e0 100644
--- a/examples/svg/embedded/fluidlauncher/slideshow.h
+++ b/examples/svg/embedded/fluidlauncher/slideshow.h
@@ -78,13 +78,13 @@ signals:
void inputReceived();
protected:
- void paintEvent(QPaintEvent *event);
- void keyPressEvent(QKeyEvent* event);
- void mouseMoveEvent(QMouseEvent* event);
- void mousePressEvent(QMouseEvent* event);
- void mouseReleaseEvent(QMouseEvent* event);
- void timerEvent(QTimerEvent* event);
- void showEvent(QShowEvent * event );
+ void paintEvent(QPaintEvent *event) override;
+ void keyPressEvent(QKeyEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void mouseReleaseEvent(QMouseEvent *event) override;
+ void timerEvent(QTimerEvent *event) override;
+ void showEvent(QShowEvent *event ) override;
private:
diff --git a/examples/svg/embedded/weatherinfo/weatherinfo.cpp b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
index 1da505c..b64d8ca 100644
--- a/examples/svg/embedded/weatherinfo/weatherinfo.cpp
+++ b/examples/svg/embedded/weatherinfo/weatherinfo.cpp
@@ -579,7 +579,7 @@ private:
}
- void resizeEvent(QResizeEvent *event) {
+ void resizeEvent(QResizeEvent *event) override {
Q_UNUSED(event);
layoutItems();
}
diff --git a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
index 9b2b741..3a7daec 100644
--- a/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
+++ b/examples/svg/embeddedsvgviewer/embeddedsvgviewer.h
@@ -64,10 +64,10 @@ class EmbeddedSvgViewer : public QWidget
Q_OBJECT
public:
EmbeddedSvgViewer(const QString& filePath);
- virtual void paintEvent(QPaintEvent *event);
- void mouseMoveEvent ( QMouseEvent * event );
- void mousePressEvent ( QMouseEvent * event );
- void resizeEvent ( QResizeEvent * event );
+ void paintEvent(QPaintEvent *event) override;
+ void mouseMoveEvent(QMouseEvent *event) override;
+ void mousePressEvent(QMouseEvent *event) override;
+ void resizeEvent(QResizeEvent *event) override;
public slots:
void setZoom(int); // 100 <= newZoom < 0
diff --git a/examples/svg/network/bearercloud/bearercloud.h b/examples/svg/network/bearercloud/bearercloud.h
index 551a2e5..0bc5d70 100644
--- a/examples/svg/network/bearercloud/bearercloud.h
+++ b/examples/svg/network/bearercloud/bearercloud.h
@@ -58,7 +58,7 @@ public:
void cloudMoved();
- void timerEvent(QTimerEvent *event);
+ void timerEvent(QTimerEvent *event) override;
private Q_SLOTS:
void configurationAdded(const QNetworkConfiguration &config);
diff --git a/examples/svg/network/bearercloud/cloud.h b/examples/svg/network/bearercloud/cloud.h
index 99af08c..1342945 100644
--- a/examples/svg/network/bearercloud/cloud.h
+++ b/examples/svg/network/bearercloud/cloud.h
@@ -59,7 +59,7 @@ public:
~Cloud();
enum { Type = UserType + 1 };
- int type() const { return Type; }
+ int type() const override { return Type; }
void setFinalScale(qreal factor);
void setDeleteAfterAnimation(bool deleteAfter);
@@ -67,14 +67,14 @@ public:
void calculateForces();
bool advance();
- QRectF boundingRect() const;
- void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *);
+ QRectF boundingRect() const override;
+ void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override;
static qreal getRadiusForState(QNetworkConfiguration::StateFlags state);
protected:
- QVariant itemChange(GraphicsItemChange change, const QVariant &value);
- void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event);
+ QVariant itemChange(GraphicsItemChange change, const QVariant &value) override;
+ void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override;
private Q_SLOTS:
void stateChanged(QNetworkSession::State state);
diff --git a/examples/svg/network/bearercloud/main.cpp b/examples/svg/network/bearercloud/main.cpp
index a06b4ea..c5ca98c 100644
--- a/examples/svg/network/bearercloud/main.cpp
+++ b/examples/svg/network/bearercloud/main.cpp
@@ -52,7 +52,7 @@ public:
~CloudView() { }
protected:
- void resizeEvent(QResizeEvent *) {
+ void resizeEvent(QResizeEvent *) override {
fitInView(sceneRect(), Qt::KeepAspectRatio);
}
};
diff --git a/examples/svg/opengl/framebufferobject/glwidget.h b/examples/svg/opengl/framebufferobject/glwidget.h
index 6bd92ea..771497b 100644
--- a/examples/svg/opengl/framebufferobject/glwidget.h
+++ b/examples/svg/opengl/framebufferobject/glwidget.h
@@ -54,12 +54,12 @@ public:
void saveGLState();
void restoreGLState();
- void paintEvent(QPaintEvent *);
- void mousePressEvent(QMouseEvent *);
- void mouseDoubleClickEvent(QMouseEvent *);
- void mouseMoveEvent(QMouseEvent *);
- void timerEvent(QTimerEvent *);
- void wheelEvent(QWheelEvent *);
+ void paintEvent(QPaintEvent *) override;
+ void mousePressEvent(QMouseEvent *) override;
+ void mouseDoubleClickEvent(QMouseEvent *) override;
+ void mouseMoveEvent(QMouseEvent *) override;
+ void timerEvent(QTimerEvent *) override;
+ void wheelEvent(QWheelEvent *) override;
public slots:
void animate(qreal);
diff --git a/examples/svg/richtext/textobject/svgtextobject.h b/examples/svg/richtext/textobject/svgtextobject.h
index 47fefc9..a788ee5 100644
--- a/examples/svg/richtext/textobject/svgtextobject.h
+++ b/examples/svg/richtext/textobject/svgtextobject.h
@@ -60,9 +60,9 @@ class SvgTextObject : public QObject, public QTextObjectInterface
public:
QSizeF intrinsicSize(QTextDocument *doc, int posInDocument,
- const QTextFormat &format);
+ const QTextFormat &format) override;
void drawObject(QPainter *painter, const QRectF &rect, QTextDocument *doc,
- int posInDocument, const QTextFormat &format);
+ int posInDocument, const QTextFormat &format) override;
};
//![0]
diff --git a/examples/svg/svggenerator/displaywidget.h b/examples/svg/svggenerator/displaywidget.h
index 48a8128..51c6c68 100644
--- a/examples/svg/svggenerator/displaywidget.h
+++ b/examples/svg/svggenerator/displaywidget.h
@@ -64,7 +64,7 @@ public slots:
void setShape(Shape shape);
protected:
- void paintEvent(QPaintEvent *event);
+ void paintEvent(QPaintEvent *event) override;
private:
Background background;