aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/component.cpp2
-rw-r--r--src/exception.cpp2
-rw-r--r--src/net/imap/IMAPFolder.cpp2
-rw-r--r--src/net/imap/IMAPUtils.cpp2
-rw-r--r--src/net/maildir/maildirFolder.cpp2
-rw-r--r--src/net/pop3/POP3Command.cpp2
-rw-r--r--src/net/smtp/SMTPCommand.cpp10
-rw-r--r--src/parameter.cpp2
-rw-r--r--src/propertySet.cpp2
-rw-r--r--src/utility/filteredStream.cpp2
-rw-r--r--src/utility/parserInputStreamAdapter.cpp2
-rw-r--r--vmime/net/imap/IMAPUtils.hpp2
-rw-r--r--vmime/net/smtp/SMTPCommand.hpp12
-rw-r--r--vmime/propertySet.hpp2
-rw-r--r--vmime/security/digest/messageDigestFactory.hpp2
-rw-r--r--vmime/utility/parserInputStreamAdapter.hpp2
16 files changed, 25 insertions, 25 deletions
diff --git a/src/component.cpp b/src/component.cpp
index b102b45d..7226d0d2 100644
--- a/src/component.cpp
+++ b/src/component.cpp
@@ -150,7 +150,7 @@ void component::parseImpl
{
// This is the default implementation for parsing from an input stream:
// actually, we extract the substring and use the "parse from string" implementation
- const std::string buffer = parser->extract(position, end);
+ const string buffer = parser->extract(position, end);
parseImpl(ctx, buffer, 0, buffer.length(), newPosition);
// Recursivey offset parsed bounds on children
diff --git a/src/exception.cpp b/src/exception.cpp
index a341c161..f223a1bb 100644
--- a/src/exception.cpp
+++ b/src/exception.cpp
@@ -292,7 +292,7 @@ const char* no_object_found::name() const throw() { return "no_object_found"; }
no_such_property::~no_such_property() throw() {}
no_such_property::no_such_property(const string& name, const exception& other)
- : exception(std::string("No such property: '") + name + string("'."), other) { }
+ : exception(string("No such property: '") + name + string("'."), other) { }
exception* no_such_property::clone() const { return new no_such_property(*this); }
const char* no_such_property::name() const throw() { return "no_such_property"; }
diff --git a/src/net/imap/IMAPFolder.cpp b/src/net/imap/IMAPFolder.cpp
index 779f1535..4ad581d0 100644
--- a/src/net/imap/IMAPFolder.cpp
+++ b/src/net/imap/IMAPFolder.cpp
@@ -1323,7 +1323,7 @@ void IMAPFolder::addMessage(ref <vmime::message> msg, const int flags,
msg->generate(ossAdapter);
- const std::string& str = oss.str();
+ const string& str = oss.str();
utility::inputStreamStringAdapter strAdapter(str);
addMessage(strAdapter, str.length(), flags, date, progress);
diff --git a/src/net/imap/IMAPUtils.cpp b/src/net/imap/IMAPUtils.cpp
index d215f180..4fea517f 100644
--- a/src/net/imap/IMAPUtils.cpp
+++ b/src/net/imap/IMAPUtils.cpp
@@ -634,7 +634,7 @@ const string IMAPUtils::dateTime(const vmime::datetime& date)
// static
const string IMAPUtils::buildFetchRequestImpl
- (const std::string& mode, const std::string& set, const int options)
+ (const string& mode, const string& set, const int options)
{
// Example:
// C: A654 FETCH 2:4 (FLAGS BODY[HEADER.FIELDS (DATE FROM)])
diff --git a/src/net/maildir/maildirFolder.cpp b/src/net/maildir/maildirFolder.cpp
index 841d5f5d..aa886ff3 100644
--- a/src/net/maildir/maildirFolder.cpp
+++ b/src/net/maildir/maildirFolder.cpp
@@ -834,7 +834,7 @@ void maildirFolder::addMessage(ref <vmime::message> msg, const int flags,
msg->generate(ossAdapter);
- const std::string& str = oss.str();
+ const string& str = oss.str();
utility::inputStreamStringAdapter strAdapter(str);
addMessage(strAdapter, str.length(), flags, date, progress);
diff --git a/src/net/pop3/POP3Command.cpp b/src/net/pop3/POP3Command.cpp
index 72909a49..01589656 100644
--- a/src/net/pop3/POP3Command.cpp
+++ b/src/net/pop3/POP3Command.cpp
@@ -203,7 +203,7 @@ ref <POP3Command> POP3Command::QUIT()
// static
-ref <POP3Command> POP3Command::createCommand(const std::string& text)
+ref <POP3Command> POP3Command::createCommand(const string& text)
{
return vmime::create <POP3Command>(text);
}
diff --git a/src/net/smtp/SMTPCommand.cpp b/src/net/smtp/SMTPCommand.cpp
index 99a3ac17..35ea56fb 100644
--- a/src/net/smtp/SMTPCommand.cpp
+++ b/src/net/smtp/SMTPCommand.cpp
@@ -40,14 +40,14 @@ namespace net {
namespace smtp {
-SMTPCommand::SMTPCommand(const std::string& text)
+SMTPCommand::SMTPCommand(const string& text)
: m_text(text)
{
}
// static
-ref <SMTPCommand> SMTPCommand::EHLO(const std::string& hostname)
+ref <SMTPCommand> SMTPCommand::EHLO(const string& hostname)
{
std::ostringstream cmd;
cmd.imbue(std::locale::classic());
@@ -58,7 +58,7 @@ ref <SMTPCommand> SMTPCommand::EHLO(const std::string& hostname)
// static
-ref <SMTPCommand> SMTPCommand::HELO(const std::string& hostname)
+ref <SMTPCommand> SMTPCommand::HELO(const string& hostname)
{
std::ostringstream cmd;
cmd.imbue(std::locale::classic());
@@ -69,7 +69,7 @@ ref <SMTPCommand> SMTPCommand::HELO(const std::string& hostname)
// static
-ref <SMTPCommand> SMTPCommand::AUTH(const std::string& mechName)
+ref <SMTPCommand> SMTPCommand::AUTH(const string& mechName)
{
std::ostringstream cmd;
cmd.imbue(std::locale::classic());
@@ -147,7 +147,7 @@ ref <SMTPCommand> SMTPCommand::QUIT()
// static
-ref <SMTPCommand> SMTPCommand::createCommand(const std::string& text)
+ref <SMTPCommand> SMTPCommand::createCommand(const string& text)
{
return vmime::create <SMTPCommand>(text);
}
diff --git a/src/parameter.cpp b/src/parameter.cpp
index b86d4815..901139e3 100644
--- a/src/parameter.cpp
+++ b/src/parameter.cpp
@@ -290,7 +290,7 @@ void parameter::generateImpl
// value is to be generated.
// A stream for a temporary storage
- std::string sevenBitBuffer;
+ string sevenBitBuffer;
utility::outputStreamStringAdapter sevenBitStream(sevenBitBuffer);
string::size_type pos = curLinePos;
diff --git a/src/propertySet.cpp b/src/propertySet.cpp
index 3202a8b8..b0084d31 100644
--- a/src/propertySet.cpp
+++ b/src/propertySet.cpp
@@ -131,7 +131,7 @@ void propertySet::parse(const string& props)
{
value.reserve(50);
- const std::string::value_type quoteChar = *pos;
+ const string::value_type quoteChar = *pos;
bool theEnd = false;
bool escape = false;
diff --git a/src/utility/filteredStream.cpp b/src/utility/filteredStream.cpp
index 294a7a94..ecc2eae2 100644
--- a/src/utility/filteredStream.cpp
+++ b/src/utility/filteredStream.cpp
@@ -306,7 +306,7 @@ void LFToCRLFFilteredOutputStream::write
if (count == 0)
return;
- std::string buffer;
+ string buffer;
buffer.reserve(count);
const value_type* pos = data;
diff --git a/src/utility/parserInputStreamAdapter.cpp b/src/utility/parserInputStreamAdapter.cpp
index 54bc8f6a..0d6248cf 100644
--- a/src/utility/parserInputStreamAdapter.cpp
+++ b/src/utility/parserInputStreamAdapter.cpp
@@ -88,7 +88,7 @@ const string parserInputStreamAdapter::extract(const size_type begin, const size
stream::size_type parserInputStreamAdapter::findNext
- (const std::string& token, const size_type startPosition)
+ (const string& token, const size_type startPosition)
{
static const unsigned int BUFFER_SIZE = 4096;
diff --git a/vmime/net/imap/IMAPUtils.hpp b/vmime/net/imap/IMAPUtils.hpp
index e9527813..aea02ef9 100644
--- a/vmime/net/imap/IMAPUtils.hpp
+++ b/vmime/net/imap/IMAPUtils.hpp
@@ -143,7 +143,7 @@ public:
private:
static const string buildFetchRequestImpl
- (const std::string& mode, const std::string& set, const int options);
+ (const string& mode, const string& set, const int options);
};
diff --git a/vmime/net/smtp/SMTPCommand.hpp b/vmime/net/smtp/SMTPCommand.hpp
index 774587de..79db16a2 100644
--- a/vmime/net/smtp/SMTPCommand.hpp
+++ b/vmime/net/smtp/SMTPCommand.hpp
@@ -59,9 +59,9 @@ class VMIME_EXPORT SMTPCommand : public object
public:
- static ref <SMTPCommand> HELO(const std::string& hostname);
- static ref <SMTPCommand> EHLO(const std::string& hostname);
- static ref <SMTPCommand> AUTH(const std::string& mechName);
+ static ref <SMTPCommand> HELO(const string& hostname);
+ static ref <SMTPCommand> EHLO(const string& hostname);
+ static ref <SMTPCommand> AUTH(const string& mechName);
static ref <SMTPCommand> STARTTLS();
static ref <SMTPCommand> MAIL(const mailbox& mbox);
static ref <SMTPCommand> RCPT(const mailbox& mbox);
@@ -75,7 +75,7 @@ public:
* @param text command text
* @return a new SMTPCommand object
*/
- static ref <SMTPCommand> createCommand(const std::string& text);
+ static ref <SMTPCommand> createCommand(const string& text);
/** Sends this command to the specified socket.
*
@@ -92,12 +92,12 @@ public:
protected:
- SMTPCommand(const std::string& text);
+ SMTPCommand(const string& text);
SMTPCommand(const SMTPCommand&);
private:
- std::string m_text;
+ string m_text;
};
diff --git a/vmime/propertySet.hpp b/vmime/propertySet.hpp
index cd84aed5..a2679808 100644
--- a/vmime/propertySet.hpp
+++ b/vmime/propertySet.hpp
@@ -341,7 +341,7 @@ private:
private:
- const std::string m_name;
+ const string m_name;
};
ref <property> find(const string& name) const;
diff --git a/vmime/security/digest/messageDigestFactory.hpp b/vmime/security/digest/messageDigestFactory.hpp
index 9c743827..2a1a4083 100644
--- a/vmime/security/digest/messageDigestFactory.hpp
+++ b/vmime/security/digest/messageDigestFactory.hpp
@@ -70,7 +70,7 @@ private:
};
- typedef std::map <std::string, ref <digestAlgorithmFactory> > MapType;
+ typedef std::map <string, ref <digestAlgorithmFactory> > MapType;
MapType m_algos;
public:
diff --git a/vmime/utility/parserInputStreamAdapter.hpp b/vmime/utility/parserInputStreamAdapter.hpp
index 3b323658..ae2b1af9 100644
--- a/vmime/utility/parserInputStreamAdapter.hpp
+++ b/vmime/utility/parserInputStreamAdapter.hpp
@@ -157,7 +157,7 @@ public:
return pos - initialPos;
}
- size_type findNext(const std::string& token, const size_type startPosition = 0);
+ size_type findNext(const string& token, const size_type startPosition = 0);
private: