Add missing override into Qt modules

Change-Id: I014ac8c7b590c77b054fbb01f0ab5601c44ca88e
Reviewed-by: hjk <hjk@qt.io>
bb10
Alexander Volkov 2016-11-26 12:40:58 +03:00
parent ed6f129026
commit 7183fc8f0d
9 changed files with 44 additions and 44 deletions

View File

@ -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);
}

View File

@ -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);
}

View File

@ -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;
};

View File

@ -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; }

View File

@ -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:

View File

@ -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);

View File

@ -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);

View File

@ -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<const QPicture *> 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

View File

@ -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<const QSqlRelationalTableModel *>(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;