openkylin
/
kylin-nm
mirror of https://gitee.com/openkylin/kylin-nm.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix:modify some coding errors.

This commit is contained in:
renpeijia 2021-09-10 14:36:37 +08:00
parent ba6c9658ef
commit 25fdf0b516
5 changed files with 3 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/dbus-interface/kylinconnectoperation.h
View File

@ -37,7 +37,7 @@ signals:
void activateConnectionError(QString errorMessage);
void deactivateConnectionError(QString errorMessage);
private:
protected:
KyNetworkResourceManager *m_networkResourceInstance = nullptr;
};

9
src/backend/dbus-interface/kylinconnectresource.cpp
View File

@ -11,7 +11,6 @@
KyConnectResourse::KyConnectResourse(QObject *parent) : QObject(parent)
{
m_networkResourceInstance = KyNetworkResourceManager::getInstance();
m_networkdevice = new KyNetworkDeviceResourse();
connect(m_networkResourceInstance, &KyNetworkResourceManager::connectionAdd, this, &KyConnectResourse::connectionAdd);
connect(m_networkResourceInstance, &KyNetworkResourceManager::connectionRemove, this, &KyConnectResourse::connectionRemove);
@ -21,10 +20,6 @@ KyConnectResourse::KyConnectResourse(QObject *parent) : QObject(parent)
KyConnectResourse::~KyConnectResourse()
{
m_networkResourceInstance = nullptr;
if (nullptr != m_networkdevice) {
delete m_networkdevice;
m_networkdevice = nullptr;
}
}
KyConnectItem *KyConnectResourse::getConnectionItem(NetworkManager::Connection::Ptr connectPtr)
@ -44,7 +39,7 @@ KyConnectItem *KyConnectResourse::getConnectionItem(NetworkManager::Connection::
connectionItem->m_itemType = settingPtr->connectionType();
if (m_networkResourceInstance->isActivatingConnection(connectPtr->uuid())) {
connectionItem->m_connectState = NetworkManager::ActiveConnection::State::Deactivating;
connectionItem->m_connectState = NetworkManager::ActiveConnection::State::Activating;
} else {
connectionItem->m_connectState = NetworkManager::ActiveConnection::State::Deactivated;
}
@ -57,7 +52,7 @@ KyConnectItem * KyConnectResourse::getConnectionItemByUuid(QString connectUuid,
m_networkResourceInstance->getConnect(connectUuid);
if (nullptr == connectPtr) {
qWarning()<<"get connect failed, connect uuid"<<connectUuid;
qWarning()<< "[KyConnectResourse]" <<"get connect failed, connect uuid"<<connectUuid;
return nullptr;
}

1
src/backend/dbus-interface/kylinconnectresource.h
View File

@ -54,6 +54,5 @@ signals:
private:
KyNetworkResourceManager *m_networkResourceInstance = nullptr;
KyNetworkDeviceResourse *m_networkdevice = nullptr;
};
#endif // KYLINCONNECTRESOURCE_H

1
src/backend/dbus-interface/kywirelessconnectoperation.cpp
View File

@ -68,7 +68,6 @@ NetworkManager::ConnectionSettings::Ptr assembleWirelessSettings(const KyWireles
KyWirelessConnectOperation::KyWirelessConnectOperation(QObject *parent) : KyConnectOperation(parent)
{
m_networkResourceInstance = KyNetworkResourceManager::getInstance();
connect(m_networkResourceInstance, &KyNetworkResourceManager::wifinEnabledChanged, this, &KyWirelessConnectOperation::wifinEnabledChanged);
}

3
src/backend/dbus-interface/kywirelessconnectoperation.h
View File

@ -126,9 +126,6 @@ private:
void setIpv4AndIpv6Setting(NetworkManager::ConnectionSettings::Ptr connSetting, const KyConnectSetting &connSettingInfo);
void setWirelessSecuWpaXEap(NetworkManager::ConnectionSettings::Ptr connSettingPtr);
void activateApConnectionByUuid(const QString apUuid, const QString apDevice);
KyNetworkResourceManager *m_networkResourceInstance = nullptr;
};
#endif // KYWIRELESSCONNECTOPERATION_H