From 2f16b1e7336a1b174bfc0da4ae5437c925c6ac21 Mon Sep 17 00:00:00 2001
From: "Robin.Mueller" <robin.mueller.m@gmail.com>
Date: Mon, 25 May 2020 13:48:43 +0200
Subject: [PATCH] moved some files

---
 datapool/PoolRawAccessHelper.h               | 2 +-
 datapoolglob/DataPoolAdmin.cpp               | 2 +-
 datapoolglob/DataPoolParameterWrapper.cpp    | 2 +-
 {datapool => datapoolglob}/PIDReader.h       | 0
 {datapool => datapoolglob}/PIDReaderList.h   | 8 ++++----
 {datapool => datapoolglob}/PoolRawAccess.cpp | 2 +-
 {datapool => datapoolglob}/PoolRawAccess.h   | 0
 monitoring/MonitorBase.h                     | 2 +-
 power/Fuse.h                                 | 2 +-
 power/PowerSensor.h                          | 2 +-
 10 files changed, 11 insertions(+), 11 deletions(-)
 rename {datapool => datapoolglob}/PIDReader.h (100%)
 rename {datapool => datapoolglob}/PIDReaderList.h (73%)
 rename {datapool => datapoolglob}/PoolRawAccess.cpp (99%)
 rename {datapool => datapoolglob}/PoolRawAccess.h (100%)

diff --git a/datapool/PoolRawAccessHelper.h b/datapool/PoolRawAccessHelper.h
index f2434241..52d9ebe5 100644
--- a/datapool/PoolRawAccessHelper.h
+++ b/datapool/PoolRawAccessHelper.h
@@ -7,9 +7,9 @@
 #ifndef FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
 #define FRAMEWORK_DATAPOOL_POOLRAWACCESSHELPER_H_
 
-#include <framework/datapool/PoolRawAccess.h>
 #include <framework/returnvalues/HasReturnvaluesIF.h>
 #include <framework/datapoolglob/GlobalDataSet.h>
+#include <framework/datapoolglob/PoolRawAccess.h>
 
 /**
  * @brief 	This helper function simplifies accessing data pool entries
diff --git a/datapoolglob/DataPoolAdmin.cpp b/datapoolglob/DataPoolAdmin.cpp
index f32ff567..05de1eb2 100644
--- a/datapoolglob/DataPoolAdmin.cpp
+++ b/datapoolglob/DataPoolAdmin.cpp
@@ -1,7 +1,7 @@
 #include <framework/datapoolglob/DataPoolAdmin.h>
-#include <framework/datapool/PoolRawAccess.h>
 #include <framework/datapoolglob/GlobalDataSet.h>
 #include <framework/datapoolglob/GlobalDataPool.h>
+#include <framework/datapoolglob/PoolRawAccess.h>
 #include <framework/ipc/CommandMessage.h>
 #include <framework/ipc/QueueFactory.h>
 #include <framework/parameters/ParameterMessage.h>
diff --git a/datapoolglob/DataPoolParameterWrapper.cpp b/datapoolglob/DataPoolParameterWrapper.cpp
index d93cd88e..062cff12 100644
--- a/datapoolglob/DataPoolParameterWrapper.cpp
+++ b/datapoolglob/DataPoolParameterWrapper.cpp
@@ -1,6 +1,6 @@
 #include <framework/datapoolglob/GlobalDataSet.h>
 #include <framework/datapoolglob/DataPoolParameterWrapper.h>
-#include <framework/datapool/PoolRawAccess.h>
+#include <framework/datapoolglob/PoolRawAccess.h>
 #include <framework/parameters/HasParametersIF.h>
 
 
diff --git a/datapool/PIDReader.h b/datapoolglob/PIDReader.h
similarity index 100%
rename from datapool/PIDReader.h
rename to datapoolglob/PIDReader.h
diff --git a/datapool/PIDReaderList.h b/datapoolglob/PIDReaderList.h
similarity index 73%
rename from datapool/PIDReaderList.h
rename to datapoolglob/PIDReaderList.h
index 07d1b8e6..0b838508 100644
--- a/datapool/PIDReaderList.h
+++ b/datapoolglob/PIDReaderList.h
@@ -1,8 +1,8 @@
-#ifndef FRAMEWORK_DATAPOOL_PIDREADERLIST_H_
-#define FRAMEWORK_DATAPOOL_PIDREADERLIST_H_
+#ifndef FRAMEWORK_DATAPOOLGLOB_PIDREADERLIST_H_
+#define FRAMEWORK_DATAPOOLGLOB_PIDREADERLIST_H_
 
-#include <framework/datapool/PIDReader.h>
 #include <framework/datapool/PoolVariableIF.h>
+#include <framework/datapoolglob/PIDReader.h>
 template <class T, uint8_t n_var>
 class PIDReaderList {
 private:
@@ -24,4 +24,4 @@ public:
 
 
 
-#endif /* FRAMEWORK_DATAPOOL_PIDREADERLIST_H_ */
+#endif /* FRAMEWORK_DATAPOOLGLOB_PIDREADERLIST_H_ */
diff --git a/datapool/PoolRawAccess.cpp b/datapoolglob/PoolRawAccess.cpp
similarity index 99%
rename from datapool/PoolRawAccess.cpp
rename to datapoolglob/PoolRawAccess.cpp
index 778e1b9c..cc04f9b9 100644
--- a/datapool/PoolRawAccess.cpp
+++ b/datapoolglob/PoolRawAccess.cpp
@@ -1,5 +1,5 @@
 #include <framework/datapoolglob/GlobalDataPool.h>
-#include <framework/datapool/PoolRawAccess.h>
+#include <framework/datapoolglob/PoolRawAccess.h>
 #include <framework/serviceinterface/ServiceInterfaceStream.h>
 #include <framework/osal/Endiness.h>
 
diff --git a/datapool/PoolRawAccess.h b/datapoolglob/PoolRawAccess.h
similarity index 100%
rename from datapool/PoolRawAccess.h
rename to datapoolglob/PoolRawAccess.h
diff --git a/monitoring/MonitorBase.h b/monitoring/MonitorBase.h
index d66e956d..f18ca4b5 100644
--- a/monitoring/MonitorBase.h
+++ b/monitoring/MonitorBase.h
@@ -2,7 +2,7 @@
 #define MONITORBASE_H_
 
 #include <framework/datapoolglob/GlobalDataSet.h>
-#include <framework/datapool/PIDReader.h>
+#include <framework/datapoolglob/PIDReader.h>
 #include <framework/monitoring/LimitViolationReporter.h>
 #include <framework/monitoring/MonitoringIF.h>
 #include <framework/monitoring/MonitoringMessageContent.h>
diff --git a/power/Fuse.h b/power/Fuse.h
index 44f8964f..0f258b63 100644
--- a/power/Fuse.h
+++ b/power/Fuse.h
@@ -3,7 +3,7 @@
 
 #include <framework/datapoolglob/GlobalDataSet.h>
 #include <framework/datapoolglob/GlobalPoolVariable.h>
-#include <framework/datapool/PIDReader.h>
+#include <framework/datapoolglob/PIDReader.h>
 #include <framework/devicehandlers/HealthDevice.h>
 #include <framework/monitoring/AbsLimitMonitor.h>
 #include <framework/power/PowerComponentIF.h>
diff --git a/power/PowerSensor.h b/power/PowerSensor.h
index f94088a8..0fb47506 100644
--- a/power/PowerSensor.h
+++ b/power/PowerSensor.h
@@ -2,8 +2,8 @@
 #define POWERSENSOR_H_
 
 #include <framework/datapoolglob/GlobalDataSet.h>
-#include <framework/datapool/PIDReader.h>
 #include <framework/datapoolglob/GlobalPoolVariable.h>
+#include <framework/datapoolglob/PIDReader.h>
 #include <framework/devicehandlers/HealthDevice.h>
 #include <framework/monitoring/LimitMonitor.h>
 #include <framework/parameters/ParameterHelper.h>