blumia/dde-application-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: V23接口改造适配

Browse Source 
V23接口改造适配

Log: V23接口改造适配
Influence: 无
Task: https://pms.uniontech.com/task-view-207483.html
Change-Id: I91e7c2807c168e87781e18aedc7aec887702ae13
This commit is contained in:
tanfeng
2022-11-17 17:25:20 +08:00
committed by fanpengcheng
parent d1fe32c13e
commit e4f4a47b87
42 changed files with 147 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/frameworkdbus/dbuskwaylandoutput.h
View File

@ -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;
}
}

2
src/frameworkdbus/dbuskwaylandwindowmanager.cpp
View File

@ -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.
*

12
src/frameworkdbus/dbuskwaylandwindowmanager.h
View File

@ -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;
}
}

2
src/frameworkdbus/dbuslauncher.cpp
View File

@ -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.
*

8
src/frameworkdbus/dbuslauncher.h
View File

@ -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 <QtCore/QObject>
#include <QtCore/QByteArray>
@ -223,7 +223,7 @@ private:
__LauncherdPrivate *d_ptr;
};
namespace com {
namespace org {
namespace deepin {
namespace dde {
namespace daemon {

2
src/frameworkdbus/dbuslauncherfront.cpp
View File

@ -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
src/frameworkdbus/dbuslauncherfront.h
View File

@ -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 <QtCore/QObject>
#include <QtCore/QByteArray>
@ -159,7 +159,7 @@ private:
__LauncherPrivate *d_ptr;
};
namespace com {
namespace org {
namespace deepin {
namespace dde {
typedef ::LauncherFront LauncherFront;

10
src/frameworkdbus/dbusplasmawindow.cpp
View File

@ -27,7 +27,7 @@ public:
QMap<QString, QList<QVariant>> 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<QVariant> &args)
void __PlasmaWindow::CallQueued(const QString &callName, const QList<QVariant> &args)
{
if (d_ptr->m_waittingCalls.contains(callName))
{
@ -53,12 +53,12 @@ void PlasmaWindow::CallQueued(const QString &callName, const QList<QVariant> &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);

18
src/frameworkdbus/dbusplasmawindow.h
View File

@ -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<QString> 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;
}
}
}

2
src/frameworkdbus/dbuswmswitcher.cpp
View File

@ -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.
*

16
src/frameworkdbus/dbuswmswitcher.h
View File

@ -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 <QtCore/QObject>
#include <QtCore/QByteArray>
@ -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

18
src/frameworkdbus/dbusxeventmonitor.cpp
View File

@ -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<QString, QList<QVariant>> 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<QVariant> &args)
void __org_deepin_dde_XEventMonitor::CallQueued(const QString &callName, const QList<QVariant> &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);

18
src/frameworkdbus/dbusxeventmonitor.h
View File

@ -25,21 +25,21 @@
#include <QtDBus/QtDBus>
/*
* 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<QString> 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;
}
}
}