From cc80ba2a7e23455dedca3403f13bde74aa10618a Mon Sep 17 00:00:00 2001 From: Marco Benelli Date: Tue, 3 May 2016 11:57:12 +0200 Subject: [PATCH] QmlJS: update importFile and importModule signature. Update the signatures of importFile and importModule overridden methods to match the new ones in parent class. Change-Id: I8c5e7458935f848bc3952d4c388b5385dd9a5da5 Reviewed-by: Tobias Hunger --- src/libs/qmljs/qmljsdocument.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/libs/qmljs/qmljsdocument.cpp b/src/libs/qmljs/qmljsdocument.cpp index 82cf503666c..d1aabae61f9 100644 --- a/src/libs/qmljs/qmljsdocument.cpp +++ b/src/libs/qmljs/qmljsdocument.cpp @@ -238,14 +238,19 @@ public: {} virtual void pragmaLibrary() { isLibrary = true; } - virtual void importFile(const QString &jsfile, const QString &module) + virtual void importFile(const QString &jsfile, const QString &module, int line, int column) { + Q_UNUSED(line); + Q_UNUSED(column); imports += ImportInfo::pathImport( documentPath, jsfile, LanguageUtils::ComponentVersion(), module); } - virtual void importModule(const QString &uri, const QString &version, const QString &module) + virtual void importModule(const QString &uri, const QString &version, const QString &module, + int line, int column) { + Q_UNUSED(line); + Q_UNUSED(column); imports += ImportInfo::moduleImport(uri, LanguageUtils::ComponentVersion(version), module); }