From 7e265b05f440ed81b80f2de496c9d13221a69fe0 Mon Sep 17 00:00:00 2001 From: Vincent Richard Date: Tue, 10 Dec 2013 08:52:51 +0100 Subject: Simplified types for better readability. Use appropriate types (size_t, byte_t...). Minor warning fixes. --- src/net/messageSet.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/net/messageSet.cpp') diff --git a/src/net/messageSet.cpp b/src/net/messageSet.cpp index 71a8a788..2939042e 100644 --- a/src/net/messageSet.cpp +++ b/src/net/messageSet.cpp @@ -151,14 +151,14 @@ messageSet::messageSet(const messageSet& other) { m_ranges.resize(other.m_ranges.size()); - for (unsigned int i = 0, n = other.m_ranges.size() ; i < n ; ++i) + for (size_t i = 0, n = other.m_ranges.size() ; i < n ; ++i) m_ranges[i] = other.m_ranges[i]->clone(); } messageSet::~messageSet() { - for (unsigned int i = 0, n = m_ranges.size() ; i < n ; ++i) + for (size_t i = 0, n = m_ranges.size() ; i < n ; ++i) delete m_ranges[i]; } @@ -256,12 +256,12 @@ messageSet messageSet::byUID(const std::vector & uids) { std::vector numericUIDs; - for (unsigned int i = 0, n = uids.size() ; i < n ; ++i) + for (size_t i = 0, n = uids.size() ; i < n ; ++i) { const string uid = uids[i]; int numericUID = 0; - const string::value_type* p = uid.c_str(); + const char* p = uid.c_str(); for ( ; *p >= '0' && *p <= '9' ; ++p) numericUID = (numericUID * 10) + (*p - '0'); @@ -271,7 +271,7 @@ messageSet messageSet::byUID(const std::vector & uids) messageSet set; // Non-numeric UID, fall back to plain UID list (single-UID ranges) - for (unsigned int i = 0, n = uids.size() ; i < n ; ++i) + for (size_t i = 0, n = uids.size() ; i < n ; ++i) set.m_ranges.push_back(new UIDMessageRange(uids[i])); return set; @@ -342,7 +342,7 @@ void messageSet::addRange(const messageRange& range) void messageSet::enumerate(messageSetEnumerator& en) const { - for (unsigned int i = 0, n = m_ranges.size() ; i < n ; ++i) + for (size_t i = 0, n = m_ranges.size() ; i < n ; ++i) m_ranges[i]->enumerate(en); } -- cgit v1.2.3