From dbcf2ad1f36c4a9cdeacc8742a4d4b2e2e09218a Mon Sep 17 00:00:00 2001
From: Ger van Diepen <diepen@astron.nl>
Date: Mon, 2 Jan 2006 12:57:16 +0000
Subject: [PATCH] BugID: 556 Blob code has been moved to a separate package

---
 Demo/CEP/StationCorrelator/src/DH_CorrCube.cc                 | 2 +-
 Demo/CEP/StationCorrelator/src/DH_RSP.h                       | 2 +-
 Demo/CEP/StationCorrelator/src/DH_RSPSync.cc                  | 2 +-
 Demo/CEP/StationCorrelator/src/DH_Vis.cc                      | 2 +-
 Demo/CEP/StationCorrelator/src/StationCorrelator.cc           | 4 ++--
 Demo/CEP/StationCorrelator/src/StationCorrelator.h            | 2 +-
 Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc       | 4 ++--
 Demo/CEP/StationCorrelator/src/WH_Correlator.cc               | 2 +-
 Demo/CEP/StationCorrelator/src/WH_Dump.cc                     | 2 +-
 Demo/CEP/StationCorrelator/src/WH_Dump.h                      | 2 +-
 Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc                 | 2 +-
 Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h                  | 2 +-
 Demo/CEP/StationCorrelator/src/WH_RSP.h                       | 2 +-
 Demo/CEP/StationCorrelator/src/WH_RSPBoard.h                  | 2 +-
 Demo/CEP/StationCorrelator/src/WH_RSPInput.h                  | 2 +-
 Demo/CEP/StationCorrelator/src/WH_Transpose.h                 | 2 +-
 .../CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h | 2 +-
 Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h    | 2 +-
 Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h           | 2 +-
 Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h  | 2 +-
 .../CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h | 2 +-
 Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc      | 2 +-
 Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h         | 2 +-
 Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h   | 2 +-
 24 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc b/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc
index 70cfa9fb834..c4be0825446 100644
--- a/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc
+++ b/Demo/CEP/StationCorrelator/src/DH_CorrCube.cc
@@ -12,7 +12,7 @@
 #include <lofar_config.h>
 
 #include <DH_CorrCube.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/StationCorrelator/src/DH_RSP.h b/Demo/CEP/StationCorrelator/src/DH_RSP.h
index ae46a6a4d5d..6a8672241ce 100644
--- a/Demo/CEP/StationCorrelator/src/DH_RSP.h
+++ b/Demo/CEP/StationCorrelator/src/DH_RSP.h
@@ -27,7 +27,7 @@
 
 #include <Transport/DataHolder.h>
 #include <complex>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 using std::complex;
 
diff --git a/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc b/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc
index 3f8c95e5b51..8416da8244a 100644
--- a/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc
+++ b/Demo/CEP/StationCorrelator/src/DH_RSPSync.cc
@@ -12,7 +12,7 @@
 
 
 #include <DH_RSPSync.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/StationCorrelator/src/DH_Vis.cc b/Demo/CEP/StationCorrelator/src/DH_Vis.cc
index 636da90c410..aac0d08e587 100644
--- a/Demo/CEP/StationCorrelator/src/DH_Vis.cc
+++ b/Demo/CEP/StationCorrelator/src/DH_Vis.cc
@@ -12,7 +12,7 @@
 
 
 #include <DH_Vis.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/StationCorrelator/src/StationCorrelator.cc b/Demo/CEP/StationCorrelator/src/StationCorrelator.cc
index f78b871da75..98793749c73 100644
--- a/Demo/CEP/StationCorrelator/src/StationCorrelator.cc
+++ b/Demo/CEP/StationCorrelator/src/StationCorrelator.cc
@@ -25,8 +25,8 @@
 
 #include <StationCorrelator.h>
 
-#include <Common/KeyParser.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyParser.h>
+#include <Blob/KeyValueMap.h>
 #include <Common/LofarLogger.h>
 #include <Common/lofar_iostream.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/StationCorrelator.h b/Demo/CEP/StationCorrelator/src/StationCorrelator.h
index 8572c46133d..61ce2b1d79a 100644
--- a/Demo/CEP/StationCorrelator/src/StationCorrelator.h
+++ b/Demo/CEP/StationCorrelator/src/StationCorrelator.h
@@ -23,7 +23,7 @@
 #ifndef STATIONCORRELATOR_H
 #define STATIONCORRELATOR_H
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <CEPFrame/ApplicationHolder.h>
 
 namespace LOFAR {
diff --git a/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc b/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc
index 49cad904682..87a79d8db8d 100644
--- a/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc
+++ b/Demo/CEP/StationCorrelator/src/StationCorrelatorMain.cc
@@ -23,8 +23,8 @@
 //# Always #include <lofar_config.h> first!
 #include <lofar_config.h>
 
-#include <Common/KeyParser.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyParser.h>
+#include <Blob/KeyValueMap.h>
 #include <Common/LofarLogger.h>
 #include <Common/lofar_iostream.h>
 #include <Common/lofar_string.h>
diff --git a/Demo/CEP/StationCorrelator/src/WH_Correlator.cc b/Demo/CEP/StationCorrelator/src/WH_Correlator.cc
index b46c7ec7367..3863785f082 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Correlator.cc
+++ b/Demo/CEP/StationCorrelator/src/WH_Correlator.cc
@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 // General includes
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Common/LofarLogger.h>
 
 #ifdef HAVE_MPI
diff --git a/Demo/CEP/StationCorrelator/src/WH_Dump.cc b/Demo/CEP/StationCorrelator/src/WH_Dump.cc
index dfdec0042de..d1e70ddd6bf 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Dump.cc
+++ b/Demo/CEP/StationCorrelator/src/WH_Dump.cc
@@ -16,7 +16,7 @@
 
 // General includes
 #include <Common/LofarLogger.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 // Application specific includes
 #include <WH_Dump.h>
diff --git a/Demo/CEP/StationCorrelator/src/WH_Dump.h b/Demo/CEP/StationCorrelator/src/WH_Dump.h
index 305c2e9026e..0fb4c08bf68 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Dump.h
+++ b/Demo/CEP/StationCorrelator/src/WH_Dump.h
@@ -13,7 +13,7 @@
 #include <sys/time.h>
 
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 using namespace std;
 namespace LOFAR
diff --git a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc
index d3688fa87c3..0fda0422ef5 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc
+++ b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.cc
@@ -15,7 +15,7 @@
 
 // General includes
 #include <Common/LofarLogger.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 // Application specific includes
 #include <WH_Plot2MAC.h>
diff --git a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h
index 246bce9c40b..e53dc9bc711 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h
+++ b/Demo/CEP/StationCorrelator/src/WH_Plot2MAC.h
@@ -14,7 +14,7 @@
 
 #include <lofar_config.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <GCF/PALlight/CEPPropertySet.h>
 
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_RSP.h b/Demo/CEP/StationCorrelator/src/WH_RSP.h
index 5b489bd52bf..aa2a843ee3c 100644
--- a/Demo/CEP/StationCorrelator/src/WH_RSP.h
+++ b/Demo/CEP/StationCorrelator/src/WH_RSP.h
@@ -25,7 +25,7 @@
 #define STATIONCORRELATOR_WH_RSP_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #include <DH_RSPSync.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h b/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h
index 00fe8c57b1b..2759d617e5d 100644
--- a/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h
+++ b/Demo/CEP/StationCorrelator/src/WH_RSPBoard.h
@@ -24,7 +24,7 @@
 #define STATIONCORRELATOR_WH_RSPBOARD_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #include <SyncStamp.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_RSPInput.h b/Demo/CEP/StationCorrelator/src/WH_RSPInput.h
index 4dafba45425..b5541dab47d 100644
--- a/Demo/CEP/StationCorrelator/src/WH_RSPInput.h
+++ b/Demo/CEP/StationCorrelator/src/WH_RSPInput.h
@@ -24,7 +24,7 @@
 #define STATIONCORRELATOR_WH_RSPINPUT_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #include <DH_RSPSync.h>
 
diff --git a/Demo/CEP/StationCorrelator/src/WH_Transpose.h b/Demo/CEP/StationCorrelator/src/WH_Transpose.h
index 80e29176ca8..2979c0eea98 100644
--- a/Demo/CEP/StationCorrelator/src/WH_Transpose.h
+++ b/Demo/CEP/StationCorrelator/src/WH_Transpose.h
@@ -29,7 +29,7 @@
 // one line description.
 
 //# Includes
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 
 namespace LOFAR
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h
index 0e309eed64c..be23bc8468c 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_BGL_Processing.h
@@ -24,7 +24,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h
index 3e265d896bf..00ed8d3bca8 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_Correlator.h
@@ -25,7 +25,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h
index cd9765d104b..ab94a8ee9ae 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_BGLProc/test/tWH_PPF.h
@@ -27,7 +27,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h
index f1963ddb932..0faaf5d5f8d 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/src/WH_SBCollect.h
@@ -24,7 +24,7 @@
 #define TFLOPCORRELATOR_TFC_INPUTSECTION_WH_SBCOLLECT_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 
 
diff --git a/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h b/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h
index 478013fdbbe..92dac28e562 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_InputSection/test/tWH_SBCollect.h
@@ -25,7 +25,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc b/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc
index 497e3d58d85..bea8f769bcd 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc
+++ b/Demo/CEP/TFlopCorrelator/TFC_Interface/src/DH_RSPSync.cc
@@ -12,7 +12,7 @@
 
 
 #include <DH_RSPSync.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 
 namespace LOFAR
 {
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h b/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h
index 4867a3457d5..2923c89bb84 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_Storage/src/WH_Storage.h
@@ -24,7 +24,7 @@
 #define TFLOPCORRELATOR_WH_STORAGE_H
 
 
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <tinyCEP/WorkHolder.h>
 #ifdef USE_MAC_PI
 #include <GCF/PALlight/CEPPropertySet.h>
diff --git a/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h b/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h
index b984c87e55b..decdfb4911f 100644
--- a/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h
+++ b/Demo/CEP/TFlopCorrelator/TFC_Storage/test/tAH_TestStorage.h
@@ -25,7 +25,7 @@
 
 #include <tinyCEP/TinyApplicationHolder.h>
 #include <tinyCEP/WorkHolder.h>
-#include <Common/KeyValueMap.h>
+#include <Blob/KeyValueMap.h>
 #include <Transport/Connection.h>
 #include <Transport/TransportHolder.h>
 #include <Transport/DataHolder.h>
-- 
GitLab