diff options
Diffstat (limited to 'vmime')
| -rw-r--r-- | vmime/charset.hpp | 2 | ||||
| -rw-r--r-- | vmime/exception.hpp | 22 | ||||
| -rw-r--r-- | vmime/net/imap/IMAPParser.hpp | 6 | ||||
| -rw-r--r-- | vmime/net/store.hpp | 4 | ||||
| -rw-r--r-- | vmime/platform.hpp (renamed from vmime/platformDependant.hpp) | 19 | ||||
| -rw-r--r-- | vmime/platforms/posix/posixHandler.hpp | 4 | ||||
| -rw-r--r-- | vmime/platforms/windows/windowsHandler.hpp | 4 | ||||
| -rw-r--r-- | vmime/utility/file.hpp | 4 | ||||
| -rw-r--r-- | vmime/utility/progressListener.hpp | 2 | ||||
| -rw-r--r-- | vmime/vmime.hpp | 2 |
10 files changed, 37 insertions, 32 deletions
diff --git a/vmime/charset.hpp b/vmime/charset.hpp index 84c40fb6..0dad075b 100644 --- a/vmime/charset.hpp +++ b/vmime/charset.hpp @@ -61,7 +61,7 @@ public: /** Returns the default charset used on the system. * - * This function simply calls <code>platformDependantHandler::getLocaleCharset()</code> + * This function simply calls <code>platformHandler::getLocaleCharset()</code> * and is provided for convenience. * * @return system default charset diff --git a/vmime/exception.hpp b/vmime/exception.hpp index 02980088..07caa8df 100644 --- a/vmime/exception.hpp +++ b/vmime/exception.hpp @@ -248,12 +248,12 @@ public: }; -class no_platform_dependant_handler : public vmime::exception +class no_platform_handler : public vmime::exception { public: - no_platform_dependant_handler(const exception& other = NO_EXCEPTION); - ~no_platform_dependant_handler() throw(); + no_platform_handler(const exception& other = NO_EXCEPTION); + ~no_platform_handler() throw(); exception* clone() const; const char* name() const throw(); @@ -655,16 +655,16 @@ public: ~command_error() throw(); /** Return the name of the command which have thrown the exception. - * This is protocol-dependant. + * This is protocol-dependent. * - * @return command name (protocol-dependant) + * @return command name (protocol-dependent) */ const string& command() const; /** Return the invalid response line. - * The meaning is protocol-dependant. + * The meaning is protocol-dependent. * - * @return response line (protocol-dependant) + * @return response line (protocol-dependent) */ const string& response() const; @@ -689,16 +689,16 @@ public: ~invalid_response() throw(); /** Return the name of the command which have thrown the exception. - * This is protocol-dependant. + * This is protocol-dependent. * - * @return command name (protocol-dependant) + * @return command name (protocol-dependent) */ const string& command() const; /** Return the invalid response line. - * The meaning is protocol-dependant. + * The meaning is protocol-dependent. * - * @return response line (protocol-dependant) + * @return response line (protocol-dependent) */ const string& response() const; diff --git a/vmime/net/imap/IMAPParser.hpp b/vmime/net/imap/IMAPParser.hpp index da812952..0b11f948 100644 --- a/vmime/net/imap/IMAPParser.hpp +++ b/vmime/net/imap/IMAPParser.hpp @@ -37,7 +37,7 @@ #include "vmime/encoderB64.hpp" #include "vmime/encoderQP.hpp" -#include "vmime/platformDependant.hpp" +#include "vmime/platform.hpp" #include "vmime/net/timeoutHandler.hpp" #include "vmime/net/socket.hpp" @@ -5092,7 +5092,7 @@ public: if (receiveBuffer.empty()) // buffer is empty { - platformDependant::getHandler()->wait(); + platform::getHandler()->wait(); continue; } @@ -5151,7 +5151,7 @@ public: if (receiveBuffer.empty()) // buffer is empty { - platformDependant::getHandler()->wait(); + platform::getHandler()->wait(); continue; } diff --git a/vmime/net/store.hpp b/vmime/net/store.hpp index b140c822..b2321e39 100644 --- a/vmime/net/store.hpp +++ b/vmime/net/store.hpp @@ -46,14 +46,14 @@ protected: public: - /** Return the default folder. This is protocol dependant + /** Return the default folder. This is protocol dependent * and usually is the INBOX folder. * * @return default folder */ virtual ref <folder> getDefaultFolder() = 0; - /** Return the root folder. This is protocol dependant + /** Return the root folder. This is protocol dependent * and usually is the user's mail drop root folder. * * @return root folder diff --git a/vmime/platformDependant.hpp b/vmime/platform.hpp index cd8a7ce2..a1ca60f8 100644 --- a/vmime/platformDependant.hpp +++ b/vmime/platform.hpp @@ -21,8 +21,8 @@ // the GNU General Public License cover the whole combination. // -#ifndef VMIME_PLATFORMDEPENDANT_HPP_INCLUDED -#define VMIME_PLATFORMDEPENDANT_HPP_INCLUDED +#ifndef VMIME_PLATFORM_HPP_INCLUDED +#define VMIME_PLATFORM_HPP_INCLUDED #include "vmime/config.hpp" @@ -48,12 +48,12 @@ namespace vmime /** Allow setting or getting the current platform handler. */ -class platformDependant +class platform { public: - /** Handles all platform-dependant operations. It offers an interface to - * access platform-dependant objects: sockets, date/time, file system, etc. + /** Handles all platform-dependent operations. It offers an interface to + * access platform-dependent objects: sockets, date/time, file system, etc. */ class handler : public object @@ -138,7 +138,7 @@ public: static ref <const handler> getHandler() { if (!sm_handler) - throw exceptions::no_platform_dependant_handler(); + throw exceptions::no_platform_handler(); return (sm_handler); } @@ -149,7 +149,12 @@ private: }; +/** Compatibility with older versions of VMime (before 0.8.1). */ +typedef platform platformDependant; + + } // vmime -#endif // VMIME_PLATFORMDEPENDANT_HPP_INCLUDED +#endif // VMIME_PLATFORM_HPP_INCLUDED + diff --git a/vmime/platforms/posix/posixHandler.hpp b/vmime/platforms/posix/posixHandler.hpp index 0f9969d7..0a5ad843 100644 --- a/vmime/platforms/posix/posixHandler.hpp +++ b/vmime/platforms/posix/posixHandler.hpp @@ -26,7 +26,7 @@ #include "vmime/config.hpp" -#include "vmime/platformDependant.hpp" +#include "vmime/platform.hpp" #if VMIME_HAVE_MESSAGING_FEATURES #include "vmime/platforms/posix/posixSocket.hpp" @@ -43,7 +43,7 @@ namespace platforms { namespace posix { -class posixHandler : public vmime::platformDependant::handler +class posixHandler : public vmime::platform::handler { public: diff --git a/vmime/platforms/windows/windowsHandler.hpp b/vmime/platforms/windows/windowsHandler.hpp index 741f0a9d..170325a2 100644 --- a/vmime/platforms/windows/windowsHandler.hpp +++ b/vmime/platforms/windows/windowsHandler.hpp @@ -26,7 +26,7 @@ #include "vmime/config.hpp" -#include "vmime/platformDependant.hpp" +#include "vmime/platform.hpp" #if VMIME_HAVE_MESSAGING_FEATURES #include "vmime/platforms/windows/windowsSocket.hpp" @@ -42,7 +42,7 @@ namespace platforms { namespace windows { -class windowsHandler : public vmime::platformDependant::handler +class windowsHandler : public vmime::platform::handler { public: diff --git a/vmime/utility/file.hpp b/vmime/utility/file.hpp index f68fc8ae..142827b2 100644 --- a/vmime/utility/file.hpp +++ b/vmime/utility/file.hpp @@ -229,12 +229,12 @@ public: /** Parse a path contained in a string. * - * @param str string containing a path in a system-dependant representation + * @param str string containing a path in a system-dependent representation * @return path object (abstract representation) */ virtual const file::path stringToPath(const string& str) const = 0; - /** Return the system-dependant string representation for the specified path. + /** Return the system-dependent string representation for the specified path. * * @param path abstract representation of the path * @return string representation of the path diff --git a/vmime/utility/progressListener.hpp b/vmime/utility/progressListener.hpp index cd4e36e6..168b5663 100644 --- a/vmime/utility/progressListener.hpp +++ b/vmime/utility/progressListener.hpp @@ -43,7 +43,7 @@ public: /** Allow the caller object to cancel the current operation. * - * @warning WARNING: this is implementation-dependant: cancelling + * @warning WARNING: this is implementation-dependent: cancelling * may not be supported by the notifier object. * * @return true to cancel the operation, false otherwise diff --git a/vmime/vmime.hpp b/vmime/vmime.hpp index a31ba428..2c0d2546 100644 --- a/vmime/vmime.hpp +++ b/vmime/vmime.hpp @@ -32,7 +32,7 @@ #include "vmime/base.hpp" #include "vmime/exception.hpp" #include "vmime/options.hpp" -#include "vmime/platformDependant.hpp" +#include "vmime/platform.hpp" // Base components #include "vmime/dateTime.hpp" |