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

Android: Hide displayNameFromInfo() in cpp

Browse Source 
Change-Id: Iaec548c4b2b56c7515ccf945234f4f59367b006b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
This commit is contained in:
Jarek Kobus
2024-05-21 11:18:27 +02:00
parent c6174e8f1c
commit 22435ba7fb
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/android/androiddevice.cpp
View File

@@ -51,6 +51,12 @@ static constexpr char ipRegexStr[] = "(\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}
static const QRegularExpression ipRegex = QRegularExpression(ipRegexStr); static const QRegularExpression ipRegex = QRegularExpression(ipRegexStr);
static constexpr char wifiDevicePort[] = "5555"; static constexpr char wifiDevicePort[] = "5555";
static QString displayNameFromInfo(const AndroidDeviceInfo &info)
{
return info.type == IDevice::Hardware ? androidConfig().getProductModel(info.serialNumber)
: info.avdName;
}
class AndroidDeviceWidget : public IDeviceWidget class AndroidDeviceWidget : public IDeviceWidget
{ {
public: public:
@@ -245,13 +251,6 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev
return info; return info;
} }
QString AndroidDevice::displayNameFromInfo(const AndroidDeviceInfo &info)
{
return info.type == IDevice::Hardware
? androidConfig().getProductModel(info.serialNumber)
: info.avdName;
}
Id AndroidDevice::idFromDeviceInfo(const AndroidDeviceInfo &info) 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);
@@ -745,7 +744,7 @@ void AndroidDeviceManager::handleAvdListChange(const AndroidDeviceInfoList &avdL
QList<Id> connectedDevs; QList<Id> connectedDevs;
for (const AndroidDeviceInfo &item : avdList) { for (const AndroidDeviceInfo &item : avdList) {
const Id deviceId = AndroidDevice::idFromDeviceInfo(item); const Id deviceId = AndroidDevice::idFromDeviceInfo(item);
const QString displayName = AndroidDevice::displayNameFromInfo(item); const QString displayName = displayNameFromInfo(item);
IDevice::ConstPtr dev = devMgr->find(deviceId); IDevice::ConstPtr dev = devMgr->find(deviceId);
if (dev) { if (dev) {
const auto androidDev = static_cast<const AndroidDevice *>(dev.get()); const auto androidDev = static_cast<const AndroidDevice *>(dev.get());

1
src/plugins/android/androiddevice.h
View File

@@ -29,7 +29,6 @@ public:
static IDevice::Ptr create(); static IDevice::Ptr create();
static AndroidDeviceInfo androidDeviceInfoFromIDevice(const IDevice *dev); static AndroidDeviceInfo androidDeviceInfoFromIDevice(const IDevice *dev);
static QString displayNameFromInfo(const AndroidDeviceInfo &info);
static Utils::Id idFromDeviceInfo(const AndroidDeviceInfo &info); static Utils::Id idFromDeviceInfo(const AndroidDeviceInfo &info);
static Utils::Id idFromAvdInfo(const CreateAvdInfo &info); static Utils::Id idFromAvdInfo(const CreateAvdInfo &info);