diff --git a/Net/include/Poco/Net/ParallelSocketAcceptor.h b/Net/include/Poco/Net/ParallelSocketAcceptor.h index 4bf1a6a08..71533cc76 100644 --- a/Net/include/Poco/Net/ParallelSocketAcceptor.h +++ b/Net/include/Poco/Net/ParallelSocketAcceptor.h @@ -57,9 +57,9 @@ class ParallelSocketAcceptor public: typedef Poco::Net::ParallelSocketReactor 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, - SocketReactor& rReactor, + ParallelSocketAcceptor(ServerSocket& socket, + SocketReactor& reactor, unsigned threads = Poco::Environment::processorCount()): - _socket(rSocket), - _pReactor(&rReactor), + _socket(socket), + _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(*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(*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(); - return new ServiceHandler(rSocket, *_reactors[nextReactor]); + _reactors[next]->wakeUp(); + return new ServiceHandler(socket, *_reactors[next]); } SocketReactor* reactor() diff --git a/Net/include/Poco/Net/SocketAcceptor.h b/Net/include/Poco/Net/SocketAcceptor.h index f811980f3..ff2bfa79d 100644 --- a/Net/include/Poco/Net/SocketAcceptor.h +++ b/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): - _socket(rSocket), + explicit SocketAcceptor(ServerSocket& socket): + _socket(socket), _pReactor(0) /// Creates a SocketAcceptor, using the given ServerSocket. { } - SocketAcceptor(ServerSocket& rSocket, SocketReactor& rReactor): - _socket(rSocket), - _pReactor(&rReactor) + SocketAcceptor(ServerSocket& socket, SocketReactor& reactor): + _socket(socket), + _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(*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(*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() diff --git a/Net/include/Poco/Net/SocketConnector.h b/Net/include/Poco/Net/SocketConnector.h index 2f84da82e..86e261cf8 100644 --- a/Net/include/Poco/Net/SocketConnector.h +++ b/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(*this, &SocketConnector::onReadable)); _pReactor->addEventHandler(_socket, Poco::Observer(*this, &SocketConnector::onWritable)); _pReactor->addEventHandler(_socket, Poco::Observer(*this, &SocketConnector::onError)); diff --git a/Net/testsuite/src/DNSTest.cpp b/Net/testsuite/src/DNSTest.cpp index cc53b6399..559cad4e0 100644 --- a/Net/testsuite/src/DNSTest.cpp +++ b/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&) diff --git a/Net/testsuite/src/DatagramSocketTest.cpp b/Net/testsuite/src/DatagramSocketTest.cpp index 0e66afebb..b5d7a54d5 100644 --- a/Net/testsuite/src/DatagramSocketTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/DialogSocketTest.cpp b/Net/testsuite/src/DialogSocketTest.cpp index f8a8e2de8..f9c895d12 100644 --- a/Net/testsuite/src/DialogSocketTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/FTPClientSessionTest.cpp b/Net/testsuite/src/FTPClientSessionTest.cpp index 14c33f5cb..062104265 100644 --- a/Net/testsuite/src/FTPClientSessionTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/FTPStreamFactoryTest.cpp b/Net/testsuite/src/FTPStreamFactoryTest.cpp index e3b564967..1a7e78d94 100644 --- a/Net/testsuite/src/FTPStreamFactoryTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTMLFormTest.cpp b/Net/testsuite/src/HTMLFormTest.cpp index 04bce115e..6966d50ad 100644 --- a/Net/testsuite/src/HTMLFormTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPClientSessionTest.cpp b/Net/testsuite/src/HTTPClientSessionTest.cpp index 423c6f430..87a31d697 100644 --- a/Net/testsuite/src/HTTPClientSessionTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPCookieTest.cpp b/Net/testsuite/src/HTTPCookieTest.cpp index bdaf0570e..ff290349d 100644 --- a/Net/testsuite/src/HTTPCookieTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPCredentialsTest.cpp b/Net/testsuite/src/HTTPCredentialsTest.cpp index 63461642d..9741bd7b9 100644 --- a/Net/testsuite/src/HTTPCredentialsTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPRequestTest.cpp b/Net/testsuite/src/HTTPRequestTest.cpp index ff79f1ae9..ff72cad0d 100644 --- a/Net/testsuite/src/HTTPRequestTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPResponseTest.cpp b/Net/testsuite/src/HTTPResponseTest.cpp index 6bf992429..49b865e1c 100644 --- a/Net/testsuite/src/HTTPResponseTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPServerTest.cpp b/Net/testsuite/src/HTTPServerTest.cpp index 251e1a713..7dc31b554 100644 --- a/Net/testsuite/src/HTTPServerTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/HTTPStreamFactoryTest.cpp b/Net/testsuite/src/HTTPStreamFactoryTest.cpp index ac6277487..9c513e87f 100644 --- a/Net/testsuite/src/HTTPStreamFactoryTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/ICMPClientTest.cpp b/Net/testsuite/src/ICMPClientTest.cpp index 5771459c3..1ac1923a8 100644 --- a/Net/testsuite/src/ICMPClientTest.cpp +++ b/Net/testsuite/src/ICMPClientTest.cpp @@ -34,8 +34,8 @@ using Poco::Delegate; using Poco::AutoPtr; -ICMPClientTest::ICMPClientTest(const std::string& rName): - CppUnit::TestCase(rName), +ICMPClientTest::ICMPClientTest(const std::string& name): + CppUnit::TestCase(name), _icmpClient(IPAddress::IPv4) { } diff --git a/Net/testsuite/src/ICMPSocketTest.cpp b/Net/testsuite/src/ICMPSocketTest.cpp index a6374ecfc..8906f3951 100644 --- a/Net/testsuite/src/ICMPSocketTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/IPAddressTest.cpp b/Net/testsuite/src/IPAddressTest.cpp index b702fea47..e80db2dd0 100644 --- a/Net/testsuite/src/IPAddressTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/MailMessageTest.cpp b/Net/testsuite/src/MailMessageTest.cpp index bfc016b19..bf2c95585 100644 --- a/Net/testsuite/src/MailMessageTest.cpp +++ b/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& 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) { } diff --git a/Net/testsuite/src/MailStreamTest.cpp b/Net/testsuite/src/MailStreamTest.cpp index ebd9837a6..30565db9c 100644 --- a/Net/testsuite/src/MailStreamTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/MediaTypeTest.cpp b/Net/testsuite/src/MediaTypeTest.cpp index 8bdc5fe94..6a2e717b3 100644 --- a/Net/testsuite/src/MediaTypeTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/MessageHeaderTest.cpp b/Net/testsuite/src/MessageHeaderTest.cpp index ddbb70b31..a32fc3da4 100644 --- a/Net/testsuite/src/MessageHeaderTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/MulticastSocketTest.cpp b/Net/testsuite/src/MulticastSocketTest.cpp index a36bd3fb3..1bac859af 100644 --- a/Net/testsuite/src/MulticastSocketTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/MultipartReaderTest.cpp b/Net/testsuite/src/MultipartReaderTest.cpp index a6cddc1ca..d34a0e42c 100644 --- a/Net/testsuite/src/MultipartReaderTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/MultipartWriterTest.cpp b/Net/testsuite/src/MultipartWriterTest.cpp index ff741f716..62da0d066 100644 --- a/Net/testsuite/src/MultipartWriterTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/NTPClientTest.cpp b/Net/testsuite/src/NTPClientTest.cpp index 0d689b169..64aa40724 100644 --- a/Net/testsuite/src/NTPClientTest.cpp +++ b/Net/testsuite/src/NTPClientTest.cpp @@ -34,8 +34,8 @@ using Poco::Delegate; using Poco::AutoPtr; -NTPClientTest::NTPClientTest(const std::string& rName): - CppUnit::TestCase(rName), +NTPClientTest::NTPClientTest(const std::string& name): + CppUnit::TestCase(name), _ntpClient(IPAddress::IPv4) { } diff --git a/Net/testsuite/src/NameValueCollectionTest.cpp b/Net/testsuite/src/NameValueCollectionTest.cpp index d85bb1c57..d800673b4 100644 --- a/Net/testsuite/src/NameValueCollectionTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/NetworkInterfaceTest.cpp b/Net/testsuite/src/NetworkInterfaceTest.cpp index f7079df2b..7f828f565 100644 --- a/Net/testsuite/src/NetworkInterfaceTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/OAuth10CredentialsTest.cpp b/Net/testsuite/src/OAuth10CredentialsTest.cpp index e6e7429f7..ad546419e 100644 --- a/Net/testsuite/src/OAuth10CredentialsTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/OAuth20CredentialsTest.cpp b/Net/testsuite/src/OAuth20CredentialsTest.cpp index c5509151a..8f0594720 100644 --- a/Net/testsuite/src/OAuth20CredentialsTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/POP3ClientSessionTest.cpp b/Net/testsuite/src/POP3ClientSessionTest.cpp index 1ffb05909..b9b0b23a3 100644 --- a/Net/testsuite/src/POP3ClientSessionTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/QuotedPrintableTest.cpp b/Net/testsuite/src/QuotedPrintableTest.cpp index 1f9e7684c..d2b371fd6 100644 --- a/Net/testsuite/src/QuotedPrintableTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/RawSocketTest.cpp b/Net/testsuite/src/RawSocketTest.cpp index f035795e6..b043066af 100644 --- a/Net/testsuite/src/RawSocketTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/SMTPClientSessionTest.cpp b/Net/testsuite/src/SMTPClientSessionTest.cpp index b26139d03..a36f75e91 100644 --- a/Net/testsuite/src/SMTPClientSessionTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/SocketAddressTest.cpp b/Net/testsuite/src/SocketAddressTest.cpp index 8d9981fff..fabf0b251 100644 --- a/Net/testsuite/src/SocketAddressTest.cpp +++ b/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&) diff --git a/Net/testsuite/src/SocketReactorTest.cpp b/Net/testsuite/src/SocketReactorTest.cpp index 12fa9d6f1..938d900b1 100644 --- a/Net/testsuite/src/SocketReactorTest.cpp +++ b/Net/testsuite/src/SocketReactorTest.cpp @@ -136,8 +136,8 @@ namespace checkWritableObserverCount(1); _reactor.removeEventHandler(_socket, Observer(*this, &ClientServiceHandler::onWritable)); checkWritableObserverCount(0); - std::string dataString(1024, 'x'); - _socket.sendBytes(dataString.data(), (int) dataString.length()); + std::string data(1024, 'x'); + _socket.sendBytes(data.data(), (int) data.length()); _socket.shutdownSend(); } @@ -253,13 +253,13 @@ namespace class FailConnector: public SocketConnector { public: - FailConnector(SocketAddress& address, SocketReactor& rReactor): - SocketConnector(address, rReactor), + FailConnector(SocketAddress& address, SocketReactor& reactor): + SocketConnector(address, reactor), _failed(false), _shutdown(false) { - rReactor.addEventHandler(socket(), Observer(*this, &FailConnector::onTimeout)); - rReactor.addEventHandler(socket(), Observer(*this, &FailConnector::onShutdown)); + reactor.addEventHandler(socket(), Observer(*this, &FailConnector::onTimeout)); + reactor.addEventHandler(socket(), Observer(*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) { } diff --git a/Net/testsuite/src/SocketStreamTest.cpp b/Net/testsuite/src/SocketStreamTest.cpp index cf6239c1d..8c9d15338 100644 --- a/Net/testsuite/src/SocketStreamTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/SocketTest.cpp b/Net/testsuite/src/SocketTest.cpp index ae53249d6..c0030e9c2 100644 --- a/Net/testsuite/src/SocketTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/SyslogTest.cpp b/Net/testsuite/src/SyslogTest.cpp index 797ed94db..51e7b05d7 100644 --- a/Net/testsuite/src/SyslogTest.cpp +++ b/Net/testsuite/src/SyslogTest.cpp @@ -112,7 +112,7 @@ void CachingChannel::getMessages(std::vector& msg, int offset, in } -SyslogTest::SyslogTest(const std::string& rName): CppUnit::TestCase(rName) +SyslogTest::SyslogTest(const std::string& name): CppUnit::TestCase(name) { } diff --git a/Net/testsuite/src/TCPServerTest.cpp b/Net/testsuite/src/TCPServerTest.cpp index ab282adaf..9f11d461e 100644 --- a/Net/testsuite/src/TCPServerTest.cpp +++ b/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) { } diff --git a/Net/testsuite/src/WebSocketTest.cpp b/Net/testsuite/src/WebSocketTest.cpp index a6debe8de..72f6dcaf3 100644 --- a/Net/testsuite/src/WebSocketTest.cpp +++ b/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) { }