add forward declarations

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;

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 {
 

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) \

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.

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