forked from qt-creator/qt-creator
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>
This commit is contained in:
@@ -175,7 +175,7 @@ public:
|
||||
QHash<QString, SettingValue> m_valueHash;
|
||||
QVariantHash m_defaultValueHash;
|
||||
QString m_settingsGroup;
|
||||
mutable FileName m_binaryFullPath;
|
||||
mutable FilePath m_binaryFullPath;
|
||||
};
|
||||
|
||||
} // namespace Internal
|
||||
@@ -351,11 +351,11 @@ QVariant::Type VcsBaseClientSettings::valueType(const QString &key) const
|
||||
return QVariant::Invalid;
|
||||
}
|
||||
|
||||
FileName VcsBaseClientSettings::binaryPath() const
|
||||
FilePath VcsBaseClientSettings::binaryPath() const
|
||||
{
|
||||
if (d->m_binaryFullPath.isEmpty()) {
|
||||
const FileNameList searchPaths
|
||||
= Utils::transform(searchPathList(), [](const QString &s) { return FileName::fromString(s); });
|
||||
const FilePathList searchPaths
|
||||
= Utils::transform(searchPathList(), [](const QString &s) { return FilePath::fromString(s); });
|
||||
d->m_binaryFullPath = Environment::systemEnvironment().searchInPath(
|
||||
stringValue(binaryPathKey), searchPaths);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user