aboutsummaryrefslogtreecommitdiffstats
path: root/src/net
diff options
context:
space:
mode:
Diffstat (limited to 'src/net')
-rw-r--r--src/net/imap/IMAPFolder.cpp2
-rw-r--r--src/net/imap/IMAPMessage.cpp4
-rw-r--r--src/net/imap/IMAPStructure.cpp6
-rw-r--r--src/net/imap/IMAPUtils.cpp4
-rw-r--r--src/net/maildir/format/courierMaildirFormat.cpp10
-rw-r--r--src/net/maildir/maildirFolder.cpp4
-rw-r--r--src/net/maildir/maildirMessage.cpp6
-rw-r--r--src/net/message.cpp6
-rw-r--r--src/net/pop3/POP3Response.cpp4
-rw-r--r--src/net/pop3/POP3Store.cpp2
-rw-r--r--src/net/pop3/POP3Utils.cpp2
-rw-r--r--src/net/serviceFactory.cpp4
-rw-r--r--src/net/smtp/SMTPResponse.cpp4
-rw-r--r--src/net/smtp/SMTPTransport.cpp8
-rw-r--r--src/net/transport.cpp2
15 files changed, 34 insertions, 34 deletions
diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp
index 8eac9eae..ddd53994 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/net/imap/IMAPFolder.cpp
@@ -590,7 +590,7 @@ std::vector <ref <message> > IMAPFolder::getMessagesByUID(const std::vector <mes
cmd << "UID FETCH " << IMAPUtils::extractUIDFromGlobalUID(uids[0]);
- for (unsigned int i = 1, n = uids.size() ; i < n ; ++i)
+ for (std::vector <message::uid>::size_type i = 1, n = uids.size() ; i < n ; ++i)
cmd << "," << IMAPUtils::extractUIDFromGlobalUID(uids[i]);
cmd << " UID";
diff --git a/src/net/imap/IMAPMessage.cpp b/src/net/imap/IMAPMessage.cpp
index 45d4699b..55f2108e 100644
--- a/src/net/imap/IMAPMessage.cpp
+++ b/src/net/imap/IMAPMessage.cpp
@@ -233,7 +233,7 @@ void IMAPMessage::fetchPartHeader(ref <part> p)
void IMAPMessage::fetchPartHeaderForStructure(ref <structure> str)
{
- for (int i = 0, n = str->getPartCount() ; i < n ; ++i)
+ for (size_t i = 0, n = str->getPartCount() ; i < n ; ++i)
{
ref <class part> part = str->getPartAt(i);
@@ -694,7 +694,7 @@ void IMAPMessage::constructParsedMessage(ref <bodyPart> parentPart, ref <structu
}
else
{
- for (int i = 0, n = str->getPartCount() ; i < n ; ++i)
+ for (size_t i = 0, n = str->getPartCount() ; i < n ; ++i)
{
ref <class part> part = str->getPartAt(i);
diff --git a/src/net/imap/IMAPStructure.cpp b/src/net/imap/IMAPStructure.cpp
index a0bd98bb..6b0a6c02 100644
--- a/src/net/imap/IMAPStructure.cpp
+++ b/src/net/imap/IMAPStructure.cpp
@@ -59,19 +59,19 @@ IMAPStructure::IMAPStructure(ref <IMAPPart> parent, const std::vector <IMAPParse
}
-ref <const part> IMAPStructure::getPartAt(const int x) const
+ref <const part> IMAPStructure::getPartAt(const size_t x) const
{
return m_parts[x];
}
-ref <part> IMAPStructure::getPartAt(const int x)
+ref <part> IMAPStructure::getPartAt(const size_t x)
{
return m_parts[x];
}
-int IMAPStructure::getPartCount() const
+size_t IMAPStructure::getPartCount() const
{
return m_parts.size();
}
diff --git a/src/net/imap/IMAPUtils.cpp b/src/net/imap/IMAPUtils.cpp
index 3f1c704b..68507644 100644
--- a/src/net/imap/IMAPUtils.cpp
+++ b/src/net/imap/IMAPUtils.cpp
@@ -122,7 +122,7 @@ const string IMAPUtils::pathToString
{
string result;
- for (int i = 0 ; i < path.getSize() ; ++i)
+ for (size_t i = 0 ; i < path.getSize() ; ++i)
{
if (i > 0) result += hierarchySeparator;
result += toModifiedUTF7(hierarchySeparator, path[i]);
@@ -556,7 +556,7 @@ const string IMAPUtils::listToSet(const std::vector <message::uid>& list)
res << extractUIDFromGlobalUID(list[0]);
- for (unsigned int i = 1, n = list.size() ; i < n ; ++i)
+ for (std::vector <message::uid>::size_type i = 1, n = list.size() ; i < n ; ++i)
res << "," << extractUIDFromGlobalUID(list[i]);
return res.str();
diff --git a/src/net/maildir/format/courierMaildirFormat.cpp b/src/net/maildir/format/courierMaildirFormat.cpp
index 033951a1..58176a27 100644
--- a/src/net/maildir/format/courierMaildirFormat.cpp
+++ b/src/net/maildir/format/courierMaildirFormat.cpp
@@ -91,7 +91,7 @@ void courierMaildirFormat::destroyFolder(const folder::path& path)
// Recursively delete directories of subfolders
const std::vector <folder::path> folders = listFolders(path, true);
- for (unsigned int i = 0, n = folders.size() ; i < n ; ++i)
+ for (std::vector <folder::path>::size_type i = 0, n = folders.size() ; i < n ; ++i)
{
maildirUtils::recursiveFSDelete(fsf->create
(folderPathToFileSystemPath(folders[i], ROOT_DIRECTORY)));
@@ -108,7 +108,7 @@ void courierMaildirFormat::renameFolder
{
const std::vector <folder::path> folders = listFolders(oldPath, true);
- for (unsigned int i = 0, n = folders.size() ; i < n ; ++i)
+ for (std::vector <folder::path>::size_type i = 0, n = folders.size() ; i < n ; ++i)
{
const folder::path folderOldPath = folders[i];
@@ -188,7 +188,7 @@ const utility::file::path courierMaildirFormat::folderPathToFileSystemPath
{
string folderComp;
- for (int i = 0, n = path.getSize() ; i < n ; ++i)
+ for (size_t i = 0, n = path.getSize() ; i < n ; ++i)
folderComp += "." + toModifiedUTF7(path[i]);
fsPath /= utility::file::path::component(folderComp);
@@ -237,7 +237,7 @@ const std::vector <folder::path> courierMaildirFormat::listFolders
// Then, map directories to folders
std::vector <folder::path> folders;
- for (unsigned int i = 0, n = dirs.size() ; i < n ; ++i)
+ for (std::vector <string>::size_type i = 0, n = dirs.size() ; i < n ; ++i)
{
const string dir = dirs[i].substr(1) + ".";
folder::path path;
@@ -273,7 +273,7 @@ bool courierMaildirFormat::listDirectories(const folder::path& root,
if (!root.isRoot())
{
- for (int i = 0, n = root.getSize() ; i < n ; ++i)
+ for (size_t i = 0, n = root.getSize() ; i < n ; ++i)
base += "." + toModifiedUTF7(root[i]);
}
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index cbea38ee..d8ca8695 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -505,7 +505,7 @@ void maildirFolder::listFolders(std::vector <ref <folder> >& list, const bool re
list.reserve(pathList.size());
- for (unsigned int i = 0, n = pathList.size() ; i < n ; ++i)
+ for (std::vector <folder::path>::size_type i = 0, n = pathList.size() ; i < n ; ++i)
{
ref <maildirFolder> subFolder =
vmime::create <maildirFolder>(pathList[i], store);
@@ -1264,7 +1264,7 @@ void maildirFolder::expunge()
if (!nums.empty())
{
- for (int i = nums.size() - 1 ; i >= 0 ; --i)
+ for (std::vector <int>::size_type i = nums.size() - 1 ; i >= 0 ; --i)
m_messageInfos.erase(m_messageInfos.begin() + i);
}
diff --git a/src/net/maildir/maildirMessage.cpp b/src/net/maildir/maildirMessage.cpp
index dd38cbd8..0bd1b277 100644
--- a/src/net/maildir/maildirMessage.cpp
+++ b/src/net/maildir/maildirMessage.cpp
@@ -143,17 +143,17 @@ public:
}
- ref <const part> getPartAt(const int x) const
+ ref <const part> getPartAt(const size_t x) const
{
return m_parts[x];
}
- ref <part> getPartAt(const int x)
+ ref <part> getPartAt(const size_t x)
{
return m_parts[x];
}
- int getPartCount() const
+ size_t getPartCount() const
{
return m_parts.size();
}
diff --git a/src/net/message.cpp b/src/net/message.cpp
index b8624330..8639625e 100644
--- a/src/net/message.cpp
+++ b/src/net/message.cpp
@@ -34,19 +34,19 @@ namespace vmime {
namespace net {
-ref <const part> part::getPartAt(const int pos) const
+ref <const part> part::getPartAt(const size_t pos) const
{
return getStructure()->getPartAt(pos);
}
-ref <part> part::getPartAt(const int pos)
+ref <part> part::getPartAt(const size_t pos)
{
return getStructure()->getPartAt(pos);
}
-int part::getPartCount() const
+size_t part::getPartCount() const
{
return getStructure()->getPartCount();
}
diff --git a/src/net/pop3/POP3Response.cpp b/src/net/pop3/POP3Response.cpp
index ab792611..6ca0ad75 100644
--- a/src/net/pop3/POP3Response.cpp
+++ b/src/net/pop3/POP3Response.cpp
@@ -136,13 +136,13 @@ const string POP3Response::getText() const
}
-const string POP3Response::getLineAt(const unsigned int pos) const
+const string POP3Response::getLineAt(const size_t pos) const
{
return m_lines[pos];
}
-unsigned int POP3Response::getLineCount() const
+size_t POP3Response::getLineCount() const
{
return m_lines.size();
}
diff --git a/src/net/pop3/POP3Store.cpp b/src/net/pop3/POP3Store.cpp
index a1dac0a0..4e3f4512 100644
--- a/src/net/pop3/POP3Store.cpp
+++ b/src/net/pop3/POP3Store.cpp
@@ -653,7 +653,7 @@ const std::vector <string> POP3Store::getCapabilities()
if (response->isSuccess())
{
- for (unsigned int i = 0, n = response->getLineCount() ; i < n ; ++i)
+ for (size_t i = 0, n = response->getLineCount() ; i < n ; ++i)
res.push_back(response->getLineAt(i));
}
diff --git a/src/net/pop3/POP3Utils.cpp b/src/net/pop3/POP3Utils.cpp
index c065b695..c4654956 100644
--- a/src/net/pop3/POP3Utils.cpp
+++ b/src/net/pop3/POP3Utils.cpp
@@ -43,7 +43,7 @@ void POP3Utils::parseMultiListOrUidlResponse(ref <POP3Response> response, std::m
{
std::map <int, string> ids;
- for (unsigned int i = 0, n = response->getLineCount() ; i < n ; ++i)
+ for (size_t i = 0, n = response->getLineCount() ; i < n ; ++i)
{
string line = response->getLineAt(i);
string::iterator it = line.begin();
diff --git a/src/net/serviceFactory.cpp b/src/net/serviceFactory.cpp
index 71b7efea..3a547bb2 100644
--- a/src/net/serviceFactory.cpp
+++ b/src/net/serviceFactory.cpp
@@ -105,13 +105,13 @@ ref <const serviceFactory::registeredService> serviceFactory::getServiceByProtoc
}
-int serviceFactory::getServiceCount() const
+size_t serviceFactory::getServiceCount() const
{
return (m_services.size());
}
-ref <const serviceFactory::registeredService> serviceFactory::getServiceAt(const int pos) const
+ref <const serviceFactory::registeredService> serviceFactory::getServiceAt(const size_t pos) const
{
return (m_services[pos]);
}
diff --git a/src/net/smtp/SMTPResponse.cpp b/src/net/smtp/SMTPResponse.cpp
index 28a1ea87..c0000e94 100644
--- a/src/net/smtp/SMTPResponse.cpp
+++ b/src/net/smtp/SMTPResponse.cpp
@@ -200,13 +200,13 @@ int SMTPResponse::extractResponseCode(const string& response)
}
-const SMTPResponse::responseLine SMTPResponse::getLineAt(const unsigned int pos) const
+const SMTPResponse::responseLine SMTPResponse::getLineAt(const size_t pos) const
{
return m_lines[pos];
}
-unsigned int SMTPResponse::getLineCount() const
+size_t SMTPResponse::getLineCount() const
{
return m_lines.size();
}
diff --git a/src/net/smtp/SMTPTransport.cpp b/src/net/smtp/SMTPTransport.cpp
index 7c67fa02..0ea4e379 100644
--- a/src/net/smtp/SMTPTransport.cpp
+++ b/src/net/smtp/SMTPTransport.cpp
@@ -231,7 +231,7 @@ void SMTPTransport::helo()
// Get supported extensions from SMTP response
// One extension per line, format is: EXT PARAM1 PARAM2...
- for (int i = 1, n = resp->getLineCount() ; i < n ; ++i)
+ for (size_t i = 1, n = resp->getLineCount() ; i < n ; ++i)
{
const string line = resp->getLineAt(i).getText();
std::istringstream iss(line);
@@ -582,7 +582,7 @@ void SMTPTransport::send(const mailbox& expeditor, const mailboxList& recipients
sendRequest("MAIL FROM:<" + expeditor.getEmail() + ">");
// Emit a "RCPT TO" command for each recipient
- for (int i = 0 ; i < recipients.getMailboxCount() ; ++i)
+ for (size_t i = 0 ; i < recipients.getMailboxCount() ; ++i)
{
const mailbox& mbox = *recipients.getMailboxAt(i);
@@ -602,7 +602,7 @@ void SMTPTransport::send(const mailbox& expeditor, const mailboxList& recipients
}
// Read responses for "RCPT TO" commands
- for (int i = 0 ; i < recipients.getMailboxCount() ; ++i)
+ for (size_t i = 0 ; i < recipients.getMailboxCount() ; ++i)
{
const mailbox& mbox = *recipients.getMailboxAt(i);
@@ -632,7 +632,7 @@ void SMTPTransport::send(const mailbox& expeditor, const mailboxList& recipients
}
// Emit a "RCPT TO" command for each recipient
- for (int i = 0 ; i < recipients.getMailboxCount() ; ++i)
+ for (size_t i = 0 ; i < recipients.getMailboxCount() ; ++i)
{
const mailbox& mbox = *recipients.getMailboxAt(i);
diff --git a/src/net/transport.cpp b/src/net/transport.cpp
index 9349e750..90279170 100644
--- a/src/net/transport.cpp
+++ b/src/net/transport.cpp
@@ -50,7 +50,7 @@ transport::transport(ref <session> sess, const serviceInfos& infos, ref <securit
static void extractMailboxes
(mailboxList& recipients, const addressList& list)
{
- for (int i = 0 ; i < list.getAddressCount() ; ++i)
+ for (size_t i = 0 ; i < list.getAddressCount() ; ++i)
{
ref <mailbox> mbox = list.getAddressAt(i)->clone().dynamicCast <mailbox>();