diff options
Diffstat (limited to 'src/net')
27 files changed, 113 insertions, 111 deletions
diff --git a/src/net/defaultConnectionInfos.cpp b/src/net/defaultConnectionInfos.cpp index 97d1a7f7..ee706a34 100644 --- a/src/net/defaultConnectionInfos.cpp +++ b/src/net/defaultConnectionInfos.cpp @@ -40,7 +40,7 @@ const string defaultConnectionInfos::getHost() const } -const port_t defaultConnectionInfos::getPort() const +port_t defaultConnectionInfos::getPort() const { return m_port; } diff --git a/src/net/events.cpp b/src/net/events.cpp index 69fbc336..a6674a79 100644 --- a/src/net/events.cpp +++ b/src/net/events.cpp @@ -46,7 +46,7 @@ messageCountEvent::messageCountEvent ref <folder> messageCountEvent::getFolder() const { return (m_folder); } -const messageCountEvent::Types messageCountEvent::getType() const { return (m_type); } +messageCountEvent::Types messageCountEvent::getType() const { return (m_type); } const std::vector <int>& messageCountEvent::getNumbers() const { return (m_nums); } @@ -73,7 +73,7 @@ messageChangedEvent::messageChangedEvent ref <folder> messageChangedEvent::getFolder() const { return (m_folder); } -const messageChangedEvent::Types messageChangedEvent::getType() const { return (m_type); } +messageChangedEvent::Types messageChangedEvent::getType() const { return (m_type); } const std::vector <int>& messageChangedEvent::getNumbers() const { return (m_nums); } @@ -96,7 +96,7 @@ folderEvent::folderEvent ref <folder> folderEvent::getFolder() const { return (m_folder); } -const folderEvent::Types folderEvent::getType() const { return (m_type); } +folderEvent::Types folderEvent::getType() const { return (m_type); } void folderEvent::dispatch(folderListener* listener) const diff --git a/src/net/imap/IMAPConnection.cpp b/src/net/imap/IMAPConnection.cpp index 69ef337d..7c78b788 100644 --- a/src/net/imap/IMAPConnection.cpp +++ b/src/net/imap/IMAPConnection.cpp @@ -531,14 +531,14 @@ ref <security::authenticator> IMAPConnection::getAuthenticator() } -const bool IMAPConnection::isConnected() const +bool IMAPConnection::isConnected() const { return (m_socket && m_socket->isConnected() && (m_state == STATE_AUTHENTICATED || m_state == STATE_SELECTED)); } -const bool IMAPConnection::isSecuredConnection() const +bool IMAPConnection::isSecuredConnection() const { return m_secured; } @@ -670,7 +670,7 @@ IMAPParser::response* IMAPConnection::readResponse(IMAPParser::literalHandler* l } -const IMAPConnection::ProtocolStates IMAPConnection::state() const +IMAPConnection::ProtocolStates IMAPConnection::state() const { return (m_state); } @@ -681,7 +681,8 @@ void IMAPConnection::setState(const ProtocolStates state) m_state = state; } -const char IMAPConnection::hierarchySeparator() const + +char IMAPConnection::hierarchySeparator() const { return (m_hierarchySeparator); } diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp index daf20918..2130211c 100644 --- a/src/net/imap/IMAPFolder.cpp +++ b/src/net/imap/IMAPFolder.cpp @@ -71,7 +71,7 @@ IMAPFolder::~IMAPFolder() } -const int IMAPFolder::getMode() const +int IMAPFolder::getMode() const { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -80,7 +80,7 @@ const int IMAPFolder::getMode() const } -const int IMAPFolder::getType() +int IMAPFolder::getType() { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -100,7 +100,7 @@ const int IMAPFolder::getType() } -const int IMAPFolder::getFlags() +int IMAPFolder::getFlags() { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -412,7 +412,7 @@ void IMAPFolder::destroy() } -const bool IMAPFolder::exists() +bool IMAPFolder::exists() { ref <IMAPStore> store = m_store.acquire(); @@ -423,7 +423,7 @@ const bool IMAPFolder::exists() } -const int IMAPFolder::testExistAndGetType() +int IMAPFolder::testExistAndGetType() { m_type = TYPE_UNDEFINED; @@ -495,7 +495,7 @@ const int IMAPFolder::testExistAndGetType() } -const bool IMAPFolder::isOpen() const +bool IMAPFolder::isOpen() const { return (m_open); } @@ -548,7 +548,7 @@ std::vector <ref <message> > IMAPFolder::getMessages(const std::vector <int>& nu } -const int IMAPFolder::getMessageCount() +int IMAPFolder::getMessageCount() { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -761,7 +761,7 @@ void IMAPFolder::fetchMessage(ref <message> msg, const int options) } -const int IMAPFolder::getFetchCapabilities() const +int IMAPFolder::getFetchCapabilities() const { return (FETCH_ENVELOPE | FETCH_CONTENT_INFO | FETCH_STRUCTURE | FETCH_FLAGS | FETCH_SIZE | FETCH_FULL_HEADER | FETCH_UID | diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp index 8e4bcc40..90bebf39 100644 --- a/src/net/imap/IMAPMessage.cpp +++ b/src/net/imap/IMAPMessage.cpp @@ -30,6 +30,7 @@ #include <sstream> #include <iterator> +#include <typeinfo> namespace vmime { @@ -60,8 +61,8 @@ public: ref <const IMAPpart> getParent() const { return m_parent.acquire(); } const mediaType& getType() const { return (m_mediaType); } - const int getSize() const { return (m_size); } - const int getNumber() const { return (m_number); } + int getSize() const { return (m_size); } + int getNumber() const { return (m_number); } ref <const header> getHeader() const { @@ -149,7 +150,7 @@ public: return m_parts[x]; } - const int getPartCount() const + int getPartCount() const { return m_parts.size(); } @@ -299,7 +300,7 @@ void IMAPMessage::onFolderClosed() } -const int IMAPMessage::getNumber() const +int IMAPMessage::getNumber() const { return (m_num); } @@ -311,7 +312,7 @@ const message::uid IMAPMessage::getUniqueId() const } -const int IMAPMessage::getSize() const +int IMAPMessage::getSize() const { if (m_size == -1) throw exceptions::unfetched_object(); @@ -320,13 +321,13 @@ const int IMAPMessage::getSize() const } -const bool IMAPMessage::isExpunged() const +bool IMAPMessage::isExpunged() const { return (m_expunged); } -const int IMAPMessage::getFlags() const +int IMAPMessage::getFlags() const { if (m_flags == FLAG_UNDEFINED) throw exceptions::unfetched_object(); diff --git a/src/net/imap/IMAPStore.cpp b/src/net/imap/IMAPStore.cpp index 53fa9e80..753adc65 100644 --- a/src/net/imap/IMAPStore.cpp +++ b/src/net/imap/IMAPStore.cpp @@ -91,7 +91,7 @@ ref <folder> IMAPStore::getFolder(const folder::path& path) } -const bool IMAPStore::isValidFolderName(const folder::path::component& /* name */) const +bool IMAPStore::isValidFolderName(const folder::path::component& /* name */) const { return true; } @@ -117,19 +117,19 @@ void IMAPStore::connect() } -const bool IMAPStore::isConnected() const +bool IMAPStore::isConnected() const { return (m_connection && m_connection->isConnected()); } -const bool IMAPStore::isIMAPS() const +bool IMAPStore::isIMAPS() const { return m_isIMAPS; } -const bool IMAPStore::isSecuredConnection() const +bool IMAPStore::isSecuredConnection() const { if (m_connection == NULL) return false; @@ -203,7 +203,7 @@ void IMAPStore::unregisterFolder(IMAPFolder* folder) } -const int IMAPStore::getCapabilities() const +int IMAPStore::getCapabilities() const { return (CAPABILITY_CREATE_FOLDER | CAPABILITY_RENAME_FOLDER | diff --git a/src/net/imap/IMAPTag.cpp b/src/net/imap/IMAPTag.cpp index 87902c30..7b8ce3fc 100644 --- a/src/net/imap/IMAPTag.cpp +++ b/src/net/imap/IMAPTag.cpp @@ -74,7 +74,7 @@ const IMAPTag IMAPTag::operator++(int) } -const int IMAPTag::number() const +int IMAPTag::number() const { return (m_number); } @@ -92,9 +92,9 @@ void IMAPTag::generate() "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ"; m_tag[0] = prefixChars[m_number / 1000]; - m_tag[1] = '0' + (m_number % 1000) / 100; - m_tag[2] = '0' + (m_number % 100) / 10; - m_tag[3] = '0' + (m_number % 10); + m_tag[1] = static_cast <char>('0' + (m_number % 1000) / 100); + m_tag[2] = static_cast <char>('0' + (m_number % 100) / 10); + m_tag[3] = static_cast <char>('0' + m_number % 10); } diff --git a/src/net/imap/IMAPUtils.cpp b/src/net/imap/IMAPUtils.cpp index 98157ae8..18ca00cb 100644 --- a/src/net/imap/IMAPUtils.cpp +++ b/src/net/imap/IMAPUtils.cpp @@ -272,7 +272,7 @@ const string IMAPUtils::toModifiedUTF7 base64 = false; } - out += ch; + out += static_cast <string::value_type>(ch); if (ch == '&') out += '-'; @@ -358,7 +358,7 @@ const folder::path::component IMAPUtils::fromModifiedUTF7(const string& text) } -const int IMAPUtils::folderTypeFromFlags(const IMAPParser::mailbox_flag_list* list) +int IMAPUtils::folderTypeFromFlags(const IMAPParser::mailbox_flag_list* list) { // Get folder type int type = folder::TYPE_CONTAINS_MESSAGES | folder::TYPE_CONTAINS_FOLDERS; @@ -378,7 +378,7 @@ const int IMAPUtils::folderTypeFromFlags(const IMAPParser::mailbox_flag_list* li } -const int IMAPUtils::folderFlagsFromFlags(const IMAPParser::mailbox_flag_list* list) +int IMAPUtils::folderFlagsFromFlags(const IMAPParser::mailbox_flag_list* list) { // Get folder flags int folderFlags = folder::FLAG_CHILDREN; @@ -397,7 +397,7 @@ const int IMAPUtils::folderFlagsFromFlags(const IMAPParser::mailbox_flag_list* l } -const int IMAPUtils::messageFlagsFromFlags(const IMAPParser::flag_list* list) +int IMAPUtils::messageFlagsFromFlags(const IMAPParser::flag_list* list) { const std::vector <IMAPParser::flag*>& flagList = list->flags(); int flags = 0; diff --git a/src/net/maildir/format/courierMaildirFormat.cpp b/src/net/maildir/format/courierMaildirFormat.cpp index 82a3b188..1118c279 100644 --- a/src/net/maildir/format/courierMaildirFormat.cpp +++ b/src/net/maildir/format/courierMaildirFormat.cpp @@ -132,7 +132,7 @@ void courierMaildirFormat::renameFolderImpl } -const bool courierMaildirFormat::folderExists(const folder::path& path) const +bool courierMaildirFormat::folderExists(const folder::path& path) const { utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory(); @@ -164,7 +164,7 @@ const bool courierMaildirFormat::folderExists(const folder::path& path) const } -const bool courierMaildirFormat::folderHasSubfolders(const folder::path& path) const +bool courierMaildirFormat::folderHasSubfolders(const folder::path& path) const { std::vector <string> dirs; return listDirectories(path, dirs, true); @@ -251,7 +251,7 @@ const std::vector <folder::path> courierMaildirFormat::listFolders } -const bool courierMaildirFormat::listDirectories(const folder::path& root, +bool courierMaildirFormat::listDirectories(const folder::path& root, std::vector <string>& dirs, const bool onlyTestForExistence) const { utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory(); @@ -304,7 +304,7 @@ const bool courierMaildirFormat::listDirectories(const folder::path& root, // static -const bool courierMaildirFormat::isSubfolderDirectory(const utility::file& file) +bool courierMaildirFormat::isSubfolderDirectory(const utility::file& file) { // A directory which names starts with '.' may be a subfolder if (file.isDirectory() && @@ -494,7 +494,7 @@ const folder::path::component courierMaildirFormat::fromModifiedUTF7(const strin } -const bool courierMaildirFormat::supports() const +bool courierMaildirFormat::supports() const { utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory(); diff --git a/src/net/maildir/format/kmailMaildirFormat.cpp b/src/net/maildir/format/kmailMaildirFormat.cpp index c6293ace..eeedd416 100644 --- a/src/net/maildir/format/kmailMaildirFormat.cpp +++ b/src/net/maildir/format/kmailMaildirFormat.cpp @@ -85,7 +85,7 @@ void kmailMaildirFormat::destroyFolder(const folder::path& path) } -const bool kmailMaildirFormat::folderExists(const folder::path& path) const +bool kmailMaildirFormat::folderExists(const folder::path& path) const { utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory(); @@ -210,7 +210,7 @@ void kmailMaildirFormat::listFoldersImpl // static -const bool kmailMaildirFormat::isSubfolderDirectory(const utility::file& file) +bool kmailMaildirFormat::isSubfolderDirectory(const utility::file& file) { // A directory which name does not start with '.' is listed as a sub-folder if (file.isDirectory() && @@ -275,7 +275,7 @@ void kmailMaildirFormat::renameFolder(const folder::path& oldPath, const folder: } -const bool kmailMaildirFormat::folderHasSubfolders(const folder::path& path) const +bool kmailMaildirFormat::folderHasSubfolders(const folder::path& path) const { utility::fileSystemFactory* fsf = platform::getHandler()->getFileSystemFactory(); @@ -296,7 +296,7 @@ const bool kmailMaildirFormat::folderHasSubfolders(const folder::path& path) con } -const bool kmailMaildirFormat::supports() const +bool kmailMaildirFormat::supports() const { // This is the default return true; diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp index 4f5903e2..4f0acaf3 100644 --- a/src/net/maildir/maildirFolder.cpp +++ b/src/net/maildir/maildirFolder.cpp @@ -74,7 +74,7 @@ void maildirFolder::onStoreDisconnected() } -const int maildirFolder::getMode() const +int maildirFolder::getMode() const { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -83,7 +83,7 @@ const int maildirFolder::getMode() const } -const int maildirFolder::getType() +int maildirFolder::getType() { if (m_path.isEmpty()) return (TYPE_CONTAINS_FOLDERS); @@ -92,7 +92,7 @@ const int maildirFolder::getType() } -const int maildirFolder::getFlags() +int maildirFolder::getFlags() { int flags = 0; @@ -241,7 +241,7 @@ void maildirFolder::destroy() } -const bool maildirFolder::exists() +bool maildirFolder::exists() { ref <maildirStore> store = m_store.acquire(); @@ -249,7 +249,7 @@ const bool maildirFolder::exists() } -const bool maildirFolder::isOpen() const +bool maildirFolder::isOpen() const { return (m_open); } @@ -441,7 +441,7 @@ std::vector <ref <message> > maildirFolder::getMessages(const std::vector <int>& } -const int maildirFolder::getMessageCount() +int maildirFolder::getMessageCount() { return (m_messageCount); } @@ -1339,7 +1339,7 @@ void maildirFolder::fetchMessage(ref <message> msg, const int options) } -const int maildirFolder::getFetchCapabilities() const +int maildirFolder::getFetchCapabilities() const { return (FETCH_ENVELOPE | FETCH_STRUCTURE | FETCH_CONTENT_INFO | FETCH_FLAGS | FETCH_SIZE | FETCH_FULL_HEADER | FETCH_UID | diff --git a/src/net/maildir/maildirMessage.cpp b/src/net/maildir/maildirMessage.cpp index 3ed42ba6..1ae83eed 100644 --- a/src/net/maildir/maildirMessage.cpp +++ b/src/net/maildir/maildirMessage.cpp @@ -57,8 +57,8 @@ public: weak_ref <const maildirPart> getParent() const { return (m_parent); } const mediaType& getType() const { return (m_mediaType); } - const int getSize() const { return (m_size); } - const int getNumber() const { return (m_number); } + int getSize() const { return (m_size); } + int getNumber() const { return (m_number); } ref <const header> getHeader() const { @@ -76,11 +76,11 @@ public: return (*(m_header = vmime::create <header>())); } - const int getHeaderParsedOffset() const { return (m_headerParsedOffset); } - const int getHeaderParsedLength() const { return (m_headerParsedLength); } + int getHeaderParsedOffset() const { return (m_headerParsedOffset); } + int getHeaderParsedLength() const { return (m_headerParsedLength); } - const int getBodyParsedOffset() const { return (m_bodyParsedOffset); } - const int getBodyParsedLength() const { return (m_bodyParsedLength); } + int getBodyParsedOffset() const { return (m_bodyParsedOffset); } + int getBodyParsedLength() const { return (m_bodyParsedLength); } void initStructure(const bodyPart& part); @@ -145,7 +145,7 @@ public: return m_parts[x]; } - const int getPartCount() const + int getPartCount() const { return m_parts.size(); } @@ -247,7 +247,7 @@ void maildirMessage::onFolderClosed() } -const int maildirMessage::getNumber() const +int maildirMessage::getNumber() const { return (m_num); } @@ -259,7 +259,7 @@ const message::uid maildirMessage::getUniqueId() const } -const int maildirMessage::getSize() const +int maildirMessage::getSize() const { if (m_size == -1) throw exceptions::unfetched_object(); @@ -268,7 +268,7 @@ const int maildirMessage::getSize() const } -const bool maildirMessage::isExpunged() const +bool maildirMessage::isExpunged() const { return (m_expunged); } @@ -301,7 +301,7 @@ ref <const header> maildirMessage::getHeader() const } -const int maildirMessage::getFlags() const +int maildirMessage::getFlags() const { if (m_flags == FLAG_UNDEFINED) throw exceptions::unfetched_object(); diff --git a/src/net/maildir/maildirStore.cpp b/src/net/maildir/maildirStore.cpp index 746cd099..8e4e0029 100644 --- a/src/net/maildir/maildirStore.cpp +++ b/src/net/maildir/maildirStore.cpp @@ -104,7 +104,7 @@ ref <folder> maildirStore::getFolder(const folder::path& path) } -const bool maildirStore::isValidFolderName(const folder::path::component& name) const +bool maildirStore::isValidFolderName(const folder::path::component& name) const { if (!platform::getHandler()->getFileSystemFactory()->isValidPathComponent(name)) return false; @@ -157,13 +157,13 @@ void maildirStore::connect() } -const bool maildirStore::isConnected() const +bool maildirStore::isConnected() const { return (m_connected); } -const bool maildirStore::isSecuredConnection() const +bool maildirStore::isSecuredConnection() const { return false; } @@ -171,7 +171,7 @@ const bool maildirStore::isSecuredConnection() const ref <connectionInfos> maildirStore::getConnectionInfos() const { - return vmime::create <defaultConnectionInfos>("localhost", 0); + return vmime::create <defaultConnectionInfos>("localhost", static_cast <port_t>(0)); } @@ -226,7 +226,7 @@ const utility::path& maildirStore::getFileSystemPath() const } -const int maildirStore::getCapabilities() const +int maildirStore::getCapabilities() const { return (CAPABILITY_CREATE_FOLDER | CAPABILITY_RENAME_FOLDER | diff --git a/src/net/maildir/maildirUtils.cpp b/src/net/maildir/maildirUtils.cpp index cd688b08..67d52fe6 100644 --- a/src/net/maildir/maildirUtils.cpp +++ b/src/net/maildir/maildirUtils.cpp @@ -34,7 +34,7 @@ namespace net { namespace maildir { -const bool maildirUtils::isMessageFile(const utility::file& file) +bool maildirUtils::isMessageFile(const utility::file& file) { // Ignore files which name begins with '.' if (file.isFile() && @@ -77,7 +77,7 @@ const utility::file::path::component maildirUtils::extractId } -const int maildirUtils::extractFlags(const utility::file::path::component& comp) +int maildirUtils::extractFlags(const utility::file::path::component& comp) { string::size_type sep = comp.getBuffer().rfind(':'); // try colon @@ -208,7 +208,7 @@ maildirUtils::messageIdComparator::messageIdComparator } -const bool maildirUtils::messageIdComparator::operator() +bool maildirUtils::messageIdComparator::operator() (const utility::file::path::component& other) const { return (m_comp == maildirUtils::extractId(other)); diff --git a/src/net/message.cpp b/src/net/message.cpp index f1a231a9..37f020b3 100644 --- a/src/net/message.cpp +++ b/src/net/message.cpp @@ -40,7 +40,7 @@ ref <part> part::getPartAt(const int pos) } -const int part::getPartCount() const +int part::getPartCount() const { return getStructure()->getPartCount(); } diff --git a/src/net/pop3/POP3Folder.cpp b/src/net/pop3/POP3Folder.cpp index 0b20878d..ba70f2b1 100644 --- a/src/net/pop3/POP3Folder.cpp +++ b/src/net/pop3/POP3Folder.cpp @@ -63,7 +63,7 @@ POP3Folder::~POP3Folder() } -const int POP3Folder::getMode() const +int POP3Folder::getMode() const { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -72,7 +72,7 @@ const int POP3Folder::getMode() const } -const int POP3Folder::getType() +int POP3Folder::getType() { if (!isOpen()) throw exceptions::illegal_state("Folder not open"); @@ -86,7 +86,7 @@ const int POP3Folder::getType() } -const int POP3Folder::getFlags() +int POP3Folder::getFlags() { return (0); } @@ -194,7 +194,7 @@ void POP3Folder::destroy() } -const bool POP3Folder::exists() +bool POP3Folder::exists() { ref <POP3Store> store = m_store.acquire(); @@ -205,7 +205,7 @@ const bool POP3Folder::exists() } -const bool POP3Folder::isOpen() const +bool POP3Folder::isOpen() const { return (m_open); } @@ -273,7 +273,7 @@ std::vector <ref <message> > POP3Folder::getMessages(const std::vector <int>& nu } -const int POP3Folder::getMessageCount() +int POP3Folder::getMessageCount() { ref <POP3Store> store = m_store.acquire(); @@ -517,7 +517,7 @@ void POP3Folder::fetchMessage(ref <message> msg, const int options) } -const int POP3Folder::getFetchCapabilities() const +int POP3Folder::getFetchCapabilities() const { return (FETCH_ENVELOPE | FETCH_CONTENT_INFO | FETCH_SIZE | FETCH_FULL_HEADER | FETCH_UID | diff --git a/src/net/pop3/POP3Message.cpp b/src/net/pop3/POP3Message.cpp index ace7d7c8..6cdd4557 100644 --- a/src/net/pop3/POP3Message.cpp +++ b/src/net/pop3/POP3Message.cpp @@ -55,7 +55,7 @@ void POP3Message::onFolderClosed() } -const int POP3Message::getNumber() const +int POP3Message::getNumber() const { return (m_num); } @@ -67,7 +67,7 @@ const message::uid POP3Message::getUniqueId() const } -const int POP3Message::getSize() const +int POP3Message::getSize() const { if (m_size == -1) throw exceptions::unfetched_object(); @@ -76,13 +76,13 @@ const int POP3Message::getSize() const } -const bool POP3Message::isExpunged() const +bool POP3Message::isExpunged() const { return (false); } -const int POP3Message::getFlags() const +int POP3Message::getFlags() const { int flags = FLAG_RECENT; diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp index 08f3c40b..16a5dff4 100644 --- a/src/net/pop3/POP3Store.cpp +++ b/src/net/pop3/POP3Store.cpp @@ -119,7 +119,7 @@ ref <folder> POP3Store::getFolder(const folder::path& path) } -const bool POP3Store::isValidFolderName(const folder::path::component& /* name */) const +bool POP3Store::isValidFolderName(const folder::path::component& /* name */) const { return true; } @@ -572,13 +572,13 @@ void POP3Store::startTLS() #endif // VMIME_HAVE_TLS_SUPPORT -const bool POP3Store::isConnected() const +bool POP3Store::isConnected() const { return (m_socket && m_socket->isConnected() && m_authentified); } -const bool POP3Store::isSecuredConnection() const +bool POP3Store::isSecuredConnection() const { return m_secured; } @@ -666,13 +666,13 @@ const std::vector <string> POP3Store::getCapabilities() } -const bool POP3Store::isSuccessResponse(const string& buffer) +bool POP3Store::isSuccessResponse(const string& buffer) { return getResponseCode(buffer) == RESPONSE_OK; } -const bool POP3Store::stripFirstLine(const string& buffer, string& result, string* firstLine) +bool POP3Store::stripFirstLine(const string& buffer, string& result, string* firstLine) { const string::size_type end = buffer.find('\n'); @@ -690,7 +690,7 @@ const bool POP3Store::stripFirstLine(const string& buffer, string& result, strin } -const int POP3Store::getResponseCode(const string& buffer) +int POP3Store::getResponseCode(const string& buffer) { if (buffer.length() >= 2) { @@ -805,7 +805,7 @@ void POP3Store::readResponse(string& buffer, const bool multiLine, } last1 = receiveBuffer[receiveBuffer.length() - 1]; - last2 = (receiveBuffer.length() >= 2) ? receiveBuffer[receiveBuffer.length() - 2] : 0; + last2 = static_cast <char>((receiveBuffer.length() >= 2) ? receiveBuffer[receiveBuffer.length() - 2] : 0); // Append the data to the response buffer buffer += receiveBuffer; @@ -926,7 +926,7 @@ void POP3Store::readResponse(utility::outputStream& os, } -const bool POP3Store::checkTerminator(string& buffer, const bool multiLine) +bool POP3Store::checkTerminator(string& buffer, const bool multiLine) { // Multi-line response if (multiLine) @@ -951,7 +951,7 @@ const bool POP3Store::checkTerminator(string& buffer, const bool multiLine) } -const bool POP3Store::checkOneTerminator(string& buffer, const string& term) +bool POP3Store::checkOneTerminator(string& buffer, const string& term) { if (buffer.length() >= term.length() && std::equal(buffer.end() - term.length(), buffer.end(), term.begin())) @@ -977,7 +977,7 @@ void POP3Store::unregisterFolder(POP3Folder* folder) } -const int POP3Store::getCapabilities() const +int POP3Store::getCapabilities() const { return (CAPABILITY_DELETE_MESSAGE); } diff --git a/src/net/sendmail/sendmailTransport.cpp b/src/net/sendmail/sendmailTransport.cpp index fdd6e9ba..c1aded62 100644 --- a/src/net/sendmail/sendmailTransport.cpp +++ b/src/net/sendmail/sendmailTransport.cpp @@ -92,13 +92,13 @@ void sendmailTransport::connect() } -const bool sendmailTransport::isConnected() const +bool sendmailTransport::isConnected() const { return (m_connected); } -const bool sendmailTransport::isSecuredConnection() const +bool sendmailTransport::isSecuredConnection() const { return false; } @@ -106,7 +106,7 @@ const bool sendmailTransport::isSecuredConnection() const ref <connectionInfos> sendmailTransport::getConnectionInfos() const { - return vmime::create <defaultConnectionInfos>("localhost", 0); + return vmime::create <defaultConnectionInfos>("localhost", static_cast <port_t>(0)); } diff --git a/src/net/serviceFactory.cpp b/src/net/serviceFactory.cpp index 49c6a50b..0abeeb39 100644 --- a/src/net/serviceFactory.cpp +++ b/src/net/serviceFactory.cpp @@ -100,7 +100,7 @@ ref <const serviceFactory::registeredService> serviceFactory::getServiceByProtoc } -const int serviceFactory::getServiceCount() const +int serviceFactory::getServiceCount() const { return (m_services.size()); } diff --git a/src/net/serviceInfos.cpp b/src/net/serviceInfos.cpp index 01547a14..d6aee298 100644 --- a/src/net/serviceInfos.cpp +++ b/src/net/serviceInfos.cpp @@ -79,7 +79,7 @@ serviceInfos::~serviceInfos() } -const bool serviceInfos::hasProperty(ref <session> s, const property& p) const +bool serviceInfos::hasProperty(ref <session> s, const property& p) const { return s->getProperties().hasProperty(getPropertyPrefix() + p.getName()); } @@ -141,13 +141,13 @@ const string& serviceInfos::property::getDefaultValue() const } -const serviceInfos::property::Types serviceInfos::property::getType() const +serviceInfos::property::Types serviceInfos::property::getType() const { return (m_type); } -const int serviceInfos::property::getFlags() const +int serviceInfos::property::getFlags() const { return (m_flags); } diff --git a/src/net/serviceRegistration.inl b/src/net/serviceRegistration.inl index 2d7f1888..75fa4358 100644 --- a/src/net/serviceRegistration.inl +++ b/src/net/serviceRegistration.inl @@ -58,7 +58,7 @@ public: return (m_name); } - const int getType() const + int getType() const { return (m_type); } diff --git a/src/net/smtp/SMTPResponse.cpp b/src/net/smtp/SMTPResponse.cpp index 17d5d0c9..24301c57 100644 --- a/src/net/smtp/SMTPResponse.cpp +++ b/src/net/smtp/SMTPResponse.cpp @@ -49,7 +49,7 @@ SMTPResponse::SMTPResponse(const SMTPResponse&) } -const int SMTPResponse::getCode() const +int SMTPResponse::getCode() const { const int firstCode = m_lines[0].getCode(); @@ -179,7 +179,7 @@ const SMTPResponse::responseLine SMTPResponse::getNextResponse() // static -const int SMTPResponse::extractResponseCode(const string& response) +int SMTPResponse::extractResponseCode(const string& response) { int code = 0; @@ -200,7 +200,7 @@ const SMTPResponse::responseLine SMTPResponse::getLineAt(const unsigned int pos) } -const unsigned int SMTPResponse::getLineCount() const +unsigned int SMTPResponse::getLineCount() const { return m_lines.size(); } @@ -227,7 +227,7 @@ void SMTPResponse::responseLine::setCode(const int code) } -const int SMTPResponse::responseLine::getCode() const +int SMTPResponse::responseLine::getCode() const { return m_code; } diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp index e042bafd..0a2e5b9f 100644 --- a/src/net/smtp/SMTPTransport.cpp +++ b/src/net/smtp/SMTPTransport.cpp @@ -485,13 +485,13 @@ void SMTPTransport::startTLS() #endif // VMIME_HAVE_TLS_SUPPORT -const bool SMTPTransport::isConnected() const +bool SMTPTransport::isConnected() const { return (m_socket && m_socket->isConnected() && m_authentified); } -const bool SMTPTransport::isSecuredConnection() const +bool SMTPTransport::isSecuredConnection() const { return m_secured; } diff --git a/src/net/tls/TLSSecuredConnectionInfos.cpp b/src/net/tls/TLSSecuredConnectionInfos.cpp index 01938171..55df5e20 100644 --- a/src/net/tls/TLSSecuredConnectionInfos.cpp +++ b/src/net/tls/TLSSecuredConnectionInfos.cpp @@ -45,7 +45,7 @@ const string TLSSecuredConnectionInfos::getHost() const } -const port_t TLSSecuredConnectionInfos::getPort() const +port_t TLSSecuredConnectionInfos::getPort() const { return m_port; } diff --git a/src/net/tls/TLSSocket.cpp b/src/net/tls/TLSSocket.cpp index 65abb6d9..73af1da7 100644 --- a/src/net/tls/TLSSocket.cpp +++ b/src/net/tls/TLSSocket.cpp @@ -84,7 +84,7 @@ void TLSSocket::disconnect() } -const bool TLSSocket::isConnected() const +bool TLSSocket::isConnected() const { return m_wrapped->isConnected() && m_connected; } @@ -103,7 +103,7 @@ void TLSSocket::send(const string& buffer) } -const int TLSSocket::receiveRaw(char* buffer, const int count) +int TLSSocket::receiveRaw(char* buffer, const int count) { const ssize_t ret = gnutls_record_recv (*m_session->m_gnutlsSession, diff --git a/src/net/transport.cpp b/src/net/transport.cpp index 3c8536ab..5db70d21 100644 --- a/src/net/transport.cpp +++ b/src/net/transport.cpp @@ -123,7 +123,7 @@ void transport::send(ref <vmime::message> msg, utility::progressListener* progre } -const transport::Type transport::getType() const +transport::Type transport::getType() const { return (TYPE_TRANSPORT); } |