From d0c159c8e306709629e3af0b83b464c5cea15754 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Wed, 25 Jul 2018 23:25:10 +0200 Subject: Fix a few overrides in Qt Core 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 Reviewed-by: Kevin Funk --- src/corelib/io/qbuffer.cpp | 4 +- src/corelib/io/qfiledevice.h | 2 +- src/corelib/io/qnoncontiguousbytedevice_p.h | 12 ++--- src/corelib/io/qresource.cpp | 6 +-- src/corelib/io/qresource_p.h | 56 ++++++++++++------------ src/corelib/itemmodels/qsortfilterproxymodel.cpp | 2 +- src/corelib/kernel/qobject_p.h | 4 +- src/corelib/mimetypes/qmimeprovider_p.h | 16 +++---- src/corelib/statemachine/qsignaltransition_p.h | 2 +- src/corelib/statemachine/qstatemachine.cpp | 4 +- 10 files changed, 54 insertions(+), 54 deletions(-) (limited to 'src/corelib') diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index e0b9c41323..7b3fa2ccad 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -60,8 +60,8 @@ public: QByteArray *buf; QByteArray defaultBuf; - virtual qint64 peek(char *data, qint64 maxSize) override; - virtual QByteArray peek(qint64 maxSize) override; + qint64 peek(char *data, qint64 maxSize) override; + QByteArray peek(qint64 maxSize) override; #ifndef QT_NO_QOBJECT // private slots diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index af41bec2f6..2d524193c5 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -100,7 +100,7 @@ public: FileError error() const; void unsetError(); - virtual void close() override; + void close() override; bool isSequential() const override; diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h index ebed1120db..bbc4ea5ae2 100644 --- a/src/corelib/io/qnoncontiguousbytedevice_p.h +++ b/src/corelib/io/qnoncontiguousbytedevice_p.h @@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice public: QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); ~QByteDeviceWrappingIoDevice (); - virtual bool isSequential () const override; - virtual bool atEnd () const override; - virtual bool reset () override; - virtual qint64 size () const override; + bool isSequential() const override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; protected: - virtual qint64 readData ( char * data, qint64 maxSize ) override; - virtual qint64 writeData ( const char * data, qint64 maxSize ) override; + qint64 readData(char *data, qint64 maxSize) override; + qint64 writeData(const char *data, qint64 maxSize) override; QNonContiguousByteDevice *byteDevice; }; diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index 367cd78d65..19ce9ef517 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -905,8 +905,8 @@ public: inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { } inline ~QDynamicBufferResourceRoot() { } inline const uchar *mappingBuffer() const { return buffer; } - virtual QString mappingRoot() const override { return root; } - virtual ResourceRootType type() const override { return Resource_Buffer; } + QString mappingRoot() const override { return root; } + ResourceRootType type() const override { return Resource_Buffer; } // size == -1 means "unknown" bool registerSelf(const uchar *b, int size) @@ -988,7 +988,7 @@ public: } } 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 fromMM = false; diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index dcfe46704c..7451de8809 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -64,49 +64,49 @@ public: explicit QResourceFileEngine(const QString &path); ~QResourceFileEngine(); - virtual void setFileName(const QString &file) override; + void setFileName(const QString &file) override; - virtual bool open(QIODevice::OpenMode flags) override ; - virtual bool close() override; - virtual bool flush() override; - virtual qint64 size() const override; - virtual qint64 pos() const override; + bool open(QIODevice::OpenMode flags) override; + bool close() override; + bool flush() override; + qint64 size() const override; + qint64 pos() const override; virtual bool atEnd() const; - virtual bool seek(qint64) override; - virtual qint64 read(char *data, qint64 maxlen) override; - virtual qint64 write(const char *data, qint64 len) override; + bool seek(qint64) override; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; - virtual bool remove() override; - virtual bool copy(const QString &newName) override; - virtual bool rename(const QString &newName) override; - virtual bool link(const QString &newName) override; + bool remove() override; + bool copy(const QString &newName) override; + bool rename(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; - virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; + bool mkdir(const QString &dirName, bool createParentDirectories) 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; - virtual QString owner(FileOwner) const override; + uint ownerId(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; - virtual Iterator *endEntryList() override; + Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + Iterator *endEntryList() override; bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; bool supportsExtension(Extension extension) const override; diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index 31b9bbc990..5d1a916df0 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -424,7 +424,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() override; + void _q_sourceModelDestroyed() override; bool needsReorder(const QVector &source_rows, const QModelIndex &source_parent) const; diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index 6aea40cf4a..c4e1c69883 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -432,9 +432,9 @@ struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData, { ~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 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); } virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload }; diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index b2be545cf8..97504fe99a 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -97,17 +97,17 @@ public: QMimeBinaryProvider(QMimeDatabasePrivate *db, const QString &directory); virtual ~QMimeBinaryProvider(); - virtual bool isValid() override; - virtual QMimeType mimeTypeForName(const QString &name) override; + bool isValid() override; + QMimeType mimeTypeForName(const QString &name) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &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 findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void addAllMimeTypes(QList &result) override; static void loadMimeTypePrivate(QMimeTypePrivate &); - virtual void loadIcon(QMimeTypePrivate &) override; - virtual void loadGenericIcon(QMimeTypePrivate &) override; + void loadIcon(QMimeTypePrivate &) override; + void loadGenericIcon(QMimeTypePrivate &) override; void ensureLoaded() override; private: @@ -135,11 +135,11 @@ public: QMimeXMLProvider(QMimeDatabasePrivate *db, const QString &directory); ~QMimeXMLProvider(); - virtual bool isValid() override; - virtual QMimeType mimeTypeForName(const QString &name) override; + bool isValid() override; + QMimeType mimeTypeForName(const QString &name) override; void addFileNameMatches(const QString &fileName, QMimeGlobMatchResult &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 findByMagic(const QByteArray &data, int *accuracyPtr, QMimeType &candidate) override; void addAllMimeTypes(QList &result) override; diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index 0666e600a4..b3de334677 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -70,7 +70,7 @@ public: void unregister(); void maybeRegister(); - virtual void callOnTransition(QEvent *e) override; + void callOnTransition(QEvent *e) override; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 24734f99ac..6f0306f80c 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1721,8 +1721,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const : QAbstractTransition() { setTargetStates(targets); } protected: - virtual bool eventTest(QEvent *) override { return true; } - virtual void onTransition(QEvent *) override {} + bool eventTest(QEvent *) override { return true; } + void onTransition(QEvent *) override {} }; QState *root = rootState(); -- cgit v1.2.3