arcanis/queued
1
0
Fork 0
mirror of https://github.com/arcan1s/queued.git synced 2025-07-15 14:55:46 +00:00
Code Issues Projects Releases Wiki Activity

massive api changes: replace public method results to Result<T, E>

Browse Source
This commit is contained in:
Evgenii Alekseev
2017-10-27 02:35:04 +03:00
parent de0653f038
commit bdb1dd0101
66 changed files with 1807 additions and 891 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sources/queued-daemon/src/QueuedApplicationInterface.cpp
View File

@ -17,6 +17,7 @@
#include "QueuedApplicationInterface.h"
#include <QCoreApplication>
#include <QDBusMetaType>
#include <queued/Queued.h>
@ -33,6 +34,9 @@ QueuedApplicationInterface::QueuedApplicationInterface(
, m_application(parent)
{
qCDebug(LOG_DBUS) << __PRETTY_FUNCTION__;
qRegisterMetaType<QueuedResult<QStringList>>("QueuedResult<QStringList>");
qDBusRegisterMetaType<QueuedResult<QStringList>>();
}
@ -42,17 +46,17 @@ QueuedApplicationInterface::~QueuedApplicationInterface()
}
bool QueuedApplicationInterface::Active() const
QDBusVariant QueuedApplicationInterface::Active() const
{
return true;
return QueuedCoreAdaptor::toDBusVariant(QueuedResult<bool>(true));
}
QStringList QueuedApplicationInterface::UIDs() const
QDBusVariant QueuedApplicationInterface::UIDs() const
{
QStringList uids;
uids.append(QString::number(::getuid()));
uids.append(QString::number(::geteuid()));
return uids;
return QueuedCoreAdaptor::toDBusVariant(QueuedResult<QStringList>(uids));
}

5
sources/queued-daemon/src/QueuedApplicationInterface.h
View File

@ -18,6 +18,7 @@
#define QUEUEDAPPLICATIONINTERFACE_H
#include <QDBusAbstractAdaptor>
#include <QDBusVariant>
#include "QueuedConfig.h"
@ -34,8 +35,8 @@ public:
virtual ~QueuedApplicationInterface();
public slots:
bool Active() const;
QStringList UIDs() const;
QDBusVariant Active() const;
QDBusVariant UIDs() const;
private:
QueuedApplication *m_application = nullptr;

5
sources/queued-daemon/src/main.cpp
View File

@ -35,12 +35,11 @@ QueuedApplication *instance = nullptr;
bool existingSessionOperation(const QString &operation)
{
QVariantList arguments = QueuedCoreAdaptor::sendRequest(
auto res = QueuedCoreAdaptor::sendRequest<bool>(
QueuedConfig::DBUS_SERVICE, QueuedConfig::DBUS_APPLICATION_PATH,
QueuedConfig::DBUS_SERVICE, operation, QVariantList());
return (!arguments.isEmpty() && arguments.at(0).type() == QVariant::Bool
&& arguments[0].toBool());
return ((res.type() == Result::Content::Value) && res.get());
}