From d4f010caf28368e38125d1c9a55549e135e298d8 Mon Sep 17 00:00:00 2001 From: gongheng Date: Wed, 30 Jul 2025 13:09:48 +0800 Subject: [PATCH 1/2] fix: [cppcheck] Remove the useless code. -- The "ret" is not use, so remvoe it. --- .../src/DeviceManager/DeviceAudio.cpp | 12 +++++----- .../src/DeviceManager/DeviceBios.cpp | 4 ++-- .../src/DeviceManager/DeviceBluetooth.cpp | 22 +++++++++---------- .../src/DeviceManager/DeviceCdrom.cpp | 8 +++---- .../src/DeviceManager/DeviceInfo.cpp | 4 ++-- 5 files changed, 25 insertions(+), 25 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceAudio.cpp b/deepin-devicemanager/src/DeviceManager/DeviceAudio.cpp index 8f1020094..54c110e81 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceAudio.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceAudio.cpp @@ -119,14 +119,14 @@ bool DeviceAudio::setInfoFromLshw(const QMap &mapInfo) TomlFixMethod DeviceAudio::setInfoFromTomlOneByOne(const QMap &mapInfo) { TomlFixMethod ret = TOML_None; -// must cover the loadOtherDeviceInfo + // must cover the loadOtherDeviceInfo // 添加基本信息 - ret = setTomlAttribute(mapInfo, "SysFS_Path", m_SysPath); - ret = setTomlAttribute(mapInfo, "KernelModeDriver", m_Driver); + setTomlAttribute(mapInfo, "SysFS_Path", m_SysPath); + setTomlAttribute(mapInfo, "KernelModeDriver", m_Driver); // 添加其他信息,成员变量 - ret = setTomlAttribute(mapInfo, "Chip", m_Chip); - ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities); - ret = setTomlAttribute(mapInfo, "Memory Address", m_Memory); + setTomlAttribute(mapInfo, "Chip", m_Chip); + setTomlAttribute(mapInfo, "Capabilities", m_Capabilities); + setTomlAttribute(mapInfo, "Memory Address", m_Memory); ret = setTomlAttribute(mapInfo, "IRQ", m_Irq); //3. 获取设备的其它信息 getOtherMapInfo(mapInfo); diff --git a/deepin-devicemanager/src/DeviceManager/DeviceBios.cpp b/deepin-devicemanager/src/DeviceManager/DeviceBios.cpp index 5b74f1a34..92fbd0ab7 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceBios.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceBios.cpp @@ -23,8 +23,8 @@ TomlFixMethod DeviceBios::setInfoFromTomlOneByOne(const QMap & TomlFixMethod ret = TOML_None; ret = setTomlAttribute(mapInfo, "Version", m_Version, true); - ret = setTomlAttribute(mapInfo, "Product Name", m_ProductName, true); - ret = setTomlAttribute(mapInfo, "Chipset", m_ChipsetFamily, true); + setTomlAttribute(mapInfo, "Product Name", m_ProductName, true); + setTomlAttribute(mapInfo, "Chipset", m_ChipsetFamily, true); // ret = setTomlAttribute(mapInfo, "Vendor", m_Vendor,true); // m_IsBoard = true; diff --git a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp index 3a5654d7c..7ab898171 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp @@ -116,20 +116,20 @@ TomlFixMethod DeviceBluetooth::setInfoFromTomlOneByOne(const QMap &mapInfo) TomlFixMethod DeviceCdrom::setInfoFromTomlOneByOne(const QMap &mapInfo) { TomlFixMethod ret = TOML_None; - ret = setTomlAttribute(mapInfo, "Model", m_Type); - ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo); - ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities); - ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaxPower); + setTomlAttribute(mapInfo, "Model", m_Type); + setTomlAttribute(mapInfo, "Bus Info", m_BusInfo); + setTomlAttribute(mapInfo, "Capabilities", m_Capabilities); + setTomlAttribute(mapInfo, "Maximum Power", m_MaxPower); ret = setTomlAttribute(mapInfo, "Speed", m_Speed); //3. 获取设备的其它信息 getOtherMapInfo(mapInfo); diff --git a/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp b/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp index 24f00a5a3..448fedaf0 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp @@ -506,8 +506,8 @@ TomlFixMethod DeviceBaseInfo::setInfoFromTomlBase(const QMap & return TOML_Del; } - ret2 = setTomlAttribute(mapInfo, "Revision", m_Version); - ret2 = setTomlAttribute(mapInfo, "Description", m_Description); + setTomlAttribute(mapInfo, "Revision", m_Version); + setTomlAttribute(mapInfo, "Description", m_Description); m_VID = m_VID.toLower(); m_PID = m_PID.toLower(); m_VID_PID = m_VID + m_PID.remove("0x"); From b79007bbc62f5d8e819d5a8005da16b6c0e44d61 Mon Sep 17 00:00:00 2001 From: gongheng Date: Wed, 30 Jul 2025 13:33:09 +0800 Subject: [PATCH 2/2] Perf: [cppcheck] Improve program execution efficiency. -- Enhance application runtime performance -- Clean up dead/unused code --- .../src/DeviceManager/DeviceManager.cpp | 51 ++++++++++--------- .../src/DeviceManager/DeviceMonitor.cpp | 2 - .../src/DeviceManager/DeviceStorage.cpp | 2 +- 3 files changed, 29 insertions(+), 26 deletions(-) diff --git a/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp b/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp index ab0542521..e874c2613 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceManager.cpp @@ -36,7 +36,7 @@ using namespace DDLog; DeviceManager *DeviceManager::sInstance = nullptr; int DeviceManager::m_CurrentXlsRow = 1; -QMutex addCmdMutex; +static QMutex addCmdMutex; DeviceManager::DeviceManager() : m_CpuNum(1) @@ -359,11 +359,13 @@ QList DeviceManager::convertDeviceList(DeviceType deviceType) if (deviceType == DT_Print) {return m_ListDevicePrint;} if (deviceType == DT_Image) {return m_ListDeviceImage;} if (deviceType == DT_Others) {return m_ListDeviceOthers;} + + return QList(); } DeviceBaseInfo *DeviceManager::createDevice(DeviceType deviceType) { - DeviceBaseInfo *vTemp; + DeviceBaseInfo *vTemp { nullptr }; if (deviceType == DT_Computer) {vTemp = new DeviceComputer(); return vTemp;} if (deviceType == DT_Cpu) {vTemp = new DeviceCpu(); return vTemp;} if (deviceType == DT_Bios) {vTemp = new DeviceBios(); return vTemp;} @@ -467,7 +469,6 @@ TomlFixMethod DeviceManager::tomlDeviceMapSet(DeviceType deviceType, DeviceBase DevicePower *tomldevice = dynamic_cast(device); (TOML_Del == tomldevice->setInfoFromTomlBase(mapInfo)) ? ret = TOML_Del : ret = tomldevice->setInfoFromTomlOneByOne(mapInfo); } break; - default: { } break; } return ret; } @@ -477,83 +478,81 @@ QString DeviceManager::tomlDeviceReadKeyValue(DeviceType deviceType, DeviceBaseI if (!device) return QString(""); - TomlFixMethod ret = TOML_None; switch (deviceType) { case DT_Null: break; case DT_Computer: { DeviceComputer *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Cpu: { DeviceCpu *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Bios: { DeviceBios *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Memory: { DeviceMemory *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Storage: { DeviceStorage *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Gpu: { DeviceGpu *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Monitor: { DeviceMonitor *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Network: { DeviceNetwork *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Audio: { DeviceAudio *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Bluetoorh: { DeviceBluetooth *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Keyboard: { DeviceInput *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Mouse: { DeviceInput *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Print: { DevicePrint *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Image: { DeviceImage *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Cdrom: { DeviceCdrom *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Others: { DeviceOthers *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_OtherPCI: { DeviceOtherPCI *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; + }; case DT_Power: { DevicePower *tomldevice = dynamic_cast(device); return tomldevice->readDeviceInfoKeyValue(key); - } break; - default: { } break; + }; } return QString(""); } @@ -561,6 +560,8 @@ QString DeviceManager::tomlDeviceReadKeyValue(DeviceType deviceType, DeviceBaseI bool DeviceManager::tomlSetBytomlmatchkey(DeviceType deviceType, DeviceBaseInfo *device, const QString &tomltomlmatchkey, const QString &tomltomlconfigdemanding) { Q_UNUSED(deviceType) + Q_UNUSED(tomltomlconfigdemanding) + QMap itemMap; QStringList keyValues = tomltomlmatchkey.split(","); foreach (const QString &keyValue, keyValues) { @@ -690,6 +691,8 @@ void DeviceManager::tomlDeviceAdd(DeviceType deviceType, DeviceBaseInfo *const d bool DeviceManager::findByModalias(DeviceType deviceType, DeviceBaseInfo *device, const QString &modalias) { + Q_UNUSED(deviceType) + if (modalias.isEmpty()) return false; { @@ -718,6 +721,8 @@ bool DeviceManager::findByModalias(DeviceType deviceType, DeviceBaseInfo *device bool DeviceManager::findByVIDPID(DeviceType deviceType, DeviceBaseInfo *device, const QString &vid, const QString &pid) { + Q_UNUSED(deviceType) + if (vid.isEmpty() || pid.isEmpty()) return false; { diff --git a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp index 1c1ea6811..4bc976a25 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceMonitor.cpp @@ -288,8 +288,6 @@ QString DeviceMonitor::subTitle() const QString DeviceMonitor::getOverviewInfo() { QString ov; - - ov = QString("%1(%2)").arg(m_Name).arg(m_ScreenSize); if (Common::specialComType == 6 || Common::specialComType == 7) { ov = QString("(%1)").arg(m_ScreenSize); } else { diff --git a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp index 0c0d88e4a..dfd91d3f7 100644 --- a/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp +++ b/deepin-devicemanager/src/DeviceManager/DeviceStorage.cpp @@ -532,7 +532,7 @@ QString DeviceStorage::subTitle() const QString DeviceStorage::getOverviewInfo() { - QString overViewInfo = QString("%1 (%2)").arg(m_Name).arg(m_Size); + QString overViewInfo; if (m_Interface.contains("UFS", Qt::CaseInsensitive)) { overViewInfo = QString("%1 %2").arg(m_Size).arg("UFS");