diff options
author | Assam Boudjelthia <[email protected]> | 2021-10-13 21:18:13 +0300 |
---|---|---|
committer | Assam Boudjelthia <[email protected]> | 2022-03-14 17:48:31 +0000 |
commit | 851171f7727c608610a6bf3f1333a393fd3c4b78 (patch) | |
tree | b10ac2ecdf892aba2ff0ea4c795ee29916479e88 /src/plugins/android/androiddevice.cpp | |
parent | e5ce9e9e764b7baa1af5721a01e75870a2cbf6bd (diff) |
Android: rename avdname to avdName in AndroidDeviceInfo
Change-Id: I9f4743b0d9f953f1fa407acfea41345571cb9998
Reviewed-by: Alessandro Portale <[email protected]>
Diffstat (limited to 'src/plugins/android/androiddevice.cpp')
-rw-r--r-- | src/plugins/android/androiddevice.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index 70c2ba2d807..3e78f43b329 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -231,7 +231,7 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev { AndroidDeviceInfo info; info.state = dev->deviceState(); - info.avdname = dev->extraData(Constants::AndroidAvdName).toString(); + info.avdName = dev->extraData(Constants::AndroidAvdName).toString(); info.serialNumber = dev->extraData(Constants::AndroidSerialNumber).toString(); info.cpuAbi = dev->extraData(Constants::AndroidCpuAbi).toStringList(); const QString avdPath = dev->extraData(Constants::AndroidAvdPath).toString(); @@ -246,12 +246,12 @@ QString AndroidDevice::displayNameFromInfo(const AndroidDeviceInfo &info) { return info.type == IDevice::Hardware ? AndroidConfigurations::currentConfig().getProductModel(info.serialNumber) - : info.avdname; + : info.avdName; } Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info) { - const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdname); + const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdName); return Id(Constants::ANDROID_DEVICE_ID).withSuffix(':' + id); } @@ -640,7 +640,7 @@ void AndroidDeviceManager::HandleAvdsListChange() devMgr->removeDevice(dev->id()); } else { // Find the state of the AVD retrieved from the AVD watcher - const QString serial = getRunningAvdsSerialNumber(item.avdname); + const QString serial = getRunningAvdsSerialNumber(item.avdName); const IDevice::DeviceState state = getDeviceState(serial, IDevice::Emulator); if (dev->deviceState() != state) { devMgr->setDeviceState(dev->id(), state); @@ -658,7 +658,7 @@ void AndroidDeviceManager::HandleAvdsListChange() newDev->setMachineType(item.type); newDev->setDeviceState(item.state); - newDev->setExtraData(Constants::AndroidAvdName, item.avdname); + newDev->setExtraData(Constants::AndroidAvdName, item.avdName); newDev->setExtraData(Constants::AndroidSerialNumber, item.serialNumber); newDev->setExtraData(Constants::AndroidCpuAbi, item.cpuAbi); newDev->setExtraData(Constants::AndroidSdk, item.sdk); |