diff options
author | Tobias Hunger <tobias.hunger@qt.io> | 2017-09-20 12:53:30 +0200 |
---|---|---|
committer | Tobias Hunger <tobias.hunger@qt.io> | 2017-09-27 07:37:26 +0000 |
commit | 3d8be750b973719424baa7c1c47baa570ff7cdd6 (patch) | |
tree | 2c3cc2e26f626d9fdcb22c6d0675fc8fcdf56dad /src/libs/utils/environment.h | |
parent | 8645b278800bb06df5f24034751bde241d23d02f (diff) | |
download | qt-creator-3d8be750b973719424baa7c1c47baa570ff7cdd6.tar.gz |
Environment: Use Utils::FileName for path() and related methods
Update users accordingly.
Change-Id: I9432e82308e9d0630514c6c8632aeb6b6ee0cf90
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
Diffstat (limited to 'src/libs/utils/environment.h')
-rw-r--r-- | src/libs/utils/environment.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h index 2f4e84106e..c9ebb99b8d 100644 --- a/src/libs/utils/environment.h +++ b/src/libs/utils/environment.h @@ -112,12 +112,12 @@ public: Environment::const_iterator constEnd() const; Environment::const_iterator constFind(const QString &name) const; - using PathFilter = std::function<bool(const QString &)>; + using PathFilter = std::function<bool(const FileName &)>; FileName searchInPath(const QString &executable, - const QStringList &additionalDirs = QStringList(), + const FileNameList &additionalDirs = FileNameList(), const PathFilter &func = PathFilter()) const; - QStringList path() const; + FileNameList path() const; QStringList appendExeExtensions(const QString &executable) const; bool isSameExecutable(const QString &exe1, const QString &exe2) const; @@ -129,8 +129,8 @@ public: bool operator==(const Environment &other) const; private: - FileName searchInDirectory(const QStringList &execs, QString directory, - QSet<QString> &alreadyChecked) const; + FileName searchInDirectory(const QStringList &execs, const FileName &directory, + QSet<FileName> &alreadyChecked) const; QMap<QString, QString> m_values; OsType m_osType; }; |