From 3d8be750b973719424baa7c1c47baa570ff7cdd6 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Wed, 20 Sep 2017 12:53:30 +0200 Subject: Environment: Use Utils::FileName for path() and related methods Update users accordingly. Change-Id: I9432e82308e9d0630514c6c8632aeb6b6ee0cf90 Reviewed-by: Tim Jenssen --- src/libs/utils/environment.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/libs/utils/environment.h') 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; + using PathFilter = std::function; 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 &alreadyChecked) const; + FileName searchInDirectory(const QStringList &execs, const FileName &directory, + QSet &alreadyChecked) const; QMap m_values; OsType m_osType; }; -- cgit v1.2.1