From 4c08d38313d39d0ede00ce6dd91e4b4c723337e5 Mon Sep 17 00:00:00 2001
From: Fan PengCheng <fanpengcheng@uniontech.com>
Date: Wed, 14 Apr 2021 14:29:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=8E=BB=E9=99=A4=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E5=BC=82=E5=B8=B8=E8=BE=93=E5=87=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

添加空的widget指针到layout上，导致qt库中的警告信息被输出

Log: 去除日志中的异常输出信息
Task: https://pms.uniontech.com/zentao/task-view-64795.html
Change-Id: I2e49e8985cac68c3beb8be969794dbc0fd160a81
---
 frame/display/displaymanager.cpp |  3 ---
 frame/display/displaymanager.h   |  2 --
 plugins/network/networkitem.cpp  | 13 ++++---------
 3 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/frame/display/displaymanager.cpp b/frame/display/displaymanager.cpp
index 969abc6fd..be8beed76 100644
--- a/frame/display/displaymanager.cpp
+++ b/frame/display/displaymanager.cpp
@@ -255,7 +255,6 @@ void DisplayManager::updateScreenDockInfo()
  */
 void DisplayManager::screenCountChanged()
 {
-    qDebug() << __FUNCTION__;
     // 找到过期的screen指针
     QList<QScreen *> to_remove_list;
     for (auto s : m_screens) {
@@ -292,8 +291,6 @@ void DisplayManager::screenCountChanged()
         m_screens.append(s);
     }
 
-    qDebug() << "屏幕数量" << m_screens.count();
-
     // 屏幕数量发生变化，应该刷新一下任务栏的显示
     m_delayTimer->start();
 }
diff --git a/frame/display/displaymanager.h b/frame/display/displaymanager.h
index 739657624..73f5b6b02 100644
--- a/frame/display/displaymanager.h
+++ b/frame/display/displaymanager.h
@@ -27,9 +27,7 @@
 #include "singleton.h"
 #include "constants.h"
 
-#include <com_deepin_dde_daemon_dock.h>
 #include <com_deepin_daemon_display.h>
-#include <com_deepin_daemon_display_monitor.h>
 
 using DisplayInter = com::deepin::daemon::Display;
 using namespace Dock;
diff --git a/plugins/network/networkitem.cpp b/plugins/network/networkitem.cpp
index eca406714..738c843e8 100644
--- a/plugins/network/networkitem.cpp
+++ b/plugins/network/networkitem.cpp
@@ -1133,14 +1133,9 @@ void NetworkItem::updateMasterControlSwitch()
     m_switchWiredBtn->blockSignals(false);
     /* 根据有线适配器启用状态增/删布局中的组件 */
     for (WiredItem *wiredItem : m_wiredItems) {
-        if (!wiredItem) {
+        if (!wiredItem)
             continue;
-        }
-        if (m_switchWiredBtnState) {
-            m_wiredLayout->addWidget(wiredItem->itemApplet());
-        } else {
-            m_wiredLayout->removeWidget(wiredItem->itemApplet());
-        }
+
         // wiredItem->itemApplet()->setVisible(m_switchWiredBtnState); // TODO
         wiredItem->setVisible(m_switchWiredBtnState);
     }
@@ -1158,9 +1153,9 @@ void NetworkItem::updateMasterControlSwitch()
     m_switchWirelessBtn->blockSignals(false);
     /* 根据无线适配器启用状态增/删布局中的组件 */
     for (WirelessItem *wirelessItem : m_wirelessItems) {
-        if (!wirelessItem) {
+        if (!wirelessItem)
             continue;
-        }
+
         if (m_switchWirelessBtnState) {
             m_wirelessLayout->addWidget(wirelessItem->itemApplet());
         } else {