diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/vmime/net/folder.cpp | 15 | ||||
| -rw-r--r-- | src/vmime/text.cpp | 3 |
2 files changed, 13 insertions, 5 deletions
diff --git a/src/vmime/net/folder.cpp b/src/vmime/net/folder.cpp index 6e01b602..75b10042 100644 --- a/src/vmime/net/folder.cpp +++ b/src/vmime/net/folder.cpp @@ -56,7 +56,10 @@ void folder::addMessageChangedListener(events::messageChangedListener* l) { void folder::removeMessageChangedListener(events::messageChangedListener* l) { - std::remove(m_messageChangedListeners.begin(), m_messageChangedListeners.end(), l); + m_messageChangedListeners.erase( + std::remove(m_messageChangedListeners.begin(), m_messageChangedListeners.end(), l), + m_messageChangedListeners.end() + ); } @@ -78,7 +81,10 @@ void folder::addMessageCountListener(events::messageCountListener* l) { void folder::removeMessageCountListener(events::messageCountListener* l) { - std::remove(m_messageCountListeners.begin(), m_messageCountListeners.end(), l); + m_messageCountListeners.erase( + std::remove(m_messageCountListeners.begin(), m_messageCountListeners.end(), l), + m_messageCountListeners.end() + ); } @@ -100,7 +106,10 @@ void folder::addFolderListener(events::folderListener* l) { void folder::removeFolderListener(events::folderListener* l) { - std::remove(m_folderListeners.begin(), m_folderListeners.end(), l); + m_folderListeners.erase( + std::remove(m_folderListeners.begin(), m_folderListeners.end(), l), + m_folderListeners.end() + ); } diff --git a/src/vmime/text.cpp b/src/vmime/text.cpp index 86ba44f1..123ce007 100644 --- a/src/vmime/text.cpp +++ b/src/vmime/text.cpp @@ -269,7 +269,6 @@ shared_ptr <text> text::newFromString(const string& in, const charset& ch) { void text::createFromString(const string& in, const charset& ch) { - size_t asciiCount = 0; size_t asciiPercent = 0; removeAllWords(); @@ -282,7 +281,7 @@ void text::createFromString(const string& in, const charset& ch) { const bool alwaysEncode = ch.getRecommendedEncoding(recommendedEnc); if (!alwaysEncode) { - asciiCount = utility::stringUtils::countASCIIchars(in.begin(), in.end()); + const auto asciiCount = utility::stringUtils::countASCIIchars(in.begin(), in.end()); asciiPercent = (in.length() == 0 ? 100 : (100 * asciiCount) / in.length()); } |