eliminate unneeded dependencies on public headers

- Remove unneeded dependencies from libqtappfw public
headers, specifically MessageEngine and Message
hierarchy header files, in preparation for refactoring
work on these areas.
This change helps shield client apps from the
upcoming changes in the library, and highlight the
separation between the library's core and the various
modules providing public interfaces to those apps.

- Make MessageType an scoped enum to fwd declare it.

- Update Copyright statement on files updated by
this patch.

Bug-AGL: SPEC-3112
Signed-off-by: Raquel Medina <raquel.medina@konsulko.com>
Change-Id: I12fd9cdc034aa1166f6448c07befadd9d2042b05

2 files changed, 12 insertions, 8 deletions

diff --git a/map/map.cpp b/map/map.cpp
index 38f682a..666efa1 100644
--- a/map/map.cpp
+++ b/map/map.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Konsulko Group
+ * Copyright (C) 2019, 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,11 +14,13 @@
  * limitations under the License.
  */
 
+#include <QDebug>
+
 #include "message.h"
-#include "messageengine.h"
-#include "map.h"
 #include "mapmessage.h"
 #include "responsemessage.h"
+#include "messageengine.h"
+#include "map.h"
 
 Map::Map (QUrl &url, QObject * parent) :
     QObject(parent),
@@ -90,13 +92,13 @@ void Map::onDisconnected()
 
 void Map::onMessageReceived(MessageType type, Message *msg)
 {
-    if (type == MapEventMessage) {
+    if (type == MessageType::MapEventMessage) {
         MapMessage *tmsg = qobject_cast<MapMessage*>(msg);
 
         if (tmsg->isNotificationEvent()) {
             emit notificationEvent(tmsg->eventData().toVariantMap());
         }
-    } else if (msg->isReply() && type == ResponseRequestMessage) {
+    } else if (msg->isReply() && type == MessageType::ResponseRequestMessage) {
         ResponseMessage *tmsg = qobject_cast<ResponseMessage*>(msg);
 
         if (tmsg->requestVerb() == "list_messages") {
diff --git a/map/map.h b/map/map.h
index c54a250..97407cc 100644
--- a/map/map.h
+++ b/map/map.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2019 Konsulko Group
+ * Copyright (C) 2019, 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,13 +17,15 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include <QDebug>
 #include <QObject>
 #include <QJsonArray>
 #include <QtQml/QQmlContext>
 #include <QtQml/QQmlListProperty>
 
-#include "messageengine.h"
+class MessageEngine;
+class Message;
+
+enum class MessageType;
 
 class Map : public QObject
 {