Header documentation. Header clean-up

23 files changed, 89 insertions, 68 deletions

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