From 1175b75aa5eeb1246cd18ed9efa6e7b05002845c Mon Sep 17 00:00:00 2001
From: donghualin <donghualin@uniontech.com>
Date: Wed, 11 Jan 2023 09:09:36 +0800
Subject: [PATCH] =?UTF-8?q?style:=20=E8=A7=A3=E5=86=B3=E7=BC=96=E8=AF=91?=
 =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

1、gerrit上打包提示DRegionMonitor重复定义导致编译不过，此处加上命名空间
2、删除不用的头文件包含

Log:
Influence: gerrit打包
Task: https://pms.uniontech.com/task-view-96831.html
Change-Id: Ic5f5c88619193a2b49482c967fff1eca5b784608
---
 frame/window/quickpluginwindow.h               | 3 +--
 frame/window/tray/tray_gridview.cpp            | 1 +
 frame/window/tray/widgets/expandiconwidget.cpp | 8 +++++---
 frame/window/traymanagerwindow.cpp             | 1 -
 frame/window/traymanagerwindow.h               | 3 +--
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/frame/window/quickpluginwindow.h b/frame/window/quickpluginwindow.h
index 1c2a58b34..7dd7f1006 100644
--- a/frame/window/quickpluginwindow.h
+++ b/frame/window/quickpluginwindow.h
@@ -39,8 +39,7 @@ class QMenu;
 class QuickPluginMimeData;
 enum class DockPart;
 
-namespace Dtk { namespace Gui { class DRegionMonitor; }
-                namespace Widget { class DListView; class DStandardItem; } }
+namespace Dtk { namespace Widget { class DListView; class DStandardItem; } }
 
 using namespace Dtk::Widget;
 
diff --git a/frame/window/tray/tray_gridview.cpp b/frame/window/tray/tray_gridview.cpp
index 2df7a6f10..b0d0d4807 100644
--- a/frame/window/tray/tray_gridview.cpp
+++ b/frame/window/tray/tray_gridview.cpp
@@ -406,6 +406,7 @@ bool TrayGridView::mouseInDock()
         return mousePosition.x() > dockRect.left();
     }
     }
+    return false;
 }
 
 void TrayGridView::handleDropEvent(QDropEvent *e)
diff --git a/frame/window/tray/widgets/expandiconwidget.cpp b/frame/window/tray/widgets/expandiconwidget.cpp
index 77a3cbe5b..d6f4b1d36 100644
--- a/frame/window/tray/widgets/expandiconwidget.cpp
+++ b/frame/window/tray/widgets/expandiconwidget.cpp
@@ -35,6 +35,8 @@
 
 DGUI_USE_NAMESPACE
 
+using RegionMonitor = Dtk::Gui::DRegionMonitor;
+
 ExpandIconWidget::ExpandIconWidget(QWidget *parent, Qt::WindowFlags f)
     : BaseTrayWidget(parent, f)
     , m_position(Dock::Position::Bottom)
@@ -192,7 +194,7 @@ TrayGridWidget::TrayGridWidget(QWidget *parent)
     , m_dockInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this))
     , m_trayGridView(nullptr)
     , m_referGridView(nullptr)
-    , m_regionInter(new DRegionMonitor(this))
+    , m_regionInter(new RegionMonitor(this))
 {
     initMember();
     setAttribute(Qt::WA_TranslucentBackground);
@@ -281,14 +283,14 @@ void TrayGridWidget::hideEvent(QHideEvent *event)
 
 void TrayGridWidget::initMember()
 {
-    connect(m_regionInter, &DRegionMonitor::buttonPress, this, [ = ](const QPoint &mousePos, const int flag) {
+    connect(m_regionInter, &RegionMonitor::buttonPress, this, [ = ](const QPoint &mousePos, const int flag) {
         // 如果当前是隐藏，那么在点击任何地方都隐藏
         if (!isVisible()) {
             hide();
             return;
         }
 
-        if ((flag != DRegionMonitor::WatchedFlags::Button_Left) && (flag != DRegionMonitor::WatchedFlags::Button_Right))
+        if ((flag != RegionMonitor::WatchedFlags::Button_Left) && (flag != RegionMonitor::WatchedFlags::Button_Right))
             return;
 
         QPoint ptPos = parentWidget()->mapToGlobal(this->pos());
diff --git a/frame/window/traymanagerwindow.cpp b/frame/window/traymanagerwindow.cpp
index 05c52d051..e51345368 100644
--- a/frame/window/traymanagerwindow.cpp
+++ b/frame/window/traymanagerwindow.cpp
@@ -32,7 +32,6 @@
 #include "utils.h"
 
 #include <DGuiApplicationHelper>
-#include <DRegionMonitor>
 
 #include <QDropEvent>
 #include <QBoxLayout>
diff --git a/frame/window/traymanagerwindow.h b/frame/window/traymanagerwindow.h
index 7889a91b8..fb9b170c4 100644
--- a/frame/window/traymanagerwindow.h
+++ b/frame/window/traymanagerwindow.h
@@ -28,8 +28,7 @@
 
 #include <QWidget>
 
-namespace Dtk { namespace Gui { class DRegionMonitor; };
-                namespace Widget { class DBlurEffectWidget; } }
+namespace Dtk { namespace Widget { class DBlurEffectWidget; } }
 
 using namespace Dtk::Widget;