style: format code
This commit is contained in:
@ -9,14 +9,20 @@ ApplicationManager1Service::~ApplicationManager1Service() = default;
|
||||
|
||||
ApplicationManager1Service::ApplicationManager1Service() = default;
|
||||
|
||||
QList<QDBusObjectPath> ApplicationManager1Service::list() const { return m_applicationList.keys(); }
|
||||
QList<QDBusObjectPath> ApplicationManager1Service::list() const
|
||||
{
|
||||
return m_applicationList.keys();
|
||||
}
|
||||
|
||||
bool ApplicationManager1Service::removeOneApplication(const QDBusObjectPath &application)
|
||||
{
|
||||
return m_applicationList.remove(application) != 0;
|
||||
}
|
||||
|
||||
void ApplicationManager1Service::removeAllApplication() { m_applicationList.clear(); }
|
||||
void ApplicationManager1Service::removeAllApplication()
|
||||
{
|
||||
m_applicationList.clear();
|
||||
}
|
||||
|
||||
QDBusObjectPath ApplicationManager1Service::Application(const QString &id)
|
||||
{
|
||||
|
@ -21,13 +21,11 @@ public:
|
||||
ApplicationManager1Service(const ApplicationManager1Service &) = delete;
|
||||
ApplicationManager1Service(ApplicationManager1Service &&) = delete;
|
||||
ApplicationManager1Service &operator=(const ApplicationManager1Service &) = delete;
|
||||
ApplicationManager1Service &operator=(ApplicationManager1Service&&) = delete;
|
||||
ApplicationManager1Service &operator=(ApplicationManager1Service &&) = delete;
|
||||
|
||||
Q_PROPERTY(QList<QDBusObjectPath> List READ list)
|
||||
QList<QDBusObjectPath> list() const;
|
||||
void addApplication(const QString &ID,
|
||||
const QStringList &actions,
|
||||
bool AutoStart = false);
|
||||
void addApplication(const QString &ID, const QStringList &actions, bool AutoStart = false);
|
||||
bool removeOneApplication(const QDBusObjectPath &application);
|
||||
void removeAllApplication();
|
||||
|
||||
@ -37,7 +35,7 @@ public Q_SLOTS:
|
||||
QDBusObjectPath Launch(const QString &id, const QString &action, const QStringList &fields, const QVariantMap &options);
|
||||
|
||||
private:
|
||||
QMap<QDBusObjectPath,QSharedPointer<ApplicationService>> m_applicationList;
|
||||
QMap<QDBusObjectPath, QSharedPointer<ApplicationService>> m_applicationList;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
@ -35,22 +35,52 @@ QDBusObjectPath ApplicationService::Launch(const QString &action, const QStringL
|
||||
return {};
|
||||
}
|
||||
|
||||
QStringList ApplicationService::actions() const noexcept { return m_actions; }
|
||||
QStringList ApplicationService::actions() const noexcept
|
||||
{
|
||||
return m_actions;
|
||||
}
|
||||
|
||||
QStringList& ApplicationService::actionsRef() noexcept { return m_actions; }
|
||||
QStringList &ApplicationService::actionsRef() noexcept
|
||||
{
|
||||
return m_actions;
|
||||
}
|
||||
|
||||
QString ApplicationService::iD() const noexcept { return m_ID; }
|
||||
QString ApplicationService::iD() const noexcept
|
||||
{
|
||||
return m_ID;
|
||||
}
|
||||
|
||||
IconMap ApplicationService::icons() const { return m_Icons; }
|
||||
IconMap ApplicationService::icons() const
|
||||
{
|
||||
return m_Icons;
|
||||
}
|
||||
|
||||
IconMap& ApplicationService::iconsRef() { return m_Icons; }
|
||||
IconMap &ApplicationService::iconsRef()
|
||||
{
|
||||
return m_Icons;
|
||||
}
|
||||
|
||||
bool ApplicationService::isAutoStart() const noexcept { return m_AutoStart; }
|
||||
bool ApplicationService::isAutoStart() const noexcept
|
||||
{
|
||||
return m_AutoStart;
|
||||
}
|
||||
|
||||
void ApplicationService::setAutoStart(bool autostart) noexcept { m_AutoStart = autostart; }
|
||||
void ApplicationService::setAutoStart(bool autostart) noexcept
|
||||
{
|
||||
m_AutoStart = autostart;
|
||||
}
|
||||
|
||||
QList<QDBusObjectPath> ApplicationService::instances() const noexcept { return m_Instances.keys(); }
|
||||
QList<QDBusObjectPath> ApplicationService::instances() const noexcept
|
||||
{
|
||||
return m_Instances.keys();
|
||||
}
|
||||
|
||||
bool ApplicationService::removeOneInstance(const QDBusObjectPath &instance) { return m_Instances.remove(instance) != 0; }
|
||||
bool ApplicationService::removeOneInstance(const QDBusObjectPath &instance)
|
||||
{
|
||||
return m_Instances.remove(instance) != 0;
|
||||
}
|
||||
|
||||
void ApplicationService::removeAllInstance() { m_Instances.clear();}
|
||||
void ApplicationService::removeAllInstance()
|
||||
{
|
||||
m_Instances.clear();
|
||||
}
|
||||
|
@ -19,21 +19,21 @@ class ApplicationService : public QObject
|
||||
Q_OBJECT
|
||||
public:
|
||||
~ApplicationService() override;
|
||||
ApplicationService(const ApplicationService&) = delete;
|
||||
ApplicationService(const ApplicationService &) = delete;
|
||||
ApplicationService(ApplicationService &&) = delete;
|
||||
ApplicationService& operator=(const ApplicationService&) = delete;
|
||||
ApplicationService &operator=(const ApplicationService &) = delete;
|
||||
ApplicationService &operator=(ApplicationService &&) = delete;
|
||||
|
||||
Q_PROPERTY(QStringList Actions READ actions CONSTANT)
|
||||
QStringList actions() const noexcept;
|
||||
QStringList& actionsRef() noexcept;
|
||||
QStringList &actionsRef() noexcept;
|
||||
|
||||
Q_PROPERTY(QString ID READ iD CONSTANT)
|
||||
QString iD() const noexcept;
|
||||
|
||||
Q_PROPERTY(IconMap Icons READ icons)
|
||||
IconMap icons() const;
|
||||
IconMap& iconsRef();
|
||||
IconMap &iconsRef();
|
||||
|
||||
Q_PROPERTY(bool AutoStart READ isAutoStart WRITE setAutoStart)
|
||||
bool isAutoStart() const noexcept;
|
||||
@ -57,7 +57,7 @@ private:
|
||||
QString m_ID;
|
||||
QDBusObjectPath m_applicationPath;
|
||||
QStringList m_actions;
|
||||
QMap<QDBusObjectPath,QSharedPointer<InstanceService>> m_Instances;
|
||||
QMap<QDBusObjectPath, QSharedPointer<InstanceService>> m_Instances;
|
||||
IconMap m_Icons;
|
||||
};
|
||||
|
||||
|
@ -5,12 +5,19 @@
|
||||
#include "instanceservice.h"
|
||||
|
||||
InstanceService::InstanceService(QString application, QString systemdUnitPath)
|
||||
: m_Application(std::move(application)), m_SystemdUnitPath(std::move(systemdUnitPath))
|
||||
: m_Application(std::move(application))
|
||||
, m_SystemdUnitPath(std::move(systemdUnitPath))
|
||||
{
|
||||
}
|
||||
|
||||
InstanceService::~InstanceService() = default;
|
||||
|
||||
QDBusObjectPath InstanceService::application() const { return m_Application; }
|
||||
QDBusObjectPath InstanceService::application() const
|
||||
{
|
||||
return m_Application;
|
||||
}
|
||||
|
||||
QDBusObjectPath InstanceService::systemdUnitPath() const { return m_SystemdUnitPath; }
|
||||
QDBusObjectPath InstanceService::systemdUnitPath() const
|
||||
{
|
||||
return m_SystemdUnitPath;
|
||||
}
|
||||
|
@ -16,7 +16,7 @@ public:
|
||||
InstanceService(const InstanceService &) = delete;
|
||||
InstanceService(InstanceService &&) = delete;
|
||||
InstanceService &operator=(const InstanceService &) = delete;
|
||||
InstanceService &operator=(InstanceService&&) = delete;
|
||||
InstanceService &operator=(InstanceService &&) = delete;
|
||||
|
||||
Q_PROPERTY(QDBusObjectPath Application READ application CONSTANT)
|
||||
QDBusObjectPath application() const;
|
||||
|
@ -23,7 +23,7 @@ class JobManager1Service final : public QObject
|
||||
public:
|
||||
JobManager1Service();
|
||||
JobManager1Service(const JobManager1Service &) = delete;
|
||||
JobManager1Service(JobManager1Service&&) = delete;
|
||||
JobManager1Service(JobManager1Service &&) = delete;
|
||||
JobManager1Service &operator=(const JobManager1Service &) = delete;
|
||||
JobManager1Service &operator=(JobManager1Service &&) = delete;
|
||||
|
||||
@ -34,8 +34,12 @@ public:
|
||||
static_assert(std::is_invocable_v<F, QVariant>, "param type must be QVariant.");
|
||||
|
||||
QString objectPath{DDEApplicationManager1JobObjectPath + QUuid::createUuid().toString(QUuid::Id128)};
|
||||
auto future = QtConcurrent::mappedReduced(
|
||||
args.begin(), args.end(), func,qOverload<QVariantList::parameter_type>(&QVariantList::append), QVariantList{}, QtConcurrent::ReduceOption::OrderedReduce);
|
||||
auto future = QtConcurrent::mappedReduced(args.begin(),
|
||||
args.end(),
|
||||
func,
|
||||
qOverload<QVariantList::parameter_type>(&QVariantList::append),
|
||||
QVariantList{},
|
||||
QtConcurrent::ReduceOption::OrderedReduce);
|
||||
QSharedPointer<JobService> job{new JobService{future}};
|
||||
auto path = QDBusObjectPath{objectPath};
|
||||
{
|
||||
@ -44,7 +48,7 @@ public:
|
||||
}
|
||||
emit JobNew(path, source);
|
||||
registerObjectToDbus(new JobAdaptor(job.data()), objectPath, getDBusInterface<JobAdaptor>());
|
||||
auto emitRemove = [this, job, path, future] (QVariantList value) {
|
||||
auto emitRemove = [this, job, path, future](QVariantList value) {
|
||||
decltype(m_jobs)::size_type removeCount{0};
|
||||
{
|
||||
QMutexLocker locker{&m_mutex};
|
||||
|
@ -4,7 +4,7 @@
|
||||
|
||||
#include "jobservice.h"
|
||||
|
||||
JobService::JobService(const QFuture<QVariantList>& job)
|
||||
JobService::JobService(const QFuture<QVariantList> &job)
|
||||
: m_job(job)
|
||||
{
|
||||
}
|
||||
|
@ -29,7 +29,7 @@ public Q_SLOTS:
|
||||
|
||||
private:
|
||||
friend class JobManager1Service;
|
||||
explicit JobService(const QFuture<QVariantList>& job);
|
||||
explicit JobService(const QFuture<QVariantList> &job);
|
||||
QFuture<QVariantList> m_job;
|
||||
};
|
||||
|
||||
|
Reference in New Issue
Block a user