aboutsummaryrefslogtreecommitdiffstats
path: root/src/net/imap
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/net/imap/IMAPConnection.cpp9
-rw-r--r--src/net/imap/IMAPFolder.cpp16
-rw-r--r--src/net/imap/IMAPMessage.cpp15
-rw-r--r--src/net/imap/IMAPStore.cpp10
-rw-r--r--src/net/imap/IMAPTag.cpp8
-rw-r--r--src/net/imap/IMAPUtils.cpp8
6 files changed, 34 insertions, 32 deletions
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;