From 7667dbc05a66a4a8259c934713d0b230ac27cbc5 Mon Sep 17 00:00:00 2001 From: songwentao Date: Thu, 21 Jul 2022 15:59:37 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BF=AE=E6=94=B9=E9=9D=99=E6=80=81?= =?UTF-8?q?=E6=A3=80=E6=9F=A5=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改静态检查报错 Log: Influence: 修复gerrit static-vefified -1 报错 Task: https://pms.uniontech.com/task-view-157871.html Change-Id: I491e7fa7403170e66fb18ca35fa3e31519aa54d5 --- src/lib/process.h | 2 +- src/modules/dock/appmenu.h | 11 ++++++++-- src/modules/dock/dbusadaptorentry.h | 2 +- src/modules/dock/docksettings.h | 11 +++++----- src/modules/dock/processinfo.cpp | 5 +++++ src/modules/dock/processinfo.h | 5 +++-- src/modules/dock/windowinfok.h | 32 ++++++++++++++--------------- src/modules/dock/windowinfox.h | 30 +++++++++++++-------------- 8 files changed, 56 insertions(+), 42 deletions(-) diff --git a/src/lib/process.h b/src/lib/process.h index 813755e..6cf972b 100644 --- a/src/lib/process.h +++ b/src/lib/process.h @@ -31,7 +31,7 @@ typedef std::map Status; class Process { public: - Process(); + explicit Process(); explicit Process(int _pid); bool isExist(); diff --git a/src/modules/dock/appmenu.h b/src/modules/dock/appmenu.h index f0fd512..ced8d01 100644 --- a/src/modules/dock/appmenu.h +++ b/src/modules/dock/appmenu.h @@ -35,10 +35,16 @@ typedef std::function AppMenuAction; class AppMenu; // 应用菜单选项 -struct AppMenuItem { +struct AppMenuItem +{ + AppMenuItem() + : isActive(true) + , hint(0) + { + } + QString id; QString text; - bool isActive; QString isCheckable; QString checked; QString icon; @@ -47,6 +53,7 @@ struct AppMenuItem { QString showCheckMark; std::shared_ptr subMenu; + bool isActive; int hint; AppMenuAction action; }; diff --git a/src/modules/dock/dbusadaptorentry.h b/src/modules/dock/dbusadaptorentry.h index 31960f2..4ca6b59 100644 --- a/src/modules/dock/dbusadaptorentry.h +++ b/src/modules/dock/dbusadaptorentry.h @@ -83,7 +83,7 @@ class DBusAdaptorEntry: public QDBusAbstractAdaptor "") public: - DBusAdaptorEntry(QObject *parent); + explicit DBusAdaptorEntry(QObject *parent); virtual ~DBusAdaptorEntry(); public: // PROPERTIES diff --git a/src/modules/dock/docksettings.h b/src/modules/dock/docksettings.h index d9c6e2c..9b1f331 100644 --- a/src/modules/dock/docksettings.h +++ b/src/modules/dock/docksettings.h @@ -30,7 +30,7 @@ enum class HideMode { KeepShowing, KeepHidden, - SmartHide, + SmartHide }; class HideModeHandler { @@ -69,7 +69,7 @@ public: // 显示样式 enum class DisplayMode { Fashion, - Efficient, + Efficient }; class DisplayModeHandler { @@ -106,7 +106,7 @@ enum class PositionMode { Top, // 上 Right, // 右 Bottom, // 下 - Left, // 左 + Left // 左 }; class PositionModeHandler { @@ -143,6 +143,8 @@ public: return PositionMode::Bottom; if (modeStr == "left") return PositionMode::Left; + + return PositionMode::Bottom; } }; @@ -179,7 +181,7 @@ public: ForceQuitAppMode toEnum() { if (modeStr == "disabled") return ForceQuitAppMode::Disabled; - else if (modeStr == "deactivated") + if (modeStr == "deactivated") return ForceQuitAppMode::Deactivated; return ForceQuitAppMode::Enabled; @@ -237,7 +239,6 @@ public: void removePluginSettings(QString pluginName, QStringList settingkeys); QJsonObject plguinSettingsStrToObj(QString jsonStr); - Q_SIGNALS: // 隐藏模式改变 void hideModeChanged(HideMode mode); diff --git a/src/modules/dock/processinfo.cpp b/src/modules/dock/processinfo.cpp index 625be37..2127c99 100644 --- a/src/modules/dock/processinfo.cpp +++ b/src/modules/dock/processinfo.cpp @@ -107,6 +107,11 @@ ProcessInfo::ProcessInfo(std::vector &cmd) } } +ProcessInfo::~ProcessInfo() +{ + +} + std::string ProcessInfo::getEnv(std::string key) { return m_process.getEnv(key); diff --git a/src/modules/dock/processinfo.h b/src/modules/dock/processinfo.h index 9c35ec6..d6cb8f3 100644 --- a/src/modules/dock/processinfo.h +++ b/src/modules/dock/processinfo.h @@ -31,8 +31,9 @@ class ProcessInfo { public: - ProcessInfo(int pid); - ProcessInfo(std::vector &cmd); + explicit ProcessInfo(int pid); + explicit ProcessInfo(std::vector &cmd); + virtual ~ProcessInfo(); std::string getEnv(std::string key); std::vector getCmdLine(); diff --git a/src/modules/dock/windowinfok.h b/src/modules/dock/windowinfok.h index e65731e..9f282e2 100644 --- a/src/modules/dock/windowinfok.h +++ b/src/modules/dock/windowinfok.h @@ -34,23 +34,23 @@ class ProcessInfo; class WindowInfoK: public WindowInfoBase { public: - WindowInfoK(PlasmaWindow *window, XWindow _xid = 0); - virtual ~WindowInfoK(); + explicit WindowInfoK(PlasmaWindow *window, XWindow _xid = 0); + virtual ~WindowInfoK() override; - virtual bool shouldSkip(); - virtual QString getIcon(); - virtual QString getTitle(); - virtual bool isDemandingAttention(); - virtual bool allowClose(); - virtual void close(uint32_t timestamp); - virtual void activate(); - virtual void minimize(); - virtual bool isMinimized(); - virtual int64_t getCreatedTime(); - virtual QString getDisplayName(); - virtual QString getWindowType(); - virtual void update(); - virtual void killClient(); + virtual bool shouldSkip() override; + virtual QString getIcon() override; + virtual QString getTitle() override; + virtual bool isDemandingAttention() override; + virtual bool allowClose() override; + virtual void close(uint32_t timestamp) override; + virtual void activate() override; + virtual void minimize() override; + virtual bool isMinimized() override; + virtual int64_t getCreatedTime() override; + virtual QString getDisplayName() override; + virtual QString getWindowType() override; + virtual void update() override; + virtual void killClient() override; QString getAppId(); void setAppId(QString _appId); diff --git a/src/modules/dock/windowinfox.h b/src/modules/dock/windowinfox.h index ede957a..88b4226 100644 --- a/src/modules/dock/windowinfox.h +++ b/src/modules/dock/windowinfox.h @@ -34,22 +34,22 @@ class WindowInfoX: public WindowInfoBase { public: WindowInfoX(XWindow _xid = 0); - virtual ~WindowInfoX(); + virtual ~WindowInfoX() override; - virtual bool shouldSkip(); - virtual QString getIcon(); - virtual QString getTitle(); - virtual bool isDemandingAttention(); - virtual void close(uint32_t timestamp); - virtual void activate(); - virtual void minimize(); - virtual bool isMinimized(); - virtual int64_t getCreatedTime(); - virtual QString getDisplayName(); - virtual QString getWindowType(); - virtual bool allowClose(); - virtual void update(); - virtual void killClient(); + virtual bool shouldSkip() override; + virtual QString getIcon() override; + virtual QString getTitle() override; + virtual bool isDemandingAttention() override; + virtual void close(uint32_t timestamp) override; + virtual void activate() override; + virtual void minimize() override; + virtual bool isMinimized() override; + virtual int64_t getCreatedTime() override; + virtual QString getDisplayName() override; + virtual QString getWindowType() override; + virtual bool allowClose() override; + virtual void update() override; + virtual void killClient() override; QString genInnerId(WindowInfoX *winInfo); QString getGtkAppId();