aboutsummaryrefslogtreecommitdiffstats
path: root/launcher/src/applicationmodel.cpp
diff options
context:
space:
mode:
authorScott Murray <scott.murray@konsulko.com>2022-09-10 12:42:21 -0400
committerScott Murray <scott.murray@konsulko.com>2022-09-10 12:56:20 -0400
commit5e828161fc1571323e2812a344f6714ae9331b2c (patch)
tree3a79d3656e4074aff77e51c41d9c23e7a64f0d3e /launcher/src/applicationmodel.cpp
parentfd578508fe8f59a0bf11916ea99561125dcfc4ba (diff)
Rework to use launcher wrapper from libqtappfw
Switch to using the new app launcher API wrapper from libqtappfw in order to migrate to the new gRPC based API implementation. As well, the copyright headers in the source files have been tweaked to remove the Apache license boilerplate in favour of a SPDX license tag. Bug-AGL: SPEC-4559 Signed-off-by: Scott Murray <scott.murray@konsulko.com> Change-Id: I62cd0a51e9c97b1db3d86ca67b7c92d086d2f1c9
Diffstat (limited to 'launcher/src/applicationmodel.cpp')
-rw-r--r--launcher/src/applicationmodel.cpp27
1 files changed, 6 insertions, 21 deletions
diff --git a/launcher/src/applicationmodel.cpp b/launcher/src/applicationmodel.cpp
index 1af4366..d54d171 100644
--- a/launcher/src/applicationmodel.cpp
+++ b/launcher/src/applicationmodel.cpp
@@ -1,19 +1,9 @@
+// SPDX-License-Identifier: Apache-2.0
/*
* Copyright (C) 2016 The Qt Company Ltd.
* Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH
* Copyright (c) 2018,2019 TOYOTA MOTOR CORPORATION
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
+ * Copyright (C) 2022 Konsulko Group
*/
#include "applicationmodel.h"
@@ -197,18 +187,13 @@ void ApplicationModel::updateApplist(QStringList info)
endResetModel();
}
-void ApplicationModel::initAppList(QString data)
+void ApplicationModel::initAppList(QList<QMap<QString, QString>> &apps)
{
HMI_DEBUG("launcher","init application list.");
beginResetModel();
- QJsonDocument japps = QJsonDocument::fromJson(data.toUtf8());
- for (auto const &app : japps.array()) {
- QJsonObject const &jso = app.toObject();
- auto const name = jso["name"].toString();
- auto const id = jso["id"].toString();
- auto const icon = get_icon_name(jso);
-
- d->addApp(icon, name, id);
+ qDebug() << "ApplicationModel::initAppList: got " << apps.size() << " apps";
+ for (int i = 0; i < apps.size(); i++) {
+ d->addApp(apps[i]["icon_path"], apps[i]["name"], apps[i]["id"]);
}
endResetModel();
}