aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/emptyContentHandler.cpp4
-rw-r--r--src/encoderB64.cpp4
-rw-r--r--src/encoderDefault.cpp4
-rw-r--r--src/encoderQP.cpp4
-rw-r--r--src/encoderUUE.cpp4
-rw-r--r--src/net/imap/IMAPFolder.cpp8
-rw-r--r--src/net/imap/IMAPMessage.cpp10
-rw-r--r--src/net/maildir/maildirFolder.cpp8
-rw-r--r--src/net/maildir/maildirMessage.cpp6
-rw-r--r--src/net/pop3/POP3Folder.cpp6
-rw-r--r--src/net/pop3/POP3Message.cpp4
-rw-r--r--src/net/pop3/POP3Store.cpp8
-rw-r--r--src/net/sendmail/sendmailTransport.cpp4
-rw-r--r--src/net/smtp/SMTPTransport.cpp2
-rw-r--r--src/net/transport.cpp2
-rw-r--r--src/streamContentHandler.cpp6
-rw-r--r--src/stringContentHandler.cpp6
-rw-r--r--src/utility/progressListener.cpp (renamed from src/utility/progressionListener.cpp)16
-rw-r--r--src/utility/stream.cpp2
-rw-r--r--src/utility/stringProxy.cpp2
20 files changed, 55 insertions, 55 deletions
diff --git a/src/emptyContentHandler.cpp b/src/emptyContentHandler.cpp
index 298a591e..17e7695d 100644
--- a/src/emptyContentHandler.cpp
+++ b/src/emptyContentHandler.cpp
@@ -47,7 +47,7 @@ void emptyContentHandler::generate(utility::outputStream& /* os */, const vmime:
void emptyContentHandler::extract(utility::outputStream& /* os */,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
if (progress)
progress->start(0);
@@ -60,7 +60,7 @@ void emptyContentHandler::extract(utility::outputStream& /* os */,
void emptyContentHandler::extractRaw(utility::outputStream& /* os */,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
if (progress)
progress->start(0);
diff --git a/src/encoderB64.cpp b/src/encoderB64.cpp
index e58440b2..8eb3f2ee 100644
--- a/src/encoderB64.cpp
+++ b/src/encoderB64.cpp
@@ -75,7 +75,7 @@ const unsigned char encoderB64::sm_decodeMap[256] =
const utility::stream::size_type encoderB64::encode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -187,7 +187,7 @@ const utility::stream::size_type encoderB64::encode(utility::inputStream& in,
const utility::stream::size_type encoderB64::decode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
diff --git a/src/encoderDefault.cpp b/src/encoderDefault.cpp
index 03f36bb1..e0ed037d 100644
--- a/src/encoderDefault.cpp
+++ b/src/encoderDefault.cpp
@@ -34,7 +34,7 @@ encoderDefault::encoderDefault()
const utility::stream::size_type encoderDefault::encode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -51,7 +51,7 @@ const utility::stream::size_type encoderDefault::encode(utility::inputStream& in
const utility::stream::size_type encoderDefault::decode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
diff --git a/src/encoderQP.cpp b/src/encoderQP.cpp
index 635ee45d..41e7fe46 100644
--- a/src/encoderQP.cpp
+++ b/src/encoderQP.cpp
@@ -90,7 +90,7 @@ const unsigned char encoderQP::sm_hexDecodeTable[256] =
const utility::stream::size_type encoderQP::encode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -298,7 +298,7 @@ const utility::stream::size_type encoderQP::encode(utility::inputStream& in,
const utility::stream::size_type encoderQP::decode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
diff --git a/src/encoderUUE.cpp b/src/encoderUUE.cpp
index 05ecf098..123f79fe 100644
--- a/src/encoderUUE.cpp
+++ b/src/encoderUUE.cpp
@@ -64,7 +64,7 @@ static inline const unsigned char UUDECODE(const unsigned char c)
const utility::stream::size_type encoderUUE::encode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
@@ -143,7 +143,7 @@ const utility::stream::size_type encoderUUE::encode(utility::inputStream& in,
const utility::stream::size_type encoderUUE::decode(utility::inputStream& in,
- utility::outputStream& out, utility::progressionListener* progress)
+ utility::outputStream& out, utility::progressListener* progress)
{
in.reset(); // may not work...
diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp
index c05799d2..81584dd0 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/net/imap/IMAPFolder.cpp
@@ -602,7 +602,7 @@ std::vector <ref <folder> > IMAPFolder::getFolders(const bool recursive)
void IMAPFolder::fetchMessages(std::vector <ref <message> >& msg, const int options,
- utility::progressionListener* progress)
+ utility::progressListener* progress)
{
if (!m_store)
throw exceptions::illegal_state("Store disconnected");
@@ -1065,7 +1065,7 @@ void IMAPFolder::setMessageFlags(const string& set, const int flags, const int m
void IMAPFolder::addMessage(ref <vmime::message> msg, const int flags,
- vmime::datetime* date, utility::progressionListener* progress)
+ vmime::datetime* date, utility::progressListener* progress)
{
std::ostringstream oss;
utility::outputStreamAdapter ossAdapter(oss);
@@ -1080,7 +1080,7 @@ void IMAPFolder::addMessage(ref <vmime::message> msg, const int flags,
void IMAPFolder::addMessage(utility::inputStream& is, const int size, const int flags,
- vmime::datetime* date, utility::progressionListener* progress)
+ vmime::datetime* date, utility::progressListener* progress)
{
if (!m_store)
throw exceptions::illegal_state("Store disconnected");
@@ -1151,7 +1151,7 @@ void IMAPFolder::addMessage(utility::inputStream& is, const int size, const int
// Put read data into socket output stream
m_connection->sendRaw(buffer, read);
- // Notify progression
+ // Notify progress
if (progress)
progress->progress(current, total);
}
diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp
index d67773c8..cce01196 100644
--- a/src/net/imap/IMAPMessage.cpp
+++ b/src/net/imap/IMAPMessage.cpp
@@ -235,7 +235,7 @@ class IMAPMessage_literalHandler : public IMAPParser::literalHandler
{
public:
- IMAPMessage_literalHandler(utility::outputStream& os, utility::progressionListener* progress)
+ IMAPMessage_literalHandler(utility::outputStream& os, utility::progressListener* progress)
: m_os(os), m_progress(progress)
{
}
@@ -260,7 +260,7 @@ public:
private:
utility::outputStream& m_os;
- utility::progressionListener* m_progress;
+ utility::progressListener* m_progress;
};
#endif // VMIME_BUILDING_DOC
@@ -356,7 +356,7 @@ ref <const header> IMAPMessage::getHeader() const
}
-void IMAPMessage::extract(utility::outputStream& os, utility::progressionListener* progress,
+void IMAPMessage::extract(utility::outputStream& os, utility::progressListener* progress,
const int start, const int length, const bool peek) const
{
if (!m_folder)
@@ -367,7 +367,7 @@ void IMAPMessage::extract(utility::outputStream& os, utility::progressionListene
void IMAPMessage::extractPart
- (ref <const part> p, utility::outputStream& os, utility::progressionListener* progress,
+ (ref <const part> p, utility::outputStream& os, utility::progressListener* progress,
const int start, const int length, const bool peek) const
{
if (!m_folder)
@@ -392,7 +392,7 @@ void IMAPMessage::fetchPartHeader(ref <part> p)
void IMAPMessage::extract(ref <const part> p, utility::outputStream& os,
- utility::progressionListener* progress, const int start,
+ utility::progressListener* progress, const int start,
const int length, const bool headerOnly, const bool peek) const
{
IMAPMessage_literalHandler literalHandler(os, progress);
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index f6a084d2..1c9449dc 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -852,7 +852,7 @@ void maildirFolder::setMessageFlagsImpl
void maildirFolder::addMessage(ref <vmime::message> msg, const int flags,
- vmime::datetime* date, utility::progressionListener* progress)
+ vmime::datetime* date, utility::progressListener* progress)
{
std::ostringstream oss;
utility::outputStreamAdapter ossAdapter(oss);
@@ -867,7 +867,7 @@ void maildirFolder::addMessage(ref <vmime::message> msg, const int flags,
void maildirFolder::addMessage(utility::inputStream& is, const int size,
- const int flags, vmime::datetime* /* date */, utility::progressionListener* progress)
+ const int flags, vmime::datetime* /* date */, utility::progressListener* progress)
{
if (!m_store)
throw exceptions::illegal_state("Store disconnected");
@@ -956,7 +956,7 @@ void maildirFolder::addMessage(utility::inputStream& is, const int size,
void maildirFolder::copyMessageImpl(const utility::file::path& tmpDirPath,
const utility::file::path& curDirPath, const utility::file::path::component& filename,
utility::inputStream& is, const utility::stream::size_type size,
- utility::progressionListener* progress)
+ utility::progressListener* progress)
{
utility::fileSystemFactory* fsf = platformDependant::getHandler()->getFileSystemFactory();
@@ -1324,7 +1324,7 @@ weak_ref <store> maildirFolder::getStore()
void maildirFolder::fetchMessages(std::vector <ref <message> >& msg,
- const int options, utility::progressionListener* progress)
+ const int options, utility::progressListener* progress)
{
if (!m_store)
throw exceptions::illegal_state("Store disconnected");
diff --git a/src/net/maildir/maildirMessage.cpp b/src/net/maildir/maildirMessage.cpp
index 739b6e7b..326a3ced 100644
--- a/src/net/maildir/maildirMessage.cpp
+++ b/src/net/maildir/maildirMessage.cpp
@@ -302,7 +302,7 @@ void maildirMessage::setFlags(const int flags, const int mode)
void maildirMessage::extract(utility::outputStream& os,
- utility::progressionListener* progress, const int start,
+ utility::progressListener* progress, const int start,
const int length, const bool peek) const
{
extractImpl(os, progress, 0, m_size, start, length, peek);
@@ -310,7 +310,7 @@ void maildirMessage::extract(utility::outputStream& os,
void maildirMessage::extractPart(ref <const part> p, utility::outputStream& os,
- utility::progressionListener* progress, const int start,
+ utility::progressListener* progress, const int start,
const int length, const bool peek) const
{
const maildirPart& mp = dynamic_cast <const maildirPart&>(p);
@@ -320,7 +320,7 @@ void maildirMessage::extractPart(ref <const part> p, utility::outputStream& os,
}
-void maildirMessage::extractImpl(utility::outputStream& os, utility::progressionListener* progress,
+void maildirMessage::extractImpl(utility::outputStream& os, utility::progressListener* progress,
const int start, const int length, const int partialStart, const int partialLength,
const bool /* peek */) const
{
diff --git a/src/net/pop3/POP3Folder.cpp b/src/net/pop3/POP3Folder.cpp
index fd4c6fd2..d1f97dd5 100644
--- a/src/net/pop3/POP3Folder.cpp
+++ b/src/net/pop3/POP3Folder.cpp
@@ -285,7 +285,7 @@ std::vector <ref <folder> > POP3Folder::getFolders(const bool /* recursive */)
void POP3Folder::fetchMessages(std::vector <ref <message> >& msg, const int options,
- utility::progressionListener* progress)
+ utility::progressListener* progress)
{
if (!m_store)
throw exceptions::illegal_state("Store disconnected");
@@ -683,14 +683,14 @@ void POP3Folder::rename(const folder::path& /* newPath */)
void POP3Folder::addMessage(ref <vmime::message> /* msg */, const int /* flags */,
- vmime::datetime* /* date */, utility::progressionListener* /* progress */)
+ vmime::datetime* /* date */, utility::progressListener* /* progress */)
{
throw exceptions::operation_not_supported();
}
void POP3Folder::addMessage(utility::inputStream& /* is */, const int /* size */, const int /* flags */,
- vmime::datetime* /* date */, utility::progressionListener* /* progress */)
+ vmime::datetime* /* date */, utility::progressListener* /* progress */)
{
throw exceptions::operation_not_supported();
}
diff --git a/src/net/pop3/POP3Message.cpp b/src/net/pop3/POP3Message.cpp
index 62bfdf96..e279a059 100644
--- a/src/net/pop3/POP3Message.cpp
+++ b/src/net/pop3/POP3Message.cpp
@@ -109,7 +109,7 @@ ref <const header> POP3Message::getHeader() const
void POP3Message::extract(utility::outputStream& os,
- utility::progressionListener* progress, const int start,
+ utility::progressListener* progress, const int start,
const int length, const bool /* peek */) const
{
if (!m_folder)
@@ -146,7 +146,7 @@ void POP3Message::extract(utility::outputStream& os,
void POP3Message::extractPart
(ref <const part> /* p */, utility::outputStream& /* os */,
- utility::progressionListener* /* progress */,
+ utility::progressListener* /* progress */,
const int /* start */, const int /* length */,
const bool /* peek */) const
{
diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp
index 1b15c9f6..29a22dcf 100644
--- a/src/net/pop3/POP3Store.cpp
+++ b/src/net/pop3/POP3Store.cpp
@@ -702,7 +702,7 @@ void POP3Store::sendRequest(const string& buffer, const bool end)
void POP3Store::readResponse(string& buffer, const bool multiLine,
- utility::progressionListener* progress)
+ utility::progressListener* progress)
{
bool foundTerminator = false;
int current = 0, total = 0;
@@ -777,7 +777,7 @@ void POP3Store::readResponse(string& buffer, const bool multiLine,
// Check for terminator string (and strip it if present)
foundTerminator = checkTerminator(buffer, multiLine);
- // Notify progression
+ // Notify progress
if (progress)
{
total = std::max(total, current);
@@ -800,7 +800,7 @@ void POP3Store::readResponse(string& buffer, const bool multiLine,
void POP3Store::readResponse(utility::outputStream& os,
- utility::progressionListener* progress, const int predictedSize)
+ utility::progressListener* progress, const int predictedSize)
{
int current = 0, total = predictedSize;
@@ -875,7 +875,7 @@ void POP3Store::readResponse(utility::outputStream& os,
os.write(buffer, read);
current += read;
- // Notify progression
+ // Notify progress
if (progress)
{
total = std::max(total, current);
diff --git a/src/net/sendmail/sendmailTransport.cpp b/src/net/sendmail/sendmailTransport.cpp
index 853f4eec..2b5c4b04 100644
--- a/src/net/sendmail/sendmailTransport.cpp
+++ b/src/net/sendmail/sendmailTransport.cpp
@@ -116,7 +116,7 @@ void sendmailTransport::noop()
void sendmailTransport::send
(const mailbox& expeditor, const mailboxList& recipients,
utility::inputStream& is, const utility::stream::size_type size,
- utility::progressionListener* progress)
+ utility::progressListener* progress)
{
// If no recipient/expeditor was found, throw an exception
if (recipients.isEmpty())
@@ -149,7 +149,7 @@ void sendmailTransport::send
void sendmailTransport::internalSend
(const std::vector <string> args, utility::inputStream& is,
- const utility::stream::size_type size, utility::progressionListener* progress)
+ const utility::stream::size_type size, utility::progressListener* progress)
{
const utility::file::path path = vmime::platformDependant::getHandler()->
getFileSystemFactory()->stringToPath(m_sendmailPath);
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 2e6013e9..c50d3c69 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -494,7 +494,7 @@ void SMTPTransport::noop()
void SMTPTransport::send(const mailbox& expeditor, const mailboxList& recipients,
utility::inputStream& is, const utility::stream::size_type size,
- utility::progressionListener* progress)
+ utility::progressListener* progress)
{
// If no recipient/expeditor was found, throw an exception
if (recipients.isEmpty())
diff --git a/src/net/transport.cpp b/src/net/transport.cpp
index 9170a84a..85d227e4 100644
--- a/src/net/transport.cpp
+++ b/src/net/transport.cpp
@@ -47,7 +47,7 @@ static void extractMailboxes
}
-void transport::send(ref <vmime::message> msg, utility::progressionListener* progress)
+void transport::send(ref <vmime::message> msg, utility::progressListener* progress)
{
// Extract expeditor
mailbox expeditor;
diff --git a/src/streamContentHandler.cpp b/src/streamContentHandler.cpp
index a290aed5..5870832c 100644
--- a/src/streamContentHandler.cpp
+++ b/src/streamContentHandler.cpp
@@ -133,7 +133,7 @@ void streamContentHandler::generate(utility::outputStream& os, const vmime::enco
void streamContentHandler::extract(utility::outputStream& os,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
if (!m_stream)
return;
@@ -155,7 +155,7 @@ void streamContentHandler::extract(utility::outputStream& os,
m_stream->reset(); // may not work...
- utility::progressionListenerSizeAdapter plsa(progress, getLength());
+ utility::progressListenerSizeAdapter plsa(progress, getLength());
theDecoder->decode(*m_stream, os, &plsa);
}
@@ -163,7 +163,7 @@ void streamContentHandler::extract(utility::outputStream& os,
void streamContentHandler::extractRaw(utility::outputStream& os,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
if (!m_stream)
return;
diff --git a/src/stringContentHandler.cpp b/src/stringContentHandler.cpp
index ba23d5a1..7b8bfa1f 100644
--- a/src/stringContentHandler.cpp
+++ b/src/stringContentHandler.cpp
@@ -151,7 +151,7 @@ void stringContentHandler::generate(utility::outputStream& os,
void stringContentHandler::extract(utility::outputStream& os,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
// No decoding to perform
if (!isEncoded())
@@ -164,7 +164,7 @@ void stringContentHandler::extract(utility::outputStream& os,
ref <encoder> theDecoder = m_encoding.getEncoder();
utility::inputStreamStringProxyAdapter in(m_string);
- utility::progressionListenerSizeAdapter plsa(progress, getLength());
+ utility::progressListenerSizeAdapter plsa(progress, getLength());
theDecoder->decode(in, os, &plsa);
}
@@ -172,7 +172,7 @@ void stringContentHandler::extract(utility::outputStream& os,
void stringContentHandler::extractRaw(utility::outputStream& os,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
m_string.extract(os, 0, m_string.length(), progress);
}
diff --git a/src/utility/progressionListener.cpp b/src/utility/progressListener.cpp
index d2895f01..0a6f63e9 100644
--- a/src/utility/progressionListener.cpp
+++ b/src/utility/progressListener.cpp
@@ -21,36 +21,36 @@
// the GNU General Public License cover the whole combination.
//
-#include "vmime/utility/progressionListener.hpp"
+#include "vmime/utility/progressListener.hpp"
namespace vmime {
namespace utility {
-// progressionListenerSizeAdapter
+// progressListenerSizeAdapter
-progressionListenerSizeAdapter::progressionListenerSizeAdapter
- (progressionListener* list, const int total)
+progressListenerSizeAdapter::progressListenerSizeAdapter
+ (progressListener* list, const int total)
: m_wrapped(list), m_total(total)
{
}
-const bool progressionListenerSizeAdapter::cancel() const
+const bool progressListenerSizeAdapter::cancel() const
{
return (m_wrapped ? m_wrapped->cancel() : false);
}
-void progressionListenerSizeAdapter::start(const int predictedTotal)
+void progressListenerSizeAdapter::start(const int predictedTotal)
{
if (m_wrapped)
m_wrapped->start(predictedTotal);
}
-void progressionListenerSizeAdapter::progress(const int current, const int currentTotal)
+void progressListenerSizeAdapter::progress(const int current, const int currentTotal)
{
if (m_wrapped)
{
@@ -62,7 +62,7 @@ void progressionListenerSizeAdapter::progress(const int current, const int curre
}
-void progressionListenerSizeAdapter::stop(const int total)
+void progressListenerSizeAdapter::stop(const int total)
{
if (m_wrapped)
{
diff --git a/src/utility/stream.cpp b/src/utility/stream.cpp
index 04fa3308..c9f901ec 100644
--- a/src/utility/stream.cpp
+++ b/src/utility/stream.cpp
@@ -55,7 +55,7 @@ const stream::size_type bufferedStreamCopy(inputStream& is, outputStream& os)
const stream::size_type bufferedStreamCopy(inputStream& is, outputStream& os,
- const stream::size_type length, progressionListener* progress)
+ const stream::size_type length, progressListener* progress)
{
stream::value_type buffer[65536];
stream::size_type total = 0;
diff --git a/src/utility/stringProxy.cpp b/src/utility/stringProxy.cpp
index 6ad41e26..10c2c3ce 100644
--- a/src/utility/stringProxy.cpp
+++ b/src/utility/stringProxy.cpp
@@ -86,7 +86,7 @@ stringProxy& stringProxy::operator=(const string_type& s)
void stringProxy::extract(outputStream& os, const size_type start, const size_type end,
- utility::progressionListener* progress) const
+ utility::progressListener* progress) const
{
size_type len = 0;
generated by cgit v1.2.3 (git 2.25.1) at 2025-05-16 20:40:00 +0000