From ebc301cf581e9e777448211d229ac20f4324d456 Mon Sep 17 00:00:00 2001 From: "Hoa V. DINH" Date: Wed, 3 Apr 2013 00:23:38 -0700 Subject: #include -> --- build-mac/framework-Info.plist | 30 +++++++++++ build-mac/mailcore2.xcodeproj/project.pbxproj | 72 +++++++++++++------------ src/async/MCAsync.h | 6 +-- src/async/imap/MCAsyncIMAP.h | 34 ++++++------ src/async/imap/MCIMAPAppendMessageOperation.h | 4 +- src/async/imap/MCIMAPAsyncConnection.h | 4 +- src/async/imap/MCIMAPAsyncSession.h | 4 +- src/async/imap/MCIMAPCapabilityOperation.h | 2 +- src/async/imap/MCIMAPCheckAccountOperation.h | 2 +- src/async/imap/MCIMAPCopyMessagesOperation.h | 2 +- src/async/imap/MCIMAPCreateFolderOperation.h | 2 +- src/async/imap/MCIMAPDeleteFolderOperation.h | 2 +- src/async/imap/MCIMAPExpungeOperation.h | 2 +- src/async/imap/MCIMAPFetchContentOperation.h | 2 +- src/async/imap/MCIMAPFetchFoldersOperation.h | 4 +- src/async/imap/MCIMAPFetchMessagesOperation.h | 2 +- src/async/imap/MCIMAPFetchNamespaceOperation.h | 2 +- src/async/imap/MCIMAPFolderInfoOperation.h | 2 +- src/async/imap/MCIMAPIdentityOperation.h | 2 +- src/async/imap/MCIMAPIdleOperation.h | 2 +- src/async/imap/MCIMAPOperation.h | 4 +- src/async/imap/MCIMAPRenameFolderOperation.h | 2 +- src/async/imap/MCIMAPSearchOperation.h | 4 +- src/async/imap/MCIMAPStoreFlagsOperation.h | 2 +- src/async/imap/MCIMAPStoreLabelsOperation.h | 2 +- src/async/imap/MCIMAPSubscribeFolderOperation.h | 2 +- src/async/pop/MCAsyncPOP.h | 12 ++--- src/async/pop/MCPOPAsyncSession.h | 2 +- src/async/pop/MCPOPDeleteMessagesOperation.h | 2 +- src/async/pop/MCPOPFetchHeaderOperation.h | 2 +- src/async/pop/MCPOPFetchMessageOperation.h | 2 +- src/async/pop/MCPOPFetchMessagesOperation.h | 2 +- src/async/pop/MCPOPOperation.h | 4 +- src/async/smtp/MCAsyncSMTP.h | 6 +-- src/async/smtp/MCSMTPAsyncSession.h | 4 +- src/async/smtp/MCSMTPCheckAccountOperation.h | 4 +- src/async/smtp/MCSMTPOperation.h | 4 +- src/async/smtp/MCSMTPSendWithDataOperation.h | 6 +-- src/core/MCCore.h | 14 ++--- src/core/abstract/MCAbstract.h | 14 ++--- src/core/abstract/MCAbstractMessage.h | 2 +- src/core/abstract/MCAbstractMessagePart.h | 4 +- src/core/abstract/MCAbstractMultipart.h | 4 +- src/core/abstract/MCAbstractPart.h | 4 +- src/core/abstract/MCAddress.h | 2 +- src/core/abstract/MCMessageHeader.h | 2 +- src/core/basetypes/MCArray.h | 2 +- src/core/basetypes/MCAutoreleasePool.h | 2 +- src/core/basetypes/MCBaseTypes.h | 34 ++++++------ src/core/basetypes/MCData.h | 4 +- src/core/basetypes/MCHTMLCleaner.h | 2 +- src/core/basetypes/MCHashMap.h | 2 +- src/core/basetypes/MCIndexSet.h | 4 +- src/core/basetypes/MCOperation.h | 2 +- src/core/basetypes/MCOperationQueue.h | 2 +- src/core/basetypes/MCSet.h | 2 +- src/core/basetypes/MCString.h | 4 +- src/core/basetypes/MCValue.h | 2 +- src/core/imap/MCIMAP.h | 22 ++++---- src/core/imap/MCIMAPFolder.h | 4 +- src/core/imap/MCIMAPMessage.h | 8 +-- src/core/imap/MCIMAPMessagePart.h | 2 +- src/core/imap/MCIMAPMultipart.h | 2 +- src/core/imap/MCIMAPNamespace.h | 2 +- src/core/imap/MCIMAPNamespaceItem.h | 2 +- src/core/imap/MCIMAPPart.h | 4 +- src/core/imap/MCIMAPSearchExpression.h | 4 +- src/core/imap/MCIMAPSession.h | 4 +- src/core/imap/MCIMAPSyncResult.h | 2 +- src/core/pop/MCPOP.h | 6 +-- src/core/pop/MCPOPMessageInfo.h | 2 +- src/core/pop/MCPOPSession.h | 4 +- src/core/renderer/MCAddressDisplay.h | 2 +- src/core/renderer/MCDateFormatter.h | 2 +- src/core/renderer/MCHTMLRenderer.h | 6 +-- src/core/renderer/MCHTMLRendererCallback.h | 4 +- src/core/renderer/MCRenderer.h | 2 +- src/core/renderer/MCSizeFormatter.h | 2 +- src/core/rfc822/MCAttachment.h | 8 +-- src/core/rfc822/MCMessageBuilder.h | 4 +- src/core/rfc822/MCMessageParser.h | 6 +-- src/core/rfc822/MCMessagePart.h | 4 +- src/core/rfc822/MCMultipart.h | 4 +- src/core/rfc822/MCRFC822.h | 10 ++-- src/core/smtp/MCSMTP.h | 4 +- src/core/smtp/MCSMTPSession.h | 4 +- src/mailcore.h | 6 +-- src/objc/MCObjC.h | 12 ++--- src/objc/abstract/MCOAbstract.h | 16 +++--- src/objc/abstract/MCOAbstractMessagePart.h | 2 +- src/objc/abstract/MCOAbstractMultipart.h | 2 +- src/objc/abstract/MCOAbstractPart+Private.h | 2 +- src/objc/abstract/MCOHTMLRendererIMAPDelegate.h | 2 +- src/objc/imap/MCOIMAP.h | 50 ++++++++--------- src/objc/imap/MCOIMAPAppendMessageOperation.h | 4 +- src/objc/imap/MCOIMAPBaseOperation.h | 2 +- src/objc/imap/MCOIMAPCapabilityOperation.h | 2 +- src/objc/imap/MCOIMAPCopyMessagesOperation.h | 2 +- src/objc/imap/MCOIMAPFetchContentOperation.h | 4 +- src/objc/imap/MCOIMAPFetchFoldersOperation.h | 2 +- src/objc/imap/MCOIMAPFetchFoldersOperation.mm | 2 +- src/objc/imap/MCOIMAPFetchMessagesOperation.h | 4 +- src/objc/imap/MCOIMAPFetchNamespaceOperation.h | 2 +- src/objc/imap/MCOIMAPFolder.h | 2 +- src/objc/imap/MCOIMAPFolderInfoOperation.h | 2 +- src/objc/imap/MCOIMAPIdentityOperation.h | 2 +- src/objc/imap/MCOIMAPIdleOperation.h | 2 +- src/objc/imap/MCOIMAPMessage.h | 4 +- src/objc/imap/MCOIMAPMessagePart.h | 2 +- src/objc/imap/MCOIMAPMultipart.h | 2 +- src/objc/imap/MCOIMAPOperation.h | 2 +- src/objc/imap/MCOIMAPPart.h | 4 +- src/objc/imap/MCOIMAPSearchExpression.h | 2 +- src/objc/imap/MCOIMAPSearchOperation.h | 2 +- src/objc/imap/MCOIMAPSession.h | 2 +- src/objc/imap/MCOIMAPSession.mm | 2 +- src/objc/pop/MCOPOP.h | 12 ++--- src/objc/pop/MCOPOPFetchHeaderOperation.h | 2 +- src/objc/pop/MCOPOPFetchMessageOperation.h | 2 +- src/objc/pop/MCOPOPFetchMessagesOperation.h | 2 +- src/objc/pop/MCOPOPOperation.h | 2 +- src/objc/pop/MCOPOPSession.h | 2 +- src/objc/rfc822/MCOAttachment.h | 2 +- src/objc/rfc822/MCOMessageBuilder.h | 2 +- src/objc/rfc822/MCOMessageParser.h | 2 +- src/objc/rfc822/MCOMessagePart.h | 2 +- src/objc/rfc822/MCOMultipart.h | 2 +- src/objc/rfc822/MCORFC822.h | 10 ++-- src/objc/smtp/MCOSMTP.h | 6 +-- src/objc/smtp/MCOSMTPOperation.h | 2 +- src/objc/smtp/MCOSMTPSendOperation.h | 2 +- src/objc/smtp/MCOSMTPSession.h | 2 +- src/objc/utils/MCOIndexSet.h | 2 +- src/objc/utils/MCOIndexSet.mm | 2 +- src/objc/utils/MCORange.h | 2 +- src/objc/utils/MCOUtils.h | 26 ++++----- src/ui/mac/MCOCIDURLProtocol.h | 2 +- src/ui/mac/MCOMessageView.h | 2 +- tests/test-all.h | 2 +- tests/test-all.mm | 2 +- 140 files changed, 379 insertions(+), 347 deletions(-) create mode 100644 build-mac/framework-Info.plist diff --git a/build-mac/framework-Info.plist b/build-mac/framework-Info.plist new file mode 100644 index 00000000..e92ea282 --- /dev/null +++ b/build-mac/framework-Info.plist @@ -0,0 +1,30 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleExecutable + ${EXECUTABLE_NAME} + CFBundleIconFile + + CFBundleIdentifier + com.libmailcore.${PRODUCT_NAME:rfc1034identifier} + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + ${PRODUCT_NAME} + CFBundlePackageType + FMWK + CFBundleShortVersionString + 1.0 + CFBundleSignature + ???? + CFBundleVersion + 1 + NSHumanReadableCopyright + Copyright © 2013 MailCore. All rights reserved. + NSPrincipalClass + + + diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj index ced5b166..1b131e71 100644 --- a/build-mac/mailcore2.xcodeproj/project.pbxproj +++ b/build-mac/mailcore2.xcodeproj/project.pbxproj @@ -214,7 +214,7 @@ C6A81B961706840C00882C15 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A81B951706840C00882C15 /* CoreGraphics.framework */; }; C6A81BAE1706847900882C15 /* test-all.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BAC1706847900882C15 /* test-all.mm */; }; C6A81BAF170684D300882C15 /* test-all.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BAC1706847900882C15 /* test-all.mm */; }; - C6A81BB2170685A700882C15 /* libmailcore2-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */; }; + C6A81BB2170685A700882C15 /* libMailCore-ios.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */; }; C6A81BB41706891B00882C15 /* CFNetwork.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6A81BB31706891B00882C15 /* CFNetwork.framework */; }; C6A81BBA17068C0600882C15 /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BB717068C0600882C15 /* AppDelegate.mm */; }; C6A81BBB17068C0600882C15 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = C6A81BB817068C0600882C15 /* main.m */; }; @@ -524,11 +524,11 @@ C6BA2C131705F4E6003F0E9E /* MCOIMAPFolderInfo.m in Sources */ = {isa = PBXBuildFile; fileRef = C6F61F9E17016EA00073032E /* MCOIMAPFolderInfo.m */; }; C6BA2C141705F4E6003F0E9E /* MCOIMAPBaseOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6F61FB41702AB2F0073032E /* MCOIMAPBaseOperation.mm */; }; C6BD288F170BD71100A91AC1 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288E170BD71100A91AC1 /* Cocoa.framework */; }; - C6BD28A3170BD84F00A91AC1 /* libmailcore2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C64EA537169E772200778456 /* libmailcore2.a */; }; + C6BD28A3170BD84F00A91AC1 /* libMailCore.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C64EA537169E772200778456 /* libMailCore.a */; }; C6BD28A7170BD99800A91AC1 /* mailcore.h in Headers */ = {isa = PBXBuildFile; fileRef = C64EA7A4169F2A3E00778456 /* mailcore.h */; settings = {ATTRIBUTES = (Public, ); }; }; C6BD28AA170BDB6B00A91AC1 /* MCOFramework.h in Headers */ = {isa = PBXBuildFile; fileRef = C6BD28A8170BDB6B00A91AC1 /* MCOFramework.h */; }; C6BD28AB170BDB6B00A91AC1 /* MCOFramework.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6BD28A9170BDB6B00A91AC1 /* MCOFramework.mm */; }; - C6BD28AC170BDEA200A91AC1 /* MailCore2.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288D170BD71100A91AC1 /* MailCore2.framework */; }; + C6BD28AC170BDEA200A91AC1 /* MailCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C6BD288D170BD71100A91AC1 /* MailCore.framework */; }; C6CCC5C716FFE5190077A5FC /* MCORange.mm in Sources */ = {isa = PBXBuildFile; fileRef = C6CCC5C616FFE5190077A5FC /* MCORange.mm */; }; C6CCC5C916FFEA070077A5FC /* MCORange.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6CCC5C816FFE54F0077A5FC /* MCORange.h */; }; C6CCC5CA16FFEA090077A5FC /* MCOIndexSet.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = C6F5B9F216FEAC6C00D9DABD /* MCOIndexSet.h */; }; @@ -596,13 +596,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - C64EA7A2169F2A1D00778456 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = C64EA52E169E772200778456 /* Project object */; - proxyType = 1; - remoteGlobalIDString = C64EA536169E772200778456; - remoteInfo = mailcore2; - }; C6A81BB01706852200882C15 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = C64EA52E169E772200778456 /* Project object */; @@ -617,6 +610,13 @@ remoteGlobalIDString = C64EA536169E772200778456; remoteInfo = "static mailcore2 osx"; }; + C6BD28B5170C034B00A91AC1 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = C64EA52E169E772200778456 /* Project object */; + proxyType = 1; + remoteGlobalIDString = C6BD288C170BD71100A91AC1; + remoteInfo = "mailcore osx"; + }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -1036,7 +1036,7 @@ C64BB26B16FD4C3B000DB34C /* MCORFC822.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCORFC822.h; sourceTree = ""; }; C64BB26C16FD62FB000DB34C /* MCOUtils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MCOUtils.h; sourceTree = ""; }; C64BB26D16FD63F6000DB34C /* MCOConstants.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOConstants.h; sourceTree = ""; }; - C64EA537169E772200778456 /* libmailcore2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libmailcore2.a; sourceTree = BUILT_PRODUCTS_DIR; }; + C64EA537169E772200778456 /* libMailCore.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libMailCore.a; sourceTree = BUILT_PRODUCTS_DIR; }; C64EA68C169E847800778456 /* MCIMAPAsyncConnection.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCIMAPAsyncConnection.h; sourceTree = ""; }; C64EA68F169E847800778456 /* MCSMTPAsyncSession.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCSMTPAsyncSession.cc; sourceTree = ""; }; C64EA690169E847800778456 /* MCSMTPAsyncSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCSMTPAsyncSession.h; sourceTree = ""; }; @@ -1212,8 +1212,8 @@ C6A81BFB170781BC00882C15 /* MCOPOP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOPOP.h; sourceTree = ""; }; C6A81BFE1707CEE400882C15 /* MCOPOPMessageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOPOPMessageInfo.h; sourceTree = ""; }; C6A81BFF1707CEE500882C15 /* MCOPOPMessageInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOPOPMessageInfo.mm; sourceTree = ""; }; - C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libmailcore2-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; }; - C6BD288D170BD71100A91AC1 /* MailCore2.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MailCore2.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libMailCore-ios.a"; sourceTree = BUILT_PRODUCTS_DIR; }; + C6BD288D170BD71100A91AC1 /* MailCore.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = MailCore.framework; sourceTree = BUILT_PRODUCTS_DIR; }; C6BD288E170BD71100A91AC1 /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; }; C6BD2891170BD71100A91AC1 /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; }; C6BD2892170BD71100A91AC1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = System/Library/Frameworks/CoreData.framework; sourceTree = SDKROOT; }; @@ -1295,7 +1295,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C6BD28AC170BDEA200A91AC1 /* MailCore2.framework in Frameworks */, + C6BD28AC170BDEA200A91AC1 /* MailCore.framework in Frameworks */, C64EA7B116A00BBB00778456 /* CoreServices.framework in Frameworks */, C64EA790169F259200778456 /* Foundation.framework in Frameworks */, ); @@ -1306,7 +1306,7 @@ buildActionMask = 2147483647; files = ( C6A81BB41706891B00882C15 /* CFNetwork.framework in Frameworks */, - C6A81BB2170685A700882C15 /* libmailcore2-ios.a in Frameworks */, + C6A81BB2170685A700882C15 /* libMailCore-ios.a in Frameworks */, C6A81B931706840C00882C15 /* UIKit.framework in Frameworks */, C6A81B941706840C00882C15 /* Foundation.framework in Frameworks */, C6A81B961706840C00882C15 /* CoreGraphics.framework in Frameworks */, @@ -1324,7 +1324,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - C6BD28A3170BD84F00A91AC1 /* libmailcore2.a in Frameworks */, + C6BD28A3170BD84F00A91AC1 /* libMailCore.a in Frameworks */, C6BD288F170BD71100A91AC1 /* Cocoa.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; @@ -1412,11 +1412,11 @@ C64EA538169E772200778456 /* Products */ = { isa = PBXGroup; children = ( - C64EA537169E772200778456 /* libmailcore2.a */, + C64EA537169E772200778456 /* libMailCore.a */, C64EA78C169F259200778456 /* tests */, - C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */, + C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */, C6A81B911706840C00882C15 /* test-ios.app */, - C6BD288D170BD71100A91AC1 /* MailCore2.framework */, + C6BD288D170BD71100A91AC1 /* MailCore.framework */, ); name = Products; sourceTree = ""; @@ -1908,7 +1908,7 @@ ); name = "static mailcore2 osx"; productName = mailcore; - productReference = C64EA537169E772200778456 /* libmailcore2.a */; + productReference = C64EA537169E772200778456 /* libMailCore.a */; productType = "com.apple.product-type.library.static"; }; C64EA78B169F259200778456 /* tests */ = { @@ -1922,7 +1922,7 @@ buildRules = ( ); dependencies = ( - C64EA7A3169F2A1D00778456 /* PBXTargetDependency */, + C6BD28B6170C034B00A91AC1 /* PBXTargetDependency */, ); name = tests; productName = tests; @@ -1962,7 +1962,7 @@ ); name = "static mailcore2 ios"; productName = mailcore; - productReference = C6BA2C191705F4E6003F0E9E /* libmailcore2-ios.a */; + productReference = C6BA2C191705F4E6003F0E9E /* libMailCore-ios.a */; productType = "com.apple.product-type.library.static"; }; C6BD288C170BD71100A91AC1 /* mailcore osx */ = { @@ -1982,7 +1982,7 @@ ); name = "mailcore osx"; productName = "mailcore framework"; - productReference = C6BD288D170BD71100A91AC1 /* MailCore2.framework */; + productReference = C6BD288D170BD71100A91AC1 /* MailCore.framework */; productType = "com.apple.product-type.framework"; }; /* End PBXNativeTarget section */ @@ -1991,7 +1991,7 @@ C64EA52E169E772200778456 /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0450; + LastUpgradeCheck = 0460; ORGANIZATIONNAME = MailCore; }; buildConfigurationList = C64EA531169E772200778456 /* Build configuration list for PBXProject "mailcore2" */; @@ -2385,11 +2385,6 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - C64EA7A3169F2A1D00778456 /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = C64EA536169E772200778456 /* static mailcore2 osx */; - targetProxy = C64EA7A2169F2A1D00778456 /* PBXContainerItemProxy */; - }; C6A81BB11706852200882C15 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = C6BA2B091705F4E6003F0E9E /* static mailcore2 ios */; @@ -2400,6 +2395,11 @@ target = C64EA536169E772200778456 /* static mailcore2 osx */; targetProxy = C6BD28A4170BD86A00A91AC1 /* PBXContainerItemProxy */; }; + C6BD28B6170C034B00A91AC1 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = C6BD288C170BD71100A91AC1 /* mailcore osx */; + targetProxy = C6BD28B5170C034B00A91AC1 /* PBXContainerItemProxy */; + }; /* End PBXTargetDependency section */ /* Begin XCBuildConfiguration section */ @@ -2563,16 +2563,18 @@ C64EA53C169E772200778456 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = mailcore2; + PRODUCT_NAME = MailCore; }; name = Debug; }; C64EA53D169E772200778456 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + COMBINE_HIDPI_IMAGES = YES; EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = mailcore2; + PRODUCT_NAME = MailCore; }; name = Release; }; @@ -2674,7 +2676,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libstdc++"; EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "mailcore2-ios"; + PRODUCT_NAME = "MailCore-ios"; SDKROOT = iphoneos; }; name = Debug; @@ -2686,7 +2688,7 @@ CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; CLANG_CXX_LIBRARY = "libstdc++"; EXECUTABLE_PREFIX = lib; - PRODUCT_NAME = "mailcore2-ios"; + PRODUCT_NAME = "MailCore-ios"; SDKROOT = iphoneos; }; name = Release; @@ -2713,7 +2715,7 @@ "-all_load", "-ltidy", ); - PRODUCT_NAME = MailCore2; + PRODUCT_NAME = MailCore; WRAPPER_EXTENSION = framework; }; name = Debug; @@ -2740,7 +2742,7 @@ "-all_load", "-ltidy", ); - PRODUCT_NAME = MailCore2; + PRODUCT_NAME = MailCore; WRAPPER_EXTENSION = framework; }; name = Release; diff --git a/src/async/MCAsync.h b/src/async/MCAsync.h index 245bf15b..3198985d 100644 --- a/src/async/MCAsync.h +++ b/src/async/MCAsync.h @@ -9,8 +9,8 @@ #ifndef mailcore2_MCAsync_h #define mailcore2_MCAsync_h -#include -#include -#include +#include +#include +#include #endif diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h index 18ea5e20..441d05b4 100644 --- a/src/async/imap/MCAsyncIMAP.h +++ b/src/async/imap/MCAsyncIMAP.h @@ -9,22 +9,22 @@ #ifndef mailcore2_MCAsyncIMAP_h #define mailcore2_MCAsyncIMAP_h -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/async/imap/MCIMAPAppendMessageOperation.h b/src/async/imap/MCIMAPAppendMessageOperation.h index 15b18e2f..3a047adb 100644 --- a/src/async/imap/MCIMAPAppendMessageOperation.h +++ b/src/async/imap/MCIMAPAppendMessageOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCIMAPAppendMessageOperation__ #define __mailcore2__MCIMAPAppendMessageOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h index 12efcf14..2cbc4ef9 100644 --- a/src/async/imap/MCIMAPAsyncConnection.h +++ b/src/async/imap/MCIMAPAsyncConnection.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCIMAPASYNCCONNECTION_H -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h index 874ae571..3a11256b 100644 --- a/src/async/imap/MCIMAPAsyncSession.h +++ b/src/async/imap/MCIMAPAsyncSession.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCIMAPAccount__ #define __mailcore2__MCIMAPAccount__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPCapabilityOperation.h b/src/async/imap/MCIMAPCapabilityOperation.h index f11828bb..8fb76dc2 100644 --- a/src/async/imap/MCIMAPCapabilityOperation.h +++ b/src/async/imap/MCIMAPCapabilityOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPCapabilityOperation__ #define __mailcore2__MCIMAPCapabilityOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPCheckAccountOperation.h b/src/async/imap/MCIMAPCheckAccountOperation.h index 7d61645b..c0f2f4f7 100644 --- a/src/async/imap/MCIMAPCheckAccountOperation.h +++ b/src/async/imap/MCIMAPCheckAccountOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPCheckAccountOperation__ #define __mailcore2__MCIMAPCheckAccountOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPCopyMessagesOperation.h b/src/async/imap/MCIMAPCopyMessagesOperation.h index 9f8e75f0..a37d442e 100644 --- a/src/async/imap/MCIMAPCopyMessagesOperation.h +++ b/src/async/imap/MCIMAPCopyMessagesOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPCopyMessagesOperation__ #define __mailcore2__MCIMAPCopyMessagesOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPCreateFolderOperation.h b/src/async/imap/MCIMAPCreateFolderOperation.h index d37abfba..ff8955fe 100644 --- a/src/async/imap/MCIMAPCreateFolderOperation.h +++ b/src/async/imap/MCIMAPCreateFolderOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPCreateFolderOperation__ #define __mailcore2__MCIMAPCreateFolderOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPDeleteFolderOperation.h b/src/async/imap/MCIMAPDeleteFolderOperation.h index 99027456..c5d7cbfc 100644 --- a/src/async/imap/MCIMAPDeleteFolderOperation.h +++ b/src/async/imap/MCIMAPDeleteFolderOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPDeleteFolderOperation__ #define __mailcore2__MCIMAPDeleteFolderOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPExpungeOperation.h b/src/async/imap/MCIMAPExpungeOperation.h index fbdf8118..5ed86352 100644 --- a/src/async/imap/MCIMAPExpungeOperation.h +++ b/src/async/imap/MCIMAPExpungeOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPExpungeOperation__ #define __mailcore2__MCIMAPExpungeOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPFetchContentOperation.h b/src/async/imap/MCIMAPFetchContentOperation.h index 390c57b7..5ea0fe01 100644 --- a/src/async/imap/MCIMAPFetchContentOperation.h +++ b/src/async/imap/MCIMAPFetchContentOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__IMAPFetchContentOperation__ #define __mailcore2__IMAPFetchContentOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPFetchFoldersOperation.h b/src/async/imap/MCIMAPFetchFoldersOperation.h index 025a3210..84d2a87f 100644 --- a/src/async/imap/MCIMAPFetchFoldersOperation.h +++ b/src/async/imap/MCIMAPFetchFoldersOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCIMAPFetchFoldersOperation__ #define __mailcore2__MCIMAPFetchFoldersOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPFetchMessagesOperation.h b/src/async/imap/MCIMAPFetchMessagesOperation.h index 4afa59e5..42f0ea0a 100644 --- a/src/async/imap/MCIMAPFetchMessagesOperation.h +++ b/src/async/imap/MCIMAPFetchMessagesOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__IMAPFetchMessagesOperation__ #define __mailcore2__IMAPFetchMessagesOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPFetchNamespaceOperation.h b/src/async/imap/MCIMAPFetchNamespaceOperation.h index 5e18b38a..8fa348b1 100644 --- a/src/async/imap/MCIMAPFetchNamespaceOperation.h +++ b/src/async/imap/MCIMAPFetchNamespaceOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__IMAPFetchNamespaceOperation__ #define __mailcore2__IMAPFetchNamespaceOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPFolderInfoOperation.h b/src/async/imap/MCIMAPFolderInfoOperation.h index bce16579..f11bb7ca 100644 --- a/src/async/imap/MCIMAPFolderInfoOperation.h +++ b/src/async/imap/MCIMAPFolderInfoOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPFolderInfoOperation__ #define __mailcore2__MCIMAPFolderInfoOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPIdentityOperation.h b/src/async/imap/MCIMAPIdentityOperation.h index 22a27a28..1cd2d662 100644 --- a/src/async/imap/MCIMAPIdentityOperation.h +++ b/src/async/imap/MCIMAPIdentityOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__IMAPIdentityOperation__ #define __mailcore2__IMAPIdentityOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPIdleOperation.h b/src/async/imap/MCIMAPIdleOperation.h index 5841c73d..3ba5fdf4 100644 --- a/src/async/imap/MCIMAPIdleOperation.h +++ b/src/async/imap/MCIMAPIdleOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__IMAPIdleOperation__ #define __mailcore2__IMAPIdleOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPOperation.h b/src/async/imap/MCIMAPOperation.h index 57541993..7a8c1384 100644 --- a/src/async/imap/MCIMAPOperation.h +++ b/src/async/imap/MCIMAPOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCIMAPOperation__ #define __mailcore2__MCIMAPOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPRenameFolderOperation.h b/src/async/imap/MCIMAPRenameFolderOperation.h index 83f949bf..cd966794 100644 --- a/src/async/imap/MCIMAPRenameFolderOperation.h +++ b/src/async/imap/MCIMAPRenameFolderOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPRenameFolderOperation__ #define __mailcore2__MCIMAPRenameFolderOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPSearchOperation.h b/src/async/imap/MCIMAPSearchOperation.h index 96efb35b..7063284a 100644 --- a/src/async/imap/MCIMAPSearchOperation.h +++ b/src/async/imap/MCIMAPSearchOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__IMAPSearchOperation__ #define __mailcore2__IMAPSearchOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPStoreFlagsOperation.h b/src/async/imap/MCIMAPStoreFlagsOperation.h index 6e50e015..cf5655ec 100644 --- a/src/async/imap/MCIMAPStoreFlagsOperation.h +++ b/src/async/imap/MCIMAPStoreFlagsOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPStoreFlagsOperation__ #define __mailcore2__MCIMAPStoreFlagsOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPStoreLabelsOperation.h b/src/async/imap/MCIMAPStoreLabelsOperation.h index 3e5cad2c..cf6e1925 100644 --- a/src/async/imap/MCIMAPStoreLabelsOperation.h +++ b/src/async/imap/MCIMAPStoreLabelsOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPStoreLabelsOperation__ #define __mailcore2__MCIMAPStoreLabelsOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/imap/MCIMAPSubscribeFolderOperation.h b/src/async/imap/MCIMAPSubscribeFolderOperation.h index 277a87ad..1a344378 100644 --- a/src/async/imap/MCIMAPSubscribeFolderOperation.h +++ b/src/async/imap/MCIMAPSubscribeFolderOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPSubscribeFolderOperation__ #define __mailcore2__MCIMAPSubscribeFolderOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/pop/MCAsyncPOP.h b/src/async/pop/MCAsyncPOP.h index d41d406d..962b6ab9 100644 --- a/src/async/pop/MCAsyncPOP.h +++ b/src/async/pop/MCAsyncPOP.h @@ -9,11 +9,11 @@ #ifndef mailcore2_MCAsyncPOP_h #define mailcore2_MCAsyncPOP_h -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/async/pop/MCPOPAsyncSession.h b/src/async/pop/MCPOPAsyncSession.h index 66401eb6..48dae219 100644 --- a/src/async/pop/MCPOPAsyncSession.h +++ b/src/async/pop/MCPOPAsyncSession.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCPopAsyncSession__ #define __mailcore2__MCPopAsyncSession__ -#include +#include #ifdef __cplusplus diff --git a/src/async/pop/MCPOPDeleteMessagesOperation.h b/src/async/pop/MCPOPDeleteMessagesOperation.h index c7819ce6..7056ad9c 100644 --- a/src/async/pop/MCPOPDeleteMessagesOperation.h +++ b/src/async/pop/MCPOPDeleteMessagesOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCPOPDeleteMessagesOperation__ #define __mailcore2__MCPOPDeleteMessagesOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/pop/MCPOPFetchHeaderOperation.h b/src/async/pop/MCPOPFetchHeaderOperation.h index 1ad4a40b..038769a3 100644 --- a/src/async/pop/MCPOPFetchHeaderOperation.h +++ b/src/async/pop/MCPOPFetchHeaderOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCPOPFetchHeaderOperation__ #define __mailcore2__MCPOPFetchHeaderOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/pop/MCPOPFetchMessageOperation.h b/src/async/pop/MCPOPFetchMessageOperation.h index 7b61db8a..10864a70 100644 --- a/src/async/pop/MCPOPFetchMessageOperation.h +++ b/src/async/pop/MCPOPFetchMessageOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCPOPFetchMessageOperation__ #define __mailcore2__MCPOPFetchMessageOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/pop/MCPOPFetchMessagesOperation.h b/src/async/pop/MCPOPFetchMessagesOperation.h index 1078257c..6a3d099a 100644 --- a/src/async/pop/MCPOPFetchMessagesOperation.h +++ b/src/async/pop/MCPOPFetchMessagesOperation.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCPOPFetchMessagesOperation__ #define __mailcore2__MCPOPFetchMessagesOperation__ -#include +#include #ifdef __cplusplus diff --git a/src/async/pop/MCPOPOperation.h b/src/async/pop/MCPOPOperation.h index e621caa0..d1ce9f94 100644 --- a/src/async/pop/MCPOPOperation.h +++ b/src/async/pop/MCPOPOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCPOPOperation__ #define __mailcore2__MCPOPOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/smtp/MCAsyncSMTP.h b/src/async/smtp/MCAsyncSMTP.h index 5d5e8282..1c565d25 100644 --- a/src/async/smtp/MCAsyncSMTP.h +++ b/src/async/smtp/MCAsyncSMTP.h @@ -9,8 +9,8 @@ #ifndef mailcore2_MCAsyncSMTP_h #define mailcore2_MCAsyncSMTP_h -#include -#include -#include +#include +#include +#include #endif diff --git a/src/async/smtp/MCSMTPAsyncSession.h b/src/async/smtp/MCSMTPAsyncSession.h index 3159809b..6b1538c4 100644 --- a/src/async/smtp/MCSMTPAsyncSession.h +++ b/src/async/smtp/MCSMTPAsyncSession.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCSMTPASYNCSESSION_H -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/src/async/smtp/MCSMTPCheckAccountOperation.h b/src/async/smtp/MCSMTPCheckAccountOperation.h index 68850d15..5eb2bfbd 100644 --- a/src/async/smtp/MCSMTPCheckAccountOperation.h +++ b/src/async/smtp/MCSMTPCheckAccountOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCSMTPCheckAccountOperation__ #define __mailcore2__MCSMTPCheckAccountOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/smtp/MCSMTPOperation.h b/src/async/smtp/MCSMTPOperation.h index d41154d1..79846532 100644 --- a/src/async/smtp/MCSMTPOperation.h +++ b/src/async/smtp/MCSMTPOperation.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCSMTPOperation__ #define __mailcore2__MCSMTPOperation__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/async/smtp/MCSMTPSendWithDataOperation.h b/src/async/smtp/MCSMTPSendWithDataOperation.h index 105cb751..8e9b6cd9 100644 --- a/src/async/smtp/MCSMTPSendWithDataOperation.h +++ b/src/async/smtp/MCSMTPSendWithDataOperation.h @@ -9,9 +9,9 @@ #ifndef __mailcore2__MCSMTPSendWithDataOperation__ #define __mailcore2__MCSMTPSendWithDataOperation__ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus diff --git a/src/core/MCCore.h b/src/core/MCCore.h index a909e677..952ae1b5 100644 --- a/src/core/MCCore.h +++ b/src/core/MCCore.h @@ -9,12 +9,12 @@ #ifndef __MAILCORE_MCCORE_H_ #define __MAILCORE_MCCORE_H_ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/core/abstract/MCAbstract.h b/src/core/abstract/MCAbstract.h index fd36af46..d53a69a4 100644 --- a/src/core/abstract/MCAbstract.h +++ b/src/core/abstract/MCAbstract.h @@ -2,12 +2,12 @@ #define __MAILCORE_MCABSTRACT_H -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/core/abstract/MCAbstractMessage.h b/src/core/abstract/MCAbstractMessage.h index 9dccdbb8..657ddaa5 100644 --- a/src/core/abstract/MCAbstractMessage.h +++ b/src/core/abstract/MCAbstractMessage.h @@ -1,7 +1,7 @@ #ifndef __MAILCORE_MCABSTRACTMESSAGE_H_ #define __MAILCORE_MCABSTRACTMESSAGE_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/abstract/MCAbstractMessagePart.h b/src/core/abstract/MCAbstractMessagePart.h index 1bc6981e..1ff1def6 100644 --- a/src/core/abstract/MCAbstractMessagePart.h +++ b/src/core/abstract/MCAbstractMessagePart.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCABSTRACTMESSAGEPART_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/abstract/MCAbstractMultipart.h b/src/core/abstract/MCAbstractMultipart.h index ca2a163b..da77f9a6 100644 --- a/src/core/abstract/MCAbstractMultipart.h +++ b/src/core/abstract/MCAbstractMultipart.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCABSTRACTMULTIPART_H -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/abstract/MCAbstractPart.h b/src/core/abstract/MCAbstractPart.h index 49360089..970b5e04 100644 --- a/src/core/abstract/MCAbstractPart.h +++ b/src/core/abstract/MCAbstractPart.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCABSTRACTPART_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/abstract/MCAddress.h b/src/core/abstract/MCAddress.h index add45f7d..9ed71414 100644 --- a/src/core/abstract/MCAddress.h +++ b/src/core/abstract/MCAddress.h @@ -3,7 +3,7 @@ #define __MAILCORE_MCADDRESS_H_ #include -#include +#include #ifdef __cplusplus diff --git a/src/core/abstract/MCMessageHeader.h b/src/core/abstract/MCMessageHeader.h index c8e2c5f6..3e481db3 100644 --- a/src/core/abstract/MCMessageHeader.h +++ b/src/core/abstract/MCMessageHeader.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCMESSAGEHEADER_H_ -#include +#include #include #ifdef __cplusplus diff --git a/src/core/basetypes/MCArray.h b/src/core/basetypes/MCArray.h index c6dd1090..6ee17549 100644 --- a/src/core/basetypes/MCArray.h +++ b/src/core/basetypes/MCArray.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCARRAY_H_ -#include +#include #include diff --git a/src/core/basetypes/MCAutoreleasePool.h b/src/core/basetypes/MCAutoreleasePool.h index 583015c9..6d0b2ad2 100644 --- a/src/core/basetypes/MCAutoreleasePool.h +++ b/src/core/basetypes/MCAutoreleasePool.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCAUTORELEASEPOOL_H_ -#include +#include #include #include diff --git a/src/core/basetypes/MCBaseTypes.h b/src/core/basetypes/MCBaseTypes.h index d5b12083..8ce52531 100644 --- a/src/core/basetypes/MCBaseTypes.h +++ b/src/core/basetypes/MCBaseTypes.h @@ -2,22 +2,22 @@ #define __MAILCORE_MCBASETYPES_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/core/basetypes/MCData.h b/src/core/basetypes/MCData.h index 7a9d6db7..a8f3fe8b 100644 --- a/src/core/basetypes/MCData.h +++ b/src/core/basetypes/MCData.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCDATA_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/basetypes/MCHTMLCleaner.h b/src/core/basetypes/MCHTMLCleaner.h index f4707872..81af69df 100644 --- a/src/core/basetypes/MCHTMLCleaner.h +++ b/src/core/basetypes/MCHTMLCleaner.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__HTMLCleaner__ #define __mailcore2__HTMLCleaner__ -#include +#include namespace mailcore { diff --git a/src/core/basetypes/MCHashMap.h b/src/core/basetypes/MCHashMap.h index 92700190..40751b8e 100644 --- a/src/core/basetypes/MCHashMap.h +++ b/src/core/basetypes/MCHashMap.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCHASHMAP_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/basetypes/MCIndexSet.h b/src/core/basetypes/MCIndexSet.h index 3d9bdb6c..461bb063 100644 --- a/src/core/basetypes/MCIndexSet.h +++ b/src/core/basetypes/MCIndexSet.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCIndexSet__ #define __mailcore2__MCIndexSet__ -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/src/core/basetypes/MCOperation.h b/src/core/basetypes/MCOperation.h index e5b8fa33..71d0b465 100644 --- a/src/core/basetypes/MCOperation.h +++ b/src/core/basetypes/MCOperation.h @@ -3,7 +3,7 @@ #define __MAILCORE_MCOPERATION_H_ #include -#include +#include #ifdef __cplusplus diff --git a/src/core/basetypes/MCOperationQueue.h b/src/core/basetypes/MCOperationQueue.h index dd503bb3..02f77d7a 100644 --- a/src/core/basetypes/MCOperationQueue.h +++ b/src/core/basetypes/MCOperationQueue.h @@ -4,7 +4,7 @@ #include #include -#include +#include #include #ifdef __cplusplus diff --git a/src/core/basetypes/MCSet.h b/src/core/basetypes/MCSet.h index 2d6df20c..8b82ad33 100644 --- a/src/core/basetypes/MCSet.h +++ b/src/core/basetypes/MCSet.h @@ -2,7 +2,7 @@ #define __MAILCORE_CSET_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/basetypes/MCString.h b/src/core/basetypes/MCString.h index 521291d3..53a27068 100644 --- a/src/core/basetypes/MCString.h +++ b/src/core/basetypes/MCString.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCSTR_H_ -#include -#include +#include +#include #include #include diff --git a/src/core/basetypes/MCValue.h b/src/core/basetypes/MCValue.h index 52866235..09c05d6b 100644 --- a/src/core/basetypes/MCValue.h +++ b/src/core/basetypes/MCValue.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCVALUE_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAP.h b/src/core/imap/MCIMAP.h index 28782163..add670a2 100644 --- a/src/core/imap/MCIMAP.h +++ b/src/core/imap/MCIMAP.h @@ -2,16 +2,16 @@ #define __MAILCORE_MCIMAP_H_ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #endif diff --git a/src/core/imap/MCIMAPFolder.h b/src/core/imap/MCIMAPFolder.h index 23a4a831..f4f6e7ef 100644 --- a/src/core/imap/MCIMAPFolder.h +++ b/src/core/imap/MCIMAPFolder.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCIMAPFOLDER_H -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPMessage.h b/src/core/imap/MCIMAPMessage.h index fdf2779b..5bc5f843 100644 --- a/src/core/imap/MCIMAPMessage.h +++ b/src/core/imap/MCIMAPMessage.h @@ -2,10 +2,10 @@ #define __MAILCORE_IMAP_MESSAGE_H_ -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPMessagePart.h b/src/core/imap/MCIMAPMessagePart.h index 8e23eff2..a4ff6e39 100644 --- a/src/core/imap/MCIMAPMessagePart.h +++ b/src/core/imap/MCIMAPMessagePart.h @@ -2,7 +2,7 @@ #define __MAILCORE_IMAPMESSAGEPART_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPMultipart.h b/src/core/imap/MCIMAPMultipart.h index 02ee5cf8..126a4398 100644 --- a/src/core/imap/MCIMAPMultipart.h +++ b/src/core/imap/MCIMAPMultipart.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCIMAPMULTIPART_H -#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPNamespace.h b/src/core/imap/MCIMAPNamespace.h index faf15330..09c029e2 100644 --- a/src/core/imap/MCIMAPNamespace.h +++ b/src/core/imap/MCIMAPNamespace.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCIMAPNAMESPACE_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPNamespaceItem.h b/src/core/imap/MCIMAPNamespaceItem.h index 7ac96a35..4cee0aea 100644 --- a/src/core/imap/MCIMAPNamespaceItem.h +++ b/src/core/imap/MCIMAPNamespaceItem.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCIMAPNAMESPACEITEM_H -#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPPart.h b/src/core/imap/MCIMAPPart.h index 44d03b2f..bca5a5bb 100644 --- a/src/core/imap/MCIMAPPart.h +++ b/src/core/imap/MCIMAPPart.h @@ -2,9 +2,9 @@ #define __MAILCORE_MCIMAPPART_H_ -#include +#include #include -#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPSearchExpression.h b/src/core/imap/MCIMAPSearchExpression.h index b6546507..59028092 100644 --- a/src/core/imap/MCIMAPSearchExpression.h +++ b/src/core/imap/MCIMAPSearchExpression.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCIMAPSEARCHEXPRESSION_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPSession.h b/src/core/imap/MCIMAPSession.h index bd31527e..fc6a8456 100644 --- a/src/core/imap/MCIMAPSession.h +++ b/src/core/imap/MCIMAPSession.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCIMAPSESSION_H -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/src/core/imap/MCIMAPSyncResult.h b/src/core/imap/MCIMAPSyncResult.h index 3505a441..74a42355 100644 --- a/src/core/imap/MCIMAPSyncResult.h +++ b/src/core/imap/MCIMAPSyncResult.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__MCIMAPSyncResult__ #define __mailcore2__MCIMAPSyncResult__ -#include +#include #ifdef __cplusplus diff --git a/src/core/pop/MCPOP.h b/src/core/pop/MCPOP.h index 7651f9e6..c72498f6 100644 --- a/src/core/pop/MCPOP.h +++ b/src/core/pop/MCPOP.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCPOP_H -#include -#include -#include +#include +#include +#include #endif diff --git a/src/core/pop/MCPOPMessageInfo.h b/src/core/pop/MCPOPMessageInfo.h index 5a87b3e4..f7bb9f18 100644 --- a/src/core/pop/MCPOPMessageInfo.h +++ b/src/core/pop/MCPOPMessageInfo.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCPOPMESSAGEINFO_H_ -#include +#include #ifdef __cplusplus diff --git a/src/core/pop/MCPOPSession.h b/src/core/pop/MCPOPSession.h index 1f9af5cc..22eca94b 100644 --- a/src/core/pop/MCPOPSession.h +++ b/src/core/pop/MCPOPSession.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCPOPSESSION_H_ -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/src/core/renderer/MCAddressDisplay.h b/src/core/renderer/MCAddressDisplay.h index 153ad245..167bce9e 100644 --- a/src/core/renderer/MCAddressDisplay.h +++ b/src/core/renderer/MCAddressDisplay.h @@ -9,7 +9,7 @@ #ifndef __MCAddressDisplay__ #define __MCAddressDisplay__ -#include +#include #ifdef __cplusplus diff --git a/src/core/renderer/MCDateFormatter.h b/src/core/renderer/MCDateFormatter.h index 6467aae6..2649f7ae 100644 --- a/src/core/renderer/MCDateFormatter.h +++ b/src/core/renderer/MCDateFormatter.h @@ -9,7 +9,7 @@ #ifndef __testUI__MCDateFormatter__ #define __testUI__MCDateFormatter__ -#include +#include #include #ifdef __cplusplus diff --git a/src/core/renderer/MCHTMLRenderer.h b/src/core/renderer/MCHTMLRenderer.h index 042625cf..5de2056f 100644 --- a/src/core/renderer/MCHTMLRenderer.h +++ b/src/core/renderer/MCHTMLRenderer.h @@ -9,9 +9,9 @@ #ifndef __testUI__MCHTMLRenderer__ #define __testUI__MCHTMLRenderer__ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus diff --git a/src/core/renderer/MCHTMLRendererCallback.h b/src/core/renderer/MCHTMLRendererCallback.h index fdccdce2..6c900827 100644 --- a/src/core/renderer/MCHTMLRendererCallback.h +++ b/src/core/renderer/MCHTMLRendererCallback.h @@ -9,8 +9,8 @@ #ifndef __mailcore2__MCHTMLRendererCallback__ #define __mailcore2__MCHTMLRendererCallback__ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/renderer/MCRenderer.h b/src/core/renderer/MCRenderer.h index 65999f95..b79b160d 100644 --- a/src/core/renderer/MCRenderer.h +++ b/src/core/renderer/MCRenderer.h @@ -9,6 +9,6 @@ #ifndef mailcore2_MCRenderer_h #define mailcore2_MCRenderer_h -#include +#include #endif diff --git a/src/core/renderer/MCSizeFormatter.h b/src/core/renderer/MCSizeFormatter.h index a6c74010..625c1d3d 100644 --- a/src/core/renderer/MCSizeFormatter.h +++ b/src/core/renderer/MCSizeFormatter.h @@ -9,7 +9,7 @@ #ifndef __testUI__MCSizeFormatter__ #define __testUI__MCSizeFormatter__ -#include +#include #ifdef __cplusplus diff --git a/src/core/rfc822/MCAttachment.h b/src/core/rfc822/MCAttachment.h index ed0d8f1d..c1fc232e 100644 --- a/src/core/rfc822/MCAttachment.h +++ b/src/core/rfc822/MCAttachment.h @@ -2,10 +2,10 @@ #define __MAILCORE_MCATTACHMENT_H_ -#include -#include -#include -#include +#include +#include +#include +#include #ifdef __cplusplus diff --git a/src/core/rfc822/MCMessageBuilder.h b/src/core/rfc822/MCMessageBuilder.h index f34e09f4..0da545d9 100644 --- a/src/core/rfc822/MCMessageBuilder.h +++ b/src/core/rfc822/MCMessageBuilder.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCMESSAGEBUILDER_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/rfc822/MCMessageParser.h b/src/core/rfc822/MCMessageParser.h index ba129933..f5d043c5 100644 --- a/src/core/rfc822/MCMessageParser.h +++ b/src/core/rfc822/MCMessageParser.h @@ -2,9 +2,9 @@ #define __MAILCORE_MCPARSEDMESSAGE_H_ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus diff --git a/src/core/rfc822/MCMessagePart.h b/src/core/rfc822/MCMessagePart.h index c4f80551..6dd5eb7f 100644 --- a/src/core/rfc822/MCMessagePart.h +++ b/src/core/rfc822/MCMessagePart.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCMESSAGEPART_H_ -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/rfc822/MCMultipart.h b/src/core/rfc822/MCMultipart.h index 2853a2ed..f65e8993 100644 --- a/src/core/rfc822/MCMultipart.h +++ b/src/core/rfc822/MCMultipart.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCMULTIPART_H -#include -#include +#include +#include #ifdef __cplusplus diff --git a/src/core/rfc822/MCRFC822.h b/src/core/rfc822/MCRFC822.h index 9eb381b8..340577ae 100644 --- a/src/core/rfc822/MCRFC822.h +++ b/src/core/rfc822/MCRFC822.h @@ -2,10 +2,10 @@ #define __MAILCORE_MCRFC822_H -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #endif diff --git a/src/core/smtp/MCSMTP.h b/src/core/smtp/MCSMTP.h index 1f7d17d7..0b1560bd 100644 --- a/src/core/smtp/MCSMTP.h +++ b/src/core/smtp/MCSMTP.h @@ -2,7 +2,7 @@ #define __MAILCORE_MCSMTP_H -#include -#include +#include +#include #endif diff --git a/src/core/smtp/MCSMTPSession.h b/src/core/smtp/MCSMTPSession.h index dafe8b44..bae57cca 100644 --- a/src/core/smtp/MCSMTPSession.h +++ b/src/core/smtp/MCSMTPSession.h @@ -2,8 +2,8 @@ #define __MAILCORE_MCSMTPSESSION_H -#include -#include +#include +#include #include #ifdef __cplusplus diff --git a/src/mailcore.h b/src/mailcore.h index d6a36aa7..d890a5e8 100644 --- a/src/mailcore.h +++ b/src/mailcore.h @@ -9,8 +9,8 @@ #ifndef mailcore2_mailcore_h #define mailcore2_mailcore_h -#include -#include -#include +#include +#include +#include #endif diff --git a/src/objc/MCObjC.h b/src/objc/MCObjC.h index ca817cff..809f57df 100644 --- a/src/objc/MCObjC.h +++ b/src/objc/MCObjC.h @@ -11,12 +11,12 @@ #ifdef __OBJC__ -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #endif diff --git a/src/objc/abstract/MCOAbstract.h b/src/objc/abstract/MCOAbstract.h index 3100b5af..62acc8e7 100644 --- a/src/objc/abstract/MCOAbstract.h +++ b/src/objc/abstract/MCOAbstract.h @@ -9,13 +9,13 @@ #ifndef mailcore2_MCOAbstract_h #define mailcore2_MCOAbstract_h -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import #endif diff --git a/src/objc/abstract/MCOAbstractMessagePart.h b/src/objc/abstract/MCOAbstractMessagePart.h index 75cda3cd..b7275a88 100644 --- a/src/objc/abstract/MCOAbstractMessagePart.h +++ b/src/objc/abstract/MCOAbstractMessagePart.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOABSTRACTMESSAGEPART_H_ #import -#import +#import @class MCOMessageHeader; diff --git a/src/objc/abstract/MCOAbstractMultipart.h b/src/objc/abstract/MCOAbstractMultipart.h index 3eeb6794..e39809ff 100644 --- a/src/objc/abstract/MCOAbstractMultipart.h +++ b/src/objc/abstract/MCOAbstractMultipart.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOABSTRACTMULTIPART_H_ #import -#import +#import @interface MCOAbstractMultipart : MCOAbstractPart diff --git a/src/objc/abstract/MCOAbstractPart+Private.h b/src/objc/abstract/MCOAbstractPart+Private.h index 47ea189b..43349941 100644 --- a/src/objc/abstract/MCOAbstractPart+Private.h +++ b/src/objc/abstract/MCOAbstractPart+Private.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOABSTRACTPART_PRIVATE_H_ -#include +#include #ifdef __cplusplus diff --git a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h index 57b1dac7..83389cf3 100644 --- a/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h +++ b/src/objc/abstract/MCOHTMLRendererIMAPDelegate.h @@ -9,7 +9,7 @@ #ifndef mailcore2_MCOHTMLRendererIMAPDelegate_h #define mailcore2_MCOHTMLRendererIMAPDelegate_h -#import +#import @class MCOIMAPPart; diff --git a/src/objc/imap/MCOIMAP.h b/src/objc/imap/MCOIMAP.h index b44f52d6..55e430ae 100644 --- a/src/objc/imap/MCOIMAP.h +++ b/src/objc/imap/MCOIMAP.h @@ -10,30 +10,30 @@ #define __MAILCORE_MCOIMAP_H_ -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #endif diff --git a/src/objc/imap/MCOIMAPAppendMessageOperation.h b/src/objc/imap/MCOIMAPAppendMessageOperation.h index 53704e3f..1f988acd 100644 --- a/src/objc/imap/MCOIMAPAppendMessageOperation.h +++ b/src/objc/imap/MCOIMAPAppendMessageOperation.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import -#import +#import +#import #ifndef __MAILCORE_MCOIMAPAPPENDMESSAGEOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPBaseOperation.h b/src/objc/imap/MCOIMAPBaseOperation.h index 65e590db..be0aaf70 100644 --- a/src/objc/imap/MCOIMAPBaseOperation.h +++ b/src/objc/imap/MCOIMAPBaseOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPBASEOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPCapabilityOperation.h b/src/objc/imap/MCOIMAPCapabilityOperation.h index b7ddf9d5..446b8cfe 100644 --- a/src/objc/imap/MCOIMAPCapabilityOperation.h +++ b/src/objc/imap/MCOIMAPCapabilityOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPCAPABILITYOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPCopyMessagesOperation.h b/src/objc/imap/MCOIMAPCopyMessagesOperation.h index 4171fc76..112d23fa 100644 --- a/src/objc/imap/MCOIMAPCopyMessagesOperation.h +++ b/src/objc/imap/MCOIMAPCopyMessagesOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOCOPYMESSAGESOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPFetchContentOperation.h b/src/objc/imap/MCOIMAPFetchContentOperation.h index b6484ff1..6873860b 100644 --- a/src/objc/imap/MCOIMAPFetchContentOperation.h +++ b/src/objc/imap/MCOIMAPFetchContentOperation.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import -#import +#import +#import #ifndef __MAILCORE_MCOIMAPFETCHCONTENTOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.h b/src/objc/imap/MCOIMAPFetchFoldersOperation.h index 8f7b6592..87912f60 100644 --- a/src/objc/imap/MCOIMAPFetchFoldersOperation.h +++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOIMAPFETCHFOLDERSOPERATION_H_ -#import +#import @interface MCOIMAPFetchFoldersOperation : MCOIMAPBaseOperation - (void)start:(void (^)(NSError *error, NSArray *folder))completionBlock; diff --git a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm index 09b75131..4700ee85 100644 --- a/src/objc/imap/MCOIMAPFetchFoldersOperation.mm +++ b/src/objc/imap/MCOIMAPFetchFoldersOperation.mm @@ -14,7 +14,7 @@ #import "MCOUtils.h" #import -#import +#import using namespace mailcore; diff --git a/src/objc/imap/MCOIMAPFetchMessagesOperation.h b/src/objc/imap/MCOIMAPFetchMessagesOperation.h index cdf98eeb..b8c97c56 100644 --- a/src/objc/imap/MCOIMAPFetchMessagesOperation.h +++ b/src/objc/imap/MCOIMAPFetchMessagesOperation.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import -#import +#import +#import #ifndef __MAILCORE_MCOIMAPFETCHMESSAGESOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h index c7aacb04..0c20e90a 100644 --- a/src/objc/imap/MCOIMAPFetchNamespaceOperation.h +++ b/src/objc/imap/MCOIMAPFetchNamespaceOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPFETCHNAMESPACEOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPFolder.h b/src/objc/imap/MCOIMAPFolder.h index ca41f543..2771bc0f 100644 --- a/src/objc/imap/MCOIMAPFolder.h +++ b/src/objc/imap/MCOIMAPFolder.h @@ -7,7 +7,7 @@ // #import -#import +#import #ifndef __MAILCORE_MCOIMAPFOLDER_H_ diff --git a/src/objc/imap/MCOIMAPFolderInfoOperation.h b/src/objc/imap/MCOIMAPFolderInfoOperation.h index ed11da95..a41d43c7 100644 --- a/src/objc/imap/MCOIMAPFolderInfoOperation.h +++ b/src/objc/imap/MCOIMAPFolderInfoOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPFOLDERINFOOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPIdentityOperation.h b/src/objc/imap/MCOIMAPIdentityOperation.h index eeb11d5f..42be05a7 100644 --- a/src/objc/imap/MCOIMAPIdentityOperation.h +++ b/src/objc/imap/MCOIMAPIdentityOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPIDENTITYOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPIdleOperation.h b/src/objc/imap/MCOIMAPIdleOperation.h index 9928cc43..aabe2fbd 100644 --- a/src/objc/imap/MCOIMAPIdleOperation.h +++ b/src/objc/imap/MCOIMAPIdleOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPIDLEOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPMessage.h b/src/objc/imap/MCOIMAPMessage.h index 87a0f797..5a5276ef 100644 --- a/src/objc/imap/MCOIMAPMessage.h +++ b/src/objc/imap/MCOIMAPMessage.h @@ -6,8 +6,8 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import -#import +#import +#import #ifndef __MAILCORE_MCOIMAPMESSAGE_H_ diff --git a/src/objc/imap/MCOIMAPMessagePart.h b/src/objc/imap/MCOIMAPMessagePart.h index 1ad51d95..bb0e7578 100644 --- a/src/objc/imap/MCOIMAPMessagePart.h +++ b/src/objc/imap/MCOIMAPMessagePart.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPMESSAGEPART_H_ diff --git a/src/objc/imap/MCOIMAPMultipart.h b/src/objc/imap/MCOIMAPMultipart.h index 9a67ff82..96ab11f6 100644 --- a/src/objc/imap/MCOIMAPMultipart.h +++ b/src/objc/imap/MCOIMAPMultipart.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPMULTIPART_H_ diff --git a/src/objc/imap/MCOIMAPOperation.h b/src/objc/imap/MCOIMAPOperation.h index 7382f2ef..50a6d3dc 100644 --- a/src/objc/imap/MCOIMAPOperation.h +++ b/src/objc/imap/MCOIMAPOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOIMAPOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPPart.h b/src/objc/imap/MCOIMAPPart.h index ea31e8a8..18e5b367 100644 --- a/src/objc/imap/MCOIMAPPart.h +++ b/src/objc/imap/MCOIMAPPart.h @@ -6,9 +6,9 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import -#import +#import #ifndef __MAILCORE_MCOIMAPABSTRACTPART_H_ diff --git a/src/objc/imap/MCOIMAPSearchExpression.h b/src/objc/imap/MCOIMAPSearchExpression.h index 8c903627..9bd518ed 100644 --- a/src/objc/imap/MCOIMAPSearchExpression.h +++ b/src/objc/imap/MCOIMAPSearchExpression.h @@ -7,7 +7,7 @@ // #import -#import +#import #ifndef __MAILCORE_MCOIMAPSEARCHEXPRESSION_H_ diff --git a/src/objc/imap/MCOIMAPSearchOperation.h b/src/objc/imap/MCOIMAPSearchOperation.h index c61239b9..2d85043e 100644 --- a/src/objc/imap/MCOIMAPSearchOperation.h +++ b/src/objc/imap/MCOIMAPSearchOperation.h @@ -6,7 +6,7 @@ // Copyright (c) 2013 MailCore. All rights reserved. // -#import +#import #ifndef __MAILCORE_MCOSEARCHOPERATION_H_ diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h index eaf7df49..187cce37 100644 --- a/src/objc/imap/MCOIMAPSession.h +++ b/src/objc/imap/MCOIMAPSession.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOIMAPSESSION_H_ #import -#import +#import @class MCOIMAPFetchFoldersOperation; @class MCOIMAPOperation; diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm index 54b9e398..e075ba0f 100644 --- a/src/objc/imap/MCOIMAPSession.mm +++ b/src/objc/imap/MCOIMAPSession.mm @@ -16,7 +16,7 @@ #import "MCOUtils.h" -#import +#import using namespace mailcore; diff --git a/src/objc/pop/MCOPOP.h b/src/objc/pop/MCOPOP.h index e06022e5..6544021d 100644 --- a/src/objc/pop/MCOPOP.h +++ b/src/objc/pop/MCOPOP.h @@ -9,11 +9,11 @@ #ifndef mailcore2_MCOPOP_h #define mailcore2_MCOPOP_h -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import #endif diff --git a/src/objc/pop/MCOPOPFetchHeaderOperation.h b/src/objc/pop/MCOPOPFetchHeaderOperation.h index 74ed96ef..f9dba7f5 100644 --- a/src/objc/pop/MCOPOPFetchHeaderOperation.h +++ b/src/objc/pop/MCOPOPFetchHeaderOperation.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOPOPFETCHHEADEROPERATION_H_ #import -#import +#import @class MCOMessageHeader; diff --git a/src/objc/pop/MCOPOPFetchMessageOperation.h b/src/objc/pop/MCOPOPFetchMessageOperation.h index 231a5cb8..f833a1cc 100644 --- a/src/objc/pop/MCOPOPFetchMessageOperation.h +++ b/src/objc/pop/MCOPOPFetchMessageOperation.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOPOPFETCHMESSAGEOPERATION_H_ #import -#import +#import typedef void (^MCOPOPOperationProgressBlock)(unsigned int current, unsigned int maximum); diff --git a/src/objc/pop/MCOPOPFetchMessagesOperation.h b/src/objc/pop/MCOPOPFetchMessagesOperation.h index d6d33965..40cc175c 100644 --- a/src/objc/pop/MCOPOPFetchMessagesOperation.h +++ b/src/objc/pop/MCOPOPFetchMessagesOperation.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOPOPFETCHMESSAGESOPERATION_H_ #import -#import +#import @interface MCOPOPFetchMessagesOperation : MCOPOPOperation diff --git a/src/objc/pop/MCOPOPOperation.h b/src/objc/pop/MCOPOPOperation.h index 774ff4ac..3b482fdf 100644 --- a/src/objc/pop/MCOPOPOperation.h +++ b/src/objc/pop/MCOPOPOperation.h @@ -11,7 +11,7 @@ #define __MAILCORE_MCOPOPOPERATION_H_ #import -#import +#import @interface MCOPOPOperation : MCOOperation - (void)start:(void (^)(NSError *error))completionBlock; diff --git a/src/objc/pop/MCOPOPSession.h b/src/objc/pop/MCOPOPSession.h index ae9bf1d9..81ae2e86 100644 --- a/src/objc/pop/MCOPOPSession.h +++ b/src/objc/pop/MCOPOPSession.h @@ -12,7 +12,7 @@ #import -#import +#import @class MCOPOPFetchMessagesOperation; @class MCOPOPFetchHeaderOperation; diff --git a/src/objc/rfc822/MCOAttachment.h b/src/objc/rfc822/MCOAttachment.h index 1f054848..95f60321 100644 --- a/src/objc/rfc822/MCOAttachment.h +++ b/src/objc/rfc822/MCOAttachment.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOATTACHMENT_H_ -#import +#import @interface MCOAttachment : MCOAbstractPart diff --git a/src/objc/rfc822/MCOMessageBuilder.h b/src/objc/rfc822/MCOMessageBuilder.h index 4fa23e0b..a74b3e6f 100644 --- a/src/objc/rfc822/MCOMessageBuilder.h +++ b/src/objc/rfc822/MCOMessageBuilder.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOMESSAGEBUILDER_H_ -#import +#import @class MCOAttachment; @protocol MCOHTMLRendererDelegate; diff --git a/src/objc/rfc822/MCOMessageParser.h b/src/objc/rfc822/MCOMessageParser.h index 0d239511..a22b657e 100644 --- a/src/objc/rfc822/MCOMessageParser.h +++ b/src/objc/rfc822/MCOMessageParser.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOMESSAGEPARSER_H_ -#import +#import @protocol MCOHTMLRendererDelegate; diff --git a/src/objc/rfc822/MCOMessagePart.h b/src/objc/rfc822/MCOMessagePart.h index b41fbf0b..dc31fdfb 100644 --- a/src/objc/rfc822/MCOMessagePart.h +++ b/src/objc/rfc822/MCOMessagePart.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOMESSAGEPART_H_ -#import +#import @interface MCOMessagePart : MCOAbstractMessagePart diff --git a/src/objc/rfc822/MCOMultipart.h b/src/objc/rfc822/MCOMultipart.h index d38fef85..b5722e72 100644 --- a/src/objc/rfc822/MCOMultipart.h +++ b/src/objc/rfc822/MCOMultipart.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOMULTIPART_H_ -#import +#import @interface MCOMultipart : MCOAbstractMultipart diff --git a/src/objc/rfc822/MCORFC822.h b/src/objc/rfc822/MCORFC822.h index b85c8e53..fa9b8242 100644 --- a/src/objc/rfc822/MCORFC822.h +++ b/src/objc/rfc822/MCORFC822.h @@ -10,10 +10,10 @@ #define __MAILCORE_MCORFC822_H_ -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import #endif diff --git a/src/objc/smtp/MCOSMTP.h b/src/objc/smtp/MCOSMTP.h index df8cec4d..70759600 100644 --- a/src/objc/smtp/MCOSMTP.h +++ b/src/objc/smtp/MCOSMTP.h @@ -9,8 +9,8 @@ #ifndef mailcore2_MCOSMTP_h #define mailcore2_MCOSMTP_h -#import -#import -#import +#import +#import +#import #endif diff --git a/src/objc/smtp/MCOSMTPOperation.h b/src/objc/smtp/MCOSMTPOperation.h index 28b91857..a833353c 100644 --- a/src/objc/smtp/MCOSMTPOperation.h +++ b/src/objc/smtp/MCOSMTPOperation.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOSMTPOPERATION_H_ -#import +#import @interface MCOSMTPOperation : MCOOperation - (void)start:(void (^)(NSError *error))completionBlock; diff --git a/src/objc/smtp/MCOSMTPSendOperation.h b/src/objc/smtp/MCOSMTPSendOperation.h index e0ce3a05..02c220d5 100644 --- a/src/objc/smtp/MCOSMTPSendOperation.h +++ b/src/objc/smtp/MCOSMTPSendOperation.h @@ -10,7 +10,7 @@ #define __MAILCORE_MCOSMTPSENDOPERATION_H_ -#import +#import typedef void (^MCOSMTPOperationProgressBlock)(unsigned int current, unsigned int maximum); diff --git a/src/objc/smtp/MCOSMTPSession.h b/src/objc/smtp/MCOSMTPSession.h index d5c940b9..60eefa18 100644 --- a/src/objc/smtp/MCOSMTPSession.h +++ b/src/objc/smtp/MCOSMTPSession.h @@ -12,7 +12,7 @@ #import -#import +#import @class MCOSMTPSendOperation; @class MCOSMTPOperation; diff --git a/src/objc/utils/MCOIndexSet.h b/src/objc/utils/MCOIndexSet.h index 2f2932ee..83e6f169 100644 --- a/src/objc/utils/MCOIndexSet.h +++ b/src/objc/utils/MCOIndexSet.h @@ -8,7 +8,7 @@ #import -#import +#import #ifndef __MAILCORE_MCOINDEXSET_H_ diff --git a/src/objc/utils/MCOIndexSet.mm b/src/objc/utils/MCOIndexSet.mm index 45a00ccc..1827af67 100644 --- a/src/objc/utils/MCOIndexSet.mm +++ b/src/objc/utils/MCOIndexSet.mm @@ -8,7 +8,7 @@ #import "MCOIndexSet.h" -#include +#include #import "NSObject+MCO.h" diff --git a/src/objc/utils/MCORange.h b/src/objc/utils/MCORange.h index 1f2f9715..a42e0928 100644 --- a/src/objc/utils/MCORange.h +++ b/src/objc/utils/MCORange.h @@ -12,7 +12,7 @@ #import #ifdef __cplusplus -#include +#include #endif #ifdef __cplusplus diff --git a/src/objc/utils/MCOUtils.h b/src/objc/utils/MCOUtils.h index 60f4f2a1..bc4f716c 100644 --- a/src/objc/utils/MCOUtils.h +++ b/src/objc/utils/MCOUtils.h @@ -9,18 +9,18 @@ #ifndef mailcore2_MCOUtils_h #define mailcore2_MCOUtils_h -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import -#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import +#import #endif diff --git a/src/ui/mac/MCOCIDURLProtocol.h b/src/ui/mac/MCOCIDURLProtocol.h index cf0b5335..ac4b0f2b 100644 --- a/src/ui/mac/MCOCIDURLProtocol.h +++ b/src/ui/mac/MCOCIDURLProtocol.h @@ -8,7 +8,7 @@ #import -#include +#include @interface MCOCIDURLProtocol : NSURLProtocol diff --git a/src/ui/mac/MCOMessageView.h b/src/ui/mac/MCOMessageView.h index c8ffe241..fa25184f 100644 --- a/src/ui/mac/MCOMessageView.h +++ b/src/ui/mac/MCOMessageView.h @@ -7,7 +7,7 @@ // #import -#include +#include @protocol MCOMessageViewDelegate; diff --git a/tests/test-all.h b/tests/test-all.h index 2f020ae8..6197cf47 100644 --- a/tests/test-all.h +++ b/tests/test-all.h @@ -9,7 +9,7 @@ #ifndef __mailcore2__test_all__ #define __mailcore2__test_all__ -#include +#include extern void testAll(); diff --git a/tests/test-all.mm b/tests/test-all.mm index d9ed9249..97de53fd 100644 --- a/tests/test-all.mm +++ b/tests/test-all.mm @@ -11,7 +11,7 @@ #include #include #include -#include +#include extern "C" { extern int mailstream_debug; -- cgit v1.2.3