From d4c386beda2e6f418cacf79e29c2ddd84e5e6766 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Sat, 18 Aug 2018 19:51:21 +0200 Subject: [PATCH] Removed useless 'constCast's. --- src/vmime/net/imap/IMAPMessage.cpp | 4 ++-- .../net/imap/IMAPMessagePartContentHandler.cpp | 16 +++++++--------- src/vmime/net/maildir/maildirFormat.cpp | 12 +++--------- src/vmime/net/maildir/maildirFormat.hpp | 10 ++-------- src/vmime/net/pop3/POP3Message.cpp | 2 +- .../security/sasl/defaultSASLAuthenticator.cpp | 2 +- 6 files changed, 16 insertions(+), 30 deletions(-) diff --git a/src/vmime/net/imap/IMAPMessage.cpp b/src/vmime/net/imap/IMAPMessage.cpp index f0d2ebd3..87f78f38 100644 --- a/src/vmime/net/imap/IMAPMessage.cpp +++ b/src/vmime/net/imap/IMAPMessage.cpp @@ -414,11 +414,11 @@ size_t IMAPMessage::extractImpl IMAPCommand::FETCH( m_uid.empty() ? messageSet::byNumber(m_num) : messageSet::byUID(m_uid), fetchParams - )->send(constCast (folder)->m_connection); + )->send(folder->m_connection); // Get the response scoped_ptr resp - (constCast (folder)->m_connection->readResponse(&literalHandler)); + (folder->m_connection->readResponse(&literalHandler)); if (resp->isBad() || resp->response_done()->response_tagged()-> resp_cond_state()->status() != IMAPParser::resp_cond_state::OK) diff --git a/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp b/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp index 32a2a75b..0917d0f7 100644 --- a/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp +++ b/src/vmime/net/imap/IMAPMessagePartContentHandler.cpp @@ -52,17 +52,15 @@ IMAPMessagePartContentHandler::IMAPMessagePartContentHandler shared_ptr IMAPMessagePartContentHandler::clone() const { return make_shared - (constCast (m_message.lock()), - constCast (m_part.lock()), - m_encoding); + (m_message.lock(), m_part.lock(), m_encoding); } void IMAPMessagePartContentHandler::generate (utility::outputStream& os, const vmime::encoding& enc, const size_t maxLineLength) const { - shared_ptr msg = constCast (m_message.lock()); - shared_ptr part = constCast (m_part.lock()); + shared_ptr msg = m_message.lock(); + shared_ptr part = m_part.lock(); // Data is already encoded if (isEncoded()) @@ -128,8 +126,8 @@ void IMAPMessagePartContentHandler::generate void IMAPMessagePartContentHandler::extract (utility::outputStream& os, utility::progressListener* progress) const { - shared_ptr msg = constCast (m_message.lock()); - shared_ptr part = constCast (m_part.lock()); + shared_ptr msg = m_message.lock(); + shared_ptr part = m_part.lock(); // No decoding to perform if (!isEncoded()) @@ -158,8 +156,8 @@ void IMAPMessagePartContentHandler::extract void IMAPMessagePartContentHandler::extractRaw (utility::outputStream& os, utility::progressListener* progress) const { - shared_ptr msg = constCast (m_message.lock()); - shared_ptr part = constCast (m_part.lock()); + shared_ptr msg = m_message.lock(); + shared_ptr part = m_part.lock(); msg->extractPart(part, os, progress); } diff --git a/src/vmime/net/maildir/maildirFormat.cpp b/src/vmime/net/maildir/maildirFormat.cpp index 5b0b3c2b..7f2cb5f1 100644 --- a/src/vmime/net/maildir/maildirFormat.cpp +++ b/src/vmime/net/maildir/maildirFormat.cpp @@ -56,9 +56,9 @@ maildirFormat::context::context(const shared_ptr & store) } -shared_ptr maildirFormat::context::getStore() const +shared_ptr maildirFormat::context::getStore() { - return constCast (m_store.lock()); + return m_store.lock(); } @@ -72,13 +72,7 @@ maildirFormat::maildirFormat(const shared_ptr & ctx) } -shared_ptr maildirFormat::getContext() -{ - return m_context; -} - - -shared_ptr maildirFormat::getContext() const +shared_ptr maildirFormat::getContext() const { return m_context; } diff --git a/src/vmime/net/maildir/maildirFormat.hpp b/src/vmime/net/maildir/maildirFormat.hpp index 7a95caf4..733303bd 100644 --- a/src/vmime/net/maildir/maildirFormat.hpp +++ b/src/vmime/net/maildir/maildirFormat.hpp @@ -57,7 +57,7 @@ public: context(const shared_ptr & store); - shared_ptr getStore() const; + shared_ptr getStore(); private: @@ -162,13 +162,7 @@ protected: * * @return current context */ - shared_ptr getContext(); - - /** Returns the current context (const version). - * - * @return current context - */ - shared_ptr getContext() const; + shared_ptr getContext() const; /** Quick checks whether this implementation can read the Maildir * format in the specified directory. diff --git a/src/vmime/net/pop3/POP3Message.cpp b/src/vmime/net/pop3/POP3Message.cpp index 24d211a4..913219b3 100644 --- a/src/vmime/net/pop3/POP3Message.cpp +++ b/src/vmime/net/pop3/POP3Message.cpp @@ -149,7 +149,7 @@ void POP3Message::extract throw exceptions::partial_fetch_not_supported(); // Emit the "RETR" command - shared_ptr store = constCast (folder)->m_store.lock(); + shared_ptr store = folder->m_store.lock(); POP3Command::RETR(m_num)->send(store->getConnection()); diff --git a/src/vmime/security/sasl/defaultSASLAuthenticator.cpp b/src/vmime/security/sasl/defaultSASLAuthenticator.cpp index 44d4e18c..2dbc0399 100644 --- a/src/vmime/security/sasl/defaultSASLAuthenticator.cpp +++ b/src/vmime/security/sasl/defaultSASLAuthenticator.cpp @@ -134,7 +134,7 @@ void defaultSASLAuthenticator::setSASLSession(const shared_ptr & se shared_ptr defaultSASLAuthenticator::getSASLSession() const { - return constCast (m_saslSession.lock()); + return m_saslSession.lock(); }