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

Fix a few overrides in Qt Core

Browse Source 
This change removes redundant 'virtual' from function declarations.

Clang Tidy's modernize-use-override check reports:
  warning: 'virtual' is redundant since the function is already
  declared 'override'

CppCoreGuidelines say:
  C.128: Virtual functions should specify exactly one of virtual,
  override, or final

Change-Id: I9a4bdd6cc041d46ae64b25597ba4f7268ac4c2b7
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Reviewed-by: Kevin Funk <kevin.funk@kdab.com>
This commit is contained in:
Alessandro Portale 2018-07-25 23:25:10 +02:00
parent 35ec3b49e1
commit d0c159c8e3
10 changed files with 54 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

@ -100,7 +100,7 @@ public:
FileError error() const; FileError error() const;
void unsetError(); void unsetError();
virtual void close() override; void close() override;
bool isSequential() const override; bool isSequential() const override;

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

@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice
public: public:
QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd);
~QByteDeviceWrappingIoDevice (); ~QByteDeviceWrappingIoDevice ();
virtual bool isSequential () const override; bool isSequential() const override;
virtual bool atEnd () const override; bool atEnd() const override;
virtual bool reset () override; bool reset() override;
virtual qint64 size () const override; qint64 size() const override;
protected: protected:
virtual qint64 readData ( char * data, qint64 maxSize ) override; qint64 readData(char *data, qint64 maxSize) override;
virtual qint64 writeData ( const char * data, qint64 maxSize ) override; qint64 writeData(const char *data, qint64 maxSize) override;
QNonContiguousByteDevice *byteDevice; QNonContiguousByteDevice *byteDevice;
}; };

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

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

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

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

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

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

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

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

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

@ -97,17 +97,17 @@ public:
QMimeBinaryProvider(QMimeDatabasePrivate *db, const QString &directory); QMimeBinaryProvider(QMimeDatabasePrivate *db, const QString &directory);
virtual ~QMimeBinaryProvider(); virtual ~QMimeBinaryProvider();
virtual bool isValid() override; bool isValid() override;
virtual QMimeType mimeTypeForName(const QString &name) override; QMimeType mimeTypeForName(const QString &name) override;
void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override;
void addParents(const QString &mime, QStringList &result) override; void addParents(const QString &mime, QStringList &result) override;
virtual QString resolveAlias(const QString &name) override; QString resolveAlias(const QString &name) override;
void addAliases(const QString &name, QStringList &result) override; void addAliases(const QString &name, QStringList &result) override;
void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override;
void addAllMimeTypes(QList<QMimeType> &result) override; void addAllMimeTypes(QList<QMimeType> &result) override;
static void loadMimeTypePrivate(QMimeTypePrivate &); static void loadMimeTypePrivate(QMimeTypePrivate &);
virtual void loadIcon(QMimeTypePrivate &) override; void loadIcon(QMimeTypePrivate &) override;
virtual void loadGenericIcon(QMimeTypePrivate &) override; void loadGenericIcon(QMimeTypePrivate &) override;
void ensureLoaded() override; void ensureLoaded() override;
private: private:
@ -135,11 +135,11 @@ public:
QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory); QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory);
~QMimeXMLProvider(); ~QMimeXMLProvider();
virtual bool isValid() override; bool isValid() override;
virtual QMimeType mimeTypeForName(const QString &name) override; QMimeType mimeTypeForName(const QString &name) override;
void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &result) override;
void addParents(const QString &mime, QStringList &result) override; void addParents(const QString &mime, QStringList &result) override;
virtual QString resolveAlias(const QString &name) override; QString resolveAlias(const QString &name) override;
void addAliases(const QString &name, QStringList &result) override; void addAliases(const QString &name, QStringList &result) override;
void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override;
void addAllMimeTypes(QList<QMimeType> &result) override; void addAllMimeTypes(QList<QMimeType> &result) override;

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

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

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

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