X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=homescreen%2Fsrc%2Fmain.cpp;fp=homescreen%2Fsrc%2Fmain.cpp;h=b92ff607da2ad2b5836800c11c4deb8b5eed6864;hb=133ac94184bbd28b53544b34e3391f8d6bffdeca;hp=5c819f9f3b2e78c59a1ba21e9886eec1fcd13b62;hpb=7dcc687d179c645f4ccf7fffdb507e18b8d562c4;p=apps%2Fhomescreen.git diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 5c819f9..b92ff60 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -28,42 +29,15 @@ #include #include "applicationlauncher.h" #include "statusbarmodel.h" -#include "afm_user_daemon_proxy.h" #include "mastervolume.h" #include "homescreenhandler.h" #include "hmi-debug.h" #include "chromecontroller.h" -// XXX: We want this DBus connection to be shared across the different -// QML objects, is there another way to do this, a nice way, perhaps? -org::AGL::afm::user *afm_user_daemon_proxy; - -namespace { - -struct Cleanup { - static inline void cleanup(org::AGL::afm::user *p) { - delete p; - afm_user_daemon_proxy = Q_NULLPTR; - } -}; - -void noOutput(QtMsgType, const QMessageLogContext &, const QString &) -{ -} - -} - int main(int argc, char *argv[]) { QGuiApplication a(argc, argv); - // use launch process - QScopedPointer afm_user_daemon_proxy(new org::AGL::afm::user("org.AGL.afm.user", - "/org/AGL/afm/user", - QDBusConnection::sessionBus(), - 0)); - ::afm_user_daemon_proxy = afm_user_daemon_proxy.data(); - QCoreApplication::setOrganizationDomain("LinuxFoundation"); QCoreApplication::setOrganizationName("AutomotiveGradeLinux"); QCoreApplication::setApplicationName("HomeScreen");