diff options
| author |  Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2013-04-04 23:23:50 -0700 |
|---|---|---|
| committer | Hoa V. DINH <dinh.viet.hoa@gmail.com> | 2013-04-04 23:23:50 -0700 |
| commit | d036437a499feafdd79994fcaa38d03b50929fe0 (patch) | |
| tree | e000395d2eff5532184d8e73c49daa473cf73ecc | |
| parent | 6eba7f202753d79f2de6b8a8c87864e93394343c (diff) | |
Header documentation. Header clean-up
87 files changed, 358 insertions, 206 deletions
diff --git a/src/MailCore.h b/src/MailCore.h index d890a5e8..978b9cf7 100644 --- a/src/MailCore.h +++ b/src/MailCore.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_mailcore_h -#define mailcore2_mailcore_h +#ifndef __MAILCORE_MAILCORE_h + +#define __MAILCORE_MAILCORE_h #include <MailCore/MCCore.h> #include <MailCore/MCAsync.h> diff --git a/src/async/MCAsync.h b/src/async/MCAsync.h index 3198985d..414cb353 100644 --- a/src/async/MCAsync.h +++ b/src/async/MCAsync.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCAsync_h -#define mailcore2_MCAsync_h +#ifndef __MAILCORE_MCASYNC_H_ + +#define __MAILCORE_MCASYNC_H_ #include <MailCore/MCAsyncSMTP.h> #include <MailCore/MCAsyncIMAP.h> diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h index 441d05b4..c0c34487 100644 --- a/src/async/imap/MCAsyncIMAP.h +++ b/src/async/imap/MCAsyncIMAP.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCAsyncIMAP_h -#define mailcore2_MCAsyncIMAP_h +#ifndef __MAILCORE_MCASYNCIMAP_H_ + +#define __MAILCORE_MCASYNCIMAP_H_ #include <MailCore/MCIMAPAsyncSession.h> #include <MailCore/MCIMAPOperation.h> diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h index 3a047adb..90834c1f 100644 --- a/src/async/imap/MCIMAPAppendMessageOperation.h +++ b/src/async/imap/MCIMAPAppendMessageOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPAppendMessageOperation__ -#define __mailcore2__MCIMAPAppendMessageOperation__ +#ifndef __MAILCORE_MCIMAPAPPENDMESSAGEOPERATION_H_ + +#define __MAILCORE_MCIMAPAPPENDMESSAGEOPERATION_H_ #include <MailCore/MCIMAPOperation.h> #include <MailCore/MCMessageConstants.h> @@ -42,4 +43,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPAppendMessageOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index 3a11256b..7ca922c5 100644 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPAccount__ -#define __mailcore2__MCIMAPAccount__ +#ifndef __MAILCORE_MCIMAPACCOUNT_H_ + +#define __MAILCORE_MCIMAPACCOUNT_H_ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCMessageConstants.h> @@ -149,4 +150,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPAccount__) */ +#endif
\ No newline at end of file diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h index 8fb76dc2..82a51d93 100644 --- a/src/async/imap/MCIMAPCapabilityOperation.h +++ b/src/async/imap/MCIMAPCapabilityOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPCapabilityOperation__ -#define __mailcore2__MCIMAPCapabilityOperation__ +#ifndef __MAILCORE_MCIMAPCAPABILITYOPERATION_H_ + +#define __MAILCORE_MCIMAPCAPABILITYOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -33,4 +34,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPCapabilityOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h index c0f2f4f7..78c95d52 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.h +++ b/src/async/imap/MCIMAPCheckAccountOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPCheckAccountOperation__ -#define __mailcore2__MCIMAPCheckAccountOperation__ +#ifndef __MAILCORE_MCIMAPCHECKACCOUNTOPERATION_H_ + +#define __MAILCORE_MCIMAPCHECKACCOUNTOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -23,4 +24,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPCheckAccountOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h index a37d442e..06f1eff8 100644 --- a/src/async/imap/MCIMAPCopyMessagesOperation.h +++ b/src/async/imap/MCIMAPCopyMessagesOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPCopyMessagesOperation__ -#define __mailcore2__MCIMAPCopyMessagesOperation__ +#ifndef __MAILCORE_MCIMAPCOPYMESSAGESOPERATION_H_ + +#define __MAILCORE_MCIMAPCOPYMESSAGESOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -41,4 +42,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPCopyMessagesOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h index ff8955fe..8aa360ca 100644 --- a/src/async/imap/MCIMAPCreateFolderOperation.h +++ b/src/async/imap/MCIMAPCreateFolderOperation.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPCreateFolderOperation__ -#define __mailcore2__MCIMAPCreateFolderOperation__ +#ifndef __MAILCORE_MCIMAPCREATEFOLDEROPERATION_H_ +#define __MAILCORE_MCIMAPCREATEFOLDEROPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -27,4 +27,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPCreateFolderOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h index c5d7cbfc..5644cf84 100644 --- a/src/async/imap/MCIMAPDeleteFolderOperation.h +++ b/src/async/imap/MCIMAPDeleteFolderOperation.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPDeleteFolderOperation__ -#define __mailcore2__MCIMAPDeleteFolderOperation__ +#ifndef __MAILCORE_MCIMAPDELETEFOLDEROPERATION_H_ +#define __MAILCORE_MCIMAPDELETEFOLDEROPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -27,4 +27,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPDeleteFolderOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h index 5ed86352..270eac60 100644 --- a/src/async/imap/MCIMAPExpungeOperation.h +++ b/src/async/imap/MCIMAPExpungeOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPExpungeOperation__ -#define __mailcore2__MCIMAPExpungeOperation__ +#ifndef __MAILCORE_MCIMAPEXPUNGEOPERATION_H_ + +#define __MAILCORE_MCIMAPEXPUNGEOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -27,4 +28,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPExpungeOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h index 5ea0fe01..7de797ae 100644 --- a/src/async/imap/MCIMAPFetchContentOperation.h +++ b/src/async/imap/MCIMAPFetchContentOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__IMAPFetchContentOperation__ -#define __mailcore2__IMAPFetchContentOperation__ +#ifndef __MAILCORE_IMAPFETCHCONTENTOPERATION_H_ + +#define __MAILCORE_IMAPFETCHCONTENTOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -46,4 +47,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__IMAPFetchContentOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h index 84d2a87f..ebc49ca8 100644 --- a/src/async/imap/MCIMAPFetchFoldersOperation.h +++ b/src/async/imap/MCIMAPFetchFoldersOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPFetchFoldersOperation__ -#define __mailcore2__MCIMAPFetchFoldersOperation__ +#ifndef __MAILCORE_MCIMAPFETCHFOLDERSOPERATION_H_ + +#define __MAILCORE_MCIMAPFETCHFOLDERSOPERATION_H_ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCIMAPOperation.h> @@ -41,4 +42,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPFetchFoldersOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h index 42f0ea0a..c719ef6a 100644 --- a/src/async/imap/MCIMAPFetchMessagesOperation.h +++ b/src/async/imap/MCIMAPFetchMessagesOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__IMAPFetchMessagesOperation__ -#define __mailcore2__IMAPFetchMessagesOperation__ +#ifndef __MAILCORE_MCIMAPFETCHMESSAGESOPERATION_H_ + +#define __MAILCORE_MCIMAPFETCHMESSAGESOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -52,4 +53,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__IMAPFetchMessagesOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h index 8fa348b1..a1e32ec7 100644 --- a/src/async/imap/MCIMAPFetchNamespaceOperation.h +++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__IMAPFetchNamespaceOperation__ -#define __mailcore2__IMAPFetchNamespaceOperation__ +#ifndef __MAILCORE_MCIMAPFETCHNAMESPACEOPERATION_H_ + +#define __MAILCORE_MCIMAPFETCHNAMESPACEOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -34,4 +35,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__IMAPFetchNamespaceOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h index f11bb7ca..cdf6f35a 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.h +++ b/src/async/imap/MCIMAPFolderInfoOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPFolderInfoOperation__ -#define __mailcore2__MCIMAPFolderInfoOperation__ +#ifndef __MAILCORE_MCIMAPFOLDERINFOOPERATION_H_ + +#define __MAILCORE_MCIMAPFOLDERINFOOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -40,4 +41,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPFolderInfoOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h index 1cd2d662..069918cf 100644 --- a/src/async/imap/MCIMAPIdentityOperation.h +++ b/src/async/imap/MCIMAPIdentityOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__IMAPIdentityOperation__ -#define __mailcore2__IMAPIdentityOperation__ +#ifndef __MAILCORE_MCIMAPIDENTITYOPERATION_H_ + +#define __MAILCORE_MCIMAPIDENTITYOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -46,4 +47,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__IMAPIdentityOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h index 3ba5fdf4..377014dd 100644 --- a/src/async/imap/MCIMAPIdleOperation.h +++ b/src/async/imap/MCIMAPIdleOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__IMAPIdleOperation__ -#define __mailcore2__IMAPIdleOperation__ +#ifndef __MAILCORE_MCIMAPIDLEOPERATION_H_ + +#define __MAILCORE_MCIMAPIDLEOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -38,4 +39,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__IMAPIdleOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h index 7a8c1384..f7e937db 100644 --- a/src/async/imap/MCIMAPOperation.h +++ b/src/async/imap/MCIMAPOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPOperation__ -#define __mailcore2__MCIMAPOperation__ +#ifndef __MAILCORE_MCIMAPOPERATION_H_ + +#define __MAILCORE_MCIMAPOPERATION_H_ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCIMAPProgressCallback.h> @@ -57,4 +58,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPOperationCallback.h b/src/async/imap/MCIMAPOperationCallback.h index 4b0f166d..4899e585 100644 --- a/src/async/imap/MCIMAPOperationCallback.h +++ b/src/async/imap/MCIMAPOperationCallback.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPOperationCallback__ -#define __mailcore2__MCIMAPOperationCallback__ +#ifndef __MAILCORE_MCIMAPOPERATIONCALLBACK_H_ + +#define __MAILCORE_MCIMAPOPERATIONCALLBACK_H_ #ifdef __cplusplus @@ -25,4 +26,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPOperationCallback__) */ +#endif diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h index cd966794..5db74d4b 100644 --- a/src/async/imap/MCIMAPRenameFolderOperation.h +++ b/src/async/imap/MCIMAPRenameFolderOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPRenameFolderOperation__ -#define __mailcore2__MCIMAPRenameFolderOperation__ +#ifndef __MAILCORE_MCIMAPRENAMEFOLDEROPERATION_H_ + +#define __MAILCORE_MCIMAPRENAMEFOLDEROPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -34,4 +35,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPRenameFolderOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h index 7063284a..ca0c174d 100644 --- a/src/async/imap/MCIMAPSearchOperation.h +++ b/src/async/imap/MCIMAPSearchOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__IMAPSearchOperation__ -#define __mailcore2__IMAPSearchOperation__ +#ifndef __MAILCORE_MCIMAPSEARCHOPERATION_H_ + +#define __MAILCORE_MCIMAPSEARCHOPERATION_H_ #include <MailCore/MCIMAPOperation.h> #include <MailCore/MCMessageConstants.h> @@ -49,4 +50,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__IMAPSearchOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h index cf5655ec..e4f0f074 100644 --- a/src/async/imap/MCIMAPStoreFlagsOperation.h +++ b/src/async/imap/MCIMAPStoreFlagsOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPStoreFlagsOperation__ -#define __mailcore2__MCIMAPStoreFlagsOperation__ +#ifndef __MAILCORE_MCIMAPSTOREFLAGSOPERATION_H_ + +#define __MAILCORE_MCIMAPSTOREFLAGSOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -42,4 +43,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPStoreFlagsOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h index cf6e1925..fea31fd8 100644 --- a/src/async/imap/MCIMAPStoreLabelsOperation.h +++ b/src/async/imap/MCIMAPStoreLabelsOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPStoreLabelsOperation__ -#define __mailcore2__MCIMAPStoreLabelsOperation__ +#ifndef __MAILCORE_MCIMAPSTORELABELSOPERATION_H_ + +#define __MAILCORE_MCIMAPSTORELABELSOPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -42,4 +43,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPStoreLabelsOperation__) */ +#endif diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h index 1a344378..56a6a39a 100644 --- a/src/async/imap/MCIMAPSubscribeFolderOperation.h +++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPSubscribeFolderOperation__ -#define __mailcore2__MCIMAPSubscribeFolderOperation__ +#ifndef __MAILCORE_MCIMAPSUBSCRIBEFOLDEROPERATION_H_ + +#define __MAILCORE_MCIMAPSUBSCRIBEFOLDEROPERATION_H_ #include <MailCore/MCIMAPOperation.h> @@ -34,4 +35,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPSubscribeFolderOperation__) */ +#endif diff --git a/src/async/pop/MCAsyncPOP.h b/src/async/pop/MCAsyncPOP.h index 962b6ab9..880e700e 100644 --- a/src/async/pop/MCAsyncPOP.h +++ b/src/async/pop/MCAsyncPOP.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCAsyncPOP_h -#define mailcore2_MCAsyncPOP_h +#ifndef __MAILCORE_MCASYNCPOP_H_ + +#define __MAILCORE_MCASYNCPOP_H_ #include <MailCore/MCPOPAsyncSession.h> #include <MailCore/MCPOPOperation.h> diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h index 48dae219..41ada0ef 100644 --- a/src/async/pop/MCPOPAsyncSession.h +++ b/src/async/pop/MCPOPAsyncSession.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCPopAsyncSession__ -#define __mailcore2__MCPopAsyncSession__ +#ifndef __MAILCORE_MCPOPASYNCSESSION_H_ + +#define __MAILCORE_MCPOPASYNCSESSION_H_ #include <MailCore/MCBaseTypes.h> @@ -73,4 +74,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCPopAsyncSession__) */ +#endif diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h index 7056ad9c..a7e02d9f 100644 --- a/src/async/pop/MCPOPDeleteMessagesOperation.h +++ b/src/async/pop/MCPOPDeleteMessagesOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCPOPDeleteMessagesOperation__ -#define __mailcore2__MCPOPDeleteMessagesOperation__ +#ifndef __MAILCORE_MCPOPDELETEMESSAGESOPERATION_H_ + +#define __MAILCORE_MCPOPDELETEMESSAGESOPERATION_H_ #include <MailCore/MCPOPOperation.h> @@ -35,4 +36,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCPOPDeleteMessagesOperation__) */ +#endif diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h index 038769a3..d3635eb9 100644 --- a/src/async/pop/MCPOPFetchHeaderOperation.h +++ b/src/async/pop/MCPOPFetchHeaderOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCPOPFetchHeaderOperation__ -#define __mailcore2__MCPOPFetchHeaderOperation__ +#ifndef __MAILCORE_MCPOPFETCHHEADEROPERATION_H_ + +#define __MAILCORE_MCPOPFETCHHEADEROPERATION_H_ #include <MailCore/MCPOPOperation.h> @@ -39,4 +40,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCPOPFetchHeaderOperation__) */ +#endif diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h index 10864a70..877e4380 100644 --- a/src/async/pop/MCPOPFetchMessageOperation.h +++ b/src/async/pop/MCPOPFetchMessageOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCPOPFetchMessageOperation__ -#define __mailcore2__MCPOPFetchMessageOperation__ +#ifndef __MAILCORE_MCPOPFETCHMESSAGEOPERATION_H_ + +#define __MAILCORE_MCPOPFETCHMESSAGEOPERATION_H_ #include <MailCore/MCPOPOperation.h> @@ -36,4 +37,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCPOPFetchMessageOperation__) */ +#endif diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h index 6a3d099a..e9d68014 100644 --- a/src/async/pop/MCPOPFetchMessagesOperation.h +++ b/src/async/pop/MCPOPFetchMessagesOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCPOPFetchMessagesOperation__ -#define __mailcore2__MCPOPFetchMessagesOperation__ +#ifndef __MAILCORE_MCPOPFETCHMESSAGESOPERATION_H_ + +#define __MAILCORE_MCPOPFETCHMESSAGESOPERATION_H_ #include <MailCore/MCPOPOperation.h> @@ -31,4 +32,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCPOPFetchMessagesOperation__) */ +#endif diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h index d1ce9f94..8134d6a5 100644 --- a/src/async/pop/MCPOPOperation.h +++ b/src/async/pop/MCPOPOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCPOPOperation__ -#define __mailcore2__MCPOPOperation__ +#ifndef __MAILCORE_MCPOPOPERATION_H_ + +#define __MAILCORE_MCPOPOPERATION_H_ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCPOPProgressCallback.h> @@ -49,4 +50,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCPOPOperation__) */ +#endif diff --git a/src/async/pop/MCPOPOperationCallback.h b/src/async/pop/MCPOPOperationCallback.h index 48491215..175afa6b 100644 --- a/src/async/pop/MCPOPOperationCallback.h +++ b/src/async/pop/MCPOPOperationCallback.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCPOPOperationCallback_h -#define mailcore2_MCPOPOperationCallback_h +#ifndef __MAILCORE_MCPOPOPERATIONCALLBACK_H_ + +#define __MAILCORE_MCPOPOPERATIONCALLBACK_H_ #ifdef __cplusplus diff --git a/src/async/smtp/MCAsyncSMTP.h b/src/async/smtp/MCAsyncSMTP.h index 1c565d25..194a8fd3 100644 --- a/src/async/smtp/MCAsyncSMTP.h +++ b/src/async/smtp/MCAsyncSMTP.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCAsyncSMTP_h -#define mailcore2_MCAsyncSMTP_h +#ifndef __MAILCORE_MCASYNCSMTP_H_ + +#define __MAILCORE_MCASYNCSMTP_H_ #include <MailCore/MCSMTPAsyncSession.h> #include <MailCore/MCSMTPOperation.h> diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h index 5eb2bfbd..af9862c4 100644 --- a/src/async/smtp/MCSMTPCheckAccountOperation.h +++ b/src/async/smtp/MCSMTPCheckAccountOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCSMTPCheckAccountOperation__ -#define __mailcore2__MCSMTPCheckAccountOperation__ +#ifndef __MAILCORE_MCSMTPCHECKACCOUNTOPERATION_H_ + +#define __MAILCORE_MCSMTPCHECKACCOUNTOPERATION_H_ #include <MailCore/MCSMTPOperation.h> #include <MailCore/MCAbstract.h> @@ -36,4 +37,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCSMTPCheckAccountOperation__) */ +#endif diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h index 79846532..b8b6f35f 100644 --- a/src/async/smtp/MCSMTPOperation.h +++ b/src/async/smtp/MCSMTPOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCSMTPOperation__ -#define __mailcore2__MCSMTPOperation__ +#ifndef __MAILCORE_MCSMTPOPERATION_H_ + +#define __MAILCORE_MCSMTPOPERATION_H_ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCSMTPProgressCallback.h> @@ -48,4 +49,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCSMTPOperation__) */ +#endif diff --git a/src/async/smtp/MCSMTPOperationCallback.h b/src/async/smtp/MCSMTPOperationCallback.h index 33b07d8c..37a2b486 100644 --- a/src/async/smtp/MCSMTPOperationCallback.h +++ b/src/async/smtp/MCSMTPOperationCallback.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCSMTPOperationCallback__ -#define __mailcore2__MCSMTPOperationCallback__ +#ifndef __MAILCORE_MCSMTPOPERATIONCALLBACK_H_ + +#define __MAILCORE_MCSMTPOPERATIONCALLBACK_H_ #ifdef __cplusplus @@ -23,4 +24,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCSMTPOperationCallback__) */ +#endif diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h index 8e9b6cd9..afa1a5e0 100644 --- a/src/async/smtp/MCSMTPSendWithDataOperation.h +++ b/src/async/smtp/MCSMTPSendWithDataOperation.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCSMTPSendWithDataOperation__ -#define __mailcore2__MCSMTPSendWithDataOperation__ +#ifndef __MAILCORE_MCSMTPSENDWITHDATAOPERATION_H_ + +#define __MAILCORE_MCSMTPSENDWITHDATAOPERATION_H_ #include <MailCore/MCBaseTypes.h> #include <MailCore/MCAbstract.h> @@ -36,4 +37,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__SMTPSendWithDataOperation__) */ +#endif diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h index 81af69df..a7c54eff 100644 --- a/src/core/basetypes/MCHTMLCleaner.h +++ b/src/core/basetypes/MCHTMLCleaner.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__HTMLCleaner__ -#define __mailcore2__HTMLCleaner__ +#ifndef __MAILCORE_HTMLCLEANER_H_ + +#define __MAILCORE_HTMLCLEANER_H_ #include <MailCore/MCString.h> @@ -20,4 +21,4 @@ namespace mailcore { } -#endif /* defined(__mailcore2__HTMLCleaner__) */ +#endif diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h index 461bb063..47d97341 100644 --- a/src/core/basetypes/MCIndexSet.h +++ b/src/core/basetypes/MCIndexSet.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIndexSet__ -#define __mailcore2__MCIndexSet__ +#ifndef __MAILCORE_MCINDEXSET_H_ + +#define __MAILCORE_MCINDEXSET_H_ #include <MailCore/MCObject.h> #include <MailCore/MCRange.h> @@ -65,4 +66,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIndexSet__) */ +#endif diff --git a/src/core/basetypes/MCValuePrivate.h b/src/core/basetypes/MCValuePrivate.h index a4637f0a..9179eea3 100644 --- a/src/core/basetypes/MCValuePrivate.h +++ b/src/core/basetypes/MCValuePrivate.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCValuePrivate_h -#define mailcore2_MCValuePrivate_h +#ifndef __MAILCORE_MCVALUEPRIVATE_H_ + +#define __MAILCORE_MCVALUEPRIVATE_H_ enum { VALUE_TYPE_NONE, diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h index 74a42355..b511b0bd 100644 --- a/src/core/imap/MCIMAPSyncResult.h +++ b/src/core/imap/MCIMAPSyncResult.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCIMAPSyncResult__ -#define __mailcore2__MCIMAPSyncResult__ +#ifndef __MAILCORE_MCIMAPSYNCRESULT_H_ + +#define __MAILCORE_MCIMAPSYNCRESULT_H_ #include <MailCore/MCBaseTypes.h> @@ -35,4 +36,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCIMAPSyncResult__) */ +#endif diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h index 6c900827..0ddc3650 100644 --- a/src/core/renderer/MCHTMLRendererCallback.h +++ b/src/core/renderer/MCHTMLRendererCallback.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCHTMLRendererCallback__ -#define __mailcore2__MCHTMLRendererCallback__ +#ifndef __MAILCORE_MCHTMLRENDERERCALLBACK_H_ + +#define __MAILCORE_MCHTMLRENDERERCALLBACK_H_ #include <MailCore/MCAbstract.h> #include <MailCore/MCIMAP.h> @@ -51,4 +52,4 @@ namespace mailcore { #endif -#endif /* defined(__mailcore2__MCHTMLRendererCallback__) */ +#endif diff --git a/src/core/renderer/MCRenderer.h b/src/core/renderer/MCRenderer.h index b79b160d..a7b1993a 100644 --- a/src/core/renderer/MCRenderer.h +++ b/src/core/renderer/MCRenderer.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCRenderer_h -#define mailcore2_MCRenderer_h +#ifndef __MAILCORE_MCRENDERER_H_ + +#define __MAILCORE_MCRENDERER_H_ #include <MailCore/MCHTMLRendererCallback.h> diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h index 625c1d3d..a51373ae 100644 --- a/src/core/renderer/MCSizeFormatter.h +++ b/src/core/renderer/MCSizeFormatter.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __testUI__MCSizeFormatter__ -#define __testUI__MCSizeFormatter__ +#ifndef __MAILCORE_MCSIZEFORMATTER_H_ +#define __MAILCORE_MCSIZEFORMATTER_H_ #include <MailCore/MCBaseTypes.h> @@ -25,4 +25,4 @@ namespace mailcore { #endif -#endif /* defined(__testUI__MCSizeFormatter__) */ +#endif diff --git a/src/objc/MCObjC.h b/src/objc/MCObjC.h index 809f57df..0ed2520c 100644 --- a/src/objc/MCObjC.h +++ b/src/objc/MCObjC.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCObjC_h -#define mailcore2_MCObjC_h +#ifndef __MAILCORE_MCOBJC_H_ + +#define __MAILCORE_MCOBJC_H_ #ifdef __OBJC__ diff --git a/src/objc/abstract/MCOAbstract.h b/src/objc/abstract/MCOAbstract.h index 62acc8e7..fe61adf3 100644 --- a/src/objc/abstract/MCOAbstract.h +++ b/src/objc/abstract/MCOAbstract.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOAbstract_h -#define mailcore2_MCOAbstract_h +#ifndef __MAILCORE_MCOABSTRACT_H_ + +#define __MAILCORE_MCOABSTRACT_H_ #import <MailCore/MCOAbstractMessage.h> #import <MailCore/MCOAbstractMessagePart.h> diff --git a/src/objc/abstract/MCOAbstractMessage+Private.h b/src/objc/abstract/MCOAbstractMessage+Private.h index 82e94c12..fda4b170 100644 --- a/src/objc/abstract/MCOAbstractMessage+Private.h +++ b/src/objc/abstract/MCOAbstractMessage+Private.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOAbstractMessage_Private_h -#define mailcore2_MCOAbstractMessage_Private_h +#ifndef __MAILCORE_MCOABSTRACTMESSAGE_PRIVATE_H_ + +#define __MAILCORE_MCOABSTRACTMESSAGE_PRIVATE_H_ #ifdef __cplusplus diff --git a/src/objc/abstract/MCOAbstractMessageRendererCallback.h b/src/objc/abstract/MCOAbstractMessageRendererCallback.h index 273358cf..10d89838 100644 --- a/src/objc/abstract/MCOAbstractMessageRendererCallback.h +++ b/src/objc/abstract/MCOAbstractMessageRendererCallback.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__MCOAbstractMessageRendererCallback__ -#define __mailcore2__MCOAbstractMessageRendererCallback__ +#ifndef __MAILCORE_MCOABSTRACTMESSAGERENDERECALLBACK_H_ + +#define __MAILCORE_MCOABSTRACTMESSAGERENDERECALLBACK_H_ #include "MCIMAP.h" #include "MCRenderer.h" @@ -45,4 +46,4 @@ private: }; #endif -#endif /* defined(__mailcore2__MCOAbstractMessageRendererCallback__) */ +#endif diff --git a/src/objc/abstract/MCOHTMLRendererDelegate.h b/src/objc/abstract/MCOHTMLRendererDelegate.h index b7981153..1f9fe663 100644 --- a/src/objc/abstract/MCOHTMLRendererDelegate.h +++ b/src/objc/abstract/MCOHTMLRendererDelegate.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOHTMLRendererDelegate_h -#define mailcore2_MCOHTMLRendererDelegate_h +#ifndef __MAILCORE_MCOHTMLRENDERERDELEGATE_H_ + +#define __MAILCORE_MCOHTMLRENDERERDELEGATE_H_ #import <Foundation/Foundation.h> diff --git a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h index 83389cf3..509e5b5d 100644 --- a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h +++ b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOHTMLRendererIMAPDelegate_h -#define mailcore2_MCOHTMLRendererIMAPDelegate_h +#ifndef __MAILCORE_MCOHTMLRENDERERIMAPDELEGATE_H_ + +#define __MAILCORE_MCOHTMLRENDERERIMAPDELEGATE_H_ #import <MailCore/MCOHTMLRendererDelegate.h> diff --git a/src/objc/imap/MCOIMAPAppendMessageOperation.h b/src/objc/imap/MCOIMAPAppendMessageOperation.h index 1f988acd..0377d797 100644 --- a/src/objc/imap/MCOIMAPAppendMessageOperation.h +++ b/src/objc/imap/MCOIMAPAppendMessageOperation.h @@ -6,13 +6,13 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H_ #define __MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> +#import <MailCore/MCOConstants.h> + @interface MCOIMAPAppendMessageOperation : MCOIMAPBaseOperation @property (nonatomic, copy) MCOIMAPBaseOperationProgressBlock progress; diff --git a/src/objc/imap/MCOIMAPBaseOperation.h b/src/objc/imap/MCOIMAPBaseOperation.h index be0aaf70..226f0ed7 100644 --- a/src/objc/imap/MCOIMAPBaseOperation.h +++ b/src/objc/imap/MCOIMAPBaseOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOOperation.h> - #ifndef __MAILCORE_MCOIMAPBASEOPERATION_H_ #define __MAILCORE_MCOIMAPBASEOPERATION_H_ +#import <MailCore/MCOOperation.h> + typedef void (^MCOIMAPBaseOperationProgressBlock)(unsigned int current, unsigned int maximum); typedef void (^MCOIMAPBaseOperationItemProgressBlock)(unsigned int current); diff --git a/src/objc/imap/MCOIMAPCapabilityOperation.h b/src/objc/imap/MCOIMAPCapabilityOperation.h index 446b8cfe..f1e662a8 100644 --- a/src/objc/imap/MCOIMAPCapabilityOperation.h +++ b/src/objc/imap/MCOIMAPCapabilityOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> - #ifndef __MAILCORE_MCOIMAPCAPABILITYOPERATION_H_ #define __MAILCORE_MCOIMAPCAPBILITYOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> + @class MCOIndexSet; @interface MCOIMAPCapabilityOperation : MCOIMAPBaseOperation diff --git a/src/objc/imap/MCOIMAPFetchContentOperation.h b/src/objc/imap/MCOIMAPFetchContentOperation.h index 6873860b..e1869d66 100644 --- a/src/objc/imap/MCOIMAPFetchContentOperation.h +++ b/src/objc/imap/MCOIMAPFetchContentOperation.h @@ -6,13 +6,13 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H_ #define __MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> +#import <MailCore/MCOConstants.h> + @interface MCOIMAPFetchContentOperation : MCOIMAPBaseOperation @property (nonatomic, copy) MCOIMAPBaseOperationProgressBlock progress; diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.h b/src/objc/imap/MCOIMAPFetchMessagesOperation.h index b8c97c56..adde2dbd 100644 --- a/src/objc/imap/MCOIMAPFetchMessagesOperation.h +++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.h @@ -6,13 +6,13 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H_ #define __MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> +#import <MailCore/MCOConstants.h> + @class MCOIndexSet; @interface MCOIMAPFetchMessagesOperation : MCOIMAPBaseOperation diff --git a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h index 0c20e90a..90702e85 100644 --- a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h +++ b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> - #ifndef __MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H_ #define __MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> + @interface MCOIMAPFetchNamespaceOperation : MCOIMAPBaseOperation - (void)start:(void (^)(NSError *error, NSDictionary * namespaces))completionBlock; diff --git a/src/objc/imap/MCOIMAPFolder.h b/src/objc/imap/MCOIMAPFolder.h index 2771bc0f..813303e2 100644 --- a/src/objc/imap/MCOIMAPFolder.h +++ b/src/objc/imap/MCOIMAPFolder.h @@ -6,13 +6,13 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <Foundation/Foundation.h> -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPFOLDER_H_ #define __MAILCORE_MCOIMAPFOLDER_H_ +#import <Foundation/Foundation.h> +#import <MailCore/MCOConstants.h> + @interface MCOIMAPFolder : NSObject <NSCopying> @property (nonatomic, copy) NSString * path; diff --git a/src/objc/imap/MCOIMAPFolderInfo.h b/src/objc/imap/MCOIMAPFolderInfo.h index ad564fdc..8b058deb 100644 --- a/src/objc/imap/MCOIMAPFolderInfo.h +++ b/src/objc/imap/MCOIMAPFolderInfo.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <Foundation/Foundation.h> - #ifndef __MAILCORE_MCOIMAPFOLDERINFO_H_ #define __MAILCORE_MCOIMAPFOLDERINFO_H_ +#import <Foundation/Foundation.h> + @interface MCOIMAPFolderInfo : NSObject + (MCOIMAPFolderInfo *) info; diff --git a/src/objc/imap/MCOIMAPFolderInfoOperation.h b/src/objc/imap/MCOIMAPFolderInfoOperation.h index a41d43c7..feb9ea39 100644 --- a/src/objc/imap/MCOIMAPFolderInfoOperation.h +++ b/src/objc/imap/MCOIMAPFolderInfoOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> - #ifndef __MAILCORE_MCOIMAPFOLDERINFOOPERATION_H_ #define __MAILCORE_MCOIMAPFOLDERINFOOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> + @class MCOIMAPFolderInfo; @interface MCOIMAPFolderInfoOperation : MCOIMAPBaseOperation diff --git a/src/objc/imap/MCOIMAPIdentityOperation.h b/src/objc/imap/MCOIMAPIdentityOperation.h index 42be05a7..60d040e3 100644 --- a/src/objc/imap/MCOIMAPIdentityOperation.h +++ b/src/objc/imap/MCOIMAPIdentityOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> - #ifndef __MAILCORE_MCOIMAPIDENTITYOPERATION_H_ #define __MAILCORE_MCOIMAPIDENTITYOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> + @interface MCOIMAPIdentityOperation : MCOIMAPBaseOperation - (void)start:(void (^)(NSError *error, NSDictionary * serverIdentity))completionBlock; diff --git a/src/objc/imap/MCOIMAPIdleOperation.h b/src/objc/imap/MCOIMAPIdleOperation.h index aabe2fbd..365457d9 100644 --- a/src/objc/imap/MCOIMAPIdleOperation.h +++ b/src/objc/imap/MCOIMAPIdleOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> - #ifndef __MAILCORE_MCOIMAPIDLEOPERATION_H_ #define __MAILCORE_MCOIMAPIDLEOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> + @interface MCOIMAPIdleOperation : MCOIMAPBaseOperation - (void) interruptIdle; diff --git a/src/objc/imap/MCOIMAPMessage.h b/src/objc/imap/MCOIMAPMessage.h index 5a5276ef..c6196103 100644 --- a/src/objc/imap/MCOIMAPMessage.h +++ b/src/objc/imap/MCOIMAPMessage.h @@ -6,13 +6,13 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOAbstractMessage.h> -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPMESSAGE_H_ #define __MAILCORE_MCOIMAPMESSAGE_H_ +#import <MailCore/MCOAbstractMessage.h> +#import <MailCore/MCOConstants.h> + @protocol MCOHTMLRendererIMAPDelegate; @interface MCOIMAPMessage : MCOAbstractMessage <NSCopying> diff --git a/src/objc/imap/MCOIMAPMessagePart.h b/src/objc/imap/MCOIMAPMessagePart.h index bb0e7578..bda7d5be 100644 --- a/src/objc/imap/MCOIMAPMessagePart.h +++ b/src/objc/imap/MCOIMAPMessagePart.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOAbstractMessagePart.h> - #ifndef __MAILCORE_MCOIMAPMESSAGEPART_H_ #define __MAILCORE_MCOIMAPMESSAGEPART_H_ +#import <MailCore/MCOAbstractMessagePart.h> + @interface MCOIMAPMessagePart : MCOAbstractMessagePart <NSCopying> @property (nonatomic, copy) NSString * partID; diff --git a/src/objc/imap/MCOIMAPMultipart.h b/src/objc/imap/MCOIMAPMultipart.h index 96ab11f6..950be8de 100644 --- a/src/objc/imap/MCOIMAPMultipart.h +++ b/src/objc/imap/MCOIMAPMultipart.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOAbstractMultipart.h> - #ifndef __MAILCORE_MCOIMAPMULTIPART_H_ #define __MAILCORE_MCOIMAPMULTIPART_H_ +#import <MailCore/MCOAbstractMultipart.h> + @interface MCOIMAPMultipart : MCOAbstractMultipart <NSCopying> @property (nonatomic, copy) NSString * partID; diff --git a/src/objc/imap/MCOIMAPNamespace.h b/src/objc/imap/MCOIMAPNamespace.h index 9c807bef..b1dc15a0 100644 --- a/src/objc/imap/MCOIMAPNamespace.h +++ b/src/objc/imap/MCOIMAPNamespace.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <Foundation/Foundation.h> - #ifndef __MAILCORE_MCOIMAPNAMESPACE_H_ #define __MAILCORE_MCOIMAPNAMESPACE_H_ +#import <Foundation/Foundation.h> + @class MCOIMAPNamespace; @interface MCOIMAPNamespace : NSObject <NSCopying> diff --git a/src/objc/imap/MCOIMAPNamespaceItem.h b/src/objc/imap/MCOIMAPNamespaceItem.h index 20e7173e..376434ff 100644 --- a/src/objc/imap/MCOIMAPNamespaceItem.h +++ b/src/objc/imap/MCOIMAPNamespaceItem.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <Foundation/Foundation.h> - #ifndef __MAILCORE_MCOIMAPNAMESPACEITEM_H_ #define __MAILCORE_MCOIMAPNAMESPACEITEM_H_ +#import <Foundation/Foundation.h> + @interface MCOIMAPNamespaceItem : NSObject <NSCopying> @property (nonatomic, copy) NSString * prefix; diff --git a/src/objc/imap/MCOIMAPOperation.h b/src/objc/imap/MCOIMAPOperation.h index 50a6d3dc..1954f00b 100644 --- a/src/objc/imap/MCOIMAPOperation.h +++ b/src/objc/imap/MCOIMAPOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOOperation.h> - #ifndef __MAILCORE_MCOIMAPOPERATION_H_ #define __MAILCORE_MCOIMAPOPERATION_H_ +#import <MailCore/MCOOperation.h> + @interface MCOIMAPOperation : MCOOperation - (void)start:(void (^)(NSError *error))completionBlock; diff --git a/src/objc/imap/MCOIMAPPart.h b/src/objc/imap/MCOIMAPPart.h index 18e5b367..588abe10 100644 --- a/src/objc/imap/MCOIMAPPart.h +++ b/src/objc/imap/MCOIMAPPart.h @@ -6,14 +6,14 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOAbstractPart.h> - -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPABSTRACTPART_H_ #define __MAILCORE_MCOIMAPABSTRACTPART_H_ +#import <MailCore/MCOAbstractPart.h> + +#import <MailCore/MCOConstants.h> + @interface MCOIMAPPart : MCOAbstractPart <NSCopying> @property (nonatomic, copy) NSString * partID; diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h index 9bd518ed..36020d7c 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.h +++ b/src/objc/imap/MCOIMAPSearchExpression.h @@ -6,13 +6,13 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <Foundation/Foundation.h> -#import <MailCore/MCOConstants.h> - #ifndef __MAILCORE_MCOIMAPSEARCHEXPRESSION_H_ #define __MAILCORE_MCOIMAPSEARCHEXPRESSION_H_ +#import <Foundation/Foundation.h> +#import <MailCore/MCOConstants.h> + @interface MCOIMAPSearchExpression : NSObject + (MCOIMAPSearchExpression *) searchFrom:(NSString *)value; diff --git a/src/objc/imap/MCOIMAPSearchOperation.h b/src/objc/imap/MCOIMAPSearchOperation.h index 2d85043e..79d1c26d 100644 --- a/src/objc/imap/MCOIMAPSearchOperation.h +++ b/src/objc/imap/MCOIMAPSearchOperation.h @@ -6,12 +6,12 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <MailCore/MCOIMAPBaseOperation.h> - #ifndef __MAILCORE_MCOSEARCHOPERATION_H_ #define __MAILCORE_MCOSEARCHOPERATION_H_ +#import <MailCore/MCOIMAPBaseOperation.h> + @class MCOIndexSet; @interface MCOIMAPSearchOperation : MCOIMAPBaseOperation diff --git a/src/objc/pop/MCOPOP.h b/src/objc/pop/MCOPOP.h index 6544021d..bfb9c4f1 100644 --- a/src/objc/pop/MCOPOP.h +++ b/src/objc/pop/MCOPOP.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOPOP_h -#define mailcore2_MCOPOP_h +#ifndef __MAILCORE_MCOPOP_H_ + +#define __MAILCORE_MCOPOP_H_ #import <MailCore/MCOPOPSession.h> #import <MailCore/MCOPOPOperation.h> diff --git a/src/objc/pop/MCOPOPMessageInfo.h b/src/objc/pop/MCOPOPMessageInfo.h index 06cc23c1..bef874ff 100644 --- a/src/objc/pop/MCOPOPMessageInfo.h +++ b/src/objc/pop/MCOPOPMessageInfo.h @@ -6,6 +6,10 @@ // Copyright (c) 2013 MailCore. All rights reserved. // +#ifndef __MAILCORE_MCOPOPMESSAGEINFO_H_ + +#define __MAILCORE_MCOPOPMESSAGEINFO_H_ + #import <Foundation/Foundation.h> // This is information of a message fetched by MCOPOPFetchMessagesOperation. @@ -23,3 +27,5 @@ @property (nonatomic, copy) NSString * uid; @end + +#endif diff --git a/src/objc/rfc822/MCOAttachment.h b/src/objc/rfc822/MCOAttachment.h index 95f60321..7c6a0d7b 100644 --- a/src/objc/rfc822/MCOAttachment.h +++ b/src/objc/rfc822/MCOAttachment.h @@ -12,14 +12,27 @@ #import <MailCore/MCOAbstractPart.h> +// This is a single part. +// It can either parsed from RFC 822 message data or created to build a message. + @interface MCOAttachment : MCOAbstractPart <NSCopying> +// Returns a MIME type for a filename. + (NSString *) mimeTypeForFilename:(NSString *)filename; + +// Returns a file attachment with the content of the given file. + (MCOAttachment *) attachmentWithContentsOfFile:(NSString *)filename; + +// Returns a part with an HTML content. + (MCOAttachment *) attachmentWithHTMLString:(NSString *)htmlString; + +// Returns a part with a RFC 822 messsage attachment. + (MCOAttachment *) attachmentWithRFC822Message:(NSData *)messageData; + +// Returns a part with an plain text content. + (MCOAttachment *) attachmentWithText:(NSString *)text; +// Decoded data of the part. @property (nonatomic, strong) NSData * data; @end diff --git a/src/objc/rfc822/MCOMessageBuilder.h b/src/objc/rfc822/MCOMessageBuilder.h index a74b3e6f..576a37a7 100644 --- a/src/objc/rfc822/MCOMessageBuilder.h +++ b/src/objc/rfc822/MCOMessageBuilder.h @@ -12,22 +12,38 @@ #import <MailCore/MCOAbstractMessage.h> +// This class will allow you to build a RFC 822 formatted message. + @class MCOAttachment; @protocol MCOHTMLRendererDelegate; @interface MCOMessageBuilder : MCOAbstractMessage <NSCopying> +// Main HTML content of the message. @property (nonatomic, copy, setter=setHTMLBody:) NSString * htmlBody; + +// Plain text content of the message. @property (nonatomic, copy) NSString * textBody; + +// List of file attachments. @property (nonatomic, copy) NSArray * attachments; + +// List of related file attachments (included as cid: link in the HTML part). @property (nonatomic, copy) NSArray * relatedAttachments; + +// Prefix for the boundary identifier @property (nonatomic, copy) NSString * boundaryPrefix; +// Add an attachment. - (void) addAttachment:(MCOAttachment *)attachment; + +// Add a related attachment. - (void) addRelatedAttachment:(MCOAttachment *)attachment; +// RFC 822 formatted message. - (NSData *) data; +// HTML rendering of the message to be displayed in a web view. - (NSString *) htmlRenderingWithDelegate:(id <MCOHTMLRendererDelegate>)delegate; @end diff --git a/src/objc/rfc822/MCOMessageParser.h b/src/objc/rfc822/MCOMessageParser.h index a22b657e..80dee964 100644 --- a/src/objc/rfc822/MCOMessageParser.h +++ b/src/objc/rfc822/MCOMessageParser.h @@ -16,14 +16,20 @@ @interface MCOMessageParser : MCOAbstractMessage <NSCopying> +// returns a parsed message from the given RFC 822 data. + (MCOMessageParser *) messageParserWithData:(NSData *)data; +// data is the RFC 822 formatted message. - (id) initWithData:(NSData *)data; - (void) dealloc; +// It's the main part of the message. It can be MCOMessagePart, MCOMultipart or MCOAttachment. - (MCOAbstractPart *) mainPart; + +// data of the RFC 822 formatted message. It's the input of the parser. - (NSData *) data; +// HTML rendering of the message to be displayed in a web view. - (NSString *) htmlRenderingWithDelegate:(id <MCOHTMLRendererDelegate>)delegate; @end diff --git a/src/objc/rfc822/MCOMessagePart.h b/src/objc/rfc822/MCOMessagePart.h index dc31fdfb..7d9d7f2c 100644 --- a/src/objc/rfc822/MCOMessagePart.h +++ b/src/objc/rfc822/MCOMessagePart.h @@ -12,6 +12,8 @@ #import <MailCore/MCOAbstractMessagePart.h> +// Message part parsed from RFC 822 message data. + @interface MCOMessagePart : MCOAbstractMessagePart <NSCopying> @end diff --git a/src/objc/rfc822/MCOMultipart.h b/src/objc/rfc822/MCOMultipart.h index b5722e72..36922fe4 100644 --- a/src/objc/rfc822/MCOMultipart.h +++ b/src/objc/rfc822/MCOMultipart.h @@ -12,6 +12,8 @@ #import <MailCore/MCOAbstractMultipart.h> +// Multipart parsed from RFC 822 message data. + @interface MCOMultipart : MCOAbstractMultipart <NSCopying> @end diff --git a/src/objc/smtp/MCOSMTP.h b/src/objc/smtp/MCOSMTP.h index 70759600..49caac83 100644 --- a/src/objc/smtp/MCOSMTP.h +++ b/src/objc/smtp/MCOSMTP.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOSMTP_h -#define mailcore2_MCOSMTP_h +#ifndef __MAILCORE_MCOSMTP_H_ + +#define __MAILCORE_MCOSMTP_H_ #import <MailCore/MCOSMTPSession.h> #import <MailCore/MCOSMTPSendOperation.h> diff --git a/src/objc/smtp/MCOSMTPSession.h b/src/objc/smtp/MCOSMTPSession.h index 60eefa18..9e1c7ac1 100644 --- a/src/objc/smtp/MCOSMTPSession.h +++ b/src/objc/smtp/MCOSMTPSession.h @@ -14,6 +14,8 @@ #import <MailCore/MCOConstants.h> +// This class implements asynchronous SMTP protocol. + @class MCOSMTPSendOperation; @class MCOSMTPOperation; @class MCOAddress; diff --git a/src/objc/utils/MCOIndexSet+Private.h b/src/objc/utils/MCOIndexSet+Private.h index 78a3554e..ef9111fa 100644 --- a/src/objc/utils/MCOIndexSet+Private.h +++ b/src/objc/utils/MCOIndexSet+Private.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOIndexSet_Private_h -#define mailcore2_MCOIndexSet_Private_h +#ifndef __MAILCORE_MCOINDEXSET_PRIVATE_H_ + +#define __MAILCORE_MCOINDEXSET_PRIVATE_H_ #ifdef __cplusplus @interface MCOIndexSet (Private) diff --git a/src/objc/utils/MCOIndexSet.h b/src/objc/utils/MCOIndexSet.h index 83e6f169..5f02935d 100644 --- a/src/objc/utils/MCOIndexSet.h +++ b/src/objc/utils/MCOIndexSet.h @@ -6,32 +6,52 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import <Foundation/Foundation.h> - -#import <MailCore/MCORange.h> - #ifndef __MAILCORE_MCOINDEXSET_H_ #define __MAILCORE_MCOINDEXSET_H_ +#import <Foundation/Foundation.h> + +#import <MailCore/MCORange.h> + // similar to NSMutableIndexSet but supports int64_t @interface MCOIndexSet : NSObject <NSCopying> +// Creates an empty index set. + (MCOIndexSet *) indexSet; + +// Creates an index set that contains a range of integers. + (MCOIndexSet *) indexSetWithRange:(MCORange)range; + +// Creates an index set with a single integer. + (MCOIndexSet *) indexSetWithIndex:(uint64_t)idx; +// Returns the number of integers in that index set. - (unsigned int) count; + +// Adds an integer to the index set. - (void) addIndex:(uint64_t)idx; + +// Removes an integer from the index set. - (void) removeIndex:(uint64_t)idx; + +// Returns YES if the index set contains the given integer. - (BOOL) containsIndex:(uint64_t)idx; +// Adds a range of integers to the index set. - (void) addRange:(MCORange)range; + +// Removes a range of integers from the index set. - (void) removeRange:(MCORange)range; + +// Removes all integers that are not in the given range. - (void) intersectsRange:(MCORange)range; +// Returns all the ranges of ths index set. - (MCORange *) allRanges; + +// Returns the number of ranges in this index set. - (unsigned int) rangesCount; @end diff --git a/src/objc/utils/MCOOperation.h b/src/objc/utils/MCOOperation.h index e44ea236..7893f917 100644 --- a/src/objc/utils/MCOOperation.h +++ b/src/objc/utils/MCOOperation.h @@ -13,9 +13,16 @@ #import <Foundation/Foundation.h> @interface MCOOperation : NSObject + @property (readonly) BOOL isCancelled; +// This methods is called on the main thread when the asynchronous operation is finished. +// Needs to be overriden by subclasses. +- (void)operationCompleted; + +// Cancel the operation. - (void)cancel; + @end #endif diff --git a/src/objc/utils/MCORange.h b/src/objc/utils/MCORange.h index a42e0928..4fdb9233 100644 --- a/src/objc/utils/MCORange.h +++ b/src/objc/utils/MCORange.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCORange_h -#define mailcore2_MCORange_h +#ifndef __MAILCORE_MCORANGE_H_ + +#define __MAILCORE_MCORANGE_H_ #import <Foundation/Foundation.h> @@ -22,22 +23,45 @@ extern "C" { @class MCOIndexSet; typedef struct { + // first integer of the range. uint64_t location; + + // length of the range. uint64_t length; } MCORange; -extern MCORange RangeEmpty; +// Constants for an emtpy range. +extern MCORange MCORangeEmpty; +// Returns a new range given a location and length. MCORange MCORangeMake(uint64_t location, uint64_t length); + +// Returns an index set that is the result of sustracting a range from a range. MCOIndexSet * MCORangeRemoveRange(MCORange range1, MCORange range2); + +// Returns an index set that is the result of the union a range from a range. MCOIndexSet * MCORangeUnion(MCORange range1, MCORange range2); + #ifdef __cplusplus + +// Returns a C++ range from an Objective-C range. mailcore::Range MCORangeToMCRange(MCORange range); + +// Returns an Objective-C range from a C++ range. MCORange MCORangeWithMCRange(mailcore::Range range); + #endif + +// Returns the intersection of two ranges. MCORange MCORangeIntersection(MCORange range1, MCORange range2); + +// Returns YES if two given ranges have an intersection. BOOL MCORangeHasIntersection(MCORange range1, MCORange range2); + +// Returns left bound of a range. uint64_t MCORangeLeftBound(MCORange range); + +// Returns right bound of a range. uint64_t MCORangeRightBound(MCORange range); #ifdef __cplusplus diff --git a/src/objc/utils/MCORange.mm b/src/objc/utils/MCORange.mm index d1681f14..36c7720c 100644 --- a/src/objc/utils/MCORange.mm +++ b/src/objc/utils/MCORange.mm @@ -13,6 +13,8 @@ #include <string.h> +MCORange MCORangeEmpty = {UINT64_MAX, 0}; + MCORange MCORangeMake(uint64_t location, uint64_t length) { MCORange result; diff --git a/src/objc/utils/MCOUtils.h b/src/objc/utils/MCOUtils.h index bc4f716c..3a2c8d82 100644 --- a/src/objc/utils/MCOUtils.h +++ b/src/objc/utils/MCOUtils.h @@ -6,8 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef mailcore2_MCOUtils_h -#define mailcore2_MCOUtils_h +#ifndef __MAILCORE_MCOUTILS_H_ + +#define __MAILCORE_MCOUTILS_H_ #import <MailCore/MCOObjectWrapper.h> #import <MailCore/NSData+MCO.h> diff --git a/tests/test-all.h b/tests/test-all.h index 6197cf47..6239f2f5 100644 --- a/tests/test-all.h +++ b/tests/test-all.h @@ -6,11 +6,11 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#ifndef __mailcore2__test_all__ -#define __mailcore2__test_all__ +#ifndef __MAILCORE_TEST_ALL_H_ +#define __MAILCORE_TEST_ALL_H_ #include <MailCore/MailCore.h> extern void testAll(); -#endif /* defined(__mailcore2__test_all__) */ +#endif |