int -> timeout_t replacements

extensions/MBTCPMaster/MBMaster.cc

@@ -127,8 +127,8 @@ prefix(prefix)
 	if( activateTimeout <= 0 )
 		activateTimeout = 20000;
 
-	int msec = conf->getArgInt("--" + prefix + "-timeout",it.getProp("timeout"));
-	if( msec <= 0 )
+	timeout_t msec = conf->getArgInt("--" + prefix + "-timeout",it.getProp("timeout"));
+	if( msec == 0 )
 		msec = 3000;
 
 	ptTimeout.setTiming(msec);

extensions/ModbusSlave/MBSlave.cc

@@ -188,8 +188,8 @@ prefix(prefix)
 	if( activateTimeout <= 0 )
 		activateTimeout = 20000;
 
-	int msec = conf->getArgInt("--" + prefix + "-timeout",it.getProp("timeout"));
-	if( msec <=0 )
+	timeout_t msec = conf->getArgInt("--" + prefix + "-timeout",it.getProp("timeout"));
+	if( msec == 0 )
 		msec = 3000;
 
 	ptTimeout.setTiming(msec);

extensions/UDPExchange/UDPExchange.cc

@@ -132,8 +132,8 @@ maxItem(0)
 	if( activateTimeout <= 0 )
 		activateTimeout = 20000;
 
-	int msec = conf->getArgInt("--udp-timeout",it.getProp("timeout"));
-	if( msec <= 0 )
+	timeout_t msec = conf->getArgInt("--udp-timeout",it.getProp("timeout"));
+	if( msec == 0 )
 		msec = 3000;
 
 	dlog[Debug::INFO] << myname << "(init): udp-timeout=" << msec << " msec" << endl;

extensions/lib/UObject_SK.cc

@@ -57,8 +57,8 @@ activated(false)
 	if( activateTimeout <= 0 )
 		activateTimeout = 20000;
 
-	int msec = conf->getArgInt("--startup-timeout");
-	if( msec <= 0 )
+	timeout_t msec = conf->getArgInt("--startup-timeout");
+	if( msec == 0 )
 		msec = 10000;
 	ptStartUpTimeout.setTiming(msec);
 }

include/SViewer.h

@@ -32,6 +32,7 @@
 #include "IOController_i.hh"
 #include "ObjectRepository.h"
 #include "UniversalInterface.h"
+#include "PassiveTimer.h"
 //--------------------------------------------------------------------------------
 class SViewer 
 {   
@@ -41,7 +42,7 @@ class SViewer
 		virtual ~SViewer();
 
 		void view();
-		void monitor( int timeoutMS=500 );
+		void monitor( timeout_t timeoutMS=500 );
 		
 	protected:
         friend class SViewer_glade;

src/Timers/PassiveSysTimer.cc

@@ -111,8 +111,8 @@ bool PassiveSysTimer::wait(timeout_t timeMS)
 //		terminate();
 	terminated = 0;
 
-	int sec;
-	int msec;
+	timeout_t sec;
+	timeout_t msec;
 	
 	if (timeMS == WaitUpTime)
 	{

src/Various/SViewer.cc

@@ -57,7 +57,7 @@ void SViewer::on_SViewer_destroy()
 //	activator->oakill(SIGKILL);
 }
 // --------------------------------------------------------------------------
-void SViewer::monitor( int timeMS )
+void SViewer::monitor( timeout_t timeMS )
 {
 	for(;;)
 	{