From c7606b7b1e870b510488da7d72c0dbe9b47e6ddb Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Sat, 5 Sep 2020 21:51:17 +0200
Subject: [PATCH] updating and cleaning pool files

---
 datapool/PoolDataSetBase.h         | 11 ++++++-----
 datapool/PoolDataSetIF.h           |  7 ++++---
 datapool/PoolEntry.cpp             |  3 ++-
 datapool/PoolEntry.h               |  8 ++++----
 datapool/PoolEntryIF.h             |  6 +++---
 datapool/PoolRawAccessHelper.cpp   |  9 +--------
 datapool/PoolRawAccessHelper.h     | 10 ++--------
 datapoolglob/DataPoolAdmin.cpp     |  9 +++++----
 datapoolglob/DataPoolAdmin.h       | 13 +++++++------
 datapoolglob/GlobalPoolVector.h    |  6 +++---
 datapoolglob/GlobalPoolVector.tpp  |  4 ++--
 datapoollocal/HasLocalDataPoolIF.h |  7 ++++---
 datapoollocal/LocalDataSet.h       |  9 +++++----
 13 files changed, 48 insertions(+), 54 deletions(-)

diff --git a/datapool/PoolDataSetBase.h b/datapool/PoolDataSetBase.h
index 66662413..a8931d62 100644
--- a/datapool/PoolDataSetBase.h
+++ b/datapool/PoolDataSetBase.h
@@ -1,7 +1,8 @@
-#ifndef FRAMEWORK_DATAPOOL_DATASETBASE_H_
-#define FRAMEWORK_DATAPOOL_DATASETBASE_H_
-#include "../datapool/PoolDataSetIF.h"
-#include "../datapool/PoolVariableIF.h"
+#ifndef FSFW_DATAPOOL_POOLDATASETBASE_H_
+#define FSFW_DATAPOOL_POOLDATASETBASE_H_
+
+#include "PoolDataSetIF.h"
+#include "PoolVariableIF.h"
 #include "../ipc/MutexIF.h"
 
 /**
@@ -148,4 +149,4 @@ private:
 	ReturnValue_t handleUnreadDatasetCommit(uint32_t lockTimeout);
 };
 
-#endif /* FRAMEWORK_DATAPOOL_POOLPOOLDATASETBASE_H_ */
+#endif /* FSFW_DATAPOOL_POOLDATASETBASE_H_ */
diff --git a/datapool/PoolDataSetIF.h b/datapool/PoolDataSetIF.h
index 44ca468b..78c05d43 100644
--- a/datapool/PoolDataSetIF.h
+++ b/datapool/PoolDataSetIF.h
@@ -1,5 +1,6 @@
-#ifndef FRAMEWORK_DATAPOOL_POOLDATASETIF_H_
-#define FRAMEWORK_DATAPOOL_POOLDATASETIF_H_
+#ifndef FSFW_DATAPOOL_POOLDATASETIF_H_
+#define FSFW_DATAPOOL_POOLDATASETIF_H_
+
 #include "DataSetIF.h"
 
 class PoolDataSetIF: public DataSetIF {
@@ -25,4 +26,4 @@ public:
     virtual bool isValid() const = 0;
 };
 
-#endif /* FRAMEWORK_DATAPOOL_POOLDATASETIF_H_ */
+#endif /* FSFW_DATAPOOL_POOLDATASETIF_H_ */
diff --git a/datapool/PoolEntry.cpp b/datapool/PoolEntry.cpp
index b0506b82..fb73328c 100644
--- a/datapool/PoolEntry.cpp
+++ b/datapool/PoolEntry.cpp
@@ -1,4 +1,5 @@
-#include "../datapool/PoolEntry.h"
+#include "PoolEntry.h"
+
 #include "../serviceinterface/ServiceInterfaceStream.h"
 #include "../globalfunctions/arrayprinter.h"
 #include <cstring>
diff --git a/datapool/PoolEntry.h b/datapool/PoolEntry.h
index 6a3daacf..033db40d 100644
--- a/datapool/PoolEntry.h
+++ b/datapool/PoolEntry.h
@@ -1,7 +1,7 @@
-#ifndef FRAMEWORK_DATAPOOL_POOLENTRY_H_
-#define FRAMEWORK_DATAPOOL_POOLENTRY_H_
+#ifndef FSFW_DATAPOOL_POOLENTRY_H_
+#define FSFW_DATAPOOL_POOLENTRY_H_
 
-#include "../datapool/PoolEntryIF.h"
+#include "PoolEntryIF.h"
 
 #include <initializer_list>
 #include <type_traits>
@@ -127,4 +127,4 @@ public:
 	Type getType();
 };
 
-#endif /* POOLENTRY_H_ */
+#endif /* FSFW_DATAPOOL_POOLENTRY_H_ */
diff --git a/datapool/PoolEntryIF.h b/datapool/PoolEntryIF.h
index 462de18b..d9db5237 100644
--- a/datapool/PoolEntryIF.h
+++ b/datapool/PoolEntryIF.h
@@ -1,5 +1,5 @@
-#ifndef FRAMEWORK_DATAPOOL_POOLENTRYIF_H_
-#define FRAMEWORK_DATAPOOL_POOLENTRYIF_H_
+#ifndef FSFW_DATAPOOL_POOLENTRYIF_H_
+#define FSFW_DATAPOOL_POOLENTRYIF_H_
 
 #include "../globalfunctions/Type.h"
 #include <cstdint>
@@ -60,4 +60,4 @@ public:
 	virtual Type getType() = 0;
 };
 
-#endif /* POOLENTRYIF_H_ */
+#endif /* FSFW_DATAPOOL_POOLENTRYIF_H_ */
diff --git a/datapool/PoolRawAccessHelper.cpp b/datapool/PoolRawAccessHelper.cpp
index 3696a21d..5a6827b6 100644
--- a/datapool/PoolRawAccessHelper.cpp
+++ b/datapool/PoolRawAccessHelper.cpp
@@ -1,11 +1,4 @@
-/**
- * @file PoolRawAccessHelper.cpp
- *
- * @date 22.12.2019
- * @author R. Mueller
- */
-
-#include "../datapool/PoolRawAccessHelper.h"
+#include "PoolRawAccessHelper.h"
 #include "../datapoolglob/GlobalDataSet.h"
 #include "../serialize/SerializeAdapter.h"
 #include "../serviceinterface/ServiceInterfaceStream.h"
diff --git a/datapool/PoolRawAccessHelper.h b/datapool/PoolRawAccessHelper.h
index db25acdf..6ff3e955 100644
--- a/datapool/PoolRawAccessHelper.h
+++ b/datapool/PoolRawAccessHelper.h
@@ -1,11 +1,5 @@
-/**
- * @file PoolRawAccessHelper.h
- *
- * @date 22.12.2019
- */
-
-#ifndef FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
-#define FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
+#ifndef FSFW_DATAPOOL_POOLRAWACCESSHELPER_H_
+#define FSFW_DATAPOOL_POOLRAWACCESSHELPER_H_
 
 #include "../returnvalues/HasReturnvaluesIF.h"
 #include "../datapoolglob/GlobalDataSet.h"
diff --git a/datapoolglob/DataPoolAdmin.cpp b/datapoolglob/DataPoolAdmin.cpp
index 029a336d..6ede0841 100644
--- a/datapoolglob/DataPoolAdmin.cpp
+++ b/datapoolglob/DataPoolAdmin.cpp
@@ -1,7 +1,8 @@
-#include "../datapoolglob/DataPoolAdmin.h"
-#include "../datapoolglob/GlobalDataSet.h"
-#include "../datapoolglob/GlobalDataPool.h"
-#include "../datapoolglob/PoolRawAccess.h"
+#include "DataPoolAdmin.h"
+#include "GlobalDataSet.h"
+#include "GlobalDataPool.h"
+#include "PoolRawAccess.h"
+
 #include "../ipc/CommandMessage.h"
 #include "../ipc/QueueFactory.h"
 #include "../parameters/ParameterMessage.h"
diff --git a/datapoolglob/DataPoolAdmin.h b/datapoolglob/DataPoolAdmin.h
index a08f322d..d8871b65 100644
--- a/datapoolglob/DataPoolAdmin.h
+++ b/datapoolglob/DataPoolAdmin.h
@@ -1,5 +1,7 @@
-#ifndef DATAPOOLADMIN_H_
-#define DATAPOOLADMIN_H_
+#ifndef FSFW_DATAPOOLGLOB_DATAPOOLADMIN_H_
+#define FSFW_DATAPOOLGLOB_DATAPOOLADMIN_H_
+
+#include "DataPoolParameterWrapper.h"
 
 #include "../objectmanager/SystemObject.h"
 #include "../returnvalues/HasReturnvaluesIF.h"
@@ -7,10 +9,9 @@
 #include "../action/HasActionsIF.h"
 #include "../ipc/MessageQueueIF.h"
 #include "../parameters/ReceivesParameterMessagesIF.h"
-
-#include "../memory/MemoryHelper.h"
 #include "../action/SimpleActionHelper.h"
-#include "../datapoolglob/DataPoolParameterWrapper.h"
+#include "../memory/MemoryHelper.h"
+
 
 class DataPoolAdmin: public HasActionsIF,
 		public ExecutableObjectIF,
@@ -56,4 +57,4 @@ private:
 			Command_t initialCommand);
 };
 
-#endif /* DATAPOOLADMIN_H_ */
+#endif /* FSFW_DATAPOOLGLOB_DATAPOOLADMIN_H_ */
diff --git a/datapoolglob/GlobalPoolVector.h b/datapoolglob/GlobalPoolVector.h
index 6b592fc6..0f5daacd 100644
--- a/datapoolglob/GlobalPoolVector.h
+++ b/datapoolglob/GlobalPoolVector.h
@@ -1,5 +1,5 @@
-#ifndef GLOBALPOOLVECTOR_H_
-#define GLOBALPOOLVECTOR_H_
+#ifndef FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_H_
+#define FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_H_
 
 #include "../datapool/DataSetIF.h"
 #include "../datapool/PoolEntry.h"
@@ -182,4 +182,4 @@ private:
 template<typename T, uint16_t vectorSize>
 using gp_vec_t = GlobPoolVector<T, vectorSize>;
 
-#endif /* POOLVECTOR_H_ */
+#endif /* FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_H_ */
diff --git a/datapoolglob/GlobalPoolVector.tpp b/datapoolglob/GlobalPoolVector.tpp
index ccf33138..013a682a 100644
--- a/datapoolglob/GlobalPoolVector.tpp
+++ b/datapoolglob/GlobalPoolVector.tpp
@@ -1,5 +1,5 @@
-#ifndef GLOBALPOOLVECTOR_TPP_
-#define GLOBALPOOLVECTOR_TPP_
+#ifndef FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_TPP_
+#define FSFW_DATAPOOLGLOB_GLOBALPOOLVECTOR_TPP_
 
 
 template<typename T, uint16_t vectorSize>
diff --git a/datapoollocal/HasLocalDataPoolIF.h b/datapoollocal/HasLocalDataPoolIF.h
index 9eb1c9f1..3e6b843f 100644
--- a/datapoollocal/HasLocalDataPoolIF.h
+++ b/datapoollocal/HasLocalDataPoolIF.h
@@ -1,5 +1,6 @@
-#ifndef FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_
-#define FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_
+#ifndef FSFW_DATAPOOLLOCAL_HASLOCALDATAPOOLIF_H_
+#define FSFW_DATAPOOLLOCAL_HASLOCALDATAPOOLIF_H_
+
 #include "../datapool/PoolEntryIF.h"
 #include "../ipc/MessageQueueSenderIF.h"
 #include "../housekeeping/HousekeepingMessage.h"
@@ -89,4 +90,4 @@ public:
 	};
 };
 
-#endif /* FRAMEWORK_DATAPOOL_HASHKPOOLPARAMETERSIF_H_ */
+#endif /* FSFW_DATAPOOLLOCAL_HASLOCALDATAPOOLIF_H_ */
diff --git a/datapoollocal/LocalDataSet.h b/datapoollocal/LocalDataSet.h
index 5641ebfb..0368f26d 100644
--- a/datapoollocal/LocalDataSet.h
+++ b/datapoollocal/LocalDataSet.h
@@ -1,6 +1,7 @@
-#ifndef FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
-#define FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_
-#include "../datapoollocal/LocalPoolDataSetBase.h"
+#ifndef FSFW_DATAPOOLLOCAL_LOCALDATASET_H_
+#define FSFW_DATAPOOLLOCAL_LOCALDATASET_H_
+
+#include "LocalPoolDataSetBase.h"
 #include <vector>
 
 class LocalDataSet: public LocalPoolDataSetBase {
@@ -17,4 +18,4 @@ private:
     std::vector<PoolVariableIF*> poolVarList;
 };
 
-#endif /* FRAMEWORK_DATAPOOLLOCAL_LOCALDATASET_H_ */
+#endif /* FSFW_DATAPOOLLOCAL_LOCALDATASET_H_ */