forked from qt-creator/qt-creator
QmlJS: Proliferate FilePath use, part 2
Change-Id: I631df6ba5e782e2db9e03de4e5df843d15c19f37 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -65,7 +65,7 @@ private:
|
||||
private:
|
||||
class Plugin {
|
||||
public:
|
||||
QString qmldirPath;
|
||||
Utils::FilePath qmldirPath;
|
||||
QString importPath;
|
||||
QString importUri;
|
||||
QString importVersion;
|
||||
@@ -98,7 +98,7 @@ private:
|
||||
QSharedPointer<QSet<QString>> visited) const;
|
||||
|
||||
void loadQmltypesFile(const QStringList &qmltypesFilePaths,
|
||||
const QString &libraryPath,
|
||||
const Utils::FilePath &libraryPath,
|
||||
QmlJS::LibraryInfo libraryInfo);
|
||||
QString resolvePlugin(const QDir &qmldirPath, const QString &qmldirPluginPath,
|
||||
const QString &baseName);
|
||||
@@ -109,7 +109,7 @@ private:
|
||||
private:
|
||||
Utils::FileSystemWatcher *pluginWatcher();
|
||||
void prepareLibraryInfo(LibraryInfo &libInfo,
|
||||
const QString &libraryPath,
|
||||
const Utils::FilePath &libraryPath,
|
||||
const QStringList &deps,
|
||||
const QStringList &errors,
|
||||
const QStringList &warnings,
|
||||
@@ -118,7 +118,7 @@ private:
|
||||
|
||||
ModelManagerInterface *m_modelManager;
|
||||
Utils::FileSystemWatcher *m_pluginWatcher;
|
||||
QHash<Utils::QtcProcess *, QString> m_runningQmldumps;
|
||||
QHash<Utils::QtcProcess *, Utils::FilePath> m_runningQmldumps;
|
||||
QList<Plugin> m_plugins;
|
||||
QHash<QString, int> m_libraryToPluginIndex;
|
||||
QHash<QString, QmlJS::ModelManagerInterface::ProjectInfo> m_qtToInfo;
|
||||
|
||||
Reference in New Issue
Block a user