From 7cf5d2a0a32cec9cdf6f56b06e371e2238a99e06 Mon Sep 17 00:00:00 2001
From: Jan David Mol <mol@astron.nl>
Date: Mon, 11 Oct 2010 11:52:18 +0000
Subject: [PATCH] bug 1362: CN_Stream -> Stream
---
.gitattributes | 4 ++--
RTCP/CNProc/src/CN_Processing_main.cc | 2 +-
RTCP/IONProc/src/BeamletBufferToComputeNode.cc | 2 +-
RTCP/IONProc/src/ION_main.cc | 2 +-
RTCP/IONProc/src/InputSection.cc | 2 +-
RTCP/IONProc/src/OutputThread.cc | 2 +-
RTCP/Interface/include/Interface/CMakeLists.txt | 2 +-
.../Interface/include/Interface/{CN_Stream.h => Stream.h} | 8 ++++----
RTCP/Interface/src/CMakeLists.txt | 2 +-
RTCP/Interface/src/{CN_Stream.cc => Stream.cc} | 6 +++---
RTCP/Storage/src/InputThread.cc | 2 +-
11 files changed, 17 insertions(+), 17 deletions(-)
rename RTCP/Interface/include/Interface/{CN_Stream.h => Stream.h} (87%)
rename RTCP/Interface/src/{CN_Stream.cc => Stream.cc} (97%)
diff --git a/.gitattributes b/.gitattributes
index 8ce206f6206..757cccd5b29 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1797,15 +1797,15 @@ RTCP/Interface/include/Interface/BFRawFormat.h -text
RTCP/Interface/include/Interface/BeamCoordinates.h -text
RTCP/Interface/include/Interface/BeamFormedData.h -text
RTCP/Interface/include/Interface/CN_ProcessingPlan.h -text
-RTCP/Interface/include/Interface/CN_Stream.h -text
RTCP/Interface/include/Interface/InverseFilteredData.h -text
RTCP/Interface/include/Interface/ProcessingPlan.h -text
RTCP/Interface/include/Interface/StokesData.h -text
+RTCP/Interface/include/Interface/Stream.h -text
RTCP/Interface/include/Interface/StreamableData.h -text
RTCP/Interface/include/Interface/TransposedBeamFormedData.h -text
RTCP/Interface/src/BeamCoordinates.cc -text
RTCP/Interface/src/CN_ProcessingPlan.cc -text
-RTCP/Interface/src/CN_Stream.cc -text
+RTCP/Interface/src/Stream.cc -text
RTCP/LofarStMan/CMakeLists.txt -text
RTCP/LofarStMan/include/LofarStMan/CMakeLists.txt -text
RTCP/LofarStMan/src/CMakeLists.txt -text
diff --git a/RTCP/CNProc/src/CN_Processing_main.cc b/RTCP/CNProc/src/CN_Processing_main.cc
index 38bc45dd8dd..17f866792d7 100644
--- a/RTCP/CNProc/src/CN_Processing_main.cc
+++ b/RTCP/CNProc/src/CN_Processing_main.cc
@@ -24,7 +24,7 @@
#include <Interface/CN_Command.h>
#include <Interface/CN_Configuration.h>
#include <Interface/Exceptions.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <CNProc/LocationInfo.h>
#include <CNProc/CN_Processing.h>
#include <Common/LofarLogger.h>
diff --git a/RTCP/IONProc/src/BeamletBufferToComputeNode.cc b/RTCP/IONProc/src/BeamletBufferToComputeNode.cc
index 80601833fd5..3affe7d4655 100644
--- a/RTCP/IONProc/src/BeamletBufferToComputeNode.cc
+++ b/RTCP/IONProc/src/BeamletBufferToComputeNode.cc
@@ -35,7 +35,7 @@
#include <Interface/BFRawFormat.h>
#include <Interface/CN_Command.h>
#include <Interface/CN_Mapping.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <Interface/SubbandMetaData.h>
#include <Interface/Exceptions.h>
diff --git a/RTCP/IONProc/src/ION_main.cc b/RTCP/IONProc/src/ION_main.cc
index 99ede0985e1..3e31fc00602 100644
--- a/RTCP/IONProc/src/ION_main.cc
+++ b/RTCP/IONProc/src/ION_main.cc
@@ -24,7 +24,7 @@
#include <Common/LofarLogger.h>
#include <Common/SystemCallException.h>
#include <Interface/CN_Command.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <Interface/CN_Mapping.h>
#include <Interface/Exceptions.h>
#include <Interface/Parset.h>
diff --git a/RTCP/IONProc/src/InputSection.cc b/RTCP/IONProc/src/InputSection.cc
index 3d43d4ac406..ed2a44ed8f8 100644
--- a/RTCP/IONProc/src/InputSection.cc
+++ b/RTCP/IONProc/src/InputSection.cc
@@ -26,7 +26,7 @@
//# Includes
#include <InputSection.h>
#include <Stream/SocketStream.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <boost/format.hpp>
using boost::format;
diff --git a/RTCP/IONProc/src/OutputThread.cc b/RTCP/IONProc/src/OutputThread.cc
index 1f06efdb71c..08dbcd14dc6 100644
--- a/RTCP/IONProc/src/OutputThread.cc
+++ b/RTCP/IONProc/src/OutputThread.cc
@@ -27,7 +27,7 @@
#include <IONProc/ION_Allocator.h>
#include <IONProc/OutputThread.h>
#include <IONProc/Scheduling.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <Stream/SocketStream.h>
#include <Thread/Semaphore.h>
diff --git a/RTCP/Interface/include/Interface/CMakeLists.txt b/RTCP/Interface/include/Interface/CMakeLists.txt
index 363a2597688..9a5a30f3f7f 100644
--- a/RTCP/Interface/include/Interface/CMakeLists.txt
+++ b/RTCP/Interface/include/Interface/CMakeLists.txt
@@ -8,7 +8,7 @@ set(inst_HEADERS
CN_Command.h
CN_Configuration.h
CN_Mapping.h
- CN_Stream.h
+ Stream.h
CorrelatedData.h
Config.h
FilteredData.h
diff --git a/RTCP/Interface/include/Interface/CN_Stream.h b/RTCP/Interface/include/Interface/Stream.h
similarity index 87%
rename from RTCP/Interface/include/Interface/CN_Stream.h
rename to RTCP/Interface/include/Interface/Stream.h
index f8fb43f30fc..9b6c9488f43 100644
--- a/RTCP/Interface/include/Interface/CN_Stream.h
+++ b/RTCP/Interface/include/Interface/Stream.h
@@ -1,4 +1,4 @@
-//# CN_Stream.h: functions to construct streams between ION/CN/Storage
+//# Stream.h: functions to construct streams between ION/CN/Storage
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -18,10 +18,10 @@
//# along with this program; if not, write to the Free Software
//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//#
-//# $Id: CN_Stream.h 16488 2010-10-07 10:06:14Z mol $
+//# $Id: Stream.h 16488 2010-10-07 10:06:14Z mol $
-#ifndef LOFAR_INTERFACE_CN_STREAM_H
-#define LOFAR_INTERFACE_CN_STREAM_H
+#ifndef LOFAR_INTERFACE_STREAM_H
+#define LOFAR_INTERFACE_STREAM_H
#include <Stream/Stream.h>
#include <string>
diff --git a/RTCP/Interface/src/CMakeLists.txt b/RTCP/Interface/src/CMakeLists.txt
index 1d93b026ad6..af509877695 100644
--- a/RTCP/Interface/src/CMakeLists.txt
+++ b/RTCP/Interface/src/CMakeLists.txt
@@ -9,7 +9,7 @@ lofar_add_library(interface
CN_Configuration.cc
CN_Mapping.cc
CN_ProcessingPlan.cc
- CN_Stream.cc
+ Stream.cc
Parset.cc
RSPTimeStamp.cc)
diff --git a/RTCP/Interface/src/CN_Stream.cc b/RTCP/Interface/src/Stream.cc
similarity index 97%
rename from RTCP/Interface/src/CN_Stream.cc
rename to RTCP/Interface/src/Stream.cc
index 519e776a478..dcf606d3bd0 100644
--- a/RTCP/Interface/src/CN_Stream.cc
+++ b/RTCP/Interface/src/Stream.cc
@@ -1,4 +1,4 @@
-//# CN_Stream.cc: one line descriptor
+//# Stream.cc: one line descriptor
//#
//# Copyright (C) 2006
//# ASTRON (Netherlands Foundation for Research in Astronomy)
@@ -18,7 +18,7 @@
//# along with this program; if not, write to the Free Software
//# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
//#
-//# $Id: CN_Stream.cc 16396 2010-09-27 12:12:24Z mol $
+//# $Id: Stream.cc 16396 2010-09-27 12:12:24Z mol $
//# Always #include <lofar_config.h> first!
#include <lofar_config.h>
@@ -26,7 +26,7 @@
//# Includes
#include <Common/LofarLogger.h>
#include <Interface/Exceptions.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <Common/StringUtil.h>
#include <Stream/FileStream.h>
diff --git a/RTCP/Storage/src/InputThread.cc b/RTCP/Storage/src/InputThread.cc
index 7c3f8d4ec9e..3b9e2190101 100644
--- a/RTCP/Storage/src/InputThread.cc
+++ b/RTCP/Storage/src/InputThread.cc
@@ -24,7 +24,7 @@
#include <lofar_config.h>
#include <Storage/InputThread.h>
-#include <Interface/CN_Stream.h>
+#include <Interface/Stream.h>
#include <Stream/NullStream.h>
#include <Stream/SocketStream.h>
#include <Common/DataConvert.h>
--
GitLab