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:
@@ -223,7 +223,7 @@ private:
|
||||
AndroidSdkManager &m_sdkManager;
|
||||
const AndroidConfig &m_config;
|
||||
AndroidSdkPackageList m_allPackages;
|
||||
FileName lastSdkManagerPath;
|
||||
FilePath lastSdkManagerPath;
|
||||
QString m_licenseTextCache;
|
||||
QByteArray m_licenseUserInput;
|
||||
mutable QReadWriteLock m_licenseInputLock;
|
||||
@@ -243,7 +243,7 @@ class SdkManagerOutputParser
|
||||
QStringList headerParts;
|
||||
QVersionNumber revision;
|
||||
QString description;
|
||||
Utils::FileName installedLocation;
|
||||
Utils::FilePath installedLocation;
|
||||
QMap<QString, QString> extraData;
|
||||
};
|
||||
|
||||
@@ -612,7 +612,7 @@ bool SdkManagerOutputParser::parseAbstractData(SdkManagerOutputParser::GenericPa
|
||||
for (const auto &key: qAsConst(extraKeys)) {
|
||||
if (valueForKey(key, line, &value)) {
|
||||
if (key == installLocationKey)
|
||||
output.installedLocation = Utils::FileName::fromString(value);
|
||||
output.installedLocation = Utils::FilePath::fromString(value);
|
||||
else if (key == revisionKey)
|
||||
output.revision = QVersionNumber::fromString(value);
|
||||
else if (key == descriptionKey)
|
||||
|
||||
Reference in New Issue
Block a user