Akatsuki-Misaki/dde-dock
1
0
Fork 0
mirror of https://github.com/linuxdeepin/dde-dock.git synced 2025-06-04 17:33:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: follow network lib update

Browse Source 
https://github.com/linuxdeepin/internal-discussion/issues/730

Change-Id: I3148d8fd86f0ff0e942b7c0037daa715cb36eb0c
This commit is contained in:
listenerri 2019-01-18 18:17:01 +08:00
parent 3fbfabd340
commit acedaeff73
Notes: gerrit 2019-01-21 09:19:14 +08:00 
Verified+1: <jenkins@deepin.com>
Code-Review+2: listenerri <listenerri@gmail.com>
Submitted-by: listenerri <listenerri@gmail.com>
Submitted-at: Mon, 21 Jan 2019 09:19:14 +0800
Reviewed-on: https://cr.deepin.io/41395
Project: dde/dde-dock
Branch: refs/heads/master
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/network/item/applet/wirelesslist.cpp
View File

@ -92,7 +92,7 @@ WirelessList::WirelessList(WirelessDevice *deviceIter, QWidget *parent)
connect(m_updateAPTimer, &QTimer::timeout, this, &WirelessList::updateAPList);
connect(m_device, &WirelessDevice::activeConnectionChanged, this, &WirelessList::onActiveConnectionChanged);
connect(m_device, &WirelessDevice::activeWirelessConnectionChanged, this, &WirelessList::onActiveConnectionChanged);
connect(m_device, static_cast<void (WirelessDevice:: *) (NetworkDevice::DeviceStatus stat) const>(&WirelessDevice::statusChanged), m_updateAPTimer, static_cast<void (QTimer::*)()>(&QTimer::start));
connect(this->verticalScrollBar(), &QScrollBar::valueChanged, this, [=] {

4
plugins/network/item/wireditem.cpp
View File

@ -49,7 +49,7 @@ WiredItem::WiredItem(WiredDevice *device)
connect(m_delayTimer, &QTimer::timeout, this, &WiredItem::reloadIcon);
connect(m_device, static_cast<void (NetworkDevice::*)(NetworkDevice::DeviceStatus) const>(&NetworkDevice::statusChanged), this, &WiredItem::deviceStateChanged);
connect(static_cast<WiredDevice *>(m_device.data()), &WiredDevice::connectionsChanged, this, &WiredItem::deviceStateChanged);
connect(static_cast<WiredDevice *>(m_device.data()), &WiredDevice::activeConnectionChanged, this, &WiredItem::deviceStateChanged);
connect(static_cast<WiredDevice *>(m_device.data()), &WiredDevice::activeWiredConnectionChanged, this, &WiredItem::deviceStateChanged);
QTimer::singleShot(0, this, &WiredItem::refreshTips);
QTimer::singleShot(0, this, &WiredItem::refreshIcon);
@ -190,7 +190,7 @@ void WiredItem::refreshTips()
if (m_device->status() != NetworkDevice::DeviceStatus::Activated) {
break;
}
const QJsonObject info = static_cast<WiredDevice *>(m_device.data())->activeConnection();
const QJsonObject info = static_cast<WiredDevice *>(m_device.data())->activeWiredConnectionInfo();
if (!info.contains("Ip4"))
break;
const QJsonObject ipv4 = info.value("Ip4").toObject();

4
plugins/network/item/wirelessitem.cpp
View File

@ -51,7 +51,7 @@ WirelessItem::WirelessItem(WirelessDevice *device)
connect(m_refreshTimer, &QTimer::timeout, this, &WirelessItem::onRefreshTimeout);
connect(m_device, static_cast<void (NetworkDevice::*) (const QString &statStr) const>(&NetworkDevice::statusChanged), this, &WirelessItem::deviceStateChanged);
connect(static_cast<WirelessDevice *>(m_device.data()), &WirelessDevice::activeApInfoChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
connect(static_cast<WirelessDevice *>(m_device.data()), &WirelessDevice::activeConnectionChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
connect(static_cast<WirelessDevice *>(m_device.data()), &WirelessDevice::activeWirelessConnectionChanged, m_refreshTimer, static_cast<void (QTimer::*) ()>(&QTimer::start));
//QMetaObject::invokeMethod(this, "init", Qt::QueuedConnection);
QTimer::singleShot(0, this, &WirelessItem::refreshTips);
@ -266,7 +266,7 @@ void WirelessItem::refreshTips()
if (m_device->status() != NetworkDevice::DeviceStatus::Activated) {
break;
}
const QJsonObject info = static_cast<WirelessDevice *>(m_device.data())->activeConnectionInfo();
const QJsonObject info = static_cast<WirelessDevice *>(m_device.data())->activeWirelessConnectionInfo();
if (!info.contains("Ip4"))
break;
const QJsonObject ipv4 = info.value("Ip4").toObject();