Conformant header guards

Fixes #606

14 files changed, 28 insertions, 28 deletions

diff --git a/src/core/imap/MCIMAP.h b/src/core/imap/MCIMAP.h
index 3faddea1..6e80995f 100644
--- a/src/core/imap/MCIMAP.h
+++ b/src/core/imap/MCIMAP.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAP_H_
+#ifndef MAILCORE_MCIMAP_H
 
-#define __MAILCORE_MCIMAP_H_
+#define MAILCORE_MCIMAP_H
 
 #include <MailCore/MCIMAPFolder.h>
 #include <MailCore/MCIMAPMessage.h>
diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h
index 85bfd69f..3bc20589 100644
--- a/src/core/imap/MCIMAPFolder.h
+++ b/src/core/imap/MCIMAPFolder.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPFOLDER_H
+#ifndef MAILCORE_MCIMAPFOLDER_H
 
-#define __MAILCORE_MCIMAPFOLDER_H
+#define MAILCORE_MCIMAPFOLDER_H
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPFolderStatus.h b/src/core/imap/MCIMAPFolderStatus.h
index a4c9ede9..db3243fe 100644
--- a/src/core/imap/MCIMAPFolderStatus.h
+++ b/src/core/imap/MCIMAPFolderStatus.h
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __MAILCORE_MCIMAPFOLDERSTATUS_H
+#ifndef MAILCORE_MCIMAPFOLDERSTATUS_H
 
-#define __MAILCORE_MCIMAPFOLDERSTATUS_H
+#define MAILCORE_MCIMAPFOLDERSTATUS_H
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPIdentity.h b/src/core/imap/MCIMAPIdentity.h
index 83bd3273..ab96abb3 100644
--- a/src/core/imap/MCIMAPIdentity.h
+++ b/src/core/imap/MCIMAPIdentity.h
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __MAILCORE_MCIMAPIDENTITY_H
+#ifndef MAILCORE_MCIMAPIDENTITY_H
 
-#define __MAILCORE_MCIMAPIDENTITY_H
+#define MAILCORE_MCIMAPIDENTITY_H
 
 #include <MailCore/MCBaseTypes.h>
 
diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h
index e072d131..a78a04d6 100644
--- a/src/core/imap/MCIMAPMessage.h
+++ b/src/core/imap/MCIMAPMessage.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_IMAP_MESSAGE_H_
+#ifndef MAILCORE_IMAP_MESSAGE_H
 
-#define __MAILCORE_IMAP_MESSAGE_H_
+#define MAILCORE_IMAP_MESSAGE_H
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCAbstractMessage.h>
diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h
index a355ed8f..0a65284e 100644
--- a/src/core/imap/MCIMAPMessagePart.h
+++ b/src/core/imap/MCIMAPMessagePart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_IMAPMESSAGEPART_H_
+#ifndef MAILCORE_IMAPMESSAGEPART_H
 
-#define __MAILCORE_IMAPMESSAGEPART_H_
+#define MAILCORE_IMAPMESSAGEPART_H
 
 #include <MailCore/MCAbstractMessagePart.h>
 
diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h
index 9d03bd78..e420b228 100644
--- a/src/core/imap/MCIMAPMultipart.h
+++ b/src/core/imap/MCIMAPMultipart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPMULTIPART_H
+#ifndef MAILCORE_MCIMAPMULTIPART_H
 
-#define __MAILCORE_MCIMAPMULTIPART_H
+#define MAILCORE_MCIMAPMULTIPART_H
 
 #include <MailCore/MCAbstractMultipart.h>
 
diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h
index bcb4b185..0c7ac6a5 100644
--- a/src/core/imap/MCIMAPNamespace.h
+++ b/src/core/imap/MCIMAPNamespace.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPNAMESPACE_H_
+#ifndef MAILCORE_MCIMAPNAMESPACE_H
 
-#define __MAILCORE_MCIMAPNAMESPACE_H_
+#define MAILCORE_MCIMAPNAMESPACE_H
 
 #include <MailCore/MCBaseTypes.h>
 
diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h
index a4cc605b..a78d6918 100644
--- a/src/core/imap/MCIMAPNamespaceItem.h
+++ b/src/core/imap/MCIMAPNamespaceItem.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPNAMESPACEITEM_H
+#ifndef MAILCORE_MCIMAPNAMESPACEITEM_H
 
-#define __MAILCORE_MCIMAPNAMESPACEITEM_H
+#define MAILCORE_MCIMAPNAMESPACEITEM_H
 
 #include <MailCore/MCBaseTypes.h>
 
diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h
index 039f620c..f04bb903 100644
--- a/src/core/imap/MCIMAPPart.h
+++ b/src/core/imap/MCIMAPPart.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPPART_H_
+#ifndef MAILCORE_MCIMAPPART_H
 
-#define __MAILCORE_MCIMAPPART_H_
+#define MAILCORE_MCIMAPPART_H
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCAbstractPart.h>
diff --git a/src/core/imap/MCIMAPProgressCallback.h b/src/core/imap/MCIMAPProgressCallback.h
index 22427afe..2df48156 100644
--- a/src/core/imap/MCIMAPProgressCallback.h
+++ b/src/core/imap/MCIMAPProgressCallback.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPPROGRESSCALLBACK_H_
+#ifndef MAILCORE_MCIMAPPROGRESSCALLBACK_H
 
-#define __MAILCORE_MCIMAPPROGRESSCALLBACK_H_
+#define MAILCORE_MCIMAPPROGRESSCALLBACK_H
 
 #ifdef __cplusplus
 
diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h
index d71a3f82..c108fd2b 100644
--- a/src/core/imap/MCIMAPSearchExpression.h
+++ b/src/core/imap/MCIMAPSearchExpression.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPSEARCHEXPRESSION_H_
+#ifndef MAILCORE_MCIMAPSEARCHEXPRESSION_H
 
-#define __MAILCORE_MCIMAPSEARCHEXPRESSION_H_
+#define MAILCORE_MCIMAPSEARCHEXPRESSION_H
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h
index 39e1768f..9ebe48d6 100755
--- a/src/core/imap/MCIMAPSession.h
+++ b/src/core/imap/MCIMAPSession.h
@@ -1,6 +1,6 @@
-#ifndef __MAILCORE_MCIMAPSESSION_H
+#ifndef MAILCORE_MCIMAPSESSION_H
 
-#define __MAILCORE_MCIMAPSESSION_H
+#define MAILCORE_MCIMAPSESSION_H
 
 #include <MailCore/MCBaseTypes.h>
 #include <MailCore/MCMessageConstants.h>
diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h
index 186984ab..ad1b16ac 100644
--- a/src/core/imap/MCIMAPSyncResult.h
+++ b/src/core/imap/MCIMAPSyncResult.h
@@ -6,9 +6,9 @@
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __MAILCORE_MCIMAPSYNCRESULT_H_
+#ifndef MAILCORE_MCIMAPSYNCRESULT_H
 
-#define __MAILCORE_MCIMAPSYNCRESULT_H_
+#define MAILCORE_MCIMAPSYNCRESULT_H
 
 #include <MailCore/MCBaseTypes.h>