Perf: Improve program execution efficiency

deepin-devicemanager/src/DeviceManager/DeviceAudio.cpp

@@ -119,14 +119,14 @@ bool DeviceAudio::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
 TomlFixMethod DeviceAudio::setInfoFromTomlOneByOne(const QMap<QString, QString> &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);

deepin-devicemanager/src/DeviceManager/DeviceBios.cpp

@@ -23,8 +23,8 @@ TomlFixMethod DeviceBios::setInfoFromTomlOneByOne(const QMap<QString, QString> &
     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;
 

deepin-devicemanager/src/DeviceManager/DeviceBluetooth.cpp

@@ -116,20 +116,20 @@ TomlFixMethod DeviceBluetooth::setInfoFromTomlOneByOne(const QMap<QString, QStri
 {
     TomlFixMethod ret = TOML_None;
     // 添加基本信息
-    ret = setTomlAttribute(mapInfo, "Model", m_Model);
-    ret = setTomlAttribute(mapInfo, "Name", m_Name);
-    ret = setTomlAttribute(mapInfo, "Vendor", m_Vendor);
-    ret = setTomlAttribute(mapInfo, "Version", m_Version);
+    setTomlAttribute(mapInfo, "Model", m_Model);
+    setTomlAttribute(mapInfo, "Name", m_Name);
+    setTomlAttribute(mapInfo, "Vendor", m_Vendor);
+    setTomlAttribute(mapInfo, "Version", m_Version);
 
     // 添加其他信息,成员变量
-    ret = setTomlAttribute(mapInfo, "Speed", m_Speed);
-    ret = setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
-    ret = setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
-    ret = setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
-    ret = setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
-    ret = setTomlAttribute(mapInfo, "Logical Name", m_LogicalName);
+    setTomlAttribute(mapInfo, "Speed", m_Speed);
+    setTomlAttribute(mapInfo, "Maximum Power", m_MaximumPower);
+    setTomlAttribute(mapInfo, "Driver Version", m_DriverVersion);
+    setTomlAttribute(mapInfo, "Capabilities", m_Capabilities);
+    setTomlAttribute(mapInfo, "Bus Info", m_BusInfo);
+    setTomlAttribute(mapInfo, "Logical Name", m_LogicalName);
     ret = setTomlAttribute(mapInfo, "MAC Address", m_MAC);
-//3. 获取设备的其它信息
+    //3. 获取设备的其它信息
     getOtherMapInfo(mapInfo);
     return ret;
 }

deepin-devicemanager/src/DeviceManager/DeviceCdrom.cpp

@@ -42,10 +42,10 @@ bool DeviceCdrom::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
 TomlFixMethod DeviceCdrom::setInfoFromTomlOneByOne(const QMap<QString, QString> &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);

deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp

@@ -506,8 +506,8 @@ TomlFixMethod DeviceBaseInfo::setInfoFromTomlBase(const QMap<QString, QString> &
         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");

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<DeviceBaseInfo *> 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 *>();
 }
 
 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<DevicePower *>(device);
         (TOML_Del == tomldevice->setInfoFromTomlBase(mapInfo)) ? ret = TOML_Del : ret = tomldevice->setInfoFromTomlOneByOne(mapInfo);
     } break;
-    default: {    } break;
     }
     return ret;
 }
@@ -477,90 +478,90 @@ 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<DeviceComputer *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Cpu: {
         DeviceCpu *tomldevice = dynamic_cast<DeviceCpu *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Bios: {
         DeviceBios *tomldevice = dynamic_cast<DeviceBios *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Memory: {
         DeviceMemory *tomldevice = dynamic_cast<DeviceMemory *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
      case DT_Storage: {
         DeviceStorage *tomldevice = dynamic_cast<DeviceStorage *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Gpu: {
         DeviceGpu *tomldevice = dynamic_cast<DeviceGpu *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Monitor: {
         DeviceMonitor *tomldevice = dynamic_cast<DeviceMonitor *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Network: {
         DeviceNetwork *tomldevice = dynamic_cast<DeviceNetwork *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Audio: {
         DeviceAudio *tomldevice = dynamic_cast<DeviceAudio *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Bluetoorh: {
         DeviceBluetooth *tomldevice = dynamic_cast<DeviceBluetooth *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Keyboard: {
         DeviceInput *tomldevice = dynamic_cast<DeviceInput *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Mouse: {
         DeviceInput *tomldevice = dynamic_cast<DeviceInput *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Print: {
         DevicePrint *tomldevice = dynamic_cast<DevicePrint *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Image: {
         DeviceImage *tomldevice = dynamic_cast<DeviceImage *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Cdrom: {
         DeviceCdrom *tomldevice = dynamic_cast<DeviceCdrom *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Others: {
         DeviceOthers *tomldevice = dynamic_cast<DeviceOthers *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_OtherPCI: {
         DeviceOtherPCI *tomldevice = dynamic_cast<DeviceOtherPCI *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
+    };
     case DT_Power: {
         DevicePower *tomldevice = dynamic_cast<DevicePower *>(device);
         return tomldevice->readDeviceInfoKeyValue(key);
-    } break;
-    default: {    } break;
+    };
     }
     return QString("");
 }
 
 bool DeviceManager::tomlSetBytomlmatchkey(DeviceType deviceType, DeviceBaseInfo *device, const QString &tomltomlmatchkey, const QString &tomltomlconfigdemanding)
 {
     Q_UNUSED(deviceType)
+    Q_UNUSED(tomltomlconfigdemanding)
+
     QMap<QString, QString> 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;
     {

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 {

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");