diff options
Diffstat (limited to 'map')
| -rw-r--r-- | map/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | map/map.cpp | 21 | ||||
| -rw-r--r-- | map/map.h | 10 |
3 files changed, 18 insertions, 15 deletions
diff --git a/map/CMakeLists.txt b/map/CMakeLists.txt index 8ca3e2c..0a94e28 100644 --- a/map/CMakeLists.txt +++ b/map/CMakeLists.txt @@ -8,7 +8,7 @@ add_library(qtappfw-bt-map SHARED map.cpp) target_include_directories(qtappfw-bt-map PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}") target_include_directories(qtappfw-bt-map PUBLIC "${CMAKE_INSTALL_INCLUDEDIR}") -target_link_libraries(qtappfw-bt-map qtappfw-core) +target_link_libraries(qtappfw-bt-map Qt5::Qml) set_target_properties(qtappfw-bt-map PROPERTIES VERSION ${PROJECT_VERSION} SOVERSION 1 diff --git a/map/map.cpp b/map/map.cpp index b85a323..7e5f38e 100644 --- a/map/map.cpp +++ b/map/map.cpp @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019, 2020 Konsulko Group + * Copyright (C) 2019,2020,2022 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -16,21 +16,17 @@ #include <QDebug> -#include "callmessage.h" -#include "eventmessage.h" -#include "responsemessage.h" -#include "messagefactory.h" -#include "messageengine.h" -#include "messageenginefactory.h" #include "map.h" -Map::Map (QUrl &url, QObject * parent) : +Map::Map(QObject * parent) : QObject(parent) { +#if 0 m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url); QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Map::onConnected); QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Map::onDisconnected); QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Map::onMessageReceived); +#endif } Map::~Map() @@ -39,6 +35,7 @@ Map::~Map() void Map::compose(QString recipient, QString message) { +#if 0 std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); CallMessage* btmsg = static_cast<CallMessage*>(msg.get()); QJsonObject parameter; @@ -46,30 +43,37 @@ void Map::compose(QString recipient, QString message) parameter.insert("message", message); btmsg->createRequest("bluetooth-map", "compose", parameter); m_mloop->sendMessage(std::move(msg)); +#endif } void Map::message(QString handle) { +#if 0 std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); CallMessage* btmsg = static_cast<CallMessage*>(msg.get()); QJsonObject parameter; parameter.insert("handle", handle); btmsg->createRequest("bluetooth-map", "message", parameter); m_mloop->sendMessage(std::move(msg)); +#endif } void Map::listMessages(QString folder) { +#if 0 std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); CallMessage* btmsg = static_cast<CallMessage*>(msg.get()); QJsonObject parameter; parameter.insert("folder", folder); btmsg->createRequest("bluetooth-map", "list_messages", parameter); m_mloop->sendMessage(std::move(msg)); +#endif } +#if 0 void Map::onConnected() { + std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call); CallMessage* btmsg = static_cast<CallMessage*>(msg.get()); QJsonObject parameter; @@ -112,3 +116,4 @@ void Map::onMessageReceived(std::shared_ptr<Message> msg) } } } +#endif @@ -1,5 +1,5 @@ /* - * Copyright (C) 2019, 2020 Konsulko Group + * Copyright (C) 2019,2020,2022 Konsulko Group * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,21 +17,17 @@ #ifndef MAP_H #define MAP_H -#include <memory> #include <QObject> #include <QJsonArray> #include <QtQml/QQmlContext> #include <QtQml/QQmlListProperty> -class MessageEngine; -class Message; - class Map : public QObject { Q_OBJECT public: - explicit Map(QUrl &url, QObject * parent = Q_NULLPTR); + explicit Map(QObject * parent = Q_NULLPTR); virtual ~Map(); Q_INVOKABLE void compose(QString recipient, QString message); @@ -44,12 +40,14 @@ class Map : public QObject void messageResult(QString handle, QVariantMap message); private: +#if 0 std::shared_ptr<MessageEngine> m_mloop; // slots void onConnected(); void onDisconnected(); void onMessageReceived(std::shared_ptr<Message>); +#endif }; #endif // MAP_H |