From e9d7262891448a3321f29c72f4b7e7bac19b0e64 Mon Sep 17 00:00:00 2001 From: Loïc Collignon Date: Sat, 17 Feb 2018 10:24:05 +0100 Subject: fix use of deprecated functions MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6c23e282f6ef7b689acf5040099de9c0c782d39c Signed-off-by: Loïc Collignon --- homescreen/src/main.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/homescreen/src/main.cpp b/homescreen/src/main.cpp index 522f957..a7f435a 100644 --- a/homescreen/src/main.cpp +++ b/homescreen/src/main.cpp @@ -111,13 +111,19 @@ int main(int argc, char *argv[]) }); layoutHandler->set_event_handler(QLibWindowmanager::Event_Visible, [layoutHandler, launcher](json_object *object) { - QString label = QString(json_object_get_string( json_object_object_get(object, "drawing_name") )); + json_object* value = nullptr; + json_object_object_get_ex(object, "drawing_name", &value); + + QString label = QString(json_object_get_string( value )); qDebug() << label; QMetaObject::invokeMethod(launcher, "setCurrent", Qt::QueuedConnection, Q_ARG(QString, label == "HomeScreen" ? "Home" : label)); }); layoutHandler->set_event_handler(QLibWindowmanager::Event_Invisible, [layoutHandler, launcher](json_object *object) { - const char* label = json_object_get_string( json_object_object_get(object, "drawing_name") ); + json_object* value = nullptr; + json_object_object_get_ex(object, "drawing_name", &value); + + const char* label = json_object_get_string( value ); HMI_DEBUG("HomeScreen", "surface %s Event_Invisible", label); }); -- cgit 1.2.3-korg