Moved 'url' and 'urlUtils' classes to 'utility' namespace.

4 files changed, 11 insertions, 11 deletions

diff --git a/src/messaging/serviceFactory.cpp b/src/messaging/serviceFactory.cpp
index ea7166ba..ea1752dd 100644
--- a/src/messaging/serviceFactory.cpp
+++ b/src/messaging/serviceFactory.cpp
@@ -60,13 +60,13 @@ service* serviceFactory::create
 
 
 service* serviceFactory::create
-	(session* sess, const url& u, authenticator* auth)
+	(session* sess, const utility::url& u, authenticator* auth)
 {
 	service* serv = create(sess, u.getProtocol(), auth);
 
 	sess->getProperties()[serv->getInfos().getPropertyPrefix() + "server.address"] = u.getHost();
 
-	if (u.getPort() != url::UNSPECIFIED_PORT)
+	if (u.getPort() != utility::url::UNSPECIFIED_PORT)
 		sess->getProperties()[serv->getInfos().getPropertyPrefix() + "server.port"] = u.getPort();
 
 	// Path portion of the URL is used to point a specific folder (empty = root).
diff --git a/src/messaging/session.cpp b/src/messaging/session.cpp
index a1f5d36e..35c188a2 100644
--- a/src/messaging/session.cpp
+++ b/src/messaging/session.cpp
@@ -64,7 +64,7 @@ transport* session::getTransport(const string& protocol, authenticator* auth)
 }
 
 
-transport* session::getTransport(const messaging::url& url, authenticator* auth)
+transport* session::getTransport(const utility::url& url, authenticator* auth)
 {
 	service* sv = serviceFactory::getInstance()->create(this, url, auth);
 
@@ -98,7 +98,7 @@ store* session::getStore(const string& protocol, authenticator* auth)
 }
 
 
-store* session::getStore(const messaging::url& url, authenticator* auth)
+store* session::getStore(const utility::url& url, authenticator* auth)
 {
 	service* sv = serviceFactory::getInstance()->create(this, url, auth);
 
diff --git a/src/messaging/url.cpp b/src/utility/url.cpp
index 1ee9607a..0c0a5799 100644
--- a/src/messaging/url.cpp
+++ b/src/utility/url.cpp
@@ -17,17 +17,17 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/url.hpp"
+#include "vmime/utility/url.hpp"
 
 #include "vmime/parserHelpers.hpp"
-#include "vmime/messaging/urlUtils.hpp"
+#include "vmime/utility/urlUtils.hpp"
 #include "vmime/exception.hpp"
 
 #include <sstream>
 
 
 namespace vmime {
-namespace messaging {
+namespace utility {
 
 
 // Known protocols
@@ -302,5 +302,5 @@ void url::setPath(const string& path)
 }
 
 
-} // messaging
+} // utility
 } // vmime
diff --git a/src/messaging/urlUtils.cpp b/src/utility/urlUtils.cpp
index 7dc1e30f..6099c19b 100644
--- a/src/messaging/urlUtils.cpp
+++ b/src/utility/urlUtils.cpp
@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "vmime/messaging/urlUtils.hpp"
+#include "vmime/utility/urlUtils.hpp"
 #include "vmime/parserHelpers.hpp"
 
 
 namespace vmime {
-namespace messaging {
+namespace utility {
 
 
 const string urlUtils::encode(const string& s)
@@ -90,5 +90,5 @@ const string urlUtils::decode(const string& s)
 }
 
 
-} // messaging
+} // utility
 } // vmime