3 files changed, 21 insertions, 21 deletions

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);
 }