Skip to content

fix: suppress three not-find warnings in net-view control center #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
deepin-bot merged 2 commits into from
Sep 3, 2026
Merged

fix: suppress three not-find warnings in net-view control center #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c09763c
fix: suppress three not-find warnings in net-view control center
Sep 3, 2026
b41d5bd
fix: remove dead code for NetWiredDisabledItem/NetWirelessDisabledItem
Sep 3, 2026
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
14 changes: 0 additions & 14 deletions net-view/operation/netitem.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,13 +214,6 @@ class NetWiredItem : public NetConnectionItem
void portalUrlChanged(const QString &url);
};

class NetWiredDisabledItem : public NetItem
{
Q_OBJECT
protected:
using NetItem::NetItem;
};

class NetWirelessHiddenItem : public NetItem
{
Q_OBJECT
Expand Down Expand Up @@ -284,13 +277,6 @@ class NetWirelessMineItem : public NetItem
using NetItem::NetItem;
};

class NetWirelessDisabledItem : public NetItem
{
Q_OBJECT
protected:
using NetItem::NetItem;
};

///////////////////////////////////////////

class NetVPNControlItem : public NetDeviceItem
Expand Down
13 changes: 2 additions & 11 deletions net-view/operation/netmanager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1029,13 +1029,6 @@ void NetManagerPrivate::updateControlEnabled(int type)
parentItem->updateenabled(pEnabled);
parentItem->updateenabledable(pEnabledable);
}

bool devDisabled = false;
int index = ((type & NET_MASK_TYPE) == NET_WIRELESS) ? WirelessDeviceIndex : WiredDeviceIndex;
if (m_deviceCount[index] == 1 && (m_deviceCount[WiredDeviceIndex] + m_deviceCount[WirelessDeviceIndex] == 1)) {
devDisabled = !pEnabled;
}
updateItemVisible(index == WirelessDeviceIndex ? "NetWirelessDisabledItem" : "NetWiredDisabledItem", devDisabled);
}

void NetManagerPrivate::updateAirplaneMode(bool enabled)
Expand All @@ -1045,10 +1038,8 @@ void NetManagerPrivate::updateAirplaneMode(bool enabled)
Q_Q(NetManager);
Q_EMIT q->airplaneModeChanged(m_airplaneMode);
}
updateItemVisible("NetAirplaneModeTipsItem", enabled && m_supportWireless);
if (enabled) {
updateItemVisible("NetWirelessDisabledItem", false);
updateItemVisible("NetWiredDisabledItem", false);
if (flags().testFlags(NetType::Net_AirplaneTips)) {
updateItemVisible("NetAirplaneModeTipsItem", enabled && m_supportWireless);
}
}

Expand Down
2 changes: 0 additions & 2 deletions net-view/operation/nettype.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ class NetType
WirelessOtherItem, // 其他网络,2级,虚拟项
WirelessItem, // 无线项,3级
WirelessHiddenItem, // 无线隐藏项,3级,虚拟项
WirelessDisabledItem, // 无线禁用项,1级,虚拟项
AirplaneModeTipsItem, // 飞行模式提示项,1级
WiredControlItem = NET_WIRED | NET_CONTROL, // 有线开关,1级,虚拟项
WiredDeviceItem = NET_WIRED | NET_DEVICE, // 有线设备,1级
WiredItem, // 有线项,2级
WiredDisabledItem, // 有线禁用项,1级,虚拟项
VPNControlItem, // vpn控制项
VPNTipsItem, // vpn提示项
SystemProxyControlItem, // 系统代理控制项
Expand Down
3 changes: 0 additions & 3 deletions net-view/operation/private/netitemprivate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,9 +76,6 @@ NetItemPrivate *NetItemPrivate::New(NetType::NetItemType type, const QString &id
CaseNewItem(AppProxyControlItem);
CaseNewItem(AirplaneModeTipsItem);
CaseNewItem(VPNTipsItem);
case NetType::WirelessDisabledItem:
case NetType::WiredDisabledItem:
break;
}
return netItemPrivate;
}
Expand Down
42 changes: 0 additions & 42 deletions net-view/window/private/netdelegate.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,13 +22,12 @@
#include <QMouseEvent>
#include <QPainter>
#include <QSortFilterProxyModel>
#include <QTextDocument>

Check warning on line 25 in net-view/window/private/netdelegate.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTextDocument> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QTextLine>

Check warning on line 26 in net-view/window/private/netdelegate.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTextLine> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QTimer>

Check warning on line 27 in net-view/window/private/netdelegate.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTimer> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QToolButton>
#include <QTextLine>

Check warning on line 28 in net-view/window/private/netdelegate.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTextLine> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QTextDocument>

Check warning on line 29 in net-view/window/private/netdelegate.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QTextDocument> not found. Please note: Cppcheck does not need standard library headers to get proper results.
#include <QDesktopServices>

Check warning on line 30 in net-view/window/private/netdelegate.cpp

View workflow job for this annotation

GitHub Actions / cppcheck 

Include file: <QDesktopServices> not found. Please note: Cppcheck does not need standard library headers to get proper results.

DWIDGET_USE_NAMESPACE

Expand Down Expand Up @@ -119,10 +118,6 @@
spacing.height = 24;
spacing.bottom = 4;
} break;
case NetType::WirelessDisabledItem:
case NetType::WiredDisabledItem:
spacing.height = 220;
break;
default:
break;
}
Expand Down Expand Up @@ -154,8 +149,6 @@
bgColor.setAlphaF(0.05);
}
} break;
case NetType::WirelessDisabledItem:
case NetType::WiredDisabledItem:
case NetType::WirelessMineItem: {
textColor = boption.dpalette.brightText().color();
textColor.setAlphaF(0.6);
Expand Down Expand Up @@ -232,10 +225,6 @@
widget->setFlag(m_flag);
netWidget = widget;
} break;
case NetType::WirelessDisabledItem:
case NetType::WiredDisabledItem: {
netWidget = new NetDisabledWidget(item, parent);
} break;
case NetType::AirplaneModeTipsItem: {
netWidget = new NetAirplaneModeTipsWidget(static_cast<NetAirplaneModeTipsItem *>(item), parent);
} break;
Expand Down Expand Up @@ -883,37 +872,6 @@
return m_iconBut->width() + 10;
}

NetDisabledWidget::NetDisabledWidget(NetItem *item, QWidget *parent)
: NetWidget(item, parent)
{
QWidget *widget = new QWidget(this);
QVBoxLayout *layout = new QVBoxLayout(widget);
layout->setSpacing(0);
layout->setContentsMargins(3, 0, 5, 10);

QToolButton *icon = new QToolButton(this);
icon->setIconSize(QSize(96, 96));
icon->setFixedSize(96, 96);
icon->setAttribute(Qt::WA_TransparentForMouseEvents);
icon->setFocusPolicy(Qt::NoFocus);
if (item->itemType() == NetType::WiredDisabledItem) {
icon->setIcon(QIcon::fromTheme("network-wired-disabled"));
} else {
icon->setIcon(QIcon::fromTheme("network-wireless-disabled"));
}

QLabel *label = createNemeLabel(item, this, DFontSizeManager::T8);
label->setAlignment(Qt::AlignCenter);
label->setFixedWidth(QWIDGETSIZE_MAX);
layout->addStretch();
layout->addWidget(icon, 0, Qt::AlignHCenter);
layout->addWidget(label);
layout->addStretch();
setCentralWidget(widget);
}

NetDisabledWidget::~NetDisabledWidget() { }

NetItemWidget::NetItemWidget(NetItem *item, QWidget *parent)
: NetWidget (item, parent)
, m_portalLabel (nullptr)
Expand Down
9 changes: 0 additions & 9 deletions net-view/window/private/netdelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -274,15 +274,6 @@ public Q_SLOTS:
dde::network::NetType::NetConnectionStatus m_status;
};

class NetDisabledWidget : public NetWidget
{
Q_OBJECT

public:
explicit NetDisabledWidget(NetItem *item, QWidget *parent = nullptr);
~NetDisabledWidget() Q_DECL_OVERRIDE;
};

} // namespace network
} // namespace dde

Expand Down
Loading