summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--CMakeLists.txt8
-rw-r--r--map/CMakeLists.txt2
-rw-r--r--map/map.cpp21
-rw-r--r--map/map.h10
-rw-r--r--pbap/CMakeLists.txt2
-rw-r--r--pbap/pbap.cpp25
-rw-r--r--pbap/pbap.h14
-rw-r--r--radio/CMakeLists.txt2
-rw-r--r--radio/radio.cpp31
-rw-r--r--radio/radio.h12
-rw-r--r--telephony/CMakeLists.txt2
-rw-r--r--telephony/telephony.cpp20
-rw-r--r--telephony/telephony.h12
13 files changed, 88 insertions, 73 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 678ccaf..a766d3f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -20,17 +20,25 @@ set(DEST_DIR "${CMAKE_INSTALL_PREFIX}")
set(PRIVATE_LIBS "${PRIVATE_LIBS} -lqtappfw-bt
-lqtappfw-hvac
-lqtappfw-mediaplayer
+ -lqtappfw-map
-lqtappfw-navigation
-lqtappfw-network
+ -lqtappfw-pbap
+ -lqtappfw-radio
+ -lqtappfw-telephony
-lqtappfw-weather")
set (SUBDIRS
docs
bluetooth
hvac
+ map
mediaplayer
navigation
network
+ pbap
+ radio
+ telephony
weather)
foreach(subdir ${SUBDIRS})
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
diff --git a/map/map.h b/map/map.h
index 150a95d..195f823 100644
--- a/map/map.h
+++ b/map/map.h
@@ -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
diff --git a/pbap/CMakeLists.txt b/pbap/CMakeLists.txt
index 04f9c67..480661a 100644
--- a/pbap/CMakeLists.txt
+++ b/pbap/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(qtappfw-bt-pbap SHARED pbap.cpp)
target_include_directories(qtappfw-bt-pbap PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories(qtappfw-bt-pbap PUBLIC "${CMAKE_INSTALL_INCLUDEDIR}")
-target_link_libraries(qtappfw-bt-pbap qtappfw-core)
+target_link_libraries(qtappfw-bt-pbap Qt5::Qml)
set_target_properties(qtappfw-bt-pbap PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION 1
diff --git a/pbap/pbap.cpp b/pbap/pbap.cpp
index a3bde48..7473c54 100644
--- a/pbap/pbap.cpp
+++ b/pbap/pbap.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018-2020 Konsulko Group
+ * Copyright (C) 2018-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.
@@ -18,13 +18,8 @@
#include <QMetaEnum>
#include <QMimeDatabase>
#include <QtQml/QQmlEngine>
+#include <QJsonObject>
-#include "callmessage.h"
-#include "eventmessage.h"
-#include "responsemessage.h"
-#include "messagefactory.h"
-#include "messageengine.h"
-#include "messageenginefactory.h"
#include "pbap.h"
@@ -81,19 +76,23 @@ int RecentCall::stringToEnum(QString key)
return (value < 0) ? 0 : value;
}
-Pbap::Pbap (QUrl &url, QQmlContext *context, QObject * parent) :
+Pbap::Pbap (QQmlContext *context, QObject * parent) :
QObject(parent)
{
+#if 0
m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
+#endif
m_context = context;
m_context->setContextProperty("ContactsModel", QVariant::fromValue(m_contacts));
qmlRegisterUncreatableType<PhoneNumber>("PhoneNumber", 1, 0, "PhoneNumber", "Enum");
m_context->setContextProperty("RecentCallModel", QVariant::fromValue(m_calls));
qmlRegisterUncreatableType<RecentCall>("RecentCall", 1, 0, "RecentCall", "Enum");
+#if 0
QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Pbap::onConnected);
QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Pbap::onDisconnected);
QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Pbap::onMessageReceived);
+#endif
}
Pbap::~Pbap()
@@ -102,6 +101,7 @@ Pbap::~Pbap()
void Pbap::importContacts(int max_entries)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -111,10 +111,12 @@ void Pbap::importContacts(int max_entries)
pmsg->createRequest("bluetooth-pbap", "import", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Pbap::refreshContacts(int max_entries)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -124,10 +126,12 @@ void Pbap::refreshContacts(int max_entries)
pmsg->createRequest("bluetooth-pbap", "contacts", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Pbap::refreshCalls(int max_entries)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -141,10 +145,12 @@ void Pbap::refreshCalls(int max_entries)
pmsg->createRequest("bluetooth-pbap", "history", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Pbap::search(QString number)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -158,6 +164,7 @@ void Pbap::search(QString number)
pmsg->createRequest("bluetooth-pbap", "search", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
bool compareContactPtr(QObject *a, QObject *b)
@@ -263,6 +270,7 @@ void Pbap::sendSearchResults(QJsonArray results)
emit searchResults(name);
}
+#if 0
void Pbap::onConnected()
{
QStringListIterator eventIterator(events);
@@ -334,3 +342,4 @@ void Pbap::onMessageReceived(std::shared_ptr<Message> msg)
}
}
}
+#endif
diff --git a/pbap/pbap.h b/pbap/pbap.h
index 676b49d..25fa450 100644
--- a/pbap/pbap.h
+++ b/pbap/pbap.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018-2020 Konsulko Group
+ * Copyright (C) 2018-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,15 +17,11 @@
#ifndef PBAP_H
#define PBAP_H
-#include <memory>
#include <QObject>
#include <QJsonArray>
#include <QtQml/QQmlContext>
#include <QtQml/QQmlListProperty>
-class MessageEngine;
-class Message;
-
class PhoneNumber : public QObject
{
Q_OBJECT
@@ -144,7 +140,7 @@ class Pbap : public QObject
Q_OBJECT
public:
- explicit Pbap(QUrl &url, QQmlContext *context, QObject * parent = Q_NULLPTR);
+ explicit Pbap(QQmlContext *context, QObject * parent = Q_NULLPTR);
virtual ~Pbap();
Q_INVOKABLE void importContacts(int max_entries);
@@ -157,7 +153,6 @@ class Pbap : public QObject
void statusChanged(bool connected);
private:
- std::shared_ptr<MessageEngine> m_mloop;
QQmlContext *m_context;
QList<QObject *>m_contacts;
QList<QObject *>m_calls;
@@ -165,11 +160,6 @@ class Pbap : public QObject
void updateCalls(QJsonArray);
void sendSearchResults(QJsonArray);
- // slots
- void onConnected();
- void onDisconnected();
- void onMessageReceived(std::shared_ptr<Message>);
-
const QStringList events {
"status",
};
diff --git a/radio/CMakeLists.txt b/radio/CMakeLists.txt
index 8cce350..24666fb 100644
--- a/radio/CMakeLists.txt
+++ b/radio/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(qtappfw-radio SHARED radio.cpp)
target_include_directories(qtappfw-radio PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories(qtappfw-radio PUBLIC "${CMAKE_INSTALL_INCLUDEDIR}")
-target_link_libraries(qtappfw-radio qtappfw-core)
+target_link_libraries(qtappfw-radio Qt5::Qml)
set_target_properties(qtappfw-radio PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION 1
diff --git a/radio/radio.cpp b/radio/radio.cpp
index 885383d..efe8e78 100644
--- a/radio/radio.cpp
+++ b/radio/radio.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018-2020 Konsulko Group
+ * Copyright (C) 2018-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.
@@ -15,17 +15,10 @@
*/
#include <QDebug>
-
-#include "callmessage.h"
-#include "eventmessage.h"
-#include "responsemessage.h"
-#include "messagefactory.h"
-#include "messageengine.h"
-#include "messageenginefactory.h"
#include "radio.h"
-Radio::Radio (QUrl &url, QQmlContext *context, QObject * parent) :
+Radio::Radio(QQmlContext *context, QObject * parent) :
QObject(parent),
m_band(1),
m_frequency(0),
@@ -34,12 +27,14 @@ Radio::Radio (QUrl &url, QQmlContext *context, QObject * parent) :
m_playing(false),
m_scanning(false)
{
+#if 0
m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
m_context = context;
QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Radio::onConnected);
QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Radio::onDisconnected);
QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Radio::onMessageReceived);
+#endif
}
Radio::~Radio()
@@ -48,6 +43,7 @@ Radio::~Radio()
void Radio::setBand(int band)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -58,10 +54,12 @@ void Radio::setBand(int band)
parameter.insert("band", band ? "FM": "AM");
rmsg->createRequest("radio", "band", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Radio::setFrequency(int frequency)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -86,12 +84,14 @@ void Radio::setFrequency(int frequency)
// the new value comes.
m_frequency = frequency;
emit frequencyChanged(m_frequency);
+#endif
}
// control related methods
void Radio::start()
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -101,10 +101,12 @@ void Radio::start()
rmsg->createRequest("radio", "start", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Radio::stop()
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -113,6 +115,7 @@ void Radio::stop()
QJsonObject parameter;
rmsg->createRequest("radio", "stop", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Radio::scanForward()
@@ -120,6 +123,7 @@ void Radio::scanForward()
if (m_scanning)
return;
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
CallMessage* rmsg = static_cast<CallMessage*>(msg.get());
QJsonObject parameter;
@@ -129,6 +133,7 @@ void Radio::scanForward()
m_scanning = true;
emit scanningChanged(m_scanning);
+#endif
}
void Radio::scanBackward()
@@ -136,6 +141,7 @@ void Radio::scanBackward()
if (m_scanning)
return;
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -148,10 +154,12 @@ void Radio::scanBackward()
m_scanning = true;
emit scanningChanged(m_scanning);
+#endif
}
void Radio::scanStop()
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -163,10 +171,12 @@ void Radio::scanStop()
m_scanning = false;
emit scanningChanged(m_scanning);
+#endif
}
void Radio::updateFrequencyBandParameters()
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -184,8 +194,10 @@ void Radio::updateFrequencyBandParameters()
rmsg = static_cast<CallMessage*>(msg2.get());
rmsg->createRequest("radio", "frequency_step", parameter);
m_mloop->sendMessage(std::move(msg2));
+#endif
}
+#if 0
void Radio::onConnected()
{
QStringListIterator eventIterator(events);
@@ -279,3 +291,4 @@ void Radio::onMessageReceived(std::shared_ptr<Message> msg)
}
}
}
+#endif
diff --git a/radio/radio.h b/radio/radio.h
index b38d9d3..cfd314c 100644
--- a/radio/radio.h
+++ b/radio/radio.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018-2020 Konsulko Group
+ * Copyright (C) 2018-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,14 +17,9 @@
#ifndef RADIO_H
#define RADIO_H
-#include <memory>
#include <QObject>
#include <QtQml/QQmlContext>
-class MessageEngine;
-class Message;
-
-
class Radio : public QObject
{
Q_OBJECT
@@ -39,7 +34,7 @@ class Radio : public QObject
Q_PROPERTY(unsigned int frequencyStep READ frequencyStep NOTIFY frequencyStepChanged)
public:
- explicit Radio(QUrl &url, QQmlContext *context, QObject * parent = Q_NULLPTR);
+ explicit Radio(QQmlContext *context, QObject * parent = Q_NULLPTR);
virtual ~Radio();
unsigned int band() const { return m_band; }
@@ -76,7 +71,6 @@ class Radio : public QObject
void frequencyStepChanged(int frequencyStep);
private:
- std::shared_ptr<MessageEngine> m_mloop;
QQmlContext *m_context;
unsigned int m_band;
@@ -88,6 +82,7 @@ class Radio : public QObject
bool m_scanning;
void updateFrequencyBandParameters();
+#if 0
void onConnected();
void onDisconnected();
void onMessageReceived(std::shared_ptr<Message> msg);
@@ -97,6 +92,7 @@ class Radio : public QObject
"station_found",
"status",
};
+#endif
};
#endif // RADIO_H
diff --git a/telephony/CMakeLists.txt b/telephony/CMakeLists.txt
index 7c4e5b5..5bd81bc 100644
--- a/telephony/CMakeLists.txt
+++ b/telephony/CMakeLists.txt
@@ -8,7 +8,7 @@ add_library(qtappfw-phone SHARED telephony.cpp)
target_include_directories(qtappfw-phone PUBLIC "${CMAKE_CURRENT_SOURCE_DIR}")
target_include_directories(qtappfw-phone PUBLIC "${CMAKE_INSTALL_INCLUDEDIR}")
-target_link_libraries(qtappfw-phone qtappfw-core)
+target_link_libraries(qtappfw-phone Qt5::Qml)
set_target_properties(qtappfw-phone PROPERTIES
VERSION ${PROJECT_VERSION}
SOVERSION 1
diff --git a/telephony/telephony.cpp b/telephony/telephony.cpp
index 71aa1cb..1040b09 100644
--- a/telephony/telephony.cpp
+++ b/telephony/telephony.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2020 Konsulko Group
+ * Copyright (C) 2017-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,24 +16,20 @@
#include <QDebug>
-#include "callmessage.h"
-#include "eventmessage.h"
-#include "responsemessage.h"
-#include "messagefactory.h"
-#include "messageengine.h"
-#include "messageenginefactory.h"
#include "telephony.h"
-Telephony::Telephony (QUrl &url, QObject * parent) :
+Telephony::Telephony(QObject * parent) :
QObject(parent),
m_connected(false),
m_call_state("disconnected")
{
+#if 0
m_mloop = MessageEngineFactory::getInstance().getMessageEngine(url);
QObject::connect(m_mloop.get(), &MessageEngine::connected, this, &Telephony::onConnected);
QObject::connect(m_mloop.get(), &MessageEngine::disconnected, this, &Telephony::onDisconnected);
QObject::connect(m_mloop.get(), &MessageEngine::messageReceived, this, &Telephony::onMessageReceived);
+#endif
}
Telephony::~Telephony()
@@ -42,6 +38,7 @@ Telephony::~Telephony()
void Telephony::dial(QString number)
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -52,10 +49,12 @@ void Telephony::dial(QString number)
parameter.insert("value", number);
tmsg->createRequest("telephony", "dial", parameter);
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Telephony::answer()
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -63,10 +62,12 @@ void Telephony::answer()
CallMessage *tmsg = static_cast<CallMessage*>(msg.get());
tmsg->createRequest("telephony", "answer");
m_mloop->sendMessage(std::move(msg));
+#endif
}
void Telephony::hangup()
{
+#if 0
std::unique_ptr<Message> msg = MessageFactory::getInstance().createOutboundMessage(MessageId::Call);
if (!msg)
return;
@@ -74,8 +75,10 @@ void Telephony::hangup()
CallMessage *tmsg = static_cast<CallMessage*>(msg.get());
tmsg->createRequest("telephony", "hangup");
m_mloop->sendMessage(std::move(msg));
+#endif
}
+#if 0
void Telephony::onConnected()
{
QStringList events {
@@ -161,3 +164,4 @@ void Telephony::onMessageReceived(std::shared_ptr<Message> msg)
qWarning() << "Received invalid inbound message";
}
+#endif
diff --git a/telephony/telephony.h b/telephony/telephony.h
index 2aecc86..9c15610 100644
--- a/telephony/telephony.h
+++ b/telephony/telephony.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2020 Konsulko Group
+ * Copyright (C) 2017-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,12 +17,8 @@
#ifndef TELEPHONY_H
#define TELEPHONY_H
-#include <memory>
#include <QObject>
-class MessageEngine;
-class Message;
-
class Telephony : public QObject
{
Q_OBJECT
@@ -33,7 +29,7 @@ class Telephony : public QObject
Q_PROPERTY(QString callColp READ callColp)
public:
- explicit Telephony(QUrl &url, QObject * parent = Q_NULLPTR);
+ explicit Telephony(QObject * parent = Q_NULLPTR);
virtual ~Telephony();
Q_INVOKABLE void dial(QString number);
Q_INVOKABLE void answer();
@@ -71,13 +67,9 @@ class Telephony : public QObject
private:
bool m_connected;
bool m_online;
- std::shared_ptr<MessageEngine> m_mloop;
QString m_call_state;
QString m_clip;
QString m_colp;
- void onConnected();
- void onDisconnected();
- void onMessageReceived(std::shared_ptr<Message>);
};
#endif // TELEPHONY_H