From d45662f1e67715e1d85cabdce079628f655dec95 Mon Sep 17 00:00:00 2001 From: FanPengCheng Date: Tue, 1 Jun 2021 10:14:15 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20cppcheck=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 按照gerrit编译的警告去除对应信息 Log: Change-Id: Iec48357bcb3d9a98bccc74f9b09d7530d1d037b5 --- frame/util/multiscreenworker.cpp | 4 ++-- frame/util/multiscreenworker.h | 6 +++--- plugins/tray/snitraywidget.h | 2 +- tests/widgets/ut_tipswidget.cpp | 5 +++-- 4 files changed, 9 insertions(+), 8 deletions(-) diff --git a/frame/util/multiscreenworker.cpp b/frame/util/multiscreenworker.cpp index 40270ed9e..8b98109a3 100644 --- a/frame/util/multiscreenworker.cpp +++ b/frame/util/multiscreenworker.cpp @@ -1090,8 +1090,8 @@ void MultiScreenWorker::displayAnimation(const QString &screen, AniAction act) /** * @brief changeDockPosition 做一个动画操作 - * @param lastScreen 上次任务栏所在的屏幕 - * @param deskScreen 任务栏要移动到的屏幕 + * @param fromScreen 上次任务栏所在的屏幕 + * @param toScreen 任务栏要移动到的屏幕 * @param fromPos 任务栏上次的方向 * @param toPos 任务栏打算移动到的方向 */ diff --git a/frame/util/multiscreenworker.h b/frame/util/multiscreenworker.h index c5b197044..5151f675c 100644 --- a/frame/util/multiscreenworker.h +++ b/frame/util/multiscreenworker.h @@ -76,9 +76,9 @@ public: , m_lastScreen(primary) , m_primary(primary) {} - inline const QString ¤t() {return m_currentScreen;} - inline const QString &last() {return m_lastScreen;} - inline const QString &primary() {return m_primary;} + inline const QString ¤t() const {return m_currentScreen;} + inline const QString &last() const {return m_lastScreen;} + inline const QString &primary() const {return m_primary;} void updateDockedScreen(const QString &screenName) { diff --git a/plugins/tray/snitraywidget.h b/plugins/tray/snitraywidget.h index c8f58d8fe..9ecb016a5 100644 --- a/plugins/tray/snitraywidget.h +++ b/plugins/tray/snitraywidget.h @@ -96,7 +96,7 @@ private Q_SLOTS: void onSNIMenuChanged(const QDBusObjectPath &value); void onSNIOverlayIconNameChanged(const QString &value); void onSNIOverlayIconPixmapChanged(DBusImageList value); - void onSNIStatusChanged(const QString &value); + void onSNIStatusChanged(const QString &status); void hidePopup(); void hideNonModel(); void popupWindowAccept(); diff --git a/tests/widgets/ut_tipswidget.cpp b/tests/widgets/ut_tipswidget.cpp index 86003fdab..9abea5658 100644 --- a/tests/widgets/ut_tipswidget.cpp +++ b/tests/widgets/ut_tipswidget.cpp @@ -28,7 +28,9 @@ #include "../widgets/tipswidget.h" -namespace Dock { +using namespace ::testing; +using namespace Dock; + class Test_TipsWidget : public ::testing::Test { public: @@ -81,4 +83,3 @@ TEST_F(Test_TipsWidget, setTextList_test) qApp->sendEvent(tipsWidget, &event); QTest::qWait(10); } -}