summaryrefslogtreecommitdiffstats
path: root/network
diff options
context:
space:
mode:
Diffstat (limited to 'network')
-rw-r--r--network/network.cpp12
-rw-r--r--network/network.h13
2 files changed, 15 insertions, 10 deletions
diff --git a/network/network.cpp b/network/network.cpp
index c497c29..b858206 100644
--- a/network/network.cpp
+++ b/network/network.cpp
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 Konsulko Group
+ * Copyright (C) 2018-2020 Konsulko Group
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -14,14 +14,16 @@
* limitations under the License.
*/
+#include <QDebug>
#include <QtQml/QQmlEngine>
#include "message.h"
-#include "messageengine.h"
-#include "network.h"
#include "networkmessage.h"
#include "responsemessage.h"
+#include "messageengine.h"
#include "networkadapter.h"
+#include "network.h"
+
Network::Network (QUrl &url, QQmlContext *context, QObject * parent) :
QObject(parent),
@@ -313,9 +315,9 @@ void Network::processReply(ResponseMessage *rmsg)
void Network::onMessageReceived(MessageType type, Message *msg)
{
- if (msg->isEvent() && (type == NetworkEventMessage)) {
+ if (msg->isEvent() && (type == MessageType::NetworkEventMessage)) {
processEvent(qobject_cast<NetworkMessage*>(msg));
- } else if (msg->isReply() && (type == ResponseRequestMessage)) {
+ } else if (msg->isReply() && (type == MessageType::ResponseRequestMessage)) {
processReply(qobject_cast<ResponseMessage*>(msg));
}
diff --git a/network/network.h b/network/network.h
index aa83fed..ebaeb6e 100644
--- a/network/network.h
+++ b/network/network.h
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2018 Konsulko Group
+ * Copyright (C) 2018-2020 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,18 +17,21 @@
#ifndef NETWORK_H
#define NETWORK_H
-#include <QDebug>
#include <QObject>
#include <QJsonArray>
#include <QtQml/QQmlContext>
#include <QtQml/QQmlListProperty>
-#include "messageengine.h"
-#include "networkmessage.h"
-#include "responsemessage.h"
#include "wifiadapter.h"
#include "wiredadapter.h"
+class MessageEngine;
+class Message;
+class NetworkMessage;
+class ResponseMessage;
+
+enum class MessageType;
+
class Network : public QObject
{
Q_OBJECT