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

AndroidDeviceInfo: Rename cpuABI to cpuAbi

Browse Source 
Coding style.

Change-Id: I433b4d47f54c5a3a9aed68d99b2ab64a7e82d698
Reviewed-by: hjk <hjk121@nokiamail.com>
This commit is contained in:
Daniel Teske
2013-07-04 12:43:26 +02:00
parent 7449297dc4
commit 6773d47a63
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/android/androidconfigurations.cpp
View File

@@ -383,7 +383,7 @@ QString AndroidConfigurations::getDeployDeviceSerialNumber(int *apiLevel, const
QVector<AndroidDeviceInfo> devices = connectedDevices();
foreach (AndroidDeviceInfo device, devices) {
if (device.sdk >= *apiLevel && device.cpuABI.contains(abi)) {
if (device.sdk >= *apiLevel && device.cpuAbi.contains(abi)) {
*apiLevel = device.sdk;
return device.serialNumber;
}
@@ -421,7 +421,7 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::connectedDevices() const
dev.serialNumber = serialNo;
dev.sdk = getSDKVersion(dev.serialNumber);
dev.cpuABI = getAbis(dev.serialNumber);
dev.cpuAbi = getAbis(dev.serialNumber);
devices.push_back(dev);
}
qSort(devices.begin(), devices.end(), androidDevicesLessThan);
@@ -509,7 +509,7 @@ QVector<AndroidDeviceInfo> AndroidConfigurations::androidVirtualDevices() const
if (line.contains(QLatin1String("Target:")))
dev.sdk = line.mid(line.lastIndexOf(QLatin1Char(' '))).remove(QLatin1Char(')')).toInt();
if (line.contains(QLatin1String("ABI:")))
dev.cpuABI = QStringList() << line.mid(line.lastIndexOf(QLatin1Char(' '))).trimmed();
dev.cpuAbi = QStringList() << line.mid(line.lastIndexOf(QLatin1Char(' '))).trimmed();
}
devices.push_back(dev);
}

2
src/plugins/android/androidconfigurations.h
View File

@@ -65,7 +65,7 @@ public:
struct AndroidDeviceInfo
{
QString serialNumber;
QStringList cpuABI;
QStringList cpuAbi;
int sdk;
static QStringList adbSelector(const QString &serialNumber);

2
src/plugins/android/androidsettingswidget.cpp
View File

@@ -75,7 +75,7 @@ QVariant AvdModel::data(const QModelIndex &index, int role) const
case 1:
return QString::fromLatin1("API %1").arg(m_list[index.row()].sdk);
case 2:
return m_list[index.row()].cpuABI;
return m_list[index.row()].cpuAbi;
}
return QVariant();
}