Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion deepin-devicemanager/src/DeviceManager/DeviceInfo.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ bool DeviceBaseInfo::driverIsKernelIn(const QString &driver)
return !outInfo.contains("filename:");
}

void DeviceBaseInfo::setCanEnale(bool can)
void DeviceBaseInfo::setCanEnable(bool can)
{
m_CanEnable = can;
}
Expand Down
4 changes: 2 additions & 2 deletions deepin-devicemanager/src/DeviceManager/DeviceInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,10 +164,10 @@ class DeviceBaseInfo : public QObject
virtual bool driverIsKernelIn(const QString &driver);

/**
* @brief setCanEnale : set can enable or not
* @brief setCanEnable : set can enable or not
* @param can
*/
void setCanEnale(bool can);
void setCanEnable(bool can);

/**
* @brief canEnable : 该设备是否可以禁用
Expand Down
2 changes: 1 addition & 1 deletion deepin-devicemanager/src/DeviceManager/DeviceOthers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ void DeviceOthers::setInfoFromLshw(const QMap<QString, QString> &mapInfo)
m_Driver.clear();
if(m_Driver.isEmpty() && !m_Avail.compare("yes", Qt::CaseInsensitive)){
setForcedDisplay(true);
setCanEnale(false);
setCanEnable(false);
if(!(tmp_Name.contains("fingerprint", Qt::CaseInsensitive) || tmp_Name. contains("MOH", Qt::CaseInsensitive)))
setCanUninstall(false);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -917,7 +917,7 @@ void DeviceGenerator::getKeyboardInfoFromHwinfo()
DeviceInput *device = new DeviceInput();
device->setInfoFromHwinfo(*it);
device->setHardwareClass("keyboard");
device->setCanEnale(false);
device->setCanEnable(false);
DeviceManager::instance()->addKeyboardDevice(device);
addBusIDFromHwinfo((*it)["SysFS BusID"]);
}
Expand Down
4 changes: 2 additions & 2 deletions deepin-devicemanager/src/GenerateDevice/HWGenerator.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -331,7 +331,7 @@ void HWGenerator::getAudioInfoFromCatAudio()
}

DeviceAudio *device = new DeviceAudio();
device->setCanEnale(false);
device->setCanEnable(false);
device->setCanUninstall(false);
device->setForcedDisplay(true);
device->setInfoFromCatAudio(tempMap);
Expand All @@ -348,7 +348,7 @@ void HWGenerator::getBluetoothInfoFromHciconfig()
continue;
}
DeviceBluetooth *device = new DeviceBluetooth();
device->setCanEnale(false);
device->setCanEnable(false);
device->setForcedDisplay(true);
device->setInfoFromHciconfig(*it);
DeviceManager::instance()->addBluetoothDevice(device);
Expand Down