From 12a93c0898f7f64d8cc013c0be36f7479f08de2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Simon=20St=C3=BCrz?= <stuerz.simon@gmail.com>
Date: Tue, 30 Jun 2015 23:47:24 +0200
Subject: [PATCH] add forward declarations

---
 server/guhcore.h               | 3 ++-
 server/jsonrpc/jsonrpcserver.h | 2 +-
 server/jsonrpc/jsontypes.h     | 5 +++--
 server/qtservice/qtservice.cpp | 2 +-
 server/ruleengine.h            | 4 +++-
 5 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/server/guhcore.h b/server/guhcore.h
index e41c0beb..303b5744 100644
--- a/server/guhcore.h
+++ b/server/guhcore.h
@@ -24,7 +24,6 @@
 
 #include "rule.h"
 #include "types/event.h"
-#include "plugin/device.h"
 #include "plugin/deviceplugin.h"
 #include "plugin/deviceclass.h"
 #include "plugin/devicedescriptor.h"
@@ -35,6 +34,8 @@
 #include <QObject>
 #include <QDebug>
 
+class Device;
+
 namespace guhserver {
 
 class JsonRPCServer;
diff --git a/server/jsonrpc/jsonrpcserver.h b/server/jsonrpc/jsonrpcserver.h
index 8c5d9c6b..5493c74f 100644
--- a/server/jsonrpc/jsonrpcserver.h
+++ b/server/jsonrpc/jsonrpcserver.h
@@ -22,7 +22,6 @@
 #ifndef JSONRPCSERVER_H
 #define JSONRPCSERVER_H
 
-#include "plugin/device.h"
 #include "plugin/deviceclass.h"
 #include "jsonhandler.h"
 
@@ -33,6 +32,7 @@
 #include <QVariantMap>
 #include <QString>
 
+class Device;
 
 namespace guhserver {
 
diff --git a/server/jsonrpc/jsontypes.h b/server/jsonrpc/jsontypes.h
index 339aabca..24ae2f1c 100644
--- a/server/jsonrpc/jsontypes.h
+++ b/server/jsonrpc/jsontypes.h
@@ -23,8 +23,6 @@
 #define JSONTYPES_H
 
 #include "plugin/deviceclass.h"
-#include "plugin/device.h"
-#include "plugin/deviceplugin.h"
 #include "plugin/devicedescriptor.h"
 #include "rule.h"
 #include "devicemanager.h"
@@ -46,6 +44,9 @@
 #include <QString>
 #include <QMetaEnum>
 
+class DevicePlugin;
+class Device;
+
 namespace guhserver {
 
 #define DECLARE_OBJECT(typeName, jsonName) \
diff --git a/server/qtservice/qtservice.cpp b/server/qtservice/qtservice.cpp
index dbfd6f12..8ec20fff 100644
--- a/server/qtservice/qtservice.cpp
+++ b/server/qtservice/qtservice.cpp
@@ -59,6 +59,7 @@
 #include <stdlib.h>
 #endif
 
+class QStringList;
 
 static QFile* f = 0;
 
@@ -205,7 +206,6 @@ void qtServiceLogDebug(QtMsgType type, const char* msg)
 */
 namespace guhserver {
 
-
 /*!
     Creates a controller object for the service with the given
     \a name.
diff --git a/server/ruleengine.h b/server/ruleengine.h
index 5a868bab..844c35fe 100644
--- a/server/ruleengine.h
+++ b/server/ruleengine.h
@@ -100,6 +100,8 @@ private:
 
 }
 
-Q_DECLARE_METATYPE(guhserver::RuleEngine::RuleError)
+using namespace guhserver;
+Q_DECLARE_METATYPE(RuleEngine::RuleError)
+
 
 #endif // RULEENGINE_H