From 2c90972493b4e1b41b38fbcaaae70ea4fc371858 Mon Sep 17 00:00:00 2001 From: Marius Vlad Date: Wed, 22 Jan 2020 21:46:09 +0200 Subject: interfaces/: Remove any trace of interfaces As this is dead-code remove it. Signed-off-by: Marius Vlad Change-Id: I1edaa7e3d2bb60aefc93f0ef3e256775040ca9ad --- interfaces/README.md | 10 -- interfaces/afm_user_daemon.xml | 52 ---------- interfaces/appframework.xml | 57 ----------- interfaces/include/afm_user_daemon.hpp | 21 ----- interfaces/include/appframework.hpp | 66 ------------- interfaces/interfaces.pri | 18 ---- interfaces/interfaces.pro | 60 ------------ interfaces/src/appframework.cpp | 167 --------------------------------- launcher.pro | 4 +- launcher/launcher.pro | 1 - 10 files changed, 2 insertions(+), 454 deletions(-) delete mode 100644 interfaces/README.md delete mode 100644 interfaces/afm_user_daemon.xml delete mode 100644 interfaces/appframework.xml delete mode 100644 interfaces/include/afm_user_daemon.hpp delete mode 100644 interfaces/include/appframework.hpp delete mode 100644 interfaces/interfaces.pri delete mode 100644 interfaces/interfaces.pro delete mode 100644 interfaces/src/appframework.cpp diff --git a/interfaces/README.md b/interfaces/README.md deleted file mode 100644 index 4a80a6c..0000000 --- a/interfaces/README.md +++ /dev/null @@ -1,10 +0,0 @@ -AGL launcher reference implementation - - -Build with QtCreator 3.5.1 - -AGL repo for source code: -https://gerrit.automotivelinux.org/gerrit/#/admin/projects/apps/launcher - -AGL repo for bitbake recipe: -https://gerrit.automotivelinux.org/gerrit/apps/launcher diff --git a/interfaces/afm_user_daemon.xml b/interfaces/afm_user_daemon.xml deleted file mode 100644 index 17b7d63..0000000 --- a/interfaces/afm_user_daemon.xml +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/interfaces/appframework.xml b/interfaces/appframework.xml deleted file mode 100644 index ebc5088..0000000 --- a/interfaces/appframework.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/interfaces/include/afm_user_daemon.hpp b/interfaces/include/afm_user_daemon.hpp deleted file mode 100644 index b9a5321..0000000 --- a/interfaces/include/afm_user_daemon.hpp +++ /dev/null @@ -1,21 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH - * - * 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. - */ - -#ifndef AFM_USER_DAEMON_HPP -#define AFM_USER_DAEMON_HPP - - -#endif // AFM_USER_DAEMON_HPP diff --git a/interfaces/include/appframework.hpp b/interfaces/include/appframework.hpp deleted file mode 100644 index 98ec317..0000000 --- a/interfaces/include/appframework.hpp +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH - * - * 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. - */ - -#ifndef APPFRAMEWORK_HPP -#define APPFRAMEWORK_HPP - -#include -#include - -class AppInfo -{ - Q_GADGET - Q_PROPERTY(QString id READ id) - Q_PROPERTY(QString version READ version) - Q_PROPERTY(int width READ width) - Q_PROPERTY(int height READ height) - Q_PROPERTY(QString name READ name) - Q_PROPERTY(QString description READ description) - Q_PROPERTY(QString shortname READ shortname) - Q_PROPERTY(QString author READ author) - Q_PROPERTY(QString iconPath READ iconPath) -public: - AppInfo(); - AppInfo(const AppInfo &other); - virtual ~AppInfo(); - AppInfo &operator =(const AppInfo &other); - void swap(AppInfo &other) { qSwap(d, other.d); } - - QString id() const; - QString version() const; - int width() const; - int height() const; - QString name() const; - QString description() const; - QString shortname() const; - QString author() const; - QString iconPath() const; - - void read(const QJsonObject &json); - - friend QDBusArgument &operator <<(QDBusArgument &argument, const AppInfo &appInfo); - friend const QDBusArgument &operator >>(const QDBusArgument &argument, AppInfo &appInfo); - -private: - class Private; - QSharedDataPointer d; -}; - -Q_DECLARE_SHARED(AppInfo) -Q_DECLARE_METATYPE(AppInfo) -Q_DECLARE_METATYPE(QList) - -#endif // APPFRAMEWORK_HPP diff --git a/interfaces/interfaces.pri b/interfaces/interfaces.pri deleted file mode 100644 index 07b9e6a..0000000 --- a/interfaces/interfaces.pri +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (C) 2016 The Qt Company Ltd. -# Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH -# -# 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. - -INCLUDEPATH += $$PWD $$OUT_PWD/../interfaces/ - -LIBS += -L$$OUT_PWD/../interfaces/ -linterfaces diff --git a/interfaces/interfaces.pro b/interfaces/interfaces.pro deleted file mode 100644 index 281eeb8..0000000 --- a/interfaces/interfaces.pro +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH -# -# 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. - -TEMPLATE = lib -TARGET = interfaces -QT = dbus -CONFIG += staticlib - -HEADERS += \ - include/appframework.hpp - -SOURCES += \ - src/appframework.cpp - -XMLSOURCES = \ - afm_user_daemon.xml \ - appframework.xml - -gen_adaptor_cpp.input = XMLSOURCES -gen_adaptor_cpp.commands = \ - qdbusxml2cpp -i include/${QMAKE_FILE_IN_BASE}.hpp -m -a ${QMAKE_FILE_IN_BASE}_adaptor ${QMAKE_FILE_IN}; \ - moc $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adaptor.h -o $$OUT_PWD/${QMAKE_FILE_IN_BASE}_adaptor.moc -gen_adaptor_cpp.output = ${QMAKE_FILE_IN_BASE}_adaptor.cpp -gen_adaptor_cpp.variable_out = SOURCES -gen_adaptor_cpp.clean = ${QMAKE_FILE_IN_BASE}_adaptor.cpp - -gen_proxy_cpp.input = XMLSOURCES -gen_proxy_cpp.commands = \ - qdbusxml2cpp -i include/${QMAKE_FILE_IN_BASE}.hpp -m -p ${QMAKE_FILE_IN_BASE}_proxy ${QMAKE_FILE_IN}; \ - moc $$OUT_PWD/${QMAKE_FILE_IN_BASE}_proxy.h -o $$OUT_PWD/${QMAKE_FILE_IN_BASE}_proxy.moc -gen_proxy_cpp.output = ${QMAKE_FILE_IN_BASE}_proxy.cpp -gen_proxy_cpp.variable_out = SOURCES -gen_proxy_cpp.clean = ${QMAKE_FILE_IN_BASE}_proxy.cpp - -gen_adaptor_h.input = XMLSOURCES -gen_adaptor_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN} -gen_adaptor_h.depends = ${QMAKE_FILE_IN_BASE}_adaptor.cpp -gen_adaptor_h.output = ${QMAKE_FILE_IN_BASE}_adaptor.h -gen_adaptor_h.clean = ${QMAKE_FILE_IN_BASE}_adaptor.h - -gen_proxy_h.input = XMLSOURCES -gen_proxy_h.commands = @echo Fake making the header for ${QMAKE_FILE_IN} -gen_proxy_h.depends = ${QMAKE_FILE_IN_BASE}_proxy.cpp -gen_proxy_h.output = ${QMAKE_FILE_IN_BASE}_proxy.h -gen_proxy_h.clean = ${QMAKE_FILE_IN_BASE}_proxy.h - -QMAKE_EXTRA_COMPILERS += gen_adaptor_cpp gen_proxy_cpp gen_adaptor_h gen_proxy_h - -DISTFILES += diff --git a/interfaces/src/appframework.cpp b/interfaces/src/appframework.cpp deleted file mode 100644 index 7420642..0000000 --- a/interfaces/src/appframework.cpp +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Copyright (C) 2016, 2017 Mentor Graphics Development (Deutschland) GmbH - * - * 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. - */ - -#include "include/appframework.hpp" - -#include - -class AppInfo::Private : public QSharedData -{ -public: - Private(); - Private(const Private &other); - - QString id; - QString version; - int width; - int height; - QString name; - QString description; - QString shortname; - QString author; - QString iconPath; -}; - -AppInfo::Private::Private() - : width(-1) - , height(-1) -{ -} - -AppInfo::Private::Private(const Private &other) - : QSharedData(other) - , id(other.id) - , version(other.version) - , width(other.width) - , height(other.height) - , name(other.name) - , description(other.description) - , shortname(other.shortname) - , author(other.author) - , iconPath(other.iconPath) -{ -} - -AppInfo::AppInfo() - : d(new Private) -{ -} - -AppInfo::AppInfo(const AppInfo &other) - : d(other.d) -{ -} - -AppInfo::~AppInfo() -{ -} - -AppInfo &AppInfo::operator =(const AppInfo &other) -{ - d = other.d; - return *this; -} - -QString AppInfo::id() const -{ - return d->id; -} - -QString AppInfo::version() const -{ - return d->version; -} - -int AppInfo::width() const -{ - return d->width; -} - -int AppInfo::height() const -{ - return d->height; -} - -QString AppInfo::name() const -{ - return d->name; -} - -QString AppInfo::description() const -{ - return d->description; -} - -QString AppInfo::shortname() const -{ - return d->shortname; -} - -QString AppInfo::author() const -{ - return d->author; -} - -QString AppInfo::iconPath() const -{ - return d->iconPath; -} - -void AppInfo::read(const QJsonObject &json) -{ - d->id = json["id"].toString(); - d->version = json["version"].toString(); - d->width = json["width"].toInt(); - d->height = json["height"].toInt(); - d->name = json["name"].toString(); - d->description = json["description"].toString(); - d->shortname = json["shortname"].toString(); - d->author = json["author"].toString(); - d->iconPath = json["iconPath"].toString(); -} - -QDBusArgument &operator <<(QDBusArgument &argument, const AppInfo &appInfo) -{ - argument.beginStructure(); - argument << appInfo.d->id; - argument << appInfo.d->version; - argument << appInfo.d->width; - argument << appInfo.d->height; - argument << appInfo.d->name; - argument << appInfo.d->description; - argument << appInfo.d->shortname; - argument << appInfo.d->author; - argument << appInfo.d->iconPath; - argument.endStructure(); - - return argument; -} - -const QDBusArgument &operator >>(const QDBusArgument &argument, AppInfo &appInfo) -{ - argument.beginStructure(); - argument >> appInfo.d->id; - argument >> appInfo.d->version; - argument >> appInfo.d->width; - argument >> appInfo.d->height; - argument >> appInfo.d->name; - argument >> appInfo.d->description; - argument >> appInfo.d->shortname; - argument >> appInfo.d->author; - argument >> appInfo.d->iconPath; - argument.endStructure(); - return argument; -} diff --git a/launcher.pro b/launcher.pro index 9f6c696..34fd355 100644 --- a/launcher.pro +++ b/launcher.pro @@ -16,9 +16,9 @@ TEMPLATE = subdirs load(configure) -SUBDIRS = pws interfaces \ +SUBDIRS = pws \ launcher \ package -launcher.depends = interfaces pws +launcher.depends = pws package.depends += launcher diff --git a/launcher/launcher.pro b/launcher/launcher.pro index bf1989e..513dd6d 100644 --- a/launcher/launcher.pro +++ b/launcher/launcher.pro @@ -19,7 +19,6 @@ QT = qml quick dbus websockets CONFIG += c++11 link_pkgconfig DESTDIR = $${OUT_PWD}/../package/root/bin -include(../interfaces/interfaces.pri) include(../pws/pws.pri) SOURCES += \ -- cgit 1.2.3-korg