From 22435ba7fb8f6f78013b31d52a3a2ba518eee013 Mon Sep 17 00:00:00 2001 From: Jarek Kobus Date: Tue, 21 May 2024 11:18:27 +0200 Subject: [PATCH] Android: Hide displayNameFromInfo() in cpp Change-Id: Iaec548c4b2b56c7515ccf945234f4f59367b006b Reviewed-by: Reviewed-by: Alessandro Portale --- src/plugins/android/androiddevice.cpp | 15 +++++++-------- src/plugins/android/androiddevice.h | 1 - 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/plugins/android/androiddevice.cpp b/src/plugins/android/androiddevice.cpp index e54693d8be1..451d6a549eb 100644 --- a/src/plugins/android/androiddevice.cpp +++ b/src/plugins/android/androiddevice.cpp @@ -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 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 { public: @@ -245,13 +251,6 @@ AndroidDeviceInfo AndroidDevice::androidDeviceInfoFromIDevice(const IDevice *dev 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) { const QString id = (info.type == IDevice::Hardware ? info.serialNumber : info.avdName); @@ -745,7 +744,7 @@ void AndroidDeviceManager::handleAvdListChange(const AndroidDeviceInfoList &avdL QList connectedDevs; for (const AndroidDeviceInfo &item : avdList) { const Id deviceId = AndroidDevice::idFromDeviceInfo(item); - const QString displayName = AndroidDevice::displayNameFromInfo(item); + const QString displayName = displayNameFromInfo(item); IDevice::ConstPtr dev = devMgr->find(deviceId); if (dev) { const auto androidDev = static_cast(dev.get()); diff --git a/src/plugins/android/androiddevice.h b/src/plugins/android/androiddevice.h index 3e9682e9c7b..789fa75ff12 100644 --- a/src/plugins/android/androiddevice.h +++ b/src/plugins/android/androiddevice.h @@ -29,7 +29,6 @@ public: static IDevice::Ptr create(); static AndroidDeviceInfo androidDeviceInfoFromIDevice(const IDevice *dev); - static QString displayNameFromInfo(const AndroidDeviceInfo &info); static Utils::Id idFromDeviceInfo(const AndroidDeviceInfo &info); static Utils::Id idFromAvdInfo(const CreateAvdInfo &info);