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

Environment: Use Utils::FileName for path() and related methods

Browse Source 
Update users accordingly.

Change-Id: I9432e82308e9d0630514c6c8632aeb6b6ee0cf90
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
This commit is contained in:
Tobias Hunger
2017-09-20 12:53:30 +02:00
parent 8645b27880
commit 3d8be750b9
13 changed files with 72 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/libs/utils/environment.h
View File

@@ -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;
};