taken over all changes

power/Fuse.cpp

@@ -1,7 +1,7 @@
 #include "../monitoring/LimitViolationReporter.h"
 #include "../monitoring/MonitoringMessageContent.h"
 #include "../objectmanager/ObjectManagerIF.h"
-#include "Fuse.h"
+#include "../power/Fuse.h"
 #include "../serialize/SerialFixedArrayListAdapter.h"
 #include "../ipc/QueueFactory.h"
 
@@ -12,7 +12,7 @@ Fuse::Fuse(object_id_t fuseObjectId, uint8_t fuseId, VariableIds ids,
 		SystemObject(fuseObjectId), oldFuseState(0), fuseId(fuseId), powerIF(
 		NULL), currentLimit(fuseObjectId, 1, ids.pidCurrent, confirmationCount,
 				maxCurrent, FUSE_CURRENT_HIGH), powerMonitor(fuseObjectId, 2,
-				DataPool::poolIdAndPositionToPid(ids.poolIdPower, 0),
+				GlobalDataPool::poolIdAndPositionToPid(ids.poolIdPower, 0),
 				confirmationCount), set(), voltage(ids.pidVoltage, &set), current(
 				ids.pidCurrent, &set), state(ids.pidState, &set), power(
 				ids.poolIdPower, &set, PoolVariableIF::VAR_READ_WRITE), commandQueue(
@@ -109,7 +109,7 @@ size_t Fuse::getSerializedSize() const {
 }
 
 ReturnValue_t Fuse::deSerialize(const uint8_t** buffer, size_t* size,
-Endianness streamEndianness) {
+        Endianness streamEndianness) {
 	ReturnValue_t result = RETURN_FAILED;
 	for (DeviceList::iterator iter = devices.begin(); iter != devices.end();
 			iter++) {