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

Add Q_DECL_OVERRIDE in the src subdirectory

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/concurrent/qtconcurrentthreadengine.h
View File

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

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

@ -111,7 +111,7 @@ public Q_SLOTS:
protected:
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 updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState);

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -63,7 +63,7 @@ public:
#endif
~QFile();
QString fileName() const;
QString fileName() const Q_DECL_OVERRIDE;
void setFileName(const QString &name);
#if defined(Q_OS_DARWIN)
@ -116,18 +116,18 @@ public:
bool copy(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(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);
Permissions permissions() const;
Permissions permissions() const Q_DECL_OVERRIDE;
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);
protected:

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

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

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

@ -64,7 +64,7 @@ protected:
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, const QString &errorString);

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

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

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

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

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

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

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

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

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

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

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

@ -182,8 +182,8 @@ public:
qint64 processId() const;
bool waitForStarted(int msecs = 30000);
bool waitForReadyRead(int msecs = 30000);
bool waitForBytesWritten(int msecs = 30000);
bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE;
bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE;
bool waitForFinished(int msecs = 30000);
QByteArray readAllStandardOutput();
@ -193,12 +193,12 @@ public:
QProcess::ExitStatus exitStatus() const;
// QIODevice
qint64 bytesAvailable() const;
qint64 bytesToWrite() const;
bool isSequential() const;
bool canReadLine() const;
void close();
bool atEnd() const;
qint64 bytesAvailable() const Q_DECL_OVERRIDE;
qint64 bytesToWrite() const Q_DECL_OVERRIDE;
bool isSequential() const Q_DECL_OVERRIDE;
bool canReadLine() const Q_DECL_OVERRIDE;
void close() Q_DECL_OVERRIDE;
bool atEnd() const Q_DECL_OVERRIDE;
static int execute(const QString &program, const QStringList &arguments);
static int execute(const QString &command);
@ -254,8 +254,8 @@ protected:
virtual void setupChildProcess();
// QIODevice
qint64 readData(char *data, qint64 maxlen);
qint64 writeData(const char *data, qint64 len);
qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE;
private:
Q_DECLARE_PRIVATE(QProcess)

2
src/corelib/io/qprocess_unix.cpp
View File

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

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

@ -873,8 +873,8 @@ public:
inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { }
inline ~QDynamicBufferResourceRoot() { }
inline const uchar *mappingBuffer() const { return buffer; }
virtual QString mappingRoot() const { return root; }
virtual ResourceRootType type() const { return Resource_Buffer; }
virtual QString mappingRoot() const Q_DECL_OVERRIDE { return root; }
virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_Buffer; }
// size == -1 means "unknown"
bool registerSelf(const uchar *b, int size)
@ -960,7 +960,7 @@ public:
}
}
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 fromMM = false;

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

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

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

@ -58,52 +58,52 @@ public:
explicit QResourceFileEngine(const QString &path);
~QResourceFileEngine();
virtual void setFileName(const QString &file);
virtual void setFileName(const QString &file) Q_DECL_OVERRIDE;
virtual bool open(QIODevice::OpenMode flags) ;
virtual bool close();
virtual bool flush();
virtual qint64 size() const;
virtual qint64 pos() const;
virtual bool open(QIODevice::OpenMode flags) Q_DECL_OVERRIDE ;
virtual bool close() Q_DECL_OVERRIDE;
virtual bool flush() Q_DECL_OVERRIDE;
virtual qint64 size() const Q_DECL_OVERRIDE;
virtual qint64 pos() const Q_DECL_OVERRIDE;
virtual bool atEnd() const;
virtual bool seek(qint64);
virtual qint64 read(char *data, qint64 maxlen);
virtual qint64 write(const char *data, qint64 len);
virtual bool seek(qint64) Q_DECL_OVERRIDE;
virtual qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE;
virtual qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE;
virtual bool remove();
virtual bool copy(const QString &newName);
virtual bool rename(const QString &newName);
virtual bool link(const QString &newName);
virtual bool remove() Q_DECL_OVERRIDE;
virtual bool copy(const QString &newName) Q_DECL_OVERRIDE;
virtual bool rename(const QString &newName) Q_DECL_OVERRIDE;
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 rmdir(const QString &dirName, bool recurseParentDirectories) const;
virtual bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE;
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 QString owner(FileOwner) const;
virtual uint ownerId(FileOwner) const Q_DECL_OVERRIDE;
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 *endEntryList();
virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE;
virtual Iterator *endEntryList() Q_DECL_OVERRIDE;
bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0);
bool supportsExtension(Extension extension) const;
bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE;
bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE;
};
QT_END_NAMESPACE

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

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

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

@ -270,17 +270,17 @@ public:
QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format);
~QConfFileSettingsPrivate();
void remove(const QString &key);
void set(const QString &key, const QVariant &value);
bool get(const QString &key, QVariant *value) const;
void remove(const QString &key) Q_DECL_OVERRIDE;
void set(const QString &key, const QVariant &value) Q_DECL_OVERRIDE;
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 sync();
void flush();
bool isWritable() const;
QString fileName() const;
void clear() Q_DECL_OVERRIDE;
void sync() Q_DECL_OVERRIDE;
void flush() Q_DECL_OVERRIDE;
bool isWritable() const Q_DECL_OVERRIDE;
QString fileName() const Q_DECL_OVERRIDE;
bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections);
static bool readIniSection(const QSettingsKey &section, const QByteArray &data,

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

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

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

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

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

@ -419,9 +419,9 @@ public:
explicit QAbstractTableModel(QObject *parent = 0);
~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,
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;
@ -438,8 +438,8 @@ protected:
private:
Q_DISABLE_COPY(QAbstractTableModel)
QModelIndex parent(const QModelIndex &child) const;
bool hasChildren(const QModelIndex &parent) const;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE;
};
class Q_CORE_EXPORT QAbstractListModel : public QAbstractItemModel
@ -450,9 +450,9 @@ public:
explicit QAbstractListModel(QObject *parent = 0);
~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,
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;
@ -469,9 +469,9 @@ protected:
private:
Q_DISABLE_COPY(QAbstractListModel)
QModelIndex parent(const QModelIndex &child) const;
int columnCount(const QModelIndex &parent) const;
bool hasChildren(const QModelIndex &parent) const;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE;
bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE;
};
// inline implementations

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

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

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

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

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

@ -279,7 +279,7 @@ public:
void updateChildrenMapping(const QModelIndex &source_parent, Mapping *parent_mapping,
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;

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

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

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

@ -49,23 +49,23 @@ public:
explicit QStringListModel(QObject *parent = 0);
explicit QStringListModel(const QStringList &strings, QObject *parent = 0);
int rowCount(const QModelIndex &parent = QModelIndex()) const;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role) const;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE;
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 removeRows(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()) 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;
void setStringList(const QStringList &strings);
Qt::DropActions supportedDropActions() const;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(QStringListModel)

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

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

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

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

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

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

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

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

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

@ -414,9 +414,9 @@ struct Q_CORE_EXPORT QDynamicMetaObjectData
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 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); }
virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload
};

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

6
src/dbus/qdbusabstractinterface.h
View File

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

4
src/dbus/qdbusconnection_p.h
View File

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

4
src/dbus/qdbusconnectioninterface.h
View File

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

4
src/dbus/qdbusintegrator_p.h
View File

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

6
src/dbus/qdbusinterface.h
View File

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

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

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

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

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

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

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

14
src/gui/image/qjpeghandler_p.h
View File

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

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

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

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

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

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

@ -55,7 +55,7 @@ public:
bool isNull() const;
int devType() const;
int devType() const Q_DECL_OVERRIDE;
uint size() const;
const char* data() const;
virtual void setData(const char* data, uint size);
@ -88,12 +88,12 @@ public:
static QStringList inputFormatList();
static QStringList outputFormatList();
QPaintEngine *paintEngine() const;
QPaintEngine *paintEngine() const Q_DECL_OVERRIDE;
protected:
QPicture(QPicturePrivate &data);
int metric(PaintDeviceMetric m) const;
int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE;
private:
bool exec(QPainter *p, QDataStream &ds, int i);

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

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

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

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

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

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

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

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

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

@ -316,33 +316,33 @@ public:
void setItemRoleNames(const QHash<int,QByteArray> &roleNames);
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const;
QModelIndex parent(const QModelIndex &child) const;
QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE;
int rowCount(const QModelIndex &parent = QModelIndex()) const;
int columnCount(const QModelIndex &parent = QModelIndex()) const;
bool hasChildren(const QModelIndex &parent = QModelIndex()) const;
int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
// 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;
bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole);
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) Q_DECL_OVERRIDE;
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,
int role = Qt::EditRole);
int role = Qt::EditRole) Q_DECL_OVERRIDE;
bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex());
bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex());
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
bool removeColumns(int column, 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()) Q_DECL_OVERRIDE;
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE;
Qt::ItemFlags flags(const QModelIndex &index) const;
Qt::DropActions supportedDropActions() const;
Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE;
Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE;
QMap<int, QVariant> itemData(const QModelIndex &index) const;
bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles);
QMap<int, QVariant> itemData(const QModelIndex &index) const Q_DECL_OVERRIDE;
bool setItemData(const QModelIndex &index, const QMap<int, QVariant> &roles) Q_DECL_OVERRIDE;
void clear();
@ -352,7 +352,7 @@ public:
using QObject::parent;
#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;
QModelIndex indexFromItem(const QStandardItem *item) const;
@ -401,9 +401,9 @@ public:
int sortRole() const;
void setSortRole(int role);
QStringList mimeTypes() const;
QMimeData *mimeData(const QModelIndexList &indexes) const;
bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent);
QStringList mimeTypes() const Q_DECL_OVERRIDE;
QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE;
bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE;
Q_SIGNALS:
void itemChanged(QStandardItem *item);

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

@ -70,8 +70,8 @@ public:
QInternalMimeData();
~QInternalMimeData();
bool hasFormat(const QString &mimeType) const;
QStringList formats() const;
bool hasFormat(const QString &mimeType) const Q_DECL_OVERRIDE;
QStringList formats() const Q_DECL_OVERRIDE;
static bool canReadData(const QString &mimeType);
@ -80,7 +80,7 @@ public:
static QByteArray renderDataHelper(const QString &mimeType, const QMimeData *data);
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 QStringList formats_sys() const = 0;

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

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

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

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

8
src/gui/kernel/qoffscreensurface.h
View File

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

4
src/gui/kernel/qopenglcontext_p.h
View File

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

2
src/gui/kernel/qplatformoffscreensurface.h
View File

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

2
src/gui/kernel/qplatformwindow.h
View File

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

2
src/gui/kernel/qshapedpixmapdndwindow_p.h
View File

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

14
src/gui/kernel/qsimpledrag_p.h
View File

@ -64,9 +64,9 @@ class Q_GUI_EXPORT QBasicDrag : public QPlatformDrag, public QObject
public:
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:
QBasicDrag();
@ -106,13 +106,13 @@ class Q_GUI_EXPORT QSimpleDrag : public QBasicDrag
{
public:
QSimpleDrag();
virtual QMimeData *platformDropData();
virtual QMimeData *platformDropData() Q_DECL_OVERRIDE;
protected:
virtual void startDrag();
virtual void cancel();
virtual void move(const QMouseEvent *me);
virtual void drop(const QMouseEvent *me);
virtual void startDrag() Q_DECL_OVERRIDE;
virtual void cancel() Q_DECL_OVERRIDE;
virtual void move(const QMouseEvent *me) Q_DECL_OVERRIDE;
virtual void drop(const QMouseEvent *me) Q_DECL_OVERRIDE;
private:
QWindow *m_current_window;

8
src/gui/kernel/qwindow.h
View File

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

4
src/gui/opengl/qopenglengineshadermanager.cpp
View File

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

4
src/gui/opengl/qopenglfunctions.cpp
View File

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

4
src/gui/opengl/qopenglgradientcache_p.h
View File

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

52
src/gui/opengl/qopenglpaintengine_p.h
View File

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

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