From 968dfe77dc4ef9b55be01a9ead5028937c3e6cd4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=BCnter=20Obiltschnig?= Date: Fri, 1 Sep 2017 20:54:11 +0200 Subject: [PATCH] fixed typos and style --- Foundation/include/Poco/NumericString.h | 6 +++--- Util/include/Poco/Util/AbstractConfiguration.h | 2 +- Util/include/Poco/Util/LoggingConfigurator.h | 2 +- Util/include/Poco/Util/Option.h | 2 +- Util/include/Poco/Util/Timer.h | 2 +- Util/include/Poco/Util/Util.h | 2 +- Util/include/Poco/Util/WinRegistryConfiguration.h | 4 ++-- Util/src/WinRegistryKey.cpp | 6 +++--- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Foundation/include/Poco/NumericString.h b/Foundation/include/Poco/NumericString.h index 0ad3d2e64..c81569a38 100644 --- a/Foundation/include/Poco/NumericString.h +++ b/Foundation/include/Poco/NumericString.h @@ -83,7 +83,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; @@ -540,7 +540,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); @@ -553,7 +553,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. } // namespace Poco diff --git a/Util/include/Poco/Util/AbstractConfiguration.h b/Util/include/Poco/Util/AbstractConfiguration.h index d1e746793..49e92b9e1 100644 --- a/Util/include/Poco/Util/AbstractConfiguration.h +++ b/Util/include/Poco/Util/AbstractConfiguration.h @@ -302,7 +302,7 @@ public: /// 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/LoggingConfigurator.h b/Util/include/Poco/Util/LoggingConfigurator.h index 4ffcaf294..a440468a4 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 66c23942d..92cc9584c 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/Util/include/Poco/Util/Timer.h b/Util/include/Poco/Util/Timer.h index c86a96c05..207d26b75 100644 --- a/Util/include/Poco/Util/Timer.h +++ b/Util/include/Poco/Util/Timer.h @@ -40,7 +40,7 @@ class Util_API Timer: protected Poco::Runnable /// sequentially. Therefore, tasks should complete their work as quickly /// as possible, otherwise subsequent tasks may be delayed. /// - /// Timer is save for multithreaded use - multiple threads can schedule + /// Timer is safe for multithreaded use - multiple threads can schedule /// new tasks simultaneously. /// /// Acknowledgement: The interface of this class has been inspired by diff --git a/Util/include/Poco/Util/Util.h b/Util/include/Poco/Util/Util.h index 2cb66471c..e06f92dff 100644 --- a/Util/include/Poco/Util/Util.h +++ b/Util/include/Poco/Util/Util.h @@ -30,7 +30,7 @@ // from a DLL simpler. All files within this DLL are compiled with the Util_EXPORTS // symbol defined on the command line. this symbol should not be defined on any project // that uses this DLL. This way any other project whose source files include this file see -// Util_API functions as being imported from a DLL, wheras this DLL sees symbols +// Util_API functions as being imported from a DLL, whereas this DLL sees symbols // defined with this macro as being exported. // #if defined(_WIN32) && defined(POCO_DLL) diff --git a/Util/include/Poco/Util/WinRegistryConfiguration.h b/Util/include/Poco/Util/WinRegistryConfiguration.h index fbbbd0071..64bc8cc7f 100644 --- a/Util/include/Poco/Util/WinRegistryConfiguration.h +++ b/Util/include/Poco/Util/WinRegistryConfiguration.h @@ -41,8 +41,8 @@ public: /// 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. diff --git a/Util/src/WinRegistryKey.cpp b/Util/src/WinRegistryKey.cpp index 3cafe424c..1d2673215 100644 --- a/Util/src/WinRegistryKey.cpp +++ b/Util/src/WinRegistryKey.cpp @@ -194,13 +194,13 @@ std::string WinRegistryKey::getStringExpand(const std::string& name) throw NotFoundException(key(name)); if (size > 0) { - Poco::Buffer Buffer(size + 1); - RegQueryValueExA(_hKey, name.c_str(), NULL, NULL, (BYTE*) Buffer.begin(), &size); + Poco::Buffer buffer(size + 1); + RegQueryValueExA(_hKey, name.c_str(), NULL, NULL, (BYTE*) buffer.begin(), &size); buffer[size] = 0; char temp; DWORD expSize = ExpandEnvironmentStringsA(buffer, &temp, 1); Poco::Buffer expBuffer(expSize); - ExpandEnvironmentStringsA(Buffer.begin(), expBuffer.begin(), expSize); + ExpandEnvironmentStringsA(buffer.begin(), expBuffer.begin(), expSize); std::string result(expBuffer.begin()); return result; }