diff options
Diffstat (limited to 'saltoqd/toqmanager.cpp')
| -rw-r--r-- | saltoqd/toqmanager.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/saltoqd/toqmanager.cpp b/saltoqd/toqmanager.cpp index fa8f7c6..5db15c9 100644 --- a/saltoqd/toqmanager.cpp +++ b/saltoqd/toqmanager.cpp @@ -1,24 +1,35 @@ #include "toqmanager.h" +#include "obexconnection.h" + #include "versionmanager.h" #include "systemmanager.h" +#include "fmsmanager.h" #include "storagemanager.h" #include "musicmanager.h" #include "commmanager.h" #include "voicecallmanager.h" +#include "weathermanager.h" ToqManager::ToqManager(const QBluetoothAddress &address, QObject *parent) : QObject(parent), _conn(new ToqConnection(address, this)), + _obex(new ObexConnection(_conn, this)), _versionManager(new VersionManager(this)), _systemManager(new SystemManager(this)), + _fmsManager(new FmsManager(_obex, this)), _storageManager(new StorageManager(this)), _musicManager(new MusicManager(this)), _commManager(new CommManager(_storageManager, this)), - _voiceCallManager(new VoiceCallManager(this)) + _voiceCallManager(new VoiceCallManager(this)), + _weatherManager(new WeatherManager(_fmsManager, this)) { connect(_conn, &ToqConnection::messageReceived, this, &ToqManager::handleToqMessage); + connect(_conn, &ToqConnection::connected, + this, &ToqManager::connected); + connect(_conn, &ToqConnection::disconnected, + this, &ToqManager::disconnected); } void ToqManager::setEndpointListener(ToqConnection::Endpoint ep, EndpointHandler *handler) @@ -31,7 +42,7 @@ void ToqManager::sendMessage(const ToqConnection::Message &msg) { if (1) { QString json = QString::fromUtf8(msg.payload.toJson(QJsonDocument::Compact)); - qDebug() << "Sending message to" << ToqConnection::nameOfEndpoint(msg.destination) << "from" << ToqConnection::nameOfEndpoint(msg.destination) << "type" << msg.type << json; + qDebug() << "Sending message to" << ToqConnection::nameOfEndpoint(msg.destination) << "from" << ToqConnection::nameOfEndpoint(msg.source) << "type" << msg.type << json; } _conn->sendMessage(msg); } @@ -46,7 +57,7 @@ void ToqManager::sendMessage(ToqConnection::Endpoint source, ToqConnection::Endp quint16 ToqManager::sendMessage(ToqConnection::Endpoint source, ToqConnection::Endpoint destination, quint32 type, const QJsonObject &payload) { QJsonDocument doc(payload); - quint16 transactionId = _conn->nextTransactionId(); + quint16 transactionId = newTransactionId(); ToqConnection::Message msg(source, destination, transactionId, type, doc); sendMessage(msg); return transactionId; |