From c0228c5ff802c335f00b1a179deb5a39719b0c92 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 16:54:37 +0100 Subject: [PATCH 01/23] allow turning off GCC_DIAG_ON/OFF --- Foundation/include/Poco/Platform_POSIX.h | 53 +++++++++--------------- 1 file changed, 20 insertions(+), 33 deletions(-) diff --git a/Foundation/include/Poco/Platform_POSIX.h b/Foundation/include/Poco/Platform_POSIX.h index 44841e926c..dc877fbdc4 100644 --- a/Foundation/include/Poco/Platform_POSIX.h +++ b/Foundation/include/Poco/Platform_POSIX.h @@ -44,48 +44,35 @@ #endif -#ifdef __GNUC__ - #ifndef __THROW - #ifndef __GNUC_PREREQ - #define __GNUC_PREREQ(maj, min) (0) - #endif - #if defined __cplusplus && __GNUC_PREREQ (2,8) - #define __THROW throw () - #else - #define __THROW - #endif - #endif - // // GCC diagnostics enable/disable by Patrick Horgan, see // http://dbp-consulting.com/tutorials/SuppressingGCCWarnings.html // use example: GCC_DIAG_OFF(unused-variable) // -#if defined(POCO_COMPILER_GCC) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) - - #ifdef GCC_DIAG_OFF - #undef GCC_DIAG_OFF - #endif - #ifdef GCC_DIAG_ON - #undef GCC_DIAG_ON - #endif - #define GCC_DIAG_STR(s) #s - #define GCC_DIAG_JOINSTR(x,y) GCC_DIAG_STR(x ## y) - #define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x) - #define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) - #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 - #define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ - GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x)) - #define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) - #else - #define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x)) - #define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning GCC_DIAG_JOINSTR(-W,x)) - #endif +#ifdef __GNUC__ + #if defined(POCO_COMPILER_GCC) && (((__GNUC__ * 100) + __GNUC_MINOR__) >= 406) && !defined(POCO_NO_GCC_DIAG) + #ifdef GCC_DIAG_OFF + #undef GCC_DIAG_OFF + #endif + #ifdef GCC_DIAG_ON + #undef GCC_DIAG_ON + #endif + #define GCC_DIAG_STR(s) #s + #define GCC_DIAG_JOINSTR(x,y) GCC_DIAG_STR(x ## y) + #define GCC_DIAG_DO_PRAGMA(x) _Pragma (#x) + #define GCC_DIAG_PRAGMA(x) GCC_DIAG_DO_PRAGMA(GCC diagnostic x) + #if ((__GNUC__ * 100) + __GNUC_MINOR__) >= 406 + #define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(push) \ + GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x)) + #define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(pop) + #else + #define GCC_DIAG_OFF(x) GCC_DIAG_PRAGMA(ignored GCC_DIAG_JOINSTR(-W,x)) + #define GCC_DIAG_ON(x) GCC_DIAG_PRAGMA(warning GCC_DIAG_JOINSTR(-W,x)) + #endif #else #define GCC_DIAG_OFF(x) #define GCC_DIAG_ON(x) #endif - #endif // __GNUC__ From 4dd625725bee3b1406cc89fe8580b8d75a5bda7a Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 20:35:10 +0100 Subject: [PATCH 02/23] style/comment fixes --- Net/include/Poco/Net/DNS.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/Net/include/Poco/Net/DNS.h b/Net/include/Poco/Net/DNS.h index 7f8f8a3228..45dfd7b6c6 100644 --- a/Net/include/Poco/Net/DNS.h +++ b/Net/include/Poco/Net/DNS.h @@ -37,18 +37,17 @@ class Net_API DNS /// An internal DNS cache is used to speed up name lookups. { public: - enum HintFlag { - DNS_HINT_NONE = 0, + DNS_HINT_NONE = 0, #ifdef POCO_HAVE_ADDRINFO - DNS_HINT_AI_PASSIVE = AI_PASSIVE, // Socket address will be used in bind() call - DNS_HINT_AI_CANONNAME = AI_CANONNAME, // Return canonical name in first ai_canonname - DNS_HINT_AI_NUMERICHOST = AI_NUMERICHOST, // Nodename must be a numeric address string - DNS_HINT_AI_NUMERICSERV = AI_NUMERICSERV, // Servicename must be a numeric port number - DNS_HINT_AI_ALL = AI_ALL, // Query both IP6 and IP4 with AI_V4MAPPED - DNS_HINT_AI_ADDRCONFIG = AI_ADDRCONFIG, // Resolution only if global address configured - DNS_HINT_AI_V4MAPPED = AI_V4MAPPED, // On v6 failure, query v4 and convert to V4MAPPED format + DNS_HINT_AI_PASSIVE = AI_PASSIVE, /// Socket address will be used in bind() call + DNS_HINT_AI_CANONNAME = AI_CANONNAME, /// Return canonical name in first ai_canonname + DNS_HINT_AI_NUMERICHOST = AI_NUMERICHOST, /// Nodename must be a numeric address string + DNS_HINT_AI_NUMERICSERV = AI_NUMERICSERV, /// Servicename must be a numeric port number + DNS_HINT_AI_ALL = AI_ALL, /// Query both IP6 and IP4 with AI_V4MAPPED + DNS_HINT_AI_ADDRCONFIG = AI_ADDRCONFIG, /// Resolution only if global address configured + DNS_HINT_AI_V4MAPPED = AI_V4MAPPED /// On v6 failure, query v4 and convert to V4MAPPED format #endif }; From 39b242952d53ad3557afc6f335b131a2ce6839f5 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 20:40:25 +0100 Subject: [PATCH 03/23] fixes for Solaris compiler --- Net/src/NTPPacket.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/Net/src/NTPPacket.cpp b/Net/src/NTPPacket.cpp index 4a1d6fa992..d3cde72e38 100644 --- a/Net/src/NTPPacket.cpp +++ b/Net/src/NTPPacket.cpp @@ -23,8 +23,14 @@ namespace Poco { namespace Net { -#pragma pack(push,1) -typedef struct _NTPPacketData { + +#if !defined(POCO_COMPILER_SUN) +#pragma pack(push, 1) +#else +#pragma pack(1) +#endif +struct NTPPacketData +{ Poco::Int8 mode:3; Poco::Int8 vn:3; Poco::Int8 li:2; @@ -38,8 +44,12 @@ typedef struct _NTPPacketData { Poco::Int64 ots; Poco::Int64 vts; Poco::Int64 tts; -} NTPPacketData; +}; +#if !defined(POCO_COMPILER_SUN) #pragma pack(pop) +#else +#pragma pack() +#endif NTPPacket::NTPPacket() : From 908389289492f885e42f9086d1e97f888bf10827 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 20:41:26 +0100 Subject: [PATCH 04/23] style fix --- Net/include/Poco/Net/WebSocket.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Net/include/Poco/Net/WebSocket.h b/Net/include/Poco/Net/WebSocket.h index dc372931a4..9d5194a921 100644 --- a/Net/include/Poco/Net/WebSocket.h +++ b/Net/include/Poco/Net/WebSocket.h @@ -65,7 +65,7 @@ class Net_API WebSocket: public StreamSocket FRAME_FLAG_FIN = 0x80, /// FIN bit: final fragment of a multi-fragment message. FRAME_FLAG_RSV1 = 0x40, /// Reserved for future use. Must be zero. FRAME_FLAG_RSV2 = 0x20, /// Reserved for future use. Must be zero. - FRAME_FLAG_RSV3 = 0x10, /// Reserved for future use. Must be zero. + FRAME_FLAG_RSV3 = 0x10 /// Reserved for future use. Must be zero. }; enum FrameOpcodes From 8b5899e00044ee500b062065fa95e850b8b69143 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 20:50:00 +0100 Subject: [PATCH 05/23] updated SolarisStudio config --- build/config/Linux-SolarisStudio | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/build/config/Linux-SolarisStudio b/build/config/Linux-SolarisStudio index fd41480906..ca0f6022d8 100644 --- a/build/config/Linux-SolarisStudio +++ b/build/config/Linux-SolarisStudio @@ -18,7 +18,7 @@ LINKMODE ?= SHARED CC = cc CXX = CC LINK = $(CXX) -LIB = $(CXX) -xar -o $@ +LIB = $(CXX) -xar -o RANLIB = ranlib SHLIB = $(CXX) $(LINKFLAGS) -G -o $@ -h$(notdir $@) SHLIBLN = $(POCO_BASE)/build/script/shlibln @@ -41,10 +41,10 @@ SHAREDLIBLINKEXT = .so CFLAGS = -mt CFLAGS32 = CFLAGS64 = -CXXFLAGS = -mt -std=c++11 -erroff=hidevf +CXXFLAGS = -mt -std=c++03 -erroff=hidevf CXXFLAGS32 = CXXFLAGS64 = -LINKFLAGS = +LINKFLAGS = -mt -std=c++03 LINKFLAGS32 = LINKFLAGS64 = STATICOPT_CC = @@ -56,14 +56,14 @@ SHAREDOPT_LINK = -Bdynamic DEBUGOPT_CC = -g -D_DEBUG DEBUGOPT_CXX = -g -D_DEBUG DEBUGOPT_LINK = -g -RELEASEOPT_CC = -xO5 -DNDEBUG -RELEASEOPT_CXX = -xO5 -DNDEBUG -RELEASEOPT_LINK = -xO5 +RELEASEOPT_CC = -xO3 -DNDEBUG +RELEASEOPT_CXX = -xO3 -DNDEBUG +RELEASEOPT_LINK = -xO3 # # System Specific Flags # -SYSFLAGS = -DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_FPENVIRONMENT -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_HAVE_FD_EPOLL +SYSFLAGS = -DPOCO_NO_GCC_API_ATTRIBUTE -DPOCO_NO_FPENVIRONMENT -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE -DPOCO_NO_GCC_DIAG # # System Specific Libraries From c06b36039bfc5ab957cdcb5a85d21a47774c54af Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 21:02:19 +0100 Subject: [PATCH 06/23] fix GCC_DIAG_OFF --- Foundation/include/Poco/Platform.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Foundation/include/Poco/Platform.h b/Foundation/include/Poco/Platform.h index 937d55b6bf..45b454c71b 100644 --- a/Foundation/include/Poco/Platform.h +++ b/Foundation/include/Poco/Platform.h @@ -112,11 +112,12 @@ #endif -#ifndef POCO_OS_FAMILY_UNIX +#ifndef __GNUC__ #define GCC_DIAG_OFF(x) #define GCC_DIAG_ON(x) #endif + // // Hardware Architecture and Byte Order // From c2528c34368433d25f03a1d3e5c66d7fadf1aa0a Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Fri, 27 Mar 2015 21:14:04 +0100 Subject: [PATCH 07/23] style fix --- Crypto/include/Poco/Crypto/Cipher.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h index 30d17f3cd0..92ba5da9f4 100644 --- a/Crypto/include/Poco/Crypto/Cipher.h +++ b/Crypto/include/Poco/Crypto/Cipher.h @@ -96,7 +96,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject ENC_BASE64 = 0x01, /// Base64-encoded output ENC_BINHEX = 0x02, /// BinHex-encoded output ENC_BASE64_NO_LF = 0x81, /// Base64-encoded output, no linefeeds - ENC_BINHEX_NO_LF = 0x82, /// BinHex-encoded output, no linefeeds + ENC_BINHEX_NO_LF = 0x82 /// BinHex-encoded output, no linefeeds }; From 8513b11a8f16e23ac4ff172c74950a865ba0f327 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 28 Mar 2015 11:23:25 +0100 Subject: [PATCH 08/23] cleanup --- Net/src/Socket.cpp | 4 +--- Net/src/SocketImpl.cpp | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Net/src/Socket.cpp b/Net/src/Socket.cpp index 7288904650..5f17264186 100644 --- a/Net/src/Socket.cpp +++ b/Net/src/Socket.cpp @@ -24,9 +24,6 @@ #elif defined(POCO_HAVE_FD_POLL) #include "Poco/SharedPtr.h" #include -typedef Poco::SharedPtr > SharedPollArray; #endif @@ -213,6 +210,7 @@ int Socket::select(SocketList& readList, SocketList& writeList, SocketList& exce return readList.size() + writeList.size() + exceptList.size(); #elif defined(POCO_HAVE_FD_POLL) + typedef Poco::SharedPtr > SharedPollArray; nfds_t nfd = readList.size() + writeList.size() + exceptList.size(); if (0 == nfd) return 0; diff --git a/Net/src/SocketImpl.cpp b/Net/src/SocketImpl.cpp index 1a98a85eab..74b26eb136 100644 --- a/Net/src/SocketImpl.cpp +++ b/Net/src/SocketImpl.cpp @@ -477,6 +477,8 @@ bool SocketImpl::poll(const Poco::Timespan& timeout, int mode) } } while (rc < 0 && lastError() == POCO_EINTR); + if (rc < 0) error(); + return rc > 0; #else From 648930b8dbb47bf42ff8270bf4909f274078eaa0 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sat, 28 Mar 2015 11:44:39 +0100 Subject: [PATCH 09/23] do not flush underlying stream on sync() as these causes issues with Zip files --- Foundation/src/DeflatingStream.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/Foundation/src/DeflatingStream.cpp b/Foundation/src/DeflatingStream.cpp index c0c722f4e1..1adb54fb3a 100644 --- a/Foundation/src/DeflatingStream.cpp +++ b/Foundation/src/DeflatingStream.cpp @@ -189,8 +189,6 @@ int DeflatingStreamBuf::sync() _zstr.next_out = (unsigned char*) _buffer; _zstr.avail_out = DEFLATE_BUFFER_SIZE; } - _pOstr->flush(); - return 0; } From 4e7d25713af5966b89061384baa8d59e787974ae Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Sat, 28 Mar 2015 19:16:56 -0500 Subject: [PATCH 10/23] Unable to build static with NetSSL_OpenSSL for OS X #763 --- NetSSL_OpenSSL/samples/Mail/Makefile | 2 +- NetSSL_OpenSSL/samples/TwitterClient/Makefile | 9 ++++++++- NetSSL_OpenSSL/samples/download/Makefile | 2 +- NetSSL_OpenSSL/testsuite/Makefile | 2 +- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/NetSSL_OpenSSL/samples/Mail/Makefile b/NetSSL_OpenSSL/samples/Mail/Makefile index 1ded0e760f..8ca4344edb 100644 --- a/NetSSL_OpenSSL/samples/Mail/Makefile +++ b/NetSSL_OpenSSL/samples/Mail/Makefile @@ -19,6 +19,6 @@ objects = Mail target = Mail target_version = 1 -target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoXML PocoFoundation +target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/NetSSL_OpenSSL/samples/TwitterClient/Makefile b/NetSSL_OpenSSL/samples/TwitterClient/Makefile index 7983a95b39..3b49cbd13b 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/Makefile +++ b/NetSSL_OpenSSL/samples/TwitterClient/Makefile @@ -8,11 +8,18 @@ include $(POCO_BASE)/build/rules/global +# Note: linking order is important, do not change it. +ifeq ($(POCO_CONFIG),FreeBSD) +SYSLIBS += -lssl -lcrypto -lz +else +SYSLIBS += -lssl -lcrypto -lz -ldl +endif + objects = Twitter TweetApp target = tweet target_version = 1 -target_libs = PocoUtil PocoJSON PocoNetSSL PocoCrypto PocoNet PocoXML PocoFoundation +target_libs = PocoNetSSL PocoCrypto PocoNet PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/NetSSL_OpenSSL/samples/download/Makefile b/NetSSL_OpenSSL/samples/download/Makefile index 49b0ec507d..8f18aef9a0 100644 --- a/NetSSL_OpenSSL/samples/download/Makefile +++ b/NetSSL_OpenSSL/samples/download/Makefile @@ -19,6 +19,6 @@ objects = download target = download target_version = 1 -target_libs = PocoNetSSL PocoCrypto PocoNet PocoUtil PocoXML PocoFoundation +target_libs = PocoNetSSL PocoCrypto PocoNet PocoUtil PocoJSON PocoXML PocoFoundation include $(POCO_BASE)/build/rules/exec diff --git a/NetSSL_OpenSSL/testsuite/Makefile b/NetSSL_OpenSSL/testsuite/Makefile index de9dd79637..02bb9cea39 100644 --- a/NetSSL_OpenSSL/testsuite/Makefile +++ b/NetSSL_OpenSSL/testsuite/Makefile @@ -22,6 +22,6 @@ objects = NetSSLTestSuite Driver \ target = testrunner target_version = 1 -target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoXML PocoFoundation CppUnit +target_libs = PocoNetSSL PocoNet PocoCrypto PocoUtil PocoJSON PocoXML PocoFoundation CppUnit include $(POCO_BASE)/build/rules/exec From 072a2bfb8f0b3c8126add6d4fafa01196b131544 Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Sun, 29 Mar 2015 11:15:47 +0200 Subject: [PATCH 11/23] updated versions --- DLLVersion.rc | 6 +++--- VERSION | 2 +- libversion | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/DLLVersion.rc b/DLLVersion.rc index 93963245a7..5f0dd0591e 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -4,8 +4,8 @@ #include "winres.h" -#define POCO_VERSION 1,6,0,0 -#define POCO_VERSION_STR "1.6.0" +#define POCO_VERSION 1,7,0,0 +#define POCO_VERSION_STR "1.7.0" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION @@ -28,7 +28,7 @@ BEGIN VALUE "FileDescription", "This file is part of the POCO C++ Libraries." VALUE "FileVersion", POCO_VERSION_STR VALUE "InternalName", "POCO" - VALUE "LegalCopyright", "Copyright (C) 2004-2014, Applied Informatics Software Engineering GmbH and Contributors." + VALUE "LegalCopyright", "Copyright (C) 2004-2015, Applied Informatics Software Engineering GmbH and Contributors." VALUE "ProductName", "POCO C++ Libraries - http://pocoproject.org" VALUE "ProductVersion", POCO_VERSION_STR END diff --git a/VERSION b/VERSION index dc1e644a10..bd8bf882d0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.6.0 +1.7.0 diff --git a/libversion b/libversion index 64bb6b746d..425151f3a4 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -30 +40 From c2a49cbc635d8dc894763624c061be5ae8a1a01c Mon Sep 17 00:00:00 2001 From: Guenter Obiltschnig Date: Mon, 30 Mar 2015 16:21:01 +0200 Subject: [PATCH 12/23] add missing LIBPREFIX definition --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 49318a3e1f..7ee99d8c21 100644 --- a/Makefile +++ b/Makefile @@ -20,6 +20,8 @@ ifndef POCO_BUILD export POCO_BUILD=$(POCO_BASE) endif +LIBPREFIX ?= lib + .PHONY: poco all libexecs cppunit tests samples cleans clean distclean install # TESTS and SAMPLES are set in config.make From bfe16d25a2ba152d66422e750528c3605d417d60 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Tue, 31 Mar 2015 21:43:21 -0500 Subject: [PATCH 13/23] Poco::JSON::PrintHandler not working for objects in array #766 --- JSON/include/Poco/JSON/PrintHandler.h | 11 +++++++- JSON/src/PrintHandler.cpp | 25 ++++++++++------- JSON/testsuite/src/JSONTest.cpp | 39 +++++++++++++++++++++++++++ 3 files changed, 65 insertions(+), 10 deletions(-) diff --git a/JSON/include/Poco/JSON/PrintHandler.h b/JSON/include/Poco/JSON/PrintHandler.h index 6fb223720c..a9661694f3 100644 --- a/JSON/include/Poco/JSON/PrintHandler.h +++ b/JSON/include/Poco/JSON/PrintHandler.h @@ -109,12 +109,14 @@ class JSON_API PrintHandler : public Handler unsigned indent(); bool printFlat() const; void arrayValue(); + bool array() const; std::ostream& _out; unsigned _indent; std::string _tab; - bool _array; + int _array; bool _value; + bool _objStart; }; @@ -124,6 +126,13 @@ inline void PrintHandler::setIndent(unsigned indent) } +inline bool PrintHandler::array() const +{ + return _array > 0; +} + + + }} // namespace Poco::JSON diff --git a/JSON/src/PrintHandler.cpp b/JSON/src/PrintHandler.cpp index 3498bdda12..fabbf62462 100644 --- a/JSON/src/PrintHandler.cpp +++ b/JSON/src/PrintHandler.cpp @@ -26,8 +26,9 @@ namespace JSON { PrintHandler::PrintHandler(unsigned indent): _out(std::cout), _indent(indent), - _array(false), - _value(false) + _array(0), + _value(false), + _objStart(false) { } @@ -35,8 +36,9 @@ PrintHandler::PrintHandler(unsigned indent): PrintHandler::PrintHandler(std::ostream& out, unsigned indent): _out(out), _indent(indent), - _array(false), - _value(false) + _array(0), + _value(false), + _objStart(false) { } @@ -50,7 +52,7 @@ void PrintHandler::reset() { _out.flush(); _tab = ""; - _array = false; + _array = 0; _value = false; } @@ -78,9 +80,11 @@ unsigned PrintHandler::indent() void PrintHandler::startObject() { + arrayValue(); _out << '{'; _out << endLine(); _tab.append(indent(), ' '); + _objStart = true; } @@ -90,6 +94,7 @@ void PrintHandler::endObject() _tab.erase(_tab.length() - indent()); _out << endLine() << _tab << '}'; + if (array()) _value = true; } @@ -97,7 +102,7 @@ void PrintHandler::startArray() { _out << '[' << endLine(); _tab.append(indent(), ' '); - _array = true; + ++_array; _value = false; } @@ -106,7 +111,8 @@ void PrintHandler::endArray() { _tab.erase(_tab.length() - indent()); _out << endLine() << _tab << ']'; - _array = false; + --_array; + poco_assert (_array >= 0); _value = false; } @@ -115,9 +121,10 @@ void PrintHandler::key(const std::string& k) { if (_value) { - comma(); + if (!_objStart) comma(); _value = false; } + _objStart = false; _out << _tab; Stringifier::formatString(k, _out); if (!printFlat()) _out << ' '; @@ -201,7 +208,7 @@ void PrintHandler::comma() void PrintHandler::arrayValue() { - if (_array) + if (array()) { if (_value) comma(); _out << _tab; diff --git a/JSON/testsuite/src/JSONTest.cpp b/JSON/testsuite/src/JSONTest.cpp index 3b9b821e55..baebf2a899 100644 --- a/JSON/testsuite/src/JSONTest.cpp +++ b/JSON/testsuite/src/JSONTest.cpp @@ -1181,6 +1181,45 @@ void JSONTest::testPrintHandler() " ]\n" "}" ); + + json = + "{" + "\"array\":" + "[" + "{" + "\"key1\":" + "[" + "1,2,3," + "{" + "\"subkey\":" + "\"test\"" + "}" + "]" + "}," + "{" + "\"key2\":" + "{" + "\"anotherSubKey\":" + "[" + "1," + "{" + "\"subSubKey\":" + "[" + "4,5,6" + "]" + "}" + "]" + "}" + "}" + "]" + "}"; + + + ostr.str(""); + pHandler->setIndent(0); + parser.reset(); + parser.parse(json); + assert (json == ostr.str()); } From d495abd4b130322a4c0990aae9e5724343f79f3a Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Fri, 3 Apr 2015 10:07:46 -0500 Subject: [PATCH 14/23] Update 99100-ReleaseNotes.page DefaultHandler => ParseHandler breaking change note for 1.5.2 --- doc/99100-ReleaseNotes.page | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page index 7277cda08c..303eead042 100644 --- a/doc/99100-ReleaseNotes.page +++ b/doc/99100-ReleaseNotes.page @@ -331,6 +331,10 @@ AAAIntroduction - Dynamic::Var: comparison of two empty objects now returns true - WinCE does not build in this release; this will be fixed in a later release + - JSON::DefaultHandler was renamed to a more appropriate name - ParseHandler; + ParseHandler does not have to be passed to the Parser, it will be used by default; + handlers are now passed into Parser as smart pointers, so passing in addresses of + stack objects will cause undefined behavior - Please note that 1.5.x releases are development releases and not considered stable. Interfaces may change, and backwards compatibility with the stable 1.4 release series is not guaranteed. There may also be some rough edges. From e26d1ffa13732c531dfe506281885322231c5731 Mon Sep 17 00:00:00 2001 From: Alex Fabijanic Date: Fri, 3 Apr 2015 10:37:07 -0500 Subject: [PATCH 15/23] Poco::Var operator== throws exception #769 --- Foundation/src/Var.cpp | 2 +- Foundation/testsuite/src/VarTest.cpp | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/Foundation/src/Var.cpp b/Foundation/src/Var.cpp index 7145604778..5daa2f8b2d 100644 --- a/Foundation/src/Var.cpp +++ b/Foundation/src/Var.cpp @@ -255,7 +255,7 @@ const Var Var::operator -- (int) bool Var::operator == (const Var& other) const { - if (isEmpty() && !other.isEmpty()) return false; + if (isEmpty() != other.isEmpty()) return false; if (isEmpty() && other.isEmpty()) return true; return convert() == other.convert(); } diff --git a/Foundation/testsuite/src/VarTest.cpp b/Foundation/testsuite/src/VarTest.cpp index c5aba9a79c..2a7d73a564 100644 --- a/Foundation/testsuite/src/VarTest.cpp +++ b/Foundation/testsuite/src/VarTest.cpp @@ -2465,6 +2465,11 @@ void VarTest::testEmpty() assert (da == da); assert (!(da != da)); + assert (da != Var(1)); + assert (!(da == Var(1))); + assert (Var(1) != da); + assert (!(Var(1) == da)); + da = "123"; int i = da.convert(); assert (123 == i); From 91dd5f8e44113b64afbaf0a3e83a0e73dde61e1a Mon Sep 17 00:00:00 2001 From: martin-osborne Date: Mon, 6 Apr 2015 17:03:35 +0100 Subject: [PATCH 16/23] Corrected spelling of accommodate in documentation and comments. --- Data/ODBC/include/Poco/Data/ODBC/Binder.h | 4 ++-- Data/ODBC/src/ODBCStatementImpl.cpp | 2 +- Data/ODBC/src/Preparator.cpp | 2 +- Data/include/Poco/Data/RowFormatter.h | 2 +- Data/include/Poco/Data/StatementImpl.h | 2 +- Foundation/include/Poco/Dynamic/Var.h | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/Data/ODBC/include/Poco/Data/ODBC/Binder.h index a343170117..66f0084f90 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h @@ -559,7 +559,7 @@ class ODBC_API Binder: public Poco::Data::AbstractBinder if (size == _maxFieldSize) { getMinValueSize(val, size); - // accomodate for terminating zero + // accommodate for terminating zero if (size != _maxFieldSize) ++size; } @@ -625,7 +625,7 @@ class ODBC_API Binder: public Poco::Data::AbstractBinder if (size == _maxFieldSize) { getMinValueSize(val, size); - // accomodate for terminating zero + // accommodate for terminating zero if (size != _maxFieldSize) size += sizeof(UTF16Char); } diff --git a/Data/ODBC/src/ODBCStatementImpl.cpp b/Data/ODBC/src/ODBCStatementImpl.cpp index 2aee16db34..c4e5071078 100644 --- a/Data/ODBC/src/ODBCStatementImpl.cpp +++ b/Data/ODBC/src/ODBCStatementImpl.cpp @@ -380,7 +380,7 @@ std::string ODBCStatementImpl::nativeSQL() delete [] pNative; throw ConnectionException(_rConnection, "SQLNativeSql()"); } - ++retlen;//accomodate for terminating '\0' + ++retlen;//accommodate for terminating '\0' }while (retlen > length); std::string sql(pNative); diff --git a/Data/ODBC/src/Preparator.cpp b/Data/ODBC/src/Preparator.cpp index 8e18fc8fea..11560e3d22 100644 --- a/Data/ODBC/src/Preparator.cpp +++ b/Data/ODBC/src/Preparator.cpp @@ -158,7 +158,7 @@ std::size_t Preparator::maxDataSize(std::size_t pos) const ODBCMetaColumn mc(_rStmt, pos); sz = mc.length(); - // accomodate for terminating zero (non-bulk only!) + // accommodate for terminating zero (non-bulk only!) MetaColumn::ColumnDataType type = mc.type(); if (!isBulk() && ((ODBCMetaColumn::FDT_WSTRING == type) || (ODBCMetaColumn::FDT_STRING == type))) ++sz; } diff --git a/Data/include/Poco/Data/RowFormatter.h b/Data/include/Poco/Data/RowFormatter.h index b80fa41de6..5b45f86163 100644 --- a/Data/include/Poco/Data/RowFormatter.h +++ b/Data/include/Poco/Data/RowFormatter.h @@ -51,7 +51,7 @@ class Data_API RowFormatter /// Statement always has the ownership of the row formatter and shares /// it with rows through RecordSet. /// - /// To accomodate for various formatting needs, a formatter can operate in two modes: + /// To accommodate for various formatting needs, a formatter can operate in two modes: /// /// - progressive: formatted individual row strings are gemerated and returned from each /// call to formatValues; diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h index 37b63b2c1a..b3696dcece 100644 --- a/Data/include/Poco/Data/StatementImpl.h +++ b/Data/include/Poco/Data/StatementImpl.h @@ -131,7 +131,7 @@ class Data_API StatementImpl /// affected for all other statements (insert, update, delete). /// If reset is true (default), the underlying bound storage is /// reset and reused. In case of containers, this means they are - /// cleared and resized to accomodate the number of rows returned by + /// cleared and resized to accommodate the number of rows returned by /// this execution step. When reset is false, data is appended to the /// bound containers during multiple execute calls. diff --git a/Foundation/include/Poco/Dynamic/Var.h b/Foundation/include/Poco/Dynamic/Var.h index 12d776b8df..58c8d9e936 100644 --- a/Foundation/include/Poco/Dynamic/Var.h +++ b/Foundation/include/Poco/Dynamic/Var.h @@ -46,7 +46,7 @@ class Foundation_API Var /// /// Loss of signedness is not allowed for numeric values. This means that if an attempt is made to convert /// the internal value which is a negative signed integer to an unsigned integer type storage, a RangeException is thrown. - /// Overflow is not allowed, so if the internal value is a larger number than the target numeric type size can accomodate, + /// Overflow is not allowed, so if the internal value is a larger number than the target numeric type size can accommodate, /// a RangeException is thrown. /// /// Precision loss, such as in conversion from floating-point types to integers or from double to float on platforms From 7e730aa9b87452ac1413abc576df2210c2652cc8 Mon Sep 17 00:00:00 2001 From: martin-osborne Date: Mon, 6 Apr 2015 17:34:48 +0100 Subject: [PATCH 17/23] Corrected other misspelt 'a' words. --- CppUnit/include/CppUnit/Orthodox.h | 2 +- Crypto/include/Poco/Crypto/Cipher.h | 4 +- Crypto/include/Poco/Crypto/RSACipherImpl.h | 2 +- Data/include/Poco/Data/Bulk.h | 4 +- Data/include/Poco/Data/BulkExtraction.h | 2 +- Data/include/Poco/Data/Extraction.h | 2 +- Data/include/Poco/Data/SQLChannel.h | 2 +- Foundation/include/Poco/Clock.h | 2 +- Foundation/include/Poco/Dynamic/Var.h | 114 ++++++++++----------- Foundation/include/Poco/ListMap.h | 2 +- Foundation/include/Poco/LocalDateTime.h | 2 +- Foundation/include/Poco/Path.h | 2 +- Foundation/include/Poco/Timestamp.h | 2 +- JSON/include/Poco/JSON/PrintHandler.h | 4 +- Net/include/Poco/Net/TCPServer.h | 2 +- Util/include/Poco/Util/Application.h | 2 +- 16 files changed, 75 insertions(+), 75 deletions(-) diff --git a/CppUnit/include/CppUnit/Orthodox.h b/CppUnit/include/CppUnit/Orthodox.h index 3a038975cb..9da0f54939 100644 --- a/CppUnit/include/CppUnit/Orthodox.h +++ b/CppUnit/include/CppUnit/Orthodox.h @@ -17,7 +17,7 @@ namespace CppUnit { /* - * Orthodox performs a simple set of tests on an arbitary + * Orthodox performs a simple set of tests on an arbitrary * class to make sure that it supports at least the * following operations: * diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h index 92ba5da9f4..7c7d37f4d6 100644 --- a/Crypto/include/Poco/Crypto/Cipher.h +++ b/Crypto/include/Poco/Crypto/Cipher.h @@ -37,7 +37,7 @@ class CryptoTransform; class Crypto_API Cipher: public Poco::RefCountedObject /// Represents the abstract base class from which all implementations of - /// symmetric/assymetric encryption algorithms must inherit. Use the CipherFactory + /// symmetric/asymmetric encryption algorithms must inherit. Use the CipherFactory /// class to obtain an instance of this class: /// /// CipherFactory& factory = CipherFactory::defaultFactory(); @@ -57,7 +57,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject /// decrypt strings or, in conjunction with a CryptoInputStream or a /// CryptoOutputStream, to encrypt streams of data. /// - /// Since encrypted strings will contain arbitary binary data that will cause + /// Since encrypted strings will contain arbitrary binary data that will cause /// problems in applications that are not binary-safe (eg., when sending /// encrypted data in e-mails), the encryptString() and decryptString() can /// encode (or decode, respectively) encrypted data using a "transport encoding". diff --git a/Crypto/include/Poco/Crypto/RSACipherImpl.h b/Crypto/include/Poco/Crypto/RSACipherImpl.h index 6d433ed1f4..cbcf22c987 100644 --- a/Crypto/include/Poco/Crypto/RSACipherImpl.h +++ b/Crypto/include/Poco/Crypto/RSACipherImpl.h @@ -33,7 +33,7 @@ namespace Crypto { class RSACipherImpl: public Cipher /// An implementation of the Cipher class for - /// assymetric (public-private key) encryption + /// asymmetric (public-private key) encryption /// based on the the RSA algorithm in OpenSSL's /// crypto library. /// diff --git a/Data/include/Poco/Data/Bulk.h b/Data/include/Poco/Data/Bulk.h index 92630d1460..19b7d715fa 100644 --- a/Data/include/Poco/Data/Bulk.h +++ b/Data/include/Poco/Data/Bulk.h @@ -41,10 +41,10 @@ class Data_API Bulk /// Destroys the bulk. const Limit& limit() const; - /// Returns the limit asociated with this bulk object. + /// Returns the limit associated with this bulk object. Poco::UInt32 size() const; - /// Returns the value of the limit asociated with + /// Returns the value of the limit associated with /// this bulk object. private: diff --git a/Data/include/Poco/Data/BulkExtraction.h b/Data/include/Poco/Data/BulkExtraction.h index 452c66e7fe..683a9f7333 100644 --- a/Data/include/Poco/Data/BulkExtraction.h +++ b/Data/include/Poco/Data/BulkExtraction.h @@ -139,7 +139,7 @@ class InternalBulkExtraction: public BulkExtraction /// Container Data Type specialization extension for extraction of values from a query result set. /// /// This class is intended for PocoData internal use - it is used by StatementImpl - /// to automaticaly create internal BulkExtraction in cases when statement returns data and no external storage + /// to automatically create internal BulkExtraction in cases when statement returns data and no external storage /// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution. /// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn /// owns the data container pointer. diff --git a/Data/include/Poco/Data/Extraction.h b/Data/include/Poco/Data/Extraction.h index 14bdc74585..577546a931 100644 --- a/Data/include/Poco/Data/Extraction.h +++ b/Data/include/Poco/Data/Extraction.h @@ -497,7 +497,7 @@ class InternalExtraction: public Extraction /// Container Data Type specialization extension for extraction of values from a query result set. /// /// This class is intended for PocoData internal use - it is used by StatementImpl - /// to automaticaly create internal Extraction in cases when statement returns data and no external storage + /// to automatically create internal Extraction in cases when statement returns data and no external storage /// was supplied. It is later used by RecordSet to retrieve the fetched data after statement execution. /// It takes ownership of the Column pointer supplied as constructor argument. Column object, in turn /// owns the data container pointer. diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h index 8b66c5ca47..4e455550a0 100644 --- a/Data/include/Poco/Data/SQLChannel.h +++ b/Data/include/Poco/Data/SQLChannel.h @@ -105,7 +105,7 @@ class Data_API SQLChannel: public Poco::Channel /// set this property to empty string. /// /// * async: Indicates asynchronous execution. When excuting asynchronously, - /// messages are sent to the target using asyncronous execution. + /// messages are sent to the target using asynchronous execution. /// However, prior to the next message being processed and sent to /// the target, the previous operation must have been either completed /// or timed out (see timeout and throw properties for details on diff --git a/Foundation/include/Poco/Clock.h b/Foundation/include/Poco/Clock.h index f9966e7793..f3b1ffe4ad 100644 --- a/Foundation/include/Poco/Clock.h +++ b/Foundation/include/Poco/Clock.h @@ -30,7 +30,7 @@ class Foundation_API Clock /// A Clock stores a monotonic* clock value /// with (theoretical) microseconds resolution. /// Clocks can be compared with each other - /// and simple arithmetics are supported. + /// and simple arithmetic is supported. /// /// [*] Note that Clock values are only monotonic if /// the operating system provides a monotonic clock. diff --git a/Foundation/include/Poco/Dynamic/Var.h b/Foundation/include/Poco/Dynamic/Var.h index 58c8d9e936..de0dc6dcab 100644 --- a/Foundation/include/Poco/Dynamic/Var.h +++ b/Foundation/include/Poco/Dynamic/Var.h @@ -271,16 +271,16 @@ class Foundation_API Var template Var& operator += (const T& other) - /// Addition asignment operator for addition/assignment of POD to Var. + /// Addition assignment operator for addition/assignment of POD to Var. { return *this = convert() + other; } Var& operator += (const Var& other); - /// Addition asignment operator overload for Var + /// Addition assignment operator overload for Var Var& operator += (const char* other); - /// Addition asignment operator overload for const char* + /// Addition assignment operator overload for const char* template const Var operator - (const T& other) const @@ -294,13 +294,13 @@ class Foundation_API Var template Var& operator -= (const T& other) - /// Subtraction asignment operator + /// Subtraction assignment operator { return *this = convert() - other; } Var& operator -= (const Var& other); - /// Subtraction asignment operator overload for Var + /// Subtraction assignment operator overload for Var template const Var operator * (const T& other) const @@ -314,13 +314,13 @@ class Foundation_API Var template Var& operator *= (const T& other) - /// Multiplication asignment operator + /// Multiplication assignment operator { return *this = convert() * other; } Var& operator *= (const Var& other); - /// Multiplication asignment operator overload for Var + /// Multiplication assignment operator overload for Var template const Var operator / (const T& other) const @@ -334,13 +334,13 @@ class Foundation_API Var template Var& operator /= (const T& other) - /// Division asignment operator + /// Division assignment operator { return *this = convert() / other; } Var& operator /= (const Var& other); - /// Division asignment operator specialization for Var + /// Division assignment operator specialization for Var template bool operator == (const T& other) const @@ -922,28 +922,28 @@ inline char operator / (const char& other, const Var& da) inline char operator += (char& other, const Var& da) - /// Addition asignment operator for adding Var to char + /// Addition assignment operator for adding Var to char { return other += da.convert(); } inline char operator -= (char& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from char + /// Subtraction assignment operator for subtracting Var from char { return other -= da.convert(); } inline char operator *= (char& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with char + /// Multiplication assignment operator for multiplying Var with char { return other *= da.convert(); } inline char operator /= (char& other, const Var& da) - /// Division asignment operator for dividing Var with char + /// Division assignment operator for dividing Var with char { return other /= da.convert(); } @@ -1026,28 +1026,28 @@ inline Poco::Int8 operator / (const Poco::Int8& other, const Var& da) inline Poco::Int8 operator += (Poco::Int8& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::Int8 + /// Addition assignment operator for adding Var to Poco::Int8 { return other += da.convert(); } inline Poco::Int8 operator -= (Poco::Int8& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::Int8 + /// Subtraction assignment operator for subtracting Var from Poco::Int8 { return other -= da.convert(); } inline Poco::Int8 operator *= (Poco::Int8& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::Int8 + /// Multiplication assignment operator for multiplying Var with Poco::Int8 { return other *= da.convert(); } inline Poco::Int8 operator /= (Poco::Int8& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::Int8 + /// Division assignment operator for dividing Var with Poco::Int8 { return other /= da.convert(); } @@ -1130,28 +1130,28 @@ inline Poco::UInt8 operator / (const Poco::UInt8& other, const Var& da) inline Poco::UInt8 operator += (Poco::UInt8& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::UInt8 + /// Addition assignment operator for adding Var to Poco::UInt8 { return other += da.convert(); } inline Poco::UInt8 operator -= (Poco::UInt8& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::UInt8 + /// Subtraction assignment operator for subtracting Var from Poco::UInt8 { return other -= da.convert(); } inline Poco::UInt8 operator *= (Poco::UInt8& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::UInt8 + /// Multiplication assignment operator for multiplying Var with Poco::UInt8 { return other *= da.convert(); } inline Poco::UInt8 operator /= (Poco::UInt8& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::UInt8 + /// Division assignment operator for dividing Var with Poco::UInt8 { return other /= da.convert(); } @@ -1234,28 +1234,28 @@ inline Poco::Int16 operator / (const Poco::Int16& other, const Var& da) inline Poco::Int16 operator += (Poco::Int16& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::Int16 + /// Addition assignment operator for adding Var to Poco::Int16 { return other += da.convert(); } inline Poco::Int16 operator -= (Poco::Int16& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::Int16 + /// Subtraction assignment operator for subtracting Var from Poco::Int16 { return other -= da.convert(); } inline Poco::Int16 operator *= (Poco::Int16& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::Int16 + /// Multiplication assignment operator for multiplying Var with Poco::Int16 { return other *= da.convert(); } inline Poco::Int16 operator /= (Poco::Int16& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::Int16 + /// Division assignment operator for dividing Var with Poco::Int16 { return other /= da.convert(); } @@ -1338,28 +1338,28 @@ inline Poco::UInt16 operator / (const Poco::UInt16& other, const Var& da) inline Poco::UInt16 operator += (Poco::UInt16& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::UInt16 + /// Addition assignment operator for adding Var to Poco::UInt16 { return other += da.convert(); } inline Poco::UInt16 operator -= (Poco::UInt16& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::UInt16 + /// Subtraction assignment operator for subtracting Var from Poco::UInt16 { return other -= da.convert(); } inline Poco::UInt16 operator *= (Poco::UInt16& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::UInt16 + /// Multiplication assignment operator for multiplying Var with Poco::UInt16 { return other *= da.convert(); } inline Poco::UInt16 operator /= (Poco::UInt16& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::UInt16 + /// Division assignment operator for dividing Var with Poco::UInt16 { return other /= da.convert(); } @@ -1442,28 +1442,28 @@ inline Poco::Int32 operator / (const Poco::Int32& other, const Var& da) inline Poco::Int32 operator += (Poco::Int32& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::Int32 + /// Addition assignment operator for adding Var to Poco::Int32 { return other += da.convert(); } inline Poco::Int32 operator -= (Poco::Int32& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::Int32 + /// Subtraction assignment operator for subtracting Var from Poco::Int32 { return other -= da.convert(); } inline Poco::Int32 operator *= (Poco::Int32& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::Int32 + /// Multiplication assignment operator for multiplying Var with Poco::Int32 { return other *= da.convert(); } inline Poco::Int32 operator /= (Poco::Int32& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::Int32 + /// Division assignment operator for dividing Var with Poco::Int32 { return other /= da.convert(); } @@ -1546,28 +1546,28 @@ inline Poco::UInt32 operator / (const Poco::UInt32& other, const Var& da) inline Poco::UInt32 operator += (Poco::UInt32& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::UInt32 + /// Addition assignment operator for adding Var to Poco::UInt32 { return other += da.convert(); } inline Poco::UInt32 operator -= (Poco::UInt32& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::UInt32 + /// Subtraction assignment operator for subtracting Var from Poco::UInt32 { return other -= da.convert(); } inline Poco::UInt32 operator *= (Poco::UInt32& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::UInt32 + /// Multiplication assignment operator for multiplying Var with Poco::UInt32 { return other *= da.convert(); } inline Poco::UInt32 operator /= (Poco::UInt32& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::UInt32 + /// Division assignment operator for dividing Var with Poco::UInt32 { return other /= da.convert(); } @@ -1650,28 +1650,28 @@ inline Poco::Int64 operator / (const Poco::Int64& other, const Var& da) inline Poco::Int64 operator += (Poco::Int64& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::Int64 + /// Addition assignment operator for adding Var to Poco::Int64 { return other += da.convert(); } inline Poco::Int64 operator -= (Poco::Int64& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::Int64 + /// Subtraction assignment operator for subtracting Var from Poco::Int64 { return other -= da.convert(); } inline Poco::Int64 operator *= (Poco::Int64& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::Int64 + /// Multiplication assignment operator for multiplying Var with Poco::Int64 { return other *= da.convert(); } inline Poco::Int64 operator /= (Poco::Int64& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::Int64 + /// Division assignment operator for dividing Var with Poco::Int64 { return other /= da.convert(); } @@ -1754,28 +1754,28 @@ inline Poco::UInt64 operator / (const Poco::UInt64& other, const Var& da) inline Poco::UInt64 operator += (Poco::UInt64& other, const Var& da) - /// Addition asignment operator for adding Var to Poco::UInt64 + /// Addition assignment operator for adding Var to Poco::UInt64 { return other += da.convert(); } inline Poco::UInt64 operator -= (Poco::UInt64& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from Poco::UInt64 + /// Subtraction assignment operator for subtracting Var from Poco::UInt64 { return other -= da.convert(); } inline Poco::UInt64 operator *= (Poco::UInt64& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with Poco::UInt64 + /// Multiplication assignment operator for multiplying Var with Poco::UInt64 { return other *= da.convert(); } inline Poco::UInt64 operator /= (Poco::UInt64& other, const Var& da) - /// Division asignment operator for dividing Var with Poco::UInt64 + /// Division assignment operator for dividing Var with Poco::UInt64 { return other /= da.convert(); } @@ -1858,28 +1858,28 @@ inline float operator / (const float& other, const Var& da) inline float operator += (float& other, const Var& da) - /// Addition asignment operator for adding Var to float + /// Addition assignment operator for adding Var to float { return other += da.convert(); } inline float operator -= (float& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from float + /// Subtraction assignment operator for subtracting Var from float { return other -= da.convert(); } inline float operator *= (float& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with float + /// Multiplication assignment operator for multiplying Var with float { return other *= da.convert(); } inline float operator /= (float& other, const Var& da) - /// Division asignment operator for dividing Var with float + /// Division assignment operator for dividing Var with float { return other /= da.convert(); } @@ -1962,28 +1962,28 @@ inline double operator / (const double& other, const Var& da) inline double operator += (double& other, const Var& da) - /// Addition asignment operator for adding Var to double + /// Addition assignment operator for adding Var to double { return other += da.convert(); } inline double operator -= (double& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from double + /// Subtraction assignment operator for subtracting Var from double { return other -= da.convert(); } inline double operator *= (double& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with double + /// Multiplication assignment operator for multiplying Var with double { return other *= da.convert(); } inline double operator /= (double& other, const Var& da) - /// Division asignment operator for dividing Var with double + /// Division assignment operator for dividing Var with double { return other /= da.convert(); } @@ -2133,28 +2133,28 @@ inline long operator / (const long& other, const Var& da) inline long operator += (long& other, const Var& da) - /// Addition asignment operator for adding Var to long + /// Addition assignment operator for adding Var to long { return other += da.convert(); } inline long operator -= (long& other, const Var& da) - /// Subtraction asignment operator for subtracting Var from long + /// Subtraction assignment operator for subtracting Var from long { return other -= da.convert(); } inline long operator *= (long& other, const Var& da) - /// Multiplication asignment operator for multiplying Var with long + /// Multiplication assignment operator for multiplying Var with long { return other *= da.convert(); } inline long operator /= (long& other, const Var& da) - /// Division asignment operator for dividing Var with long + /// Division assignment operator for dividing Var with long { return other /= da.convert(); } diff --git a/Foundation/include/Poco/ListMap.h b/Foundation/include/Poco/ListMap.h index fc6c3884c4..7ec735db4f 100644 --- a/Foundation/include/Poco/ListMap.h +++ b/Foundation/include/Poco/ListMap.h @@ -37,7 +37,7 @@ class ListMap /// ordering of elements is not desirable. Naturally, this container will /// have inferior data retrieval performance and it is not recommended for /// use with large datasets. The main purpose within POCO is for Internet - /// messages (email message, http headers etc), to prevent autmomatic + /// messages (email message, http headers etc), to prevent automatic /// header entry reordering. { public: diff --git a/Foundation/include/Poco/LocalDateTime.h b/Foundation/include/Poco/LocalDateTime.h index 72ac4869e6..a73dbc8371 100644 --- a/Foundation/include/Poco/LocalDateTime.h +++ b/Foundation/include/Poco/LocalDateTime.h @@ -39,7 +39,7 @@ class Foundation_API LocalDateTime /// i.e. UTC = local time - time zone differential. /// /// Although LocalDateTime supports relational and arithmetic - /// operators, all date/time comparisons and date/time arithmetics + /// operators, all date/time comparisons and date/time arithmetic /// should be done in UTC, using the DateTime or Timestamp /// class for better performance. The relational operators /// normalize the dates/times involved to UTC before carrying out diff --git a/Foundation/include/Poco/Path.h b/Foundation/include/Poco/Path.h index ded731f1cb..f6e824d414 100644 --- a/Foundation/include/Poco/Path.h +++ b/Foundation/include/Poco/Path.h @@ -170,7 +170,7 @@ class Foundation_API Path /// Appends the given path. Path& resolve(const Path& path); - /// Resolves the given path agains the current one. + /// Resolves the given path against the current one. /// /// If the given path is absolute, it replaces the current one. /// Otherwise, the relative path is appended to the current path. diff --git a/Foundation/include/Poco/Timestamp.h b/Foundation/include/Poco/Timestamp.h index e0d33059c4..1042bab5c7 100644 --- a/Foundation/include/Poco/Timestamp.h +++ b/Foundation/include/Poco/Timestamp.h @@ -34,7 +34,7 @@ class Foundation_API Timestamp /// A Timestamp stores a monotonic* time value /// with (theoretical) microseconds resolution. /// Timestamps can be compared with each other - /// and simple arithmetics are supported. + /// and simple arithmetic is supported. /// /// [*] Note that Timestamp values are only monotonic as /// long as the systems's clock is monotonic as well diff --git a/JSON/include/Poco/JSON/PrintHandler.h b/JSON/include/Poco/JSON/PrintHandler.h index a9661694f3..11e0587f79 100644 --- a/JSON/include/Poco/JSON/PrintHandler.h +++ b/JSON/include/Poco/JSON/PrintHandler.h @@ -53,14 +53,14 @@ class JSON_API PrintHandler : public Handler void startObject(); /// The parser has read a '{'; a new object is started. - /// If indent is greater than zero, a newline will be apended. + /// If indent is greater than zero, a newline will be appended. void endObject(); /// The parser has read a '}'; the object is closed. void startArray(); /// The parser has read a [; a new array will be started. - /// If indent is greater than zero, a newline will be apended. + /// If indent is greater than zero, a newline will be appended. void endArray(); /// The parser has read a ]; the array is closed. diff --git a/Net/include/Poco/Net/TCPServer.h b/Net/include/Poco/Net/TCPServer.h index fccb658f77..45ce8edd29 100644 --- a/Net/include/Poco/Net/TCPServer.h +++ b/Net/include/Poco/Net/TCPServer.h @@ -80,7 +80,7 @@ class Net_API TCPServer: public Poco::Runnable public: TCPServer(TCPServerConnectionFactory::Ptr pFactory, Poco::UInt16 portNumber = 0, TCPServerParams::Ptr pParams = 0); /// Creates the TCPServer, with ServerSocket listening on the given port. - /// Default port is zero, allowing any availble port. The port number + /// Default port is zero, allowing any available port. The port number /// can be queried through TCPServer::port() member. /// /// The server takes ownership of the TCPServerConnectionFactory diff --git a/Util/include/Poco/Util/Application.h b/Util/include/Poco/Util/Application.h index 7d2caafc17..596b01ac29 100644 --- a/Util/include/Poco/Util/Application.h +++ b/Util/include/Poco/Util/Application.h @@ -189,7 +189,7 @@ class Util_API Application: public Subsystem /// by the .ini file and the .xml file. /// /// If the application is built in debug mode (the _DEBUG preprocessor - /// macro is defined) and the base name of the appication executable + /// macro is defined) and the base name of the application executable /// ends with a 'd', a config file without the 'd' ending its base name is /// also found. /// From 12c0594db613a2ed93d9ff04aa63c9b1380bef48 Mon Sep 17 00:00:00 2001 From: martin-osborne Date: Mon, 6 Apr 2015 17:56:13 +0100 Subject: [PATCH 18/23] Corrected misspelt 'b' and 'c' words. --- CppParser/include/Poco/CppParser/NameSpace.h | 4 ++-- CppParser/src/Utility.cpp | 2 +- Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h | 2 +- Data/SQLite/include/Poco/Data/SQLite/Notifier.h | 4 ++-- Data/include/Poco/Data/SQLChannel.h | 4 ++-- Data/include/Poco/Data/Transaction.h | 4 ++-- Foundation/include/Poco/Checksum.h | 2 +- Foundation/include/Poco/Clock.h | 2 +- Foundation/include/Poco/Dynamic/VarHolder.h | 2 +- Foundation/include/Poco/FileStream.h | 4 ++-- Foundation/include/Poco/RegularExpression.h | 2 +- Foundation/include/Poco/SharedMemory_WIN32.h | 2 +- Foundation/include/Poco/SimpleHashTable.h | 2 +- Foundation/include/Poco/TextEncoding.h | 2 +- Foundation/testsuite/src/LocalDateTimeTest.cpp | 2 +- Net/include/Poco/Net/FTPClientSession.h | 2 +- Net/include/Poco/Net/MailMessage.h | 2 +- Zip/include/Poco/Zip/Compress.h | 2 +- 18 files changed, 23 insertions(+), 23 deletions(-) diff --git a/CppParser/include/Poco/CppParser/NameSpace.h b/CppParser/include/Poco/CppParser/NameSpace.h index f632ee7545..f5556c49dd 100644 --- a/CppParser/include/Poco/CppParser/NameSpace.h +++ b/CppParser/include/Poco/CppParser/NameSpace.h @@ -66,7 +66,7 @@ class CppParser_API NameSpace: public Symbol Symbol* lookup(const std::string& name) const; /// Looks up the given name in the symbol table - /// and returns the corresponsing symbol, or null + /// and returns the corresponding symbol, or null /// if no symbol can be found. The name can include /// a namespace. @@ -104,7 +104,7 @@ class CppParser_API NameSpace: public Symbol private: Symbol* lookup(const std::string& name, std::set& alreadyVisited) const; /// Looks up the given name in the symbol table - /// and returns the corresponsing symbol, or null + /// and returns the corresponding symbol, or null /// if no symbol can be found. The name can include /// a namespace. diff --git a/CppParser/src/Utility.cpp b/CppParser/src/Utility.cpp index c46cdf5447..b311ff93b4 100644 --- a/CppParser/src/Utility.cpp +++ b/CppParser/src/Utility.cpp @@ -93,7 +93,7 @@ void Utility::detectPrefixAndIncludes(const std::string& origHFile, std::vector< ++itTmp; std::string defValue = *itTmp; istr >> x; - // now find the corresponsing #define + // now find the corresponding #define while (x.find(defValue) == std::string::npos) istr >> x; //now parse until a class def is found without a ; at the end diff --git a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h index 0af4ece96b..dd24e96b10 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h +++ b/Data/ODBC/include/Poco/Data/ODBC/TypeInfo.h @@ -41,7 +41,7 @@ class ODBC_API TypeInfo /// /// This class provides mapping between C and SQL datatypes as well /// as datatypes supported by the underlying database. In order for database - /// types to be available, a valid conection handle must be supplied at either + /// types to be available, a valid connection handle must be supplied at either /// object construction time, or at a later point in time, through call to /// fillTypeInfo member function. /// diff --git a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h index 77ec247759..1a9aa5d009 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h @@ -46,7 +46,7 @@ class SQLite_API Notifier /// /// There can be only one set of callbacks per session (i.e. registering a new /// callback automatically unregisters the previous one). All callbacks are - /// registered and enabled at Notifier contruction time and can be disabled + /// registered and enabled at Notifier construction time and can be disabled /// at a later point time. { public: @@ -119,7 +119,7 @@ class SQLite_API Notifier /// and triggers the event. static int sqliteCommitCallbackFn(void* pVal); - /// Commit callback event dispatcher. If an exception occurs, it is catched inside this function, + /// Commit callback event dispatcher. If an exception occurs, it is caught inside this function, /// non-zero value is returned, which causes SQLite engine to turn commit into a rollback. /// Therefore, callers should check for return value - if it is zero, callback completed succesfuly /// and transaction was committed. diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h index 4e455550a0..58d8e9c143 100644 --- a/Data/include/Poco/Data/SQLChannel.h +++ b/Data/include/Poco/Data/SQLChannel.h @@ -109,7 +109,7 @@ class Data_API SQLChannel: public Poco::Channel /// However, prior to the next message being processed and sent to /// the target, the previous operation must have been either completed /// or timed out (see timeout and throw properties for details on - /// how abnormal conditos are handled). + /// how abnormal conditions are handled). /// /// * timeout: Timeout (ms) to wait for previous log operation completion. /// Values "0" and "" mean no timeout. Only valid when logging @@ -125,7 +125,7 @@ class Data_API SQLChannel: public Poco::Channel std::size_t wait(); /// Waits for the completion of the previous operation and returns - /// the result. If chanel is in synchronous mode, returns 0 immediately. + /// the result. If channel is in synchronous mode, returns 0 immediately. static void registerChannel(); /// Registers the channel with the global LoggingFactory. diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h index c00e183322..31965953f6 100644 --- a/Data/include/Poco/Data/Transaction.h +++ b/Data/include/Poco/Data/Transaction.h @@ -56,7 +56,7 @@ class Data_API Transaction /// reference as an argument. /// /// When transaction is created using this constructor, it is executed and - /// commited automatically. If no error occurs, rollback is disabled and does + /// committed automatically. If no error occurs, rollback is disabled and does /// not occur at destruction time. If an error occurs resulting in exception being /// thrown, the transaction is rolled back and exception propagated to calling code. /// @@ -84,7 +84,7 @@ class Data_API Transaction ~Transaction(); /// Destroys the Transaction. - /// Rolls back the current database transaction if it has not been commited + /// Rolls back the current database transaction if it has not been committed /// (by calling commit()), or rolled back (by calling rollback()). /// /// If an exception is thrown during rollback, the exception is logged diff --git a/Foundation/include/Poco/Checksum.h b/Foundation/include/Poco/Checksum.h index 49b3076616..69a275cce1 100644 --- a/Foundation/include/Poco/Checksum.h +++ b/Foundation/include/Poco/Checksum.h @@ -69,7 +69,7 @@ class Foundation_API Checksum /// Returns the calculated checksum. Type type() const; - /// Which type of checksum are we calulcating + /// Which type of checksum are we calculating. private: Type _type; diff --git a/Foundation/include/Poco/Clock.h b/Foundation/include/Poco/Clock.h index f3b1ffe4ad..2defd508af 100644 --- a/Foundation/include/Poco/Clock.h +++ b/Foundation/include/Poco/Clock.h @@ -110,7 +110,7 @@ class Foundation_API Clock static ClockDiff resolution(); /// Returns the resolution in units per second. - /// Since the Clock clas has microsecond resolution, + /// Since the Clock class has microsecond resolution, /// the returned value is always 1000000. static ClockDiff accuracy(); diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index 1a743e798a..841a71bbb3 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -388,7 +388,7 @@ class Foundation_API VarHolder /// This function is meant for converting unsigned integral data types to /// unsigned data types. Negative values can not be converted and if one is /// encountered, RangeException is thrown. - /// If upper limit is within the target data type limits, the converiosn is performed. + /// If upper limit is within the target data type limits, the conversion is performed. { poco_static_assert (std::numeric_limits::is_specialized); poco_static_assert (std::numeric_limits::is_specialized); diff --git a/Foundation/include/Poco/FileStream.h b/Foundation/include/Poco/FileStream.h index 26aad367b1..b8617ec104 100644 --- a/Foundation/include/Poco/FileStream.h +++ b/Foundation/include/Poco/FileStream.h @@ -124,7 +124,7 @@ class Foundation_API FileOutputStream: public FileIOS, public std::ostream { public: FileOutputStream(); - /// Creats an unopened FileOutputStream. + /// Creates an unopened FileOutputStream. FileOutputStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::trunc); /// Creates the FileOutputStream for the file given by path, using @@ -161,7 +161,7 @@ class Foundation_API FileStream: public FileIOS, public std::iostream { public: FileStream(); - /// Creats an unopened FileStream. + /// Creates an unopened FileStream. FileStream(const std::string& path, std::ios::openmode mode = std::ios::out | std::ios::in); /// Creates the FileStream for the file given by path, using diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h index e1bc063b9c..54abc37efb 100644 --- a/Foundation/include/Poco/RegularExpression.h +++ b/Foundation/include/Poco/RegularExpression.h @@ -49,7 +49,7 @@ class Foundation_API RegularExpression /// (see http://www.pcre.org). { public: - enum Options // These must match the corresponsing options in pcre.h! + enum Options // These must match the corresponding options in pcre.h! /// Some of the following options can only be passed to the constructor; /// some can be passed only to matching functions, and some can be used /// everywhere. diff --git a/Foundation/include/Poco/SharedMemory_WIN32.h b/Foundation/include/Poco/SharedMemory_WIN32.h index bc496555fb..79e0bbcd31 100644 --- a/Foundation/include/Poco/SharedMemory_WIN32.h +++ b/Foundation/include/Poco/SharedMemory_WIN32.h @@ -52,7 +52,7 @@ class Foundation_API SharedMemoryImpl: public RefCountedObject /// will generally ignore the hint. char* begin() const; - /// Returns the beginn address of the SharedMemory segment. Will be null for illegal segments. + /// Returns the begin address of the SharedMemory segment. Will be null for illegal segments. char* end() const; /// Points past the last byte of the end address of the SharedMemory segment. Will be null for illegal segments. diff --git a/Foundation/include/Poco/SimpleHashTable.h b/Foundation/include/Poco/SimpleHashTable.h index f04cb5ac83..7ee008577d 100644 --- a/Foundation/include/Poco/SimpleHashTable.h +++ b/Foundation/include/Poco/SimpleHashTable.h @@ -38,7 +38,7 @@ template > class SimpleHashTable /// A SimpleHashTable stores a key value pair that can be looked up via a hashed key. /// - /// In comparision to a HashTable, this class handles collisions by sequentially searching the next + /// In comparison to a HashTable, this class handles collisions by sequentially searching the next /// free location. This also means that the maximum size of this table is limited, i.e. if the hash table /// is full, it will throw an exception and that this class does not support remove operations. /// On the plus side it is faster than the HashTable. diff --git a/Foundation/include/Poco/TextEncoding.h b/Foundation/include/Poco/TextEncoding.h index b67a18f159..511b07056f 100644 --- a/Foundation/include/Poco/TextEncoding.h +++ b/Foundation/include/Poco/TextEncoding.h @@ -71,7 +71,7 @@ class Foundation_API TextEncoding /// Returns true if the given name is one of the names of this encoding. /// For example, the "ISO-8859-1" encoding is also known as "Latin-1". /// - /// Encoding name comparision are be case insensitive. + /// Encoding name comparisons are case insensitive. virtual const CharacterMap& characterMap() const = 0; /// Returns the CharacterMap for the encoding. diff --git a/Foundation/testsuite/src/LocalDateTimeTest.cpp b/Foundation/testsuite/src/LocalDateTimeTest.cpp index fd4b52b653..f3381419eb 100644 --- a/Foundation/testsuite/src/LocalDateTimeTest.cpp +++ b/Foundation/testsuite/src/LocalDateTimeTest.cpp @@ -404,7 +404,7 @@ void LocalDateTimeTest::testTimezone() // iterations. Do this with both a LocalDateTime object and // a ANSI C time_t. Then create a LocalDateTime based on the // time_t and verify that the time_t calculated value is equal - // to the LocalDateTime value. The comparision operator + // to the LocalDateTime value. The comparison operator // verifies the _dateTime and _tzd members. LocalDateTime dt2; t = std::time(NULL); diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h index 695f7d4de3..0d766a67f6 100644 --- a/Net/include/Poco/Net/FTPClientSession.h +++ b/Net/include/Poco/Net/FTPClientSession.h @@ -134,7 +134,7 @@ class Net_API FTPClientSession void setFileType(FileType type); /// Sets the file type for transferring files. /// - /// Sends a TYPE command with a corresponsing argument to the + /// Sends a TYPE command with a corresponding argument to the /// server. /// /// Throws a FTPException in case of a FTP-specific error, or a diff --git a/Net/include/Poco/Net/MailMessage.h b/Net/include/Poco/Net/MailMessage.h index 7a5a653a04..9a5e683175 100644 --- a/Net/include/Poco/Net/MailMessage.h +++ b/Net/include/Poco/Net/MailMessage.h @@ -207,7 +207,7 @@ class Net_API MailMessage: public MessageHeader const std::string& mediaType, const std::string& filename = ""); /// Returns either default StringPartSource part store or, - /// if the part store factory was provided during contruction, + /// if the part store factory was provided during construction, /// the one created by PartStoreFactory. /// Returned part store is allocated on the heap; it is caller's /// responsibility to delete it after use. Typical use is handler diff --git a/Zip/include/Poco/Zip/Compress.h b/Zip/include/Poco/Zip/Compress.h index d00d4970ba..3e9e931d96 100644 --- a/Zip/include/Poco/Zip/Compress.h +++ b/Zip/include/Poco/Zip/Compress.h @@ -103,7 +103,7 @@ class Zip_API Compress /// for directories. void addFileRaw(std::istream& in, const ZipLocalFileHeader& hdr, const Poco::Path& fileName); - /// copys an already compressed ZipEntry from in + /// Copies an already compressed ZipEntry from in private: std::set _storeExtensions; From ba8c37c31f530aa372c1fbf1cfd46cf7e25e8db1 Mon Sep 17 00:00:00 2001 From: franchuti688 Date: Tue, 31 Mar 2015 12:25:52 +0200 Subject: [PATCH 19/23] adapted POCO C++ to biicode build system --- CMakeLists.txt | 2 + README.md | 1 + biicode/README.md | 37 ++++ biicode/cmake/BiiPocoMacros.cmake | 148 ++++++++++++++++ biicode/cmake/Crypto.cmake | 1 + biicode/cmake/Data.cmake | 41 +++++ biicode/cmake/Foundation.cmake | 16 ++ biicode/cmake/MySQL.cmake | 2 + biicode/cmake/NetSSL_Win.cmake | 1 + biicode/cmake/ODBC.cmake | 2 + biicode/cmake/PDF.cmake | 6 + biicode/cmake/SQLite.cmake | 7 + biicode/cmake/XML.cmake | 15 ++ biicode/cmake/biicode.cmake | 84 +++++++++ biicode/conf/biicode.conf | 74 ++++++++ biicode/conf/ignore.bii | 250 +++++++++++++++++++++++++++ biicode/conf/pocomsg.h.bii | 157 +++++++++++++++++ biicode/scripts/post_process_hook.py | 179 +++++++++++++++++++ 18 files changed, 1023 insertions(+) create mode 100644 biicode/README.md create mode 100644 biicode/cmake/BiiPocoMacros.cmake create mode 100644 biicode/cmake/Crypto.cmake create mode 100644 biicode/cmake/Data.cmake create mode 100644 biicode/cmake/Foundation.cmake create mode 100644 biicode/cmake/MySQL.cmake create mode 100644 biicode/cmake/NetSSL_Win.cmake create mode 100644 biicode/cmake/ODBC.cmake create mode 100644 biicode/cmake/PDF.cmake create mode 100644 biicode/cmake/SQLite.cmake create mode 100644 biicode/cmake/XML.cmake create mode 100644 biicode/cmake/biicode.cmake create mode 100644 biicode/conf/biicode.conf create mode 100644 biicode/conf/ignore.bii create mode 100644 biicode/conf/pocomsg.h.bii create mode 100644 biicode/scripts/post_process_hook.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 2ad0f906f0..22b982902d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -35,6 +35,8 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) # Append our module directory to CMake set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) +# COMMENT REPLACED BY BIICODE + ################################################################################# # Setup C/C++ compiler options ################################################################################# diff --git a/README.md b/README.md index 9b50063d0f..a22c52db59 100644 --- a/README.md +++ b/README.md @@ -6,6 +6,7 @@ Build Status - Travis: [![Travis Build Status](https://travis-ci.org/pocoproject/poco.png?branch=develop)](https://travis-ci.org/pocoproject/poco) - AppVeyor: [![AppVeyor Build Status](https://ci.appveyor.com/api/projects/status/7iyrx3f233s3akae)](https://ci.appveyor.com/project/obiltschnig/poco) +- biicode: [![Build Status](https://webapi.biicode.com/v1/badges/fenix/fenix/poco/develop)](https://www.biicode.com/fenix/fenix/poco/develop) ![alt text][logo] diff --git a/biicode/README.md b/biicode/README.md new file mode 100644 index 0000000000..2da84e56c0 --- /dev/null +++ b/biicode/README.md @@ -0,0 +1,37 @@ +Biicode C/C++ dependency manager +================================= +New with biicode? Check the [Getting Started Guide](http://docs.biicode.com/c++/gettingstarted.html). + +How to build it? +------------------ +Building it is too easy: + + $ git clone git@github.com:pocoproject/poco.git + $ cd poco + $ bii init -l && bii work + +It creates all the necessary structure to build POCO C++ with biicode. Then, you could run its default samples: + + $ bii build + $ ./bin/any_executable + +Run faster using several processors, e.g., using 4 cores: + + $ bii build -j4 + +**Note**: I recommend Windows OS users to use Visual Studio generator to build POCO project: + + $ bii configure -G "Visual Studio 10" + $ bii build -j4 + $ ./bin/any_executable + +By default, the first use applies all the changes to the repository, if you want to revert these ones, set the BII_POCO_REVERT_CHANGES environment variable to True and run bii work to keep your original code and undo the biicode changes. + + $ export BII_POCO_REVERT_CHANGES=True + $ bii work + + +How to use it in other external projects? +------------------------------------------- + +Take a look at any example from [examples/poco(develop) block](https://www.biicode.com/examples/examples/poco/develop) and try your own using *POCO C++ develop version* with biicode. diff --git a/biicode/cmake/BiiPocoMacros.cmake b/biicode/cmake/BiiPocoMacros.cmake new file mode 100644 index 0000000000..c161b02147 --- /dev/null +++ b/biicode/cmake/BiiPocoMacros.cmake @@ -0,0 +1,148 @@ +macro(ENABLE_LIBRARIES ) + if(NOT BII_LIB_SRC) + return() + endif() + string(FIND "${BII_LIB_SRC}" "Data/MySQL/include" MySQL_SINGLE_MATCHED ) + IF(MySQL_SINGLE_MATCHED) + SET(ENABLE_DATA_MYSQL ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Data/ODBC/include" ODBC_SINGLE_MATCHED) + IF(ODBC_SINGLE_MATCHED) + SET(ENABLE_DATA_ODBC ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Data/SQLite/include" SQLite_SINGLE_MATCHED ) + IF(SQLite_SINGLE_MATCHED) + SET(ENABLE_DATA_SQLITE ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "JSON/include" JSON_SINGLE_MATCHED ) + IF(JSON_SINGLE_MATCHED) + SET(ENABLE_JSON ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "MongoDB/include" MONGODB_SINGLE_MATCHED ) + IF(MONGODB_SINGLE_MATCHED) + SET(ENABLE_MONGODB ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Util/include" UTIL_SINGLE_MATCHED ) + IF(UTIL_SINGLE_MATCHED) + SET(ENABLE_UTIL ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Net/include" NET_SINGLE_MATCHED ) + IF(NET_SINGLE_MATCHED) + SET(ENABLE_NET ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Zip/include" ZIP_SINGLE_MATCHED ) + IF(ZIP_SINGLE_MATCHED) + SET(ENABLE_ZIP ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "ApacheConnector/include" APACHECONNECTOR_SINGLE_MATCHED ) + IF(APACHECONNECTOR_SINGLE_MATCHED) + SET(ENABLE_APACHECONNECTOR ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "CppParser/include" CPPPARSER_SINGLE_MATCHED ) + IF(CPPPARSER_SINGLE_MATCHED) + SET(ENABLE_CPPPARSER ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "XML/include" XML_SINGLE_MATCHED ) + IF(XML_SINGLE_MATCHED) + SET(ENABLE_XML ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Crypto/include" CRYPTO_SINGLE_MATCHED ) + IF(CRYPTO_SINGLE_MATCHED) + SET(ENABLE_CRYPTO ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "Data/include" DATA_SINGLE_MATCHED ) + IF(DATA_SINGLE_MATCHED) + SET(ENABLE_DATA ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "NetSSL_OpenSSL/include" NETSSL_OPENSSL_SINGLE_MATCHED ) + IF(NETSSL_OPENSSL_SINGLE_MATCHED) + SET(ENABLE_NETSSL ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "NetSSL_Win/include" NETSSL_WIN_SINGLE_MATCHED ) + IF(NETSSL_WIN_SINGLE_MATCHED) + SET(ENABLE_NETSSL_WIN ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "PDF/include" PDF_SINGLE_MATCHED ) + IF(PDF_SINGLE_MATCHED) + SET(ENABLE_PDF ON) + ENDIF() + + string(FIND "${BII_LIB_SRC}" "SevenZip/include" SEVENZIP_SINGLE_MATCHED ) + IF(SEVENZIP_SINGLE_MATCHED) + SET(ENABLE_SEVENZIP ON) + ENDIF() +endmacro() + +macro(FILTER_BII_LIB_SRC PATTERN) + if(NOT BII_LIB_SRC) + return() + endif() + SET(ALL_MATCHES ) + foreach(RESOURCE_FILE ${BII_LIB_SRC}) + set(SINGLE_MATCHED ) + string(REGEX MATCH "${PATTERN}" SINGLE_MATCHED "${RESOURCE_FILE}") + IF(DEFINED SINGLE_MATCHED) + SET(ALL_MATCHES ${ALL_MATCHES} ${SINGLE_MATCHED}) + ENDIF(DEFINED SINGLE_MATCHED) + endforeach(RESOURCE_FILE ${BII_LIB_SRC}) + + FOREACH(BAD_ITEM ${ALL_MATCHES}) + LIST(REMOVE_ITEM BII_LIB_SRC ${BAD_ITEM}) + ENDFOREACH(BAD_ITEM ${ALL_MATCHES}) +endmacro() + +# Delete all the bad implementations which biicode detects +macro(FILTER_BAD_DEPENDENCIES) + if(NOT BII_LIB_SRC) + return() + endif() + SET(BAD_DEPS_PATTERN "(.*)(_WIN32U|_UNIX|_POSIX|_STD|_C99|_DEC|_DUMMY|_SUN|_VMS|_WINCE|_WIN32|_VX|_Android|_HPUX)(.*)") + # First filter: selected the pattern "_WIN32" or similars + FILTER_BII_LIB_SRC(${BAD_DEPS_PATTERN}) + + # Second filter: special cases + SET(SPECIAL_BAD_DEPENDENCIES_WIN Foundation/include/Poco/SyslogChannel.h + Foundation/src/SyslogChannel.cpp + Foundation/include/Poco/OpcomChannel.h + Foundation/src/OpcomChannel.cpp) + + SET(SPECIAL_BAD_DEPENDENCIES_UNIX Foundation/include/Poco/EventLogChannel.h + Foundation/src/EventLogChannel.cpp + Foundation/include/Poco/WindowsConsoleChannel.h + Foundation/src/WindowsConsoleChannel.cpp + Foundation/include/Poco/OpcomChannel.h + Foundation/src/OpcomChannel.cpp + Util/src/WinRegistryKey.cpp + Util/src/WinRegistryConfiguration.cpp + Util/src/WinService.cpp) + IF(WIN32) + FOREACH(SPECIAL_DEP ${SPECIAL_BAD_DEPENDENCIES_WIN}) + list(FIND BII_LIB_SRC ${SPECIAL_DEP} DEP_MATCH) + if(DEP_MATCH) + LIST(REMOVE_ITEM BII_LIB_SRC ${SPECIAL_DEP}) + endif() + ENDFOREACH() + ELSEIF(UNIX) + FOREACH(SPECIAL_DEP ${SPECIAL_BAD_DEPENDENCIES_UNIX}) + list(FIND BII_LIB_SRC ${SPECIAL_DEP} DEP_MATCH) + if(DEP_MATCH) + LIST(REMOVE_ITEM BII_LIB_SRC ${SPECIAL_DEP}) + endif() + ENDFOREACH() + ENDIF() +endmacro() diff --git a/biicode/cmake/Crypto.cmake b/biicode/cmake/Crypto.cmake new file mode 100644 index 0000000000..216a383e5f --- /dev/null +++ b/biicode/cmake/Crypto.cmake @@ -0,0 +1 @@ +TARGET_LINK_LIBRARIES(${BII_BLOCK_TARGET} INTERFACE ${OPENSSL_LIBRARIES}) \ No newline at end of file diff --git a/biicode/cmake/Data.cmake b/biicode/cmake/Data.cmake new file mode 100644 index 0000000000..0327d11bf6 --- /dev/null +++ b/biicode/cmake/Data.cmake @@ -0,0 +1,41 @@ +if (NOT POCO_STATIC) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DTHREADSAFE) +endif (NOT POCO_STATIC) + +if(MSVC AND NOT(MSVC_VERSION LESS 1400)) + set_source_files_properties(src/StatementImpl.cpp + PROPERTIES COMPILE_FLAGS "/bigobj") +endif() + +if(ENABLE_DATA_SQLITE) + # SQlite3 is built in any case + include( SQLite ) +endif(ENABLE_DATA_SQLITE) + +if(ENABLE_DATA_MYSQL) +find_package(MySQL) +if(MYSQL_FOUND) + target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${MYSQL_INCLUDE_DIR}") + message(STATUS "MySQL Support Enabled") + include( MySQL ) +else() + message(STATUS "MySQL Support Disabled - no MySQL library") +endif(MYSQL_FOUND) +endif(ENABLE_DATA_MYSQL) + +if(ENABLE_DATA_ODBC) +find_package(ODBC) +if(WIN32 AND NOT WINCE) + set(ODBC_LIBRARIES "odbc32" "odbccp32") + message(STATUS "Windows native ODBC Support Enabled") + include( ODBC ) +else(WIN32 AND NOT WINCE) + if(ODBC_FOUND) + target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${ODBC_INCLUDE_DIRECTORIES}") + message(STATUS "ODBC Support Enabled") + include( ODBC ) + else() + message(STATUS "ODBC Support Disabled - no ODBC runtime") + endif() +endif(WIN32 AND NOT WINCE) +endif(ENABLE_DATA_ODBC) diff --git a/biicode/cmake/Foundation.cmake b/biicode/cmake/Foundation.cmake new file mode 100644 index 0000000000..2638f5b3b0 --- /dev/null +++ b/biicode/cmake/Foundation.cmake @@ -0,0 +1,16 @@ +# If POCO_UNBUNDLED is enabled we try to find the required packages +# The configuration will fail if the packages are not found +if (POCO_UNBUNDLED) + find_package(PCRE REQUIRED) + set(SYSLIBS ${SYSLIBS} ${PCRE_LIBRARIES}) + target_include_directories(${BII_BLOCK_TARGET} INTERFACE ${PCRE_INCLUDE_DIRS}) + + find_package(ZLIB REQUIRED) + set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES}) + target_include_directories(${BII_BLOCK_TARGET} INTERFACE ${ZLIB_INCLUDE_DIRS}) +endif (POCO_UNBUNDLED) + +if(WIN32) + set(SYSLIBS ${SYSLIBS} iphlpapi) +endif(WIN32) +target_link_libraries(${BII_BLOCK_TARGET} INTERFACE ${SYSLIBS}) diff --git a/biicode/cmake/MySQL.cmake b/biicode/cmake/MySQL.cmake new file mode 100644 index 0000000000..ab0ff4abf9 --- /dev/null +++ b/biicode/cmake/MySQL.cmake @@ -0,0 +1,2 @@ +target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DTHREADSAFE -DNO_TCL) +target_link_libraries( ${BII_BLOCK_TARGET} INTERFACE ${MYSQL_LIB}) diff --git a/biicode/cmake/NetSSL_Win.cmake b/biicode/cmake/NetSSL_Win.cmake new file mode 100644 index 0000000000..43a728138a --- /dev/null +++ b/biicode/cmake/NetSSL_Win.cmake @@ -0,0 +1 @@ +target_link_libraries(${BII_BLOCK_TARGET} INTERFACE Crypt32.lib) \ No newline at end of file diff --git a/biicode/cmake/ODBC.cmake b/biicode/cmake/ODBC.cmake new file mode 100644 index 0000000000..b3145d3797 --- /dev/null +++ b/biicode/cmake/ODBC.cmake @@ -0,0 +1,2 @@ +target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE ${ODBC_CFLAGS} -DTHREADSAFE) +target_link_libraries( ${BII_BLOCK_TARGET} INTERFACE ${ODBC_LIBRARIES}) diff --git a/biicode/cmake/PDF.cmake b/biicode/cmake/PDF.cmake new file mode 100644 index 0000000000..26d500a242 --- /dev/null +++ b/biicode/cmake/PDF.cmake @@ -0,0 +1,6 @@ +if (POCO_UNBUNDLED) + find_package(ZLIB REQUIRED) + set(SYSLIBS ${SYSLIBS} ${ZLIB_LIBRARIES}) + include_directories(${ZLIB_INCLUDE_DIRS}) +endif (POCO_UNBUNDLED) +target_link_libraries(${BII_BLOCK_TARGET} INTERFACE ${SYSLIBS} ) diff --git a/biicode/cmake/SQLite.cmake b/biicode/cmake/SQLite.cmake new file mode 100644 index 0000000000..80a74deeed --- /dev/null +++ b/biicode/cmake/SQLite.cmake @@ -0,0 +1,7 @@ +target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DSQLITE_THREADSAFE=1 + -DSQLITE_DISABLE_LFS + -DSQLITE_OMIT_UTF16 + -DSQLITE_OMIT_PROGRESS_CALLBACK + -DSQLITE_OMIT_COMPLETE + -DSQLITE_OMIT_TCL_VARIABLE + -DSQLITE_OMIT_DEPRECATED) diff --git a/biicode/cmake/XML.cmake b/biicode/cmake/XML.cmake new file mode 100644 index 0000000000..4f3d337a8f --- /dev/null +++ b/biicode/cmake/XML.cmake @@ -0,0 +1,15 @@ +# If POCO_UNBUNDLED is enabled we try to find the required packages +# The configuration will fail if the packages are not found +if (POCO_UNBUNDLED) + find_package(EXPAT REQUIRED) + set(SYSLIBS ${SYSLIBS} ${EXPAT_LIBRARIES}) + include_directories(${EXPAT_INCLUDE_DIRS}) +endif (POCO_UNBUNDLED) + +if(WIN32) + #TODO: Is XML_STATIC only required with Windows? What does it do? + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DXML_STATIC -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H) +else() + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DXML_NS -DXML_DTD -DHAVE_EXPAT_CONFIG_H) +endif() +target_link_libraries(${BII_BLOCK_TARGET} INTERFACE ${SYSLIBS}) diff --git a/biicode/cmake/biicode.cmake b/biicode/cmake/biicode.cmake new file mode 100644 index 0000000000..ab024352cd --- /dev/null +++ b/biicode/cmake/biicode.cmake @@ -0,0 +1,84 @@ +# Append biicode module directory to CMake +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake + ${CMAKE_CURRENT_SOURCE_DIR}/biicode/cmake) + +include(BiiPocoMacros) + +FILTER_BAD_DEPENDENCIES() + +# Actually create targets: EXEcutables and libraries. +ADD_BIICODE_TARGETS() + +option(POCO_STATIC + "Set to OFF|ON (default is OFF) to control build of POCO as STATIC library" ON) + +# Uncomment from next two lines to force statitc or dynamic library, default is autodetection +if(POCO_STATIC) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_STATIC -DPOCO_NO_AUTOMATIC_LIBS) + set( LIB_MODE STATIC ) + message(STATUS "Building static libraries") +else(POCO_STATIC) + set( LIB_MODE SHARED ) + message(STATUS "Building dynamic libraries") +endif(POCO_STATIC) + +# OS Detection +if(WIN32) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_OS_FAMILY_WINDOWS -DUNICODE -D_UNICODE) + #set(SYSLIBS iphlpapi gdi32 odbc32) +endif(WIN32) + +if (UNIX AND NOT ANDROID ) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_OS_FAMILY_UNIX ) + # Standard 'must be' defines + if (APPLE) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DPOCO_HAVE_IPv6 -DPOCO_NO_STAT64) + set(SYSLIBS dl) + else (APPLE) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -D_XOPEN_SOURCE=500 -D_REENTRANT -D_THREAD_SAFE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64) + set(SYSLIBS pthread dl rt) + endif (APPLE) +endif(UNIX AND NOT ANDROID ) + +if (CMAKE_COMPILER_IS_MINGW) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -DWC_NO_BEST_FIT_CHARS=0x400 -DPOCO_WIN32_UTF8) + target_compile_definitions(${BII_BLOCK_TARGET} INTERFACE -D_WIN32 -DMINGW32 -DWINVER=0x500 -DODBCVER=0x0300 -DPOCO_THREAD_STACK_SIZE) +endif (CMAKE_COMPILER_IS_MINGW) + +# Collect the built libraries and include dirs, the will be used to create the PocoConfig.cmake file +ENABLE_LIBRARIES() + +include(Foundation) +if(ENABLE_XML) + include(XML) +endif() +if(ENABLE_PDF) + include(PDF) +endif() + +#NetSSL + +if(WIN32 AND ENABLE_NETSSL_WIN) + include(NetSSL_Win) +endif(WIN32 AND ENABLE_NETSSL_WIN) + +find_package(OpenSSL) +if(OPENSSL_FOUND) + target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${OPENSSL_INCLUDE_DIR}") + if(ENABLE_NETSSL) + target_link_libraries(${BII_BLOCK_TARGET} INTERFACE ${OPENSSL_SSL_LIBRARY}) + endif() + if(ENABLE_CRYPTO) + include(Crypto) + endif() +endif(OPENSSL_FOUND) + +if(ENABLE_DATA) + include(Data) +endif() + +find_package(APR) +find_package(Apache2) +if(APRUTIL_FOUND AND APACHE_FOUND) + target_include_directories(${BII_BLOCK_TARGET} INTERFACE "${APACHE_INCLUDE_DIR}" "${APRUTIL_INCLUDE_DIR}" ) +endif(APRUTIL_FOUND AND APACHE_FOUND) \ No newline at end of file diff --git a/biicode/conf/biicode.conf b/biicode/conf/biicode.conf new file mode 100644 index 0000000000..a56f7fc6bb --- /dev/null +++ b/biicode/conf/biicode.conf @@ -0,0 +1,74 @@ +# Biicode configuration file +[requirements] + fenix/7z: 0 + fenix/hpdf: 1 + fenix/sqlite: 0 + zlib/zlib: 2 + lasote/openssl(v1.0.2): 3 + fenix/pcre: 0 + +[paths] + # Local directories to look for headers (within block) + /ApacheConnector/include + /CppParser/include + /CppUnit/include + /CppUnit/WinTestRunner/include + /Crypto/include + /Data/include + /Data/MySQL/include + /Data/ODBC/include + /Data/SQLite/include + /Foundation/include + /Net/include + /Util/include + /XML/include + /JSON/include + /MongoDB/include + /NetSSL_OpenSSL/include + /NetSSL_Win/include/Poco/Net + /PDF/include + /SevenZip/include + /Zip/include + +[dependencies] + CMakeLists.txt + cmake/* VERSION LICENSE + + Foundation/include/Poco/String.h = Foundation/src/String.cpp + Foundation/include/Poco/Format.h = Foundation/src/Format.cpp + + # Advanced implementations + XML/include/Poco/XML/XMLException.h = XML/src/XMLException.cpp + XML/include/Poco/XML/expat.h = XML/src/xmlparse.cpp + XML/src/xmlrole.h = XML/src/xmlrole.c + XML/src/xmltok.h = XML/src/xmltok.c + XML/src/xmltok_impl.h = XML/src/xmltok_impl.c + + Net/include/Poco/Net/NetException.h = Net/src/NetException.cpp + Util/include/Poco/Util/OptionException.h = Util/src/OptionException.cpp + Foundation/include/Poco/PipeImpl.h = Foundation/src/PipeImpl.cpp + JSON/include/Poco/JSON/JSONException.h = JSON/src/JSONException.cpp + JSON/include/Poco/JSON/Template.h = JSON/src/Template.cpp + PDF/include/Poco/PDF/PDFException.h = PDF/src/PDFException.cpp + Zip/include/Poco/Zip/ZipException.h = Zip/src/ZipException.cpp + Data/include/Poco/Data/DataException.h = Data/src/DataException.cpp + Data/SQLite/include/Poco/Data/SQLite/SQLiteException.h = Data/SQLite/src/SQLiteException.cpp + Data/ODBC/include/Poco/Data/ODBC/ODBCException.h = Data/ODBC/src/ODBCException.cpp + + # Editing bad dependencies from NetSSL_OpenSSL and NetSSL_Win libraries + NetSSL_OpenSSL/include/Poco/Net/*.h - Net/src/*.cpp NetSSL_Win/src/*.cpp + NetSSL_OpenSSL/include/Poco/Net/SSLException.h = NetSSL_OpenSSL/src/SSLException.cpp + + NetSSL_Win/include/Poco/Net/*.h - Net/src/*.cpp NetSSL_OpenSSL/src/*.cpp + NetSSL_Win/include/Poco/Net/SSLException.h = NetSSL_Win/src/SSLException.cpp + +[includes] + # Creating relations if UNBUNDLED isn't defined + pcre*.h: fenix/pcre + zlib.h: zlib/zlib + zutil.h: zlib/zlib + hpdf*.h: fenix/hpdf/include + 7z*.h: fenix/7z + openssl/*.h: lasote/openssl/include + sqlite3.h: fenix/sqlite + +#[mains] section \ No newline at end of file diff --git a/biicode/conf/ignore.bii b/biicode/conf/ignore.bii new file mode 100644 index 0000000000..aab6dad629 --- /dev/null +++ b/biicode/conf/ignore.bii @@ -0,0 +1,250 @@ +*.com +*.sh +*.class +*.dll +*.exe +*.o +*.so +*.obj +*.pyc +*.dir +*.sln +*.vcpro +*.filters +*.sln +*.vcxproj +*.progen +*.vcproj +*.vxbuild +*.page +*.doc +*.template +*.properties +*.cmd +doc/* +build/* +contrib/* +patches/* +PocoDoc/* +PageCompiler/* +release/* +ProGen/* +PageCompiler/* +*/doc/* +*/testsuite/* +*/wcelibcex-1.0/* +*/File2Page/* +*/samples/* + + +# Ignored library files (zlib, pcre, hdpf, 7-zip) +*7z.h +*7zAlloc.c +*7zAlloc.h +*7zBuf.c +*7zBuf.h +*7zBuf2.c +*7zCrc.c +*7zCrc.h +*7zCrcOpt.c +*7zDec.c +*7zFile.c +*7zFile.h +*7zIn.c +*7zStream.c +*7zVersion.h +*adler32.c +*Alloc.c +*Alloc.h +*Bcj2.c +*Bcj2.h +*Bra.c +*Bra.h +*Bra86.c +*BraIA64.c +*compress.c +*CpuArch.c +*CpuArch.h +*crc32.c +*crc32.h +*deflate.c +*deflate.h +*Delta.c +*Delta.h +*gzguts.h +*gzio.c +*hpdf.h +*hpdf_annotation.c +*hpdf_annotation.h +*hpdf_array.c +*hpdf_binary.c +*hpdf_boolean.c +*hpdf_catalog.c +*hpdf_catalog.h +*hpdf_conf.h +*hpdf_consts.h +*hpdf_destination.c +*hpdf_destination.h +*hpdf_dict.c +*hpdf_doc.c +*hpdf_doc.h +*hpdf_doc_png.c +*hpdf_encoder.c +*hpdf_encoder.h +*hpdf_encoder_cns.c +*hpdf_encoder_cnt.c +*hpdf_encoder_jp.c +*hpdf_encoder_kr.c +*hpdf_encrypt.c +*hpdf_encrypt.h +*hpdf_encryptdict.c +*hpdf_encryptdict.h +*hpdf_error.c +*hpdf_error.h +*hpdf_ext_gstate.c +*hpdf_ext_gstate.h +*hpdf_font.c +*hpdf_font.h +*hpdf_fontdef.c +*hpdf_fontdef.h +*hpdf_fontdef_base14.c +*hpdf_fontdef_cid.c +*hpdf_fontdef_cns.c +*hpdf_fontdef_cnt.c +*hpdf_fontdef_jp.c +*hpdf_fontdef_kr.c +*hpdf_fontdef_tt.c +*hpdf_fontdef_type1.c +*hpdf_font_cid.c +*hpdf_font_tt.c +*hpdf_font_type1.c +*hpdf_gstate.c +*hpdf_gstate.h +*hpdf_image.c +*hpdf_image.h +*hpdf_image_png.c +*hpdf_info.c +*hpdf_info.h +*hpdf_list.c +*hpdf_list.h +*hpdf_mmgr.c +*hpdf_mmgr.h +*hpdf_name.c +*hpdf_null.c +*hpdf_number.c +*hpdf_objects.c +*hpdf_objects.h +*hpdf_outline.c +*hpdf_outline.h +*hpdf_pages.c +*hpdf_pages.h +*hpdf_page_label.c +*hpdf_page_label.h +*hpdf_page_operator.c +*hpdf_real.c +*hpdf_streams.c +*hpdf_streams.h +*hpdf_string.c +*hpdf_types.h +*hpdf_utils.c +*hpdf_utils.h +*hpdf_xref.c +*infback.c +*inffast.c +*inffast.h +*inffixed.h +*inflate.c +*inflate.h +*inftrees.c +*inftrees.h +*LzFind.c +*LzFind.h +*LzFindMt.c +*LzFindMt.h +*LzHash.h +*Lzma2Dec.c +*Lzma2Dec.h +*Lzma2Enc.c +*Lzma2Enc.h +*Lzma86.h +*Lzma86Dec.c +*Lzma86Enc.c +*LzmaDec.c +*LzmaDec.h +*LzmaEnc.c +*LzmaEnc.h +*LzmaLib.c +*LzmaLib.h +*MtCoder.c +*MtCoder.h +*pcre.h +*pcre_byte_order.c +*pcre_chartables.c +*pcre_compile.c +*pcre_config.c +*pcre_config.h +*pcre_dfa_exec.c +*pcre_exec.c +*pcre_fullinfo.c +*pcre_get.c +*pcre_globals.c +*pcre_internal.h +*pcre_jit_compile.c +*pcre_maketables.c +*pcre_newline.c +*pcre_ord2utf8.c +*pcre_refcount.c +*pcre_string_utils.c +*pcre_study.c +*pcre_tables.c +*pcre_ucd.c +*pcre_valid_utf8.c +*pcre_version.c +*pcre_xclass.c +*png.c +*png.h +*pngconf.h +*pngerror.c +*pnggccrd.c +*pngget.c +*pngmem.c +*pngpread.c +*pngread.c +*pngrio.c +*pngrtran.c +*pngrutil.c +*pngset.c +*pngtest.c +*pngtrans.c +*pngvcrd.c +*pngwio.c +*pngwrite.c +*pngwtran.c +*pngwutil.c +*Ppmd.h +*Ppmd7.c +*Ppmd7.h +*Ppmd7Dec.c +*Ppmd7Enc.c +*RotateDefs.h +*Sha256.c +*Sha256.h +*Threads.c +*Threads.h +*trees.c +*trees.h +*ucp.h +*Xz.c +*Xz.h +*XzCrc64.c +*XzCrc64.h +*XzDec.c +*XzEnc.c +*XzEnc.h +*XzIn.c +*zconf.h +*zlib.h +*zutil.c +*zutil.h +*sqlite3.c +*sqlite3.h \ No newline at end of file diff --git a/biicode/conf/pocomsg.h.bii b/biicode/conf/pocomsg.h.bii new file mode 100644 index 0000000000..7fc4a705e2 --- /dev/null +++ b/biicode/conf/pocomsg.h.bii @@ -0,0 +1,157 @@ +// +// pocomsg.mc[.h] +// +// $Id: //poco/1.4/Foundation/src/pocomsg.mc#1 $ +// +// The Poco message source/header file. +// +// NOTE: pocomsg.h is automatically generated from pocomsg.mc. +// Never edit pocomsg.h directly! +// +// Copyright (c) 2004-2006, Applied Informatics Software Engineering GmbH. +// and Contributors. +// +// Permission is hereby granted, free of charge, to any person or organization +// obtaining a copy of the software and accompanying documentation covered by +// this license (the "Software") to use, reproduce, display, distribute, +// execute, and transmit the Software, and to prepare derivative works of the +// Software, and to permit third-parties to whom the Software is furnished to +// do so, all subject to the following: +// +// The copyright notices in the Software and this entire statement, including +// the above license grant, this restriction and the following disclaimer, +// must be included in all copies of the Software, in whole or in part, and +// all derivative works of the Software, unless such copies or derivative +// works are solely in the form of machine-executable object code generated by +// a source language processor. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT +// SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE +// FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE, +// ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +// DEALINGS IN THE SOFTWARE. +// +// +// Categories +// +// +// Values are 32 bit values laid out as follows: +// +// 3 3 2 2 2 2 2 2 2 2 2 2 1 1 1 1 1 1 1 1 1 1 +// 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 9 8 7 6 5 4 3 2 1 0 +// +---+-+-+-----------------------+-------------------------------+ +// |Sev|C|R| Facility | Code | +// +---+-+-+-----------------------+-------------------------------+ +// +// where +// +// Sev - is the severity code +// +// 00 - Success +// 01 - Informational +// 10 - Warning +// 11 - Error +// +// C - is the Customer code flag +// +// R - is a reserved bit +// +// Facility - is the facility code +// +// Code - is the facility's status code +// +// +// Define the facility codes +// + + +// +// Define the severity codes +// + + +// +// MessageId: POCO_CTG_FATAL +// +// MessageText: +// +// Fatal +// +#define POCO_CTG_FATAL 0x00000001L + +// +// MessageId: POCO_CTG_CRITICAL +// +// MessageText: +// +// Critical +// +#define POCO_CTG_CRITICAL 0x00000002L + +// +// MessageId: POCO_CTG_ERROR +// +// MessageText: +// +// Error +// +#define POCO_CTG_ERROR 0x00000003L + +// +// MessageId: POCO_CTG_WARNING +// +// MessageText: +// +// Warning +// +#define POCO_CTG_WARNING 0x00000004L + +// +// MessageId: POCO_CTG_NOTICE +// +// MessageText: +// +// Notice +// +#define POCO_CTG_NOTICE 0x00000005L + +// +// MessageId: POCO_CTG_INFORMATION +// +// MessageText: +// +// Information +// +#define POCO_CTG_INFORMATION 0x00000006L + +// +// MessageId: POCO_CTG_DEBUG +// +// MessageText: +// +// Debug +// +#define POCO_CTG_DEBUG 0x00000007L + +// +// MessageId: POCO_CTG_TRACE +// +// MessageText: +// +// Trace +// +#define POCO_CTG_TRACE 0x00000008L + +// +// Event Identifiers +// +// +// MessageId: POCO_MSG_LOG +// +// MessageText: +// +// %1 +// +#define POCO_MSG_LOG 0x00001000L diff --git a/biicode/scripts/post_process_hook.py b/biicode/scripts/post_process_hook.py new file mode 100644 index 0000000000..7a5084e80b --- /dev/null +++ b/biicode/scripts/post_process_hook.py @@ -0,0 +1,179 @@ +''' + This is the biicode hook file. It changes some relative #include's, adds some lines to CMakeLists + and some configuration files to root project folder to make possible POCO reusing. + + You can revert all the modifications suffered in the original code. By default, + if you're using biicode, the changes are applied: + + BII_POCO_REVERT_CHANGES = False + + To revert all, run into your current command prompt: + + Windows: $ set BII_POCO_REVERT_CHANGES=True + Unix: $ export BII_POCO_REVERT_CHANGES=True + + and execute "bii work" to back into original form. +''' +import os +import re +import shutil +import platform + + +def replacement(match_object): + if not "Poco/Net/" in match_object.group(0): + return '#include "Poco/Net/%s"' % match_object.group(1) + return '#include "%s"' % match_object.group(1) + + +def save(path, binary_content): + with open(path, 'wb') as handle: + handle.write(binary_content) + + +def load(path): + with open(path, 'rb') as handle: + return handle.read() + + +def search_and_replace_pattern(_files, base_path, pattern): + for _file in _files: + try: + _file_path = os.path.join(base_path, _file) + c = load(_file_path) + c = re.sub(pattern, replacement, c) + save(_file_path, c) + except: + pass + + +def search_and_replace(_file, token, _replacement): + try: + c = load(_file) + c = c.replace(token, _replacement) + save(_file, c) + except: + pass + + +def prepare_all_samples(): + ignored_samples = ['ApacheConnector', 'CppUnit', + 'PageCompiler'] + poco_modules = os.listdir(root_folder) + for module in os.listdir(root_folder): + if (platform.system() != "Windows" and module == "NetSSL_Win") \ + or module in ignored_samples: + continue + samples_module_path = os.path.join(root_folder, module, 'samples') + if os.path.exists(samples_module_path): + example_dest = os.path.join(root_folder, 'examples', module) + shutil.copytree(samples_module_path, example_dest) + + if "#[mains] section" in load(biicode_conf_path): + examples_mains = '''[mains] + # Crypto + examples/Crypto/genrsakey/src/genrsakey.cpp + # SevenZip + examples/SevenZip/un7zip/src/un7zip.cpp + # Util + examples/Util/pkill/src/pkill.cpp + examples/Util/SampleApp/src/SampleApp.cpp + examples/Util/SampleServer/src/SampleServer.cpp + # Zip + examples/Zip/zip/src/zip.cpp + examples/Zip/unzip/src/unzip.cpp +''' + search_and_replace(biicode_conf_path, "#[mains] section", examples_mains) + +def delete_all_samples(): + examples_path = os.path.join(root_folder, 'examples') + if os.path.exists(examples_path): + shutil.rmtree(examples_path) + + +def apply_changes(): + ''' Applying necessary chnages to use POCO with biicode ''' + shutil.copy(os.path.join(root_folder, 'biicode', 'conf', 'biicode.conf'), root_folder) + shutil.copy(os.path.join(root_folder, 'biicode', 'conf', 'ignore.bii'), root_folder) + shutil.copy(os.path.join(root_folder, 'biicode', 'conf', 'pocomsg.h.bii'), + os.path.join(root_folder, 'Foundation', 'src', 'pocomsg.h')) + + base_header_name = os.path.join(root_folder, "Foundation", "include", "Poco") + # Replacements + if os_platform == "Windows": + pattern_match = '#include\s+"Poco/Net/(%s)"' % '|'.join(netssl_win_all_headers) + pattern_match = pattern_match.replace('.', '\\.') + search_and_replace_pattern(netssl_win_all_headers, netssl_win_headers_path, pattern_match) + search_and_replace_pattern(netssl_win_all_sources, netssl_win_src_path, pattern_match) + search_and_replace(os.path.join(base_header_name, "DeflatingStream.h"), "Poco/zlib.h", "zlib/zlib/zlib.h") + search_and_replace(os.path.join(base_header_name, "InflatingStream.h"), "Poco/zlib.h", "zlib/zlib/zlib.h") + search_and_replace(os.path.join(root_folder, "Foundation", "src", "Checksum.cpp"), "Poco/zlib.h", "zlib/zlib/zlib.h") + search_and_replace(os.path.join(root_folder, "Zip", "src", "ZipStream.cpp"), "Poco/zlib.h", "zlib/zlib/zlib.h") + search_and_replace(cmakelist_path, cmakelist_token, cmakelist_replacement) + + prepare_all_samples() + + +def revert_changes(): + ''' Revert all the biicode changes code ''' + os.remove(biicode_conf_path) + os.remove(ignore_bii_path) + os.remove(pocomsg_h_path) + + base_header_name = os.path.join(root_folder, "Foundation", "include", "Poco") + # Replacements + if os_platform == "Windows": + pattern_match = '#include\s+"(%s)"' % '|'.join(netssl_win_all_headers) + pattern_match = pattern_match.replace('.', '\\.') + search_and_replace_pattern(netssl_win_all_headers, netssl_win_headers_path, pattern_match) + search_and_replace_pattern(netssl_win_all_sources, netssl_win_src_path, pattern_match) + search_and_replace(os.path.join(base_header_name, "DeflatingStream.h"), "zlib/zlib/zlib.h", "Poco/zlib.h") + search_and_replace(os.path.join(base_header_name, "InflatingStream.h"), "zlib/zlib/zlib.h", "Poco/zlib.h") + search_and_replace(os.path.join(root_folder, "Foundation", "src", "Checksum.cpp"), "zlib/zlib/zlib.h", "Poco/zlib.h") + search_and_replace(os.path.join(root_folder, "Zip", "src", "ZipStream.cpp"), "zlib/zlib/zlib.h", "Poco/zlib.h") + if os_platform == "Windows": + search_and_replace(cmakelist_path, cmakelist_replacement_win, cmakelist_token) + else: + search_and_replace(cmakelist_path, cmakelist_replacement, cmakelist_token) + + delete_all_samples() + + +# Main code +os_platform = platform.system() +BII_POCO_REVERT_CHANGES = os.environ.get('BII_POCO_REVERT_CHANGES', 'False') + +root_folder = bii.block_folder if os.path.exists(bii.block_folder) else bii.project_folder +netssl_win_headers_path = os.path.join(root_folder, 'NetSSL_Win', 'include', 'Poco', 'Net') +netssl_win_all_headers = os.listdir(netssl_win_headers_path) +netssl_win_src_path = os.path.join(root_folder, 'NetSSL_Win', 'src') +netssl_win_all_sources = os.listdir(netssl_win_src_path) + +ignore_bii_path = os.path.join(root_folder, 'ignore.bii') +biicode_conf_path = os.path.join(root_folder, 'biicode.conf') +pocomsg_h_path = os.path.join(root_folder, 'Foundation', 'src', 'pocomsg.h') + +cmakelist_path = os.path.join(root_folder, "CMakeLists.txt") +cmakelist_token = "# COMMENT REPLACED BY BIICODE" +cmakelist_replacement = '''if(BIICODE) +include(biicode/cmake/biicode.cmake) +return() +endif()''' +cmakelist_replacement_win = "if(BIICODE)\r\ninclude(biicode/cmake/biicode.cmake)\r\nreturn()\r\nendif()" + +try: + # Apply or revert changes + if BII_POCO_REVERT_CHANGES == 'False': + if "if(BIICODE)" in load(cmakelist_path): + print "Hook: changes just applied" + else: + print "Hook: applying changes" + apply_changes() + else: + if "if(BIICODE)" not in load(cmakelist_path): + print "Hook: changes just reverted" + else: + print "Hook: reverting changes" + revert_changes() +except Exception as e: + print "Exception: %s" % e \ No newline at end of file From ae0f6d80d3e26390c35630e854407f1ce6f1591d Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Tue, 7 Apr 2015 13:01:37 -0500 Subject: [PATCH 20/23] Update CONTRIBUTORS --- CONTRIBUTORS | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index b56e2a2837..c8ff89857b 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -52,5 +52,6 @@ Björn Schramke Jonathan Seeley Tor Lillqvist Alexander Bychuk +Francisco Ramírez -- $Id$ From e9dce11e50ebf415c741944f43d0cc81804fbe74 Mon Sep 17 00:00:00 2001 From: martin-osborne Date: Fri, 10 Apr 2015 10:54:47 +0100 Subject: [PATCH 21/23] Correct mispelt 'd' and 'e' words. --- Crypto/include/Poco/Crypto/Cipher.h | 2 +- Crypto/include/Poco/Crypto/CipherImpl.h | 4 ++-- Crypto/include/Poco/Crypto/RSACipherImpl.h | 4 ++-- Data/include/Poco/Data/SQLChannel.h | 2 +- Data/include/Poco/Data/SessionImpl.h | 2 +- Data/include/Poco/Data/Statement.h | 4 ++-- Data/include/Poco/Data/Transaction.h | 2 +- Data/include/Poco/Data/TypeHandler.h | 2 +- Foundation/include/Poco/AbstractCache.h | 4 ++-- Foundation/include/Poco/Any.h | 4 ++-- Foundation/include/Poco/FileChannel.h | 2 +- Foundation/include/Poco/SimpleFileChannel.h | 2 +- Foundation/include/Poco/ThreadPool.h | 2 +- JSON/include/Poco/JSON/Template.h | 2 +- Net/include/Poco/Net/NetworkInterface.h | 4 ++-- Net/include/Poco/Net/RemoteSyslogChannel.h | 2 +- PDF/include/Poco/PDF/Page.h | 2 +- XML/include/Poco/DOM/DOMObject.h | 2 +- 18 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Crypto/include/Poco/Crypto/Cipher.h b/Crypto/include/Poco/Crypto/Cipher.h index 7c7d37f4d6..aba9bd7c47 100644 --- a/Crypto/include/Poco/Crypto/Cipher.h +++ b/Crypto/include/Poco/Crypto/Cipher.h @@ -107,7 +107,7 @@ class Crypto_API Cipher: public Poco::RefCountedObject /// Returns the name of the Cipher. virtual CryptoTransform* createEncryptor() = 0; - /// Creates an encrytor object to be used with a CryptoStream. + /// Creates an encryptor object to be used with a CryptoStream. virtual CryptoTransform* createDecryptor() = 0; /// Creates a decryptor object to be used with a CryptoStream. diff --git a/Crypto/include/Poco/Crypto/CipherImpl.h b/Crypto/include/Poco/Crypto/CipherImpl.h index 1a1f10b6e5..c4abfdd560 100644 --- a/Crypto/include/Poco/Crypto/CipherImpl.h +++ b/Crypto/include/Poco/Crypto/CipherImpl.h @@ -45,10 +45,10 @@ class CipherImpl: public Cipher /// Returns the name of the cipher. CryptoTransform* createEncryptor(); - /// Creates an encrytor object. + /// Creates an encryptor object. CryptoTransform* createDecryptor(); - /// Creates a decrytor object. + /// Creates a decryptor object. private: CipherKey _key; diff --git a/Crypto/include/Poco/Crypto/RSACipherImpl.h b/Crypto/include/Poco/Crypto/RSACipherImpl.h index cbcf22c987..bc24fd051e 100644 --- a/Crypto/include/Poco/Crypto/RSACipherImpl.h +++ b/Crypto/include/Poco/Crypto/RSACipherImpl.h @@ -52,10 +52,10 @@ class RSACipherImpl: public Cipher /// Returns the name of the Cipher. CryptoTransform* createEncryptor(); - /// Creates an encrytor object. + /// Creates an encryptor object. CryptoTransform* createDecryptor(); - /// Creates a decrytor object. + /// Creates a decryptor object. private: RSAKey _key; diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h index 58d8e9c143..a24d03aa12 100644 --- a/Data/include/Poco/Data/SQLChannel.h +++ b/Data/include/Poco/Data/SQLChannel.h @@ -104,7 +104,7 @@ class Data_API SQLChannel: public Poco::Channel /// Table must exist in the target database. To disable archiving, /// set this property to empty string. /// - /// * async: Indicates asynchronous execution. When excuting asynchronously, + /// * async: Indicates asynchronous execution. When executing asynchronously, /// messages are sent to the target using asynchronous execution. /// However, prior to the next message being processed and sent to /// the target, the previous operation must have been either completed diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h index 2e71291d85..5b201b3ee1 100644 --- a/Data/include/Poco/Data/SessionImpl.h +++ b/Data/include/Poco/Data/SessionImpl.h @@ -170,7 +170,7 @@ class Data_API SessionImpl: public Poco::RefCountedObject protected: void setConnectionString(const std::string& connectionString); /// Sets the connection string. Should only be called on - /// disconnetced sessions. Throws InvalidAccessException when called on + /// disconnected sessions. Throws InvalidAccessException when called on /// a connected session. private: diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index 3ec465292d..d469041fbe 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -50,7 +50,7 @@ class Data_API Statement /// It does not contain code of its own. /// Its main purpose is to forward calls to the concrete StatementImpl stored inside. /// Statement execution can be synchronous or asynchronous. - /// Synchronous ececution is achieved through execute() call, while asynchronous is + /// Synchronous execution is achieved through execute() call, while asynchronous is /// achieved through executeAsync() method call. /// An asynchronously executing statement should not be copied during the execution. /// @@ -68,7 +68,7 @@ class Data_API Statement /// /// See individual functions documentation for more details. /// - /// Statement owns the RowFormatter, which can be provided externaly through setFormatter() + /// Statement owns the RowFormatter, which can be provided externally through setFormatter() /// member function. /// If no formatter is externally supplied to the statement, the SimpleRowFormatter is lazy /// created and used. diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h index 31965953f6..ddcb00130a 100644 --- a/Data/include/Poco/Data/Transaction.h +++ b/Data/include/Poco/Data/Transaction.h @@ -36,7 +36,7 @@ class Data_API Transaction /// transaction is in progress. If not, a new transaction is created. /// When the Transaction is destroyed, and commit() has been called, /// nothing is done. Otherwise, the current transaction is rolled back. - /// See Transaction for more detaisl nad purpose of this template. + /// See Transaction for more details and purpose of this template. { public: Transaction(Poco::Data::Session& session, Poco::Logger* pLogger = 0); diff --git a/Data/include/Poco/Data/TypeHandler.h b/Data/include/Poco/Data/TypeHandler.h index bd3c5d5101..06ad089ac1 100644 --- a/Data/include/Poco/Data/TypeHandler.h +++ b/Data/include/Poco/Data/TypeHandler.h @@ -97,7 +97,7 @@ class TypeHandler: public AbstractTypeHandler /// /// static void extract(std::size_t pos, Person& obj, const Person& defVal, AbstractExtractor::Ptr pExt) /// { - /// // defVal is the default person we should use if we encunter NULL entries, so we take the individual fields + /// // defVal is the default person we should use if we encounter NULL entries, so we take the individual fields /// // as defaults. You can do more complex checking, ie return defVal if only one single entry of the fields is null etc... /// poco_assert_dbg (!pExt.isNull()); /// std::string lastName; diff --git a/Foundation/include/Poco/AbstractCache.h b/Foundation/include/Poco/AbstractCache.h index ad9493bd77..873c3f3e79 100644 --- a/Foundation/include/Poco/AbstractCache.h +++ b/Foundation/include/Poco/AbstractCache.h @@ -87,7 +87,7 @@ class AbstractCache /// If for the key already an entry exists, it will be overwritten. /// The difference to add is that no remove or add events are thrown in this case, /// just a simply silent update is performed - /// If the key doesnot exist the behavior is equal to add, ie. an add event is thrown + /// If the key does not exist the behavior is equal to add, ie. an add event is thrown { typename TMutex::ScopedLock lock(_mutex); doUpdate(key, val); @@ -107,7 +107,7 @@ class AbstractCache /// If for the key already an entry exists, it will be overwritten. /// The difference to add is that no remove or add events are thrown in this case, /// just an Update is thrown - /// If the key doesnot exist the behavior is equal to add, ie. an add event is thrown + /// If the key does not exist the behavior is equal to add, ie. an add event is thrown { typename TMutex::ScopedLock lock(_mutex); doUpdate(key, val); diff --git a/Foundation/include/Poco/Any.h b/Foundation/include/Poco/Any.h index 119a8b6376..a905528732 100644 --- a/Foundation/include/Poco/Any.h +++ b/Foundation/include/Poco/Any.h @@ -516,7 +516,7 @@ ValueType AnyCast(Any& operand) /// Example Usage: /// MyType tmp = AnyCast(anAny). /// Will throw a BadCastException if the cast fails. - /// Dont use an AnyCast in combination with references, i.e. MyType& tmp = ... or const MyType& tmp = ... + /// Do not use an AnyCast in combination with references, i.e. MyType& tmp = ... or const MyType& tmp = ... /// Some compilers will accept this code although a copy is returned. Use the RefAnyCast in /// these cases. { @@ -535,7 +535,7 @@ ValueType AnyCast(const Any& operand) /// Example Usage: /// MyType tmp = AnyCast(anAny). /// Will throw a BadCastException if the cast fails. - /// Dont use an AnyCast in combination with references, i.e. MyType& tmp = ... or const MyType& = ... + /// Do not use an AnyCast in combination with references, i.e. MyType& tmp = ... or const MyType& = ... /// Some compilers will accept this code although a copy is returned. Use the RefAnyCast in /// these cases. { diff --git a/Foundation/include/Poco/FileChannel.h b/Foundation/include/Poco/FileChannel.h index 374c622a3d..a59fd23bf1 100644 --- a/Foundation/include/Poco/FileChannel.h +++ b/Foundation/include/Poco/FileChannel.h @@ -152,7 +152,7 @@ class Foundation_API FileChannel: public Channel // or whether it's allowed to stay in the system's file buffer for some time. /// Valid values are: /// - /// * true: Every essages is immediately flushed to the log file (default). + /// * true: Every message is immediately flushed to the log file (default). /// * false: Messages are not immediately flushed to the log file. /// /// The rotateOnOpen property specifies whether an existing log file should be diff --git a/Foundation/include/Poco/SimpleFileChannel.h b/Foundation/include/Poco/SimpleFileChannel.h index 4020329e1c..784db0e8fe 100644 --- a/Foundation/include/Poco/SimpleFileChannel.h +++ b/Foundation/include/Poco/SimpleFileChannel.h @@ -75,7 +75,7 @@ class Foundation_API SimpleFileChannel: public Channel // or whether it's allowed to stay in the system's file buffer for some time. /// Valid values are: /// - /// * true: Every essages is immediately flushed to the log file (default). + /// * true: Every message is immediately flushed to the log file (default). /// * false: Messages are not immediately flushed to the log file. /// { diff --git a/Foundation/include/Poco/ThreadPool.h b/Foundation/include/Poco/ThreadPool.h index a176d67cf9..954acabd2c 100644 --- a/Foundation/include/Poco/ThreadPool.h +++ b/Foundation/include/Poco/ThreadPool.h @@ -42,7 +42,7 @@ class Foundation_API ThreadPool /// Threads in a thread pool are re-used once they become /// available again. /// The thread pool always keeps a minimum number of threads - /// running. If the demans for threads increases, additional + /// running. If the demand for threads increases, additional /// threads are created. Once the demand for threads sinks /// again, no-longer used threads are stopped and removed /// from the pool. diff --git a/JSON/include/Poco/JSON/Template.h b/JSON/include/Poco/JSON/Template.h index 63665e7596..5118ea3f77 100644 --- a/JSON/include/Poco/JSON/Template.h +++ b/JSON/include/Poco/JSON/Template.h @@ -69,7 +69,7 @@ class JSON_API Template /// /// /// ---- - /// This can be used to check the existance of the value. + /// This can be used to check the existence of the value. /// Use this for example when a zero value is ok (which returns false for . /// /// diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index d0f5135679..fce7d34564 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -150,7 +150,7 @@ class Net_API NetworkInterface /// Returns the interface adapter name. /// /// On Windows platforms, this is the network adapter LUID. - /// The adapter name is used by some Windows Net APIs like Dhcp. + /// The adapter name is used by some Windows Net APIs like DHCP. /// /// On other platforms this is the same as name(). @@ -183,7 +183,7 @@ class Net_API NetworkInterface /// Returns the broadcast address for this network interface. const IPAddress& destAddress(unsigned index = 0) const; - /// Returns the IPv4 point-to-point destiation address for this network interface. + /// Returns the IPv4 point-to-point destination address for this network interface. const MACAddress& macAddress() const; /// Returns MAC (Media Access Control) address for the interface. diff --git a/Net/include/Poco/Net/RemoteSyslogChannel.h b/Net/include/Poco/Net/RemoteSyslogChannel.h index 2efb325e85..46fe61db03 100644 --- a/Net/include/Poco/Net/RemoteSyslogChannel.h +++ b/Net/include/Poco/Net/RemoteSyslogChannel.h @@ -72,7 +72,7 @@ class Net_API RemoteSyslogChannel: public Poco::Channel SYSLOG_NTP = (12<<3), /// ntp subsystem SYSLOG_LOGAUDIT = (13<<3), /// log audit SYSLOG_LOGALERT = (14<<3), /// log alert - SYSLOG_CLOCK = (15<<3), /// clock deamon + SYSLOG_CLOCK = (15<<3), /// clock daemon SYSLOG_LOCAL0 = (16<<3), /// reserved for local use SYSLOG_LOCAL1 = (17<<3), /// reserved for local use SYSLOG_LOCAL2 = (18<<3), /// reserved for local use diff --git a/PDF/include/Poco/PDF/Page.h b/PDF/include/Poco/PDF/Page.h index 8797e8e5f0..a59d4f27c5 100644 --- a/PDF/include/Poco/PDF/Page.h +++ b/PDF/include/Poco/PDF/Page.h @@ -321,7 +321,7 @@ class PDF_API Page /// Draws an arc. void ellipse(float x, float y, float xRadius, float yRadius); - /// Draws an ellips. + /// Draws an ellipse. void stroke(); /// Paints the current path. diff --git a/XML/include/Poco/DOM/DOMObject.h b/XML/include/Poco/DOM/DOMObject.h index a48e82d251..b2ecad16af 100644 --- a/XML/include/Poco/DOM/DOMObject.h +++ b/XML/include/Poco/DOM/DOMObject.h @@ -45,7 +45,7 @@ class XML_API DOMObject /// For every call to duplicate() there must be a matching /// call to release(). /// An object obtained via any other way must not be - /// released, except ownership of it has been explicitely + /// released, except ownership of it has been explicitly /// taken with a call to duplicate(). /// /// While DOMObjects are safe for use in multithreaded programs, From 4cf45ea4a39f4d6e151c1ffb92e350234ce9fb7f Mon Sep 17 00:00:00 2001 From: martin-osborne Date: Fri, 10 Apr 2015 11:31:12 +0100 Subject: [PATCH 22/23] Corrected more words. --- ApacheConnector/include/ApacheConnector.h | 2 +- Crypto/include/Poco/Crypto/OpenSSLInitializer.h | 2 +- Data/MySQL/include/Poco/Data/MySQL/Utility.h | 2 +- Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h | 2 +- .../include/Poco/Data/SQLite/SQLiteStatementImpl.h | 2 +- Data/SQLite/include/Poco/Data/SQLite/Utility.h | 4 ++-- Data/include/Poco/Data/AbstractExtraction.h | 4 ++-- Data/include/Poco/Data/Binding.h | 4 ++-- Data/include/Poco/Data/LOB.h | 4 ++-- Data/include/Poco/Data/RecordSet.h | 2 +- Data/include/Poco/Data/Row.h | 6 +++--- Data/include/Poco/Data/RowFormatter.h | 8 ++++---- Data/include/Poco/Data/RowIterator.h | 2 +- Data/include/Poco/Data/SQLChannel.h | 12 ++++++------ Data/include/Poco/Data/Session.h | 4 ++-- Data/include/Poco/Data/SimpleRowFormatter.h | 2 +- Data/include/Poco/Data/Statement.h | 2 +- Data/include/Poco/Data/StatementImpl.h | 4 ++-- Foundation/include/Poco/AbstractEvent.h | 8 ++++---- Foundation/include/Poco/AbstractStrategy.h | 2 +- Foundation/include/Poco/Any.h | 2 +- Foundation/include/Poco/AutoReleasePool.h | 2 +- Foundation/include/Poco/BinaryWriter.h | 2 +- Foundation/include/Poco/DateTime.h | 4 ++-- Foundation/include/Poco/Dynamic/VarHolder.h | 2 +- Foundation/include/Poco/Dynamic/VarIterator.h | 2 +- Foundation/include/Poco/FileChannel.h | 2 +- Foundation/include/Poco/HMACEngine.h | 2 +- Foundation/include/Poco/LinearHashTable.h | 2 +- Foundation/include/Poco/ListMap.h | 4 ++-- Foundation/include/Poco/LocalDateTime.h | 4 ++-- Foundation/include/Poco/Logger.h | 10 +++++----- Foundation/include/Poco/MD4Engine.h | 2 +- Foundation/include/Poco/MD5Engine.h | 2 +- Foundation/include/Poco/Nullable.h | 2 +- Foundation/include/Poco/PBKDF2Engine.h | 2 +- Foundation/include/Poco/PatternFormatter.h | 2 +- Foundation/include/Poco/RecursiveDirectoryIterator.h | 2 +- Foundation/include/Poco/RegularExpression.h | 12 ++++++------ Foundation/include/Poco/SHA1Engine.h | 2 +- Foundation/include/Poco/String.h | 4 ++-- Foundation/include/Poco/StringTokenizer.h | 2 +- Foundation/include/Poco/TaskNotification.h | 2 +- Foundation/include/Poco/TextEncoding.h | 10 +++++----- Foundation/include/Poco/Thread.h | 2 +- Foundation/include/Poco/TypeList.h | 10 +++++----- Foundation/include/Poco/UniqueAccessExpireLRUCache.h | 2 +- Foundation/include/Poco/UniqueExpireLRUCache.h | 2 +- JSON/include/Poco/JSON/PrintHandler.h | 2 +- Net/include/Poco/Net/DatagramSocket.h | 2 +- Net/include/Poco/Net/FTPClientSession.h | 2 +- Net/include/Poco/Net/HTTPServerParams.h | 2 +- Net/include/Poco/Net/ICMPSocket.h | 2 +- Net/include/Poco/Net/MailStream.h | 6 +++--- Net/include/Poco/Net/NetworkInterface.h | 2 +- Net/include/Poco/Net/RawSocket.h | 2 +- Net/include/Poco/Net/SMTPClientSession.h | 2 +- Net/include/Poco/Net/Socket.h | 2 +- Net/include/Poco/Net/SocketNotification.h | 2 +- Net/include/Poco/Net/SocketReactor.h | 4 ++-- Net/include/Poco/Net/StreamSocket.h | 2 +- NetSSL_OpenSSL/include/Poco/Net/Context.h | 10 +++++----- NetSSL_OpenSSL/include/Poco/Net/SSLManager.h | 4 ++-- .../include/Poco/Net/SecureSMTPClientSession.h | 2 +- NetSSL_Win/include/Poco/Net/SSLManager.h | 2 +- .../include/Poco/Net/SecureSMTPClientSession.h | 2 +- PDF/include/Poco/PDF/Document.h | 2 +- Util/include/Poco/Util/AbstractConfiguration.h | 2 +- Util/include/Poco/Util/WinRegistryConfiguration.h | 4 ++-- 69 files changed, 118 insertions(+), 118 deletions(-) diff --git a/ApacheConnector/include/ApacheConnector.h b/ApacheConnector/include/ApacheConnector.h index 48ea96cef2..76e0d01d46 100644 --- a/ApacheConnector/include/ApacheConnector.h +++ b/ApacheConnector/include/ApacheConnector.h @@ -33,7 +33,7 @@ class ApacheRequestRec int readRequest(char* buffer, int length); /// Read up to length bytes from request body into buffer. - /// Returns the number of bytes read, 0 if eof or -1 if an error occured. + /// Returns the number of bytes read, 0 if eof or -1 if an error occurred. void writeResponse(const char* buffer, int length); /// Writes the given characters as response to the given request_rec. diff --git a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h index 868530062c..ade2531e1f 100644 --- a/Crypto/include/Poco/Crypto/OpenSSLInitializer.h +++ b/Crypto/include/Poco/Crypto/OpenSSLInitializer.h @@ -44,7 +44,7 @@ namespace Crypto { class Crypto_API OpenSSLInitializer - /// Initalizes the OpenSSL library. + /// Initializes the OpenSSL library. /// /// The class ensures the earliest initialization and the /// latest shutdown of the OpenSSL library. diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h index c4427c332f..e53ebce22d 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h @@ -57,7 +57,7 @@ class MySQL_API Utility /// Returns host info. static bool hasMicrosecond(); - /// Rturns true if microseconds are suported. + /// Returns true if microseconds are suported. static MYSQL* handle(Poco::Data::Session& session); /// Returns native MySQL handle for the session. diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h index f9d356629c..267939cd60 100644 --- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h +++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h @@ -82,7 +82,7 @@ class ODBCPostgreSQLTest: public ODBCTest static const std::string _libDir; /// Varible determining the location of the library directory /// on the database installation system. - /// Used to enable PLpgSQL language programmaticaly when + /// Used to enable PLpgSQL language programmatically when /// it is not enabled. static SessionPtr _pSession; diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h index 7a6531c8b9..327ec16d32 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h @@ -79,7 +79,7 @@ class SQLite_API SQLiteStatementImpl: public Poco::Data::StatementImpl void compileImpl(); /// Compiles the statement, doesn't bind yet. /// Returns true if the statement was succesfully compiled. - /// The way SQLite handles batches of statmeents is by compiling + /// The way SQLite handles batches of statements is by compiling /// one at a time and returning a pointer to the next one. /// The remainder of the statement is kept in a string /// buffer pointed to by _pLeftover member. diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h index 2ce1c1a95c..8b785cece6 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h @@ -60,10 +60,10 @@ class SQLite_API Utility /// Returns native DB handle. static std::string lastError(sqlite3* pDb); - /// Retreives the last error code from sqlite and converts it to a string. + /// Retrieves the last error code from sqlite and converts it to a string. static std::string lastError(const Session& session); - /// Retreives the last error code from sqlite and converts it to a string. + /// Retrieves the last error code from sqlite and converts it to a string. static void throwException(int rc, const std::string& addErrMsg = std::string()); /// Throws for an error code the appropriate exception diff --git a/Data/include/Poco/Data/AbstractExtraction.h b/Data/include/Poco/Data/AbstractExtraction.h index abe202f418..8176e5b564 100644 --- a/Data/include/Poco/Data/AbstractExtraction.h +++ b/Data/include/Poco/Data/AbstractExtraction.h @@ -140,7 +140,7 @@ class Data_API AbstractExtraction bool isValueNull(const std::string& str, bool deflt); /// Overload for const reference to std::string. /// - /// Returns true when folowing conditions are met: + /// Returns true when following conditions are met: /// /// - string is empty /// - getEmptyStringIsNull() returns true @@ -148,7 +148,7 @@ class Data_API AbstractExtraction bool isValueNull(const Poco::UTF16String& str, bool deflt); /// Overload for const reference to UTF16String. /// - /// Returns true when folowing conditions are met: + /// Returns true when following conditions are met: /// /// - string is empty /// - getEmptyStringIsNull() returns true diff --git a/Data/include/Poco/Data/Binding.h b/Data/include/Poco/Data/Binding.h index 07f2831a79..0b55b529b6 100644 --- a/Data/include/Poco/Data/Binding.h +++ b/Data/include/Poco/Data/Binding.h @@ -1474,7 +1474,7 @@ inline AbstractBindingVec& io(AbstractBindingVec& bv) template inline AbstractBinding::Ptr bind(T t, const std::string& name) /// Convenience function for a more compact Binding creation. - /// This funtion differs from use() in its value copy semantics. + /// This function differs from use() in its value copy semantics. { return new CopyBinding(t, name, AbstractBinding::PD_IN); } @@ -1483,7 +1483,7 @@ inline AbstractBinding::Ptr bind(T t, const std::string& name) template inline AbstractBinding::Ptr bind(T t) /// Convenience function for a more compact Binding creation. - /// This funtion differs from use() in its value copy semantics. + /// This function differs from use() in its value copy semantics. { return Poco::Data::Keywords::bind(t, ""); } diff --git a/Data/include/Poco/Data/LOB.h b/Data/include/Poco/Data/LOB.h index 8bcb6b8b0a..94f1bfcbbb 100644 --- a/Data/include/Poco/Data/LOB.h +++ b/Data/include/Poco/Data/LOB.h @@ -205,7 +205,7 @@ namespace std template<> inline void swap(Poco::Data::BLOB& b1, Poco::Data::BLOB& b2) - /// Full template specalization of std:::swap for BLOB + /// Full template specialization of std:::swap for BLOB { b1.swap(b2); } @@ -213,7 +213,7 @@ namespace std template<> inline void swap(Poco::Data::CLOB& c1, Poco::Data::CLOB& c2) - /// Full template specalization of std:::swap for CLOB + /// Full template specialization of std:::swap for CLOB { c1.swap(c2); } diff --git a/Data/include/Poco/Data/RecordSet.h b/Data/include/Poco/Data/RecordSet.h index fa6dbc4d7c..0647d4f1ba 100644 --- a/Data/include/Poco/Data/RecordSet.h +++ b/Data/include/Poco/Data/RecordSet.h @@ -63,7 +63,7 @@ class Data_API RecordSet: private Statement /// /// The third (optional) argument passed to the Recordset constructor is a RowFormatter /// implementation. The formatter is used in conjunction with << operator for recordset - /// data formating. + /// data formatting. /// /// The number of rows in the RecordSet can be limited by specifying /// a limit for the Statement. diff --git a/Data/include/Poco/Data/Row.h b/Data/include/Poco/Data/Row.h index ba3351226f..3af4f60f2c 100644 --- a/Data/include/Poco/Data/Row.h +++ b/Data/include/Poco/Data/Row.h @@ -178,13 +178,13 @@ class Data_API Row /// Converts the column names to string. void formatNames() const; - /// Fomats the column names. + /// Formats the column names. const std::string& valuesToString() const; - /// Converts the row values to string and returns the formated string. + /// Converts the row values to string and returns the formatted string. void formatValues() const; - /// Fomats the row values. + /// Formats the row values. bool operator == (const Row& other) const; /// Equality operator. diff --git a/Data/include/Poco/Data/RowFormatter.h b/Data/include/Poco/Data/RowFormatter.h index 5b45f86163..e283a6ec28 100644 --- a/Data/include/Poco/Data/RowFormatter.h +++ b/Data/include/Poco/Data/RowFormatter.h @@ -53,7 +53,7 @@ class Data_API RowFormatter /// /// To accommodate for various formatting needs, a formatter can operate in two modes: /// - /// - progressive: formatted individual row strings are gemerated and returned from each + /// - progressive: formatted individual row strings are generated and returned from each /// call to formatValues; /// std::string& formatNames(const NameVecPtr, std::string&) and /// std::string& formatValues(const ValueVec&, std::string&) member calls should be @@ -65,7 +65,7 @@ class Data_API RowFormatter /// void formatValues(const ValueVec&) member calls should be used in this case /// /// When formatter is used in conjunction with Row/RecordSet, the formatting members corresponding - /// to the formater mode are expected to be implemented. If a call is propagated to this parent + /// to the formatter mode are expected to be implemented. If a call is propagated to this parent /// class, the functions do nothing or silently return empty string respectively. /// { @@ -134,10 +134,10 @@ class Data_API RowFormatter /// to empty strings and row count to INVALID_ROW_COUNT. Mode getMode() const; - /// Returns the formater mode. + /// Returns the formatter mode. void setMode(Mode mode); - /// Sets the fromatter mode. + /// Sets the formatter mode. protected: diff --git a/Data/include/Poco/Data/RowIterator.h b/Data/include/Poco/Data/RowIterator.h index e91118ca3d..197d0c4425 100644 --- a/Data/include/Poco/Data/RowIterator.h +++ b/Data/include/Poco/Data/RowIterator.h @@ -142,7 +142,7 @@ namespace std template<> inline void swap(Poco::Data::RowIterator& s1, Poco::Data::RowIterator& s2) - /// Full template specalization of std:::swap for RowIterator + /// Full template specialization of std:::swap for RowIterator { s1.swap(s2); } diff --git a/Data/include/Poco/Data/SQLChannel.h b/Data/include/Poco/Data/SQLChannel.h index a24d03aa12..10c958560c 100644 --- a/Data/include/Poco/Data/SQLChannel.h +++ b/Data/include/Poco/Data/SQLChannel.h @@ -51,10 +51,10 @@ class Data_API SQLChannel: public Poco::Channel /// DateTime DATE)" /// /// The table name is configurable through "table" property. - /// Other than DateTime filed name used for optiona time-based archiving purposes, currently the - /// field names are not mandated. However, it is recomended to use names as specified above. + /// Other than DateTime filed name used for optional time-based archiving purposes, currently the + /// field names are not mandated. However, it is recommended to use names as specified above. /// - /// To provide as non-intrusive operation as possbile, the log entries are cached and + /// To provide as non-intrusive operation as possible, the log entries are cached and /// inserted into the target database asynchronously by default . The blocking, however, will occur /// before the next entry insertion with default timeout of 1 second. The default settings can be /// overriden (see async, timeout and throw properties for details). @@ -150,15 +150,15 @@ class Data_API SQLChannel: public Poco::Channel typedef Poco::SharedPtr StrategyPtr; void initLogStatement(); - /// Initiallizes the log statement. + /// Initializes the log statement. void initArchiveStatements(); - /// Initiallizes the archive statement. + /// Initializes the archive statement. void logAsync(const Message& msg); /// Waits for previous operation completion and /// calls logSync(). If the previous operation times out, - /// and _throw is true, TimeoutException is thrown, oterwise + /// and _throw is true, TimeoutException is thrown, otherwise /// the timeout is ignored and log entry is lost. void logSync(const Message& msg); diff --git a/Data/include/Poco/Data/Session.h b/Data/include/Poco/Data/Session.h index c93bb1a962..f413d2cc85 100644 --- a/Data/include/Poco/Data/Session.h +++ b/Data/include/Poco/Data/Session.h @@ -78,7 +78,7 @@ class Data_API Session /// The above example assigns the variable i to the ":data" placeholder in the SQL query. The query is parsed and compiled exactly /// once, but executed 100 times. At the end the values 0 to 99 will be present in the Table "DUMMY". /// - /// A faster implementaton of the above code will simply create a vector of int + /// A faster implementation of the above code will simply create a vector of int /// and use the vector as parameter to the use clause (you could also use set or multiset instead): /// /// std::vector data; @@ -486,7 +486,7 @@ namespace std template<> inline void swap(Poco::Data::Session& s1, Poco::Data::Session& s2) - /// Full template specalization of std:::swap for Session + /// Full template specialization of std:::swap for Session { s1.swap(s2); } diff --git a/Data/include/Poco/Data/SimpleRowFormatter.h b/Data/include/Poco/Data/SimpleRowFormatter.h index aa928f6e04..a0f2cfc911 100644 --- a/Data/include/Poco/Data/SimpleRowFormatter.h +++ b/Data/include/Poco/Data/SimpleRowFormatter.h @@ -111,7 +111,7 @@ namespace std template<> inline void swap(Poco::Data::SimpleRowFormatter& s1, Poco::Data::SimpleRowFormatter& s2) - /// Full template specalization of std:::swap for SimpleRowFormatter + /// Full template specialization of std:::swap for SimpleRowFormatter { s1.swap(s2); } diff --git a/Data/include/Poco/Data/Statement.h b/Data/include/Poco/Data/Statement.h index d469041fbe..7e8c182b78 100644 --- a/Data/include/Poco/Data/Statement.h +++ b/Data/include/Poco/Data/Statement.h @@ -803,7 +803,7 @@ namespace std template<> inline void swap(Poco::Data::Statement& s1, Poco::Data::Statement& s2) - /// Full template specalization of std:::swap for Statement + /// Full template specialization of std:::swap for Statement { s1.swap(s2); } diff --git a/Data/include/Poco/Data/StatementImpl.h b/Data/include/Poco/Data/StatementImpl.h index b3696dcece..859cc2d57f 100644 --- a/Data/include/Poco/Data/StatementImpl.h +++ b/Data/include/Poco/Data/StatementImpl.h @@ -184,7 +184,7 @@ class Data_API StatementImpl virtual std::size_t next() = 0; /// Retrieves the next row or set of rows from the resultset and - /// returns the number of rows retreved. + /// returns the number of rows retrieved. /// /// Will throw, if the resultset is empty. /// Expects the statement to be compiled and bound. @@ -253,7 +253,7 @@ class Data_API StatementImpl /// - std::list SessionImpl& session(); - /// Rteurns session associated with this statement. + /// Returns session associated with this statement. virtual AbstractBinding::BinderPtr binder() = 0; /// Returns the concrete binder used by the statement. diff --git a/Foundation/include/Poco/AbstractEvent.h b/Foundation/include/Poco/AbstractEvent.h index 886df0e66d..46b3a7a644 100644 --- a/Foundation/include/Poco/AbstractEvent.h +++ b/Foundation/include/Poco/AbstractEvent.h @@ -253,7 +253,7 @@ class AbstractEvent ActiveResult notifyAsync(const void* pSender, const TArgs& args) /// Sends a notification to all registered delegates. The order is /// determined by the TStrategy. This method is not blocking and will - /// immediately return. The delegates are invoked in a seperate thread. + /// immediately return. The delegates are invoked in a separate thread. /// Call activeResult.wait() to wait until the notification has ended. /// While executing, other objects can change the delegate list. These changes don't /// influence the current active notifications but are activated with @@ -344,7 +344,7 @@ class AbstractEvent } TStrategy _strategy; /// The strategy used to notify observers. - bool _enabled; /// Stores if an event is enabled. Notfies on disabled events have no effect + bool _enabled; /// Stores if an event is enabled. Notifies on disabled events have no effect /// but it is possible to change the observers. mutable TMutex _mutex; @@ -455,7 +455,7 @@ class AbstractEvent ActiveResult notifyAsync(const void* pSender) /// Sends a notification to all registered delegates. The order is /// determined by the TStrategy. This method is not blocking and will - /// immediately return. The delegates are invoked in a seperate thread. + /// immediately return. The delegates are invoked in a separate thread. /// Call activeResult.wait() to wait until the notification has ended. /// While executing, other objects can change the delegate list. These changes don't /// influence the current active notifications but are activated with @@ -544,7 +544,7 @@ class AbstractEvent } TStrategy _strategy; /// The strategy used to notify observers. - bool _enabled; /// Stores if an event is enabled. Notfies on disabled events have no effect + bool _enabled; /// Stores if an event is enabled. Notifies on disabled events have no effect /// but it is possible to change the observers. mutable TMutex _mutex; diff --git a/Foundation/include/Poco/AbstractStrategy.h b/Foundation/include/Poco/AbstractStrategy.h index c300a4809e..df7e5e76d3 100644 --- a/Foundation/include/Poco/AbstractStrategy.h +++ b/Foundation/include/Poco/AbstractStrategy.h @@ -69,7 +69,7 @@ class AbstractStrategy virtual void onReplace(const void* pSender, std::set& elemsToRemove) = 0; /// Used by the Strategy to indicate which elements should be removed from /// the cache. Note that onReplace does not change the current list of keys. - /// The cache object is reponsible to remove the elements. + /// The cache object is responsible to remove the elements. }; diff --git a/Foundation/include/Poco/Any.h b/Foundation/include/Poco/Any.h index a905528732..4a8d7cd2ed 100644 --- a/Foundation/include/Poco/Any.h +++ b/Foundation/include/Poco/Any.h @@ -203,7 +203,7 @@ class Any Any& swap(Any& other) /// Swaps the content of the two Anys. /// - /// When small object optimizaton is enabled, swap only + /// When small object optimization is enabled, swap only /// has no-throw guarantee when both (*this and other) /// objects are allocated on the heap. { diff --git a/Foundation/include/Poco/AutoReleasePool.h b/Foundation/include/Poco/AutoReleasePool.h index 4506056edd..c97758bcd5 100644 --- a/Foundation/include/Poco/AutoReleasePool.h +++ b/Foundation/include/Poco/AutoReleasePool.h @@ -31,7 +31,7 @@ template class AutoReleasePool /// An AutoReleasePool implements simple garbage collection for /// reference-counted objects. - /// It temporarily takes ownwership of reference-counted objects that + /// It temporarily takes ownership of reference-counted objects that /// nobody else wants to take ownership of and releases them /// at a later, appropriate point in time. /// diff --git a/Foundation/include/Poco/BinaryWriter.h b/Foundation/include/Poco/BinaryWriter.h index a881eb7c6a..e038349b50 100644 --- a/Foundation/include/Poco/BinaryWriter.h +++ b/Foundation/include/Poco/BinaryWriter.h @@ -45,7 +45,7 @@ class Foundation_API BinaryWriter /// data type sizes (e.g., 32-bit and 64-bit architectures), as the sizes /// of some of the basic types may be different. For example, writing a /// long integer on a 64-bit system and reading it on a 32-bit system - /// may yield an incorrent result. Use fixed-size types (Int32, Int64, etc.) + /// may yield an incorrect result. Use fixed-size types (Int32, Int64, etc.) /// in such a case. { public: diff --git a/Foundation/include/Poco/DateTime.h b/Foundation/include/Poco/DateTime.h index f6385d25e8..c6095b8081 100644 --- a/Foundation/include/Poco/DateTime.h +++ b/Foundation/include/Poco/DateTime.h @@ -160,7 +160,7 @@ class Foundation_API DateTime /// on a Saturday, week 1 will be the week starting on Monday, January 3. /// January 1 and 2 will fall within week 0 (or the last week of the previous year). /// - /// For 2007, which starts on a Monday, week 1 will be the week startung on Monday, January 1. + /// For 2007, which starts on a Monday, week 1 will be the week starting on Monday, January 1. /// There will be no week 0 in 2007. int day() const; @@ -247,7 +247,7 @@ class Foundation_API DateTime /// Computes the Julian day for an UTC time. static double toJulianDay(int year, int month, int day, int hour = 0, int minute = 0, int second = 0, int millisecond = 0, int microsecond = 0); - /// Computes the Julian day for a gregorian calendar date and time. + /// Computes the Julian day for a Gregorian calendar date and time. /// See , section 2.3.1 for the algorithm. static Timestamp::UtcTimeVal toUtcTime(double julianDay); diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index 841a71bbb3..a8c4cb6aa4 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -281,7 +281,7 @@ class Foundation_API VarHolder /// pre-allocated buffer inside the holder). /// /// Called from clone() member function of the implementation when - /// smal object optimization is enabled. + /// small object optimization is enabled. { #ifdef POCO_NO_SOO (void)pVarHolder; diff --git a/Foundation/include/Poco/Dynamic/VarIterator.h b/Foundation/include/Poco/Dynamic/VarIterator.h index 61accac4cf..2f36949124 100644 --- a/Foundation/include/Poco/Dynamic/VarIterator.h +++ b/Foundation/include/Poco/Dynamic/VarIterator.h @@ -143,7 +143,7 @@ namespace std template<> inline void swap(Poco::Dynamic::VarIterator& s1, Poco::Dynamic::VarIterator& s2) - /// Full template specalization of std:::swap for VarIterator + /// Full template specialization of std:::swap for VarIterator { s1.swap(s2); } diff --git a/Foundation/include/Poco/FileChannel.h b/Foundation/include/Poco/FileChannel.h index a59fd23bf1..c0a7c3712f 100644 --- a/Foundation/include/Poco/FileChannel.h +++ b/Foundation/include/Poco/FileChannel.h @@ -54,7 +54,7 @@ class Foundation_API FileChannel: public Channel /// /// The rotation strategy can be specified with the /// "rotation" property, which can take one of the - /// follwing values: + /// following values: /// /// * never: no log rotation /// * [day,][hh]:mm: the file is rotated on specified day/time diff --git a/Foundation/include/Poco/HMACEngine.h b/Foundation/include/Poco/HMACEngine.h index 5ca9440339..c57f60cc12 100644 --- a/Foundation/include/Poco/HMACEngine.h +++ b/Foundation/include/Poco/HMACEngine.h @@ -30,7 +30,7 @@ namespace Poco { template class HMACEngine: public DigestEngine - /// This class implementes the HMAC message + /// This class implements the HMAC message /// authentication code algorithm, as specified /// in RFC 2104. The underlying DigestEngine /// (MD5Engine, SHA1Engine, etc.) must be given as diff --git a/Foundation/include/Poco/LinearHashTable.h b/Foundation/include/Poco/LinearHashTable.h index 1bc1b9483a..d5d8f7ce52 100644 --- a/Foundation/include/Poco/LinearHashTable.h +++ b/Foundation/include/Poco/LinearHashTable.h @@ -37,7 +37,7 @@ class LinearHashTable /// This class implements a linear hash table. /// /// In a linear hash table, the available address space - /// grows or shrinks dynamically. A linar hash table thus + /// grows or shrinks dynamically. A linear hash table thus /// supports any number of insertions or deletions without /// lookup or insertion performance deterioration. /// diff --git a/Foundation/include/Poco/ListMap.h b/Foundation/include/Poco/ListMap.h index 7ec735db4f..81716bc0ea 100644 --- a/Foundation/include/Poco/ListMap.h +++ b/Foundation/include/Poco/ListMap.h @@ -103,7 +103,7 @@ class ListMap } ConstIterator find(const KeyType& key) const - /// Finds the first occurence of the key and + /// Finds the first occurrence of the key and /// returns iterator pointing to the found entry /// or iterator pointing to the end if entry is /// not found. @@ -118,7 +118,7 @@ class ListMap } Iterator find(const KeyType& key) - /// Finds the first occurence of the key and + /// Finds the first occurrence of the key and /// returns iterator pointing to the found entry /// or iterator pointing to the end if entry is /// not found. diff --git a/Foundation/include/Poco/LocalDateTime.h b/Foundation/include/Poco/LocalDateTime.h index a73dbc8371..06a55dcf56 100644 --- a/Foundation/include/Poco/LocalDateTime.h +++ b/Foundation/include/Poco/LocalDateTime.h @@ -171,7 +171,7 @@ class Foundation_API LocalDateTime /// on a Saturday, week 1 will be the week starting on Monday, January 3. /// January 1 and 2 will fall within week 0 (or the last week of the previous year). /// - /// For 2007, which starts on a Monday, week 1 will be the week startung on Monday, January 1. + /// For 2007, which starts on a Monday, week 1 will be the week starting on Monday, January 1. /// There will be no week 0 in 2007. int day() const; @@ -210,7 +210,7 @@ class Foundation_API LocalDateTime /// Returns the microsecond (0 to 999) double julianDay() const; - /// Returns the julian day for the date. + /// Returns the Julian day for the date. int tzd() const; /// Returns the time zone differential. diff --git a/Foundation/include/Poco/Logger.h b/Foundation/include/Poco/Logger.h index 67a591f0cb..9f5f60c868 100644 --- a/Foundation/include/Poco/Logger.h +++ b/Foundation/include/Poco/Logger.h @@ -389,22 +389,22 @@ class Foundation_API Logger: public Channel /// Returns true if the log level is at least PRIO_TRACE. static std::string format(const std::string& fmt, const std::string& arg); - /// Replaces all occurences of $0 in fmt with the string given in arg and + /// Replaces all occurrences of $0 in fmt with the string given in arg and /// returns the result. To include a dollar sign in the result string, /// specify two dollar signs ($$) in the format string. static std::string format(const std::string& fmt, const std::string& arg0, const std::string& arg1); - /// Replaces all occurences of $ in fmt with the string given in arg and + /// Replaces all occurrences of $ in fmt with the string given in arg and /// returns the result. To include a dollar sign in the result string, /// specify two dollar signs ($$) in the format string. static std::string format(const std::string& fmt, const std::string& arg0, const std::string& arg1, const std::string& arg2); - /// Replaces all occurences of $ in fmt with the string given in arg and + /// Replaces all occurrences of $ in fmt with the string given in arg and /// returns the result. To include a dollar sign in the result string, /// specify two dollar signs ($$) in the format string. static std::string format(const std::string& fmt, const std::string& arg0, const std::string& arg1, const std::string& arg2, const std::string& arg3); - /// Replaces all occurences of $ in fmt with the string given in arg and + /// Replaces all occurrences of $ in fmt with the string given in arg and /// returns the result. To include a dollar sign in the result string, /// specify two dollar signs ($$) in the format string. @@ -450,7 +450,7 @@ class Foundation_API Logger: public Channel static Logger* has(const std::string& name); /// Returns a pointer to the Logger with the given name if it - /// exists, or a null pointer otherwse. + /// exists, or a null pointer otherwise. static void destroy(const std::string& name); /// Destroys the logger with the specified name. Does nothing diff --git a/Foundation/include/Poco/MD4Engine.h b/Foundation/include/Poco/MD4Engine.h index 819e098997..5ebe928f16 100644 --- a/Foundation/include/Poco/MD4Engine.h +++ b/Foundation/include/Poco/MD4Engine.h @@ -51,7 +51,7 @@ namespace Poco { class Foundation_API MD4Engine: public DigestEngine - /// This class implementes the MD4 message digest algorithm, + /// This class implements the MD4 message digest algorithm, /// described in RFC 1320. { public: diff --git a/Foundation/include/Poco/MD5Engine.h b/Foundation/include/Poco/MD5Engine.h index cd925d0393..e1b89a1e8f 100644 --- a/Foundation/include/Poco/MD5Engine.h +++ b/Foundation/include/Poco/MD5Engine.h @@ -51,7 +51,7 @@ namespace Poco { class Foundation_API MD5Engine: public DigestEngine - /// This class implementes the MD5 message digest algorithm, + /// This class implements the MD5 message digest algorithm, /// described in RFC 1321. { public: diff --git a/Foundation/include/Poco/Nullable.h b/Foundation/include/Poco/Nullable.h index 78c8ccb653..adceafd870 100644 --- a/Foundation/include/Poco/Nullable.h +++ b/Foundation/include/Poco/Nullable.h @@ -180,7 +180,7 @@ class Nullable bool operator < (const Nullable& other) const /// Compares two Nullable objects. Return true if this object's - /// value is smaler than the other object's value. + /// value is smaller than the other object's value. /// Null value is smaller than a non-null value. { if (_isNull && other._isNull) return false; diff --git a/Foundation/include/Poco/PBKDF2Engine.h b/Foundation/include/Poco/PBKDF2Engine.h index 59a10087fa..56a5dc1942 100644 --- a/Foundation/include/Poco/PBKDF2Engine.h +++ b/Foundation/include/Poco/PBKDF2Engine.h @@ -31,7 +31,7 @@ namespace Poco { template class PBKDF2Engine: public DigestEngine - /// This class implementes the Password-Based Key Derivation Function 2, + /// This class implements the Password-Based Key Derivation Function 2, /// as specified in RFC 2898. The underlying DigestEngine (HMACEngine, etc.), /// which must accept the passphrase as constructor argument (std::string), /// must be given as template argument. diff --git a/Foundation/include/Poco/PatternFormatter.h b/Foundation/include/Poco/PatternFormatter.h index 0ab1a33b36..dccb2117db 100644 --- a/Foundation/include/Poco/PatternFormatter.h +++ b/Foundation/include/Poco/PatternFormatter.h @@ -136,7 +136,7 @@ class Foundation_API PatternFormatter: public Formatter void parsePattern(); /// Will parse the _pattern string into the vector of PatternActions, /// which contains the message key, any text that needs to be written first - /// a proprety in case of %[] and required length. + /// a property in case of %[] and required length. std::vector _patternActions; bool _localTime; diff --git a/Foundation/include/Poco/RecursiveDirectoryIterator.h b/Foundation/include/Poco/RecursiveDirectoryIterator.h index acbb74ea7b..db8d1f2e94 100644 --- a/Foundation/include/Poco/RecursiveDirectoryIterator.h +++ b/Foundation/include/Poco/RecursiveDirectoryIterator.h @@ -53,7 +53,7 @@ class RecursiveDirectoryIterator /// The class can follow different traversal strategies: /// * depth-first strategy; /// * siblings-first strategy. - /// The stategies are set by template parameter. + /// The strategies are set by template parameter. /// There are two corresponding typedefs: /// * SimpleRecursiveDirectoryIterator; /// * SiblingsFirstRecursiveDirectoryIterator. diff --git a/Foundation/include/Poco/RegularExpression.h b/Foundation/include/Poco/RegularExpression.h index 54abc37efb..6307605474 100644 --- a/Foundation/include/Poco/RegularExpression.h +++ b/Foundation/include/Poco/RegularExpression.h @@ -83,7 +83,7 @@ class Foundation_API RegularExpression RE_NEWLINE_CRLF = 0x00300000, /// assume newline is CRLF ("\r\n") [ctor] RE_NEWLINE_ANY = 0x00400000, /// assume newline is any valid Unicode newline character [ctor] RE_NEWLINE_ANYCRLF = 0x00500000, /// assume newline is any of CR, LF, CRLF [ctor] - RE_GLOBAL = 0x10000000, /// replace all occurences (/g) [subst] + RE_GLOBAL = 0x10000000, /// replace all occurrences (/g) [subst] RE_NO_VARS = 0x20000000 /// treat dollar in replacement string as ordinary character [subst] }; @@ -187,19 +187,19 @@ class Foundation_API RegularExpression /// Substitute in subject all matches of the pattern with replacement. /// If RE_GLOBAL is specified as option, all matches are replaced. Otherwise, /// only the first match is replaced. - /// Occurences of $ (for example, $1, $2, ...) in replacement are replaced + /// Occurrences of $ (for example, $1, $2, ...) in replacement are replaced /// with the corresponding captured string. $0 is the original subject string. - /// Returns the number of replaced occurences. + /// Returns the number of replaced occurrences. int subst(std::string& subject, std::string::size_type offset, const std::string& replacement, int options = 0) const; /// Substitute in subject all matches of the pattern with replacement, /// starting at offset. /// If RE_GLOBAL is specified as option, all matches are replaced. Otherwise, /// only the first match is replaced. - /// Unless RE_NO_VARS is specified, occurences of $ (for example, $0, $1, $2, ... $9) + /// Unless RE_NO_VARS is specified, occurrences of $ (for example, $0, $1, $2, ... $9) /// in replacement are replaced with the corresponding captured string. - /// $0 is the captured substring. $1 ... $n are the substrings maching the subpatterns. - /// Returns the number of replaced occurences. + /// $0 is the captured substring. $1 ... $n are the substrings matching the subpatterns. + /// Returns the number of replaced occurrences. static bool match(const std::string& subject, const std::string& pattern, int options = 0); /// Matches the given subject string against the regular expression given in pattern, diff --git a/Foundation/include/Poco/SHA1Engine.h b/Foundation/include/Poco/SHA1Engine.h index 8109cc3508..a0b56ff859 100644 --- a/Foundation/include/Poco/SHA1Engine.h +++ b/Foundation/include/Poco/SHA1Engine.h @@ -34,7 +34,7 @@ namespace Poco { class Foundation_API SHA1Engine: public DigestEngine - /// This class implementes the SHA-1 message digest algorithm. + /// This class implements the SHA-1 message digest algorithm. /// (FIPS 180-1, see http://www.itl.nist.gov/fipspubs/fip180-1.htm) { public: diff --git a/Foundation/include/Poco/String.h b/Foundation/include/Poco/String.h index 0eb3947c02..9cdeb4aa4d 100644 --- a/Foundation/include/Poco/String.h +++ b/Foundation/include/Poco/String.h @@ -388,7 +388,7 @@ S translate(const S& str, const typename S::value_type* from, const typename S:: template S& translateInPlace(S& str, const S& from, const S& to) - /// Replaces in str all occurences of characters in from + /// Replaces in str all occurrences of characters in from /// with the corresponding (by position) characters in to. /// If there is no corresponding character, the character /// is removed. @@ -491,7 +491,7 @@ S& removeInPlace(S& str, const typename S::value_type ch, typename S::size_type template S replace(const S& str, const S& from, const S& to, typename S::size_type start = 0) - /// Replace all occurences of from (which must not be the empty string) + /// Replace all occurrences of from (which must not be the empty string) /// in str with to, starting at position start. { S result(str); diff --git a/Foundation/include/Poco/StringTokenizer.h b/Foundation/include/Poco/StringTokenizer.h index a86f447d2d..51d965c9ad 100644 --- a/Foundation/include/Poco/StringTokenizer.h +++ b/Foundation/include/Poco/StringTokenizer.h @@ -69,7 +69,7 @@ class Foundation_API StringTokenizer /// Returns true if token exists, false otherwise. std::size_t find(const std::string& token, std::size_t pos = 0) const; - /// Returns the index of the first occurence of the token + /// Returns the index of the first occurrence of the token /// starting at position pos. /// Throws a NotFoundException if the token is not found. diff --git a/Foundation/include/Poco/TaskNotification.h b/Foundation/include/Poco/TaskNotification.h index 6958395c0c..be0c73df02 100644 --- a/Foundation/include/Poco/TaskNotification.h +++ b/Foundation/include/Poco/TaskNotification.h @@ -122,7 +122,7 @@ class TaskCustomNotification: public TaskNotification /// This is a template for "custom" notification. /// Unlike other notifications, this notification /// is instantiated and posted by the task itself. - /// The purpose is to provide generic notifiation + /// The purpose is to provide generic notification /// mechanism between the task and its observer(s). { public: diff --git a/Foundation/include/Poco/TextEncoding.h b/Foundation/include/Poco/TextEncoding.h index 511b07056f..14a0dd9413 100644 --- a/Foundation/include/Poco/TextEncoding.h +++ b/Foundation/include/Poco/TextEncoding.h @@ -97,22 +97,22 @@ class Foundation_API TextEncoding /// /// The queryConvert function must return the Unicode scalar value /// represented by this byte sequence or -1 if the byte sequence is malformed - /// or -n where n is number of bytes requested for the sequence, if lenght is + /// or -n where n is number of bytes requested for the sequence, if length is /// shorter than the sequence. /// The length of the sequence might not be determined by the first byte, /// in which case the conversion becomes an iterative process: /// First call with length == 1 might return -2, - /// Then a second call with lenght == 2 might return -4 + /// Then a second call with length == 2 might return -4 /// Eventually, the third call with length == 4 should return either a /// Unicode scalar value, or -1 if the byte sequence is malformed. /// The default implementation returns (int) bytes[0]. virtual int sequenceLength(const unsigned char* bytes, int length) const; /// The sequenceLength function is used to get the lenth of the sequence pointed - /// by bytes. The length paramater should be greater or equal to the length of + /// by bytes. The length parameter should be greater or equal to the length of /// the sequence. /// - /// The sequenceLength function must return the lenght of the sequence + /// The sequenceLength function must return the length of the sequence /// represented by this byte sequence or a negative value -n if length is /// shorter than the sequence, where n is the number of byte requested /// to determine the length of the sequence. @@ -120,7 +120,7 @@ class Foundation_API TextEncoding /// in which case the conversion becomes an iterative process as long as the /// result is negative: /// First call with length == 1 might return -2, - /// Then a second call with lenght == 2 might return -4 + /// Then a second call with length == 2 might return -4 /// Eventually, the third call with length == 4 should return 4. /// The default implementation returns 1. diff --git a/Foundation/include/Poco/Thread.h b/Foundation/include/Poco/Thread.h index b36c07adce..4c10f5422d 100644 --- a/Foundation/include/Poco/Thread.h +++ b/Foundation/include/Poco/Thread.h @@ -111,7 +111,7 @@ class Foundation_API Thread: private ThreadImpl void setOSPriority(int prio, int policy = POLICY_DEFAULT); /// Sets the thread's priority, using an operating system specific /// priority value. Use getMinOSPriority() and getMaxOSPriority() to - /// obtain mininum and maximum priority values. Additionally, + /// obtain minimum and maximum priority values. Additionally, /// a scheduling policy can be specified. The policy is currently /// only used on POSIX platforms where the values SCHED_OTHER (default), /// SCHED_FIFO and SCHED_RR are supported. diff --git a/Foundation/include/Poco/TypeList.h b/Foundation/include/Poco/TypeList.h index 5b949c2967..9fa6322ba9 100644 --- a/Foundation/include/Poco/TypeList.h +++ b/Foundation/include/Poco/TypeList.h @@ -304,7 +304,7 @@ struct TypeAppender, T> template struct TypeOneEraser; - /// TypeOneEraser erases the first occurence of the type T in Head. + /// TypeOneEraser erases the first occurrence of the type T in Head. /// Usage: /// /// typedef TypeListType::HeadType Type3; @@ -336,7 +336,7 @@ struct TypeOneEraser, T> template struct TypeAllEraser; - /// TypeAllEraser erases all the occurences of the type T in Head. + /// TypeAllEraser erases all the occurrences of the type T in Head. /// Usage: /// /// typedef TypeListType::HeadType Type4; @@ -368,7 +368,7 @@ struct TypeAllEraser, T> template struct TypeDuplicateEraser; - /// TypeDuplicateEraser erases all but the first occurence of the type T in Head. + /// TypeDuplicateEraser erases all but the first occurrence of the type T in Head. /// Usage: /// /// typedef TypeListType::HeadType Type4; @@ -397,7 +397,7 @@ struct TypeDuplicateEraser > template struct TypeOneReplacer; - /// TypeOneReplacer replaces the first occurence + /// TypeOneReplacer replaces the first occurrence /// of the type T in Head with type R. /// Usage: /// @@ -430,7 +430,7 @@ struct TypeOneReplacer, T, R> template struct TypeAllReplacer; - /// TypeAllReplacer replaces all the occurences + /// TypeAllReplacer replaces all the occurrences /// of the type T in Head with type R. /// Usage: /// diff --git a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h index 1329ae401a..398b3cf7ea 100644 --- a/Foundation/include/Poco/UniqueAccessExpireLRUCache.h +++ b/Foundation/include/Poco/UniqueAccessExpireLRUCache.h @@ -37,7 +37,7 @@ template < > class UniqueAccessExpireLRUCache: public AbstractCache, TMutex, TEventMutex> /// A UniqueAccessExpireLRUCache combines LRU caching and time based per entry expire caching. - /// One can define for each cache entry a seperate timepoint + /// One can define for each cache entry a separate timepoint /// but also limit the size of the cache (per default: 1024). /// Each TValue object must thus offer the following method: /// diff --git a/Foundation/include/Poco/UniqueExpireLRUCache.h b/Foundation/include/Poco/UniqueExpireLRUCache.h index 748c131c98..ff389cf962 100644 --- a/Foundation/include/Poco/UniqueExpireLRUCache.h +++ b/Foundation/include/Poco/UniqueExpireLRUCache.h @@ -37,7 +37,7 @@ template < > class UniqueExpireLRUCache: public AbstractCache, TMutex, TEventMutex> /// A UniqueExpireLRUCache combines LRU caching and time based per entry expire caching. - /// One can define for each cache entry a seperate timepoint + /// One can define for each cache entry a separate timepoint /// but also limit the size of the cache (per default: 1024). /// Each TValue object must thus offer the following method: /// diff --git a/JSON/include/Poco/JSON/PrintHandler.h b/JSON/include/Poco/JSON/PrintHandler.h index 11e0587f79..ca3debdf22 100644 --- a/JSON/include/Poco/JSON/PrintHandler.h +++ b/JSON/include/Poco/JSON/PrintHandler.h @@ -89,7 +89,7 @@ class JSON_API PrintHandler : public Handler #endif void value(const std::string& value); - /// A string value is read; it will be fromatted and written to the output. + /// A string value is read; it will be formatted and written to the output. void value(double d); /// A double value is read; it will be written to the output. diff --git a/Net/include/Poco/Net/DatagramSocket.h b/Net/include/Poco/Net/DatagramSocket.h index 6a25fc7c8f..74c4c5e3df 100644 --- a/Net/include/Poco/Net/DatagramSocket.h +++ b/Net/include/Poco/Net/DatagramSocket.h @@ -121,7 +121,7 @@ class Net_API DatagramSocket: public Socket protected: DatagramSocket(SocketImpl* pImpl); /// Creates the Socket and attaches the given SocketImpl. - /// The socket takes owership of the SocketImpl. + /// The socket takes ownership of the SocketImpl. /// /// The SocketImpl must be a StreamSocketImpl, otherwise /// an InvalidArgumentException will be thrown. diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h index 0d766a67f6..84902ae04e 100644 --- a/Net/include/Poco/Net/FTPClientSession.h +++ b/Net/include/Poco/Net/FTPClientSession.h @@ -258,7 +258,7 @@ class Net_API FTPClientSession /// The stream is valid until endList() is called. /// /// Optionally, a path to a directory or file can be specified. - /// According to the FTP prototol, if a path to a filename is + /// According to the FTP protocol, if a path to a filename is /// given, only information for the specific file is returned. /// If a path to a directory is given, a listing of that directory /// is returned. If no path is given, a listing of the current diff --git a/Net/include/Poco/Net/HTTPServerParams.h b/Net/include/Poco/Net/HTTPServerParams.h index 865659911e..a87dd6d6cf 100644 --- a/Net/include/Poco/Net/HTTPServerParams.h +++ b/Net/include/Poco/Net/HTTPServerParams.h @@ -88,7 +88,7 @@ class Net_API HTTPServerParams: public TCPServerParams /// Returns the connection timeout for HTTP connections. void setMaxKeepAliveRequests(int maxKeepAliveRequests); - /// Specifies the maximun number of requests allowed + /// Specifies the maximum number of requests allowed /// during a persistent connection. 0 means unlimited /// connections. diff --git a/Net/include/Poco/Net/ICMPSocket.h b/Net/include/Poco/Net/ICMPSocket.h index cfcc2ff3e5..b6253864c9 100644 --- a/Net/include/Poco/Net/ICMPSocket.h +++ b/Net/include/Poco/Net/ICMPSocket.h @@ -80,7 +80,7 @@ class Net_API ICMPSocket: public Socket protected: ICMPSocket(SocketImpl* pImpl); /// Creates the Socket and attaches the given SocketImpl. - /// The socket takes owership of the SocketImpl. + /// The socket takes ownership of the SocketImpl. /// /// The SocketImpl must be a ICMPSocketImpl, otherwise /// an InvalidArgumentException will be thrown. diff --git a/Net/include/Poco/Net/MailStream.h b/Net/include/Poco/Net/MailStream.h index b9e760ae6b..77934a2558 100644 --- a/Net/include/Poco/Net/MailStream.h +++ b/Net/include/Poco/Net/MailStream.h @@ -113,8 +113,8 @@ class Net_API MailIOS: public virtual std::ios class Net_API MailInputStream: public MailIOS, public std::istream /// This class is used for reading E-Mail messages from a - /// POP3 server. All occurences of "\r\n..\r\n" are replaced with - /// "\r\n.\r\n". The first occurence of "\r\n.\r\n" denotes the end + /// POP3 server. All occurrences of "\r\n..\r\n" are replaced with + /// "\r\n.\r\n". The first occurrence of "\r\n.\r\n" denotes the end /// of the stream. { public: @@ -129,7 +129,7 @@ class Net_API MailInputStream: public MailIOS, public std::istream class Net_API MailOutputStream: public MailIOS, public std::ostream /// This class is used for writing E-Mail messages to a - /// SMTP server. All occurences of "\r\n.\r\n" are replaced with + /// SMTP server. All occurrences of "\r\n.\r\n" are replaced with /// "\r\n..\r\n". { public: diff --git a/Net/include/Poco/Net/NetworkInterface.h b/Net/include/Poco/Net/NetworkInterface.h index fce7d34564..6115d46614 100644 --- a/Net/include/Poco/Net/NetworkInterface.h +++ b/Net/include/Poco/Net/NetworkInterface.h @@ -123,7 +123,7 @@ class Net_API NetworkInterface /// Assigns another NetworkInterface. bool operator < (const NetworkInterface& other) const; - /// Operatorr less-than. + /// Operator less-than. bool operator == (const NetworkInterface& other) const; /// Operator equal. Compares interface indices. diff --git a/Net/include/Poco/Net/RawSocket.h b/Net/include/Poco/Net/RawSocket.h index 0476884336..f5e92765a2 100644 --- a/Net/include/Poco/Net/RawSocket.h +++ b/Net/include/Poco/Net/RawSocket.h @@ -121,7 +121,7 @@ class Net_API RawSocket: public Socket protected: RawSocket(SocketImpl* pImpl); /// Creates the Socket and attaches the given SocketImpl. - /// The socket takes owership of the SocketImpl. + /// The socket takes ownership of the SocketImpl. /// /// The SocketImpl must be a StreamSocketImpl, otherwise /// an InvalidArgumentException will be thrown. diff --git a/Net/include/Poco/Net/SMTPClientSession.h b/Net/include/Poco/Net/SMTPClientSession.h index bf7b9650e0..7258ad6324 100644 --- a/Net/include/Poco/Net/SMTPClientSession.h +++ b/Net/include/Poco/Net/SMTPClientSession.h @@ -35,7 +35,7 @@ class MailMessage; class Net_API SMTPClientSession /// This class implements an Simple Mail - /// Transfer Procotol (SMTP, RFC 2821) + /// Transfer Protocol (SMTP, RFC 2821) /// client for sending e-mail messages. { public: diff --git a/Net/include/Poco/Net/Socket.h b/Net/include/Poco/Net/Socket.h index fc7f0ba2da..cc4a7a2fc0 100644 --- a/Net/include/Poco/Net/Socket.h +++ b/Net/include/Poco/Net/Socket.h @@ -299,7 +299,7 @@ class Net_API Socket protected: Socket(SocketImpl* pImpl); /// Creates the Socket and attaches the given SocketImpl. - /// The socket takes owership of the SocketImpl. + /// The socket takes ownership of the SocketImpl. poco_socket_t sockfd() const; /// Returns the socket descriptor for this socket. diff --git a/Net/include/Poco/Net/SocketNotification.h b/Net/include/Poco/Net/SocketNotification.h index bf8c60d4cf..7e1bca346b 100644 --- a/Net/include/Poco/Net/SocketNotification.h +++ b/Net/include/Poco/Net/SocketNotification.h @@ -96,7 +96,7 @@ class Net_API ErrorNotification: public SocketNotification class Net_API TimeoutNotification: public SocketNotification - /// This notification is sent if no other event has occured + /// This notification is sent if no other event has occurred /// for a specified time. { public: diff --git a/Net/include/Poco/Net/SocketReactor.h b/Net/include/Poco/Net/SocketReactor.h index a39e9d25b2..2919c2b728 100644 --- a/Net/include/Poco/Net/SocketReactor.h +++ b/Net/include/Poco/Net/SocketReactor.h @@ -83,7 +83,7 @@ class Net_API SocketReactor: public Poco::Runnable /// becomes writable. The ErrorNotification will be dispatched if /// there is an error condition on a socket. /// - /// If the timeout expires and no event has occured, a + /// If the timeout expires and no event has occurred, a /// TimeoutNotification will be dispatched to all event handlers /// registered for it. This is done in the onTimeout() method /// which can be overridden by subclasses to perform custom @@ -158,7 +158,7 @@ class Net_API SocketReactor: public Poco::Runnable /// reactor.addEventHandler(obs); bool hasEventHandler(const Socket& socket, const Poco::AbstractObserver& observer); - /// Returns true if the observer is reistered with SocketReactor for the given socket. + /// Returns true if the observer is registered with SocketReactor for the given socket. void removeEventHandler(const Socket& socket, const Poco::AbstractObserver& observer); /// Unregisters an event handler with the SocketReactor. diff --git a/Net/include/Poco/Net/StreamSocket.h b/Net/include/Poco/Net/StreamSocket.h index 987da84899..6127b73e1f 100644 --- a/Net/include/Poco/Net/StreamSocket.h +++ b/Net/include/Poco/Net/StreamSocket.h @@ -160,7 +160,7 @@ class Net_API StreamSocket: public Socket StreamSocket(SocketImpl* pImpl); /// Creates the Socket and attaches the given SocketImpl. - /// The socket takes owership of the SocketImpl. + /// The socket takes ownership of the SocketImpl. /// /// The SocketImpl must be a StreamSocketImpl, otherwise /// an InvalidArgumentException will be thrown. diff --git a/NetSSL_OpenSSL/include/Poco/Net/Context.h b/NetSSL_OpenSSL/include/Poco/Net/Context.h index 734e726b0b..6a0988c4c8 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Context.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Context.h @@ -226,29 +226,29 @@ class NetSSL_API Context: public Poco::RefCountedObject /// /// Specifying a size of 0 will set an unlimited cache size. /// - /// This method may only be called on SERVER_USE Context objets. + /// This method may only be called on SERVER_USE Context objects. std::size_t getSessionCacheSize() const; /// Returns the current maximum size of the server session cache. /// - /// This method may only be called on SERVER_USE Context objets. + /// This method may only be called on SERVER_USE Context objects. void setSessionTimeout(long seconds); /// Sets the timeout (in seconds) of cached sessions on the server. /// A cached session will be removed from the cache if it has /// not been used for the given number of seconds. /// - /// This method may only be called on SERVER_USE Context objets. + /// This method may only be called on SERVER_USE Context objects. long getSessionTimeout() const; /// Returns the timeout (in seconds) of cached sessions on the server. /// - /// This method may only be called on SERVER_USE Context objets. + /// This method may only be called on SERVER_USE Context objects. void flushSessionCache(); /// Flushes the SSL session cache on the server. /// - /// This method may only be called on SERVER_USE Context objets. + /// This method may only be called on SERVER_USE Context objects. void enableExtendedCertificateVerification(bool flag = true); /// Enable or disable the automatic post-connection diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h index 070aecebc1..aa9d137d03 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h @@ -51,11 +51,11 @@ class NetSSL_API SSLManager /// Proper initialization of SSLManager is critical. /// /// SSLManager can be initialized manually, by calling initializeServer() - /// and/or initializeClient(), or intialization can be automatic. In the latter + /// and/or initializeClient(), or initialization can be automatic. In the latter /// case, a Poco::Util::Application instance must be available and the required /// configuration properties must be set (see below). /// - /// Note that manual intialization must happen very early in the application, + /// Note that manual initialization must happen very early in the application, /// before defaultClientContext() or defaultServerContext() are called. /// /// If defaultClientContext() and defaultServerContext() are never called diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h b/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h index bca3b7b7c5..12f25cf81a 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureSMTPClientSession.h @@ -31,7 +31,7 @@ namespace Net { class NetSSL_API SecureSMTPClientSession: public SMTPClientSession /// This class implements an Simple Mail - /// Transfer Procotol (SMTP, RFC 2821) + /// Transfer Protocol (SMTP, RFC 2821) /// client for sending e-mail messages that /// supports the STARTTLS command for secure /// connections. diff --git a/NetSSL_Win/include/Poco/Net/SSLManager.h b/NetSSL_Win/include/Poco/Net/SSLManager.h index 608b99e47d..d960e2fb05 100644 --- a/NetSSL_Win/include/Poco/Net/SSLManager.h +++ b/NetSSL_Win/include/Poco/Net/SSLManager.h @@ -53,7 +53,7 @@ class NetSSL_Win_API SSLManager /// Proper initialization of SSLManager is critical. /// /// SSLManager can be initialized manually, by calling initializeServer() - /// and/or initializeClient(), or intialization can be automatic. In the latter + /// and/or initializeClient(), or initialization can be automatic. In the latter /// case, a Poco::Util::Application instance must be available and the required /// configuration properties must be set (see below). /// diff --git a/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h b/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h index 675eb4deea..5732eee9de 100644 --- a/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h +++ b/NetSSL_Win/include/Poco/Net/SecureSMTPClientSession.h @@ -31,7 +31,7 @@ namespace Net { class NetSSL_Win_API SecureSMTPClientSession: public SMTPClientSession /// This class implements an Simple Mail - /// Transfer Procotol (SMTP, RFC 2821) + /// Transfer Protocol (SMTP, RFC 2821) /// client for sending e-mail messages that /// supports the STARTTLS command for secure /// connections. diff --git a/PDF/include/Poco/PDF/Document.h b/PDF/include/Poco/PDF/Document.h index 2415babf32..4dbaada450 100644 --- a/PDF/include/Poco/PDF/Document.h +++ b/PDF/include/Poco/PDF/Document.h @@ -293,7 +293,7 @@ class PDF_API Document /// Sets the document info. void setInfo(Info info, const LocalDateTime& dt); - /// Sets the document creation or moidification date. + /// Sets the document creation or modification date. std::string getInfo(Info info); /// Returns the document info. diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h index 4cc09cf07e..4bbfbc1873 100644 --- a/Util/include/Poco/Util/AbstractConfiguration.h +++ b/Util/include/Poco/Util/AbstractConfiguration.h @@ -302,7 +302,7 @@ class Util_API AbstractConfiguration: public Poco::RefCountedObject /// Creates a view (see ConfigurationView) into the configuration. std::string expand(const std::string& value) const; - /// Replaces all occurences of ${} in value with the + /// Replaces all occurrences of ${} in value with the /// value of the . If does not exist, /// nothing is changed. /// diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h index fbbbd00715..64bc8cc7f0 100644 --- a/Util/include/Poco/Util/WinRegistryConfiguration.h +++ b/Util/include/Poco/Util/WinRegistryConfiguration.h @@ -41,8 +41,8 @@ class Util_API WinRegistryConfiguration: public AbstractConfiguration /// Creates the WinRegistryConfiguration. /// The rootPath must start with one of the root key names /// like HKEY_CLASSES_ROOT, e.g. HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services. - /// All further keys are relativ to the root path and can be - /// dot seperated, e.g. the path MyService.ServiceName will be converted to + /// All further keys are relative to the root path and can be + /// dot separated, e.g. the path MyService.ServiceName will be converted to /// HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\MyService\ServiceName. /// The extraSam parameter will be passed along to WinRegistryKey, to control /// registry virtualization for example. From 7780ab3ae08f9f11bb3becf5c3410fc927b69586 Mon Sep 17 00:00:00 2001 From: martin-osborne Date: Fri, 10 Apr 2015 11:43:49 +0100 Subject: [PATCH 23/23] Corrected more spellings. --- Crypto/include/Poco/Crypto/RSADigestEngine.h | 2 +- Crypto/include/Poco/Crypto/X509Certificate.h | 2 +- .../include/Poco/Data/MySQL/MySQLException.h | 2 +- Data/MySQL/include/Poco/Data/MySQL/Utility.h | 2 +- Data/ODBC/include/Poco/Data/ODBC/Binder.h | 2 +- .../ODBC/include/Poco/Data/ODBC/SessionImpl.h | 2 +- Data/ODBC/testsuite/src/ODBCAccessTest.cpp | 2 +- Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h | 2 +- .../include/Poco/Data/SQLite/Notifier.h | 2 +- .../Poco/Data/SQLite/SQLiteStatementImpl.h | 2 +- .../SQLite/include/Poco/Data/SQLite/Utility.h | 12 ++-- Data/include/Poco/Data/AbstractBinder.h | 2 +- Data/include/Poco/Data/RowFilter.h | 2 +- Data/include/Poco/Data/Session.h | 4 +- Data/include/Poco/Data/SessionImpl.h | 2 +- Data/include/Poco/Data/Transaction.h | 2 +- Foundation/include/Poco/DateTime.h | 2 +- Foundation/include/Poco/DateTimeParser.h | 2 +- Foundation/include/Poco/Dynamic/VarHolder.h | 62 +++++++++---------- Foundation/include/Poco/JSONString.h | 2 +- Foundation/include/Poco/LocalDateTime.h | 2 +- Foundation/include/Poco/NumericString.h | 6 +- Net/include/Poco/Net/FTPClientSession.h | 2 +- .../Poco/Net/HTTPRequestHandlerFactory.h | 2 +- Net/include/Poco/Net/MediaType.h | 4 +- Net/include/Poco/Net/StreamSocket.h | 4 +- NetSSL_OpenSSL/include/Poco/Net/Context.h | 4 +- NetSSL_OpenSSL/include/Poco/Net/SSLManager.h | 2 +- PDF/include/Poco/PDF/Page.h | 2 +- Util/include/Poco/Util/LoggingConfigurator.h | 2 +- Util/include/Poco/Util/Option.h | 2 +- XML/include/Poco/DOM/Document.h | 4 +- 32 files changed, 74 insertions(+), 74 deletions(-) diff --git a/Crypto/include/Poco/Crypto/RSADigestEngine.h b/Crypto/include/Poco/Crypto/RSADigestEngine.h index e4e8479151..3b63661e2b 100644 --- a/Crypto/include/Poco/Crypto/RSADigestEngine.h +++ b/Crypto/include/Poco/Crypto/RSADigestEngine.h @@ -86,7 +86,7 @@ class Crypto_API RSADigestEngine: public Poco::DigestEngine const DigestEngine::Digest& signature(); /// Signs the digest using the RSA algorithm - /// and the private key (teh first time it's + /// and the private key (the first time it's /// called) and returns the result. /// /// Can be called multiple times. diff --git a/Crypto/include/Poco/Crypto/X509Certificate.h b/Crypto/include/Poco/Crypto/X509Certificate.h index 472c537637..72d39ca0c0 100644 --- a/Crypto/include/Poco/Crypto/X509Certificate.h +++ b/Crypto/include/Poco/Crypto/X509Certificate.h @@ -128,7 +128,7 @@ class Crypto_API X509Certificate /// certificate. /// /// Returns true if verification against the issuer certificate - /// was successfull, false otherwise. + /// was successful, false otherwise. const X509* certificate() const; /// Returns the underlying OpenSSL certificate. diff --git a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h index 6585ceaada..2b5eab6d93 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h +++ b/Data/MySQL/include/Poco/Data/MySQL/MySQLException.h @@ -93,7 +93,7 @@ class ConnectionException : public MySQLException class TransactionException : public ConnectionException - /// TrabsactionException + /// TransactionException { public: diff --git a/Data/MySQL/include/Poco/Data/MySQL/Utility.h b/Data/MySQL/include/Poco/Data/MySQL/Utility.h index e53ebce22d..8274a3c990 100644 --- a/Data/MySQL/include/Poco/Data/MySQL/Utility.h +++ b/Data/MySQL/include/Poco/Data/MySQL/Utility.h @@ -57,7 +57,7 @@ class MySQL_API Utility /// Returns host info. static bool hasMicrosecond(); - /// Returns true if microseconds are suported. + /// Returns true if microseconds are supported. static MYSQL* handle(Poco::Data::Session& session); /// Returns native MySQL handle for the session. diff --git a/Data/ODBC/include/Poco/Data/ODBC/Binder.h b/Data/ODBC/include/Poco/Data/ODBC/Binder.h index 66f0084f90..7e0e11e037 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/Binder.h +++ b/Data/ODBC/include/Poco/Data/ODBC/Binder.h @@ -942,7 +942,7 @@ class ODBC_API Binder: public Poco::Data::AbstractBinder /// This function runs for query and stored procedure parameters (in and /// out-bound). Some drivers, however, do not care about knowing this /// information to start with. For that reason, after all the attempts - /// to discover the required values are unsuccesfully exhausted, the values + /// to discover the required values are unsuccessfully exhausted, the values /// are both set to zero and no exception is thrown. void setParamSetSize(std::size_t length); diff --git a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h index 2d4c3b161f..22a3d60639 100644 --- a/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h +++ b/Data/ODBC/include/Poco/Data/ODBC/SessionImpl.h @@ -59,7 +59,7 @@ class ODBC_API SessionImpl: public Poco::Data::AbstractSessionImpl bool autoBind = true, bool autoExtract = true); /// Creates the SessionImpl. Opens a connection to the database. - /// Throws NotConnectedException if connection was not succesful. + /// Throws NotConnectedException if connection was not successful. //@ deprecated SessionImpl(const std::string& connect, diff --git a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp index c93838e97e..c09f00bd86 100644 --- a/Data/ODBC/testsuite/src/ODBCAccessTest.cpp +++ b/Data/ODBC/testsuite/src/ODBCAccessTest.cpp @@ -195,7 +195,7 @@ bool ODBCAccessTest::init(const std::string& driver, const std::string& dsn) return false; } - //N.B. Access driver does not suport check for connection. + //N.B. Access driver does not support check for connection. std::cout << "*** Connected to [" << driver << "] test database." << std::endl; return true; diff --git a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h index 267939cd60..2440bcc1d8 100644 --- a/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h +++ b/Data/ODBC/testsuite/src/ODBCPostgreSQLTest.h @@ -80,7 +80,7 @@ class ODBCPostgreSQLTest: public ODBCTest /// Alternative is direct database configuration for PL/pgSQL usage. static const std::string _libDir; - /// Varible determining the location of the library directory + /// Variable determining the location of the library directory /// on the database installation system. /// Used to enable PLpgSQL language programmatically when /// it is not enabled. diff --git a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h index 1a9aa5d009..f53f28bdfa 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Notifier.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Notifier.h @@ -121,7 +121,7 @@ class SQLite_API Notifier static int sqliteCommitCallbackFn(void* pVal); /// Commit callback event dispatcher. If an exception occurs, it is caught inside this function, /// non-zero value is returned, which causes SQLite engine to turn commit into a rollback. - /// Therefore, callers should check for return value - if it is zero, callback completed succesfuly + /// Therefore, callers should check for return value - if it is zero, callback completed successfuly /// and transaction was committed. static void sqliteRollbackCallbackFn(void* pVal); diff --git a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h index 327ec16d32..5ff43d4307 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h +++ b/Data/SQLite/include/Poco/Data/SQLite/SQLiteStatementImpl.h @@ -78,7 +78,7 @@ class SQLite_API SQLiteStatementImpl: public Poco::Data::StatementImpl void compileImpl(); /// Compiles the statement, doesn't bind yet. - /// Returns true if the statement was succesfully compiled. + /// Returns true if the statement was successfully compiled. /// The way SQLite handles batches of statements is by compiling /// one at a time and returning a pointer to the next one. /// The remainder of the statement is kept in a string diff --git a/Data/SQLite/include/Poco/Data/SQLite/Utility.h b/Data/SQLite/include/Poco/Data/SQLite/Utility.h index 8b785cece6..fb9e2e47d9 100644 --- a/Data/SQLite/include/Poco/Data/SQLite/Utility.h +++ b/Data/SQLite/include/Poco/Data/SQLite/Utility.h @@ -75,37 +75,37 @@ class SQLite_API Utility /// Loads the contents of a database file on disk into an opened /// database in memory. /// - /// Returns true if succesful. + /// Returns true if successful. static bool fileToMemory(const Session& session, const std::string& fileName); /// Loads the contents of a database file on disk into an opened /// database in memory. /// - /// Returns true if succesful. + /// Returns true if successful. static bool memoryToFile(const std::string& fileName, sqlite3* pInMemory); /// Saves the contents of an opened database in memory to the /// database on disk. /// - /// Returns true if succesful. + /// Returns true if successful. static bool memoryToFile(const std::string& fileName, const Session& session); /// Saves the contents of an opened database in memory to the /// database on disk. /// - /// Returns true if succesful. + /// Returns true if successful. static bool isThreadSafe(); /// Returns true if SQLite was compiled in multi-thread or serialized mode. /// See http://www.sqlite.org/c3ref/threadsafe.html for details. /// - /// Returns true if succesful + /// Returns true if successful static bool setThreadMode(int mode); /// Sets the threading mode to single, multi or serialized. /// See http://www.sqlite.org/threadsafe.html for details. /// - /// Returns true if succesful + /// Returns true if successful static int getThreadMode(); /// Returns the thread mode. diff --git a/Data/include/Poco/Data/AbstractBinder.h b/Data/include/Poco/Data/AbstractBinder.h index 2eca13135f..d478b96bb3 100644 --- a/Data/include/Poco/Data/AbstractBinder.h +++ b/Data/include/Poco/Data/AbstractBinder.h @@ -172,7 +172,7 @@ class Data_API AbstractBinder /// Binds a long. virtual void bind(std::size_t pos, const unsigned long& val, Direction dir = PD_IN) = 0; - /// Binds an unsiged long. + /// Binds an unsigned long. virtual void bind(std::size_t pos, const std::vector& val, Direction dir = PD_IN); /// Binds a long vector. diff --git a/Data/include/Poco/Data/RowFilter.h b/Data/include/Poco/Data/RowFilter.h index 6ce35c55d6..d427fe8212 100644 --- a/Data/include/Poco/Data/RowFilter.h +++ b/Data/include/Poco/Data/RowFilter.h @@ -125,7 +125,7 @@ class Data_API RowFilter: public RefCountedObject /// Returns the number of comparisons removed. void toggleNot(); - /// Togless the NOT operator for this filter; + /// Toggles the NOT operator for this filter; bool isNot() const; /// Returns true if filter is NOT-ed, false otherwise. diff --git a/Data/include/Poco/Data/Session.h b/Data/include/Poco/Data/Session.h index f413d2cc85..049922dde8 100644 --- a/Data/include/Poco/Data/Session.h +++ b/Data/include/Poco/Data/Session.h @@ -202,7 +202,7 @@ class Data_API Session /// reconnect a disconnected session. /// If the connection is not established, /// a ConnectionFailedException is thrown. - /// Zero timout means indefinite + /// Zero timeout means indefinite void close(); /// Closes the session. @@ -262,7 +262,7 @@ class Data_API Session static std::string uri(const std::string& connector, const std::string& connectionString); - /// Utility function that teturns the URI formatted from supplied + /// Utility function that returns the URI formatted from supplied /// arguments as "connector:///connectionString". void setFeature(const std::string& name, bool state); diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h index 5b201b3ee1..d1255cc0c8 100644 --- a/Data/include/Poco/Data/SessionImpl.h +++ b/Data/include/Poco/Data/SessionImpl.h @@ -67,7 +67,7 @@ class Data_API SessionImpl: public Poco::RefCountedObject /// a disconnected session. /// If the connection is not established within requested timeout /// (specified in seconds), a ConnectionFailedException is thrown. - /// Zero timout means indefinite + /// Zero timeout means indefinite virtual void close() = 0; /// Closes the connection. diff --git a/Data/include/Poco/Data/Transaction.h b/Data/include/Poco/Data/Transaction.h index ddcb00130a..c231dbebe1 100644 --- a/Data/include/Poco/Data/Transaction.h +++ b/Data/include/Poco/Data/Transaction.h @@ -111,7 +111,7 @@ class Data_API Transaction void execute(const std::vector& sql); /// Executes all the SQL statements supplied in the vector and, after the last - /// one is sucesfully executed, commits the transaction. + /// one is successfully executed, commits the transaction. /// If an error occurs during execution, transaction is rolled back. /// Passing true value for commit disables rollback during destruction /// of this Transaction object. diff --git a/Foundation/include/Poco/DateTime.h b/Foundation/include/Poco/DateTime.h index c6095b8081..8a086470b8 100644 --- a/Foundation/include/Poco/DateTime.h +++ b/Foundation/include/Poco/DateTime.h @@ -164,7 +164,7 @@ class Foundation_API DateTime /// There will be no week 0 in 2007. int day() const; - /// Returns the day witin the month (1 to 31). + /// Returns the day within the month (1 to 31). int dayOfWeek() const; /// Returns the weekday (0 to 6, where diff --git a/Foundation/include/Poco/DateTimeParser.h b/Foundation/include/Poco/DateTimeParser.h index 74e6a2ebd8..3a9feb6cf2 100644 --- a/Foundation/include/Poco/DateTimeParser.h +++ b/Foundation/include/Poco/DateTimeParser.h @@ -103,7 +103,7 @@ class Foundation_API DateTimeParser static int parseDayOfWeek(std::string::const_iterator& it, const std::string::const_iterator& end); /// Tries to interpret the given range as a weekday name. The range must be at least /// three characters long. - /// Returns the weekday number (0 .. 6, where 0 = Synday, 1 = Monday, etc.) if the + /// Returns the weekday number (0 .. 6, where 0 = Sunday, 1 = Monday, etc.) if the /// weekday name is valid. Otherwise throws a SyntaxException. protected: diff --git a/Foundation/include/Poco/Dynamic/VarHolder.h b/Foundation/include/Poco/Dynamic/VarHolder.h index a8c4cb6aa4..2501f05307 100644 --- a/Foundation/include/Poco/Dynamic/VarHolder.h +++ b/Foundation/include/Poco/Dynamic/VarHolder.h @@ -139,47 +139,47 @@ class Foundation_API VarHolder virtual void convert(Int8& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(Int16& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(Int32& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(Int64& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(UInt8& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(UInt16& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(UInt32& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(UInt64& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(DateTime& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(LocalDateTime& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(Timestamp& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. #ifndef POCO_LONG_IS_64_BIT @@ -193,78 +193,78 @@ class Foundation_API VarHolder virtual void convert(bool& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(float& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(double& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(char& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(std::string& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual void convert(Poco::UTF16String& val) const; /// Throws BadCastException. Must be overriden in a type - /// specialization in order to suport the conversion. + /// specialization in order to support the conversion. virtual bool isArray() const; /// Returns true. virtual bool isVector() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isList() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isDeque() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isStruct() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isInteger() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isSigned() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isNumeric() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isBoolean() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isString() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isDate() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isTime() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual bool isDateTime() const; /// Returns false. Must be properly overriden in a type - /// specialization in order to suport the diagnostic. + /// specialization in order to support the diagnostic. virtual std::size_t size() const; /// Returns 1 iff Var is not empty or this function overriden. @@ -332,7 +332,7 @@ class Foundation_API VarHolder template void convertToSmallerUnsigned(const F& from, T& to) const /// This function is meant for converting unsigned integral data types, - /// from larger to smaller type. Since lower limit is always 0 for unigned types, + /// from larger to smaller type. Since lower limit is always 0 for unsigned types, /// only the upper limit is checked, thus saving some cycles compared to the signed /// version of the function. If the value to be converted is smaller than /// the maximum value for the target type, the conversion is performed. @@ -369,7 +369,7 @@ class Foundation_API VarHolder /// This function is meant for converting floating point data types to /// unsigned integral data types. Negative values can not be converted and if one is /// encountered, RangeException is thrown. - /// If uper limit is within the target data type limits, the conversion is performed. + /// If upper limit is within the target data type limits, the conversion is performed. { poco_static_assert (std::numeric_limits::is_specialized); poco_static_assert (std::numeric_limits::is_specialized); diff --git a/Foundation/include/Poco/JSONString.h b/Foundation/include/Poco/JSONString.h index f762725f57..80cba92e7d 100644 --- a/Foundation/include/Poco/JSONString.h +++ b/Foundation/include/Poco/JSONString.h @@ -31,7 +31,7 @@ std::string Foundation_API toJSON(char c); void Foundation_API toJSON(const std::string& value, std::ostream& out, bool wrap = true); - /// Formats string value into the suplied output stream by + /// Formats string value into the supplied output stream by /// escaping control characters. /// If wrap is true, the resulting string is enclosed in double quotes diff --git a/Foundation/include/Poco/LocalDateTime.h b/Foundation/include/Poco/LocalDateTime.h index 06a55dcf56..f696c18e1c 100644 --- a/Foundation/include/Poco/LocalDateTime.h +++ b/Foundation/include/Poco/LocalDateTime.h @@ -175,7 +175,7 @@ class Foundation_API LocalDateTime /// There will be no week 0 in 2007. int day() const; - /// Returns the day witin the month (1 to 31). + /// Returns the day within the month (1 to 31). int dayOfWeek() const; /// Returns the weekday (0 to 6, where diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index 4abd8f9c22..a6bd35b392 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -81,7 +81,7 @@ bool strToInt(const char* pStr, I& result, short base, char thSep = ',') /// Converts zero-terminated character array to integer number; /// Thousand separators are recognized for base10 and current locale; /// it is silently skipped but not verified for correct positioning. - /// Function returns true if succesful. If parsing was unsuccesful, + /// Function returns true if successful. If parsing was unsuccessful, /// the return value is false with the result value undetermined. { if (!pStr) return false; @@ -514,7 +514,7 @@ Foundation_API bool strToFloat(const std::string&, float& result, char decSep = /// If decimal separator and/or thousand separator are different from defaults, they should be /// supplied to ensure proper conversion. /// - /// Returns true if succesful, false otherwise. + /// Returns true if successful, false otherwise. Foundation_API double strToDouble(const char* str); @@ -527,7 +527,7 @@ Foundation_API bool strToDouble(const std::string& str, double& result, char dec /// If decimal separator and/or thousand separator are different from defaults, they should be /// supplied to ensure proper conversion. /// - /// Returns true if succesful, false otherwise. + /// Returns true if successful, false otherwise. // // end double-conversion functions declarations diff --git a/Net/include/Poco/Net/FTPClientSession.h b/Net/include/Poco/Net/FTPClientSession.h index 84902ae04e..f406aad4c4 100644 --- a/Net/include/Poco/Net/FTPClientSession.h +++ b/Net/include/Poco/Net/FTPClientSession.h @@ -160,7 +160,7 @@ class Net_API FTPClientSession void cdup(); /// Moves one directory up from the current working directory - /// on teh server. + /// on the server. /// /// Sends a CDUP command to the server. /// diff --git a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h index 6bf9fc9aa4..88c1b09fb1 100644 --- a/Net/include/Poco/Net/HTTPRequestHandlerFactory.h +++ b/Net/include/Poco/Net/HTTPRequestHandlerFactory.h @@ -49,7 +49,7 @@ class Net_API HTTPRequestHandlerFactory /// Destroys the HTTPRequestHandlerFactory. virtual HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request) = 0; - /// Must be overridden by sublasses. + /// Must be overridden by subclasses. /// /// Creates a new request handler for the given HTTP request. diff --git a/Net/include/Poco/Net/MediaType.h b/Net/include/Poco/Net/MediaType.h index a2d7664d15..3a115e580e 100644 --- a/Net/include/Poco/Net/MediaType.h +++ b/Net/include/Poco/Net/MediaType.h @@ -109,7 +109,7 @@ class Net_API MediaType /// Returns true if the type and subtype match /// the type and subtype of the given media type. /// If the MIME type is a range of types it matches - /// any media type withing the range (e.g. "image/*" matches + /// any media type within the range (e.g. "image/*" matches /// any image media type, "*/*" matches anything). /// Matching is case insensitive. @@ -117,7 +117,7 @@ class Net_API MediaType /// Returns true if the type and subtype match /// the given type and subtype. /// If the MIME type is a range of types it matches - /// any media type withing the range (e.g. "image/*" matches + /// any media type within the range (e.g. "image/*" matches /// any image media type, "*/*" matches anything). /// Matching is case insensitive. diff --git a/Net/include/Poco/Net/StreamSocket.h b/Net/include/Poco/Net/StreamSocket.h index 6127b73e1f..302fb58bc7 100644 --- a/Net/include/Poco/Net/StreamSocket.h +++ b/Net/include/Poco/Net/StreamSocket.h @@ -111,7 +111,7 @@ class Net_API StreamSocket: public Socket int sendBytes(Poco::FIFOBuffer& buffer); /// Sends the contents of the given buffer through - /// the socket. FIFOBuffer has writable/readable transiton + /// the socket. FIFOBuffer has writable/readable transition /// notifications which may be enabled to notify the caller when /// the buffer transitions between empty, partially full and /// full states. @@ -137,7 +137,7 @@ class Net_API StreamSocket: public Socket int receiveBytes(Poco::FIFOBuffer& buffer); /// Receives data from the socket and stores it /// in buffer. Up to length bytes are received. FIFOBuffer has - /// writable/readable transiton notifications which may be enabled + /// writable/readable transition notifications which may be enabled /// to notify the caller when the buffer transitions between empty, /// partially full and full states. /// diff --git a/NetSSL_OpenSSL/include/Poco/Net/Context.h b/NetSSL_OpenSSL/include/Poco/Net/Context.h index 6a0988c4c8..24a5bc1561 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/Context.h +++ b/NetSSL_OpenSSL/include/Poco/Net/Context.h @@ -119,7 +119,7 @@ class NetSSL_API Context: public Poco::RefCountedObject /// * verificationMode specifies whether and how peer certificates are validated. /// * verificationDepth sets the upper limit for verification chain sizes. Verification /// will fail if a certificate chain larger than this is encountered. - /// * loadDefaultCAs specifies wheter the builtin CA certificates from OpenSSL are used. + /// * loadDefaultCAs specifies whether the builtin CA certificates from OpenSSL are used. /// * cipherList specifies the supported ciphers in OpenSSL notation. /// /// Note: If the private key is protected by a passphrase, a PrivateKeyPassphraseHandler @@ -142,7 +142,7 @@ class NetSSL_API Context: public Poco::RefCountedObject /// * verificationMode specifies whether and how peer certificates are validated. /// * verificationDepth sets the upper limit for verification chain sizes. Verification /// will fail if a certificate chain larger than this is encountered. - /// * loadDefaultCAs specifies wheter the builtin CA certificates from OpenSSL are used. + /// * loadDefaultCAs specifies whether the builtin CA certificates from OpenSSL are used. /// * cipherList specifies the supported ciphers in OpenSSL notation. /// /// Note that a private key and/or certificate must be specified with diff --git a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h index aa9d137d03..8aa1c8f814 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SSLManager.h @@ -112,7 +112,7 @@ class NetSSL_API SSLManager /// the Context class for details). Valid values are none, relaxed, strict, once. /// - verificationDepth (integer, 1-9): Sets the upper limit for verification chain sizes. Verification /// will fail if a certificate chain larger than this is encountered. - /// - loadDefaultCAFile (boolean): Specifies wheter the builtin CA certificates from OpenSSL are used. + /// - loadDefaultCAFile (boolean): Specifies whether the builtin CA certificates from OpenSSL are used. /// - cipherList (string): Specifies the supported ciphers in OpenSSL notation /// (e.g. "ALL:!ADH:!LOW:!EXP:!MD5:@STRENGTH"). /// - privateKeyPassphraseHandler.name (string): The name of the class (subclass of PrivateKeyPassphraseHandler) diff --git a/PDF/include/Poco/PDF/Page.h b/PDF/include/Poco/PDF/Page.h index a59d4f27c5..de6dbe6a7a 100644 --- a/PDF/include/Poco/PDF/Page.h +++ b/PDF/include/Poco/PDF/Page.h @@ -424,7 +424,7 @@ class PDF_API Page /// Returns current dash mode. void setDashMode(const PatternVec& pattern, int paramNo, int phase) const; - /// Sets teh dash mode. + /// Sets the dash mode. float getFlatness() const; /// Returns the current flatness. diff --git a/Util/include/Poco/Util/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h index 4ffcaf2945..a440468a4b 100644 --- a/Util/include/Poco/Util/LoggingConfigurator.h +++ b/Util/include/Poco/Util/LoggingConfigurator.h @@ -38,7 +38,7 @@ class Util_API LoggingConfigurator /// /// The LoggingConfigurator sets up and connects formatters, channels /// and loggers. To accomplish its work, the LoggingConfigurator relies on the - /// functionality provided by the LoggingFactory und LoggingRegistry classes. + /// functionality provided by the LoggingFactory and LoggingRegistry classes. /// /// The LoggingConfigurator expects all configuration data to be under a root /// property named "logging". diff --git a/Util/include/Poco/Util/Option.h b/Util/include/Poco/Util/Option.h index 66c23942de..92cc9584ce 100644 --- a/Util/include/Poco/Util/Option.h +++ b/Util/include/Poco/Util/Option.h @@ -60,7 +60,7 @@ class Util_API Option /// /// Option instances are value objects. /// - /// Typcally, after construction, an Option object is immediately + /// Typically, after construction, an Option object is immediately /// passed to an Options object. /// /// An Option object can be created by chaining the constructor diff --git a/XML/include/Poco/DOM/Document.h b/XML/include/Poco/DOM/Document.h index 407b372bf5..55a353952c 100644 --- a/XML/include/Poco/DOM/Document.h +++ b/XML/include/Poco/DOM/Document.h @@ -90,10 +90,10 @@ class XML_API Document: public AbstractContainerNode, public DocumentEvent /// Resumes all events suspended with suspendEvent(); bool eventsSuspended() const; - /// Returns true if events are suspeded. + /// Returns true if events are suspended. bool events() const; - /// Returns true if events are not suspeded. + /// Returns true if events are not suspended. const DocumentType* doctype() const; /// The Document Type Declaration (see DocumentType) associated with this document.