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 #include #include +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 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 . */ #include "module_widget.h" -#include "gsetting_watcher.h" #include #include 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 #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 +using namespace dcc_dock_plugin; + class Test_GSettingWatcher : public QObject, public ::testing::Test {};