From 95e85b711982ef015377fb138e533fced8bd1af8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8C=83=E6=9C=8B=E7=A8=8B?= <fanpengcheng@uniontech.com>
Date: Thu, 4 Nov 2021 19:35:28 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=B7=BB=E5=8A=A0=E5=91=BD=E5=90=8D?=
 =?UTF-8?q?=E7=A9=BA=E9=97=B4=EF=BC=8C=E9=98=B2=E6=AD=A2=E5=92=8C=E6=8E=A7?=
 =?UTF-8?q?=E5=88=B6=E4=B8=AD=E5=BF=83=E4=B8=AD=E7=9A=84=E7=B1=BB=E4=BA=A7?=
 =?UTF-8?q?=E7=94=9F=E7=AC=A6=E5=8F=B7=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

GSettingWatcher这个类在控制中心和个性化的任务栏配置插件中均存在，用命名空间进行区分

Log:
Bug: https://pms.uniontech.com/zentao/bug-view-101282.html
Influence: 控制中心闪退问题
Change-Id: If71613fcdf4d7f7f931c8df58e4aac93c7098686
---
 plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp         | 1 +
 plugins/dcc-dock-settings-plugin/gsetting_watcher.h           | 4 ++++
 plugins/dcc-dock-settings-plugin/module_widget.cpp            | 1 -
 plugins/dcc-dock-settings-plugin/module_widget.h              | 3 ++-
 .../plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp | 2 ++
 5 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp b/plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp
index 93ad21d7b..d198a78ae 100644
--- a/plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp
+++ b/plugins/dcc-dock-settings-plugin/gsetting_watcher.cpp
@@ -27,6 +27,7 @@
 #include <QStandardItemModel>
 #include <QVariant>
 #include <QWidget>
+using namespace dcc_dock_plugin;
 
 /**
  * @brief GSettingWatcher::GSettingWatcher 用于监听处于 \a baseSchemasId + "." + \a module 配置下的配置项内容变化，并将变化应用到绑定的控件上
diff --git a/plugins/dcc-dock-settings-plugin/gsetting_watcher.h b/plugins/dcc-dock-settings-plugin/gsetting_watcher.h
index 7a8fb1ad9..1f95537d2 100644
--- a/plugins/dcc-dock-settings-plugin/gsetting_watcher.h
+++ b/plugins/dcc-dock-settings-plugin/gsetting_watcher.h
@@ -28,9 +28,12 @@
 class QGSettings;
 class QListView;
 class QStandardItem;
+
+namespace dcc_dock_plugin {
 class GSettingWatcher : public QObject
 {
     Q_OBJECT
+
 public:
     GSettingWatcher(const QString &baseSchemasId, const QString &module, QObject *parent = nullptr);
     ~GSettingWatcher();
@@ -45,5 +48,6 @@ private:
     QMultiHash<QString, QWidget *> m_map;
     QGSettings *m_gsettings;
 };
+}
 
 #endif // GSETTINGWATCHER_H
diff --git a/plugins/dcc-dock-settings-plugin/module_widget.cpp b/plugins/dcc-dock-settings-plugin/module_widget.cpp
index 94c9e406e..75019a74c 100644
--- a/plugins/dcc-dock-settings-plugin/module_widget.cpp
+++ b/plugins/dcc-dock-settings-plugin/module_widget.cpp
@@ -19,7 +19,6 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 #include "module_widget.h"
-#include "gsetting_watcher.h"
 
 #include <widgets/comboxwidget.h>
 #include <widgets/titledslideritem.h>
diff --git a/plugins/dcc-dock-settings-plugin/module_widget.h b/plugins/dcc-dock-settings-plugin/module_widget.h
index 4f9a02d31..905128d45 100644
--- a/plugins/dcc-dock-settings-plugin/module_widget.h
+++ b/plugins/dcc-dock-settings-plugin/module_widget.h
@@ -28,6 +28,7 @@
 #include <com_deepin_dde_daemon_dock.h>
 
 #include "com_deepin_dde_dock.h"
+#include "gsetting_watcher.h"
 
 namespace dcc {
 namespace widgets {
@@ -42,11 +43,11 @@ class DTipLabel;
 DWIDGET_END_NAMESPACE
 
 class TitleLabel;
-class GSettingWatcher;
 class QStandardItemModel;
 class QTimer;
 
 using namespace dcc::widgets;
+using namespace dcc_dock_plugin;
 using DBusDock = com::deepin::dde::daemon::Dock;
 using DBusInter = com::deepin::dde::Dock;
 
diff --git a/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp b/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp
index bd86218aa..583658e7a 100644
--- a/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp
+++ b/tests/plugins/dcc-dock-settings-plugin/ut_gsettings_watcher.cpp
@@ -4,6 +4,8 @@
 
 #include <gtest/gtest.h>
 
+using namespace dcc_dock_plugin;
+
 class Test_GSettingWatcher : public QObject, public ::testing::Test
 {};