From f51b4f263f92a34ef3c5e4f5cf298c4b8a9de6b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= Date: Mon, 18 Oct 2021 11:45:51 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E5=A4=8Dcppcheck=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复cppcheck问题，不影响功能 Log: Influence: 不影响 Task: https://pms.uniontech.com/zentao/task-view-88591.html Change-Id: I6667525b683ee55b73d5aec9c46acf4257a5a2c5 --- frame/util/multiscreenworker.h | 2 +- frame/util/themeappicon.cpp | 3 --- plugins/bluetooth/componments/adaptersmanager.cpp | 8 -------- plugins/bluetooth/componments/adaptersmanager.h | 1 - plugins/bluetooth/componments/bluetoothadapteritem.cpp | 5 ----- plugins/bluetooth/componments/bluetoothadapteritem.h | 1 - tests/item/components/ut_previewcontainer.cpp | 4 ++-- tests/item/ut_dockitem.cpp | 10 +++------- 8 files changed, 6 insertions(+), 28 deletions(-) diff --git a/frame/util/multiscreenworker.h b/frame/util/multiscreenworker.h index 907a53a6b..c5bc9e8f1 100644 --- a/frame/util/multiscreenworker.h +++ b/frame/util/multiscreenworker.h @@ -227,7 +227,7 @@ private: void displayAnimation(const QString &screen, AniAction act); void tryToShowDock(int eventX, int eventY); - void changeDockPosition(QString lastScreen, QString deskScreen, const Position &fromPos, const Position &toPos); + void changeDockPosition(QString fromScreen, QString toScreen, const Position &fromPos, const Position &toPos); QString getValidScreen(const Position &pos); void resetDockScreen(); diff --git a/frame/util/themeappicon.cpp b/frame/util/themeappicon.cpp index 4ba7f09be..81b667808 100644 --- a/frame/util/themeappicon.cpp +++ b/frame/util/themeappicon.cpp @@ -155,9 +155,6 @@ bool ThemeAppIcon::getIcon(QPixmap &pix, const QString iconName, const int size, // fallback to a Default pixmap pix = QPixmap(":/icons/resources/application-x-desktop.svg"); break; - - Q_UNREACHABLE(); - } while (false); if (!key.isEmpty()) { diff --git a/plugins/bluetooth/componments/adaptersmanager.cpp b/plugins/bluetooth/componments/adaptersmanager.cpp index 3a3e3a813..e67ea518a 100644 --- a/plugins/bluetooth/componments/adaptersmanager.cpp +++ b/plugins/bluetooth/componments/adaptersmanager.cpp @@ -285,11 +285,3 @@ void AdaptersManager::adapterRefresh(const Adapter *adapter) m_bluetoothInter->SetAdapterDiscoverable(dPath, true); m_bluetoothInter->RequestDiscovery(dPath); } - -void AdaptersManager::disconnectDevice(Device *device) -{ - if (device) { - QDBusObjectPath path(device->id()); - m_bluetoothInter->DisconnectDevice(path); - } -} diff --git a/plugins/bluetooth/componments/adaptersmanager.h b/plugins/bluetooth/componments/adaptersmanager.h index 3d72127df..1602ef809 100644 --- a/plugins/bluetooth/componments/adaptersmanager.h +++ b/plugins/bluetooth/componments/adaptersmanager.h @@ -38,7 +38,6 @@ public: void connectDevice(const Device *device, Adapter *adapter); int adaptersCount(); void adapterRefresh(const Adapter *adapter); - void disconnectDevice(Device *device); signals: void adapterIncreased(Adapter *adapter); diff --git a/plugins/bluetooth/componments/bluetoothadapteritem.cpp b/plugins/bluetooth/componments/bluetoothadapteritem.cpp index 5e18241ab..23d6ce80b 100644 --- a/plugins/bluetooth/componments/bluetoothadapteritem.cpp +++ b/plugins/bluetooth/componments/bluetoothadapteritem.cpp @@ -214,11 +214,6 @@ QSize BluetoothAdapterItem::sizeHint() const return QSize(ItemWidth, m_adapterLabel->height() + (m_adapter->powered() ? m_seperator->sizeHint().height() + viewHeight : 0));// 加上分割线的高度 } -int BluetoothAdapterItem::currentDeviceCount() -{ - return m_deviceItems.size(); -} - QStringList BluetoothAdapterItem::connectedDevicesName() { QStringList devsName; diff --git a/plugins/bluetooth/componments/bluetoothadapteritem.h b/plugins/bluetooth/componments/bluetoothadapteritem.h index 43cef17bf..8374882c6 100644 --- a/plugins/bluetooth/componments/bluetoothadapteritem.h +++ b/plugins/bluetooth/componments/bluetoothadapteritem.h @@ -100,7 +100,6 @@ public: explicit BluetoothAdapterItem(Adapter *adapter, QWidget *parent = nullptr); ~BluetoothAdapterItem(); Adapter *adapter() { return m_adapter; } - int currentDeviceCount(); QStringList connectedDevicesName(); public slots: diff --git a/tests/item/components/ut_previewcontainer.cpp b/tests/item/components/ut_previewcontainer.cpp index 33de20bc9..bf9452841 100644 --- a/tests/item/components/ut_previewcontainer.cpp +++ b/tests/item/components/ut_previewcontainer.cpp @@ -51,8 +51,8 @@ TEST_F(Test_PreviewContainer, coverage_test) snap->requestCloseAppSnapshot(); container->setWindowInfos(map, QList () << 1 << 2 << 3 << 4); - for (const WId id: map.keys()) { - container->appendSnapWidget(id); + for (const WId snapId: map.keys()) { + container->appendSnapWidget(snapId); } container->previewEntered(id); diff --git a/tests/item/ut_dockitem.cpp b/tests/item/ut_dockitem.cpp index bec23bd24..58b817419 100644 --- a/tests/item/ut_dockitem.cpp +++ b/tests/item/ut_dockitem.cpp @@ -121,14 +121,10 @@ TEST_F(Test_DockItem, event_test) item->showHoverTips(); - QTimer::singleShot(10, [ &item ] { - delete item; - item = nullptr; - }); - item->showContextMenu(); + QEvent *deleteEvent = new QEvent(QEvent::DeferredDelete); + qApp->postEvent(item, deleteEvent); - QTest::qWait(1000); - ASSERT_TRUE(true); + item->showContextMenu(); } TEST_F(Test_DockItem, topleftPoint_test)