From 7fc1ec3ae56c90ee5ce792cf61987295490a9213 Mon Sep 17 00:00:00 2001 From: donghualin Date: Tue, 21 Jun 2022 17:43:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=94=B9=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=99=A8=E4=B8=AD=E5=AF=B9AM=E6=8E=A5=E5=8F=A3=E7=9A=84?= =?UTF-8?q?=E8=AE=BF=E9=97=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修改插件加载相关的类对AM接口的访问 Log: Influence: 任务栏 Task: https://pms.uniontech.com/task-view-133075.html Change-Id: Ifbf3ce3b8d9fc3098f1a0a5e3ff4a8bc97e68d67 --- frame/controller/dockpluginscontroller.h | 2 -- frame/controller/systemplugincontroller.h | 2 -- frame/item/components/appsnapshot.cpp | 2 +- frame/item/components/appsnapshot.h | 15 ++++++--------- frame/item/components/previewcontainer.h | 2 -- frame/util/abstractpluginscontroller.cpp | 4 ++-- frame/util/abstractpluginscontroller.h | 7 ++----- 7 files changed, 11 insertions(+), 23 deletions(-) diff --git a/frame/controller/dockpluginscontroller.h b/frame/controller/dockpluginscontroller.h index 6b7e26705..f6aa22138 100644 --- a/frame/controller/dockpluginscontroller.h +++ b/frame/controller/dockpluginscontroller.h @@ -26,8 +26,6 @@ #include "pluginproxyinterface.h" #include "abstractpluginscontroller.h" -#include - #include #include #include diff --git a/frame/controller/systemplugincontroller.h b/frame/controller/systemplugincontroller.h index 6dbed0580..2fc26d155 100644 --- a/frame/controller/systemplugincontroller.h +++ b/frame/controller/systemplugincontroller.h @@ -26,8 +26,6 @@ #include "abstractpluginscontroller.h" #include "abstractpluginscontroller.h" -#include - #include #include #include diff --git a/frame/item/components/appsnapshot.cpp b/frame/item/components/appsnapshot.cpp index a6e546feb..fa5fcd509 100644 --- a/frame/item/components/appsnapshot.cpp +++ b/frame/item/components/appsnapshot.cpp @@ -65,7 +65,7 @@ AppSnapshot::AppSnapshot(const WId wid, QWidget *parent) , m_waitLeaveTimer(new QTimer(this)) , m_closeBtn2D(new DIconButton(this)) , m_wmHelper(DWindowManagerHelper::instance()) - , m_dockDaemonInter(new DockDaemonInter("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) + , m_dockDaemonInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this)) { m_closeBtn2D->setFixedSize(SNAP_CLOSE_BTN_WIDTH, SNAP_CLOSE_BTN_WIDTH); m_closeBtn2D->setIconSize(QSize(SNAP_CLOSE_BTN_WIDTH, SNAP_CLOSE_BTN_WIDTH)); diff --git a/frame/item/components/appsnapshot.h b/frame/item/components/appsnapshot.h index 2f7bca737..8282caefe 100644 --- a/frame/item/components/appsnapshot.h +++ b/frame/item/components/appsnapshot.h @@ -22,16 +22,15 @@ #ifndef APPSNAPSHOT_H #define APPSNAPSHOT_H -#include -#include -#include +#include "dbusutil.h" #include #include #include -#include -#include +#include +#include +#include DWIDGET_USE_NAMESPACE DGUI_USE_NAMESPACE @@ -54,8 +53,6 @@ struct SHMInfo; struct _XImage; typedef _XImage XImage; -using DockDaemonInter = com::deepin::dde::daemon::Dock; - namespace Dock { class TipsWidget; } @@ -65,7 +62,7 @@ class AppSnapshot : public QWidget Q_OBJECT public: - explicit AppSnapshot(const WId wid, QWidget *parent = 0); + explicit AppSnapshot(const WId wid, QWidget *parent = Q_NULLPTR); inline WId wid() const { return m_wid; } inline bool attentioned() const { return m_windowInfo.attention; } @@ -120,7 +117,7 @@ private: QTimer *m_waitLeaveTimer; DIconButton *m_closeBtn2D; DWindowManagerHelper *m_wmHelper; - DockDaemonInter *m_dockDaemonInter; + DockInter *m_dockDaemonInter; }; #endif // APPSNAPSHOT_H diff --git a/frame/item/components/previewcontainer.h b/frame/item/components/previewcontainer.h index 1e48cb8b7..7ddd167df 100644 --- a/frame/item/components/previewcontainer.h +++ b/frame/item/components/previewcontainer.h @@ -30,8 +30,6 @@ #include "appsnapshot.h" #include "floatingpreview.h" -#include - #include DWIDGET_USE_NAMESPACE diff --git a/frame/util/abstractpluginscontroller.cpp b/frame/util/abstractpluginscontroller.cpp index 3d42bce2b..a53d55a77 100644 --- a/frame/util/abstractpluginscontroller.cpp +++ b/frame/util/abstractpluginscontroller.cpp @@ -41,13 +41,13 @@ static const QStringList CompatiblePluginApiList { AbstractPluginsController::AbstractPluginsController(QObject *parent) : QObject(parent) , m_dbusDaemonInterface(QDBusConnection::sessionBus().interface()) - , m_dockDaemonInter(new DockDaemonInter("com.deepin.dde.daemon.Dock", "/com/deepin/dde/daemon/Dock", QDBusConnection::sessionBus(), this)) + , m_dockDaemonInter(new DockInter(dockServiceName(), dockServicePath(), QDBusConnection::sessionBus(), this)) { qApp->installEventFilter(this); refreshPluginSettings(); - connect(m_dockDaemonInter, &DockDaemonInter::PluginSettingsSynced, this, &AbstractPluginsController::refreshPluginSettings, Qt::QueuedConnection); + connect(m_dockDaemonInter, &DockInter::PluginSettingsSynced, this, &AbstractPluginsController::refreshPluginSettings, Qt::QueuedConnection); } AbstractPluginsController::~AbstractPluginsController() diff --git a/frame/util/abstractpluginscontroller.h b/frame/util/abstractpluginscontroller.h index f58e5a69e..ebfc303bd 100644 --- a/frame/util/abstractpluginscontroller.h +++ b/frame/util/abstractpluginscontroller.h @@ -24,16 +24,13 @@ #include "pluginproxyinterface.h" #include "pluginloader.h" - -#include +#include "dbusutil.h" #include #include #include #include -using DockDaemonInter = com::deepin::dde::daemon::Dock; - class PluginsItemInterface; class AbstractPluginsController : public QObject, PluginProxyInterface { @@ -83,7 +80,7 @@ private: private: QDBusConnectionInterface *m_dbusDaemonInterface; - DockDaemonInter *m_dockDaemonInter; + DockInter *m_dockDaemonInter; // interface, "pluginloader", PluginLoader指针对象 QMap> m_pluginsMap;