From e4f4a47b87bae582869869ec329057413743c6da Mon Sep 17 00:00:00 2001 From: tanfeng Date: Thu, 17 Nov 2022 17:25:20 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20V23=E6=8E=A5=E5=8F=A3=E6=94=B9?= =?UTF-8?q?=E9=80=A0=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit V23接口改造适配 Log: V23接口改造适配 Influence: 无 Task: https://pms.uniontech.com/task-view-207483.html Change-Id: I91e7c2807c168e87781e18aedc7aec887702ae13 --- .gitignore | 1 + ... org.deepin.dde.Application1.Instance.xml} | 2 +- ...> org.deepin.dde.Application1.Manager.xml} | 2 +- ...on.xml => org.deepin.dde.Application1.xml} | 2 +- ...emon.Mime.xml => org.deepin.dde.Mime1.xml} | 2 +- misc/systemd/CMakeLists.txt | 4 +-- ...deepin.dde.Application1.Instance@.service} | 0 ...g.deepin.dde.Application1.Manager.service} | 2 +- src/frameworkdbus/dbuskwaylandoutput.h | 8 +++--- .../dbuskwaylandwindowmanager.cpp | 2 +- src/frameworkdbus/dbuskwaylandwindowmanager.h | 12 ++++---- src/frameworkdbus/dbuslauncher.cpp | 2 +- src/frameworkdbus/dbuslauncher.h | 8 +++--- src/frameworkdbus/dbuslauncherfront.cpp | 2 +- src/frameworkdbus/dbuslauncherfront.h | 8 +++--- src/frameworkdbus/dbusplasmawindow.cpp | 10 +++---- src/frameworkdbus/dbusplasmawindow.h | 18 ++++++------ src/frameworkdbus/dbuswmswitcher.cpp | 2 +- src/frameworkdbus/dbuswmswitcher.h | 16 ++++++----- src/frameworkdbus/dbusxeventmonitor.cpp | 18 ++++++------ src/frameworkdbus/dbusxeventmonitor.h | 18 ++++++------ src/lib/appinfocommon.cpp | 1 - src/lib/appinfocommon.h | 1 - src/modules/apps/alrecorder.h | 2 +- src/modules/apps/appmanager.cpp | 4 +-- src/modules/apps/dbusalrecorderadaptor.h | 4 +-- src/modules/apps/dfwatcher.cpp | 6 ++-- src/modules/apps/dfwatcher.h | 2 +- src/modules/dock/dbushandler.cpp | 22 +++++++-------- src/modules/dock/dbushandler.h | 6 ++-- src/modules/dock/dock.h | 2 ++ src/modules/dock/windowinfok.h | 2 ++ src/modules/launcher/launcher.cpp | 20 ++++++------- src/modules/startmanager/common.h | 2 +- .../startmanager/startmanagerdbushandler.cpp | 8 +++--- src/service/CMakeLists.txt | 8 +++--- src/service/impl/application.cpp | 2 +- src/service/impl/application_instance.cpp | 18 ++++++------ src/service/impl/application_manager.cpp | 2 +- src/service/main.cpp | 28 +++++++++---------- src/utils/synconfig.cpp | 8 +++--- src/utils/synconfig.h | 2 +- 42 files changed, 147 insertions(+), 142 deletions(-) rename dbus/{org.desktopspec.ApplicationInstance.xml => org.deepin.dde.Application1.Instance.xml} (78%) rename dbus/{org.desktopspec.ApplicationManager.xml => org.deepin.dde.Application1.Manager.xml} (95%) rename dbus/{org.desktopspec.Application.xml => org.deepin.dde.Application1.xml} (92%) rename dbus/{org.deepin.daemon.Mime.xml => org.deepin.dde.Mime1.xml} (96%) rename misc/systemd/{org.desktopspec.application.instance@.service => org.deepin.dde.Application1.Instance@.service} (100%) rename misc/systemd/{org.desktopspec.application.manager.service => org.deepin.dde.Application1.Manager.service} (76%) diff --git a/.gitignore b/.gitignore index 25eed59..2daed62 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ build/ # translations files *.qm +.vscode/ diff --git a/dbus/org.desktopspec.ApplicationInstance.xml b/dbus/org.deepin.dde.Application1.Instance.xml similarity index 78% rename from dbus/org.desktopspec.ApplicationInstance.xml rename to dbus/org.deepin.dde.Application1.Instance.xml index af4d27c..a852d3f 100644 --- a/dbus/org.desktopspec.ApplicationInstance.xml +++ b/dbus/org.deepin.dde.Application1.Instance.xml @@ -1,4 +1,4 @@ - + diff --git a/dbus/org.desktopspec.ApplicationManager.xml b/dbus/org.deepin.dde.Application1.Manager.xml similarity index 95% rename from dbus/org.desktopspec.ApplicationManager.xml rename to dbus/org.deepin.dde.Application1.Manager.xml index 73fb1f9..eac83e9 100644 --- a/dbus/org.desktopspec.ApplicationManager.xml +++ b/dbus/org.deepin.dde.Application1.Manager.xml @@ -1,4 +1,4 @@ - + diff --git a/dbus/org.desktopspec.Application.xml b/dbus/org.deepin.dde.Application1.xml similarity index 92% rename from dbus/org.desktopspec.Application.xml rename to dbus/org.deepin.dde.Application1.xml index d3c2f4f..b6e8898 100644 --- a/dbus/org.desktopspec.Application.xml +++ b/dbus/org.deepin.dde.Application1.xml @@ -1,4 +1,4 @@ - + diff --git a/dbus/org.deepin.daemon.Mime.xml b/dbus/org.deepin.dde.Mime1.xml similarity index 96% rename from dbus/org.deepin.daemon.Mime.xml rename to dbus/org.deepin.dde.Mime1.xml index e400845..623366f 100644 --- a/dbus/org.deepin.daemon.Mime.xml +++ b/dbus/org.deepin.dde.Mime1.xml @@ -1,4 +1,4 @@ - + diff --git a/misc/systemd/CMakeLists.txt b/misc/systemd/CMakeLists.txt index a178d73..7caef89 100644 --- a/misc/systemd/CMakeLists.txt +++ b/misc/systemd/CMakeLists.txt @@ -1,6 +1,6 @@ set(SYSTEMD_FILES - org.desktopspec.application.instance@.service - org.desktopspec.application.manager.service + org.deepin.dde.Application1.Instance@.service + org.deepin.dde.Application1.Manager.service ) install(FILES ${SYSTEMD_FILES} DESTINATION lib/systemd/user/) diff --git a/misc/systemd/org.desktopspec.application.instance@.service b/misc/systemd/org.deepin.dde.Application1.Instance@.service similarity index 100% rename from misc/systemd/org.desktopspec.application.instance@.service rename to misc/systemd/org.deepin.dde.Application1.Instance@.service diff --git a/misc/systemd/org.desktopspec.application.manager.service b/misc/systemd/org.deepin.dde.Application1.Manager.service similarity index 76% rename from misc/systemd/org.desktopspec.application.manager.service rename to misc/systemd/org.deepin.dde.Application1.Manager.service index f7851d7..bf6af28 100644 --- a/misc/systemd/org.desktopspec.application.manager.service +++ b/misc/systemd/org.deepin.dde.Application1.Manager.service @@ -3,6 +3,6 @@ Description=Deepin Application Manager service [Service] Type=DBus -BusName=org.desktopspec.ApplicationManager +BusName=org.deepin.dde.Application1.Manager ExecStart=/usr/bin/deepin-application-manager Slice=services.slice \ No newline at end of file diff --git a/src/frameworkdbus/dbuskwaylandoutput.h b/src/frameworkdbus/dbuskwaylandoutput.h index 244af62..b0df2e6 100644 --- a/src/frameworkdbus/dbuskwaylandoutput.h +++ b/src/frameworkdbus/dbuskwaylandoutput.h @@ -24,7 +24,7 @@ /* - * Proxy class for interface com.deepin.daemon.KWayland.Output + * Proxy class for interface org.deepin.dde.KWayland1.Output */ class __OutputManagementPrivate; class __OutputManagement : public DBusExtendedAbstractInterface @@ -33,7 +33,7 @@ class __OutputManagement : public DBusExtendedAbstractInterface public: static inline const char *staticInterfaceName() - { return "com.deepin.daemon.KWayland.Output"; } + { return "org.deepin.dde.KWayland1.Output"; } public: explicit __OutputManagement(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); @@ -109,8 +109,8 @@ private: namespace com { namespace deepin { - namespace daemon { - namespace kwayland { + namespace dde { + namespace kwayland1 { typedef ::__OutputManagement Output; } } diff --git a/src/frameworkdbus/dbuskwaylandwindowmanager.cpp b/src/frameworkdbus/dbuskwaylandwindowmanager.cpp index 7c051ce..466e0a0 100644 --- a/src/frameworkdbus/dbuskwaylandwindowmanager.cpp +++ b/src/frameworkdbus/dbuskwaylandwindowmanager.cpp @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c kwaylandmanager -p kwaylandmanager com.deepin.daemon.KWayland.WindowManager.xml + * Command line was: qdbusxml2cpp-fix -c kwaylandmanager -p kwaylandmanager org.deepin.dde.KWayland1.WindowManager.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * diff --git a/src/frameworkdbus/dbuskwaylandwindowmanager.h b/src/frameworkdbus/dbuskwaylandwindowmanager.h index ced6126..1c018f0 100644 --- a/src/frameworkdbus/dbuskwaylandwindowmanager.h +++ b/src/frameworkdbus/dbuskwaylandwindowmanager.h @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c kwaylandmanager -p kwaylandmanager com.deepin.daemon.KWayland.WindowManager.xml + * Command line was: qdbusxml2cpp-fix -c kwaylandmanager -p kwaylandmanager org.deepin.dde.KWayland1.WindowManager.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * @@ -24,7 +24,7 @@ /* - * Proxy class for interface com.deepin.daemon.KWayland.WindowManager + * Proxy class for interface org.deepin.dde.KWayland1.WindowManager */ class __kwaylandmanagerPrivate; class __KwaylandManager : public DBusExtendedAbstractInterface @@ -33,7 +33,7 @@ class __KwaylandManager : public DBusExtendedAbstractInterface public: static inline const char *staticInterfaceName() - { return "com.deepin.daemon.KWayland.WindowManager"; } + { return "org.deepin.dde.KWayland1.WindowManager"; } public: explicit __KwaylandManager(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); @@ -82,10 +82,10 @@ private: __kwaylandmanagerPrivate *d_ptr; }; -namespace com { +namespace org { namespace deepin { - namespace daemon { - namespace kwayland { + namespace dde { + namespace kwayland1 { typedef ::__KwaylandManager WindowManager; } } diff --git a/src/frameworkdbus/dbuslauncher.cpp b/src/frameworkdbus/dbuslauncher.cpp index 16ee681..0429fd6 100644 --- a/src/frameworkdbus/dbuslauncher.cpp +++ b/src/frameworkdbus/dbuslauncher.cpp @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c Launcherd -p generated/com_deepin_dde_daemon_launcherd ../xml/com.deepin.dde.daemon.Launcherd.xml + * Command line was: qdbusxml2cpp-fix -c Launcherd -p generated/org_deepin_dde_daemon_launcherd ../xml/org.deepin.dde.daemon.Launcherd.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * diff --git a/src/frameworkdbus/dbuslauncher.h b/src/frameworkdbus/dbuslauncher.h index 3dab6be..4738c8d 100644 --- a/src/frameworkdbus/dbuslauncher.h +++ b/src/frameworkdbus/dbuslauncher.h @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c Launcherd -p generated/com_deepin_dde_daemon_launcherd ../xml/com.deepin.dde.daemon.Launcherd.xml + * Command line was: qdbusxml2cpp-fix -c Launcherd -p generated/com_deepin_dde_daemon_launcher1 ../xml/org.deepin.dde.daemon.Launcher1.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef COM_DEEPIN_DDE_DAEMON_LAUNCHERD_H -#define COM_DEEPIN_DDE_DAEMON_LAUNCHERD_H +#ifndef ORG_DEEPIN_DDE_DAEMON_LAUNCHER1_H +#define ORG_DEEPIN_DDE_DAEMON_LAUNCHER1_H #include #include @@ -223,7 +223,7 @@ private: __LauncherdPrivate *d_ptr; }; -namespace com { +namespace org { namespace deepin { namespace dde { namespace daemon { diff --git a/src/frameworkdbus/dbuslauncherfront.cpp b/src/frameworkdbus/dbuslauncherfront.cpp index e7ffef9..4d3ee85 100644 --- a/src/frameworkdbus/dbuslauncherfront.cpp +++ b/src/frameworkdbus/dbuslauncherfront.cpp @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c Launcher -p generated/com_deepin_dde_launcher ../xml/com.deepin.dde.Launcher.xml + * Command line was: qdbusxml2cpp-fix -c Launcher -p generated/org_deepin_dde_launcher1 ../xml/org.deepin.dde.Launcher1.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * diff --git a/src/frameworkdbus/dbuslauncherfront.h b/src/frameworkdbus/dbuslauncherfront.h index df42cf4..a15c441 100644 --- a/src/frameworkdbus/dbuslauncherfront.h +++ b/src/frameworkdbus/dbuslauncherfront.h @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c Launcher -p generated/com_deepin_dde_launcher ../xml/com.deepin.dde.Launcher.xml + * Command line was: qdbusxml2cpp-fix -c Launcher -p generated/org_deepin_dde_launcher1 ../xml/org.deepin.dde.Launcher1.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef COM_DEEPIN_DDE_LAUNCHER_H -#define COM_DEEPIN_DDE_LAUNCHER_H +#ifndef ORG_DEEPIN_DDE_LAUNCHER1_H +#define ORG_DEEPIN_DDE_LAUNCHER1_H #include #include @@ -159,7 +159,7 @@ private: __LauncherPrivate *d_ptr; }; -namespace com { +namespace org { namespace deepin { namespace dde { typedef ::LauncherFront LauncherFront; diff --git a/src/frameworkdbus/dbusplasmawindow.cpp b/src/frameworkdbus/dbusplasmawindow.cpp index f86201e..58a0499 100644 --- a/src/frameworkdbus/dbusplasmawindow.cpp +++ b/src/frameworkdbus/dbusplasmawindow.cpp @@ -27,7 +27,7 @@ public: QMap> m_waittingCalls; }; -PlasmaWindow::PlasmaWindow(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) +__PlasmaWindow::__PlasmaWindow(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) : DBusExtendedAbstractInterface(service, path, staticInterfaceName(), connection, parent) , d_ptr(new __WindowPrivate) { @@ -35,13 +35,13 @@ PlasmaWindow::PlasmaWindow(const QString &service, const QString &path, const QD registerRectMetaType(); } -PlasmaWindow::~PlasmaWindow() +__PlasmaWindow::~__PlasmaWindow() { qDeleteAll(d_ptr->m_processingCalls.values()); delete d_ptr; } -void PlasmaWindow::CallQueued(const QString &callName, const QList &args) +void __PlasmaWindow::CallQueued(const QString &callName, const QList &args) { if (d_ptr->m_waittingCalls.contains(callName)) { @@ -53,12 +53,12 @@ void PlasmaWindow::CallQueued(const QString &callName, const QList &ar d_ptr->m_waittingCalls.insert(callName, args); } else { QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(asyncCallWithArgumentList(callName, args)); - connect(watcher, &QDBusPendingCallWatcher::finished, this, &PlasmaWindow::onPendingCallFinished); + connect(watcher, &QDBusPendingCallWatcher::finished, this, &__PlasmaWindow::onPendingCallFinished); d_ptr->m_processingCalls.insert(callName, watcher); } } -void PlasmaWindow::onPendingCallFinished(QDBusPendingCallWatcher *w) +void __PlasmaWindow::onPendingCallFinished(QDBusPendingCallWatcher *w) { w->deleteLater(); const auto callName = d_ptr->m_processingCalls.key(w); diff --git a/src/frameworkdbus/dbusplasmawindow.h b/src/frameworkdbus/dbusplasmawindow.h index 2e9f8e2..8829ce2 100644 --- a/src/frameworkdbus/dbusplasmawindow.h +++ b/src/frameworkdbus/dbusplasmawindow.h @@ -25,21 +25,21 @@ #include "types/dockrect.h" /* - * Proxy class for interface com.deepin.daemon.KWayland.PlasmaWindow + * Proxy class for interface org.deepin.dde.KWayland1.PlasmaWindow */ class __WindowPrivate; -class PlasmaWindow : public DBusExtendedAbstractInterface +class __PlasmaWindow : public DBusExtendedAbstractInterface { Q_OBJECT public: static inline const char *staticInterfaceName() - { return "com.deepin.daemon.KWayland.PlasmaWindow"; } + { return "org.deepin.dde.KWayland1.PlasmaWindow"; } public: - explicit PlasmaWindow(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + explicit __PlasmaWindow(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - ~PlasmaWindow(); + ~__PlasmaWindow(); public Q_SLOTS: // METHODS inline QDBusPendingReply AppId() @@ -425,11 +425,11 @@ private: __WindowPrivate *d_ptr; }; -namespace com { +namespace org { namespace deepin { - namespace daemon { - namespace kwayland { - typedef ::PlasmaWindow PlasmaWindow; + namespace dde { + namespace kwayland1 { + typedef ::__PlasmaWindow PlasmaWindow; } } } diff --git a/src/frameworkdbus/dbuswmswitcher.cpp b/src/frameworkdbus/dbuswmswitcher.cpp index 4216bc5..9f59cd6 100644 --- a/src/frameworkdbus/dbuswmswitcher.cpp +++ b/src/frameworkdbus/dbuswmswitcher.cpp @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c WMSwitcher -p generated/com_deepin_wmswitcher ../xml/com.deepin.WMSwitcher.xml + * Command line was: qdbusxml2cpp-fix -c WMSwitcher -p generated/org_deepin_dde_wmswitcher1 ../xml/org.deepin.dde.WMSwitcher1.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * diff --git a/src/frameworkdbus/dbuswmswitcher.h b/src/frameworkdbus/dbuswmswitcher.h index 7ac3b24..ec1578a 100644 --- a/src/frameworkdbus/dbuswmswitcher.h +++ b/src/frameworkdbus/dbuswmswitcher.h @@ -1,6 +1,6 @@ /* * This file was generated by qdbusxml2cpp-fix version 0.8 - * Command line was: qdbusxml2cpp-fix -c WMSwitcher -p generated/com_deepin_wmswitcher ../xml/com.deepin.WMSwitcher.xml + * Command line was: qdbusxml2cpp-fix -c WMSwitcher -p generated/org_deepin_dde_wmswitcher1 ../xml/org.deepin.dde.WMSwitcher1.xml * * qdbusxml2cpp-fix is Copyright (C) 2016 Deepin Technology Co., Ltd. * @@ -8,8 +8,8 @@ * Do not edit! All changes made to it will be lost. */ -#ifndef COM_DEEPIN_WMSWITCHER_H -#define COM_DEEPIN_WMSWITCHER_H +#ifndef ORG_DEEPIN_WMSWITCHER1_H +#define ORG_DEEPIN_WMSWITCHER1_H #include #include @@ -24,7 +24,7 @@ /* - * Proxy class for interface com.deepin.WMSwitcher + * Proxy class for interface org.deepin.dde.WMSwitcher1 */ class __WMSwitcherPrivate; class __WMSwitcher : public DBusExtendedAbstractInterface @@ -33,7 +33,7 @@ class __WMSwitcher : public DBusExtendedAbstractInterface public: static inline const char *staticInterfaceName() - { return "com.deepin.WMSwitcher"; } + { return "org.deepin.dde.WMSwitcher1"; } public: explicit __WMSwitcher(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); @@ -114,9 +114,11 @@ private: __WMSwitcherPrivate *d_ptr; }; -namespace com { +namespace org { namespace deepin { - typedef ::__WMSwitcher WMSwitcher; + namespace dde { + typedef ::__WMSwitcher WMSwitcher1; + } } } #endif diff --git a/src/frameworkdbus/dbusxeventmonitor.cpp b/src/frameworkdbus/dbusxeventmonitor.cpp index 8584c8b..90db842 100644 --- a/src/frameworkdbus/dbusxeventmonitor.cpp +++ b/src/frameworkdbus/dbusxeventmonitor.cpp @@ -12,13 +12,13 @@ #include "dbusxeventmonitor.h" /* - * Implementation of interface class __org_deepin_api_XEventMonitor + * Implementation of interface class __org_deepin_dde_XEventMonitor */ -class __org_deepin_api_XEventMonitorPrivate +class __org_deepin_dde_XEventMonitorPrivate { public: - __org_deepin_api_XEventMonitorPrivate() = default; + __org_deepin_dde_XEventMonitorPrivate() = default; // begin member variables @@ -27,21 +27,21 @@ public: QMap> m_waittingCalls; }; -__org_deepin_api_XEventMonitor::__org_deepin_api_XEventMonitor(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) +__org_deepin_dde_XEventMonitor::__org_deepin_dde_XEventMonitor(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent) : DBusExtendedAbstractInterface(service, path, staticInterfaceName(), connection, parent) - , d_ptr(new __org_deepin_api_XEventMonitorPrivate) + , d_ptr(new __org_deepin_dde_XEventMonitorPrivate) { if (QMetaType::type("AreaList") == QMetaType::UnknownType) registerAreaListMetaType(); } -__org_deepin_api_XEventMonitor::~__org_deepin_api_XEventMonitor() +__org_deepin_dde_XEventMonitor::~__org_deepin_dde_XEventMonitor() { qDeleteAll(d_ptr->m_processingCalls.values()); delete d_ptr; } -void __org_deepin_api_XEventMonitor::CallQueued(const QString &callName, const QList &args) +void __org_deepin_dde_XEventMonitor::CallQueued(const QString &callName, const QList &args) { if (d_ptr->m_waittingCalls.contains(callName)) { d_ptr->m_waittingCalls[callName] = args; @@ -51,12 +51,12 @@ void __org_deepin_api_XEventMonitor::CallQueued(const QString &callName, const Q d_ptr->m_waittingCalls.insert(callName, args); } else { QDBusPendingCallWatcher *watcher = new QDBusPendingCallWatcher(asyncCallWithArgumentList(callName, args)); - connect(watcher, &QDBusPendingCallWatcher::finished, this, &__org_deepin_api_XEventMonitor::onPendingCallFinished); + connect(watcher, &QDBusPendingCallWatcher::finished, this, &__org_deepin_dde_XEventMonitor::onPendingCallFinished); d_ptr->m_processingCalls.insert(callName, watcher); } } -void __org_deepin_api_XEventMonitor::onPendingCallFinished(QDBusPendingCallWatcher *w) +void __org_deepin_dde_XEventMonitor::onPendingCallFinished(QDBusPendingCallWatcher *w) { w->deleteLater(); const auto callName = d_ptr->m_processingCalls.key(w); diff --git a/src/frameworkdbus/dbusxeventmonitor.h b/src/frameworkdbus/dbusxeventmonitor.h index 501fad3..d6b557d 100644 --- a/src/frameworkdbus/dbusxeventmonitor.h +++ b/src/frameworkdbus/dbusxeventmonitor.h @@ -25,21 +25,21 @@ #include /* - * Proxy class for interface org.deepin.api.XEventMonitor1 + * Proxy class for interface org.deepin.dde.XEventMonitor1 */ -class __org_deepin_api_XEventMonitorPrivate; -class __org_deepin_api_XEventMonitor : public DBusExtendedAbstractInterface +class __org_deepin_dde_XEventMonitorPrivate; +class __org_deepin_dde_XEventMonitor : public DBusExtendedAbstractInterface { Q_OBJECT public: static inline const char *staticInterfaceName() - { return "org.deepin.api.XEventMonitor1"; } + { return "org.deepin.dde.XEventMonitor1"; } public: - explicit __org_deepin_api_XEventMonitor(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); + explicit __org_deepin_dde_XEventMonitor(const QString &service, const QString &path, const QDBusConnection &connection, QObject *parent = 0); - ~__org_deepin_api_XEventMonitor(); + ~__org_deepin_dde_XEventMonitor(); public Q_SLOTS: // METHODS inline QDBusPendingReply RegisterArea(int in0, int in1, int in2, int in3, int in4) @@ -87,13 +87,13 @@ private Q_SLOTS: void onPendingCallFinished(QDBusPendingCallWatcher *w); private: - __org_deepin_api_XEventMonitorPrivate *d_ptr; + __org_deepin_dde_XEventMonitorPrivate *d_ptr; }; namespace org { namespace deepin { - namespace api { - typedef ::__org_deepin_api_XEventMonitor XEventMonitor1; + namespace dde { + typedef ::__org_deepin_dde_XEventMonitor XEventMonitor1; } } } diff --git a/src/lib/appinfocommon.cpp b/src/lib/appinfocommon.cpp index 16996ca..0e96d34 100644 --- a/src/lib/appinfocommon.cpp +++ b/src/lib/appinfocommon.cpp @@ -30,7 +30,6 @@ const std::string AppinfoCommon::TypeDirectory = "Directory"; const std::string AppinfoCommon::EnvDesktopEnv = "XDG_CURRENT_DESKTOP"; const std::string AppinfoCommon::DesktopExt = ".desktop"; -const std::string AppinfoCommon::GsSchemaStartdde = "com.deepin.dde.startdde"; const std::string AppinfoCommon::EnableInvoker = "ENABLE_TURBO_INVOKER"; const std::string AppinfoCommon::TurboInvokerFailedMsg = "Failed to invoke: Booster:"; const std::string AppinfoCommon::TurboInvokerErrMsg = "deepin-turbo-invoker: error"; diff --git a/src/lib/appinfocommon.h b/src/lib/appinfocommon.h index 0c4701c..73049ee 100644 --- a/src/lib/appinfocommon.h +++ b/src/lib/appinfocommon.h @@ -35,7 +35,6 @@ public: const static std::string EnvDesktopEnv; const static std::string DesktopExt; - const static std::string GsSchemaStartdde; const static std::string EnableInvoker; const static std::string TurboInvokerFailedMsg; const static std::string TurboInvokerErrMsg; diff --git a/src/modules/apps/alrecorder.h b/src/modules/apps/alrecorder.h index 81ebdcb..539f1ab 100644 --- a/src/modules/apps/alrecorder.h +++ b/src/modules/apps/alrecorder.h @@ -32,7 +32,7 @@ class DFWatcher; class AlRecorder: public QObject { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.deepin.daemon.AlRecorder1") + Q_CLASSINFO("D-Bus Interface", "org.deepin.dde.AlRecorder1") public: // 各个应用目录中应用的启动记录 diff --git a/src/modules/apps/appmanager.cpp b/src/modules/apps/appmanager.cpp index cda5208..4c426cb 100644 --- a/src/modules/apps/appmanager.cpp +++ b/src/modules/apps/appmanager.cpp @@ -36,13 +36,13 @@ AppManager::AppManager(QObject *parent) qInfo() << "AppManager"; new DBusAdaptorRecorder(recorder); QDBusConnection con = QDBusConnection::sessionBus(); - if (!con.registerService("org.deepin.daemon.AlRecorder1")) + if (!con.registerService("org.deepin.dde.AlRecorder1")) { qWarning() << "register service AlRecorder1 error:" << con.lastError().message(); return; } - if (!con.registerObject("/org/deepin/daemon/AlRecorder1", recorder)) + if (!con.registerObject("/org/deepin/dde/AlRecorder1", recorder)) { qWarning() << "register object AlRecorder1 error:" << con.lastError().message(); return; diff --git a/src/modules/apps/dbusalrecorderadaptor.h b/src/modules/apps/dbusalrecorderadaptor.h index bbc2bb1..7b54571 100644 --- a/src/modules/apps/dbusalrecorderadaptor.h +++ b/src/modules/apps/dbusalrecorderadaptor.h @@ -18,9 +18,9 @@ class DBusAdaptorRecorder: public QDBusAbstractAdaptor { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.deepin.daemon.AlRecorder1") + Q_CLASSINFO("D-Bus Interface", "org.deepin.dde.AlRecorder1") Q_CLASSINFO("D-Bus Introspection", "" - " \n" + " \n" " \n" " \n" " \n" diff --git a/src/modules/apps/dfwatcher.cpp b/src/modules/apps/dfwatcher.cpp index 5e3a383..588db04 100644 --- a/src/modules/apps/dfwatcher.cpp +++ b/src/modules/apps/dfwatcher.cpp @@ -34,13 +34,13 @@ const QString configSuffix = ".json"; , watcher(new QFileSystemWatcher(this)) { QDBusConnection con = QDBusConnection::sessionBus(); - if (!con.registerService("org.deepin.daemon.DFWatcher1")) + if (!con.registerService("org.deepin.dde.DFWatcher1")) { qInfo() << "register service DFWatcher error:" << con.lastError().message(); return; } - if (!con.registerObject("/org/deepin/daemon/DFWatcher1", this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) + if (!con.registerObject("/org/deepin/dde/DFWatcher1", this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) { qInfo() << "register object DFWatcher error:" << con.lastError().message(); return; @@ -52,7 +52,7 @@ const QString configSuffix = ".json"; DFWatcher::~DFWatcher() { - QDBusConnection::sessionBus().unregisterObject("/org/deepin/daemon/DFWatcher1"); + QDBusConnection::sessionBus().unregisterObject("/org/deepin/dde/DFWatcher1"); } void DFWatcher::addDir(const QString &path) diff --git a/src/modules/apps/dfwatcher.h b/src/modules/apps/dfwatcher.h index 2a92ed5..74cead7 100644 --- a/src/modules/apps/dfwatcher.h +++ b/src/modules/apps/dfwatcher.h @@ -28,7 +28,7 @@ class DFWatcher: public QObject { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.deepin.daemon.DFWatcher1") + Q_CLASSINFO("D-Bus Interface", "org.deepin.dde.DFWatcher1") public: enum event{ diff --git a/src/modules/dock/dbushandler.cpp b/src/modules/dock/dbushandler.cpp index 73ba6ba..72451b6 100644 --- a/src/modules/dock/dbushandler.cpp +++ b/src/modules/dock/dbushandler.cpp @@ -31,7 +31,7 @@ DBusHandler::DBusHandler(Dock *_dock, QObject *parent) , m_launcherEnd(new LauncherBackEnd("org.deepin.dde.daemon.Launcher1", "/org/deepin/dde/daemon/Launcher1", m_session, this)) , m_launcherFront(new LauncherFront("org.deepin.dde.Launcher1", "/org/deepin/dde/Launcher1", m_session, this)) , m_wm(new com::deepin::WM("com.deepin.wm", "/com/deepin/wm", m_session, this)) - , m_wmSwitcher(new com::deepin::WMSwitcher("com.deepin.wmWMSwitcher", "/com/deepin/WMSwitcher", m_session, this)) + , m_wmSwitcher(new org::deepin::dde::WMSwitcher1("org.deepin.dde.WMSwitcher1", "/org/deepin/dde/WMSwitcher1", m_session, this)) , m_kwaylandManager(nullptr) , m_xEventMonitor(nullptr) { @@ -44,22 +44,22 @@ DBusHandler::DBusHandler(Dock *_dock, QObject *parent) m_dock->updateHideState(false); }); - // 关联com.deepin.WMSwitcher事件 WMChanged + // 关联org.deepin.dde.WMSwitcher1事件 WMChanged connect(m_wmSwitcher, &__WMSwitcher::WMChanged, this, [&](QString name) {m_dock->setWMName(name);}); if (QString(getenv("XDG_SESSION_TYPE")).contains("wayland")) { - m_xEventMonitor = new org::deepin::api::XEventMonitor1("org.deepin.api.XEventMonitor1", "/org/deepin/api/XEventMonitor1", m_session, this); + m_xEventMonitor = new org::deepin::dde::XEventMonitor1("org.deepin.dde.XEventMonitor1", "/org/deepin/dde/XEventMonitor1", m_session, this); // 注册XEventMonitor区域为整个屏幕的区域 m_activeWindowMonitorKey = m_xEventMonitor->RegisterFullScreen(); // 关联XEventMonitor的ButtonRelease事件 - connect(m_xEventMonitor, &org::deepin::api::XEventMonitor1::ButtonRelease, this, &DBusHandler::onActiveWindowButtonRelease); + connect(m_xEventMonitor, &org::deepin::dde::XEventMonitor1::ButtonRelease, this, &DBusHandler::onActiveWindowButtonRelease); } } -// 关联com.deepin.daemon.KWayland.WindowManager事件 +// 关联org.deepin.dde.KWayland.WindowManager事件 void DBusHandler::listenWaylandWMSignals() { - m_kwaylandManager = new com::deepin::daemon::kwayland::WindowManager("com.deepin.daemon.KWayland", "/com/deepin/daemon/KWayland/WindowManager", m_session, this); + m_kwaylandManager = new org::deepin::dde::kwayland1::WindowManager("org.deepin.dde.KWayland1", "/org/deepin/dde/KWayland1/WindowManager", m_session, this); // ActiveWindowchanged connect(m_kwaylandManager, &__KwaylandManager::ActiveWindowChanged, this, &DBusHandler::handleWlActiveWindowChange); @@ -102,22 +102,22 @@ QString DBusHandler::getCurrentWM() return m_wmSwitcher->CurrentWM().value(); } -// TODO 扩展ApplicationManager Launch接口，允许带参数启动应用，暂时调用StartManager接口 +// TODO 扩展Application Manager Launch接口，允许带参数启动应用，暂时调用StartManager接口 void DBusHandler::launchApp(QString desktopFile, uint32_t timestamp, QStringList files) { - QDBusInterface interface = QDBusInterface("com.deepin.daemon.Display", "/com/deepin/StartManager", "com.deepin.StartManager"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.Application1.Manager", "/org/deepin/dde/Application1/Manager", "org.deepin.dde.Application1.Manager"); interface.call("LaunchApp", desktopFile, timestamp, files); } void DBusHandler::launchAppAction(QString desktopFile, QString action, uint32_t timestamp) { - QDBusInterface interface = QDBusInterface("com.deepin.daemon.Display", "/com/deepin/StartManager", "com.deepin.StartManager"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.Application1.Manager", "/org/deepin/dde/Application1/Manager", "org.deepin.dde.Application1.Manager"); interface.call("LaunchAppAction", desktopFile, action, timestamp); } void DBusHandler::markAppLaunched(const QString &filePath) { - QDBusInterface interface = QDBusInterface("org.deepin.daemon.AlRecorder1", "/org/deepin/daemon/AlRecorder1", "org.deepin.daemon.AlRecorder1"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.AlRecorder1", "/org/deepin/dde/AlRecorder1", "org.deepin.dde.AlRecorder1"); interface.call("MarkLaunched", filePath); } @@ -225,7 +225,7 @@ void DBusHandler::listenKWindowSignals(WindowInfoK *windowInfo) PlasmaWindow *DBusHandler::createPlasmaWindow(QString objPath) { - return new PlasmaWindow("com.deepin.daemon.KWayland", objPath, m_session, this); + return new PlasmaWindow("org.deepin.dde.KWayland1", objPath, m_session, this); } /** diff --git a/src/modules/dock/dbushandler.h b/src/modules/dock/dbushandler.h index 6205f48..d8d1f4e 100644 --- a/src/modules/dock/dbushandler.h +++ b/src/modules/dock/dbushandler.h @@ -86,10 +86,10 @@ private: LauncherBackEnd *m_launcherEnd; LauncherFront *m_launcherFront; com::deepin::WM *m_wm; - com::deepin::WMSwitcher *m_wmSwitcher; - com::deepin::daemon::kwayland::WindowManager *m_kwaylandManager; + org::deepin::dde::WMSwitcher1 *m_wmSwitcher; + org::deepin::dde::kwayland1::WindowManager *m_kwaylandManager; - org::deepin::api::XEventMonitor1 *m_xEventMonitor; + org::deepin::dde::XEventMonitor1 *m_xEventMonitor; QString m_activeWindowMonitorKey; }; diff --git a/src/modules/dock/dock.h b/src/modules/dock/dock.h index 6e7d35a..33eac75 100644 --- a/src/modules/dock/dock.h +++ b/src/modules/dock/dock.h @@ -40,6 +40,8 @@ class WindowInfoK; class WindowInfoX; class ApplicationManager; +using PlasmaWindow = org::deepin::dde::kwayland1::PlasmaWindow; + enum class HideState { Unknown, diff --git a/src/modules/dock/windowinfok.h b/src/modules/dock/windowinfok.h index fa65473..67e0b68 100644 --- a/src/modules/dock/windowinfok.h +++ b/src/modules/dock/windowinfok.h @@ -27,6 +27,8 @@ #include +using PlasmaWindow = org::deepin::dde::kwayland1::PlasmaWindow; + class Entry; class ProcessInfo; diff --git a/src/modules/launcher/launcher.cpp b/src/modules/launcher/launcher.cpp index d9aacd3..67219f4 100644 --- a/src/modules/launcher/launcher.cpp +++ b/src/modules/launcher/launcher.cpp @@ -47,9 +47,9 @@ DCORE_USE_NAMESPACE #define SETTING LauncherSettings::instance() -const QString LASTORE_SERVICE = "org.deepin.lastore1"; -const QString LASTORE_PATH = "/org/deepin/lastore1"; -const QString LASTORE_INTERFACE = "org.deepin.lastore1.Manager"; +const QString LASTORE_SERVICE = "org.deepin.dde.Lastore1"; +const QString LASTORE_PATH = "/org/deepin/dde/Lastore1"; +const QString LASTORE_INTERFACE = "org.deepin.dde.Lastore1.Manager"; Launcher::Launcher(QObject *parent) : SynModule(parent) @@ -143,7 +143,7 @@ QStringList Launcher::getAllNewInstalledApps() { QStringList ret; QMap newApps; - QDBusInterface interface = QDBusInterface("org.deepin.daemon.AlRecorder1", "/org/deepin/daemon/AlRecorder1", "org.deepin.daemon.AlRecorder1"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.AlRecorder1", "/org/deepin/dde/AlRecorder1", "org.deepin.dde.AlRecorder1"); QDBusReply> reply = interface.call("GetNew"); if (reply.isValid()) newApps = reply; @@ -579,16 +579,16 @@ void Launcher::onNewAppLaunched(const QString &filePath) void Launcher::initConnection() { - QDBusConnection::sessionBus().connect("org.deepin.daemon.DFWatcher1", - "/org/deepin/daemon/DFWatcher1", - "org.deepin.daemon.DFWatcher1", + QDBusConnection::sessionBus().connect("org.deepin.dde.DFWatcher1", + "/org/deepin/dde/DFWatcher1", + "org.deepin.dde.DFWatcher1", "Event", this, SLOT(onCheckDesktopFile(const QString &, int))); - QDBusConnection::sessionBus().connect("org.deepin.daemon.AlRecorder1", - "/org/deepin/daemon/AlRecorder1", - "org.deepin.daemon.AlRecorder1", + QDBusConnection::sessionBus().connect("org.deepin.dde.AlRecorder1", + "/org/deepin/dde/AlRecorder1", + "org.deepin.dde.AlRecorder1", "Launched", this, SLOT(onNewAppLaunched(const QString &))); diff --git a/src/modules/startmanager/common.h b/src/modules/startmanager/common.h index 23f9da4..2fd1b0c 100644 --- a/src/modules/startmanager/common.h +++ b/src/modules/startmanager/common.h @@ -24,7 +24,7 @@ #include -const QString AMServiceName = "/org/desktopspec/ApplicationManager"; +const QString AMServiceName = "/org/deepin/dde/Application1/Manager"; const QString autostartDir = "autostart"; const QString proxychainsBinary = "proxychains4"; diff --git a/src/modules/startmanager/startmanagerdbushandler.cpp b/src/modules/startmanager/startmanagerdbushandler.cpp index 1a1b177..b5312de 100644 --- a/src/modules/startmanager/startmanagerdbushandler.cpp +++ b/src/modules/startmanager/startmanagerdbushandler.cpp @@ -32,14 +32,14 @@ StartManagerDBusHandler::StartManagerDBusHandler(QObject *parent) void StartManagerDBusHandler::markLaunched(QString desktopFile) { - QDBusInterface interface = QDBusInterface("org.deepin.daemon.AlRecorder1", "/org/deepin/daemon/AlRecorder1", "org.deepin.daemon.AlRecorder1"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.AlRecorder1", "/org/deepin/dde/AlRecorder1", "org.deepin.dde.AlRecorder1"); interface.call("MarkLaunched", desktopFile); } QString StartManagerDBusHandler::getProxyMsg() { QString ret; - QDBusInterface interface = QDBusInterface("com.deepin.system.proxy", "/com/deepin/system/proxy", "com.deepin.system.proxy.App"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.NetworkProxy1", "/org/deepin/dde/NetworkProxy1", "org.deepin.dde.NetworkProxy1.App", QDBusConnection::systemBus()); QDBusReply reply = interface.call("GetProxy"); if (reply.isValid()) ret = reply.value(); @@ -49,8 +49,8 @@ QString StartManagerDBusHandler::getProxyMsg() void StartManagerDBusHandler::addProxyProc(int32_t pid) { - QDBusInterface interface = QDBusInterface("com.deepin.system.proxy", "/com/deepin/system/proxy", "com.deepin.system.proxy.App"); - interface.call("AddProc"); + QDBusInterface interface = QDBusInterface("org.deepin.dde.NetworkProxy1", "/org/deepin/dde/NetworkProxy1", "org.deepin.dde.NetworkProxy1.App", QDBusConnection::systemBus()); + interface.call("AddProc", pid); } diff --git a/src/service/CMakeLists.txt b/src/service/CMakeLists.txt index 40179fd..9e81cc5 100644 --- a/src/service/CMakeLists.txt +++ b/src/service/CMakeLists.txt @@ -12,22 +12,22 @@ pkg_check_modules(GLib REQUIRED IMPORTED_TARGET glib-2.0) pkg_check_modules(QGSettings REQUIRED IMPORTED_TARGET gsettings-qt) qt5_add_dbus_adaptor(ADAPTER_SOURCES - ../../dbus/org.desktopspec.ApplicationManager.xml + ../../dbus/org.deepin.dde.Application1.Manager.xml impl/application_manager.h ApplicationManager) qt5_add_dbus_adaptor(ADAPTER_SOURCES - ../../dbus/org.desktopspec.Application.xml + ../../dbus/org.deepin.dde.Application1.xml impl/application.h Application) qt5_add_dbus_adaptor(ADAPTER_SOURCES - ../../dbus/org.desktopspec.ApplicationInstance.xml + ../../dbus/org.deepin.dde.Application1.Instance.xml impl/application_instance.h ApplicationInstance) qt5_add_dbus_adaptor(ADAPTER_SOURCES - ../../dbus/org.deepin.daemon.Mime.xml + ../../dbus/org.deepin.dde.Mime1.xml ../modules/mimeapp/mime_app.h MimeApp) diff --git a/src/service/impl/application.cpp b/src/service/impl/application.cpp index d90f749..c7b2c0d 100644 --- a/src/service/impl/application.cpp +++ b/src/service/impl/application.cpp @@ -124,7 +124,7 @@ QString Application::Name(const QString &locale) QDBusObjectPath Application::path() const { - return QDBusObjectPath(QString("/org/desktopspec/Application/%1").arg(QString(QCryptographicHash::hash(id().toUtf8(), QCryptographicHash::Md5).toHex()))); + return QDBusObjectPath(QString("/org/deepin/dde/Application1/%1").arg(QString(QCryptographicHash::hash(id().toUtf8(), QCryptographicHash::Md5).toHex()))); } Application::Type Application::type() const diff --git a/src/service/impl/application_instance.cpp b/src/service/impl/application_instance.cpp index dab1267..45839b0 100644 --- a/src/service/impl/application_instance.cpp +++ b/src/service/impl/application_instance.cpp @@ -1,7 +1,7 @@ #include "application_instance.h" #include "../applicationhelper.h" #include "application.h" -#include "applicationinstanceadaptor.h" +#include "instanceadaptor.h" #include #include @@ -21,7 +21,7 @@ class ApplicationInstancePrivate Q_DECLARE_PUBLIC(ApplicationInstance); Application* application; - ApplicationInstanceAdaptor* adapter; + InstanceAdaptor* adapter; QString m_path; QSharedPointer helper; QDateTime startupTime; @@ -33,8 +33,8 @@ public: { startupTime = QDateTime::currentDateTime(); m_id = QString(QCryptographicHash::hash(QUuid::createUuid().toByteArray(), QCryptographicHash::Md5).toHex()); - m_path = QString("/org/desktopspec/ApplicationInstance/%1").arg(m_id); - adapter = new ApplicationInstanceAdaptor(q_ptr); + m_path = QString("/org/deepin/dde/Application1/Instance/%1").arg(m_id); + adapter = new InstanceAdaptor(q_ptr); } ~ApplicationInstancePrivate() @@ -70,9 +70,9 @@ public: Q_EMIT q_ptr->taskFinished(p->exitCode()); } #else - qInfo() << "app manager load service:" << QString("org.desktopspec.application.instance@%1.service").arg(m_id); + qInfo() << "app manager load service:" << QString("org.deepin.dde.Application1.Instance@%1.service").arg(m_id); QDBusInterface systemd("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager"); - QDBusReply reply = systemd.call("StartUnit", QString("org.desktopspec.application.instance@%1.service").arg(m_id), "replace-irreversibly"); + QDBusReply reply = systemd.call("StartUnit", QString("org.deepin.dde.Application1.Instance@%1.service").arg(m_id), "replace-irreversibly"); if (!reply.isValid()) { qInfo() << reply.error(); q_ptr->deleteLater(); @@ -85,7 +85,7 @@ public: #ifdef LOADER_PATH #else QDBusInterface systemd("org.freedesktop.systemd1", "/org/freedesktop/systemd1", "org.freedesktop.systemd1.Manager"); - qInfo() << systemd.call("StopUnit", QString("org.desktopspec.application.instance@%1.service").arg(m_id), "replace-irreversibly"); + qInfo() << systemd.call("StopUnit", QString("org.deepin.dde.Application1.Instance@%1.service").arg(m_id), "replace-irreversibly"); #endif } @@ -112,7 +112,7 @@ ApplicationInstance::ApplicationInstance(Application* parent, QSharedPointerhelper = helper; QTimer::singleShot(0, this, [ = ] { - QDBusConnection::sessionBus().registerObject(d->m_path, "org.desktopspec.ApplicationInstance", this); + QDBusConnection::sessionBus().registerObject(d->m_path, "org.deepin.dde.Application1.Instance", this); d->run(); }); } @@ -196,6 +196,6 @@ uint32_t ApplicationInstance::getPid() void ApplicationInstance::Success(const QString& data) { Q_D(ApplicationInstance); - QDBusConnection::sessionBus().registerObject(d->m_path, "org.desktopspec.ApplicationInstance", this); + QDBusConnection::sessionBus().registerObject(d->m_path, "org.deepin.dde.Application1.Instance", this); return d->_success(data); } diff --git a/src/service/impl/application_manager.cpp b/src/service/impl/application_manager.cpp index f82b979..2c2166b 100644 --- a/src/service/impl/application_manager.cpp +++ b/src/service/impl/application_manager.cpp @@ -21,7 +21,7 @@ #include "../../modules/startmanager/startmanager.h" #include "application.h" #include "application_instance.h" -#include "applicationinstanceadaptor.h" +#include "instanceadaptor.h" #include "../lib/keyfile.h" ApplicationManagerPrivate::ApplicationManagerPrivate(ApplicationManager* parent) diff --git a/src/service/main.cpp b/src/service/main.cpp index 8b4f6d9..1937f72 100644 --- a/src/service/main.cpp +++ b/src/service/main.cpp @@ -2,10 +2,10 @@ #include "impl/application_manager.h" #include "impl/application.h" -#include "applicationmanageradaptor.h" -#include "applicationadaptor.h" +#include "manageradaptor.h" +#include "application1adaptor.h" #include "applicationhelper.h" -#include "mimeadaptor.h" +#include "mime1adaptor.h" #include "../modules/apps/appmanager.h" #include "../modules/launcher/launchermanager.h" #include "../modules/dock/dockmanager.h" @@ -18,9 +18,9 @@ DCORE_USE_NAMESPACE -#define ApplicationManagerServiceName "org.desktopspec.ApplicationManager" -#define ApplicationManagerServicePath "/org/desktopspec/ApplicationManager" -#define ApplicationManagerInterface "org.desktopspec.ApplicationManager" +#define ApplicationManagerServiceName "org.deepin.dde.Application1.Manager" +#define ApplicationManagerServicePath "/org/deepin/dde/Application1/Manager" +#define ApplicationManagerInterface "org.deepin.dde.Application1.Manager" QFileInfoList scan(const QString &path) { @@ -85,10 +85,10 @@ int main(int argc, char *argv[]) new AppManager(ApplicationManager::instance()); new LauncherManager(ApplicationManager::instance()); new DockManager(ApplicationManager::instance()); - new ApplicationManagerAdaptor(ApplicationManager::instance()); + new ManagerAdaptor(ApplicationManager::instance()); QDBusConnection connection = QDBusConnection::sessionBus(); - if (!connection.registerService("org.desktopspec.Application")) { + if (!connection.registerService("org.deepin.dde.Application1")) { qWarning() << "error: " << connection.lastError().message(); return -1; } @@ -104,11 +104,11 @@ int main(int argc, char *argv[]) } QList> apps{ scanFiles() }; - QList> appAdapters; + QList> appAdapters; for (const QSharedPointer app : apps) { - QSharedPointer adapter = QSharedPointer(new ApplicationAdaptor(app.get())); + QSharedPointer adapter = QSharedPointer(new Application1Adaptor(app.get())); appAdapters << adapter; - if (!connection.registerObject(app->path().path(), "org.desktopspec.Application", app.get())) { + if (!connection.registerObject(app->path().path(), "org.deepin.dde.Application1", app.get())) { qWarning() << "error: " << connection.lastError().message(); continue; } @@ -120,13 +120,13 @@ int main(int argc, char *argv[]) MimeApp* mimeApp = new MimeApp; - new MimeAdaptor(mimeApp); - if (!connection.registerService("org.deepin.daemon.Mime1")) { + new Mime1Adaptor(mimeApp); + if (!connection.registerService("org.deepin.dde.Mime1")) { qWarning() << "error: " << connection.lastError().message(); return -1; } - if (!connection.registerObject("/org/deepin/daemon/Mime1", "org.deepin.daemon.Mime1", mimeApp)) { + if (!connection.registerObject("/org/deepin/dde/Mime1", "org.deepin.dde.Mime1", mimeApp)) { qWarning() << "error: " << connection.lastError().message(); return -1; } diff --git a/src/utils/synconfig.cpp b/src/utils/synconfig.cpp index 4fef6cf..d3bf124 100644 --- a/src/utils/synconfig.cpp +++ b/src/utils/synconfig.cpp @@ -27,8 +27,8 @@ #include #include -const QString syncDBusService = "org.deepin.sync.Config1"; -const QString syncDBusObject = "/org/deepin/sync/Config1"; +const QString syncDBusService = "org.deepin.dde.Sync1.Config"; +const QString syncDBusObject = "/org/deepin/dde/Sync1/Config"; const QString syncDBusDaemonService = "com.deepin.sync.Daemon"; const QString syncDBusDaemonObject = "/com/deepin/sync/Daemon"; const QString syncDBusDaemonInterface = syncDBusDaemonService; @@ -82,13 +82,13 @@ SynConfig::SynConfig(QObject *parent) QDBusConnection con = QDBusConnection::sessionBus(); if (!con.registerService(syncDBusService)) { - qCritical() << "register service org.deepin.sync.Config1 error:" << con.lastError().message(); + qCritical() << "register service org.deepin.dde.Sync1.Config error:" << con.lastError().message(); return; } if (!con.registerObject(syncDBusObject, this, QDBusConnection::ExportAllSlots | QDBusConnection::ExportAllSignals)) { - qCritical() << "register object /org/deepin/sync/Config1 error:" << con.lastError().message(); + qCritical() << "register object /org/deepin/dde/Sync1/Config error:" << con.lastError().message(); return; } diff --git a/src/utils/synconfig.h b/src/utils/synconfig.h index 2e4825e..d1b7326 100644 --- a/src/utils/synconfig.h +++ b/src/utils/synconfig.h @@ -30,7 +30,7 @@ class SynConfig final : public QObject { Q_OBJECT - Q_CLASSINFO("D-Bus Interface", "org.deepin.sync.Config1") + Q_CLASSINFO("D-Bus Interface", "org.deepin.dde.Sync1.Config") public: // 实例 static SynConfig *instance(QObject *parent = nullptr);