feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

qmljs: (QString -> Utils::FilePath)++

Browse Source 
convert more QString containing paths to Utils::FilePath

Change-Id: I1219d7d147993e48cfa641dc9bea72ab38c90f51
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Fawzi Mohamed
2022-06-20 12:35:13 +02:00
committed by Tim Jenssen
parent 0bb272d411
commit fd89043de2
79 changed files with 844 additions and 680 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/libs/qmljs/qmljsinterpreter.h
View File

@@ -150,7 +150,7 @@ public:
virtual void accept(ValueVisitor *) const = 0;
virtual bool getSourceLocation(QString *fileName, int *line, int *column) const;
virtual bool getSourceLocation(Utils::FilePath *fileName, int *line, int *column) const;
};
template <typename RetTy> const RetTy *value_cast(const Value *)
@@ -891,7 +891,7 @@ public:
const AST::PatternElement *ast() const;
private:
const Value *value(ReferenceContext *referenceContext) const override;
bool getSourceLocation(QString *fileName, int *line, int *column) const override;
bool getSourceLocation(Utils::FilePath *fileName, int *line, int *column) const override;
};
class QMLJS_EXPORT ASTFunctionValue: public FunctionValue
@@ -912,7 +912,7 @@ public:
bool isVariadic() const override;
const ASTFunctionValue *asAstFunctionValue() const override;
bool getSourceLocation(QString *fileName, int *line, int *column) const override;
bool getSourceLocation(Utils::FilePath *fileName, int *line, int *column) const override;
};
class QMLJS_EXPORT ASTPropertyReference: public Reference
@@ -930,7 +930,7 @@ public:
AST::UiPublicMember *ast() const { return m_ast; }
QString onChangedSlotName() const { return m_onChangedSlotName; }
bool getSourceLocation(QString *fileName, int *line, int *column) const override;
bool getSourceLocation(Utils::FilePath *fileName, int *line, int *column) const override;
private:
const Value *value(ReferenceContext *referenceContext) const override;
@@ -959,7 +959,7 @@ public:
QString argumentName(int index) const override;
// Value interface
bool getSourceLocation(QString *fileName, int *line, int *column) const override;
bool getSourceLocation(Utils::FilePath *fileName, int *line, int *column) const override;
};
class QMLJS_EXPORT ASTObjectValue: public ObjectValue
@@ -980,7 +980,7 @@ public:
const ASTObjectValue *asAstObjectValue() const override;
bool getSourceLocation(QString *fileName, int *line, int *column) const override;
bool getSourceLocation(Utils::FilePath *fileName, int *line, int *column) const override;
void processMembers(MemberProcessor *processor) const override;
QString defaultPropertyName() const;
@@ -997,9 +997,11 @@ public:
static ImportInfo moduleImport(QString uri, LanguageUtils::ComponentVersion version,
const QString &as, AST::UiImport *ast = nullptr);
static ImportInfo pathImport(const QString &docPath, const QString &path,
static ImportInfo pathImport(const Utils::FilePath &docPath,
const QString &path,
LanguageUtils::ComponentVersion version,
const QString &as, AST::UiImport *ast = nullptr);
const QString &as,
AST::UiImport *ast = nullptr);
static ImportInfo invalidImport(AST::UiImport *ast = nullptr);
static ImportInfo implicitDirectoryImport(const QString &directory);
static ImportInfo qrcDirectoryImport(const QString &directory);
@@ -1041,7 +1043,7 @@ public:
ImportInfo info;
DependencyInfo::ConstPtr deps;
// uri imports: path to library, else empty
QString libraryPath;
Utils::FilePath libraryPath;
// whether the import succeeded
bool valid;
mutable bool used;