1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
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;
|