aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/qmljs
diff options
context:
space:
mode:
authorAlessandro Portale <alessandro.portale@qt.io>2018-06-15 19:26:02 +0200
committerAlessandro Portale <alessandro.portale@qt.io>2018-06-18 08:41:37 +0000
commitb16ba2ba59b2877d6b6827f2d3717fd40c6a6627 (patch)
treeef676991e9e931fdbed5890d37fa9e09a44e16f7 /src/libs/qmljs
parentacb611c8cf28ff5bb14c95daea46dad2819b7a26 (diff)
Remove a few redundant occurrences of 'virtual' and 'override'
warning: 'virtual' is redundant since the function is already declared 'override' [modernize-use-override] warning: 'override' is redundant since the function is already declared 'final' [modernize-use-override] Change-Id: I9036a0dc88ed70c4f6e37b916bb24ff65074863d Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Diffstat (limited to 'src/libs/qmljs')
-rw-r--r--src/libs/qmljs/qmljsdocument.cpp11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp
index e64deb0c722..6de0a75fcb2 100644
--- a/src/libs/qmljs/qmljsdocument.cpp
+++ b/src/libs/qmljs/qmljsdocument.cpp
@@ -248,21 +248,22 @@ public:
{}
- virtual void pragmaLibrary(int line, int column) override
+ void pragmaLibrary(int line, int column) override
{
isLibrary = true;
addLocation(line, column);
}
- virtual void importFile(const QString &jsfile, const QString &module,
- int line, int column) override
+
+ void importFile(const QString &jsfile, const QString &module,
+ int line, int column) override
{
imports += ImportInfo::pathImport(
documentPath, jsfile, LanguageUtils::ComponentVersion(), module);
addLocation(line, column);
}
- virtual void importModule(const QString &uri, const QString &version, const QString &module,
- int line, int column) override
+ void importModule(const QString &uri, const QString &version, const QString &module,
+ int line, int column) override
{
imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module);
addLocation(line, column);