Removed relative paths from #include's.

ChangeLog

@@ -2,6 +2,10 @@
 VERSION 0.6.1-cvs
 =================
 
+2004-12-26  Vincent Richard  <vincent@vincent-richard.net>
+
+ * Removed relative paths from #include's.
+
 2004-12-24  Vincent Richard  <vincent@vincent-richard.net>
 
  * Renamed class 'disposition' to 'contentDisposition' and the enum

src/messaging/IMAPConnection.cpp

@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPTag.hpp"
-#include "IMAPConnection.hpp"
-#include "IMAPUtils.hpp"
-#include "IMAPStore.hpp"
+#include "messaging/IMAPTag.hpp"
+#include "messaging/IMAPConnection.hpp"
+#include "messaging/IMAPUtils.hpp"
+#include "messaging/IMAPStore.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 #include <sstream>
 

src/messaging/IMAPConnection.hpp

@@ -21,12 +21,13 @@
 #define VMIME_MESSAGING_IMAPCONNECTION_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
-#include "socket.hpp"
-#include "../config.hpp"
-#include "timeoutHandler.hpp"
+#include "config.hpp"
 
-#include "IMAPParser.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/timeoutHandler.hpp"
+
+#include "messaging/IMAPParser.hpp"
 
 
 namespace vmime {

src/messaging/IMAPFolder.cpp

@@ -17,16 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPFolder.hpp"
+#include "messaging/IMAPFolder.hpp"
 
-#include "IMAPStore.hpp"
-#include "IMAPParser.hpp"
-#include "IMAPMessage.hpp"
-#include "IMAPUtils.hpp"
-#include "IMAPConnection.hpp"
+#include "messaging/IMAPStore.hpp"
+#include "messaging/IMAPParser.hpp"
+#include "messaging/IMAPMessage.hpp"
+#include "messaging/IMAPUtils.hpp"
+#include "messaging/IMAPConnection.hpp"
 
-#include "../exception.hpp"
-#include "../utility/smartPtr.hpp"
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+
+#include "exception.hpp"
+#include "utility/smartPtr.hpp"
 
 #include <algorithm>
 #include <sstream>

src/messaging/IMAPFolder.hpp

@@ -24,8 +24,9 @@
 #include <vector>
 #include <map>
 
-#include "../types.hpp"
-#include "folder.hpp"
+#include "types.hpp"
+
+#include "messaging/folder.hpp"
 
 
 namespace vmime {

src/messaging/IMAPMessage.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPParser.hpp"
-#include "IMAPMessage.hpp"
-#include "IMAPFolder.hpp"
-#include "IMAPStore.hpp"
-#include "IMAPConnection.hpp"
-#include "IMAPUtils.hpp"
+#include "messaging/IMAPParser.hpp"
+#include "messaging/IMAPMessage.hpp"
+#include "messaging/IMAPFolder.hpp"
+#include "messaging/IMAPStore.hpp"
+#include "messaging/IMAPConnection.hpp"
+#include "messaging/IMAPUtils.hpp"
 
 #include <sstream>
 #include <iterator>

src/messaging/IMAPMessage.hpp

@@ -21,9 +21,10 @@
 #define VMIME_MESSAGING_IMAPMESSAGE_HPP_INCLUDED
 
 
-#include "message.hpp"
-#include "folder.hpp"
-#include "../mailboxList.hpp"
+#include "messaging/message.hpp"
+#include "messaging/folder.hpp"
+
+#include "mailboxList.hpp"
 
 
 namespace vmime {

src/messaging/IMAPParser.hpp

@@ -21,23 +21,24 @@
 #define VMIME_MESSAGING_IMAPPARSER_HPP_INCLUDED
 
 
-#include "../base.hpp"
-#include "../dateTime.hpp"
-#include "../charset.hpp"
-#include "../exception.hpp"
-#include "../utility/smartPtr.hpp"
-#include "../utility/stringUtils.hpp"
+#include "base.hpp"
+#include "dateTime.hpp"
+#include "charset.hpp"
+#include "exception.hpp"
 
-#include "../encoderB64.hpp"
-#include "../encoderQP.hpp"
+#include "utility/smartPtr.hpp"
+#include "utility/stringUtils.hpp"
 
-#include "../platformDependant.hpp"
+#include "encoderB64.hpp"
+#include "encoderQP.hpp"
 
-#include "progressionListener.hpp"
-#include "timeoutHandler.hpp"
-#include "socket.hpp"
+#include "platformDependant.hpp"
 
-#include "IMAPTag.hpp"
+#include "messaging/progressionListener.hpp"
+#include "messaging/timeoutHandler.hpp"
+#include "messaging/socket.hpp"
+
+#include "messaging/IMAPTag.hpp"
 
 #include <vector>
 #include <stdexcept>

src/messaging/IMAPStore.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPStore.hpp"
-#include "IMAPFolder.hpp"
-#include "IMAPConnection.hpp"
+#include "messaging/IMAPStore.hpp"
+#include "messaging/IMAPFolder.hpp"
+#include "messaging/IMAPConnection.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 #include <map>
 

src/messaging/IMAPStore.hpp

@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_IMAPSTORE_HPP_INCLUDED
 
 
-#include "store.hpp"
-#include "socket.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+
+#include "messaging/store.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/folder.hpp"
 
 #include <ostream>
 

src/messaging/IMAPTag.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPTag.hpp"
+#include "messaging/IMAPTag.hpp"
 
 
 namespace vmime {

src/messaging/IMAPUtils.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "IMAPUtils.hpp"
-#include "message.hpp"
+#include "messaging/IMAPUtils.hpp"
+#include "messaging/message.hpp"
 
 #include <sstream>
 #include <iterator>

src/messaging/IMAPUtils.hpp

@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_IMAPUTILS_HPP_INCLUDED
 
 
-#include "folder.hpp"
-#include "../types.hpp"
-#include "IMAPParser.hpp"
-#include "../dateTime.hpp"
+#include "types.hpp"
+#include "dateTime.hpp"
+
+#include "messaging/folder.hpp"
+#include "messaging/IMAPParser.hpp"
 
 #include <vector>
 

src/messaging/POP3Folder.cpp

@@ -17,12 +17,12 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "POP3Folder.hpp"
+#include "messaging/POP3Folder.hpp"
 
-#include "POP3Store.hpp"
-#include "POP3Message.hpp"
+#include "messaging/POP3Store.hpp"
+#include "messaging/POP3Message.hpp"
 
-#include "../exception.hpp"
+#include "exception.hpp"
 
 
 namespace vmime {

src/messaging/POP3Folder.hpp

@@ -24,9 +24,10 @@
 #include <vector>
 #include <map>
 
-#include "../types.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+#include "types.hpp"
+
+#include "messaging/folder.hpp"
 
 
 namespace vmime {

src/messaging/POP3Message.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "POP3Message.hpp"
-#include "POP3Folder.hpp"
-#include "POP3Store.hpp"
+#include "messaging/POP3Message.hpp"
+#include "messaging/POP3Folder.hpp"
+#include "messaging/POP3Store.hpp"
 
 #include <sstream>
 

src/messaging/POP3Message.hpp

@@ -21,9 +21,10 @@
 #define VMIME_MESSAGING_POP3MESSAGE_HPP_INCLUDED
 
 
-#include "message.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+
+#include "messaging/message.hpp"
+#include "messaging/folder.hpp"
 
 
 namespace vmime {

src/messaging/POP3Store.cpp

@@ -17,14 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "POP3Store.hpp"
+#include "messaging/POP3Store.hpp"
+#include "messaging/POP3Folder.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
-#include "../messageId.hpp"
-#include "../utility/md5.hpp"
-
-#include "POP3Folder.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
+#include "messageId.hpp"
+#include "utility/md5.hpp"
 
 #include <algorithm>
 

src/messaging/POP3Store.hpp

@@ -21,11 +21,13 @@
 #define VMIME_MESSAGING_POP3STORE_HPP_INCLUDED
 
 
-#include "store.hpp"
-#include "socket.hpp"
-#include "../config.hpp"
-#include "timeoutHandler.hpp"
-#include "../utility/stream.hpp"
+#include "config.hpp"
+
+#include "messaging/store.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/timeoutHandler.hpp"
+
+#include "utility/stream.hpp"
 
 
 namespace vmime {

src/messaging/SMTPTransport.cpp

@@ -17,14 +17,15 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "SMTPTransport.hpp"
+#include "messaging/SMTPTransport.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
-#include "../encoderB64.hpp"
-#include "../message.hpp"
-#include "../mailboxList.hpp"
-#include "authHelper.hpp"
+#include "exception.hpp"
+#include "platformDependant.hpp"
+#include "encoderB64.hpp"
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+#include "mailboxList.hpp"
+
+#include "messaging/authHelper.hpp"
 
 
 namespace vmime {

src/messaging/SMTPTransport.hpp

@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_SMTPTRANSPORT_HPP_INCLUDED
 
 
-#include "transport.hpp"
-#include "socket.hpp"
-#include "../config.hpp"
-#include "timeoutHandler.hpp"
+#include "config.hpp"
+
+#include "messaging/transport.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/timeoutHandler.hpp"
 
 
 namespace vmime {

src/messaging/authHelper.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "authHelper.hpp"
+#include "messaging/authHelper.hpp"
 
-#include "../config.hpp"
-#include "../utility/md5.hpp"
+#include "config.hpp"
+#include "utility/md5.hpp"
 
 
 namespace vmime {

src/messaging/authHelper.hpp

@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHHELPER_HPP_INCLUDED
 
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {

src/messaging/authenticationInfos.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "authenticationInfos.hpp"
+#include "messaging/authenticationInfos.hpp"
 
 
 namespace vmime {

src/messaging/authenticationInfos.hpp

@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHENTICATIONINFOS_HPP_INCLUDED
 
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {

src/messaging/authenticator.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "authenticator.hpp"
+#include "messaging/authenticator.hpp"
 
 
 namespace vmime {

src/messaging/authenticator.hpp

@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_AUTHENTICATOR_HPP_INCLUDED
 
 
-#include "authenticationInfos.hpp"
+#include "messaging/authenticationInfos.hpp"
 
 
 namespace vmime {

src/messaging/defaultAuthenticator.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "defaultAuthenticator.hpp"
+#include "messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {

src/messaging/defaultAuthenticator.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_DEFAULTAUTHENTICATOR_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
-#include "../propertySet.hpp"
+#include "messaging/authenticator.hpp"
+#include "propertySet.hpp"
 
 
 namespace vmime {

src/messaging/events.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "events.hpp"
+#include "messaging/events.hpp"
 
 #include <algorithm>
 

src/messaging/events.hpp

@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "../utility/path.hpp"
+#include "utility/path.hpp"
 
 
 namespace vmime {

src/messaging/folder.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "folder.hpp"
+#include "messaging/folder.hpp"
 
 #include <algorithm>
 

src/messaging/folder.hpp

@@ -23,14 +23,13 @@
 
 #include <vector>
 
-#include "../types.hpp"
-#include "../dateTime.hpp"
-#include "progressionListener.hpp"
-#include "message.hpp"
-#include "../message.hpp"
-#include "events.hpp"
-#include "../utility/path.hpp"
-#include "../utility/stream.hpp"
+#include "types.hpp"
+#include "dateTime.hpp"
+#include "messaging/progressionListener.hpp"
+#include "messaging/message.hpp"
+#include "messaging/events.hpp"
+#include "utility/path.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {

src/messaging/maildirFolder.cpp

@@ -17,14 +17,18 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirFolder.hpp"
+#include "messaging/maildirFolder.hpp"
 
-#include "maildirStore.hpp"
-#include "maildirMessage.hpp"
-#include "maildirUtils.hpp"
+#include "messaging/maildirStore.hpp"
+#include "messaging/maildirMessage.hpp"
+#include "messaging/maildirUtils.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "utility/smartPtr.hpp"
+
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 
 namespace vmime {

src/messaging/maildirFolder.hpp

@@ -24,10 +24,11 @@
 #include <vector>
 #include <map>
 
-#include "../types.hpp"
-#include "folder.hpp"
+#include "types.hpp"
 
-#include "../utility/file.hpp"
+#include "messaging/folder.hpp"
+
+#include "utility/file.hpp"
 
 
 namespace vmime {

src/messaging/maildirMessage.cpp

@@ -17,12 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirMessage.hpp"
-#include "maildirFolder.hpp"
-#include "maildirUtils.hpp"
+#include "messaging/maildirMessage.hpp"
+#include "messaging/maildirFolder.hpp"
+#include "messaging/maildirUtils.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "messageParser.hpp"   // to include "message.hpp" in root directory
+
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 
 namespace vmime {

src/messaging/maildirMessage.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_MAILDIRMESSAGE_HPP_INCLUDED
 
 
-#include "message.hpp"
-#include "folder.hpp"
+#include "messaging/message.hpp"
+#include "messaging/folder.hpp"
 
 
 namespace vmime {

src/messaging/maildirStore.cpp

@@ -17,12 +17,14 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirStore.hpp"
+#include "messaging/maildirStore.hpp"
 
-#include "maildirFolder.hpp"
+#include "messaging/maildirFolder.hpp"
 
-#include "../exception.hpp"
-#include "../platformDependant.hpp"
+#include "utility/smartPtr.hpp"
+
+#include "exception.hpp"
+#include "platformDependant.hpp"
 
 
 namespace vmime {

src/messaging/maildirStore.hpp

@@ -21,10 +21,11 @@
 #define VMIME_MESSAGING_MAILDIRSTORE_HPP_INCLUDED
 
 
-#include "store.hpp"
-#include "socket.hpp"
-#include "folder.hpp"
-#include "../config.hpp"
+#include "config.hpp"
+
+#include "messaging/store.hpp"
+#include "messaging/socket.hpp"
+#include "messaging/folder.hpp"
 
 #include "utility/file.hpp"
 

src/messaging/maildirUtils.cpp

@@ -17,10 +17,10 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "maildirUtils.hpp"
-#include "maildirStore.hpp"
+#include "messaging/maildirUtils.hpp"
+#include "messaging/maildirStore.hpp"
 
-#include "../utility/random.hpp"
+#include "utility/random.hpp"
 
 
 namespace vmime {

src/messaging/maildirUtils.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_MAILDIRUTILS_HPP_INCLUDED
 
 
-#include "../utility/file.hpp"
-#include "../utility/path.hpp"
+#include "utility/file.hpp"
+#include "utility/path.hpp"
 
 
 namespace vmime {

src/messaging/message.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "message.hpp"
+#include "messaging/message.hpp"
 
 
 namespace vmime {

src/messaging/message.hpp

@@ -21,9 +21,9 @@
 #define VMIME_MESSAGING_MESSAGE_HPP_INCLUDED
 
 
-#include "../header.hpp"
-#include "progressionListener.hpp"
-#include "../utility/stream.hpp"
+#include "header.hpp"
+#include "messaging/progressionListener.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {

src/messaging/service.cpp

@@ -17,9 +17,9 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "service.hpp"
+#include "messaging/service.hpp"
 
-#include "defaultAuthenticator.hpp"
+#include "messaging/defaultAuthenticator.hpp"
 
 
 namespace vmime {

src/messaging/service.hpp

@@ -21,14 +21,15 @@
 #define VMIME_MESSAGING_SERVICE_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "session.hpp"
+#include "types.hpp"
 
-#include "authenticator.hpp"
-#include "progressionListener.hpp"
+#include "messaging/session.hpp"
 
-#include "serviceFactory.hpp"
-#include "serviceInfos.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/progressionListener.hpp"
+
+#include "messaging/serviceFactory.hpp"
+#include "messaging/serviceInfos.hpp"
 
 
 namespace vmime {

src/messaging/serviceFactory.cpp

@@ -17,13 +17,13 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "serviceFactory.hpp"
-#include "service.hpp"
+#include "messaging/serviceFactory.hpp"
+#include "messaging/service.hpp"
 
-#include "../exception.hpp"
-#include "../config.hpp"
+#include "exception.hpp"
+#include "config.hpp"
 
-#include "builtinServices.inl"
+#include "messaging/builtinServices.inl"
 
 
 namespace vmime {

src/messaging/serviceFactory.hpp

@@ -23,16 +23,16 @@
 
 #include <map>
 
-#include "../types.hpp"
-#include "../base.hpp"
-#include "../utility/singleton.hpp"
-#include "../utility/stringUtils.hpp"
+#include "types.hpp"
+#include "base.hpp"
+#include "utility/singleton.hpp"
+#include "utility/stringUtils.hpp"
 
-#include "serviceInfos.hpp"
-#include "authenticator.hpp"
-#include "progressionListener.hpp"
-#include "timeoutHandler.hpp"
-#include "url.hpp"
+#include "messaging/serviceInfos.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/progressionListener.hpp"
+#include "messaging/timeoutHandler.hpp"
+#include "messaging/url.hpp"
 
 
 namespace vmime {

src/messaging/serviceInfos.hpp

@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {

src/messaging/session.cpp

@@ -17,11 +17,11 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "session.hpp"
-#include "serviceFactory.hpp"
+#include "messaging/session.hpp"
+#include "messaging/serviceFactory.hpp"
 
-#include "store.hpp"
-#include "transport.hpp"
+#include "messaging/store.hpp"
+#include "messaging/transport.hpp"
 
 
 namespace vmime {

src/messaging/session.hpp

@@ -21,10 +21,10 @@
 #define VMIME_MESSAGING_SESSION_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
-#include "progressionListener.hpp"
+#include "messaging/authenticator.hpp"
+#include "messaging/progressionListener.hpp"
 
-#include "../propertySet.hpp"
+#include "propertySet.hpp"
 
 
 namespace vmime {

src/messaging/simpleAuthenticator.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "simpleAuthenticator.hpp"
+#include "messaging/simpleAuthenticator.hpp"
 
 
 namespace vmime {

src/messaging/simpleAuthenticator.hpp

@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_SIMPLEAUTHENTICATOR_HPP_INCLUDED
 
 
-#include "authenticator.hpp"
+#include "messaging/authenticator.hpp"
 
 
 namespace vmime {

src/messaging/socket.hpp

@@ -21,7 +21,7 @@
 #define VMIME_MESSAGING_SOCKET_HPP_INCLUDED
 
 
-#include "../base.hpp"
+#include "base.hpp"
 
 
 namespace vmime {

src/messaging/store.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_STORE_HPP_INCLUDED
 
 
-#include "service.hpp"
-#include "folder.hpp"
+#include "messaging/service.hpp"
+#include "messaging/folder.hpp"
 
 
 namespace vmime {

src/messaging/transport.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_TRANSPORT_HPP_INCLUDED
 
 
-#include "service.hpp"
-#include "../utility/stream.hpp"
+#include "messaging/service.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {

src/messaging/url.cpp

@@ -20,7 +20,7 @@
 #include "url.hpp"
 
 #include "parserHelpers.hpp"
-#include "urlUtils.hpp"
+#include "messaging/urlUtils.hpp"
 #include "exception.hpp"
 
 #include <sstream>

src/messaging/url.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_URL_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "../base.hpp"
+#include "types.hpp"
+#include "base.hpp"
 
 
 namespace vmime {

src/messaging/urlUtils.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "urlUtils.hpp"
+#include "messaging/urlUtils.hpp"
 
 
 namespace vmime {

src/messaging/urlUtils.hpp

@@ -21,8 +21,8 @@
 #define VMIME_MESSAGING_URLUTILS_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "../base.hpp"
+#include "types.hpp"
+#include "base.hpp"
 
 
 namespace vmime {

src/platforms/posix/file.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "file.hpp"
+#include "platforms/posix/file.hpp"
 
 #include <unistd.h>
 #include <fcntl.h>
@@ -30,7 +30,7 @@
 
 #include <string.h>
 
-#include "../../exception.hpp"
+#include "exception.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES

src/platforms/posix/file.hpp

@@ -21,7 +21,7 @@
 #define VMIME_PLATFORMS_POSIX_FILE_HPP_INCLUDED
 
 
-#include "../../utility/file.hpp"
+#include "utility/file.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES

src/platforms/posix/handler.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "handler.hpp"
+#include "platforms/posix/handler.hpp"
 
 #include <time.h>
 

src/platforms/posix/handler.hpp

@@ -21,15 +21,15 @@
 #define VMIME_PLATFORMS_POSIX_HANDLER_HPP_INCLUDED
 
 
-#include "../../config.hpp"
-#include "../../platformDependant.hpp"
+#include "config.hpp"
+#include "platformDependant.hpp"
 
 #if VMIME_HAVE_MESSAGING_FEATURES
-	#include "socket.hpp"
+	#include "platforms/posix/socket.hpp"
 #endif
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES
-     #include "file.hpp"
+     #include "platforms/posix/file.hpp"
 #endif
 
 

src/platforms/posix/socket.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "socket.hpp"
+#include "platforms/posix/socket.hpp"
 
 #include <unistd.h>
 #include <sys/socket.h>
@@ -27,7 +27,7 @@
 #include <netdb.h>
 #include <fcntl.h>
 
-#include "../../exception.hpp"
+#include "exception.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES

src/platforms/posix/socket.hpp

@@ -21,7 +21,7 @@
 #define VMIME_PLATFORMS_POSIX_SOCKET_HPP_INCLUDED
 
 
-#include "../../messaging/socket.hpp"
+#include "messaging/socket.hpp"
 
 
 #if VMIME_HAVE_MESSAGING_FEATURES

src/utility/file.hpp

@@ -21,9 +21,10 @@
 #define VMIME_UTILITY_FILE_HPP_INCLUDED
 
 
-#include "path.hpp"
-#include "../config.hpp"
-#include "stream.hpp"
+#include "config.hpp"
+
+#include "utility/path.hpp"
+#include "utility/stream.hpp"
 
 
 #if VMIME_HAVE_FILESYSTEM_FEATURES

src/utility/md5.cpp

@@ -44,7 +44,7 @@
 //     These notices must be retained in any copies of any part of this
 //     documentation and/or software.
 
-#include "md5.hpp"
+#include "utility/md5.hpp"
 
 
 namespace vmime {

src/utility/path.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "path.hpp"
+#include "utility/path.hpp"
 
 #include <algorithm>
 

src/utility/path.hpp

@@ -23,8 +23,8 @@
 
 #include <vector>
 
-#include "../types.hpp"
-#include "../word.hpp"
+#include "types.hpp"
+#include "word.hpp"
 
 
 namespace vmime {

src/utility/random.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "random.hpp"
+#include "utility/random.hpp"
 #include "platformDependant.hpp"
 
 #include <ctime>

src/utility/stream.cpp

@@ -17,8 +17,8 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "stream.hpp"
-#include "stringProxy.hpp"
+#include "utility/stream.hpp"
+#include "utility/stringProxy.hpp"
 
 #include <algorithm>  // for std::copy
 #include <iterator>   // for std::back_inserter

src/utility/stream.hpp

@@ -24,7 +24,7 @@
 #include <istream>
 #include <ostream>
 
-#include "../types.hpp"
+#include "types.hpp"
 
 
 namespace vmime {

src/utility/stringProxy.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "stringProxy.hpp"
+#include "utility/stringProxy.hpp"
 
 #include <iterator>
 #include <algorithm>

src/utility/stringProxy.hpp

@@ -23,8 +23,8 @@
 
 #include <limits>
 
-#include "../types.hpp"
-#include "stream.hpp"
+#include "types.hpp"
+#include "utility/stream.hpp"
 
 
 namespace vmime {

src/utility/stringUtils.cpp

@@ -17,7 +17,7 @@
 // Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 //
 
-#include "stringUtils.hpp"
+#include "utility/stringUtils.hpp"
 
 
 namespace vmime

src/utility/stringUtils.hpp

@@ -21,8 +21,8 @@
 #define VMIME_STRINGUTILS_HPP_INCLUDED
 
 
-#include "../types.hpp"
-#include "../base.hpp"
+#include "types.hpp"
+#include "base.hpp"
 
 #include <sstream>