From 2ee4b0c25d1cd8d8a5fde7109594e07c66b4e22c Mon Sep 17 00:00:00 2001 From: donghualin Date: Fri, 31 Dec 2021 14:54:12 +0800 Subject: [PATCH] =?UTF-8?q?perf:=20=E6=A0=BC=E5=BC=8F=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E5=B9=B6=E5=AF=B9=E9=83=A8=E5=88=86=E7=B1=BB=E8=A7=A3?= =?UTF-8?q?=E5=81=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 删除AppSnapshot类中对com.deepin.dde.daemon.Dock接口的调用，并通过DBus的方式来调用相关的接口 Log: Influence: 任务栏 Task: https://pms.uniontech.com/zentao/task-view-95700.html Change-Id: Ie8e48111ee9094813b002a0809cd6ba53aae9586 --- frame/window/mainpanelcontrol.h | 1 - frame/window/mainwindow.cpp | 1 - frame/window/mainwindow.h | 2 -- plugins/airplane-mode/airplanemodeapplet.cpp | 2 +- plugins/onboard/onboardplugin.cpp | 3 +++ plugins/onboard/onboardplugin.h | 2 -- plugins/power/powerstatuswidget.cpp | 2 ++ plugins/power/powerstatuswidget.h | 4 ++-- plugins/shutdown/shutdownplugin.cpp | 1 + plugins/shutdown/shutdownplugin.h | 3 ++- plugins/shutdown/shutdownwidget.h | 2 +- 11 files changed, 12 insertions(+), 11 deletions(-) diff --git a/frame/window/mainpanelcontrol.h b/frame/window/mainpanelcontrol.h index 50cd1eb5e..288e4b74a 100755 --- a/frame/window/mainpanelcontrol.h +++ b/frame/window/mainpanelcontrol.h @@ -29,7 +29,6 @@ #include using namespace Dock; -using Gesture = com::deepin::daemon::Gesture; class QBoxLayout; class QLabel; diff --git a/frame/window/mainwindow.cpp b/frame/window/mainwindow.cpp index 0d4cbb2d9..5fb08296c 100755 --- a/frame/window/mainwindow.cpp +++ b/frame/window/mainwindow.cpp @@ -55,7 +55,6 @@ #define DRAG_STATE_PROP "DRAG_STATE" using org::kde::StatusNotifierWatcher; -using DBusDock = com::deepin::dde::daemon::Dock; // let startdde know that we've already started. void MainWindow::RegisterDdeSession() diff --git a/frame/window/mainwindow.h b/frame/window/mainwindow.h index dc0f08f2e..32b440eb7 100644 --- a/frame/window/mainwindow.h +++ b/frame/window/mainwindow.h @@ -40,8 +40,6 @@ DWIDGET_USE_NAMESPACE -using XEventMonitor = ::com::deepin::api::XEventMonitor; - class MainPanelControl; class QTimer; class MenuWorker; diff --git a/plugins/airplane-mode/airplanemodeapplet.cpp b/plugins/airplane-mode/airplanemodeapplet.cpp index 1358dacd3..a8e198dcf 100644 --- a/plugins/airplane-mode/airplanemodeapplet.cpp +++ b/plugins/airplane-mode/airplanemodeapplet.cpp @@ -38,7 +38,7 @@ AirplaneModeApplet::AirplaneModeApplet(QWidget *parent) setFixedHeight(30); QLabel *title = new QLabel(this); title->setText(tr("Airplane Mode")); - QHBoxLayout *appletlayout = new QHBoxLayout; + QHBoxLayout *appletlayout = new QHBoxLayout(this); appletlayout->setMargin(0); appletlayout->setSpacing(0); appletlayout->addSpacing(0); diff --git a/plugins/onboard/onboardplugin.cpp b/plugins/onboard/onboardplugin.cpp index f5838690f..f3b65be41 100644 --- a/plugins/onboard/onboardplugin.cpp +++ b/plugins/onboard/onboardplugin.cpp @@ -27,6 +27,9 @@ #define PLUGIN_STATE_KEY "enable" +using DBusDock = com::deepin::dde::daemon::Dock; +using DockEntryInter = com::deepin::dde::daemon::dock::Entry; + using namespace Dock; OnboardPlugin::OnboardPlugin(QObject *parent) : QObject(parent) diff --git a/plugins/onboard/onboardplugin.h b/plugins/onboard/onboardplugin.h index eda7998e6..4e17c483e 100644 --- a/plugins/onboard/onboardplugin.h +++ b/plugins/onboard/onboardplugin.h @@ -31,8 +31,6 @@ #include #include -using DBusDock = com::deepin::dde::daemon::Dock; -using DockEntryInter = com::deepin::dde::daemon::dock::Entry; namespace Dock { class TipsWidget; } diff --git a/plugins/power/powerstatuswidget.cpp b/plugins/power/powerstatuswidget.cpp index 17a444808..3ce25838e 100644 --- a/plugins/power/powerstatuswidget.cpp +++ b/plugins/power/powerstatuswidget.cpp @@ -21,6 +21,8 @@ #include "powerstatuswidget.h" #include "powerplugin.h" +#include "dbus/dbuspower.h" + #include #include diff --git a/plugins/power/powerstatuswidget.h b/plugins/power/powerstatuswidget.h index b369cc334..5a0895ea1 100644 --- a/plugins/power/powerstatuswidget.h +++ b/plugins/power/powerstatuswidget.h @@ -22,12 +22,12 @@ #ifndef POWERSTATUSWIDGET_H #define POWERSTATUSWIDGET_H -#include "dbus/dbuspower.h" - #include #define POWER_KEY "power" +class DBusPower; + // from https://upower.freedesktop.org/docs/Device.html#Device:State enum BatteryState { UNKNOWN = 0, // 未知 diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp index 113344ded..3cc17bd39 100644 --- a/plugins/shutdown/shutdownplugin.cpp +++ b/plugins/shutdown/shutdownplugin.cpp @@ -23,6 +23,7 @@ #include "dbus/dbusaccount.h" #include "../frame/util/utils.h" #include "../widgets/tipswidget.h" +#include "./dbus/dbuspowermanager.h" #include #include diff --git a/plugins/shutdown/shutdownplugin.h b/plugins/shutdown/shutdownplugin.h index 02b590649..046156fad 100644 --- a/plugins/shutdown/shutdownplugin.h +++ b/plugins/shutdown/shutdownplugin.h @@ -24,10 +24,11 @@ #include "pluginsiteminterface.h" #include "shutdownwidget.h" -#include "./dbus/dbuspowermanager.h" #include +class DBusPowerManager; + namespace Dock { class TipsWidget; } diff --git a/plugins/shutdown/shutdownwidget.h b/plugins/shutdown/shutdownwidget.h index 414ffe5b4..cea9de4e9 100644 --- a/plugins/shutdown/shutdownwidget.h +++ b/plugins/shutdown/shutdownwidget.h @@ -32,7 +32,7 @@ class ShutdownWidget : public QWidget Q_OBJECT public: - explicit ShutdownWidget(QWidget *parent = 0); + explicit ShutdownWidget(QWidget *parent = Q_NULLPTR); protected: void paintEvent(QPaintEvent *e) override;