aboutsummaryrefslogtreecommitdiffstats
path: root/src/libs/utils/environment.h
diff options
context:
space:
mode:
authorhjk <hjk@qt.io>2019-05-28 13:49:26 +0200
committerhjk <hjk@qt.io>2019-05-28 12:23:26 +0000
commit473a741c9fcf09febba312464fab8385e2351181 (patch)
tree2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/libs/utils/environment.h
parent4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff)
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be best-of-breed within Qt. Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/libs/utils/environment.h')
-rw-r--r--src/libs/utils/environment.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/libs/utils/environment.h b/src/libs/utils/environment.h
index bf716e29ff..f1e957ab6d 100644
--- a/src/libs/utils/environment.h
+++ b/src/libs/utils/environment.h
@@ -124,18 +124,18 @@ public:
Environment::const_iterator constEnd() const;
Environment::const_iterator constFind(const QString &name) const;
- using PathFilter = std::function<bool(const FileName &)>;
- FileName searchInPath(const QString &executable,
- const FileNameList &additionalDirs = FileNameList(),
+ using PathFilter = std::function<bool(const FilePath &)>;
+ FilePath searchInPath(const QString &executable,
+ const FilePathList &additionalDirs = FilePathList(),
const PathFilter &func = PathFilter()) const;
- FileNameList path() const;
+ FilePathList path() const;
QStringList appendExeExtensions(const QString &executable) const;
bool isSameExecutable(const QString &exe1, const QString &exe2) const;
QString expandVariables(const QString &input) const;
- FileName expandVariables(const FileName &input) const;
+ FilePath expandVariables(const FilePath &input) const;
QStringList expandVariables(const QStringList &input) const;
bool operator!=(const Environment &other) const;
@@ -144,8 +144,8 @@ public:
static void modifySystemEnvironment(const QList<EnvironmentItem> &list); // use with care!!!
private:
- FileName searchInDirectory(const QStringList &execs, const FileName &directory,
- QSet<FileName> &alreadyChecked) const;
+ FilePath searchInDirectory(const QStringList &execs, const FilePath &directory,
+ QSet<FilePath> &alreadyChecked) const;
QMap<QString, QString> m_values;
OsType m_osType;
};