From 7183fc8f0d2d1e16c52fe78d029ee9fa13868b79 Mon Sep 17 00:00:00 2001 From: Alexander Volkov Date: Sat, 26 Nov 2016 12:40:58 +0300 Subject: Add missing override into Qt modules Change-Id: I014ac8c7b590c77b054fbb01f0ab5601c44ca88e Reviewed-by: hjk --- src/network/socket/qabstractsocket_p.h | 12 +++++----- src/network/socket/qlocalsocket_p.h | 4 ++-- src/network/socket/qnativesocketengine.cpp | 6 ++--- src/opengl/gl2paintengineex/qglgradientcache_p.h | 4 ++-- src/opengl/qglpixelbuffer_p.h | 10 ++++---- src/printsupport/dialogs/qabstractprintdialog.h | 2 +- src/printsupport/kernel/qpaintengine_alpha_p.h | 16 ++++++------- src/printsupport/kernel/qpaintengine_preview_p.h | 30 ++++++++++++------------ src/sql/models/qsqlrelationaldelegate.h | 4 ++-- 9 files changed, 44 insertions(+), 44 deletions(-) (limited to 'src') diff --git a/src/network/socket/qabstractsocket_p.h b/src/network/socket/qabstractsocket_p.h index 1578d7bb35..8a96cb9d48 100644 --- a/src/network/socket/qabstractsocket_p.h +++ b/src/network/socket/qabstractsocket_p.h @@ -72,13 +72,13 @@ public: virtual ~QAbstractSocketPrivate(); // from QAbstractSocketEngineReceiver - inline void readNotification() { canReadNotification(); } - inline void writeNotification() { canWriteNotification(); } - inline void exceptionNotification() {} - inline void closeNotification() { canCloseNotification(); } - void connectionNotification(); + inline void readNotification() override { canReadNotification(); } + inline void writeNotification() override { canWriteNotification(); } + inline void exceptionNotification() override {} + inline void closeNotification() override { canCloseNotification(); } + void connectionNotification() override; #ifndef QT_NO_NETWORKPROXY - inline void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) { + inline void proxyAuthenticationRequired(const QNetworkProxy &proxy, QAuthenticator *authenticator) override { Q_Q(QAbstractSocket); q->proxyAuthenticationRequired(proxy, authenticator); } diff --git a/src/network/socket/qlocalsocket_p.h b/src/network/socket/qlocalsocket_p.h index 560d74328e..9da37d2af3 100644 --- a/src/network/socket/qlocalsocket_p.h +++ b/src/network/socket/qlocalsocket_p.h @@ -99,12 +99,12 @@ public: QTcpSocket::setSocketError(error); } - inline qint64 readData(char *data, qint64 maxSize) + inline qint64 readData(char *data, qint64 maxSize) override { return QTcpSocket::readData(data, maxSize); } - inline qint64 writeData(const char *data, qint64 maxSize) + inline qint64 writeData(const char *data, qint64 maxSize) override { return QTcpSocket::writeData(data, maxSize); } diff --git a/src/network/socket/qnativesocketengine.cpp b/src/network/socket/qnativesocketengine.cpp index 11d19682d8..928c7fc68f 100644 --- a/src/network/socket/qnativesocketengine.cpp +++ b/src/network/socket/qnativesocketengine.cpp @@ -1230,7 +1230,7 @@ public: { engine = parent; } protected: - bool event(QEvent *); + bool event(QEvent *) override; QNativeSocketEngine *engine; }; @@ -1262,7 +1262,7 @@ public: : QSocketNotifier(fd, QSocketNotifier::Write, parent) { engine = parent; } protected: - bool event(QEvent *); + bool event(QEvent *) override; QNativeSocketEngine *engine; }; @@ -1286,7 +1286,7 @@ public: : QSocketNotifier(fd, QSocketNotifier::Exception, parent) { engine = parent; } protected: - bool event(QEvent *); + bool event(QEvent *) override; QNativeSocketEngine *engine; }; diff --git a/src/opengl/gl2paintengineex/qglgradientcache_p.h b/src/opengl/gl2paintengineex/qglgradientcache_p.h index 1333df316b..3c9da982e9 100644 --- a/src/opengl/gl2paintengineex/qglgradientcache_p.h +++ b/src/opengl/gl2paintengineex/qglgradientcache_p.h @@ -83,8 +83,8 @@ public: GLuint getBuffer(const QGradient &gradient, qreal opacity); inline int paletteSize() const { return 1024; } - void invalidateResource(); - void freeResource(QOpenGLContext *ctx); + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: inline int maxCacheSize() const { return 60; } diff --git a/src/opengl/qglpixelbuffer_p.h b/src/opengl/qglpixelbuffer_p.h index 6416e41773..9125fcfb4b 100644 --- a/src/opengl/qglpixelbuffer_p.h +++ b/src/opengl/qglpixelbuffer_p.h @@ -63,11 +63,11 @@ class QOpenGLFramebufferObject; class QGLPBufferGLPaintDevice : public QGLPaintDevice { public: - virtual QPaintEngine* paintEngine() const {return pbuf->paintEngine();} - virtual QSize size() const {return pbuf->size();} - virtual QGLContext* context() const; - virtual void beginPaint(); - virtual void endPaint(); + QPaintEngine* paintEngine() const override {return pbuf->paintEngine();} + QSize size() const override {return pbuf->size();} + QGLContext* context() const override; + void beginPaint() override; + void endPaint() override; void setPBuffer(QGLPixelBuffer* pb); void setFbo(GLuint fbo); private: diff --git a/src/printsupport/dialogs/qabstractprintdialog.h b/src/printsupport/dialogs/qabstractprintdialog.h index e8eee2ca9c..f18406af4b 100644 --- a/src/printsupport/dialogs/qabstractprintdialog.h +++ b/src/printsupport/dialogs/qabstractprintdialog.h @@ -83,7 +83,7 @@ public: explicit QAbstractPrintDialog(QPrinter *printer, QWidget *parent = Q_NULLPTR); ~QAbstractPrintDialog(); - virtual int exec() = 0; + int exec() override = 0; // obsolete void addEnabledOption(PrintDialogOption option); diff --git a/src/printsupport/kernel/qpaintengine_alpha_p.h b/src/printsupport/kernel/qpaintengine_alpha_p.h index b5ba98bf88..efae442690 100644 --- a/src/printsupport/kernel/qpaintengine_alpha_p.h +++ b/src/printsupport/kernel/qpaintengine_alpha_p.h @@ -67,18 +67,18 @@ class Q_PRINTSUPPORT_EXPORT QAlphaPaintEngine : public QPaintEngine public: ~QAlphaPaintEngine(); - virtual bool begin(QPaintDevice *pdev); - virtual bool end(); + bool begin(QPaintDevice *pdev) override; + bool end() override; - virtual void updateState(const QPaintEngineState &state); + void updateState(const QPaintEngineState &state) override; - virtual void drawPath(const QPainterPath &path); + void drawPath(const QPainterPath &path) override; - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); - virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; + void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override; protected: QAlphaPaintEngine(QAlphaPaintEnginePrivate &data, PaintEngineFeatures devcaps = 0); diff --git a/src/printsupport/kernel/qpaintengine_preview_p.h b/src/printsupport/kernel/qpaintengine_preview_p.h index 6277451bfa..31b3142cb6 100644 --- a/src/printsupport/kernel/qpaintengine_preview_p.h +++ b/src/printsupport/kernel/qpaintengine_preview_p.h @@ -69,33 +69,33 @@ public: QPreviewPaintEngine(); ~QPreviewPaintEngine(); - bool begin(QPaintDevice *dev); - bool end(); + bool begin(QPaintDevice *dev) override; + bool end() override; - void updateState(const QPaintEngineState &state); + void updateState(const QPaintEngineState &state) override; - void drawPath(const QPainterPath &path); - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - void drawTextItem(const QPointF &p, const QTextItem &textItem); + void drawPath(const QPainterPath &path) override; + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p); + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &p) override; QList pages(); - QPaintEngine::Type type() const { return Picture; } + QPaintEngine::Type type() const override { return Picture; } void setProxyEngines(QPrintEngine *printEngine, QPaintEngine *paintEngine); - void setProperty(PrintEnginePropertyKey key, const QVariant &value); - QVariant property(PrintEnginePropertyKey key) const; + void setProperty(PrintEnginePropertyKey key, const QVariant &value) override; + QVariant property(PrintEnginePropertyKey key) const override; - bool newPage(); - bool abort(); + bool newPage() override; + bool abort() override; - int metric(QPaintDevice::PaintDeviceMetric) const; + int metric(QPaintDevice::PaintDeviceMetric) const override; - QPrinter::PrinterState printerState() const; + QPrinter::PrinterState printerState() const override; }; QT_END_NAMESPACE diff --git a/src/sql/models/qsqlrelationaldelegate.h b/src/sql/models/qsqlrelationaldelegate.h index e98bf28d3b..f295de7396 100644 --- a/src/sql/models/qsqlrelationaldelegate.h +++ b/src/sql/models/qsqlrelationaldelegate.h @@ -65,7 +65,7 @@ explicit QSqlRelationalDelegate(QObject *aParent = 0) QWidget *createEditor(QWidget *aParent, const QStyleOptionViewItem &option, - const QModelIndex &index) const + const QModelIndex &index) const override { const QSqlRelationalTableModel *sqlModel = qobject_cast(index.model()); QSqlTableModel *childModel = sqlModel ? sqlModel->relationModel(index.column()) : 0; @@ -80,7 +80,7 @@ QWidget *createEditor(QWidget *aParent, return combo; } -void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const +void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override { if (!index.isValid()) return; -- cgit v1.2.3