Mergers: remove to be deprecated API.

ktf · ktf · commit 299a6037b6b7 · 2018-11-01T23:11:47.000+01:00
diff --git a/Utilities/QC/QCMerger/src/MergerDevice.cxx b/Utilities/QC/QCMerger/src/MergerDevice.cxx
@@ -59,7 +59,6 @@ void MergerDevice::establishChannel(string type, string method, string address,
 void MergerDevice::executeRunLoop()
 {
   ChangeState("INIT_DEVICE");
-  WaitForInitialValidation();
   WaitForEndOfState("INIT_DEVICE");
 
   subscribeDdsCommands();
diff --git a/Utilities/QC/QCProducer/src/ProducerDevice.cxx b/Utilities/QC/QCProducer/src/ProducerDevice.cxx
@@ -169,7 +169,6 @@ void ProducerDevice::establishChannel(std::string type, std::string method, std:
 void ProducerDevice::executeRunLoop()
 {
   ChangeState("INIT_DEVICE");
-  WaitForInitialValidation();
   WaitForEndOfState("INIT_DEVICE");
 
   subscribeDdsCommands();
diff --git a/Utilities/QC/QCViewer/src/ViewerDevice.cxx b/Utilities/QC/QCViewer/src/ViewerDevice.cxx
@@ -83,7 +83,6 @@ TObject* ViewerDevice::receiveDataObjectFromMerger()
 void ViewerDevice::executeRunLoop()
 {
   ChangeState("INIT_DEVICE");
-  WaitForInitialValidation();
   WaitForEndOfState("INIT_DEVICE");
 
   ChangeState("INIT_TASK");

Original file line number	Diff line number	Diff line change
`@@ -59,7 +59,6 @@ void MergerDevice::establishChannel(string type, string method, string address,`
`59`	`59`	`void MergerDevice::executeRunLoop()`
`60`	`60`	`{`
`61`	`61`	`ChangeState("INIT_DEVICE");`
`62`		`- WaitForInitialValidation();`
`63`	`62`	`WaitForEndOfState("INIT_DEVICE");`
`64`	`63`
`65`	`64`	`subscribeDdsCommands();`
Original file line number	Diff line number	Diff line change
`@@ -169,7 +169,6 @@ void ProducerDevice::establishChannel(std::string type, std::string method, std:`
`169`	`169`	`void ProducerDevice::executeRunLoop()`
`170`	`170`	`{`
`171`	`171`	`ChangeState("INIT_DEVICE");`
`172`		`- WaitForInitialValidation();`
`173`	`172`	`WaitForEndOfState("INIT_DEVICE");`
`174`	`173`
`175`	`174`	`subscribeDdsCommands();`
Original file line number	Diff line number	Diff line change
`@@ -83,7 +83,6 @@ TObject* ViewerDevice::receiveDataObjectFromMerger()`
`83`	`83`	`void ViewerDevice::executeRunLoop()`
`84`	`84`	`{`
`85`	`85`	`ChangeState("INIT_DEVICE");`
`86`		`- WaitForInitialValidation();`
`87`	`86`	`WaitForEndOfState("INIT_DEVICE");`
`88`	`87`
`89`	`88`	`ChangeState("INIT_TASK");`