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

fix: 去除日志中的异常输出信息

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

Log: 去除日志中的异常输出信息
Task: https://pms.uniontech.com/zentao/task-view-64795.html
Change-Id: I2e49e8985cac68c3beb8be969794dbc0fd160a81
This commit is contained in:
Fan PengCheng 2021-04-14 14:29:37 +08:00
parent a38b9b5b1a
commit 4c08d38313
3 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frame/display/displaymanager.cpp
View File

@ -255,7 +255,6 @@ void DisplayManager::updateScreenDockInfo()
*/ */
void DisplayManager::screenCountChanged() void DisplayManager::screenCountChanged()
{ {
qDebug() << __FUNCTION__;
// 找到过期的screen指针 // 找到过期的screen指针
QList<QScreen *> to_remove_list; QList<QScreen *> to_remove_list;
for (auto s : m_screens) { for (auto s : m_screens) {
@ -292,8 +291,6 @@ void DisplayManager::screenCountChanged()
m_screens.append(s); m_screens.append(s);
} }
qDebug() << "屏幕数量" << m_screens.count();
// 屏幕数量发生变化，应该刷新一下任务栏的显示 // 屏幕数量发生变化，应该刷新一下任务栏的显示
m_delayTimer->start(); m_delayTimer->start();
} }

2
frame/display/displaymanager.h
View File

@ -27,9 +27,7 @@
#include "singleton.h" #include "singleton.h"
#include "constants.h" #include "constants.h"
#include <com_deepin_dde_daemon_dock.h>
#include <com_deepin_daemon_display.h> #include <com_deepin_daemon_display.h>
#include <com_deepin_daemon_display_monitor.h>
using DisplayInter = com::deepin::daemon::Display; using DisplayInter = com::deepin::daemon::Display;
using namespace Dock; using namespace Dock;

13
plugins/network/networkitem.cpp
View File

@ -1133,14 +1133,9 @@ void NetworkItem::updateMasterControlSwitch()
m_switchWiredBtn->blockSignals(false); m_switchWiredBtn->blockSignals(false);
/* 根据有线适配器启用状态增/删布局中的组件 */ /* 根据有线适配器启用状态增/删布局中的组件 */
for (WiredItem *wiredItem : m_wiredItems) { for (WiredItem *wiredItem : m_wiredItems) {
if (!wiredItem) { if (!wiredItem)
continue; continue;
}
if (m_switchWiredBtnState) {
m_wiredLayout->addWidget(wiredItem->itemApplet());
} else {
m_wiredLayout->removeWidget(wiredItem->itemApplet());
}
// wiredItem->itemApplet()->setVisible(m_switchWiredBtnState); // TODO // wiredItem->itemApplet()->setVisible(m_switchWiredBtnState); // TODO
wiredItem->setVisible(m_switchWiredBtnState); wiredItem->setVisible(m_switchWiredBtnState);
} }
@ -1158,9 +1153,9 @@ void NetworkItem::updateMasterControlSwitch()
m_switchWirelessBtn->blockSignals(false); m_switchWirelessBtn->blockSignals(false);
/* 根据无线适配器启用状态增/删布局中的组件 */ /* 根据无线适配器启用状态增/删布局中的组件 */
for (WirelessItem *wirelessItem : m_wirelessItems) { for (WirelessItem *wirelessItem : m_wirelessItems) {
if (!wirelessItem) { if (!wirelessItem)
continue; continue;
}
if (m_switchWirelessBtnState) { if (m_switchWirelessBtnState) {
m_wirelessLayout->addWidget(wirelessItem->itemApplet()); m_wirelessLayout->addWidget(wirelessItem->itemApplet());
} else { } else {