summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorjustforlxz2020-11-26 13:17:37 +0800
committerjustforlxz2020-11-26 13:17:37 +0800
commit5eb1ea588f74d6a05404f2874b39d000476f7a20 (patch)
treefe991e894b688c0dcdc424cc25d357786c8dd69e
parente23aad9cd98d927dfa2601f93a811e7861e9a6d4 (diff)
downloadaur-5eb1ea588f74d6a05404f2874b39d000476f7a20.tar.gz
upgpkg: 5.3.0.27.r0.gabc87b95
-rw-r--r--dde-dock.patch133
1 files changed, 0 insertions, 133 deletions
diff --git a/dde-dock.patch b/dde-dock.patch
deleted file mode 100644
index 55828bda7eb..00000000000
--- a/dde-dock.patch
+++ /dev/null
@@ -1,133 +0,0 @@
-commit 92ee756615c6a32758a9e174b98b506b907fe6ad
-Author: Zhang, DingYuan <justforlxz@gmail.com>
-Date: Fri Aug 7 18:18:16 2020 +0800
-
- fix: build failed cause dde-network-utils update unknown enum
-
- dde-network-utils update enum unknown
-
- Log: 修复编译失败
- Change-Id: Ifbdd1e7920dd2fdd77f705876727fe8d0733936d
-
-diff --git a/plugins/network/item/applet/accesspointwidget.cpp b/plugins/network/item/applet/accesspointwidget.cpp
-index 21f79ac2..c123b145 100644
---- a/plugins/network/item/applet/accesspointwidget.cpp
-+++ b/plugins/network/item/applet/accesspointwidget.cpp
-@@ -46,7 +46,7 @@ extern void initFontColor(QWidget *widget);
-
- AccessPointWidget::AccessPointWidget()
- : QFrame(nullptr)
-- , m_activeState(NetworkDevice::Unknow)
-+ , m_activeState(NetworkDevice::Unknown)
- , m_ssidBtn(new SsidButton(this))
- , m_securityLabel(new QLabel)
- , m_strengthLabel(new QLabel)
-@@ -127,7 +127,7 @@ void AccessPointWidget::updateAP(const AccessPoint &ap)
- }
-
- // reset state
-- setActiveState(NetworkDevice::Unknow);
-+ setActiveState(NetworkDevice::Unknown);
- }
-
- bool AccessPointWidget::active() const
-@@ -200,6 +200,6 @@ void AccessPointWidget::ssidClicked()
-
- void AccessPointWidget::disconnectBtnClicked()
- {
-- setActiveState(NetworkDevice::Unknow);
-+ setActiveState(NetworkDevice::Unknown);
- emit requestDeactiveAP(m_ap);
- }
-diff --git a/plugins/network/item/wireditem.cpp b/plugins/network/item/wireditem.cpp
-index 31d86ff3..5eb056da 100644
---- a/plugins/network/item/wireditem.cpp
-+++ b/plugins/network/item/wireditem.cpp
-@@ -133,7 +133,7 @@ WiredItem::WiredStatus WiredItem::getDeviceState()
- }
-
- switch (m_device->status()) {
-- case NetworkDevice::Unknow: return Unknow;
-+ case NetworkDevice::Unknown: return Unknown;
- case NetworkDevice::Unmanaged:
- case NetworkDevice::Unavailable: return Nocable;
- case NetworkDevice::Disconnected: return Disconnected;
-@@ -174,7 +174,7 @@ void WiredItem::setWiredStateIcon()
- auto ratio = devicePixelRatioF();
-
- switch (m_deviceState) {
-- case NetworkDevice::Unknow:
-+ case NetworkDevice::Unknown:
- case NetworkDevice::Unmanaged:
- case NetworkDevice::Unavailable: {
- stateString = "error";
-@@ -246,7 +246,7 @@ void WiredItem::deviceStateChanged(NetworkDevice::DeviceStatus state)
- {
- m_deviceState = state;
- switch (state) {
-- case NetworkDevice::Unknow:
-+ case NetworkDevice::Unknown:
- case NetworkDevice::Unmanaged:
- case NetworkDevice::Unavailable:
- case NetworkDevice::Disconnected:
-diff --git a/plugins/network/item/wireditem.h b/plugins/network/item/wireditem.h
-index 8bb81c0d..4c4b5751 100644
---- a/plugins/network/item/wireditem.h
-+++ b/plugins/network/item/wireditem.h
-@@ -43,7 +43,7 @@ class WiredItem : public DeviceItem
-
- public:
- enum WiredStatus {
-- Unknow = 0,
-+ Unknown = 0,
- Enabled = 0x00000001,
- Disabled = 0x00000002,
- Connected = 0x00000004,
-diff --git a/plugins/network/item/wirelessitem.cpp b/plugins/network/item/wirelessitem.cpp
-index 858fc1b1..24396427 100644
---- a/plugins/network/item/wirelessitem.cpp
-+++ b/plugins/network/item/wirelessitem.cpp
-@@ -117,7 +117,7 @@ WirelessItem::WirelessStatus WirelessItem::getDeviceState()
- }
-
- switch (m_device->status()) {
-- case NetworkDevice::Unknow: return Unknow;
-+ case NetworkDevice::Unknown: return Unknown;
- case NetworkDevice::Unmanaged:
- case NetworkDevice::Unavailable:
- case NetworkDevice::Disconnected: return Disconnected;
-diff --git a/plugins/network/item/wirelessitem.h b/plugins/network/item/wirelessitem.h
-index d4d7d5ca..43d535c9 100644
---- a/plugins/network/item/wirelessitem.h
-+++ b/plugins/network/item/wirelessitem.h
-@@ -38,7 +38,7 @@ class WirelessItem : public DeviceItem
-
- public:
- enum WirelessStatus {
-- Unknow = 0,
-+ Unknown = 0,
- Enabled = 0x00010000,
- Disabled = 0x00020000,
- Connected = 0x00040000,
-diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp
-index 0c7211b7..c6bdc2ca 100644
---- a/plugins/network/networkitem.cpp
-+++ b/plugins/network/networkitem.cpp
-@@ -525,7 +525,7 @@ void NetworkItem::getPluginState()
- // 按如下顺序得到当前无线设备状态
- temp = state;
- if (!temp)
-- wirelessState = WirelessItem::Unknow;
-+ wirelessState = WirelessItem::Unknown;
- temp = state;
- if ((temp & WirelessItem::Disabled) >> 17)
- wirelessState = WirelessItem::Disabled;
-@@ -569,7 +569,7 @@ void NetworkItem::getPluginState()
- }
- temp = state;
- if (!temp)
-- wiredState = WiredItem::Unknow;
-+ wiredState = WiredItem::Unknown;
- temp = state;
- if ((temp & WiredItem::Nocable) >> 9)
- wiredState = WiredItem::Nocable;