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

33
src/libs/qmljs/qmljsdocument.h
View File

@@ -53,12 +53,12 @@ public:
typedef QSharedPointer<const Document> Ptr;
typedef QSharedPointer<Document> MutablePtr;
protected:
Document(const QString &fileName, Dialect language);
Document(const Utils::FilePath &fileName, Dialect language);
public:
~Document();
static MutablePtr create(const QString &fileName, Dialect language);
static MutablePtr create(const Utils::FilePath &fileName, Dialect language);
Document::Ptr ptr() const;
@@ -93,8 +93,8 @@ public:
int editorRevision() const;
void setEditorRevision(int revision);
QString fileName() const;
QString path() const;
Utils::FilePath fileName() const;
Utils::FilePath path() const;
QString componentName() const;
QList<SourceLocation> jsDirectives() const;
@@ -107,8 +107,8 @@ private:
AST::Node *_ast;
Bind *_bind;
QList<QmlJS::DiagnosticMessage> _diagnosticMessages;
QString _fileName;
QString _path;
Utils::FilePath _fileName;
Utils::FilePath _path;
QString _componentName;
QString _source;
QList<SourceLocation> _jsdirectives;
@@ -231,10 +231,10 @@ public:
class QMLJS_EXPORT Snapshot
{
typedef QHash<QString, Document::Ptr> Base;
QHash<QString, Document::Ptr> _documents;
QHash<QString, QList<Document::Ptr> > _documentsByPath;
QHash<QString, LibraryInfo> _libraries;
typedef QHash<Utils::FilePath, Document::Ptr> Base;
QHash<Utils::FilePath, Document::Ptr> _documents;
QHash<Utils::FilePath, QList<Document::Ptr>> _documentsByPath;
QHash<Utils::FilePath, LibraryInfo> _libraries;
ImportDependencies _dependencies;
public:
@@ -248,20 +248,19 @@ public:
const_iterator end() const { return _documents.end(); }
void insert(const Document::Ptr &document, bool allowInvalid = false);
void insertLibraryInfo(const QString &path, const LibraryInfo &info);
void remove(const QString &fileName);
void insertLibraryInfo(const Utils::FilePath &path, const LibraryInfo &info);
void remove(const Utils::FilePath &fileName);
const ImportDependencies *importDependencies() const;
ImportDependencies *importDependencies();
Document::Ptr document(const QString &fileName) const;
QList<Document::Ptr> documentsInDirectory(const QString &path) const;
LibraryInfo libraryInfo(const QString &path) const; // FIXME: Remove
Document::Ptr document(const Utils::FilePath &fileName) const;
QList<Document::Ptr> documentsInDirectory(const Utils::FilePath &path) const;
LibraryInfo libraryInfo(const Utils::FilePath &path) const;
Document::MutablePtr documentFromSource(const QString &code,
const QString &fileName,
Dialect language) const;
const Utils::FilePath &fileName,
Dialect language) const;
};
} // namespace QmlJS