From 3a043b5773de78516ac6efd0c3b483e79ebd729e Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Fri, 18 Sep 2020 13:31:51 +0200
Subject: [PATCH] object manager tweaks complete

---
 objectmanager/ObjectManagerIF.h |  9 +++++----
 objectmanager/SystemObject.cpp  |  4 ++--
 objectmanager/SystemObject.h    | 19 +++++++++++--------
 objectmanager/SystemObjectIF.h  |  6 +++---
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/objectmanager/ObjectManagerIF.h b/objectmanager/ObjectManagerIF.h
index 16619e23..1f462509 100644
--- a/objectmanager/ObjectManagerIF.h
+++ b/objectmanager/ObjectManagerIF.h
@@ -1,8 +1,8 @@
-#ifndef FRAMEWORK_OBJECTMANAGER_OBJECTMANAGERIF_H_
-#define FRAMEWORK_OBJECTMANAGER_OBJECTMANAGERIF_H_
+#ifndef FSFW_OBJECTMANAGER_OBJECTMANAGERIF_H_
+#define FSFW_OBJECTMANAGER_OBJECTMANAGERIF_H_
 
-#include "../objectmanager/frameworkObjects.h"
-#include "../objectmanager/SystemObjectIF.h"
+#include "frameworkObjects.h"
+#include "SystemObjectIF.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
 
@@ -79,6 +79,7 @@ public:
 /**
  * @brief	This is the forward declaration of the global objectManager instance.
  */
+// maybe but this in the glob namespace to explicitely mark it global?
 extern ObjectManagerIF *objectManager;
 
 /*Documentation can be found in the class method declaration above.*/
diff --git a/objectmanager/SystemObject.cpp b/objectmanager/SystemObject.cpp
index 61eaf90a..64330fbc 100644
--- a/objectmanager/SystemObject.cpp
+++ b/objectmanager/SystemObject.cpp
@@ -1,6 +1,6 @@
+#include "ObjectManager.h"
+#include "SystemObject.h"
 #include "../events/EventManagerIF.h"
-#include "../objectmanager/ObjectManager.h"
-#include "../objectmanager/SystemObject.h"
 
 SystemObject::SystemObject(object_id_t setObjectId, bool doRegister) :
 		objectId(setObjectId), registered(doRegister) {
diff --git a/objectmanager/SystemObject.h b/objectmanager/SystemObject.h
index ae4b1389..9188693e 100644
--- a/objectmanager/SystemObject.h
+++ b/objectmanager/SystemObject.h
@@ -1,9 +1,9 @@
-#ifndef SYSTEMOBJECT_H_
-#define SYSTEMOBJECT_H_
+#ifndef FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_
+#define FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_
 
+#include "SystemObjectIF.h"
 #include "../events/Event.h"
 #include "../events/EventReportingProxyIF.h"
-#include "../objectmanager/SystemObjectIF.h"
 #include "../timemanager/Clock.h"
 
 /**
@@ -13,7 +13,7 @@
  * 			class that is announced to ObjectManager. It automatically includes
  * 			itself (and therefore the inheriting class) in the object manager's
  * 			list.
- * \ingroup system_objects
+ * @ingroup system_objects
  */
 class SystemObject: public SystemObjectIF {
 private:
@@ -30,14 +30,16 @@ public:
 	 * @param parameter1
 	 * @param parameter2
 	 */
-	virtual void triggerEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0);
+	virtual void triggerEvent(Event event, uint32_t parameter1 = 0,
+			uint32_t parameter2 = 0);
 
 	/**
 	 * @brief	The class's constructor.
 	 * @details	In the constructor, the object id is set and the class is
 	 * 			inserted in the object manager.
 	 * @param setObjectId	The id the object shall have.
-	 * @param doRegister	Determines if the object is registered in the global object manager.
+	 * @param doRegister	Determines if the object is registered in
+	 * 						the global object manager.
 	 */
 	SystemObject(object_id_t setObjectId, bool doRegister = true);
 	/**
@@ -48,7 +50,8 @@ public:
 	virtual ReturnValue_t initialize() override;
 	virtual ReturnValue_t checkObjectConnections();
 
-	virtual void forwardEvent(Event event, uint32_t parameter1 = 0, uint32_t parameter2 = 0) const;
+	virtual void forwardEvent(Event event, uint32_t parameter1 = 0,
+			uint32_t parameter2 = 0) const;
 };
 
-#endif /* SYSTEMOBJECT_H_ */
+#endif /* FSFW_OBJECTMANAGER_SYSTEMOBJECT_H_ */
diff --git a/objectmanager/SystemObjectIF.h b/objectmanager/SystemObjectIF.h
index 108717af..315fde9b 100644
--- a/objectmanager/SystemObjectIF.h
+++ b/objectmanager/SystemObjectIF.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_OBJECTMANAGER_SYSTEMOBJECTIF_H_
-#define FRAMEWORK_OBJECTMANAGER_SYSTEMOBJECTIF_H_
+#ifndef FSFW_OBJECTMANAGER_SYSTEMOBJECTIF_H_
+#define FSFW_OBJECTMANAGER_SYSTEMOBJECTIF_H_
 
 #include "../events/EventReportingProxyIF.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
@@ -59,4 +59,4 @@ public:
 	virtual ReturnValue_t checkObjectConnections() = 0;
 };
 
-#endif /* FRAMEWORK_OBJECTMANAGER_SYSTEMOBJECTIF_H_ */
+#endif /* #ifndef FSFW_OBJECTMANAGER_SYSTEMOBJECTIF_H_ */