diff options
Diffstat (limited to 'src')
29 files changed, 69 insertions, 41 deletions
diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h index 6b1538c4..0be287af 100644 --- a/src/async/smtp/MCSMTPAsyncSession.h +++ b/src/async/smtp/MCSMTPAsyncSession.h @@ -4,7 +4,6 @@ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCMessageConstants.h> -#include <libetpan/libetpan.h> #ifdef __cplusplus diff --git a/src/core/abstract/MCAbstractPart.cc b/src/core/abstract/MCAbstractPart.cc index 78e2e365..b07063ad 100644 --- a/src/core/abstract/MCAbstractPart.cc +++ b/src/core/abstract/MCAbstractPart.cc @@ -2,6 +2,7 @@ #include <string.h> #include <stdlib.h> +#include <libetpan/libetpan.h> using namespace mailcore; diff --git a/src/core/abstract/MCAddress.cc b/src/core/abstract/MCAddress.cc index 2ef1cd2b..3afd07b9 100644 --- a/src/core/abstract/MCAddress.cc +++ b/src/core/abstract/MCAddress.cc @@ -1,5 +1,6 @@ #include "MCAddress.h" +#include <libetpan/libetpan.h> #include <string.h> using namespace mailcore; diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h index 9ed71414..6843e89b 100644 --- a/src/core/abstract/MCAddress.h +++ b/src/core/abstract/MCAddress.h @@ -2,7 +2,6 @@ #define __MAILCORE_MCADDRESS_H_ -#include <libetpan/libetpan.h> #include <MailCore/MCBaseTypes.h> #ifdef __cplusplus diff --git a/src/core/abstract/MCMessageHeader.cc b/src/core/abstract/MCMessageHeader.cc index 7b8db731..43620f2a 100644 --- a/src/core/abstract/MCMessageHeader.cc +++ b/src/core/abstract/MCMessageHeader.cc @@ -4,6 +4,7 @@ #include <string.h> #include <unistd.h> +#include <libetpan/libetpan.h> using namespace mailcore; diff --git a/src/core/basetypes/MCArray.cc b/src/core/basetypes/MCArray.cc index 1f9d5130..73921085 100644 --- a/src/core/basetypes/MCArray.cc +++ b/src/core/basetypes/MCArray.cc @@ -2,6 +2,7 @@ #include <string.h> #include <stdlib.h> +#include <libetpan/libetpan.h> #include "MCAssert.h" #include "MCString.h" diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h index 6ee17549..ebbf1e5f 100644 --- a/src/core/basetypes/MCArray.h +++ b/src/core/basetypes/MCArray.h @@ -4,10 +4,10 @@ #include <MailCore/MCObject.h> -#include <libetpan/libetpan.h> - #ifdef __cplusplus +typedef struct carray_s carray; + namespace mailcore { class String; diff --git a/src/core/basetypes/MCAutoreleasePool.cc b/src/core/basetypes/MCAutoreleasePool.cc index 38f9630c..80f3e1a4 100644 --- a/src/core/basetypes/MCAutoreleasePool.cc +++ b/src/core/basetypes/MCAutoreleasePool.cc @@ -1,5 +1,7 @@ #include "MCAutoreleasePool.h" +#include <libetpan/libetpan.h> + #include "MCString.h" #include "MCLog.h" #include "MCUtils.h" diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h index 6d0b2ad2..0b0a9397 100644 --- a/src/core/basetypes/MCAutoreleasePool.h +++ b/src/core/basetypes/MCAutoreleasePool.h @@ -3,11 +3,12 @@ #define __MAILCORE_MCAUTORELEASEPOOL_H_ #include <MailCore/MCObject.h> -#include <libetpan/libetpan.h> #include <pthread.h> #ifdef __cplusplus +typedef struct carray_s carray; + namespace mailcore { class AutoreleasePool : public Object { diff --git a/src/core/basetypes/MCBaseTypes.h b/src/core/basetypes/MCBaseTypes.h index 8ce52531..5ceac315 100644 --- a/src/core/basetypes/MCBaseTypes.h +++ b/src/core/basetypes/MCBaseTypes.h @@ -19,5 +19,6 @@ #include <MailCore/MCOperation.h> #include <MailCore/MCOperationQueue.h> #include <MailCore/MCOperationCallback.h> +#include <MailCore/MCLibetpanTypes.h> #endif diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h index 02f77d7a..92f2de48 100644 --- a/src/core/basetypes/MCOperationQueue.h +++ b/src/core/basetypes/MCOperationQueue.h @@ -5,7 +5,7 @@ #include <pthread.h> #include <semaphore.h> #include <MailCore/MCObject.h> -#include <libetpan/libetpan.h> +#include <MailCore/MCLibetpanTypes.h> #ifdef __cplusplus diff --git a/src/core/basetypes/MCString.cc b/src/core/basetypes/MCString.cc index 9d68a639..ae3c78f0 100644 --- a/src/core/basetypes/MCString.cc +++ b/src/core/basetypes/MCString.cc @@ -4,6 +4,7 @@ #include <stdlib.h> #include <unicode/ustring.h> #include <unicode/ucnv.h> +#include <unicode/utypes.h> #include <uuid/uuid.h> #include <pthread.h> #include <libetpan/libetpan.h> diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h index 53a27068..a8809bb1 100644 --- a/src/core/basetypes/MCString.h +++ b/src/core/basetypes/MCString.h @@ -6,10 +6,15 @@ #include <MailCore/MCRange.h> #include <stdarg.h> -#include <unicode/utypes.h> #ifdef __cplusplus +#if defined(__CHAR16_TYPE__) +typedef __CHAR16_TYPE__ UChar; +#else +typedef uint16_t UChar; +#endif + namespace mailcore { class Data; diff --git a/src/core/imap/MCIMAPNamespace.cc b/src/core/imap/MCIMAPNamespace.cc index c1c430fa..f087d87d 100644 --- a/src/core/imap/MCIMAPNamespace.cc +++ b/src/core/imap/MCIMAPNamespace.cc @@ -2,6 +2,8 @@ #include "MCIMAPNamespaceItem.h" +#include <libetpan/libetpan.h> + using namespace mailcore; void IMAPNamespace::init() diff --git a/src/core/imap/MCIMAPNamespaceItem.cc b/src/core/imap/MCIMAPNamespaceItem.cc index 7a608d68..81421a91 100644 --- a/src/core/imap/MCIMAPNamespaceItem.cc +++ b/src/core/imap/MCIMAPNamespaceItem.cc @@ -1,5 +1,7 @@ #include "MCIMAPNamespaceItem.h" +#include <libetpan/libetpan.h> + using namespace mailcore; static Array * encodedComponents(Array * components); diff --git a/src/core/imap/MCIMAPPart.cc b/src/core/imap/MCIMAPPart.cc index dc1a687f..9596533e 100644 --- a/src/core/imap/MCIMAPPart.cc +++ b/src/core/imap/MCIMAPPart.cc @@ -1,6 +1,7 @@ #include "MCIMAPPart.h" #include <string.h> +#include <libetpan/libetpan.h> #include "MCIMAPMessagePart.h" #include "MCIMAPMultipart.h" diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h index bca5a5bb..970c01e5 100644 --- a/src/core/imap/MCIMAPPart.h +++ b/src/core/imap/MCIMAPPart.h @@ -3,7 +3,6 @@ #define __MAILCORE_MCIMAPPART_H_ #include <MailCore/MCBaseTypes.h> -#include <libetpan/libetpan.h> #include <MailCore/MCAbstractPart.h> #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc index 6554704f..2b5fec8e 100644 --- a/src/core/imap/MCIMAPSession.cc +++ b/src/core/imap/MCIMAPSession.cc @@ -1,5 +1,6 @@ #include "MCIMAPSession.h" +#include <libetpan/libetpan.h> #include <string.h> #include <stdlib.h> diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h index fc6a8456..855444ae 100644 --- a/src/core/imap/MCIMAPSession.h +++ b/src/core/imap/MCIMAPSession.h @@ -4,7 +4,6 @@ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCMessageConstants.h> -#include <libetpan/libetpan.h> #ifdef __cplusplus diff --git a/src/core/pop/MCPOPSession.cc b/src/core/pop/MCPOPSession.cc index 88f80c8a..9cfe9157 100644 --- a/src/core/pop/MCPOPSession.cc +++ b/src/core/pop/MCPOPSession.cc @@ -1,6 +1,7 @@ #include "MCPOPSession.h" #include <string.h> +#include <libetpan/libetpan.h> #include "MCPOPMessageInfo.h" #include "MCPOPProgressCallback.h" diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h index 4c343877..3bbccf61 100644 --- a/src/core/pop/MCPOPSession.h +++ b/src/core/pop/MCPOPSession.h @@ -4,7 +4,6 @@ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCMessageConstants.h> -#include <libetpan/libetpan.h> #ifdef __cplusplus @@ -15,30 +14,6 @@ namespace mailcore { class MessageHeader; class POPSession : public Object { - private: - String * mHostname; - unsigned int mPort; - String * mUsername; - String * mPassword; - AuthType mAuthType; - ConnectionType mConnectionType; - bool mCheckCertificateEnabled; - time_t mTimeout; - - mailpop3 * mPop; - POPCapability mCapabilities; - POPProgressCallback * mProgressCallback; - int mState; - - void init(); - void bodyProgress(unsigned int current, unsigned int maximum); - bool checkCertificate(); - static void body_progress(size_t current, size_t maximum, void * context); - void setup(); - void unsetup(); - void connectIfNeeded(ErrorCode * pError); - void loginIfNeeded(ErrorCode * pError); - void listIfNeeded(ErrorCode * pError); public: POPSession(); @@ -85,6 +60,31 @@ namespace mailcore { void deleteMessage(unsigned int index, ErrorCode * pError); void deleteMessage(POPMessageInfo * msg, ErrorCode * pError); + + private: + String * mHostname; + unsigned int mPort; + String * mUsername; + String * mPassword; + AuthType mAuthType; + ConnectionType mConnectionType; + bool mCheckCertificateEnabled; + time_t mTimeout; + + mailpop3 * mPop; + POPCapability mCapabilities; + POPProgressCallback * mProgressCallback; + int mState; + + void init(); + void bodyProgress(unsigned int current, unsigned int maximum); + bool checkCertificate(); + static void body_progress(size_t current, size_t maximum, void * context); + void setup(); + void unsetup(); + void connectIfNeeded(ErrorCode * pError); + void loginIfNeeded(ErrorCode * pError); + void listIfNeeded(ErrorCode * pError); }; } diff --git a/src/core/renderer/MCDateFormatter.cpp b/src/core/renderer/MCDateFormatter.cpp index 1939813f..5d4ab2fb 100644 --- a/src/core/renderer/MCDateFormatter.cpp +++ b/src/core/renderer/MCDateFormatter.cpp @@ -8,6 +8,7 @@ #include "MCDateFormatter.h" #include <stdlib.h> +#include <unicode/udat.h> using namespace mailcore; diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h index 2649f7ae..eb33fe52 100644 --- a/src/core/renderer/MCDateFormatter.h +++ b/src/core/renderer/MCDateFormatter.h @@ -10,7 +10,10 @@ #define __testUI__MCDateFormatter__ #include <MailCore/MCBaseTypes.h> -#include <unicode/udat.h> + +// predeclare UDateFormat +// copied from <unicode/udat.h> +typedef void * UDateFormat; #ifdef __cplusplus @@ -18,12 +21,13 @@ namespace mailcore { class String; + // Uses same values as UDateFormatStyle enum DateFormatStyle { - DateFormatStyleFull = UDAT_FULL, - DateFormatStyleLong = UDAT_LONG, - DateFormatStyleMedium = UDAT_MEDIUM, - DateFormatStyleShort = UDAT_SHORT, - DateFormatStyleNone = UDAT_NONE, + DateFormatStyleFull = 0 /* UDAT_FULL*/, + DateFormatStyleLong = 1 /* UDAT_LONG */, + DateFormatStyleMedium = 2 /* UDAT_MEDIUM */, + DateFormatStyleShort = 3 /* UDAT_SHORT */, + DateFormatStyleNone = -1 /* UDAT_NONE */, }; class DateFormatter : public Object { diff --git a/src/core/rfc822/MCAttachment.cc b/src/core/rfc822/MCAttachment.cc index 5020ebd9..0874d300 100644 --- a/src/core/rfc822/MCAttachment.cc +++ b/src/core/rfc822/MCAttachment.cc @@ -8,6 +8,7 @@ #include <stdlib.h> #include <string.h> +#include <libetpan/libetpan.h> using namespace mailcore; diff --git a/src/core/rfc822/MCMessageBuilder.cc b/src/core/rfc822/MCMessageBuilder.cc index 461931c9..01a4aec6 100644 --- a/src/core/rfc822/MCMessageBuilder.cc +++ b/src/core/rfc822/MCMessageBuilder.cc @@ -7,6 +7,7 @@ #include <stdlib.h> #include <unistd.h> #include <string.h> +#include <libetpan/libetpan.h> using namespace mailcore; diff --git a/src/core/rfc822/MCMessageParser.cc b/src/core/rfc822/MCMessageParser.cc index a0dcf142..335ff43f 100644 --- a/src/core/rfc822/MCMessageParser.cc +++ b/src/core/rfc822/MCMessageParser.cc @@ -1,5 +1,7 @@ #include "MCMessageParser.h" +#include <libetpan/libetpan.h> + #include "MCAttachment.h" #include "MCMessageHeader.h" #include "MCHTMLRenderer.h" diff --git a/src/core/smtp/MCSMTPSession.cc b/src/core/smtp/MCSMTPSession.cc index 96bd9787..fd5832f3 100644 --- a/src/core/smtp/MCSMTPSession.cc +++ b/src/core/smtp/MCSMTPSession.cc @@ -1,6 +1,7 @@ #include "MCSMTPSession.h" #include <string.h> +#include <libetpan/libetpan.h> #include "MCAddress.h" #include "MCMessageBuilder.h" diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h index bae57cca..dc949731 100644 --- a/src/core/smtp/MCSMTPSession.h +++ b/src/core/smtp/MCSMTPSession.h @@ -4,7 +4,6 @@ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCMessageConstants.h> -#include <libetpan/libetpan.h> #ifdef __cplusplus diff --git a/src/objc/utils/NSObject+MCO.mm b/src/objc/utils/NSObject+MCO.mm index 5f1726e2..3ea4c430 100644 --- a/src/objc/utils/NSObject+MCO.mm +++ b/src/objc/utils/NSObject+MCO.mm @@ -8,6 +8,8 @@ #import "NSObject+MCO.h" +#include <libetpan/libetpan.h> + #import "NSData+MCO.h" #import "NSString+MCO.h" #import "NSDictionary+MCO.h" |