Add Q_DECL_OVERRIDE in the src subdirectory

Done automatically with clang-modernize on linux

(But does not add Q_DECL_OVERRIDE to the function that are marked
 as inline because it a compilation error with MSVC2010)

Change-Id: I2196ee26e3e6fe20816834ecea5ea389eeab3171
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Olivier Goffart 2014-11-16 13:09:01 +01:00
parent 2e271795e7
commit 5180f32c5a
454 changed files with 3808 additions and 3808 deletions

View File

@ -107,7 +107,7 @@ private:
void startThreads(); void startThreads();
void threadExit(); void threadExit();
bool threadThrottleExit(); bool threadThrottleExit();
void run(); void run() Q_DECL_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);
@ -167,7 +167,7 @@ public:
return future; return future;
} }
void asynchronousFinish() void asynchronousFinish() Q_DECL_OVERRIDE
{ {
finish(); finish();
futureInterfaceTyped()->reportFinished(result()); futureInterfaceTyped()->reportFinished(result());

View File

@ -111,7 +111,7 @@ public Q_SLOTS:
protected: protected:
QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent = 0); QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent = 0);
bool event(QEvent *event); bool event(QEvent *event) Q_DECL_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);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -57,18 +57,18 @@ public:
QPauseAnimation *insertPause(int index, int msecs); QPauseAnimation *insertPause(int index, int msecs);
QAbstractAnimation *currentAnimation() const; QAbstractAnimation *currentAnimation() const;
int duration() const; int duration() const Q_DECL_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); bool event(QEvent *event) Q_DECL_OVERRIDE;
void updateCurrentTime(int); void updateCurrentTime(int) Q_DECL_OVERRIDE;
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE;
void updateDirection(QAbstractAnimation::Direction direction); void updateDirection(QAbstractAnimation::Direction direction) Q_DECL_OVERRIDE;
private: private:
Q_DISABLE_COPY(QSequentialAnimationGroup) Q_DISABLE_COPY(QSequentialAnimationGroup)

View File

@ -76,8 +76,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); void animationInsertedAt(int index) Q_DECL_OVERRIDE;
void animationRemoved(int index, QAbstractAnimation *anim); void animationRemoved(int index, QAbstractAnimation *anim) Q_DECL_OVERRIDE;
bool atEnd() const; bool atEnd() const;

View File

@ -76,7 +76,7 @@ public:
QVariant currentValue() const; QVariant currentValue() const;
int duration() const; int duration() const Q_DECL_OVERRIDE;
void setDuration(int msecs); void setDuration(int msecs);
QEasingCurve easingCurve() const; QEasingCurve easingCurve() const;
@ -89,10 +89,10 @@ Q_SIGNALS:
protected: protected:
QVariantAnimation(QVariantAnimationPrivate &dd, QObject *parent = 0); QVariantAnimation(QVariantAnimationPrivate &dd, QObject *parent = 0);
bool event(QEvent *event); bool event(QEvent *event) Q_DECL_OVERRIDE;
void updateCurrentTime(int); void updateCurrentTime(int) Q_DECL_OVERRIDE;
void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_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;

View File

@ -66,12 +66,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; QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE;
QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const; QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE;
QByteArray name() const; QByteArray name() const Q_DECL_OVERRIDE;
QList<QByteArray> aliases() const; QList<QByteArray> aliases() const Q_DECL_OVERRIDE;
int mibEnum() const; int mibEnum() const Q_DECL_OVERRIDE;
private: private:
QIcuCodec(const char *name); QIcuCodec(const char *name);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -67,22 +67,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); bool open(OpenMode openMode) Q_DECL_OVERRIDE;
void close(); void close() Q_DECL_OVERRIDE;
qint64 size() const; qint64 size() const Q_DECL_OVERRIDE;
qint64 pos() const; qint64 pos() const Q_DECL_OVERRIDE;
bool seek(qint64 off); bool seek(qint64 off) Q_DECL_OVERRIDE;
bool atEnd() const; bool atEnd() const Q_DECL_OVERRIDE;
bool canReadLine() const; bool canReadLine() const Q_DECL_OVERRIDE;
protected: protected:
#ifndef QT_NO_QOBJECT #ifndef QT_NO_QOBJECT
void connectNotify(const QMetaMethod &); void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE;
void disconnectNotify(const QMetaMethod &); void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE;
#endif #endif
qint64 readData(char *data, qint64 maxlen); qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
qint64 writeData(const char *data, qint64 len); qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
private: private:
Q_DECLARE_PRIVATE(QBuffer) Q_DECLARE_PRIVATE(QBuffer)

View File

@ -63,7 +63,7 @@ public:
#endif #endif
~QFile(); ~QFile();
QString fileName() const; QString fileName() const Q_DECL_OVERRIDE;
void setFileName(const QString &name); void setFileName(const QString &name);
#if defined(Q_OS_DARWIN) #if defined(Q_OS_DARWIN)
@ -116,18 +116,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); bool open(OpenMode flags) Q_DECL_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; qint64 size() const Q_DECL_OVERRIDE;
bool resize(qint64 sz); bool resize(qint64 sz) Q_DECL_OVERRIDE;
static bool resize(const QString &filename, qint64 sz); static bool resize(const QString &filename, qint64 sz);
Permissions permissions() const; Permissions permissions() const Q_DECL_OVERRIDE;
static Permissions permissions(const QString &filename); static Permissions permissions(const QString &filename);
bool setPermissions(Permissions permissionSpec); bool setPermissions(Permissions permissionSpec) Q_DECL_OVERRIDE;
static bool setPermissions(const QString &filename, Permissions permissionSpec); static bool setPermissions(const QString &filename, Permissions permissionSpec);
protected: protected:

View File

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

View File

@ -64,7 +64,7 @@ protected:
inline bool ensureFlushed() const; inline bool ensureFlushed() const;
bool putCharHelper(char c); bool putCharHelper(char c) Q_DECL_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);

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -182,8 +182,8 @@ public:
qint64 processId() const; qint64 processId() const;
bool waitForStarted(int msecs = 30000); bool waitForStarted(int msecs = 30000);
bool waitForReadyRead(int msecs = 30000); bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
bool waitForBytesWritten(int msecs = 30000); bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
bool waitForFinished(int msecs = 30000); bool waitForFinished(int msecs = 30000);
QByteArray readAllStandardOutput(); QByteArray readAllStandardOutput();
@ -193,12 +193,12 @@ public:
QProcess::ExitStatus exitStatus() const; QProcess::ExitStatus exitStatus() const;
// QIODevice // QIODevice
qint64 bytesAvailable() const; qint64 bytesAvailable() const Q_DECL_OVERRIDE;
qint64 bytesToWrite() const; qint64 bytesToWrite() const Q_DECL_OVERRIDE;
bool isSequential() const; bool isSequential() const Q_DECL_OVERRIDE;
bool canReadLine() const; bool canReadLine() const Q_DECL_OVERRIDE;
void close(); void close() Q_DECL_OVERRIDE;
bool atEnd() const; bool atEnd() const Q_DECL_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);
@ -254,8 +254,8 @@ protected:
virtual void setupChildProcess(); virtual void setupChildProcess();
// QIODevice // QIODevice
qint64 readData(char *data, qint64 maxlen); qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
qint64 writeData(const char *data, qint64 len); qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
private: private:
Q_DECLARE_PRIVATE(QProcess) Q_DECLARE_PRIVATE(QProcess)

View File

@ -165,7 +165,7 @@ public:
QProcessManager(); QProcessManager();
~QProcessManager(); ~QProcessManager();
void run(); void run() Q_DECL_OVERRIDE;
void catchDeadChildren(); void catchDeadChildren();
void add(pid_t pid, QProcess *process); void add(pid_t pid, QProcess *process);
void remove(QProcess *process); void remove(QProcess *process);

View File

@ -873,8 +873,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 { return root; } virtual QString mappingRoot() const Q_DECL_OVERRIDE { return root; }
virtual ResourceRootType type() const { return Resource_Buffer; } virtual ResourceRootType type() const Q_DECL_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)
@ -960,7 +960,7 @@ public:
} }
} }
QString mappingFile() const { return fileName; } QString mappingFile() const { return fileName; }
virtual ResourceRootType type() const { return Resource_File; } virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_File; }
bool registerSelf(const QString &f) { bool registerSelf(const QString &f) {
bool fromMM = false; bool fromMM = false;

View File

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

View File

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

View File

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

View File

@ -270,17 +270,17 @@ public:
QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format); QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format);
~QConfFileSettingsPrivate(); ~QConfFileSettingsPrivate();
void remove(const QString &key); void remove(const QString &key) Q_DECL_OVERRIDE;
void set(const QString &key, const QVariant &value); void set(const QString &key, const QVariant &value) Q_DECL_OVERRIDE;
bool get(const QString &key, QVariant *value) const; bool get(const QString &key, QVariant *value) const Q_DECL_OVERRIDE;
QStringList children(const QString &prefix, ChildSpec spec) const; QStringList children(const QString &prefix, ChildSpec spec) const Q_DECL_OVERRIDE;
void clear(); void clear() Q_DECL_OVERRIDE;
void sync(); void sync() Q_DECL_OVERRIDE;
void flush(); void flush() Q_DECL_OVERRIDE;
bool isWritable() const; bool isWritable() const Q_DECL_OVERRIDE;
QString fileName() const; QString fileName() const Q_DECL_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,

View File

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

View File

@ -468,12 +468,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 { return QModelIndex(); } QModelIndex index(int, int, const QModelIndex &) const Q_DECL_OVERRIDE { return QModelIndex(); }
QModelIndex parent(const QModelIndex &) const { return QModelIndex(); } QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE { return QModelIndex(); }
int rowCount(const QModelIndex &) const { return 0; } int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE { return 0; }
int columnCount(const QModelIndex &) const { return 0; } int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE { return 0; }
bool hasChildren(const QModelIndex &) const { return false; } bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE { return false; }
QVariant data(const QModelIndex &, int) const { return QVariant(); } QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE { return QVariant(); }
}; };
Q_GLOBAL_STATIC(QEmptyItemModel, qEmptyModel) Q_GLOBAL_STATIC(QEmptyItemModel, qEmptyModel)

View File

@ -419,9 +419,9 @@ public:
explicit QAbstractTableModel(QObject *parent = 0); explicit QAbstractTableModel(QObject *parent = 0);
~QAbstractTableModel(); ~QAbstractTableModel();
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent); int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
@ -438,8 +438,8 @@ protected:
private: private:
Q_DISABLE_COPY(QAbstractTableModel) Q_DISABLE_COPY(QAbstractTableModel)
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
bool hasChildren(const QModelIndex &parent) const; bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE;
}; };
class Q_CORE_EXPORT QAbstractListModel : public QAbstractItemModel class Q_CORE_EXPORT QAbstractListModel : public QAbstractItemModel
@ -450,9 +450,9 @@ public:
explicit QAbstractListModel(QObject *parent = 0); explicit QAbstractListModel(QObject *parent = 0);
~QAbstractListModel(); ~QAbstractListModel();
QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const; QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
bool dropMimeData(const QMimeData *data, Qt::DropAction action, bool dropMimeData(const QMimeData *data, Qt::DropAction action,
int row, int column, const QModelIndex &parent); int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
@ -469,9 +469,9 @@ protected:
private: private:
Q_DISABLE_COPY(QAbstractListModel) Q_DISABLE_COPY(QAbstractListModel)
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent) const; int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE;
bool hasChildren(const QModelIndex &parent) const; bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE;
}; };
// inline implementations // inline implementations

View File

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

View File

@ -51,25 +51,25 @@ public:
explicit QIdentityProxyModel(QObject* parent = 0); explicit QIdentityProxyModel(QObject* parent = 0);
~QIdentityProxyModel(); ~QIdentityProxyModel();
int columnCount(const QModelIndex& parent = QModelIndex()) const; int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const; QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex mapFromSource(const QModelIndex& sourceIndex) const; QModelIndex mapFromSource(const QModelIndex& sourceIndex) const Q_DECL_OVERRIDE;
QModelIndex mapToSource(const QModelIndex& proxyIndex) const; QModelIndex mapToSource(const QModelIndex& proxyIndex) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex& child) const; QModelIndex parent(const QModelIndex& child) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex& parent = QModelIndex()) const; int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const; QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent); bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) Q_DECL_OVERRIDE;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const; QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE;
QItemSelection mapSelectionFromSource(const QItemSelection& selection) const; QItemSelection mapSelectionFromSource(const QItemSelection& selection) const Q_DECL_OVERRIDE;
QItemSelection mapSelectionToSource(const QItemSelection& selection) const; QItemSelection mapSelectionToSource(const QItemSelection& selection) 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; 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;
void setSourceModel(QAbstractItemModel* sourceModel); void setSourceModel(QAbstractItemModel* sourceModel) Q_DECL_OVERRIDE;
bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()); bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()); bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()); bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()); bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE;
protected: protected:
QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent); QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent);

View File

@ -279,7 +279,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(); virtual void _q_sourceModelDestroyed() Q_DECL_OVERRIDE;
}; };
typedef QHash<QModelIndex, QSortFilterProxyModelPrivate::Mapping *> IndexMap; typedef QHash<QModelIndex, QSortFilterProxyModelPrivate::Mapping *> IndexMap;

View File

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

View File

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

View File

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

View File

@ -66,8 +66,8 @@ public:
explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0); explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0);
~QEventDispatcherGlib(); ~QEventDispatcherGlib();
bool processEvents(QEventLoop::ProcessEventsFlags flags); bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE;
bool hasPendingEvents(); bool hasPendingEvents() Q_DECL_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;

View File

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

View File

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

View File

@ -414,9 +414,9 @@ struct Q_CORE_EXPORT QDynamicMetaObjectData
struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData, public QMetaObject struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData, public QMetaObject
{ {
virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) { return this; } virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) Q_DECL_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) virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) Q_DECL_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
}; };

View File

@ -66,7 +66,7 @@ Q_SIGNALS:
); );
protected: protected:
bool event(QEvent *); bool event(QEvent *) Q_DECL_OVERRIDE;
private: private:
Q_DISABLE_COPY(QSocketNotifier) Q_DISABLE_COPY(QSocketNotifier)

View File

@ -263,7 +263,7 @@ public:
Q_SIGNALS: Q_SIGNALS:
void timeout(); void timeout();
protected: protected:
void timerEvent(QTimerEvent *); void timerEvent(QTimerEvent *) Q_DECL_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)

View File

@ -148,7 +148,7 @@ Q_SIGNALS:
); );
protected: protected:
void timerEvent(QTimerEvent *); void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE;
private: private:
Q_DISABLE_COPY(QTimer) Q_DISABLE_COPY(QTimer)

View File

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

View File

@ -76,7 +76,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); bool event(QEvent *e) Q_DECL_OVERRIDE;
protected: protected:
QAbstractState(QAbstractStatePrivate &dd, QState *parent); QAbstractState(QAbstractStatePrivate &dd, QState *parent);

View File

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

View File

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

View File

@ -50,10 +50,10 @@ public:
~QFinalState(); ~QFinalState();
protected: protected:
void onEntry(QEvent *event); void onEntry(QEvent *event) Q_DECL_OVERRIDE;
void onExit(QEvent *event); void onExit(QEvent *event) Q_DECL_OVERRIDE;
bool event(QEvent *e); bool event(QEvent *e) Q_DECL_OVERRIDE;
private: private:
Q_DISABLE_COPY(QFinalState) Q_DISABLE_COPY(QFinalState)

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -136,7 +136,7 @@ public:
QSet<QAbstractState*> configuration() const; QSet<QAbstractState*> configuration() const;
#ifndef QT_NO_STATEMACHINE_EVENTFILTER #ifndef QT_NO_STATEMACHINE_EVENTFILTER
bool eventFilter(QObject *watched, QEvent *event); bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE;
#endif #endif
public Q_SLOTS: public Q_SLOTS:
@ -159,8 +159,8 @@ Q_SIGNALS:
protected: protected:
void onEntry(QEvent *event); void onEntry(QEvent *event) Q_DECL_OVERRIDE;
void onExit(QEvent *event); void onExit(QEvent *event) Q_DECL_OVERRIDE;
virtual void beginSelectTransitions(QEvent *event); virtual void beginSelectTransitions(QEvent *event);
virtual void endSelectTransitions(QEvent *event); virtual void endSelectTransitions(QEvent *event);
@ -168,7 +168,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); bool event(QEvent *e) Q_DECL_OVERRIDE;
protected: protected:
QStateMachine(QStateMachinePrivate &dd, QObject *parent); QStateMachine(QStateMachinePrivate &dd, QObject *parent);

View File

@ -60,8 +60,8 @@ public:
class Q_CORE_EXPORT QUnhandledException : public QException class Q_CORE_EXPORT QUnhandledException : public QException
{ {
public: public:
void raise() const; void raise() const Q_DECL_OVERRIDE;
QUnhandledException *clone() const; QUnhandledException *clone() const Q_DECL_OVERRIDE;
}; };
namespace QtPrivate { namespace QtPrivate {

View File

@ -70,7 +70,7 @@ public:
void setPendingResultsLimit(int limit); void setPendingResultsLimit(int limit);
bool event(QEvent *event); bool event(QEvent *event) Q_DECL_OVERRIDE;
Q_SIGNALS: Q_SIGNALS:
void started(); void started();
@ -92,8 +92,8 @@ public Q_SLOTS:
void togglePaused(); void togglePaused();
protected: protected:
void connectNotify (const QMetaMethod &signal); void connectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE;
void disconnectNotify (const QMetaMethod &signal); void disconnectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE;
// called from setFuture() implemented in template sub-classes // called from setFuture() implemented in template sub-classes
void connectOutputInterface(); void connectOutputInterface();
@ -160,8 +160,8 @@ public Q_SLOTS:
private: private:
QFuture<T> m_future; QFuture<T> m_future;
const QFutureInterfaceBase &futureInterface() const { return m_future.d; } const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; }
QFutureInterfaceBase &futureInterface() { return m_future.d; } QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; }
}; };
template <typename T> template <typename T>
@ -191,8 +191,8 @@ public:
private: private:
QFuture<void> m_future; QFuture<void> m_future;
const QFutureInterfaceBase &futureInterface() const { return m_future.d; } const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; }
QFutureInterfaceBase &futureInterface() { return m_future.d; } QFutureInterfaceBase &futureInterface() Q_DECL_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)

View File

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

View File

@ -89,7 +89,7 @@ public:
QAbstractEventDispatcher *eventDispatcher() const; QAbstractEventDispatcher *eventDispatcher() const;
void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher); void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher);
bool event(QEvent *event); bool event(QEvent *event) Q_DECL_OVERRIDE;
public Q_SLOTS: public Q_SLOTS:
void start(Priority = InheritPriority); void start(Priority = InheritPriority);

View File

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

View File

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

View File

@ -489,7 +489,7 @@ struct BezierEase : public QEasingCurveFunction
} }
} }
QEasingCurveFunction *copy() const QEasingCurveFunction *copy() const Q_DECL_OVERRIDE
{ {
BezierEase *rv = new BezierEase(); BezierEase *rv = new BezierEase();
rv->_t = _t; rv->_t = _t;
@ -525,7 +525,7 @@ struct BezierEase : public QEasingCurveFunction
return newT; return newT;
} }
qreal value(qreal x) qreal value(qreal x) Q_DECL_OVERRIDE
{ {
Q_ASSERT(_bezierCurves.count() % 3 == 0); Q_ASSERT(_bezierCurves.count() % 3 == 0);
@ -819,7 +819,7 @@ struct TCBEase : public BezierEase
: BezierEase(QEasingCurve::TCBSpline) : BezierEase(QEasingCurve::TCBSpline)
{ } { }
qreal value(qreal x) qreal value(qreal x) Q_DECL_OVERRIDE
{ {
Q_ASSERT(_bezierCurves.count() % 3 == 0); Q_ASSERT(_bezierCurves.count() % 3 == 0);
@ -839,7 +839,7 @@ struct ElasticEase : public QEasingCurveFunction
: QEasingCurveFunction(type, qreal(0.3), qreal(1.0)) : QEasingCurveFunction(type, qreal(0.3), qreal(1.0))
{ } { }
QEasingCurveFunction *copy() const QEasingCurveFunction *copy() const Q_DECL_OVERRIDE
{ {
ElasticEase *rv = new ElasticEase(_t); ElasticEase *rv = new ElasticEase(_t);
rv->_p = _p; rv->_p = _p;
@ -849,7 +849,7 @@ struct ElasticEase : public QEasingCurveFunction
return rv; return rv;
} }
qreal value(qreal t) qreal value(qreal t) Q_DECL_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;
@ -874,7 +874,7 @@ struct BounceEase : public QEasingCurveFunction
: QEasingCurveFunction(type, qreal(0.3), qreal(1.0)) : QEasingCurveFunction(type, qreal(0.3), qreal(1.0))
{ } { }
QEasingCurveFunction *copy() const QEasingCurveFunction *copy() const Q_DECL_OVERRIDE
{ {
BounceEase *rv = new BounceEase(_t); BounceEase *rv = new BounceEase(_t);
rv->_a = _a; rv->_a = _a;
@ -883,7 +883,7 @@ struct BounceEase : public QEasingCurveFunction
return rv; return rv;
} }
qreal value(qreal t) qreal value(qreal t) Q_DECL_OVERRIDE
{ {
qreal a = (_a < 0) ? qreal(1.0) : _a; qreal a = (_a < 0) ? qreal(1.0) : _a;
switch(_t) { switch(_t) {
@ -907,7 +907,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 QEasingCurveFunction *copy() const Q_DECL_OVERRIDE
{ {
BackEase *rv = new BackEase(_t); BackEase *rv = new BackEase(_t);
rv->_o = _o; rv->_o = _o;
@ -916,7 +916,7 @@ struct BackEase : public QEasingCurveFunction
return rv; return rv;
} }
qreal value(qreal t) qreal value(qreal t) Q_DECL_OVERRIDE
{ {
qreal o = (_o < 0) ? qreal(1.70158) : _o; qreal o = (_o < 0) ? qreal(1.70158) : _o;
switch(_t) { switch(_t) {

View File

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

View File

@ -56,7 +56,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**); int qt_metacall(QMetaObject::Call, int, void**) Q_DECL_OVERRIDE;
protected: protected:
QDBusAbstractInterfaceBase(QDBusAbstractInterfacePrivate &dd, QObject *parent); QDBusAbstractInterfaceBase(QDBusAbstractInterfacePrivate &dd, QObject *parent);
private: private:
@ -136,8 +136,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); void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE;
void disconnectNotify(const QMetaMethod &signal); void disconnectNotify(const QMetaMethod &signal) Q_DECL_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,

View File

@ -253,8 +253,8 @@ private:
QString getNameOwnerNoCache(const QString &service); QString getNameOwnerNoCache(const QString &service);
protected: protected:
void customEvent(QEvent *e); void customEvent(QEvent *e) Q_DECL_OVERRIDE;
void timerEvent(QTimerEvent *e); void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE;
public slots: public slots:
// public slots // public slots

View File

@ -106,8 +106,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 &); void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE;
void disconnectNotify(const QMetaMethod &); void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE;
#endif #endif
}; };

View File

@ -90,7 +90,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) void placeMetaCall(QObject *object) Q_DECL_OVERRIDE
{ {
QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id()); QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id());
} }
@ -113,7 +113,7 @@ public:
{ } { }
~QDBusActivateObjectEvent(); ~QDBusActivateObjectEvent();
void placeMetaCall(QObject *); void placeMetaCall(QObject *) Q_DECL_OVERRIDE;
private: private:
QDBusConnection connection; // just for refcounting QDBusConnection connection; // just for refcounting

View File

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

View File

@ -63,22 +63,22 @@ public:
QGifHandler(); QGifHandler();
~QGifHandler(); ~QGifHandler();
bool canRead() const; bool canRead() const Q_DECL_OVERRIDE;
bool read(QImage *image); bool read(QImage *image) Q_DECL_OVERRIDE;
bool write(const QImage &image); bool write(const QImage &image) Q_DECL_OVERRIDE;
QByteArray name() const; QByteArray name() const Q_DECL_OVERRIDE;
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
int imageCount() const; int imageCount() const Q_DECL_OVERRIDE;
int loopCount() const; int loopCount() const Q_DECL_OVERRIDE;
int nextImageDelay() const; int nextImageDelay() const Q_DECL_OVERRIDE;
int currentImageNumber() const; int currentImageNumber() const Q_DECL_OVERRIDE;
private: private:
bool imageIsComing() const; bool imageIsComing() const;

View File

@ -104,18 +104,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); void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state); QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_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); QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state); void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state); void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE;
QString key() const; QString key() const Q_DECL_OVERRIDE;
QIconEngine *clone() const; QIconEngine *clone() const Q_DECL_OVERRIDE;
bool read(QDataStream &in); bool read(QDataStream &in) Q_DECL_OVERRIDE;
bool write(QDataStream &out) const; bool write(QDataStream &out) const Q_DECL_OVERRIDE;
void virtual_hook(int id, void *data); void virtual_hook(int id, void *data) Q_DECL_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);

View File

@ -151,7 +151,7 @@ public:
bool isNull() const; bool isNull() const;
int devType() const; int devType() const Q_DECL_OVERRIDE;
bool operator==(const QImage &) const; bool operator==(const QImage &) const;
bool operator!=(const QImage &) const; bool operator!=(const QImage &) const;
@ -284,7 +284,7 @@ public:
#endif #endif
qint64 cacheKey() const; qint64 cacheKey() const;
QPaintEngine *paintEngine() const; QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
// Auxiliary data // Auxiliary data
int dotsPerMeterX() const; int dotsPerMeterX() const;
@ -317,7 +317,7 @@ public:
#endif #endif
protected: protected:
virtual int metric(PaintDeviceMetric metric) const; virtual int metric(PaintDeviceMetric metric) const Q_DECL_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);

View File

@ -58,17 +58,17 @@ public:
QJpegHandler(); QJpegHandler();
~QJpegHandler(); ~QJpegHandler();
bool canRead() const; bool canRead() const Q_DECL_OVERRIDE;
bool read(QImage *image); bool read(QImage *image) Q_DECL_OVERRIDE;
bool write(const QImage &image); bool write(const QImage &image) Q_DECL_OVERRIDE;
QByteArray name() const; QByteArray name() const Q_DECL_OVERRIDE;
static bool canRead(QIODevice *device); static bool canRead(QIODevice *device);
QVariant option(ImageOption option) const; QVariant option(ImageOption option) const Q_DECL_OVERRIDE;
void setOption(ImageOption option, const QVariant &value); void setOption(ImageOption option, const QVariant &value) Q_DECL_OVERRIDE;
bool supportsOption(ImageOption option) const; bool supportsOption(ImageOption option) const Q_DECL_OVERRIDE;
private: private:
QJpegHandlerPrivate *d; QJpegHandlerPrivate *d;

View File

@ -62,10 +62,10 @@ public:
QPicturePaintEngine(); QPicturePaintEngine();
~QPicturePaintEngine(); ~QPicturePaintEngine();
bool begin(QPaintDevice *pdev); bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE;
bool end(); bool end() Q_DECL_OVERRIDE;
void updateState(const QPaintEngineState &state); void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE;
void updatePen(const QPen &pen); void updatePen(const QPen &pen);
void updateBrush(const QBrush &brush); void updateBrush(const QBrush &brush);
@ -80,9 +80,9 @@ public:
void updateClipEnabled(bool enabled); void updateClipEnabled(bool enabled);
void updateOpacity(qreal opacity); void updateOpacity(qreal opacity);
void drawEllipse(const QRectF &rect); void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE;
void drawPath(const QPainterPath &path); void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE;
void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode); void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) Q_DECL_OVERRIDE;
#ifdef Q_NO_USING_KEYWORD #ifdef Q_NO_USING_KEYWORD
inline void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) inline void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode)
{ QPaintEngine::drawPolygon(points, pointCount, mode); } { QPaintEngine::drawPolygon(points, pointCount, mode); }
@ -90,13 +90,13 @@ public:
using QPaintEngine::drawPolygon; using QPaintEngine::drawPolygon;
#endif #endif
void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s); void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_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); Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE;
void drawTextItem(const QPointF &p, const QTextItem &ti); void drawTextItem(const QPointF &p, const QTextItem &ti) Q_DECL_OVERRIDE;
Type type() const { return Picture; } Type type() const Q_DECL_OVERRIDE { return Picture; }
protected: protected:
QPicturePaintEngine(QPaintEnginePrivate &dptr); QPicturePaintEngine(QPaintEnginePrivate &dptr);

View File

@ -450,8 +450,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 { return 0; } QPaintEngine *paintEngine() const Q_DECL_OVERRIDE { return 0; }
int metric(PaintDeviceMetric m) const int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE
{ {
switch(m) { switch(m) {
case PdmPhysicalDpiX: case PdmPhysicalDpiX:

View File

@ -55,7 +55,7 @@ public:
bool isNull() const; bool isNull() const;
int devType() const; int devType() const Q_DECL_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);
@ -88,12 +88,12 @@ public:
static QStringList inputFormatList(); static QStringList inputFormatList();
static QStringList outputFormatList(); static QStringList outputFormatList();
QPaintEngine *paintEngine() const; QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
protected: protected:
QPicture(QPicturePrivate &data); QPicture(QPicturePrivate &data);
int metric(PaintDeviceMetric m) const; int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE;
private: private:
bool exec(QPainter *p, QDataStream &ds, int i); bool exec(QPainter *p, QDataStream &ds, int i);

View File

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

View File

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

View File

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

View File

@ -159,7 +159,7 @@ public:
QPMCache(); QPMCache();
~QPMCache(); ~QPMCache();
void timerEvent(QTimerEvent *); void timerEvent(QTimerEvent *) Q_DECL_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);

View File

@ -316,33 +316,33 @@ 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; QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &child) const; QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const; int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const; int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
bool hasChildren(const QModelIndex &parent = QModelIndex()) const; bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
// Qt 6: Remove // Qt 6: Remove
QModelIndex sibling(int row, int column, const QModelIndex &idx) const; QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const; QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole); bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, QVariant headerData(int section, Qt::Orientation orientation,
int role = Qt::DisplayRole) const; int role = Qt::DisplayRole) const Q_DECL_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); int role = Qt::EditRole) Q_DECL_OVERRIDE;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()); bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()); bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const; Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const; Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
QMap<int, QVariant> itemData(const QModelIndex &index) const; QMap<int, QVariant> itemData(const QModelIndex &index) const Q_DECL_OVERRIDE;
bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles); bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) Q_DECL_OVERRIDE;
void clear(); void clear();
@ -352,7 +352,7 @@ public:
using QObject::parent; using QObject::parent;
#endif #endif
void sort(int column, Qt::SortOrder order = Qt::AscendingOrder); void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_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;
@ -401,9 +401,9 @@ public:
int sortRole() const; int sortRole() const;
void setSortRole(int role); void setSortRole(int role);
QStringList mimeTypes() const; QStringList mimeTypes() const Q_DECL_OVERRIDE;
QMimeData *mimeData(const QModelIndexList &indexes) const; QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent); bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
Q_SIGNALS: Q_SIGNALS:
void itemChanged(QStandardItem *item); void itemChanged(QStandardItem *item);

View File

@ -70,8 +70,8 @@ public:
QInternalMimeData(); QInternalMimeData();
~QInternalMimeData(); ~QInternalMimeData();
bool hasFormat(const QString &mimeType) const; bool hasFormat(const QString &mimeType) const Q_DECL_OVERRIDE;
QStringList formats() const; QStringList formats() const Q_DECL_OVERRIDE;
static bool canReadData(const QString &mimeType); static bool canReadData(const QString &mimeType);
@ -80,7 +80,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; QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_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;

View File

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

View File

@ -81,7 +81,7 @@ public:
virtual void notifyLayoutDirectionChange(); virtual void notifyLayoutDirectionChange();
virtual void notifyActiveWindowChange(QWindow *previous); virtual void notifyActiveWindowChange(QWindow *previous);
virtual bool shouldQuit(); virtual bool shouldQuit() Q_DECL_OVERRIDE;
bool shouldQuitInternal(const QWindowList &processedWindows); bool shouldQuitInternal(const QWindowList &processedWindows);
virtual bool tryCloseAllWindows(); virtual bool tryCloseAllWindows();

View File

@ -54,7 +54,7 @@ public:
explicit QOffscreenSurface(QScreen *screen = 0); explicit QOffscreenSurface(QScreen *screen = 0);
virtual ~QOffscreenSurface(); virtual ~QOffscreenSurface();
SurfaceType surfaceType() const; SurfaceType surfaceType() const Q_DECL_OVERRIDE;
void create(); void create();
void destroy(); void destroy();
@ -62,10 +62,10 @@ public:
bool isValid() const; bool isValid() const;
void setFormat(const QSurfaceFormat &format); void setFormat(const QSurfaceFormat &format);
QSurfaceFormat format() const; QSurfaceFormat format() const Q_DECL_OVERRIDE;
QSurfaceFormat requestedFormat() const; QSurfaceFormat requestedFormat() const;
QSize size() const; QSize size() const Q_DECL_OVERRIDE;
QScreen *screen() const; QScreen *screen() const;
void setScreen(QScreen *screen); void setScreen(QScreen *screen);
@ -80,7 +80,7 @@ private Q_SLOTS:
private: private:
QPlatformSurface *surfaceHandle() const; QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE;
Q_DISABLE_COPY(QOffscreenSurface) Q_DISABLE_COPY(QOffscreenSurface)
}; };

View File

@ -105,12 +105,12 @@ public:
GLuint id() const { return m_id; } GLuint id() const { return m_id; }
protected: protected:
void invalidateResource() void invalidateResource() Q_DECL_OVERRIDE
{ {
m_id = 0; m_id = 0;
} }
void freeResource(QOpenGLContext *context); void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE;
private: private:
GLuint m_id; GLuint m_id;

View File

@ -63,7 +63,7 @@ public:
QPlatformScreen *screen() const; QPlatformScreen *screen() const;
virtual QSurfaceFormat format() const; virtual QSurfaceFormat format() const Q_DECL_OVERRIDE;
virtual bool isValid() const; virtual bool isValid() const;
protected: protected:

View File

@ -72,7 +72,7 @@ public:
QPlatformScreen *screen() const; QPlatformScreen *screen() const;
virtual QSurfaceFormat format() const; virtual QSurfaceFormat format() const Q_DECL_OVERRIDE;
virtual void setGeometry(const QRect &rect); virtual void setGeometry(const QRect &rect);
virtual QRect geometry() const; virtual QRect geometry() const;

View File

@ -66,7 +66,7 @@ public:
void updateGeometry(); void updateGeometry();
protected: protected:
void exposeEvent(QExposeEvent *); void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE;
private: private:
QBackingStore *m_backingStore; QBackingStore *m_backingStore;

View File

@ -64,9 +64,9 @@ class Q_GUI_EXPORT QBasicDrag : public QPlatformDrag, public QObject
public: public:
virtual ~QBasicDrag(); virtual ~QBasicDrag();
virtual Qt::DropAction drag(QDrag *drag); virtual Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE;
virtual bool eventFilter(QObject *o, QEvent *e); virtual bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE;
protected: protected:
QBasicDrag(); QBasicDrag();
@ -106,13 +106,13 @@ class Q_GUI_EXPORT QSimpleDrag : public QBasicDrag
{ {
public: public:
QSimpleDrag(); QSimpleDrag();
virtual QMimeData *platformDropData(); virtual QMimeData *platformDropData() Q_DECL_OVERRIDE;
protected: protected:
virtual void startDrag(); virtual void startDrag() Q_DECL_OVERRIDE;
virtual void cancel(); virtual void cancel() Q_DECL_OVERRIDE;
virtual void move(const QMouseEvent *me); virtual void move(const QMouseEvent *me) Q_DECL_OVERRIDE;
virtual void drop(const QMouseEvent *me); virtual void drop(const QMouseEvent *me) Q_DECL_OVERRIDE;
private: private:
QWindow *m_current_window; QWindow *m_current_window;

View File

@ -128,7 +128,7 @@ public:
virtual ~QWindow(); virtual ~QWindow();
void setSurfaceType(SurfaceType surfaceType); void setSurfaceType(SurfaceType surfaceType);
SurfaceType surfaceType() const; SurfaceType surfaceType() const Q_DECL_OVERRIDE;
bool isVisible() const; bool isVisible() const;
@ -149,7 +149,7 @@ public:
void setModality(Qt::WindowModality modality); void setModality(Qt::WindowModality modality);
void setFormat(const QSurfaceFormat &format); void setFormat(const QSurfaceFormat &format);
QSurfaceFormat format() const; QSurfaceFormat format() const Q_DECL_OVERRIDE;
QSurfaceFormat requestedFormat() const; QSurfaceFormat requestedFormat() const;
void setFlags(Qt::WindowFlags flags); void setFlags(Qt::WindowFlags flags);
@ -328,7 +328,7 @@ protected:
virtual void hideEvent(QHideEvent *); virtual void hideEvent(QHideEvent *);
// TODO Qt 6 - add closeEvent virtual handler // TODO Qt 6 - add closeEvent virtual handler
virtual bool event(QEvent *); virtual bool event(QEvent *) Q_DECL_OVERRIDE;
virtual void keyPressEvent(QKeyEvent *); virtual void keyPressEvent(QKeyEvent *);
virtual void keyReleaseEvent(QKeyEvent *); virtual void keyReleaseEvent(QKeyEvent *);
virtual void mousePressEvent(QMouseEvent *); virtual void mousePressEvent(QMouseEvent *);
@ -348,7 +348,7 @@ protected:
private: private:
Q_PRIVATE_SLOT(d_func(), void _q_clearAlert()) Q_PRIVATE_SLOT(d_func(), void _q_clearAlert())
QPlatformSurface *surfaceHandle() const; QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE;
Q_DISABLE_COPY(QWindow) Q_DISABLE_COPY(QWindow)

View File

@ -61,13 +61,13 @@ public:
delete m_shaders; delete m_shaders;
} }
void invalidateResource() void invalidateResource() Q_DECL_OVERRIDE
{ {
delete m_shaders; delete m_shaders;
m_shaders = 0; m_shaders = 0;
} }
void freeResource(QOpenGLContext *) void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE
{ {
} }

View File

@ -186,13 +186,13 @@ struct QOpenGLFunctionsPrivateEx : public QOpenGLExtensionsPrivate, public QOpen
, m_extensions(-1) , m_extensions(-1)
{} {}
void invalidateResource() void invalidateResource() Q_DECL_OVERRIDE
{ {
m_features = -1; m_features = -1;
m_extensions = -1; m_extensions = -1;
} }
void freeResource(QOpenGLContext *) void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE
{ {
// no gl resources to free // no gl resources to free
} }

View File

@ -77,8 +77,8 @@ public:
GLuint getBuffer(const QGradient &gradient, qreal opacity); GLuint getBuffer(const QGradient &gradient, qreal opacity);
inline int paletteSize() const { return 1024; } inline int paletteSize() const { return 1024; }
void invalidateResource(); void invalidateResource() Q_DECL_OVERRIDE;
void freeResource(QOpenGLContext *ctx); void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE;
private: private:
inline int maxCacheSize() const { return 60; } inline int maxCacheSize() const { return 60; }

View File

@ -104,37 +104,37 @@ public:
QOpenGL2PaintEngineEx(); QOpenGL2PaintEngineEx();
~QOpenGL2PaintEngineEx(); ~QOpenGL2PaintEngineEx();
bool begin(QPaintDevice *device); bool begin(QPaintDevice *device) Q_DECL_OVERRIDE;
void ensureActive(); void ensureActive();
bool end(); bool end() Q_DECL_OVERRIDE;
virtual void clipEnabledChanged(); virtual void clipEnabledChanged() Q_DECL_OVERRIDE;
virtual void penChanged(); virtual void penChanged() Q_DECL_OVERRIDE;
virtual void brushChanged(); virtual void brushChanged() Q_DECL_OVERRIDE;
virtual void brushOriginChanged(); virtual void brushOriginChanged() Q_DECL_OVERRIDE;
virtual void opacityChanged(); virtual void opacityChanged() Q_DECL_OVERRIDE;
virtual void compositionModeChanged(); virtual void compositionModeChanged() Q_DECL_OVERRIDE;
virtual void renderHintsChanged(); virtual void renderHintsChanged() Q_DECL_OVERRIDE;
virtual void transformChanged(); virtual void transformChanged() Q_DECL_OVERRIDE;
virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE;
virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap,
QPainter::PixmapFragmentHints hints); QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE;
virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr,
Qt::ImageConversionFlags flags = Qt::AutoColor); Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE;
virtual void drawTextItem(const QPointF &p, const QTextItem &textItem); virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE;
virtual void fill(const QVectorPath &path, const QBrush &brush); virtual void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE;
virtual void stroke(const QVectorPath &path, const QPen &pen); virtual void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE;
virtual void clip(const QVectorPath &path, Qt::ClipOperation op); virtual void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE;
virtual void drawStaticTextItem(QStaticTextItem *textItem); virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE;
bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr);
Type type() const { return OpenGL2; } Type type() const Q_DECL_OVERRIDE { return OpenGL2; }
virtual void setState(QPainterState *s); virtual void setState(QPainterState *s) Q_DECL_OVERRIDE;
virtual QPainterState *createState(QPainterState *orig) const; virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE;
inline QOpenGL2PaintEngineState *state() { inline QOpenGL2PaintEngineState *state() {
return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); return static_cast<QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
} }
@ -142,16 +142,16 @@ public:
return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state()); return static_cast<const QOpenGL2PaintEngineState *>(QPaintEngineEx::state());
} }
void beginNativePainting(); void beginNativePainting() Q_DECL_OVERRIDE;
void endNativePainting(); void endNativePainting() Q_DECL_OVERRIDE;
void invalidateState(); void invalidateState();
void setRenderTextActive(bool); void setRenderTextActive(bool);
bool isNativePaintingActive() const; bool isNativePaintingActive() const;
bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const { return false; } bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; }
bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const; bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE;
private: private:
Q_DISABLE_COPY(QOpenGL2PaintEngineEx) Q_DISABLE_COPY(QOpenGL2PaintEngineEx)
@ -242,7 +242,7 @@ public:
void updateClipScissorTest(); void updateClipScissorTest();
void setScissor(const QRect &rect); void setScissor(const QRect &rect);
void regenerateClip(); void regenerateClip();
void systemStateChanged(); void systemStateChanged() Q_DECL_OVERRIDE;
void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true); void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true);
void syncGlState(); void syncGlState();

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