Revert "GH #1050 Net tests: fix gcc -Wshadow warnings"

Net/include/Poco/Net/ParallelSocketAcceptor.h

@@ -57,9 +57,9 @@ class ParallelSocketAcceptor
 public:
 	typedef Poco::Net::ParallelSocketReactor<SR> ParallelReactor;
 
-	explicit ParallelSocketAcceptor(ServerSocket& rSocket,
+	explicit ParallelSocketAcceptor(ServerSocket& socket,
 		unsigned threads = Poco::Environment::processorCount()):
-		_socket(rSocket),
+		_socket(socket),
 		_pReactor(0),
 		_threads(threads),
 		_next(0)
@@ -69,11 +69,11 @@ public:
 		init();
 	}
 
-	ParallelSocketAcceptor(ServerSocket& rSocket,
+	ParallelSocketAcceptor(ServerSocket& socket,
-		SocketReactor& rReactor,
+		SocketReactor& reactor,
 		unsigned threads = Poco::Environment::processorCount()):
-		_socket(rSocket),
+		_socket(socket),
-		_pReactor(&rReactor),
+		_pReactor(&reactor),
 		_threads(threads),
 		_next(0)
 		/// Creates a ParallelSocketAcceptor using the given ServerSocket, sets the 
@@ -104,19 +104,19 @@ public:
 		}
 	}
 
-	void setReactor(SocketReactor& rReactor)
+	void setReactor(SocketReactor& reactor)
 		/// Sets the reactor for this acceptor.
 	{
-		_pReactor = &rReactor;
+		_pReactor = &reactor;
 		if (!_pReactor->hasEventHandler(_socket, 
 			Poco::Observer<ParallelSocketAcceptor,
 			ReadableNotification>(*this, &ParallelSocketAcceptor::onAccept)))
 		{
-			registerAcceptor(rReactor);
+			registerAcceptor(reactor);
 		}
 	}
 	
-	virtual void registerAcceptor(SocketReactor& rReactor)
+	virtual void registerAcceptor(SocketReactor& reactor)
 		/// Registers the ParallelSocketAcceptor with a SocketReactor.
 		///
 		/// A subclass can override this function to e.g.
@@ -128,7 +128,7 @@ public:
 		if (_pReactor)
 			throw Poco::InvalidAccessException("Acceptor already registered.");
 
-		_pReactor = &rReactor;
+		_pReactor = &reactor;
 		_pReactor->addEventHandler(_socket,
 			Poco::Observer<ParallelSocketAcceptor,
 			ReadableNotification>(*this, &ParallelSocketAcceptor::onAccept));
@@ -161,15 +161,15 @@ public:
 	}
 
 protected:
-	virtual ServiceHandler* createServiceHandler(StreamSocket& rSocket)
+	virtual ServiceHandler* createServiceHandler(StreamSocket& socket)
 		/// Create and initialize a new ServiceHandler instance.
 		///
 		/// Subclasses can override this method.
 	{
-		std::size_t nextReactor = _next++;
+		std::size_t next = _next++;
 		if (_next == _reactors.size()) _next = 0;
-		_reactors[nextReactor]->wakeUp();
+		_reactors[next]->wakeUp();
-		return new ServiceHandler(rSocket, *_reactors[nextReactor]);
+		return new ServiceHandler(socket, *_reactors[next]);
 	}
 
 	SocketReactor* reactor()

Net/include/Poco/Net/SocketAcceptor.h

@@ -69,16 +69,16 @@ class SocketAcceptor
 	/// if special steps are necessary to create a ServiceHandler object.
 {
 public:
-	explicit SocketAcceptor(ServerSocket& rSocket):
+	explicit SocketAcceptor(ServerSocket& socket):
-		_socket(rSocket),
+		_socket(socket),
 		_pReactor(0)
 		/// Creates a SocketAcceptor, using the given ServerSocket.
 	{
 	}
 
-	SocketAcceptor(ServerSocket& rSocket, SocketReactor& rReactor):
+	SocketAcceptor(ServerSocket& socket, SocketReactor& reactor):
-		_socket(rSocket),
+		_socket(socket),
-		_pReactor(&rReactor)
+		_pReactor(&reactor)
 		/// Creates a SocketAcceptor, using the given ServerSocket.
 		/// The SocketAcceptor registers itself with the given SocketReactor.
 	{
@@ -103,18 +103,18 @@ public:
 		}
 	}
 
-	void setReactor(SocketReactor& rReactor)
+	void setReactor(SocketReactor& reactor)
 		/// Sets the reactor for this acceptor.
 	{
-		_pReactor = &rReactor;
+		_pReactor = &reactor;
 		if (!_pReactor->hasEventHandler(_socket, Poco::Observer<SocketAcceptor,
 			ReadableNotification>(*this, &SocketAcceptor::onAccept)))
 		{
-			registerAcceptor(rReactor);
+			registerAcceptor(reactor);
 		}
 	}
 
-	virtual void registerAcceptor(SocketReactor& rReactor)
+	virtual void registerAcceptor(SocketReactor& reactor)
 		/// Registers the SocketAcceptor with a SocketReactor.
 		///
 		/// A subclass can override this function to e.g.
@@ -128,7 +128,7 @@ public:
 		if (_pReactor)
 			throw Poco::InvalidAccessException("Acceptor already registered.");
 
-		_pReactor = &rReactor;
+		_pReactor = &reactor;
 		_pReactor->addEventHandler(_socket, Poco::Observer<SocketAcceptor, ReadableNotification>(*this, &SocketAcceptor::onAccept));
 	}
 	
@@ -158,12 +158,12 @@ public:
 	}
 	
 protected:
-	virtual ServiceHandler* createServiceHandler(StreamSocket& rSocket)
+	virtual ServiceHandler* createServiceHandler(StreamSocket& socket)
 		/// Create and initialize a new ServiceHandler instance.
 		///
 		/// Subclasses can override this method.
 	{
-		return new ServiceHandler(rSocket, *_pReactor);
+		return new ServiceHandler(socket, *_pReactor);
 	}
 
 	SocketReactor* reactor()

Net/include/Poco/Net/SocketConnector.h

@@ -80,13 +80,13 @@ public:
 		_socket.connectNB(address);
 	}
 
-	SocketConnector(SocketAddress& address, SocketReactor& rReactor):
+	SocketConnector(SocketAddress& address, SocketReactor& reactor):
 		_pReactor(0)
 		/// Creates an acceptor, using the given ServerSocket.
 		/// The SocketConnector registers itself with the given SocketReactor.
 	{
 		_socket.connectNB(address);
-		registerConnector(rReactor);
+		registerConnector(reactor);
 	}
 
 	virtual ~SocketConnector()
@@ -102,7 +102,7 @@ public:
 		}
 	}
 	
-	virtual void registerConnector(SocketReactor& rReactor)
+	virtual void registerConnector(SocketReactor& reactor)
 		/// Registers the SocketConnector with a SocketReactor.
 		///
 		/// A subclass can override this and, for example, also register
@@ -110,7 +110,7 @@ public:
 		///
 		/// The overriding method must call the baseclass implementation first.
 	{
-		_pReactor = &rReactor;
+		_pReactor = &reactor;
 		_pReactor->addEventHandler(_socket, Poco::Observer<SocketConnector, ReadableNotification>(*this, &SocketConnector::onReadable));
 		_pReactor->addEventHandler(_socket, Poco::Observer<SocketConnector, WritableNotification>(*this, &SocketConnector::onWritable));
 		_pReactor->addEventHandler(_socket, Poco::Observer<SocketConnector, ErrorNotification>(*this, &SocketConnector::onError));

Net/testsuite/src/DNSTest.cpp

@@ -27,7 +27,7 @@ using Poco::Net::ServiceNotFoundException;
 using Poco::Net::NoAddressFoundException;
 
 
-DNSTest::DNSTest(const std::string& rName): CppUnit::TestCase(rName)
+DNSTest::DNSTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 
@@ -52,7 +52,7 @@ void DNSTest::testHostByName()
 	
 	try
 	{
-		HostEntry he2 = DNS::hostByName("nohost.appinf.com");
+		HostEntry he1 = DNS::hostByName("nohost.appinf.com");
 		fail("host not found - must throw");
 	}
 	catch (HostNotFoundException&)

Net/testsuite/src/DatagramSocketTest.cpp

@@ -36,7 +36,7 @@ using Poco::InvalidArgumentException;
 using Poco::IOException;
 
 
-DatagramSocketTest::DatagramSocketTest(const std::string& rName): CppUnit::TestCase(rName)
+DatagramSocketTest::DatagramSocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/DialogSocketTest.cpp

@@ -23,7 +23,7 @@ using Poco::Net::DialogSocket;
 using Poco::Net::SocketAddress;
 
 
-DialogSocketTest::DialogSocketTest(const std::string& rName): CppUnit::TestCase(rName)
+DialogSocketTest::DialogSocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/FTPClientSessionTest.cpp

@@ -63,7 +63,7 @@ namespace
 };
 
 
-FTPClientSessionTest::FTPClientSessionTest(const std::string& rName): CppUnit::TestCase(rName)
+FTPClientSessionTest::FTPClientSessionTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/FTPStreamFactoryTest.cpp

@@ -46,7 +46,7 @@ namespace
 }
 
 
-FTPStreamFactoryTest::FTPStreamFactoryTest(const std::string& rName): CppUnit::TestCase(rName)
+FTPStreamFactoryTest::FTPStreamFactoryTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTMLFormTest.cpp

@@ -75,7 +75,7 @@ namespace
 }
 
 
-HTMLFormTest::HTMLFormTest(const std::string& rName): CppUnit::TestCase(rName)
+HTMLFormTest::HTMLFormTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPClientSessionTest.cpp

@@ -30,7 +30,7 @@ using Poco::Net::HTTPMessage;
 using Poco::StreamCopier;
 
 
-HTTPClientSessionTest::HTTPClientSessionTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPClientSessionTest::HTTPClientSessionTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPCookieTest.cpp

@@ -35,7 +35,7 @@ using Poco::Net::NameValueCollection;
 using Poco::Net::HTTPCookie;
 
 
-HTTPCookieTest::HTTPCookieTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPCookieTest::HTTPCookieTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPCredentialsTest.cpp

@@ -32,7 +32,7 @@ using Poco::Net::HTTPCredentials;
 using Poco::Net::NotAuthenticatedException;
 
 
-HTTPCredentialsTest::HTTPCredentialsTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPCredentialsTest::HTTPCredentialsTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPRequestTest.cpp

@@ -24,7 +24,7 @@ using Poco::Net::MessageException;
 using Poco::Net::NameValueCollection;
 
 
-HTTPRequestTest::HTTPRequestTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPRequestTest::HTTPRequestTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPResponseTest.cpp

@@ -25,7 +25,7 @@ using Poco::Net::HTTPCookie;
 using Poco::Net::MessageException;
 
 
-HTTPResponseTest::HTTPResponseTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPResponseTest::HTTPResponseTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPServerTest.cpp

@@ -128,7 +128,7 @@ namespace
 }
 
 
-HTTPServerTest::HTTPServerTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPServerTest::HTTPServerTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/HTTPStreamFactoryTest.cpp

@@ -30,7 +30,7 @@ using Poco::URI;
 using Poco::StreamCopier;
 
 
-HTTPStreamFactoryTest::HTTPStreamFactoryTest(const std::string& rName): CppUnit::TestCase(rName)
+HTTPStreamFactoryTest::HTTPStreamFactoryTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/ICMPClientTest.cpp

@@ -34,8 +34,8 @@ using Poco::Delegate;
 using Poco::AutoPtr;
 
 
-ICMPClientTest::ICMPClientTest(const std::string& rName): 
+ICMPClientTest::ICMPClientTest(const std::string& name): 
-	CppUnit::TestCase(rName),
+	CppUnit::TestCase(name),
 	_icmpClient(IPAddress::IPv4)
 {
 }

Net/testsuite/src/ICMPSocketTest.cpp

@@ -31,7 +31,7 @@ using Poco::TimeoutException;
 using Poco::Net::ICMPException;
 
 
-ICMPSocketTest::ICMPSocketTest(const std::string& rName): CppUnit::TestCase(rName)
+ICMPSocketTest::ICMPSocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/IPAddressTest.cpp

@@ -21,7 +21,7 @@ using Poco::Net::IPAddress;
 using Poco::Net::InvalidAddressException;
 
 
-IPAddressTest::IPAddressTest(const std::string& rName): CppUnit::TestCase(rName)
+IPAddressTest::IPAddressTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MailMessageTest.cpp

@@ -53,14 +53,14 @@ namespace
 		{
 			_disp.push_back(header["Content-Disposition"]);
 			_type.push_back(header["Content-Type"]);
-			std::string dataString;
+			std::string data;
 			int ch = stream.get();
 			while (ch > 0)
 			{
-				dataString += (char) ch;
+				data += (char) ch;
 				ch = stream.get();
 			}
-			_data.push_back(dataString);
+			_data.push_back(data);
 		}
 		
 		const std::vector<std::string>& data() const
@@ -86,7 +86,7 @@ namespace
 }
 
 
-MailMessageTest::MailMessageTest(const std::string& rName): CppUnit::TestCase(rName)
+MailMessageTest::MailMessageTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MailStreamTest.cpp

@@ -23,7 +23,7 @@ using Poco::Net::MailOutputStream;
 using Poco::StreamCopier;
 
 
-MailStreamTest::MailStreamTest(const std::string& rName): CppUnit::TestCase(rName)
+MailStreamTest::MailStreamTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MediaTypeTest.cpp

@@ -19,7 +19,7 @@
 using Poco::Net::MediaType;
 
 
-MediaTypeTest::MediaTypeTest(const std::string& rName): CppUnit::TestCase(rName)
+MediaTypeTest::MediaTypeTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MessageHeaderTest.cpp

@@ -23,7 +23,7 @@ using Poco::Net::NameValueCollection;
 using Poco::Net::MessageException;
 
 
-MessageHeaderTest::MessageHeaderTest(const std::string& rName): CppUnit::TestCase(rName)
+MessageHeaderTest::MessageHeaderTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MulticastSocketTest.cpp

@@ -37,7 +37,7 @@ using Poco::InvalidArgumentException;
 using Poco::IOException;
 
 
-MulticastSocketTest::MulticastSocketTest(const std::string& rName): CppUnit::TestCase(rName)
+MulticastSocketTest::MulticastSocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MultipartReaderTest.cpp

@@ -24,7 +24,7 @@ using Poco::Net::MessageHeader;
 using Poco::Net::MultipartException;
 
 
-MultipartReaderTest::MultipartReaderTest(const std::string& rName): CppUnit::TestCase(rName)
+MultipartReaderTest::MultipartReaderTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/MultipartWriterTest.cpp

@@ -22,7 +22,7 @@ using Poco::Net::MultipartWriter;
 using Poco::Net::MessageHeader;
 
 
-MultipartWriterTest::MultipartWriterTest(const std::string& rName): CppUnit::TestCase(rName)
+MultipartWriterTest::MultipartWriterTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/NTPClientTest.cpp

@@ -34,8 +34,8 @@ using Poco::Delegate;
 using Poco::AutoPtr;
 
 
-NTPClientTest::NTPClientTest(const std::string& rName): 
+NTPClientTest::NTPClientTest(const std::string& name): 
-	CppUnit::TestCase(rName),
+	CppUnit::TestCase(name),
 	_ntpClient(IPAddress::IPv4)
 {
 }

Net/testsuite/src/NameValueCollectionTest.cpp

@@ -21,7 +21,7 @@ using Poco::Net::NameValueCollection;
 using Poco::NotFoundException;
 
 
-NameValueCollectionTest::NameValueCollectionTest(const std::string& rName): CppUnit::TestCase(rName)
+NameValueCollectionTest::NameValueCollectionTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/NetworkInterfaceTest.cpp

@@ -29,7 +29,7 @@ using Poco::Net::IPAddress;
 using Poco::NotFoundException;
 
 
-NetworkInterfaceTest::NetworkInterfaceTest(const std::string& rName): CppUnit::TestCase(rName)
+NetworkInterfaceTest::NetworkInterfaceTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/OAuth10CredentialsTest.cpp

@@ -29,7 +29,7 @@ using Poco::Net::HTMLForm;
 using Poco::URI;
 
 
-OAuth10CredentialsTest::OAuth10CredentialsTest(const std::string& rName): CppUnit::TestCase(rName)
+OAuth10CredentialsTest::OAuth10CredentialsTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/OAuth20CredentialsTest.cpp

@@ -23,7 +23,7 @@ using Poco::Net::OAuth20Credentials;
 using Poco::Net::NotAuthenticatedException;
 
 
-OAuth20CredentialsTest::OAuth20CredentialsTest(const std::string& rName): CppUnit::TestCase(rName)
+OAuth20CredentialsTest::OAuth20CredentialsTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/POP3ClientSessionTest.cpp

@@ -25,7 +25,7 @@ using Poco::Net::MailMessage;
 using Poco::Net::POP3Exception;
 
 
-POP3ClientSessionTest::POP3ClientSessionTest(const std::string& rName): CppUnit::TestCase(rName)
+POP3ClientSessionTest::POP3ClientSessionTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/QuotedPrintableTest.cpp

@@ -22,7 +22,7 @@ using Poco::Net::QuotedPrintableEncoder;
 using Poco::Net::QuotedPrintableDecoder;
 
 
-QuotedPrintableTest::QuotedPrintableTest(const std::string& rName): CppUnit::TestCase(rName)
+QuotedPrintableTest::QuotedPrintableTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/RawSocketTest.cpp

@@ -33,7 +33,7 @@ using Poco::InvalidArgumentException;
 using Poco::IOException;
 
 
-RawSocketTest::RawSocketTest(const std::string& rName): CppUnit::TestCase(rName)
+RawSocketTest::RawSocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/SMTPClientSessionTest.cpp

@@ -26,7 +26,7 @@ using Poco::Net::MailRecipient;
 using Poco::Net::SMTPException;
 
 
-SMTPClientSessionTest::SMTPClientSessionTest(const std::string& rName): CppUnit::TestCase(rName)
+SMTPClientSessionTest::SMTPClientSessionTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/SocketAddressTest.cpp

@@ -26,7 +26,7 @@ using Poco::Net::NoAddressFoundException;
 using Poco::InvalidArgumentException;
 
 
-SocketAddressTest::SocketAddressTest(const std::string& rName): CppUnit::TestCase(rName)
+SocketAddressTest::SocketAddressTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 
@@ -61,7 +61,7 @@ void SocketAddressTest::testSocketAddress()
 
 	try
 	{
-		SocketAddress sa4("192.168.1.100", "f00bar");
+		SocketAddress sa3("192.168.1.100", "f00bar");
 		fail("bad service name - must throw");
 	}
 	catch (ServiceNotFoundException&)

Net/testsuite/src/SocketReactorTest.cpp

@@ -136,8 +136,8 @@ namespace
 			checkWritableObserverCount(1);
 			_reactor.removeEventHandler(_socket, Observer<ClientServiceHandler, WritableNotification>(*this, &ClientServiceHandler::onWritable));
 			checkWritableObserverCount(0);
-			std::string dataString(1024, 'x');
+			std::string data(1024, 'x');
-			_socket.sendBytes(dataString.data(), (int) dataString.length());
+			_socket.sendBytes(data.data(), (int) data.length());
 			_socket.shutdownSend();
 		}
 		
@@ -253,13 +253,13 @@ namespace
 	class FailConnector: public SocketConnector<ClientServiceHandler>
 	{
 	public:
-		FailConnector(SocketAddress& address, SocketReactor& rReactor):
+		FailConnector(SocketAddress& address, SocketReactor& reactor):
-			SocketConnector<ClientServiceHandler>(address, rReactor),
+			SocketConnector<ClientServiceHandler>(address, reactor),
 			_failed(false),
 			_shutdown(false)
 		{
-			rReactor.addEventHandler(socket(), Observer<FailConnector, TimeoutNotification>(*this, &FailConnector::onTimeout));
+			reactor.addEventHandler(socket(), Observer<FailConnector, TimeoutNotification>(*this, &FailConnector::onTimeout));
-			rReactor.addEventHandler(socket(), Observer<FailConnector, ShutdownNotification>(*this, &FailConnector::onShutdown));
+			reactor.addEventHandler(socket(), Observer<FailConnector, ShutdownNotification>(*this, &FailConnector::onShutdown));
 		}
 		
 		void onShutdown(ShutdownNotification* pNf)
@@ -298,7 +298,7 @@ namespace
 }
 
 
-SocketReactorTest::SocketReactorTest(const std::string& rName): CppUnit::TestCase(rName)
+SocketReactorTest::SocketReactorTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/SocketStreamTest.cpp

@@ -35,7 +35,7 @@ using Poco::TimeoutException;
 using Poco::InvalidArgumentException;
 
 
-SocketStreamTest::SocketStreamTest(const std::string& rName): CppUnit::TestCase(rName)
+SocketStreamTest::SocketStreamTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/SocketTest.cpp

@@ -41,7 +41,7 @@ using Poco::FIFOBuffer;
 using Poco::delegate;
 
 
-SocketTest::SocketTest(const std::string& rName): CppUnit::TestCase(rName)
+SocketTest::SocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/SyslogTest.cpp

@@ -112,7 +112,7 @@ void CachingChannel::getMessages(std::vector<Poco::Message>& msg, int offset, in
 }
 
 
-SyslogTest::SyslogTest(const std::string& rName): CppUnit::TestCase(rName)
+SyslogTest::SyslogTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/TCPServerTest.cpp

@@ -65,7 +65,7 @@ namespace
 }
 
 
-TCPServerTest::TCPServerTest(const std::string& rName): CppUnit::TestCase(rName)
+TCPServerTest::TCPServerTest(const std::string& name): CppUnit::TestCase(name)
 {
 }
 

Net/testsuite/src/WebSocketTest.cpp

@@ -101,7 +101,7 @@ namespace
 }
 
 
-WebSocketTest::WebSocketTest(const std::string& rName): CppUnit::TestCase(rName)
+WebSocketTest::WebSocketTest(const std::string& name): CppUnit::TestCase(name)
 {
 }