summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesus Fernandez <jesus.fernandez@qt.io>2017-05-15 15:53:34 +0200
committerJesus Fernandez <Jesus.Fernandez@qt.io>2017-05-15 17:01:55 +0000
commit74954febbe60a6d30115e4169ce675b856596bad (patch)
tree086ae2f547f0fbcda6fec25946a725bc5b32ff33
parent0fdb31403473bc4aa1d3bba6d28bcda5428cd0e3 (diff)
Remove redundant virtual in inherit classes
Change-Id: I022d5ebecd70c071e596a6d14463342dd9ab61cf Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
-rw-r--r--examples/oauth/redditclient/redditmodel.h6
-rw-r--r--src/oauth/qabstractoauth2.h16
-rw-r--r--tests/auto/abstractoauth/tst_abstractoauth.cpp18
3 files changed, 20 insertions, 20 deletions
diff --git a/examples/oauth/redditclient/redditmodel.h b/examples/oauth/redditclient/redditmodel.h
index 11c277e..eec26a7 100644
--- a/examples/oauth/redditclient/redditmodel.h
+++ b/examples/oauth/redditclient/redditmodel.h
@@ -44,9 +44,9 @@ public:
RedditModel(QObject *parent = nullptr);
RedditModel(const QString &clientId, QObject *parent = nullptr);
- virtual int rowCount(const QModelIndex &parent) const override;
- virtual int columnCount(const QModelIndex &parent) const override;
- virtual QVariant data(const QModelIndex &index, int role) const override;
+ int rowCount(const QModelIndex &parent) const override;
+ int columnCount(const QModelIndex &parent) const override;
+ QVariant data(const QModelIndex &index, int role) const override;
void grant();
diff --git a/src/oauth/qabstractoauth2.h b/src/oauth/qabstractoauth2.h
index 5ac1fba..cd9dc81 100644
--- a/src/oauth/qabstractoauth2.h
+++ b/src/oauth/qabstractoauth2.h
@@ -63,14 +63,14 @@ public:
Q_INVOKABLE virtual QUrl createAuthenticatedUrl(const QUrl &url,
const QVariantMap &parameters = QVariantMap());
- Q_INVOKABLE virtual QNetworkReply *head(const QUrl &url,
- const QVariantMap &parameters = QVariantMap()) override;
- Q_INVOKABLE virtual QNetworkReply *get(const QUrl &url,
- const QVariantMap &parameters = QVariantMap()) override;
- Q_INVOKABLE virtual QNetworkReply *post(const QUrl &url,
- const QVariantMap &parameters = QVariantMap()) override;
- Q_INVOKABLE virtual QNetworkReply *deleteResource(const QUrl &url,
- const QVariantMap &parameters = QVariantMap()) override;
+ Q_INVOKABLE QNetworkReply *head(const QUrl &url,
+ const QVariantMap &parameters = QVariantMap()) override;
+ Q_INVOKABLE QNetworkReply *get(const QUrl &url,
+ const QVariantMap &parameters = QVariantMap()) override;
+ Q_INVOKABLE QNetworkReply *post(const QUrl &url,
+ const QVariantMap &parameters = QVariantMap()) override;
+ Q_INVOKABLE QNetworkReply *deleteResource(const QUrl &url,
+ const QVariantMap &parameters = QVariantMap()) override;
QString scope() const;
void setScope(const QString &scope);
diff --git a/tests/auto/abstractoauth/tst_abstractoauth.cpp b/tests/auto/abstractoauth/tst_abstractoauth.cpp
index e4ac2af..6f4dabc 100644
--- a/tests/auto/abstractoauth/tst_abstractoauth.cpp
+++ b/tests/auto/abstractoauth/tst_abstractoauth.cpp
@@ -43,18 +43,18 @@ private:
struct AbstractOAuth : QAbstractOAuth {
AbstractOAuth() : QAbstractOAuth(*new QAbstractOAuthPrivate(QUrl(), nullptr), nullptr) {}
- virtual QString clientIdentifier() const override { return QString(); }
- virtual void setClientIdentifier(const QString &) override {}
- virtual QString token() const override { return QString(); }
- virtual void setToken(const QString &) override {}
- virtual QNetworkReply *head(const QUrl &, const QVariantMap &) override { return nullptr; }
- virtual QNetworkReply *get(const QUrl &, const QVariantMap &) override { return nullptr; }
- virtual QNetworkReply *post(const QUrl &, const QVariantMap &) override { return nullptr; }
- virtual QNetworkReply *deleteResource(const QUrl &, const QVariantMap &) override
+ QString clientIdentifier() const override { return QString(); }
+ void setClientIdentifier(const QString &) override {}
+ QString token() const override { return QString(); }
+ void setToken(const QString &) override {}
+ QNetworkReply *head(const QUrl &, const QVariantMap &) override { return nullptr; }
+ QNetworkReply *get(const QUrl &, const QVariantMap &) override { return nullptr; }
+ QNetworkReply *post(const QUrl &, const QVariantMap &) override { return nullptr; }
+ QNetworkReply *deleteResource(const QUrl &, const QVariantMap &) override
{
return nullptr;
}
- virtual void grant() override {}
+ void grant() override {}
};
private Q_SLOTS: