X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;f=HomeScreenAppFrameworkBinderAGL%2Fsrc%2Fhomescreenappframeworkbinderagl.cpp;h=4b0015c62ec0831ecc8dde30952c0b22a86dd07c;hb=4ccab203994f2472641c429bb4b86535c5128884;hp=91df6f7530018a5900f8b7d2a70b69544b1c119d;hpb=f9e65355cede6829b94b3c0e0e435ed775630913;p=staging%2FHomeScreen.git diff --git a/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp b/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp index 91df6f7..4b0015c 100644 --- a/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp +++ b/HomeScreenAppFrameworkBinderAGL/src/homescreenappframeworkbinderagl.cpp @@ -39,7 +39,7 @@ HomeScreenAppFrameworkBinderAgl::HomeScreenAppFrameworkBinderAgl(QObject *parent QDBusConnection::sessionBus(), 0); -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API QString runnables = mp_dBusAfmUserProxy->runnables("{\"dummy\": \"entry\"}"); qDebug("runnables: %s", runnables.toStdString().c_str()); @@ -51,12 +51,11 @@ HomeScreenAppFrameworkBinderAgl::HomeScreenAppFrameworkBinderAgl(QObject *parent QJsonObject appObject = appsArray[i].toObject(); AppInfo appInfo; appInfo.read(appObject); - qDebug("name %s", appInfo.name.toStdString().c_str()); + qDebug("name %s", appInfo.name().toStdString().c_str()); m_apps.append(appInfo); } -#endif -#ifdef __i386__ +#else // for the simulation /*AppInfo ai; ai.setName("org.test.app1"); @@ -82,7 +81,7 @@ QList HomeScreenAppFrameworkBinderAgl::getAvailableApps() int HomeScreenAppFrameworkBinderAgl::launchApp(const QString &name) { int pid = -1; -#ifdef __arm__ +#ifdef HAVE_IVI_LAYERMANAGEMENT_API qDebug("launchApp name: %s", name.toStdString().c_str()); QString jsonLaunch = "{\"id\":\"" + name + "\", \"mode\":\"local\"}"; qDebug("jsonLaunch %s", jsonLaunch.toStdString().c_str()); @@ -110,8 +109,7 @@ int HomeScreenAppFrameworkBinderAgl::launchApp(const QString &name) } qDebug("launchApp pid: %d", pid); -#endif -#ifdef __i386__ +#else qDebug("launchApp name: %s", name.toStdString().c_str()); pid = qrand(); #endif