feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Android: rename avdname to avdName in AndroidDeviceInfo

Browse Source 
Change-Id: I9f4743b0d9f953f1fa407acfea41345571cb9998
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Assam Boudjelthia
2021-10-13 21:18:13 +03:00
parent e5ce9e9e76
commit 851171f772
10 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/android/androiddeviceinfo.cpp
View File

@@ -46,15 +46,15 @@ bool AndroidDeviceInfo::operator<(const AndroidDeviceInfo &other) const
return type == ProjectExplorer::IDevice::Hardware;
if (sdk != other.sdk)
return sdk < other.sdk;
if (avdname != other.avdname)
return avdname < other.avdname;
if (avdName != other.avdName)
return avdName < other.avdName;
return serialNumber < other.serialNumber;
}
bool AndroidDeviceInfo::operator==(const AndroidDeviceInfo &other) const
{
return serialNumber == other.serialNumber && avdname == other.avdname
return serialNumber == other.serialNumber && avdName == other.avdName
&& avdPath == other.avdPath && cpuAbi == other.cpuAbi
&& sdk == other.sdk && state == other.state && type == other.type;
}
@@ -63,7 +63,7 @@ QDebug &operator<<(QDebug &stream, const AndroidDeviceInfo &device)
{
stream << "Type:" << (device.type == ProjectExplorer::IDevice::Emulator ? "Emulator" : "Device")
<< ", ABI:" << device.cpuAbi << ", Serial:" << device.serialNumber
<< ", Name:" << device.avdname << ", API:" << device.sdk
<< ", Name:" << device.avdName << ", API:" << device.sdk
<< ", Authorised:" << (device.state == IDevice::DeviceReadyToUse);
return stream;
}