1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replace Q_DECL_OVERRIDE with override where possible

Browse Source 
Remaining uses of Q_DECL_OVERRIDE are in:

src/corelib/global/qcompilerdetection.h
src/corelib/global/qglobal.cpp
doc/global/qt-cpp-defines.qdocconf
  (definition and documentation of Q_DECL_OVERRIDE)
tests/manual/qcursor/qcursorhighdpi/main.cpp
  (a test executable compilable both under Qt4 and Qt5)

Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com>
This commit is contained in:
Kevin Funk 2017-09-18 10:36:49 +02:00
parent 93dd85141b
commit 47c92fbb0b
622 changed files with 4860 additions and 4860 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/network/multistreamclient/chatconsumer.h
View File

@ -64,8 +64,8 @@ class ChatConsumer : public Consumer
public: public:
explicit ChatConsumer(QObject *parent = nullptr); explicit ChatConsumer(QObject *parent = nullptr);
QWidget *widget() Q_DECL_OVERRIDE; QWidget *widget() override;
void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE; void readDatagram(const QByteArray &ba) override;
private slots: private slots:
void returnPressed(); void returnPressed();

6
examples/network/multistreamclient/movieconsumer.h
View File

@ -63,9 +63,9 @@ class MovieConsumer : public Consumer
public: public:
explicit MovieConsumer(QObject *parent = nullptr); explicit MovieConsumer(QObject *parent = nullptr);
QWidget *widget() Q_DECL_OVERRIDE; QWidget *widget() override;
void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE; void readDatagram(const QByteArray &ba) override;
void serverDisconnected() Q_DECL_OVERRIDE; void serverDisconnected() override;
private: private:
QLabel *label; QLabel *label;

6
examples/network/multistreamclient/timeconsumer.h
View File

@ -64,9 +64,9 @@ class TimeConsumer : public Consumer
public: public:
explicit TimeConsumer(QObject *parent = nullptr); explicit TimeConsumer(QObject *parent = nullptr);
QWidget *widget() Q_DECL_OVERRIDE; QWidget *widget() override;
void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE; void readDatagram(const QByteArray &ba) override;
void serverDisconnected() Q_DECL_OVERRIDE; void serverDisconnected() override;
private slots: private slots:
void timerTick(); void timerTick();

6
examples/network/multistreamserver/chatprovider.h
View File

@ -59,9 +59,9 @@ class ChatProvider : public Provider
public: public:
explicit ChatProvider(QObject *parent = nullptr); explicit ChatProvider(QObject *parent = nullptr);
void readDatagram(QSctpSocket &from, const QByteArray &ba) Q_DECL_OVERRIDE; void readDatagram(QSctpSocket &from, const QByteArray &ba) override;
void newConnection(QSctpSocket &client) Q_DECL_OVERRIDE; void newConnection(QSctpSocket &client) override;
void clientDisconnected(QSctpSocket &client) Q_DECL_OVERRIDE; void clientDisconnected(QSctpSocket &client) override;
}; };
#endif #endif

2
examples/network/multistreamserver/server.h
View File

@ -72,7 +72,7 @@ public:
virtual ~Server(); virtual ~Server();
public slots: public slots:
int exec() Q_DECL_OVERRIDE; int exec() override;
private slots: private slots:
void newConnection(); void newConnection();

2
examples/network/multistreamserver/timeprovider.h
View File

@ -59,7 +59,7 @@ class TimeProvider : public Provider
public: public:
explicit TimeProvider(QObject *parent = nullptr); explicit TimeProvider(QObject *parent = nullptr);
void readDatagram(QSctpSocket &from, const QByteArray &ba) Q_DECL_OVERRIDE; void readDatagram(QSctpSocket &from, const QByteArray &ba) override;
}; };
#endif #endif

2
examples/opengl/computegles31/glwindow.h
View File

@ -86,7 +86,7 @@ public:
void setBlurRadius(float blurRadius); void setBlurRadius(float blurRadius);
protected: protected:
void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; void keyPressEvent(QKeyEvent *e) override;
void setAnimating(bool animate); void setAnimating(bool animate);
private: private:

2
examples/xml/dombookmarks/xbeltree.h
View File

@ -67,7 +67,7 @@ public:
protected: protected:
#if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD) #if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD)
void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; void contextMenuEvent(QContextMenuEvent *event) override;
#endif #endif
private slots: private slots:

4
src/concurrent/qtconcurrentthreadengine.h
View File

@ -113,7 +113,7 @@ private:
void startThreads(); void startThreads();
void threadExit(); void threadExit();
bool threadThrottleExit(); bool threadThrottleExit();
void run() Q_DECL_OVERRIDE; void run() override;
virtual void asynchronousFinish() = 0; virtual void asynchronousFinish() = 0;
#ifndef QT_NO_EXCEPTIONS #ifndef QT_NO_EXCEPTIONS
void handleException(const QException &exception); void handleException(const QException &exception);
@ -173,7 +173,7 @@ public:
return future; return future;
} }
void asynchronousFinish() Q_DECL_OVERRIDE void asynchronousFinish() override
{ {
finish(); finish();
futureInterfaceTyped()->reportFinished(result()); futureInterfaceTyped()->reportFinished(result());

2
src/corelib/animation/qabstractanimation.h
View File

@ -118,7 +118,7 @@ public Q_SLOTS:
protected: protected:
QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent = Q_NULLPTR); QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent = Q_NULLPTR);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
virtual void updateCurrentTime(int currentTime) = 0; virtual void updateCurrentTime(int currentTime) = 0;
virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);

10
src/corelib/animation/qabstractanimation_p.h
View File

@ -116,7 +116,7 @@ class QDefaultAnimationDriver : public QAnimationDriver
Q_OBJECT Q_OBJECT
public: public:
QDefaultAnimationDriver(QUnifiedTimer *timer); QDefaultAnimationDriver(QUnifiedTimer *timer);
void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *e) override;
private Q_SLOTS: private Q_SLOTS:
void startTimer(); void startTimer();
@ -196,7 +196,7 @@ public:
qint64 elapsed() const; qint64 elapsed() const;
protected: protected:
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *) override;
private Q_SLOTS: private Q_SLOTS:
void startTimers(); void startTimers();
@ -265,11 +265,11 @@ public:
*/ */
static void updateAnimationTimer(); static void updateAnimationTimer();
void restartAnimationTimer() Q_DECL_OVERRIDE; void restartAnimationTimer() override;
void updateAnimationsTime(qint64 delta) Q_DECL_OVERRIDE; void updateAnimationsTime(qint64 delta) override;
//useful for profiling/debugging //useful for profiling/debugging
int runningAnimationCount() Q_DECL_OVERRIDE { return animations.count(); } int runningAnimationCount() override { return animations.count(); }
private Q_SLOTS: private Q_SLOTS:
void startAnimations(); void startAnimations();

2
src/corelib/animation/qanimationgroup.h
View File

@ -67,7 +67,7 @@ public:
protected: protected:
QAnimationGroup(QAnimationGroupPrivate &dd, QObject *parent); QAnimationGroup(QAnimationGroupPrivate &dd, QObject *parent);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
private: private:
Q_DISABLE_COPY(QAnimationGroup) Q_DISABLE_COPY(QAnimationGroup)

10
src/corelib/animation/qparallelanimationgroup.h
View File

@ -56,15 +56,15 @@ public:
QParallelAnimationGroup(QObject *parent = Q_NULLPTR); QParallelAnimationGroup(QObject *parent = Q_NULLPTR);
~QParallelAnimationGroup(); ~QParallelAnimationGroup();
int duration() const Q_DECL_OVERRIDE; int duration() const override;
protected: protected:
QParallelAnimationGroup(QParallelAnimationGroupPrivate &dd, QObject *parent); QParallelAnimationGroup(QParallelAnimationGroupPrivate &dd, QObject *parent);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
void updateCurrentTime(int currentTime) Q_DECL_OVERRIDE; void updateCurrentTime(int currentTime) override;
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override;
void updateDirection(QAbstractAnimation::Direction direction) Q_DECL_OVERRIDE; void updateDirection(QAbstractAnimation::Direction direction) override;
private: private:
Q_DISABLE_COPY(QParallelAnimationGroup) Q_DISABLE_COPY(QParallelAnimationGroup)

2
src/corelib/animation/qparallelanimationgroup_p.h
View File

@ -78,7 +78,7 @@ public:
void connectUncontrolledAnimations(); void connectUncontrolledAnimations();
void disconnectUncontrolledAnimations(); void disconnectUncontrolledAnimations();
void animationRemoved(int index, QAbstractAnimation *) Q_DECL_OVERRIDE; void animationRemoved(int index, QAbstractAnimation *) override;
// private slot // private slot
void _q_uncontrolledAnimationFinished(); void _q_uncontrolledAnimationFinished();

6
src/corelib/animation/qpauseanimation.h
View File

@ -58,12 +58,12 @@ public:
QPauseAnimation(int msecs, QObject *parent = Q_NULLPTR); QPauseAnimation(int msecs, QObject *parent = Q_NULLPTR);
~QPauseAnimation(); ~QPauseAnimation();
int duration() const Q_DECL_OVERRIDE; int duration() const override;
void setDuration(int msecs); void setDuration(int msecs);
protected: protected:
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
void updateCurrentTime(int) Q_DECL_OVERRIDE; void updateCurrentTime(int) override;
private: private:
Q_DISABLE_COPY(QPauseAnimation) Q_DISABLE_COPY(QPauseAnimation)

6
src/corelib/animation/qpropertyanimation.h
View File

@ -66,9 +66,9 @@ public:
void setPropertyName(const QByteArray &propertyName); void setPropertyName(const QByteArray &propertyName);
protected: protected:
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
void updateCurrentValue(const QVariant &value) Q_DECL_OVERRIDE; void updateCurrentValue(const QVariant &value) override;
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override;
private: private:
Q_DISABLE_COPY(QPropertyAnimation) Q_DISABLE_COPY(QPropertyAnimation)

10
src/corelib/animation/qsequentialanimationgroup.h
View File

@ -63,18 +63,18 @@ public:
QPauseAnimation *insertPause(int index, int msecs); QPauseAnimation *insertPause(int index, int msecs);
QAbstractAnimation *currentAnimation() const; QAbstractAnimation *currentAnimation() const;
int duration() const Q_DECL_OVERRIDE; int duration() const override;
Q_SIGNALS: Q_SIGNALS:
void currentAnimationChanged(QAbstractAnimation *current); void currentAnimationChanged(QAbstractAnimation *current);
protected: protected:
QSequentialAnimationGroup(QSequentialAnimationGroupPrivate &dd, QObject *parent); QSequentialAnimationGroup(QSequentialAnimationGroupPrivate &dd, QObject *parent);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
void updateCurrentTime(int) Q_DECL_OVERRIDE; void updateCurrentTime(int) override;
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override;
void updateDirection(QAbstractAnimation::Direction direction) Q_DECL_OVERRIDE; void updateDirection(QAbstractAnimation::Direction direction) override;
private: private:
Q_DISABLE_COPY(QSequentialAnimationGroup) Q_DISABLE_COPY(QSequentialAnimationGroup)

4
src/corelib/animation/qsequentialanimationgroup_p.h
View File

@ -82,8 +82,8 @@ public:
void setCurrentAnimation(int index, bool intermediate = false); void setCurrentAnimation(int index, bool intermediate = false);
void activateCurrentAnimation(bool intermediate = false); void activateCurrentAnimation(bool intermediate = false);
void animationInsertedAt(int index) Q_DECL_OVERRIDE; void animationInsertedAt(int index) override;
void animationRemoved(int index, QAbstractAnimation *anim) Q_DECL_OVERRIDE; void animationRemoved(int index, QAbstractAnimation *anim) override;
bool atEnd() const; bool atEnd() const;

8
src/corelib/animation/qvariantanimation.h
View File

@ -82,7 +82,7 @@ public:
QVariant currentValue() const; QVariant currentValue() const;
int duration() const Q_DECL_OVERRIDE; int duration() const override;
void setDuration(int msecs); void setDuration(int msecs);
QEasingCurve easingCurve() const; QEasingCurve easingCurve() const;
@ -95,10 +95,10 @@ Q_SIGNALS:
protected: protected:
QVariantAnimation(QVariantAnimationPrivate &dd, QObject *parent = Q_NULLPTR); QVariantAnimation(QVariantAnimationPrivate &dd, QObject *parent = Q_NULLPTR);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
void updateCurrentTime(int) Q_DECL_OVERRIDE; void updateCurrentTime(int) override;
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override;
virtual void updateCurrentValue(const QVariant &value); virtual void updateCurrentValue(const QVariant &value);
virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const;

10
src/corelib/codecs/qicucodec_p.h
View File

@ -74,12 +74,12 @@ public:
static QTextCodec *codecForNameUnlocked(const char *name); static QTextCodec *codecForNameUnlocked(const char *name);
static QTextCodec *codecForMibUnlocked(int mib); static QTextCodec *codecForMibUnlocked(int mib);
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
private: private:
QIcuCodec(const char *name); QIcuCodec(const char *name);

8
src/corelib/codecs/qisciicodec_p.h
View File

@ -65,11 +65,11 @@ public:
static QTextCodec *create(const char *name); static QTextCodec *create(const char *name);
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
private: private:
int idx; int idx;

20
src/corelib/codecs/qlatincodec_p.h
View File

@ -63,12 +63,12 @@ class QLatin1Codec : public QTextCodec
public: public:
~QLatin1Codec(); ~QLatin1Codec();
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
}; };
@ -78,12 +78,12 @@ class QLatin15Codec: public QTextCodec
public: public:
~QLatin15Codec(); ~QLatin15Codec();
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
}; };
#endif // QT_NO_TEXTCODEC #endif // QT_NO_TEXTCODEC

8
src/corelib/codecs/qtsciicodec_p.h
View File

@ -91,11 +91,11 @@ class QTsciiCodec : public QTextCodec {
public: public:
~QTsciiCodec(); ~QTsciiCodec();
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
}; };
#endif // QT_NO_CODECS #endif // QT_NO_CODECS

52
src/corelib/codecs/qutfcodec_p.h
View File

@ -310,11 +310,11 @@ class QUtf8Codec : public QTextCodec {
public: public:
~QUtf8Codec(); ~QUtf8Codec();
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
void convertToUnicode(QString *target, const char *, int, ConverterState *) const; void convertToUnicode(QString *target, const char *, int, ConverterState *) const;
}; };
@ -324,12 +324,12 @@ public:
QUtf16Codec() { e = DetectEndianness; } QUtf16Codec() { e = DetectEndianness; }
~QUtf16Codec(); ~QUtf16Codec();
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
protected: protected:
DataEndianness e; DataEndianness e;
@ -338,17 +338,17 @@ protected:
class QUtf16BECodec : public QUtf16Codec { class QUtf16BECodec : public QUtf16Codec {
public: public:
QUtf16BECodec() : QUtf16Codec() { e = BigEndianness; } QUtf16BECodec() : QUtf16Codec() { e = BigEndianness; }
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
}; };
class QUtf16LECodec : public QUtf16Codec { class QUtf16LECodec : public QUtf16Codec {
public: public:
QUtf16LECodec() : QUtf16Codec() { e = LittleEndianness; } QUtf16LECodec() : QUtf16Codec() { e = LittleEndianness; }
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
}; };
class QUtf32Codec : public QTextCodec { class QUtf32Codec : public QTextCodec {
@ -356,12 +356,12 @@ public:
QUtf32Codec() { e = DetectEndianness; } QUtf32Codec() { e = DetectEndianness; }
~QUtf32Codec(); ~QUtf32Codec();
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; QString convertToUnicode(const char *, int, ConverterState *) const override;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override;
protected: protected:
DataEndianness e; DataEndianness e;
@ -370,17 +370,17 @@ protected:
class QUtf32BECodec : public QUtf32Codec { class QUtf32BECodec : public QUtf32Codec {
public: public:
QUtf32BECodec() : QUtf32Codec() { e = BigEndianness; } QUtf32BECodec() : QUtf32Codec() { e = BigEndianness; }
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
}; };
class QUtf32LECodec : public QUtf32Codec { class QUtf32LECodec : public QUtf32Codec {
public: public:
QUtf32LECodec() : QUtf32Codec() { e = LittleEndianness; } QUtf32LECodec() : QUtf32Codec() { e = LittleEndianness; }
QByteArray name() const Q_DECL_OVERRIDE; QByteArray name() const override;
QList<QByteArray> aliases() const Q_DECL_OVERRIDE; QList<QByteArray> aliases() const override;
int mibEnum() const Q_DECL_OVERRIDE; int mibEnum() const override;
}; };

4
src/corelib/io/qbuffer.cpp
View File

@ -60,8 +60,8 @@ public:
QByteArray *buf; QByteArray *buf;
QByteArray defaultBuf; QByteArray defaultBuf;
virtual qint64 peek(char *data, qint64 maxSize) Q_DECL_OVERRIDE; virtual qint64 peek(char *data, qint64 maxSize) override;
virtual QByteArray peek(qint64 maxSize) Q_DECL_OVERRIDE; virtual QByteArray peek(qint64 maxSize) override;
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
// private slots // private slots

22
src/corelib/io/qbuffer.h
View File

@ -73,22 +73,22 @@ public:
inline void setData(const char *data, int len); inline void setData(const char *data, int len);
const QByteArray &data() const; const QByteArray &data() const;
bool open(OpenMode openMode) Q_DECL_OVERRIDE; bool open(OpenMode openMode) override;
void close() Q_DECL_OVERRIDE; void close() override;
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
qint64 pos() const Q_DECL_OVERRIDE; qint64 pos() const override;
bool seek(qint64 off) Q_DECL_OVERRIDE; bool seek(qint64 off) override;
bool atEnd() const Q_DECL_OVERRIDE; bool atEnd() const override;
bool canReadLine() const Q_DECL_OVERRIDE; bool canReadLine() const override;
protected: protected:
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; void connectNotify(const QMetaMethod &) override;
void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; void disconnectNotify(const QMetaMethod &) override;
#endif #endif
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; qint64 readData(char *data, qint64 maxlen) override;
qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; qint64 writeData(const char *data, qint64 len) override;
private: private:
Q_DECLARE_PRIVATE(QBuffer) Q_DECLARE_PRIVATE(QBuffer)

12
src/corelib/io/qfile.h
View File

@ -70,7 +70,7 @@ public:
#endif #endif
~QFile(); ~QFile();
QString fileName() const Q_DECL_OVERRIDE; QString fileName() const override;
void setFileName(const QString &name); void setFileName(const QString &name);
#if defined(Q_OS_DARWIN) #if defined(Q_OS_DARWIN)
@ -124,18 +124,18 @@ public:
bool copy(const QString &newName); bool copy(const QString &newName);
static bool copy(const QString &fileName, const QString &newName); static bool copy(const QString &fileName, const QString &newName);
bool open(OpenMode flags) Q_DECL_OVERRIDE; bool open(OpenMode flags) override;
bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle);
bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle);
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
bool resize(qint64 sz) Q_DECL_OVERRIDE; bool resize(qint64 sz) override;
static bool resize(const QString &filename, qint64 sz); static bool resize(const QString &filename, qint64 sz);
Permissions permissions() const Q_DECL_OVERRIDE; Permissions permissions() const override;
static Permissions permissions(const QString &filename); static Permissions permissions(const QString &filename);
bool setPermissions(Permissions permissionSpec) Q_DECL_OVERRIDE; bool setPermissions(Permissions permissionSpec) override;
static bool setPermissions(const QString &filename, Permissions permissionSpec); static bool setPermissions(const QString &filename, Permissions permissionSpec);
protected: protected:

18
src/corelib/io/qfiledevice.h
View File

@ -100,19 +100,19 @@ public:
FileError error() const; FileError error() const;
void unsetError(); void unsetError();
virtual void close() Q_DECL_OVERRIDE; virtual void close() override;
bool isSequential() const Q_DECL_OVERRIDE; bool isSequential() const override;
int handle() const; int handle() const;
virtual QString fileName() const; virtual QString fileName() const;
qint64 pos() const Q_DECL_OVERRIDE; qint64 pos() const override;
bool seek(qint64 offset) Q_DECL_OVERRIDE; bool seek(qint64 offset) override;
bool atEnd() const Q_DECL_OVERRIDE; bool atEnd() const override;
bool flush(); bool flush();
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
virtual bool resize(qint64 sz); virtual bool resize(qint64 sz);
virtual Permissions permissions() const; virtual Permissions permissions() const;
@ -139,9 +139,9 @@ protected:
QFileDevice(QFileDevicePrivate &dd, QObject *parent = Q_NULLPTR); QFileDevice(QFileDevicePrivate &dd, QObject *parent = Q_NULLPTR);
#endif #endif
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; qint64 readData(char *data, qint64 maxlen) override;
qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; qint64 writeData(const char *data, qint64 len) override;
qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; qint64 readLineData(char *data, qint64 maxlen) override;
private: private:
Q_DISABLE_COPY(QFileDevice) Q_DISABLE_COPY(QFileDevice)

2
src/corelib/io/qfiledevice_p.h
View File

@ -69,7 +69,7 @@ protected:
inline bool ensureFlushed() const; inline bool ensureFlushed() const;
bool putCharHelper(char c) Q_DECL_OVERRIDE; bool putCharHelper(char c) override;
void setError(QFileDevice::FileError err); void setError(QFileDevice::FileError err);
void setError(QFileDevice::FileError err, const QString &errorString); void setError(QFileDevice::FileError err, const QString &errorString);

4
src/corelib/io/qfilesystemwatcher_inotify_p.h
View File

@ -70,8 +70,8 @@ public:
static QInotifyFileSystemWatcherEngine *create(QObject *parent); static QInotifyFileSystemWatcherEngine *create(QObject *parent);
QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override;
QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override;
private Q_SLOTS: private Q_SLOTS:
void readFromInotify(); void readFromInotify();

4
src/corelib/io/qfilesystemwatcher_polling_p.h
View File

@ -110,8 +110,8 @@ class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine
public: public:
QPollingFileSystemWatcherEngine(QObject *parent); QPollingFileSystemWatcherEngine(QObject *parent);
QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override;
QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override;
private Q_SLOTS: private Q_SLOTS:
void timeout(); void timeout();

8
src/corelib/io/qfsfileengine_iterator_p.h
View File

@ -68,11 +68,11 @@ public:
QFSFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); QFSFileEngineIterator(QDir::Filters filters, const QStringList &filterNames);
~QFSFileEngineIterator(); ~QFSFileEngineIterator();
QString next() Q_DECL_OVERRIDE; QString next() override;
bool hasNext() const Q_DECL_OVERRIDE; bool hasNext() const override;
QString currentFileName() const Q_DECL_OVERRIDE; QString currentFileName() const override;
QFileInfo currentFileInfo() const Q_DECL_OVERRIDE; QFileInfo currentFileInfo() const override;
private: private:
void advance() const; void advance() const;

70
src/corelib/io/qfsfileengine_p.h
View File

@ -71,49 +71,49 @@ public:
explicit QFSFileEngine(const QString &file); explicit QFSFileEngine(const QString &file);
~QFSFileEngine(); ~QFSFileEngine();
bool open(QIODevice::OpenMode openMode) Q_DECL_OVERRIDE; bool open(QIODevice::OpenMode openMode) override;
bool open(QIODevice::OpenMode flags, FILE *fh); bool open(QIODevice::OpenMode flags, FILE *fh);
bool close() Q_DECL_OVERRIDE; bool close() override;
bool flush() Q_DECL_OVERRIDE; bool flush() override;
bool syncToDisk() Q_DECL_OVERRIDE; bool syncToDisk() override;
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
qint64 pos() const Q_DECL_OVERRIDE; qint64 pos() const override;
bool seek(qint64) Q_DECL_OVERRIDE; bool seek(qint64) override;
bool isSequential() const Q_DECL_OVERRIDE; bool isSequential() const override;
bool remove() Q_DECL_OVERRIDE; bool remove() override;
bool copy(const QString &newName) Q_DECL_OVERRIDE; bool copy(const QString &newName) override;
bool rename(const QString &newName) Q_DECL_OVERRIDE; bool rename(const QString &newName) override;
bool renameOverwrite(const QString &newName) Q_DECL_OVERRIDE; bool renameOverwrite(const QString &newName) override;
bool link(const QString &newName) Q_DECL_OVERRIDE; bool link(const QString &newName) override;
bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE; bool mkdir(const QString &dirName, bool createParentDirectories) const override;
bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE; bool rmdir(const QString &dirName, bool recurseParentDirectories) const override;
bool setSize(qint64 size) Q_DECL_OVERRIDE; bool setSize(qint64 size) override;
bool caseSensitive() const Q_DECL_OVERRIDE; bool caseSensitive() const override;
bool isRelativePath() const Q_DECL_OVERRIDE; bool isRelativePath() const override;
QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE; QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE; FileFlags fileFlags(FileFlags type) const override;
bool setPermissions(uint perms) Q_DECL_OVERRIDE; bool setPermissions(uint perms) override;
QByteArray id() const override; QByteArray id() const override;
QString fileName(FileName file) const Q_DECL_OVERRIDE; QString fileName(FileName file) const override;
uint ownerId(FileOwner) const Q_DECL_OVERRIDE; uint ownerId(FileOwner) const override;
QString owner(FileOwner) const Q_DECL_OVERRIDE; QString owner(FileOwner) const override;
bool setFileTime(const QDateTime &newDate, FileTime time) Q_DECL_OVERRIDE; bool setFileTime(const QDateTime &newDate, FileTime time) override;
QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; QDateTime fileTime(FileTime time) const override;
void setFileName(const QString &file) Q_DECL_OVERRIDE; void setFileName(const QString &file) override;
int handle() const Q_DECL_OVERRIDE; int handle() const override;
#ifndef QT_NO_FILESYSTEMITERATOR #ifndef QT_NO_FILESYSTEMITERATOR
Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
Iterator *endEntryList() Q_DECL_OVERRIDE; Iterator *endEntryList() override;
#endif #endif
qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; qint64 read(char *data, qint64 maxlen) override;
qint64 readLine(char *data, qint64 maxlen) Q_DECL_OVERRIDE; qint64 readLine(char *data, qint64 maxlen) override;
qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; qint64 write(const char *data, qint64 len) override;
bool cloneTo(QAbstractFileEngine *target) override; bool cloneTo(QAbstractFileEngine *target) override;
bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE; bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override;
bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; bool supportsExtension(Extension extension) const override;
//FS only!! //FS only!!
bool open(QIODevice::OpenMode flags, int fd); bool open(QIODevice::OpenMode flags, int fd);

58
src/corelib/io/qnoncontiguousbytedevice_p.h
View File

@ -105,12 +105,12 @@ class QNonContiguousByteDeviceByteArrayImpl : public QNonContiguousByteDevice
public: public:
QNonContiguousByteDeviceByteArrayImpl(QByteArray *ba); QNonContiguousByteDeviceByteArrayImpl(QByteArray *ba);
~QNonContiguousByteDeviceByteArrayImpl(); ~QNonContiguousByteDeviceByteArrayImpl();
const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; const char* readPointer(qint64 maximumLength, qint64 &len) override;
bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; bool advanceReadPointer(qint64 amount) override;
bool atEnd() const Q_DECL_OVERRIDE; bool atEnd() const override;
bool reset() Q_DECL_OVERRIDE; bool reset() override;
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
qint64 pos() const Q_DECL_OVERRIDE; qint64 pos() const override;
protected: protected:
QByteArray* byteArray; QByteArray* byteArray;
qint64 currentPosition; qint64 currentPosition;
@ -121,12 +121,12 @@ class QNonContiguousByteDeviceRingBufferImpl : public QNonContiguousByteDevice
public: public:
QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb); QNonContiguousByteDeviceRingBufferImpl(QSharedPointer<QRingBuffer> rb);
~QNonContiguousByteDeviceRingBufferImpl(); ~QNonContiguousByteDeviceRingBufferImpl();
const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; const char* readPointer(qint64 maximumLength, qint64 &len) override;
bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; bool advanceReadPointer(qint64 amount) override;
bool atEnd() const Q_DECL_OVERRIDE; bool atEnd() const override;
bool reset() Q_DECL_OVERRIDE; bool reset() override;
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
qint64 pos() const Q_DECL_OVERRIDE; qint64 pos() const override;
protected: protected:
QSharedPointer<QRingBuffer> ringBuffer; QSharedPointer<QRingBuffer> ringBuffer;
qint64 currentPosition; qint64 currentPosition;
@ -139,12 +139,12 @@ class QNonContiguousByteDeviceIoDeviceImpl : public QNonContiguousByteDevice
public: public:
QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d); QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d);
~QNonContiguousByteDeviceIoDeviceImpl(); ~QNonContiguousByteDeviceIoDeviceImpl();
const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; const char* readPointer(qint64 maximumLength, qint64 &len) override;
bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; bool advanceReadPointer(qint64 amount) override;
bool atEnd() const Q_DECL_OVERRIDE; bool atEnd() const override;
bool reset() Q_DECL_OVERRIDE; bool reset() override;
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
qint64 pos() const Q_DECL_OVERRIDE; qint64 pos() const override;
protected: protected:
QIODevice* device; QIODevice* device;
QByteArray* currentReadBuffer; QByteArray* currentReadBuffer;
@ -162,11 +162,11 @@ class QNonContiguousByteDeviceBufferImpl : public QNonContiguousByteDevice
public: public:
QNonContiguousByteDeviceBufferImpl(QBuffer *b); QNonContiguousByteDeviceBufferImpl(QBuffer *b);
~QNonContiguousByteDeviceBufferImpl(); ~QNonContiguousByteDeviceBufferImpl();
const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; const char* readPointer(qint64 maximumLength, qint64 &len) override;
bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; bool advanceReadPointer(qint64 amount) override;
bool atEnd() const Q_DECL_OVERRIDE; bool atEnd() const override;
bool reset() Q_DECL_OVERRIDE; bool reset() override;
qint64 size() const Q_DECL_OVERRIDE; qint64 size() const override;
protected: protected:
QBuffer* buffer; QBuffer* buffer;
QByteArray byteArray; QByteArray byteArray;
@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice
public: public:
QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd);
~QByteDeviceWrappingIoDevice (); ~QByteDeviceWrappingIoDevice ();
virtual bool isSequential () const Q_DECL_OVERRIDE; virtual bool isSequential () const override;
virtual bool atEnd () const Q_DECL_OVERRIDE; virtual bool atEnd () const override;
virtual bool reset () Q_DECL_OVERRIDE; virtual bool reset () override;
virtual qint64 size () const Q_DECL_OVERRIDE; virtual qint64 size () const override;
protected: protected:
virtual qint64 readData ( char * data, qint64 maxSize ) Q_DECL_OVERRIDE; virtual qint64 readData ( char * data, qint64 maxSize ) override;
virtual qint64 writeData ( const char * data, qint64 maxSize ) Q_DECL_OVERRIDE; virtual qint64 writeData ( const char * data, qint64 maxSize ) override;
QNonContiguousByteDevice *byteDevice; QNonContiguousByteDevice *byteDevice;
}; };

22
src/corelib/io/qprocess.h
View File

@ -164,7 +164,7 @@ public:
#endif #endif
void start(OpenMode mode = ReadWrite); void start(OpenMode mode = ReadWrite);
bool startDetached(qint64 *pid = nullptr); bool startDetached(qint64 *pid = nullptr);
bool open(OpenMode mode = ReadWrite) Q_DECL_OVERRIDE; bool open(OpenMode mode = ReadWrite) override;
QString program() const; QString program() const;
void setProgram(const QString &program); void setProgram(const QString &program);
@ -227,8 +227,8 @@ public:
qint64 processId() const; qint64 processId() const;
bool waitForStarted(int msecs = 30000); bool waitForStarted(int msecs = 30000);
bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; bool waitForReadyRead(int msecs = 30000) override;
bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; bool waitForBytesWritten(int msecs = 30000) override;
bool waitForFinished(int msecs = 30000); bool waitForFinished(int msecs = 30000);
QByteArray readAllStandardOutput(); QByteArray readAllStandardOutput();
@ -238,12 +238,12 @@ public:
QProcess::ExitStatus exitStatus() const; QProcess::ExitStatus exitStatus() const;
// QIODevice // QIODevice
qint64 bytesAvailable() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override qint64 bytesAvailable() const override; // ### Qt6: remove trivial override
qint64 bytesToWrite() const Q_DECL_OVERRIDE; qint64 bytesToWrite() const override;
bool isSequential() const Q_DECL_OVERRIDE; bool isSequential() const override;
bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override bool canReadLine() const override; // ### Qt6: remove trivial override
void close() Q_DECL_OVERRIDE; void close() override;
bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override bool atEnd() const override; // ### Qt6: remove trivial override
static int execute(const QString &program, const QStringList &arguments); static int execute(const QString &program, const QStringList &arguments);
static int execute(const QString &command); static int execute(const QString &command);
@ -286,8 +286,8 @@ protected:
virtual void setupChildProcess(); virtual void setupChildProcess();
// QIODevice // QIODevice
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; qint64 readData(char *data, qint64 maxlen) override;
qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; qint64 writeData(const char *data, qint64 len) override;
private: private:
Q_DECLARE_PRIVATE(QProcess) Q_DECLARE_PRIVATE(QProcess)

6
src/corelib/io/qresource.cpp
View File

@ -911,8 +911,8 @@ public:
inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { } inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { }
inline ~QDynamicBufferResourceRoot() { } inline ~QDynamicBufferResourceRoot() { }
inline const uchar *mappingBuffer() const { return buffer; } inline const uchar *mappingBuffer() const { return buffer; }
virtual QString mappingRoot() const Q_DECL_OVERRIDE { return root; } virtual QString mappingRoot() const override { return root; }
virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_Buffer; } virtual ResourceRootType type() const override { return Resource_Buffer; }
// size == -1 means "unknown" // size == -1 means "unknown"
bool registerSelf(const uchar *b, int size) bool registerSelf(const uchar *b, int size)
@ -994,7 +994,7 @@ public:
} }
} }
QString mappingFile() const { return fileName; } QString mappingFile() const { return fileName; }
virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_File; } virtual ResourceRootType type() const override { return Resource_File; }
bool registerSelf(const QString &f) { bool registerSelf(const QString &f) {
bool fromMM = false; bool fromMM = false;

6
src/corelib/io/qresource_iterator_p.h
View File

@ -63,10 +63,10 @@ public:
QResourceFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); QResourceFileEngineIterator(QDir::Filters filters, const QStringList &filterNames);
~QResourceFileEngineIterator(); ~QResourceFileEngineIterator();
QString next() Q_DECL_OVERRIDE; QString next() override;
bool hasNext() const Q_DECL_OVERRIDE; bool hasNext() const override;
QString currentFileName() const Q_DECL_OVERRIDE; QString currentFileName() const override;
private: private:
mutable QStringList entries; mutable QStringList entries;

60
src/corelib/io/qresource_p.h
View File

@ -64,52 +64,52 @@ public:
explicit QResourceFileEngine(const QString &path); explicit QResourceFileEngine(const QString &path);
~QResourceFileEngine(); ~QResourceFileEngine();
virtual void setFileName(const QString &file) Q_DECL_OVERRIDE; virtual void setFileName(const QString &file) override;
virtual bool open(QIODevice::OpenMode flags) Q_DECL_OVERRIDE ; virtual bool open(QIODevice::OpenMode flags) override ;
virtual bool close() Q_DECL_OVERRIDE; virtual bool close() override;
virtual bool flush() Q_DECL_OVERRIDE; virtual bool flush() override;
virtual qint64 size() const Q_DECL_OVERRIDE; virtual qint64 size() const override;
virtual qint64 pos() const Q_DECL_OVERRIDE; virtual qint64 pos() const override;
virtual bool atEnd() const; virtual bool atEnd() const;
virtual bool seek(qint64) Q_DECL_OVERRIDE; virtual bool seek(qint64) override;
virtual qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; virtual qint64 read(char *data, qint64 maxlen) override;
virtual qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; virtual qint64 write(const char *data, qint64 len) override;
virtual bool remove() Q_DECL_OVERRIDE; virtual bool remove() override;
virtual bool copy(const QString &newName) Q_DECL_OVERRIDE; virtual bool copy(const QString &newName) override;
virtual bool rename(const QString &newName) Q_DECL_OVERRIDE; virtual bool rename(const QString &newName) override;
virtual bool link(const QString &newName) Q_DECL_OVERRIDE; virtual bool link(const QString &newName) override;
virtual bool isSequential() const Q_DECL_OVERRIDE; virtual bool isSequential() const override;
virtual bool isRelativePath() const Q_DECL_OVERRIDE; virtual bool isRelativePath() const override;
virtual bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE; virtual bool mkdir(const QString &dirName, bool createParentDirectories) const override;
virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE; virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override;
virtual bool setSize(qint64 size) Q_DECL_OVERRIDE; virtual bool setSize(qint64 size) override;
virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE; virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override;
virtual bool caseSensitive() const Q_DECL_OVERRIDE; virtual bool caseSensitive() const override;
virtual FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE; virtual FileFlags fileFlags(FileFlags type) const override;
virtual bool setPermissions(uint perms) Q_DECL_OVERRIDE; virtual bool setPermissions(uint perms) override;
virtual QString fileName(QAbstractFileEngine::FileName file) const Q_DECL_OVERRIDE; virtual QString fileName(QAbstractFileEngine::FileName file) const override;
virtual uint ownerId(FileOwner) const Q_DECL_OVERRIDE; virtual uint ownerId(FileOwner) const override;
virtual QString owner(FileOwner) const Q_DECL_OVERRIDE; virtual QString owner(FileOwner) const override;
virtual QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; virtual QDateTime fileTime(FileTime time) const override;
virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override;
virtual Iterator *endEntryList() Q_DECL_OVERRIDE; virtual Iterator *endEntryList() override;
bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE; bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override;
bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; bool supportsExtension(Extension extension) const override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

8
src/corelib/io/qsavefile.h
View File

@ -72,10 +72,10 @@ public:
#endif #endif
~QSaveFile(); ~QSaveFile();
QString fileName() const Q_DECL_OVERRIDE; QString fileName() const override;
void setFileName(const QString &name); void setFileName(const QString &name);
bool open(OpenMode flags) Q_DECL_OVERRIDE; bool open(OpenMode flags) override;
bool commit(); bool commit();
void cancelWriting(); void cancelWriting();
@ -84,10 +84,10 @@ public:
bool directWriteFallback() const; bool directWriteFallback() const;
protected: protected:
qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; qint64 writeData(const char *data, qint64 len) override;
private: private:
void close() Q_DECL_OVERRIDE; void close() override;
#if !QT_CONFIG(translation) #if !QT_CONFIG(translation)
static QString tr(const char *string) { return QString::fromLatin1(string); } static QString tr(const char *string) { return QString::fromLatin1(string); }
#endif #endif

2
src/corelib/io/qsettings.h
View File

@ -199,7 +199,7 @@ public:
protected: protected:
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
#endif #endif
private: private:

18
src/corelib/io/qsettings_p.h
View File

@ -261,17 +261,17 @@ public:
QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format); QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format);
~QConfFileSettingsPrivate(); ~QConfFileSettingsPrivate();
void remove(const QString &key) Q_DECL_OVERRIDE; void remove(const QString &key) override;
void set(const QString &key, const QVariant &value) Q_DECL_OVERRIDE; void set(const QString &key, const QVariant &value) override;
bool get(const QString &key, QVariant *value) const Q_DECL_OVERRIDE; bool get(const QString &key, QVariant *value) const override;
QStringList children(const QString &prefix, ChildSpec spec) const Q_DECL_OVERRIDE; QStringList children(const QString &prefix, ChildSpec spec) const override;
void clear() Q_DECL_OVERRIDE; void clear() override;
void sync() Q_DECL_OVERRIDE; void sync() override;
void flush() Q_DECL_OVERRIDE; void flush() override;
bool isWritable() const Q_DECL_OVERRIDE; bool isWritable() const override;
QString fileName() const Q_DECL_OVERRIDE; QString fileName() const override;
bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections); bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections);
static bool readIniSection(const QSettingsKey &section, const QByteArray &data, static bool readIniSection(const QSettingsKey &section, const QByteArray &data,

4
src/corelib/io/qtemporaryfile.h
View File

@ -77,7 +77,7 @@ public:
// ### Hides open(flags) // ### Hides open(flags)
bool open() { return open(QIODevice::ReadWrite); } bool open() { return open(QIODevice::ReadWrite); }
QString fileName() const Q_DECL_OVERRIDE; QString fileName() const override;
QString fileTemplate() const; QString fileTemplate() const;
void setFileTemplate(const QString &name); void setFileTemplate(const QString &name);
@ -95,7 +95,7 @@ public:
static QTemporaryFile *createNativeFile(QFile &file); static QTemporaryFile *createNativeFile(QFile &file);
protected: protected:
bool open(OpenMode flags) Q_DECL_OVERRIDE; bool open(OpenMode flags) override;
private: private:
friend class QFile; friend class QFile;

12
src/corelib/itemmodels/qabstractitemmodel.cpp
View File

@ -482,12 +482,12 @@ class QEmptyItemModel : public QAbstractItemModel
{ {
public: public:
explicit QEmptyItemModel(QObject *parent = 0) : QAbstractItemModel(parent) {} explicit QEmptyItemModel(QObject *parent = 0) : QAbstractItemModel(parent) {}
QModelIndex index(int, int, const QModelIndex &) const Q_DECL_OVERRIDE { return QModelIndex(); } QModelIndex index(int, int, const QModelIndex &) const override { return QModelIndex(); }
QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE { return QModelIndex(); } QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); }
int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE { return 0; } int rowCount(const QModelIndex &) const override { return 0; }
int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE { return 0; } int columnCount(const QModelIndex &) const override { return 0; }
bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE { return false; } bool hasChildren(const QModelIndex &) const override { return false; }
QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE { return QVariant(); } QVariant data(const QModelIndex &, int) const override { return QVariant(); }
}; };
Q_GLOBAL_STATIC(QEmptyItemModel, qEmptyModel) Q_GLOBAL_STATIC(QEmptyItemModel, qEmptyModel)

26
src/corelib/itemmodels/qabstractitemmodel.h
View File

@ -370,12 +370,12 @@ public:
explicit QAbstractTableModel(QObject *parent = Q_NULLPTR); explicit QAbstractTableModel(QObject *parent = Q_NULLPTR);
~QAbstractTableModel(); ~QAbstractTableModel();
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; int row, int column, const QModelIndex &parent) override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
using QObject::parent; using QObject::parent;
@ -384,8 +384,8 @@ protected:
private: private:
Q_DISABLE_COPY(QAbstractTableModel) Q_DISABLE_COPY(QAbstractTableModel)
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &child) const override;
bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE; bool hasChildren(const QModelIndex &parent) const override;
}; };
class Q_CORE_EXPORT QAbstractListModel : public QAbstractItemModel class Q_CORE_EXPORT QAbstractListModel : public QAbstractItemModel
@ -396,12 +396,12 @@ public:
explicit QAbstractListModel(QObject *parent = Q_NULLPTR); explicit QAbstractListModel(QObject *parent = Q_NULLPTR);
~QAbstractListModel(); ~QAbstractListModel();
QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; int row, int column, const QModelIndex &parent) override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
using QObject::parent; using QObject::parent;
@ -410,9 +410,9 @@ protected:
private: private:
Q_DISABLE_COPY(QAbstractListModel) Q_DISABLE_COPY(QAbstractListModel)
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &child) const override;
int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex &parent) const override;
bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE; bool hasChildren(const QModelIndex &parent) const override;
}; };
// inline implementations // inline implementations

44
src/corelib/itemmodels/qabstractproxymodel.h
View File

@ -68,34 +68,34 @@ public:
Q_INVOKABLE virtual QItemSelection mapSelectionToSource(const QItemSelection &selection) const; Q_INVOKABLE virtual QItemSelection mapSelectionToSource(const QItemSelection &selection) const;
Q_INVOKABLE virtual QItemSelection mapSelectionFromSource(const QItemSelection &selection) const; Q_INVOKABLE virtual QItemSelection mapSelectionFromSource(const QItemSelection &selection) const;
bool submit() Q_DECL_OVERRIDE; bool submit() override;
void revert() Q_DECL_OVERRIDE; void revert() override;
QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
QMap<int, QVariant> itemData(const QModelIndex &index) const Q_DECL_OVERRIDE; QMap<int, QVariant> itemData(const QModelIndex &index) const override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
bool setItemData(const QModelIndex& index, const QMap<int, QVariant> &roles) Q_DECL_OVERRIDE; bool setItemData(const QModelIndex& index, const QMap<int, QVariant> &roles) override;
bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) override;
QModelIndex buddy(const QModelIndex &index) const Q_DECL_OVERRIDE; QModelIndex buddy(const QModelIndex &index) const override;
bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; bool canFetchMore(const QModelIndex &parent) const override;
void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE; void fetchMore(const QModelIndex &parent) override;
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
QSize span(const QModelIndex &index) const Q_DECL_OVERRIDE; QSize span(const QModelIndex &index) const override;
bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
QMimeData* mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; QMimeData* mimeData(const QModelIndexList &indexes) const override;
bool canDropMimeData(const QMimeData *data, Qt::DropAction action, bool canDropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE; int row, int column, const QModelIndex &parent) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; int row, int column, const QModelIndex &parent) override;
QStringList mimeTypes() const Q_DECL_OVERRIDE; QStringList mimeTypes() const override;
Qt::DropActions supportedDragActions() const Q_DECL_OVERRIDE; Qt::DropActions supportedDragActions() const override;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; Qt::DropActions supportedDropActions() const override;
Q_SIGNALS: Q_SIGNALS:
void sourceModelChanged(QPrivateSignal); void sourceModelChanged(QPrivateSignal);

34
src/corelib/itemmodels/qidentityproxymodel.h
View File

@ -57,26 +57,26 @@ public:
explicit QIdentityProxyModel(QObject* parent = Q_NULLPTR); explicit QIdentityProxyModel(QObject* parent = Q_NULLPTR);
~QIdentityProxyModel(); ~QIdentityProxyModel();
int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex& parent = QModelIndex()) const override;
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override;
QModelIndex mapFromSource(const QModelIndex& sourceIndex) const Q_DECL_OVERRIDE; QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override;
QModelIndex mapToSource(const QModelIndex& proxyIndex) const Q_DECL_OVERRIDE; QModelIndex mapToSource(const QModelIndex& proxyIndex) const override;
QModelIndex parent(const QModelIndex& child) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex& child) const override;
using QObject::parent; using QObject::parent;
int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex& parent = QModelIndex()) const override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) Q_DECL_OVERRIDE; bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
QItemSelection mapSelectionFromSource(const QItemSelection& selection) const Q_DECL_OVERRIDE; QItemSelection mapSelectionFromSource(const QItemSelection& selection) const override;
QItemSelection mapSelectionToSource(const QItemSelection& selection) const Q_DECL_OVERRIDE; QItemSelection mapSelectionToSource(const QItemSelection& selection) const override;
QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const Q_DECL_OVERRIDE; QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const override;
void setSourceModel(QAbstractItemModel* sourceModel) Q_DECL_OVERRIDE; void setSourceModel(QAbstractItemModel* sourceModel) override;
bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override;
bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override;
bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override;
protected: protected:
QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent); QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent);

2
src/corelib/itemmodels/qsortfilterproxymodel.cpp
View File

@ -300,7 +300,7 @@ public:
void updateChildrenMapping(const QModelIndex &source_parent, Mapping *parent_mapping, void updateChildrenMapping(const QModelIndex &source_parent, Mapping *parent_mapping,
Qt::Orientation orient, int start, int end, int delta_item_count, bool remove); Qt::Orientation orient, int start, int end, int delta_item_count, bool remove);
virtual void _q_sourceModelDestroyed() Q_DECL_OVERRIDE; virtual void _q_sourceModelDestroyed() override;
bool needsReorder(const QVector<int> &source_rows, const QModelIndex &source_parent) const; bool needsReorder(const QVector<int> &source_rows, const QModelIndex &source_parent) const;

60
src/corelib/itemmodels/qsortfilterproxymodel.h
View File

@ -73,13 +73,13 @@ public:
explicit QSortFilterProxyModel(QObject *parent = Q_NULLPTR); explicit QSortFilterProxyModel(QObject *parent = Q_NULLPTR);
~QSortFilterProxyModel(); ~QSortFilterProxyModel();
void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; void setSourceModel(QAbstractItemModel *sourceModel) override;
QModelIndex mapToSource(const QModelIndex &proxyIndex) const Q_DECL_OVERRIDE; QModelIndex mapToSource(const QModelIndex &proxyIndex) const override;
QModelIndex mapFromSource(const QModelIndex &sourceIndex) const Q_DECL_OVERRIDE; QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override;
QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const Q_DECL_OVERRIDE; QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const override;
QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const Q_DECL_OVERRIDE; QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const override;
QRegExp filterRegExp() const; QRegExp filterRegExp() const;
void setFilterRegExp(const QRegExp &regExp); void setFilterRegExp(const QRegExp &regExp);
@ -129,44 +129,44 @@ protected:
public: public:
using QObject::parent; using QObject::parent;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &child) const override;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override;
bool setHeaderData(int section, Qt::Orientation orientation, bool setHeaderData(int section, Qt::Orientation orientation,
const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; const QVariant &value, int role = Qt::EditRole) override;
QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; QMimeData *mimeData(const QModelIndexList &indexes) const override;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; int row, int column, const QModelIndex &parent) override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override;
void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE; void fetchMore(const QModelIndex &parent) override;
bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; bool canFetchMore(const QModelIndex &parent) const override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
QModelIndex buddy(const QModelIndex &index) const Q_DECL_OVERRIDE; QModelIndex buddy(const QModelIndex &index) const override;
QModelIndexList match(const QModelIndex &start, int role, QModelIndexList match(const QModelIndex &start, int role,
const QVariant &value, int hits = 1, const QVariant &value, int hits = 1,
Qt::MatchFlags flags = Qt::MatchFlags flags =
Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const Q_DECL_OVERRIDE; Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const override;
QSize span(const QModelIndex &index) const Q_DECL_OVERRIDE; QSize span(const QModelIndex &index) const override;
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
QStringList mimeTypes() const Q_DECL_OVERRIDE; QStringList mimeTypes() const override;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; Qt::DropActions supportedDropActions() const override;
private: private:
Q_DECLARE_PRIVATE(QSortFilterProxyModel) Q_DECLARE_PRIVATE(QSortFilterProxyModel)
Q_DISABLE_COPY(QSortFilterProxyModel) Q_DISABLE_COPY(QSortFilterProxyModel)

18
src/corelib/itemmodels/qstringlistmodel.h
View File

@ -55,23 +55,23 @@ public:
explicit QStringListModel(QObject *parent = Q_NULLPTR); explicit QStringListModel(QObject *parent = Q_NULLPTR);
explicit QStringListModel(const QStringList &strings, QObject *parent = Q_NULLPTR); explicit QStringListModel(const QStringList &strings, QObject *parent = Q_NULLPTR);
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
QStringList stringList() const; QStringList stringList() const;
void setStringList(const QStringList &strings); void setStringList(const QStringList &strings);
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; Qt::DropActions supportedDropActions() const override;
private: private:
Q_DISABLE_COPY(QStringListModel) Q_DISABLE_COPY(QStringListModel)

2
src/corelib/kernel/qcoreapplication.h
View File

@ -187,7 +187,7 @@ Q_SIGNALS:
void applicationVersionChanged(); void applicationVersionChanged();
protected: protected:
bool event(QEvent *) Q_DECL_OVERRIDE; bool event(QEvent *) override;
virtual bool compressEvent(QEvent *, QObject *receiver, QPostEventList *); virtual bool compressEvent(QEvent *, QObject *receiver, QPostEventList *);
#endif // QT_NO_QOBJECT #endif // QT_NO_QOBJECT

4
src/corelib/kernel/qeventdispatcher_glib_p.h
View File

@ -70,8 +70,8 @@ public:
explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0); explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0);
~QEventDispatcherGlib(); ~QEventDispatcherGlib();
bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
bool hasPendingEvents() Q_DECL_OVERRIDE; bool hasPendingEvents() override;
void registerSocketNotifier(QSocketNotifier *socketNotifier) Q_DECL_FINAL; void registerSocketNotifier(QSocketNotifier *socketNotifier) Q_DECL_FINAL;
void unregisterSocketNotifier(QSocketNotifier *socketNotifier) Q_DECL_FINAL; void unregisterSocketNotifier(QSocketNotifier *socketNotifier) Q_DECL_FINAL;

6
src/corelib/kernel/qeventdispatcher_unix_p.h
View File

@ -105,8 +105,8 @@ public:
explicit QEventDispatcherUNIX(QObject *parent = 0); explicit QEventDispatcherUNIX(QObject *parent = 0);
~QEventDispatcherUNIX(); ~QEventDispatcherUNIX();
bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; bool processEvents(QEventLoop::ProcessEventsFlags flags) override;
bool hasPendingEvents() Q_DECL_OVERRIDE; bool hasPendingEvents() override;
void registerSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL; void registerSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL;
void unregisterSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL; void unregisterSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL;
@ -120,7 +120,7 @@ public:
void wakeUp() Q_DECL_FINAL; void wakeUp() Q_DECL_FINAL;
void interrupt() Q_DECL_FINAL; void interrupt() Q_DECL_FINAL;
void flush() Q_DECL_OVERRIDE; void flush() override;
protected: protected:
QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = 0); QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = 0);

2
src/corelib/kernel/qeventloop.h
View File

@ -76,7 +76,7 @@ public:
void wakeUp(); void wakeUp();
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
public Q_SLOTS: public Q_SLOTS:
void quit(); void quit();

4
src/corelib/kernel/qobject_p.h
View File

@ -432,9 +432,9 @@ struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData,
{ {
~QAbstractDynamicMetaObject(); ~QAbstractDynamicMetaObject();
virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) Q_DECL_OVERRIDE { return this; } virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override { return this; }
virtual int createProperty(const char *, const char *) { return -1; } virtual int createProperty(const char *, const char *) { return -1; }
virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) Q_DECL_OVERRIDE virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) override
{ return metaCall(c, _id, a); } { return metaCall(c, _id, a); }
virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload
}; };

2
src/corelib/kernel/qsocketnotifier.h
View File

@ -68,7 +68,7 @@ Q_SIGNALS:
void activated(int socket, QPrivateSignal); void activated(int socket, QPrivateSignal);
protected: protected:
bool event(QEvent *) Q_DECL_OVERRIDE; bool event(QEvent *) override;
private: private:
Q_DISABLE_COPY(QSocketNotifier) Q_DISABLE_COPY(QSocketNotifier)

2
src/corelib/kernel/qtimer.cpp
View File

@ -271,7 +271,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void timeout(); void timeout();
protected: protected:
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *) override;
}; };
QSingleShotTimer::QSingleShotTimer(int msec, Qt::TimerType timerType, const QObject *r, const char *member) QSingleShotTimer::QSingleShotTimer(int msec, Qt::TimerType timerType, const QObject *r, const char *member)

2
src/corelib/kernel/qtimer.h
View File

@ -203,7 +203,7 @@ public:
#endif #endif
protected: protected:
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *) override;
private: private:
Q_DISABLE_COPY(QTimer) Q_DISABLE_COPY(QTimer)

38
src/corelib/mimetypes/qmimeprovider_p.h
View File

@ -98,17 +98,17 @@ public:
QMimeBinaryProvider(QMimeDatabasePrivate *db); QMimeBinaryProvider(QMimeDatabasePrivate *db);
virtual ~QMimeBinaryProvider(); virtual ~QMimeBinaryProvider();
virtual bool isValid() Q_DECL_OVERRIDE; virtual bool isValid() override;
virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; virtual QMimeType mimeTypeForName(const QString &name) override;
virtual QMimeGlobMatchResult findByFileName(const QString &fileName) Q_DECL_OVERRIDE; virtual QMimeGlobMatchResult findByFileName(const QString &fileName) override;
virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE; virtual QStringList parents(const QString &mime) override;
virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE; virtual QString resolveAlias(const QString &name) override;
virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE; virtual QStringList listAliases(const QString &name) override;
virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE; virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
virtual QList<QMimeType> allMimeTypes() Q_DECL_OVERRIDE; virtual QList<QMimeType> allMimeTypes() override;
virtual void loadMimeTypePrivate(QMimeTypePrivate &) Q_DECL_OVERRIDE; virtual void loadMimeTypePrivate(QMimeTypePrivate &) override;
virtual void loadIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE; virtual void loadIcon(QMimeTypePrivate &) override;
virtual void loadGenericIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE; virtual void loadGenericIcon(QMimeTypePrivate &) override;
private: private:
struct CacheFile; struct CacheFile;
@ -141,14 +141,14 @@ public:
QMimeXMLProvider(QMimeDatabasePrivate *db); QMimeXMLProvider(QMimeDatabasePrivate *db);
~QMimeXMLProvider(); ~QMimeXMLProvider();
virtual bool isValid() Q_DECL_OVERRIDE; virtual bool isValid() override;
virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; virtual QMimeType mimeTypeForName(const QString &name) override;
virtual QMimeGlobMatchResult findByFileName(const QString &fileName) Q_DECL_OVERRIDE; virtual QMimeGlobMatchResult findByFileName(const QString &fileName) override;
virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE; virtual QStringList parents(const QString &mime) override;
virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE; virtual QString resolveAlias(const QString &name) override;
virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE; virtual QStringList listAliases(const QString &name) override;
virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE; virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override;
virtual QList<QMimeType> allMimeTypes() Q_DECL_OVERRIDE; virtual QList<QMimeType> allMimeTypes() override;
bool load(const QString &fileName, QString *errorMessage); bool load(const QString &fileName, QString *errorMessage);

2
src/corelib/statemachine/qabstractstate.h
View File

@ -73,7 +73,7 @@ protected:
virtual void onEntry(QEvent *event) = 0; virtual void onEntry(QEvent *event) = 0;
virtual void onExit(QEvent *event) = 0; virtual void onExit(QEvent *event) = 0;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
protected: protected:
QAbstractState(QAbstractStatePrivate &dd, QState *parent); QAbstractState(QAbstractStatePrivate &dd, QState *parent);

2
src/corelib/statemachine/qabstracttransition.h
View File

@ -102,7 +102,7 @@ protected:
virtual void onTransition(QEvent *event) = 0; virtual void onTransition(QEvent *event) = 0;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
protected: protected:
QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent); QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent);

6
src/corelib/statemachine/qeventtransition.h
View File

@ -65,10 +65,10 @@ public:
void setEventType(QEvent::Type type); void setEventType(QEvent::Type type);
protected: protected:
bool eventTest(QEvent *event) Q_DECL_OVERRIDE; bool eventTest(QEvent *event) override;
void onTransition(QEvent *event) Q_DECL_OVERRIDE; void onTransition(QEvent *event) override;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
protected: protected:
QEventTransition(QEventTransitionPrivate &dd, QState *parent); QEventTransition(QEventTransitionPrivate &dd, QState *parent);

6
src/corelib/statemachine/qfinalstate.h
View File

@ -55,10 +55,10 @@ public:
~QFinalState(); ~QFinalState();
protected: protected:
void onEntry(QEvent *event) Q_DECL_OVERRIDE; void onEntry(QEvent *event) override;
void onExit(QEvent *event) Q_DECL_OVERRIDE; void onExit(QEvent *event) override;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
protected: protected:
explicit QFinalState(QFinalStatePrivate &dd, QState *parent); explicit QFinalState(QFinalStatePrivate &dd, QState *parent);

6
src/corelib/statemachine/qhistorystate.h
View File

@ -80,10 +80,10 @@ Q_SIGNALS:
void historyTypeChanged(QPrivateSignal); void historyTypeChanged(QPrivateSignal);
protected: protected:
void onEntry(QEvent *event) Q_DECL_OVERRIDE; void onEntry(QEvent *event) override;
void onExit(QEvent *event) Q_DECL_OVERRIDE; void onExit(QEvent *event) override;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
private: private:
Q_DISABLE_COPY(QHistoryState) Q_DISABLE_COPY(QHistoryState)

6
src/corelib/statemachine/qsignaltransition.h
View File

@ -80,10 +80,10 @@ public:
void setSignal(const QByteArray &signal); void setSignal(const QByteArray &signal);
protected: protected:
bool eventTest(QEvent *event) Q_DECL_OVERRIDE; bool eventTest(QEvent *event) override;
void onTransition(QEvent *event) Q_DECL_OVERRIDE; void onTransition(QEvent *event) override;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
Q_SIGNALS: Q_SIGNALS:
void senderObjectChanged(QPrivateSignal); void senderObjectChanged(QPrivateSignal);

2
src/corelib/statemachine/qsignaltransition_p.h
View File

@ -70,7 +70,7 @@ public:
void unregister(); void unregister();
void maybeRegister(); void maybeRegister();
virtual void callOnTransition(QEvent *e) Q_DECL_OVERRIDE; virtual void callOnTransition(QEvent *e) override;
const QObject *sender; const QObject *sender;
QByteArray signal; QByteArray signal;

4
src/corelib/statemachine/qstate.cpp
View File

@ -396,8 +396,8 @@ public:
: QAbstractTransition() : QAbstractTransition()
{ setTargetState(target); } { setTargetState(target); }
protected: protected:
void onTransition(QEvent *) Q_DECL_OVERRIDE {} void onTransition(QEvent *) override {}
bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } bool eventTest(QEvent *) override { return true; }
}; };
} // namespace } // namespace

6
src/corelib/statemachine/qstate.h
View File

@ -116,10 +116,10 @@ Q_SIGNALS:
void errorStateChanged(QPrivateSignal); void errorStateChanged(QPrivateSignal);
protected: protected:
void onEntry(QEvent *event) Q_DECL_OVERRIDE; void onEntry(QEvent *event) override;
void onExit(QEvent *event) Q_DECL_OVERRIDE; void onExit(QEvent *event) override;
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
protected: protected:
QState(QStatePrivate &dd, QState *parent); QState(QStatePrivate &dd, QState *parent);

8
src/corelib/statemachine/qstatemachine.cpp
View File

@ -1721,8 +1721,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const
: QAbstractTransition() : QAbstractTransition()
{ setTargetStates(targets); } { setTargetStates(targets); }
protected: protected:
virtual bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } virtual bool eventTest(QEvent *) override { return true; }
virtual void onTransition(QEvent *) Q_DECL_OVERRIDE {} virtual void onTransition(QEvent *) override {}
}; };
QState *root = rootState(); QState *root = rootState();
@ -2126,8 +2126,8 @@ public:
: QAbstractTransition() : QAbstractTransition()
{ setTargetState(target); } { setTargetState(target); }
protected: protected:
void onTransition(QEvent *) Q_DECL_OVERRIDE { deleteLater(); } void onTransition(QEvent *) override { deleteLater(); }
bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } bool eventTest(QEvent *) override { return true; }
}; };
} // namespace } // namespace

8
src/corelib/statemachine/qstatemachine.h
View File

@ -141,7 +141,7 @@ public:
QSet<QAbstractState*> configuration() const; QSet<QAbstractState*> configuration() const;
#if QT_CONFIG(qeventtransition) #if QT_CONFIG(qeventtransition)
bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; bool eventFilter(QObject *watched, QEvent *event) override;
#endif #endif
public Q_SLOTS: public Q_SLOTS:
@ -156,8 +156,8 @@ Q_SIGNALS:
protected: protected:
void onEntry(QEvent *event) Q_DECL_OVERRIDE; void onEntry(QEvent *event) override;
void onExit(QEvent *event) Q_DECL_OVERRIDE; void onExit(QEvent *event) override;
virtual void beginSelectTransitions(QEvent *event); virtual void beginSelectTransitions(QEvent *event);
virtual void endSelectTransitions(QEvent *event); virtual void endSelectTransitions(QEvent *event);
@ -165,7 +165,7 @@ protected:
virtual void beginMicrostep(QEvent *event); virtual void beginMicrostep(QEvent *event);
virtual void endMicrostep(QEvent *event); virtual void endMicrostep(QEvent *event);
bool event(QEvent *e) Q_DECL_OVERRIDE; bool event(QEvent *e) override;
protected: protected:
QStateMachine(QStateMachinePrivate &dd, QObject *parent); QStateMachine(QStateMachinePrivate &dd, QObject *parent);

4
src/corelib/thread/qexception.h
View File

@ -80,8 +80,8 @@ public:
throw() throw()
#endif #endif
; ;
void raise() const Q_DECL_OVERRIDE; void raise() const override;
QUnhandledException *clone() const Q_DECL_OVERRIDE; QUnhandledException *clone() const override;
}; };
namespace QtPrivate { namespace QtPrivate {

14
src/corelib/thread/qfuturewatcher.h
View File

@ -76,7 +76,7 @@ public:
void setPendingResultsLimit(int limit); void setPendingResultsLimit(int limit);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
Q_SIGNALS: Q_SIGNALS:
void started(); void started();
@ -98,8 +98,8 @@ public Q_SLOTS:
void togglePaused(); void togglePaused();
protected: protected:
void connectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE; void connectNotify (const QMetaMethod &signal) override;
void disconnectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE; void disconnectNotify (const QMetaMethod &signal) override;
// called from setFuture() implemented in template sub-classes // called from setFuture() implemented in template sub-classes
void connectOutputInterface(); void connectOutputInterface();
@ -166,8 +166,8 @@ public Q_SLOTS:
private: private:
QFuture<T> m_future; QFuture<T> m_future;
const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; } const QFutureInterfaceBase &futureInterface() const override { return m_future.d; }
QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; } QFutureInterfaceBase &futureInterface() override { return m_future.d; }
}; };
template <typename T> template <typename T>
@ -197,8 +197,8 @@ public:
private: private:
QFuture<void> m_future; QFuture<void> m_future;
const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; } const QFutureInterfaceBase &futureInterface() const override { return m_future.d; }
QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; } QFutureInterfaceBase &futureInterface() override { return m_future.d; }
}; };
Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_future) Q_INLINE_TEMPLATE void QFutureWatcher<void>::setFuture(const QFuture<void> &_future)

4
src/corelib/thread/qfuturewatcher_p.h
View File

@ -69,8 +69,8 @@ class QFutureWatcherBasePrivate : public QObjectPrivate,
public: public:
QFutureWatcherBasePrivate(); QFutureWatcherBasePrivate();
void postCallOutEvent(const QFutureCallOutEvent &callOutEvent) Q_DECL_OVERRIDE; void postCallOutEvent(const QFutureCallOutEvent &callOutEvent) override;
void callOutInterfaceDisconnected() Q_DECL_OVERRIDE; void callOutInterfaceDisconnected() override;
void sendCallOutEvent(QFutureCallOutEvent *event); void sendCallOutEvent(QFutureCallOutEvent *event);

2
src/corelib/thread/qthread.h
View File

@ -116,7 +116,7 @@ public:
QAbstractEventDispatcher *eventDispatcher() const; QAbstractEventDispatcher *eventDispatcher() const;
void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher); void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher);
bool event(QEvent *event) Q_DECL_OVERRIDE; bool event(QEvent *event) override;
int loopLevel() const; int loopLevel() const;
#ifdef QTHREAD_HAS_CREATE #ifdef QTHREAD_HAS_CREATE

2
src/corelib/thread/qthread_p.h
View File

@ -317,7 +317,7 @@ public:
void init(); void init();
private: private:
void run() Q_DECL_OVERRIDE; void run() override;
}; };
QT_END_NAMESPACE QT_END_NAMESPACE

2
src/corelib/thread/qthreadpool.cpp
View File

@ -56,7 +56,7 @@ class QThreadPoolThread : public QThread
{ {
public: public:
QThreadPoolThread(QThreadPoolPrivate *manager); QThreadPoolThread(QThreadPoolPrivate *manager);
void run() Q_DECL_OVERRIDE; void run() override;
void registerThreadInactive(); void registerThreadInactive();
QWaitCondition runnableReady; QWaitCondition runnableReady;

18
src/corelib/tools/qeasingcurve.cpp
View File

@ -496,7 +496,7 @@ struct BezierEase : public QEasingCurveFunction
} }
} }
QEasingCurveFunction *copy() const Q_DECL_OVERRIDE QEasingCurveFunction *copy() const override
{ {
BezierEase *rv = new BezierEase(); BezierEase *rv = new BezierEase();
rv->_t = _t; rv->_t = _t;
@ -532,7 +532,7 @@ struct BezierEase : public QEasingCurveFunction
return newT; return newT;
} }
qreal value(qreal x) Q_DECL_OVERRIDE qreal value(qreal x) override
{ {
Q_ASSERT(_bezierCurves.count() % 3 == 0); Q_ASSERT(_bezierCurves.count() % 3 == 0);
@ -826,7 +826,7 @@ struct TCBEase : public BezierEase
: BezierEase(QEasingCurve::TCBSpline) : BezierEase(QEasingCurve::TCBSpline)
{ } { }
qreal value(qreal x) Q_DECL_OVERRIDE qreal value(qreal x) override
{ {
Q_ASSERT(_bezierCurves.count() % 3 == 0); Q_ASSERT(_bezierCurves.count() % 3 == 0);
@ -846,7 +846,7 @@ struct ElasticEase : public QEasingCurveFunction
: QEasingCurveFunction(type, qreal(0.3), qreal(1.0)) : QEasingCurveFunction(type, qreal(0.3), qreal(1.0))
{ } { }
QEasingCurveFunction *copy() const Q_DECL_OVERRIDE QEasingCurveFunction *copy() const override
{ {
ElasticEase *rv = new ElasticEase(_t); ElasticEase *rv = new ElasticEase(_t);
rv->_p = _p; rv->_p = _p;
@ -856,7 +856,7 @@ struct ElasticEase : public QEasingCurveFunction
return rv; return rv;
} }
qreal value(qreal t) Q_DECL_OVERRIDE qreal value(qreal t) override
{ {
qreal p = (_p < 0) ? qreal(0.3) : _p; qreal p = (_p < 0) ? qreal(0.3) : _p;
qreal a = (_a < 0) ? qreal(1.0) : _a; qreal a = (_a < 0) ? qreal(1.0) : _a;
@ -881,7 +881,7 @@ struct BounceEase : public QEasingCurveFunction
: QEasingCurveFunction(type, qreal(0.3), qreal(1.0)) : QEasingCurveFunction(type, qreal(0.3), qreal(1.0))
{ } { }
QEasingCurveFunction *copy() const Q_DECL_OVERRIDE QEasingCurveFunction *copy() const override
{ {
BounceEase *rv = new BounceEase(_t); BounceEase *rv = new BounceEase(_t);
rv->_a = _a; rv->_a = _a;
@ -890,7 +890,7 @@ struct BounceEase : public QEasingCurveFunction
return rv; return rv;
} }
qreal value(qreal t) Q_DECL_OVERRIDE qreal value(qreal t) override
{ {
qreal a = (_a < 0) ? qreal(1.0) : _a; qreal a = (_a < 0) ? qreal(1.0) : _a;
switch(_t) { switch(_t) {
@ -914,7 +914,7 @@ struct BackEase : public QEasingCurveFunction
: QEasingCurveFunction(type, qreal(0.3), qreal(1.0), qreal(1.70158)) : QEasingCurveFunction(type, qreal(0.3), qreal(1.0), qreal(1.70158))
{ } { }
QEasingCurveFunction *copy() const Q_DECL_OVERRIDE QEasingCurveFunction *copy() const override
{ {
BackEase *rv = new BackEase(_t); BackEase *rv = new BackEase(_t);
rv->_o = _o; rv->_o = _o;
@ -923,7 +923,7 @@ struct BackEase : public QEasingCurveFunction
return rv; return rv;
} }
qreal value(qreal t) Q_DECL_OVERRIDE qreal value(qreal t) override
{ {
qreal o = (_o < 0) ? qreal(1.70158) : _o; qreal o = (_o < 0) ? qreal(1.70158) : _o;
switch(_t) { switch(_t) {

2
src/corelib/tools/qtimeline.h
View File

@ -127,7 +127,7 @@ Q_SIGNALS:
void finished(QPrivateSignal); void finished(QPrivateSignal);
protected: protected:
void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *event) override;
private: private:
Q_DISABLE_COPY(QTimeLine) Q_DISABLE_COPY(QTimeLine)

170
src/corelib/tools/qtimezoneprivate_p.h
View File

@ -189,26 +189,26 @@ public:
QUtcTimeZonePrivate *clone() const override; QUtcTimeZonePrivate *clone() const override;
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data data(qint64 forMSecsSinceEpoch) const override;
QLocale::Country country() const Q_DECL_OVERRIDE; QLocale::Country country() const override;
QString comment() const Q_DECL_OVERRIDE; QString comment() const override;
QString displayName(QTimeZone::TimeType timeType, QString displayName(QTimeZone::TimeType timeType,
QTimeZone::NameType nameType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds() const override;
QList<QByteArray> availableTimeZoneIds(QLocale::Country country) const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds(QLocale::Country country) const override;
QList<QByteArray> availableTimeZoneIds(int utcOffset) const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds(int utcOffset) const override;
void serialize(QDataStream &ds) const Q_DECL_OVERRIDE; void serialize(QDataStream &ds) const override;
private: private:
void init(const QByteArray &zoneId); void init(const QByteArray &zoneId);
@ -237,27 +237,27 @@ public:
QIcuTimeZonePrivate *clone() const override; QIcuTimeZonePrivate *clone() const override;
QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override;
bool hasDaylightTime() const Q_DECL_OVERRIDE; bool hasDaylightTime() const override;
bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; bool isDaylightTime(qint64 atMSecsSinceEpoch) const override;
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data data(qint64 forMSecsSinceEpoch) const override;
bool hasTransitions() const Q_DECL_OVERRIDE; bool hasTransitions() const override;
Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data nextTransition(qint64 afterMSecsSinceEpoch) const override;
Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data previousTransition(qint64 beforeMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds() const override;
QList<QByteArray> availableTimeZoneIds(QLocale::Country country) const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds(QLocale::Country country) const override;
QList<QByteArray> availableTimeZoneIds(int offsetFromUtc) const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds(int offsetFromUtc) const override;
private: private:
void init(const QByteArray &ianaId); void init(const QByteArray &ianaId);
@ -297,34 +297,34 @@ public:
QTzTimeZonePrivate *clone() const override; QTzTimeZonePrivate *clone() const override;
QLocale::Country country() const Q_DECL_OVERRIDE; QLocale::Country country() const override;
QString comment() const Q_DECL_OVERRIDE; QString comment() const override;
QString displayName(qint64 atMSecsSinceEpoch, QString displayName(qint64 atMSecsSinceEpoch,
QTimeZone::NameType nameType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString displayName(QTimeZone::TimeType timeType, QString displayName(QTimeZone::TimeType timeType,
QTimeZone::NameType nameType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override;
bool hasDaylightTime() const Q_DECL_OVERRIDE; bool hasDaylightTime() const override;
bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; bool isDaylightTime(qint64 atMSecsSinceEpoch) const override;
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data data(qint64 forMSecsSinceEpoch) const override;
bool hasTransitions() const Q_DECL_OVERRIDE; bool hasTransitions() const override;
Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data nextTransition(qint64 afterMSecsSinceEpoch) const override;
Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data previousTransition(qint64 beforeMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds() const override;
QList<QByteArray> availableTimeZoneIds(QLocale::Country country) const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds(QLocale::Country country) const override;
private: private:
void init(const QByteArray &ianaId); void init(const QByteArray &ianaId);
@ -353,28 +353,28 @@ public:
QMacTimeZonePrivate *clone() const override; QMacTimeZonePrivate *clone() const override;
QString comment() const Q_DECL_OVERRIDE; QString comment() const override;
QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override;
bool hasDaylightTime() const Q_DECL_OVERRIDE; bool hasDaylightTime() const override;
bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; bool isDaylightTime(qint64 atMSecsSinceEpoch) const override;
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data data(qint64 forMSecsSinceEpoch) const override;
bool hasTransitions() const Q_DECL_OVERRIDE; bool hasTransitions() const override;
Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data nextTransition(qint64 afterMSecsSinceEpoch) const override;
Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data previousTransition(qint64 beforeMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds() const override;
NSTimeZone *nsTimeZone() const; NSTimeZone *nsTimeZone() const;
@ -406,28 +406,28 @@ public:
QWinTimeZonePrivate *clone() const override; QWinTimeZonePrivate *clone() const override;
QString comment() const Q_DECL_OVERRIDE; QString comment() const override;
QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override;
bool hasDaylightTime() const Q_DECL_OVERRIDE; bool hasDaylightTime() const override;
bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; bool isDaylightTime(qint64 atMSecsSinceEpoch) const override;
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data data(qint64 forMSecsSinceEpoch) const override;
bool hasTransitions() const Q_DECL_OVERRIDE; bool hasTransitions() const override;
Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data nextTransition(qint64 afterMSecsSinceEpoch) const override;
Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data previousTransition(qint64 beforeMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds() const override;
private: private:
void init(const QByteArray &ianaId); void init(const QByteArray &ianaId);
@ -457,25 +457,25 @@ public:
QAndroidTimeZonePrivate *clone() const override; QAndroidTimeZonePrivate *clone() const override;
QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType,
const QLocale &locale) const Q_DECL_OVERRIDE; const QLocale &locale) const override;
QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; QString abbreviation(qint64 atMSecsSinceEpoch) const override;
int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int offsetFromUtc(qint64 atMSecsSinceEpoch) const override;
int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int standardTimeOffset(qint64 atMSecsSinceEpoch) const override;
int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override;
bool hasDaylightTime() const Q_DECL_OVERRIDE; bool hasDaylightTime() const override;
bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; bool isDaylightTime(qint64 atMSecsSinceEpoch) const override;
Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data data(qint64 forMSecsSinceEpoch) const override;
bool hasTransitions() const Q_DECL_OVERRIDE; bool hasTransitions() const override;
Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data nextTransition(qint64 afterMSecsSinceEpoch) const override;
Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; Data previousTransition(qint64 beforeMSecsSinceEpoch) const override;
QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; QByteArray systemTimeZoneId() const override;
QList<QByteArray> availableTimeZoneIds() const Q_DECL_OVERRIDE; QList<QByteArray> availableTimeZoneIds() const override;
private: private:
void init(const QByteArray &zoneId); void init(const QByteArray &zoneId);

2
src/dbus/qdbusabstractinterface.cpp
View File

@ -73,7 +73,7 @@ public:
: QMetaCallEvent(0, 0, Q_NULLPTR, sender, m.methodIndex()) : QMetaCallEvent(0, 0, Q_NULLPTR, sender, m.methodIndex())
{} {}
void placeMetaCall(QObject *object) Q_DECL_OVERRIDE void placeMetaCall(QObject *object) override
{ {
QDBusAbstractInterface *iface = static_cast<QDBusAbstractInterface *>(object); QDBusAbstractInterface *iface = static_cast<QDBusAbstractInterface *>(object);
QDBusAbstractInterfacePrivate::finishDisconnectNotify(iface, signalId()); QDBusAbstractInterfacePrivate::finishDisconnectNotify(iface, signalId());

6
src/dbus/qdbusabstractinterface.h
View File

@ -67,7 +67,7 @@ class QDBusAbstractInterfacePrivate;
class Q_DBUS_EXPORT QDBusAbstractInterfaceBase: public QObject class Q_DBUS_EXPORT QDBusAbstractInterfaceBase: public QObject
{ {
public: public:
int qt_metacall(QMetaObject::Call, int, void**) Q_DECL_OVERRIDE; int qt_metacall(QMetaObject::Call, int, void**) override;
protected: protected:
QDBusAbstractInterfaceBase(QDBusAbstractInterfacePrivate &dd, QObject *parent); QDBusAbstractInterfaceBase(QDBusAbstractInterfacePrivate &dd, QObject *parent);
private: private:
@ -147,8 +147,8 @@ protected:
const QDBusConnection &connection, QObject *parent); const QDBusConnection &connection, QObject *parent);
QDBusAbstractInterface(QDBusAbstractInterfacePrivate &, QObject *parent); QDBusAbstractInterface(QDBusAbstractInterfacePrivate &, QObject *parent);
void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; void connectNotify(const QMetaMethod &signal) override;
void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; void disconnectNotify(const QMetaMethod &signal) override;
QVariant internalPropGet(const char *propname) const; QVariant internalPropGet(const char *propname) const;
void internalPropSet(const char *propname, const QVariant &value); void internalPropSet(const char *propname, const QVariant &value);
QDBusMessage internalConstCall(QDBus::CallMode mode, QDBusMessage internalConstCall(QDBus::CallMode mode,

2
src/dbus/qdbusconnection_p.h
View File

@ -271,7 +271,7 @@ private:
void _q_newConnection(QDBusConnectionPrivate *newConnection); void _q_newConnection(QDBusConnectionPrivate *newConnection);
protected: protected:
void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *e) override;
public slots: public slots:
// public slots // public slots

4
src/dbus/qdbusconnectioninterface.h
View File

@ -115,8 +115,8 @@ Q_SIGNALS:
void NameLost(const QString &); void NameLost(const QString &);
void NameOwnerChanged(const QString &, const QString &, const QString &); void NameOwnerChanged(const QString &, const QString &, const QString &);
protected: protected:
void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; void connectNotify(const QMetaMethod &) override;
void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; void disconnectNotify(const QMetaMethod &) override;
#endif #endif
}; };

2
src/dbus/qdbusconnectionmanager_p.h
View File

@ -85,7 +85,7 @@ signals:
void serverRequested(const QString &address, void *server); void serverRequested(const QString &address, void *server);
protected: protected:
void run() Q_DECL_OVERRIDE; void run() override;
private: private:
void executeConnectionRequest(ConnectionRequestData *data); void executeConnectionRequest(ConnectionRequestData *data);

6
src/dbus/qdbusintegrator_p.h
View File

@ -109,7 +109,7 @@ public:
: QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f) : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f)
{ } { }
void placeMetaCall(QObject *object) Q_DECL_OVERRIDE void placeMetaCall(QObject *object) override
{ {
QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id()); QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id());
} }
@ -132,7 +132,7 @@ public:
{ } { }
~QDBusActivateObjectEvent(); ~QDBusActivateObjectEvent();
void placeMetaCall(QObject *) Q_DECL_OVERRIDE; void placeMetaCall(QObject *) override;
private: private:
QDBusConnection connection; // just for refcounting QDBusConnection connection; // just for refcounting
@ -151,7 +151,7 @@ public:
: QMetaCallEvent(0, 0, Q_NULLPTR, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) : QMetaCallEvent(0, 0, Q_NULLPTR, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count)
{} {}
~QDBusSpyCallEvent(); ~QDBusSpyCallEvent();
void placeMetaCall(QObject *) Q_DECL_OVERRIDE; void placeMetaCall(QObject *) override;
static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount); static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount);
QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up

6
src/dbus/qdbusinterface.h
View File

@ -62,9 +62,9 @@ public:
QObject *parent = Q_NULLPTR); QObject *parent = Q_NULLPTR);
~QDBusInterface(); ~QDBusInterface();
virtual const QMetaObject *metaObject() const Q_DECL_OVERRIDE; virtual const QMetaObject *metaObject() const override;
virtual void *qt_metacast(const char *) Q_DECL_OVERRIDE; virtual void *qt_metacast(const char *) override;
virtual int qt_metacall(QMetaObject::Call, int, void **) Q_DECL_OVERRIDE; virtual int qt_metacall(QMetaObject::Call, int, void **) override;
private: private:
Q_DECLARE_PRIVATE(QDBusInterface) Q_DECLARE_PRIVATE(QDBusInterface)

28
src/gui/accessible/qaccessibleobject.h
View File

@ -56,13 +56,13 @@ class Q_GUI_EXPORT QAccessibleObject : public QAccessibleInterface
public: public:
explicit QAccessibleObject(QObject *object); explicit QAccessibleObject(QObject *object);
bool isValid() const Q_DECL_OVERRIDE; bool isValid() const override;
QObject *object() const Q_DECL_OVERRIDE; QObject *object() const override;
// properties // properties
QRect rect() const Q_DECL_OVERRIDE; QRect rect() const override;
void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; void setText(QAccessible::Text t, const QString &text) override;
QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; QAccessibleInterface *childAt(int x, int y) const override;
protected: protected:
virtual ~QAccessibleObject(); virtual ~QAccessibleObject();
@ -77,20 +77,20 @@ class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject
public: public:
QAccessibleApplication(); QAccessibleApplication();
QWindow *window() const Q_DECL_OVERRIDE; QWindow *window() const override;
// relations // relations
int childCount() const Q_DECL_OVERRIDE; int childCount() const override;
int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; int indexOfChild(const QAccessibleInterface*) const override;
QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE; QAccessibleInterface *focusChild() const override;
// navigation // navigation
QAccessibleInterface *parent() const Q_DECL_OVERRIDE; QAccessibleInterface *parent() const override;
QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; QAccessibleInterface *child(int index) const override;
// properties and state // properties and state
QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; QString text(QAccessible::Text t) const override;
QAccessible::Role role() const Q_DECL_OVERRIDE; QAccessible::Role role() const override;
QAccessible::State state() const Q_DECL_OVERRIDE; QAccessible::State state() const override;
}; };
#endif // QT_NO_ACCESSIBILITY #endif // QT_NO_ACCESSIBILITY

20
src/gui/image/qicon_p.h
View File

@ -112,18 +112,18 @@ public:
QPixmapIconEngine(); QPixmapIconEngine();
QPixmapIconEngine(const QPixmapIconEngine &); QPixmapIconEngine(const QPixmapIconEngine &);
~QPixmapIconEngine(); ~QPixmapIconEngine();
void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override;
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
QPixmapIconEngineEntry *bestMatch(const QSize &size, QIcon::Mode mode, QIcon::State state, bool sizeOnly); QPixmapIconEngineEntry *bestMatch(const QSize &size, QIcon::Mode mode, QIcon::State state, bool sizeOnly);
QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) override;
void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) override;
QString key() const Q_DECL_OVERRIDE; QString key() const override;
QIconEngine *clone() const Q_DECL_OVERRIDE; QIconEngine *clone() const override;
bool read(QDataStream &in) Q_DECL_OVERRIDE; bool read(QDataStream &in) override;
bool write(QDataStream &out) const Q_DECL_OVERRIDE; bool write(QDataStream &out) const override;
void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; void virtual_hook(int id, void *data) override;
private: private:
QPixmapIconEngineEntry *tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state); QPixmapIconEngineEntry *tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state);

20
src/gui/image/qiconloader_p.h
View File

@ -101,13 +101,13 @@ public:
struct ScalableEntry : public QIconLoaderEngineEntry struct ScalableEntry : public QIconLoaderEngineEntry
{ {
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
QIcon svgIcon; QIcon svgIcon;
}; };
struct PixmapEntry : public QIconLoaderEngineEntry struct PixmapEntry : public QIconLoaderEngineEntry
{ {
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
QPixmap basePixmap; QPixmap basePixmap;
}; };
@ -125,20 +125,20 @@ public:
QIconLoaderEngine(const QString& iconName = QString()); QIconLoaderEngine(const QString& iconName = QString());
~QIconLoaderEngine(); ~QIconLoaderEngine();
void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override;
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override;
QIconEngine *clone() const Q_DECL_OVERRIDE; QIconEngine *clone() const override;
bool read(QDataStream &in) Q_DECL_OVERRIDE; bool read(QDataStream &in) override;
bool write(QDataStream &out) const Q_DECL_OVERRIDE; bool write(QDataStream &out) const override;
Q_GUI_EXPORT static QIconLoaderEngineEntry *entryForSize(const QThemeIconInfo &info, const QSize &size, int scale = 1); Q_GUI_EXPORT static QIconLoaderEngineEntry *entryForSize(const QThemeIconInfo &info, const QSize &size, int scale = 1);
private: private:
QString key() const Q_DECL_OVERRIDE; QString key() const override;
bool hasIcon() const; bool hasIcon() const;
void ensureLoaded(); void ensureLoaded();
void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; void virtual_hook(int id, void *data) override;
QIconLoaderEngine(const QIconLoaderEngine &other); QIconLoaderEngine(const QIconLoaderEngine &other);
QThemeIconInfo m_info; QThemeIconInfo m_info;

6
src/gui/image/qimage.h
View File

@ -164,7 +164,7 @@ public:
bool isNull() const; bool isNull() const;
int devType() const Q_DECL_OVERRIDE; int devType() const override;
bool operator==(const QImage &) const; bool operator==(const QImage &) const;
bool operator!=(const QImage &) const; bool operator!=(const QImage &) const;
@ -311,7 +311,7 @@ public:
#endif #endif
qint64 cacheKey() const; qint64 cacheKey() const;
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPaintEngine *paintEngine() const override;
// Auxiliary data // Auxiliary data
int dotsPerMeterX() const; int dotsPerMeterX() const;
@ -349,7 +349,7 @@ public:
#endif #endif
protected: protected:
virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; virtual int metric(PaintDeviceMetric metric) const override;
QImage mirrored_helper(bool horizontal, bool vertical) const; QImage mirrored_helper(bool horizontal, bool vertical) const;
QImage rgbSwapped_helper() const; QImage rgbSwapped_helper() const;
void mirrored_inplace(bool horizontal, bool vertical); void mirrored_inplace(bool horizontal, bool vertical);

22
src/gui/image/qpaintengine_pic_p.h
View File

@ -68,10 +68,10 @@ public:
QPicturePaintEngine(); QPicturePaintEngine();
~QPicturePaintEngine(); ~QPicturePaintEngine();
bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; bool begin(QPaintDevice *pdev) override;
bool end() Q_DECL_OVERRIDE; bool end() override;
void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; void updateState(const QPaintEngineState &state) override;
void updatePen(const QPen &pen); void updatePen(const QPen &pen);
void updateBrush(const QBrush &brush); void updateBrush(const QBrush &brush);
@ -86,18 +86,18 @@ public:
void updateClipEnabled(bool enabled); void updateClipEnabled(bool enabled);
void updateOpacity(qreal opacity); void updateOpacity(qreal opacity);
void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE; void drawEllipse(const QRectF &rect) override;
void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; void drawPath(const QPainterPath &path) override;
void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) Q_DECL_OVERRIDE; void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) override;
using QPaintEngine::drawPolygon; using QPaintEngine::drawPolygon;
void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override;
void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE; void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override;
void drawImage(const QRectF &r, const QImage &image, const QRectF &sr, void drawImage(const QRectF &r, const QImage &image, const QRectF &sr,
Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; Qt::ImageConversionFlags flags = Qt::AutoColor) override;
void drawTextItem(const QPointF &p, const QTextItem &ti) Q_DECL_OVERRIDE; void drawTextItem(const QPointF &p, const QTextItem &ti) override;
Type type() const Q_DECL_OVERRIDE { return Picture; } Type type() const override { return Picture; }
protected: protected:
QPicturePaintEngine(QPaintEnginePrivate &dptr); QPicturePaintEngine(QPaintEnginePrivate &dptr);

4
src/gui/image/qpicture.cpp
View File

@ -456,8 +456,8 @@ public:
QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); } QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); }
void setDpiX(int dpi) { dpi_x = dpi; } void setDpiX(int dpi) { dpi_x = dpi; }
void setDpiY(int dpi) { dpi_y = dpi; } void setDpiY(int dpi) { dpi_y = dpi; }
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE { return 0; } QPaintEngine *paintEngine() const override { return 0; }
int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE int metric(PaintDeviceMetric m) const override
{ {
switch(m) { switch(m) {
case PdmPhysicalDpiX: case PdmPhysicalDpiX:

6
src/gui/image/qpicture.h
View File

@ -62,7 +62,7 @@ public:
bool isNull() const; bool isNull() const;
int devType() const Q_DECL_OVERRIDE; int devType() const override;
uint size() const; uint size() const;
const char* data() const; const char* data() const;
virtual void setData(const char* data, uint size); virtual void setData(const char* data, uint size);
@ -98,12 +98,12 @@ public:
static QT_DEPRECATED QStringList outputFormatList(); static QT_DEPRECATED QStringList outputFormatList();
#endif // QT_DEPRECATED_SINCE(5, 10) #endif // QT_DEPRECATED_SINCE(5, 10)
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPaintEngine *paintEngine() const override;
protected: protected:
QPicture(QPicturePrivate &data); QPicture(QPicturePrivate &data);
int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE; int metric(PaintDeviceMetric m) const override;
private: private:
bool exec(QPainter *p, QDataStream &ds, int i); bool exec(QPainter *p, QDataStream &ds, int i);

6
src/gui/image/qpixmap.h
View File

@ -83,7 +83,7 @@ public:
operator QVariant() const; operator QVariant() const;
bool isNull() const; bool isNull() const;
int devType() const Q_DECL_OVERRIDE; int devType() const override;
int width() const; int width() const;
int height() const; int height() const;
@ -162,7 +162,7 @@ public:
bool isQBitmap() const; bool isQBitmap() const;
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPaintEngine *paintEngine() const override;
inline bool operator!() const { return isNull(); } inline bool operator!() const { return isNull(); }
@ -172,7 +172,7 @@ public:
#endif #endif
protected: protected:
int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; int metric(PaintDeviceMetric) const override;
static QPixmap fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor); static QPixmap fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor);
private: private:

20
src/gui/image/qpixmap_blitter_p.h
View File

@ -69,17 +69,17 @@ public:
QBlittable *blittable() const; QBlittable *blittable() const;
void setBlittable(QBlittable *blittable); void setBlittable(QBlittable *blittable);
void resize(int width, int height) Q_DECL_OVERRIDE; void resize(int width, int height) override;
int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; int metric(QPaintDevice::PaintDeviceMetric metric) const override;
void fill(const QColor &color) Q_DECL_OVERRIDE; void fill(const QColor &color) override;
QImage *buffer() Q_DECL_OVERRIDE; QImage *buffer() override;
QImage toImage() const Q_DECL_OVERRIDE; QImage toImage() const override;
bool hasAlphaChannel() const Q_DECL_OVERRIDE; bool hasAlphaChannel() const override;
void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override;
qreal devicePixelRatio() const Q_DECL_OVERRIDE; qreal devicePixelRatio() const override;
void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; void setDevicePixelRatio(qreal scaleFactor) override;
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; QPaintEngine *paintEngine() const override;
void markRasterOverlay(const QRectF &); void markRasterOverlay(const QRectF &);
void markRasterOverlay(const QPointF &, const QTextItem &); void markRasterOverlay(const QPointF &, const QTextItem &);

34
src/gui/image/qpixmap_raster_p.h
View File

@ -63,28 +63,28 @@ public:
QRasterPlatformPixmap(PixelType type); QRasterPlatformPixmap(PixelType type);
~QRasterPlatformPixmap(); ~QRasterPlatformPixmap();
QPlatformPixmap *createCompatiblePlatformPixmap() const Q_DECL_OVERRIDE; QPlatformPixmap *createCompatiblePlatformPixmap() const override;
void resize(int width, int height) Q_DECL_OVERRIDE; void resize(int width, int height) override;
bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags) override;
void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override;
void fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; void fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags) override;
void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) override;
void copy(const QPlatformPixmap *data, const QRect &rect) Q_DECL_OVERRIDE; void copy(const QPlatformPixmap *data, const QRect &rect) override;
bool scroll(int dx, int dy, const QRect &rect) Q_DECL_OVERRIDE; bool scroll(int dx, int dy, const QRect &rect) override;
void fill(const QColor &color) Q_DECL_OVERRIDE; void fill(const QColor &color) override;
bool hasAlphaChannel() const Q_DECL_OVERRIDE; bool hasAlphaChannel() const override;
QImage toImage() const Q_DECL_OVERRIDE; QImage toImage() const override;
QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE; QImage toImage(const QRect &rect) const override;
QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; QPaintEngine* paintEngine() const override;
QImage* buffer() Q_DECL_OVERRIDE; QImage* buffer() override;
qreal devicePixelRatio() const Q_DECL_OVERRIDE; qreal devicePixelRatio() const override;
void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; void setDevicePixelRatio(qreal scaleFactor) override;
protected: protected:
int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; int metric(QPaintDevice::PaintDeviceMetric metric) const override;
void createPixmapForImage(QImage sourceImage, Qt::ImageConversionFlags flags); void createPixmapForImage(QImage sourceImage, Qt::ImageConversionFlags flags);
void setImage(const QImage &image); void setImage(const QImage &image);
QImage image; QImage image;

2
src/gui/image/qpixmapcache.cpp
View File

@ -193,7 +193,7 @@ public:
QPMCache(); QPMCache();
~QPMCache(); ~QPMCache();
void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; void timerEvent(QTimerEvent *) override;
bool insert(const QString& key, const QPixmap &pixmap, int cost); bool insert(const QString& key, const QPixmap &pixmap, int cost);
QPixmapCache::Key insert(const QPixmap &pixmap, int cost); QPixmapCache::Key insert(const QPixmap &pixmap, int cost);
bool replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int cost); bool replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int cost);

44
src/gui/itemmodels/qstandarditemmodel.h
View File

@ -333,39 +333,39 @@ public:
void setItemRoleNames(const QHash<int,QByteArray> &roleNames); void setItemRoleNames(const QHash<int,QByteArray> &roleNames);
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex &child) const override;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; int rowCount(const QModelIndex &parent = QModelIndex()) const override;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; int columnCount(const QModelIndex &parent = QModelIndex()) const override;
bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; bool hasChildren(const QModelIndex &parent = QModelIndex()) const override;
// Qt 6: Remove // Qt 6: Remove
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; QModelIndex sibling(int row, int column, const QModelIndex &idx) const override;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override;
QVariant headerData(int section, Qt::Orientation orientation, QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; int role = Qt::DisplayRole) const override;
bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value,
int role = Qt::EditRole) Q_DECL_OVERRIDE; int role = Qt::EditRole) override;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override;
bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const override;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; Qt::DropActions supportedDropActions() const override;
QMap<int, QVariant> itemData(const QModelIndex &index) const Q_DECL_OVERRIDE; QMap<int, QVariant> itemData(const QModelIndex &index) const override;
bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) Q_DECL_OVERRIDE; bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) override;
void clear(); void clear();
using QObject::parent; using QObject::parent;
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override;
QStandardItem *itemFromIndex(const QModelIndex &index) const; QStandardItem *itemFromIndex(const QModelIndex &index) const;
QModelIndex indexFromItem(const QStandardItem *item) const; QModelIndex indexFromItem(const QStandardItem *item) const;
@ -414,9 +414,9 @@ public:
int sortRole() const; int sortRole() const;
void setSortRole(int role); void setSortRole(int role);
QStringList mimeTypes() const Q_DECL_OVERRIDE; QStringList mimeTypes() const override;
QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; QMimeData *mimeData(const QModelIndexList &indexes) const override;
bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override;
Q_SIGNALS: Q_SIGNALS:
void itemChanged(QStandardItem *item); void itemChanged(QStandardItem *item);

6
src/gui/kernel/qdnd_p.h
View File

@ -77,8 +77,8 @@ public:
QInternalMimeData(); QInternalMimeData();
~QInternalMimeData(); ~QInternalMimeData();
bool hasFormat(const QString &mimeType) const Q_DECL_OVERRIDE; bool hasFormat(const QString &mimeType) const override;
QStringList formats() const Q_DECL_OVERRIDE; QStringList formats() const override;
static bool canReadData(const QString &mimeType); static bool canReadData(const QString &mimeType);
@ -87,7 +87,7 @@ public:
static QByteArray renderDataHelper(const QString &mimeType, const QMimeData *data); static QByteArray renderDataHelper(const QString &mimeType, const QMimeData *data);
protected: protected:
QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE; QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override;
virtual bool hasFormat_sys(const QString &mimeType) const = 0; virtual bool hasFormat_sys(const QString &mimeType) const = 0;
virtual QStringList formats_sys() const = 0; virtual QStringList formats_sys() const = 0;

6
src/gui/kernel/qguiapplication.h
View File

@ -155,7 +155,7 @@ public:
static Qt::ApplicationState applicationState(); static Qt::ApplicationState applicationState();
static int exec(); static int exec();
bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; bool notify(QObject *, QEvent *) override;
#ifndef QT_NO_SESSIONMANAGER #ifndef QT_NO_SESSIONMANAGER
// session management // session management
@ -187,8 +187,8 @@ Q_SIGNALS:
void applicationDisplayNameChanged(); void applicationDisplayNameChanged();
protected: protected:
bool event(QEvent *) Q_DECL_OVERRIDE; bool event(QEvent *) override;
bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override;
QGuiApplication(QGuiApplicationPrivate &p); QGuiApplication(QGuiApplicationPrivate &p);

6
src/gui/kernel/qguiapplication_p.h
View File

@ -85,13 +85,13 @@ public:
void init(); void init();
void createPlatformIntegration(); void createPlatformIntegration();
void createEventDispatcher() Q_DECL_OVERRIDE; void createEventDispatcher() override;
void eventDispatcherReady() Q_DECL_OVERRIDE; void eventDispatcherReady() override;
virtual void notifyLayoutDirectionChange(); virtual void notifyLayoutDirectionChange();
virtual void notifyActiveWindowChange(QWindow *previous); virtual void notifyActiveWindowChange(QWindow *previous);
virtual bool shouldQuit() Q_DECL_OVERRIDE; virtual bool shouldQuit() override;
bool shouldQuitInternal(const QWindowList &processedWindows); bool shouldQuitInternal(const QWindowList &processedWindows);
virtual bool tryCloseAllWindows(); virtual bool tryCloseAllWindows();

Some files were not shown because too many files have changed in this diff Show More