From: Marcus Fritzsch Date: Wed, 10 May 2017 12:09:59 +0000 (+0200) Subject: ApplicationLauncher: use single afm_user_daemon X-Git-Tag: 3.99.1~3^2 X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=0d3a0050cd3d35dbda51931134bd81460a1d12b2;hp=620ed99557cf2842426a17f4bfc48c4639efbf4b;p=apps%2Fhomescreen.git ApplicationLauncher: use single afm_user_daemon Also simplify the implementation. Change-Id: I3eec730825c358517ea2a6573b9070ec05009c4c Signed-off-by: Marcus Fritzsch --- diff --git a/homescreen/src/applicationlauncher.cpp b/homescreen/src/applicationlauncher.cpp index 7b825bb..559a93c 100644 --- a/homescreen/src/applicationlauncher.cpp +++ b/homescreen/src/applicationlauncher.cpp @@ -17,22 +17,15 @@ #include "applicationlauncher.h" +#include "afm_user_daemon_proxy.h" + #include -ApplicationLauncher::ApplicationLauncher(QObject *parent) - : QObject(parent), - mp_dBusAppFrameworkProxy() -{ - qDebug("D-Bus: connect to org.agl.homescreenappframeworkbinder /AppFramework"); - mp_dBusAppFrameworkProxy = new org::agl::appframework("org.agl.homescreenappframeworkbinder", - "/AppFramework", - QDBusConnection::sessionBus(), - 0); -} +extern org::AGL::afm::user *afm_user_daemon_proxy; -ApplicationLauncher::~ApplicationLauncher() +ApplicationLauncher::ApplicationLauncher(QObject *parent) + : QObject(parent) { - delete mp_dBusAppFrameworkProxy; } int ApplicationLauncher::launch(const QString &application) @@ -40,12 +33,13 @@ int ApplicationLauncher::launch(const QString &application) int result = -1; qDebug() << "launch" << application; - result = mp_dBusAppFrameworkProxy->launchApp(application); + result = afm_user_daemon_proxy->start(application).value().toInt(); qDebug() << "pid:" << result; if (result > 1) { setCurrent(application); } + return result; } diff --git a/homescreen/src/applicationlauncher.h b/homescreen/src/applicationlauncher.h index f4066e5..a31e663 100644 --- a/homescreen/src/applicationlauncher.h +++ b/homescreen/src/applicationlauncher.h @@ -19,8 +19,6 @@ #define APPLICATIONLAUNCHER_H #include -#include -#include class ApplicationLauncher : public QObject { @@ -28,7 +26,6 @@ class ApplicationLauncher : public QObject Q_PROPERTY(QString current READ current WRITE setCurrent NOTIFY currentChanged) public: explicit ApplicationLauncher(QObject *parent = NULL); - ~ApplicationLauncher(); QString current() const; @@ -41,7 +38,6 @@ public slots: void setCurrent(const QString ¤t); private: - org::agl::appframework *mp_dBusAppFrameworkProxy; QString m_current; };