From 9d42db98498134f7222ba39b47d2332f77e0f5b8 Mon Sep 17 00:00:00 2001 From: Felix Geyer Date: Fri, 25 Sep 2015 16:59:12 +0200 Subject: [PATCH] Mark more methods as override. --- src/autotype/test/AutoTypeTest.h | 32 ++++++++++++++++---------------- src/autotype/x11/AutoTypeX11.h | 22 +++++++++++----------- src/gui/group/GroupModel.h | 4 ++-- src/gui/group/GroupView.h | 2 +- src/streams/HashedBlockStream.h | 4 ++-- 5 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/autotype/test/AutoTypeTest.h b/src/autotype/test/AutoTypeTest.h index c21ff3beb..940564166 100644 --- a/src/autotype/test/AutoTypeTest.h +++ b/src/autotype/test/AutoTypeTest.h @@ -33,23 +33,23 @@ class AutoTypePlatformTest : public QObject, Q_INTERFACES(AutoTypePlatformInterface AutoTypeTestInterface) public: - QString keyToString(Qt::Key key); + QString keyToString(Qt::Key key) Q_DECL_OVERRIDE; - QStringList windowTitles(); - WId activeWindow(); - QString activeWindowTitle(); - bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); - void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); - int platformEventFilter(void* event); - int initialTimeout(); - bool raiseWindow(WId window); - AutoTypeExecutor* createExecutor(); + QStringList windowTitles() Q_DECL_OVERRIDE; + WId activeWindow() Q_DECL_OVERRIDE; + QString activeWindowTitle() Q_DECL_OVERRIDE; + bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + int platformEventFilter(void* event) Q_DECL_OVERRIDE; + int initialTimeout() Q_DECL_OVERRIDE; + bool raiseWindow(WId window) Q_DECL_OVERRIDE; + AutoTypeExecutor* createExecutor() Q_DECL_OVERRIDE; - void setActiveWindowTitle(const QString& title); + void setActiveWindowTitle(const QString& title) Q_DECL_OVERRIDE; - QString actionChars(); - int actionCount(); - void clearActions(); + QString actionChars() Q_DECL_OVERRIDE; + int actionCount() Q_DECL_OVERRIDE; + void clearActions() Q_DECL_OVERRIDE; void addActionChar(AutoTypeChar* action); void addActionKey(AutoTypeKey* action); @@ -68,8 +68,8 @@ class AutoTypeExecturorTest : public AutoTypeExecutor public: explicit AutoTypeExecturorTest(AutoTypePlatformTest* platform); - void execChar(AutoTypeChar* action); - void execKey(AutoTypeKey* action); + void execChar(AutoTypeChar* action) Q_DECL_OVERRIDE; + void execKey(AutoTypeKey* action) Q_DECL_OVERRIDE; private: AutoTypePlatformTest* const m_platform; diff --git a/src/autotype/x11/AutoTypeX11.h b/src/autotype/x11/AutoTypeX11.h index a1d6e9ff5..a2080a84a 100644 --- a/src/autotype/x11/AutoTypeX11.h +++ b/src/autotype/x11/AutoTypeX11.h @@ -43,15 +43,15 @@ class AutoTypePlatformX11 : public QObject, public AutoTypePlatformInterface public: AutoTypePlatformX11(); void unload() Q_DECL_OVERRIDE; - QStringList windowTitles(); - WId activeWindow(); - QString activeWindowTitle(); - bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); - void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers); - int platformEventFilter(void* event); - int initialTimeout(); - bool raiseWindow(WId window); - AutoTypeExecutor* createExecutor(); + QStringList windowTitles() Q_DECL_OVERRIDE; + WId activeWindow() Q_DECL_OVERRIDE; + QString activeWindowTitle() Q_DECL_OVERRIDE; + bool registerGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + void unregisterGlobalShortcut(Qt::Key key, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + int platformEventFilter(void* event) Q_DECL_OVERRIDE; + int initialTimeout() Q_DECL_OVERRIDE; + bool raiseWindow(WId window) Q_DECL_OVERRIDE; + AutoTypeExecutor* createExecutor() Q_DECL_OVERRIDE; KeySym charToKeySym(const QChar& ch); KeySym keyToKeySym(Qt::Key key); @@ -122,8 +122,8 @@ class AutoTypeExecturorX11 : public AutoTypeExecutor public: explicit AutoTypeExecturorX11(AutoTypePlatformX11* platform); - void execChar(AutoTypeChar* action); - void execKey(AutoTypeKey* action); + void execChar(AutoTypeChar* action) Q_DECL_OVERRIDE; + void execKey(AutoTypeKey* action) Q_DECL_OVERRIDE; private: AutoTypePlatformX11* const m_platform; diff --git a/src/gui/group/GroupModel.h b/src/gui/group/GroupModel.h index 173ea3a23..752eb2b23 100644 --- a/src/gui/group/GroupModel.h +++ b/src/gui/group/GroupModel.h @@ -35,8 +35,8 @@ public: QModelIndex index(Group* group) const; Group* groupFromIndex(const QModelIndex& index) const; - int rowCount(const QModelIndex& parent = QModelIndex()) const; - int columnCount(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; QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; QModelIndex parent(const QModelIndex& index) const Q_DECL_OVERRIDE; QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; diff --git a/src/gui/group/GroupView.h b/src/gui/group/GroupView.h index 98073f633..06bdbafa8 100644 --- a/src/gui/group/GroupView.h +++ b/src/gui/group/GroupView.h @@ -49,7 +49,7 @@ private Q_SLOTS: void modelReset(); protected: - void dragMoveEvent(QDragMoveEvent* event); + void dragMoveEvent(QDragMoveEvent* event) Q_DECL_OVERRIDE; private: void recInitExpanded(Group* group); diff --git a/src/streams/HashedBlockStream.h b/src/streams/HashedBlockStream.h index f38d5716a..cae4eb4ad 100644 --- a/src/streams/HashedBlockStream.h +++ b/src/streams/HashedBlockStream.h @@ -31,8 +31,8 @@ public: HashedBlockStream(QIODevice* baseDevice, qint32 blockSize); ~HashedBlockStream(); - bool reset(); - void close(); + bool reset() Q_DECL_OVERRIDE; + void close() Q_DECL_OVERRIDE; protected: qint64 readData(char* data, qint64 maxSize) Q_DECL_OVERRIDE;