diff options
author | hjk <[email protected]> | 2019-05-28 13:49:26 +0200 |
---|---|---|
committer | hjk <[email protected]> | 2019-05-28 12:23:26 +0000 |
commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/android/androidtoolmanager.cpp | |
parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (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 <[email protected]>
Diffstat (limited to 'src/plugins/android/androidtoolmanager.cpp')
-rw-r--r-- | src/plugins/android/androidtoolmanager.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/android/androidtoolmanager.cpp b/src/plugins/android/androidtoolmanager.cpp index 84658f12b2f..be26329f98e 100644 --- a/src/plugins/android/androidtoolmanager.cpp +++ b/src/plugins/android/androidtoolmanager.cpp @@ -46,7 +46,7 @@ using namespace Utils; class AndroidToolOutputParser { public: - void parseTargetListing(const QString &output, const FileName &sdkLocation, + void parseTargetListing(const QString &output, const FilePath &sdkLocation, SdkPlatformList &platformList); QList<SdkPlatform> m_installedPlatforms; @@ -57,7 +57,7 @@ public: environment. Returns \c true for successful execution. Command's output is copied to \a output. */ -static bool androidToolCommand(Utils::FileName toolPath, const QStringList &args, +static bool androidToolCommand(Utils::FilePath toolPath, const QStringList &args, const QProcessEnvironment &environment, QString *output) { QString androidToolPath = toolPath.toString(); @@ -143,7 +143,7 @@ QFuture<AndroidDeviceInfoList> AndroidToolManager::androidVirtualDevicesFuture() AndroidConfigurations::toolsEnvironment(m_config)); } -CreateAvdInfo AndroidToolManager::createAvdImpl(CreateAvdInfo info, FileName androidToolPath, +CreateAvdInfo AndroidToolManager::createAvdImpl(CreateAvdInfo info, FilePath androidToolPath, QProcessEnvironment env) { QProcess proc; @@ -195,8 +195,8 @@ CreateAvdInfo AndroidToolManager::createAvdImpl(CreateAvdInfo info, FileName and return info; } -AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::FileName &androidTool, - const FileName &sdkLocationPath, +AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::FilePath &androidTool, + const FilePath &sdkLocationPath, const QProcessEnvironment &env) { AndroidDeviceInfoList devices; @@ -274,7 +274,7 @@ AndroidDeviceInfoList AndroidToolManager::androidVirtualDevices(const Utils::Fil } void AndroidToolOutputParser::parseTargetListing(const QString &output, - const Utils::FileName &sdkLocation, + const Utils::FilePath &sdkLocation, SdkPlatformList &platformList) { auto addSystemImage = [](const QStringList& abiList, SdkPlatform *platform) { @@ -291,7 +291,7 @@ void AndroidToolOutputParser::parseTargetListing(const QString &output, QVersionNumber revision; int apiLevel = -1; QString description; - Utils::FileName installedLocation; + Utils::FilePath installedLocation; void clear() { abiList.clear(); |