Removed commented code

2 files changed, 2 insertions, 398 deletions

diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc
index 12eeff38..3a6508d6 100755
--- a/src/async/imap/MCIMAPAsyncConnection.cc
+++ b/src/async/imap/MCIMAPAsyncConnection.cc
@@ -249,297 +249,6 @@ IMAPIdentity * IMAPAsyncConnection::clientIdentity()
     return mClientIdentity;
 }
 
-#if 0
-IMAPFolderInfoOperation * IMAPAsyncConnection::folderInfoOperation(String * folder)
-{
-    IMAPFolderInfoOperation * op = new IMAPFolderInfoOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPFolderStatusOperation * IMAPAsyncConnection::folderStatusOperation(String * folder)
-{
-    IMAPFolderStatusOperation * op = new IMAPFolderStatusOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchFoldersOperation * IMAPAsyncConnection::fetchSubscribedFoldersOperation()
-{
-    IMAPFetchFoldersOperation * op = new IMAPFetchFoldersOperation();
-    op->setSession(this);
-    op->setFetchSubscribedEnabled(true);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchFoldersOperation * IMAPAsyncConnection::fetchAllFoldersOperation()
-{
-    IMAPFetchFoldersOperation * op = new IMAPFetchFoldersOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::renameFolderOperation(String * folder, String * otherName)
-{
-    IMAPRenameFolderOperation * op = new IMAPRenameFolderOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setOtherName(otherName);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::deleteFolderOperation(String * folder)
-{
-    IMAPDeleteFolderOperation * op = new IMAPDeleteFolderOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::createFolderOperation(String * folder)
-{
-    IMAPCreateFolderOperation * op = new IMAPCreateFolderOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::subscribeFolderOperation(String * folder)
-{
-    IMAPSubscribeFolderOperation * op = new IMAPSubscribeFolderOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::unsubscribeFolderOperation(String * folder)
-{
-    IMAPSubscribeFolderOperation * op = new IMAPSubscribeFolderOperation();
-    op->setSession(this);
-    op->setUnsubscribeEnabled(true);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPAppendMessageOperation * IMAPAsyncConnection::appendMessageOperation(String * folder, Data * messageData, MessageFlag flags, Array * customFlags)
-{
-    IMAPAppendMessageOperation * op = new IMAPAppendMessageOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setMessageData(messageData);
-    op->setFlags(flags);
-    op->setCustomFlags(customFlags);
-    op->autorelease();
-    return op;
-}
-
-IMAPCopyMessagesOperation * IMAPAsyncConnection::copyMessagesOperation(String * folder, IndexSet * uids, String * destFolder)
-{
-    IMAPCopyMessagesOperation * op = new IMAPCopyMessagesOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setUids(uids);
-    op->setDestFolder(destFolder);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::expungeOperation(String * folder)
-{
-    IMAPExpungeOperation * op = new IMAPExpungeOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchMessagesOperation * IMAPAsyncConnection::fetchMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind,
-                                                                              IndexSet * uids)
-{
-    IMAPFetchMessagesOperation * op = new IMAPFetchMessagesOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setKind(requestKind);
-    op->setFetchByUidEnabled(true);
-    op->setIndexes(uids);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchMessagesOperation * IMAPAsyncConnection::fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind,
-                                                                                 IndexSet * numbers)
-{
-    IMAPFetchMessagesOperation * op = new IMAPFetchMessagesOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setKind(requestKind);
-    op->setIndexes(numbers);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchMessagesOperation * IMAPAsyncConnection::syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind,
-                                                                    IndexSet * uids, uint64_t modSeq)
-{
-    IMAPFetchMessagesOperation * op = new IMAPFetchMessagesOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setKind(requestKind);
-    op->setFetchByUidEnabled(true);
-    op->setIndexes(uids);
-    op->setModSequenceValue(modSeq);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchContentOperation * IMAPAsyncConnection::fetchMessageByUIDOperation(String * folder, uint32_t uid)
-{
-    IMAPFetchContentOperation * op = new IMAPFetchContentOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setUid(uid);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchContentOperation * IMAPAsyncConnection::fetchMessageAttachmentByUIDOperation(String * folder, uint32_t uid, String * partID,
-                                                                                   Encoding encoding)
-{
-    IMAPFetchContentOperation * op = new IMAPFetchContentOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setUid(uid);
-    op->setPartID(partID);
-    op->setEncoding(encoding);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::storeFlagsOperation(String * folder, IndexSet * uids, IMAPStoreFlagsRequestKind kind, MessageFlag flags, Array * customFlags)
-{
-    IMAPStoreFlagsOperation * op = new IMAPStoreFlagsOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setUids(uids);
-    op->setKind(kind);
-    op->setFlags(flags);
-    op->setCustomFlags(customFlags);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::storeLabelsOperation(String * folder, IndexSet * uids, IMAPStoreFlagsRequestKind kind, Array * labels)
-{
-    IMAPStoreLabelsOperation * op = new IMAPStoreLabelsOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setUids(uids);
-    op->setKind(kind);
-    op->setLabels(labels);
-    op->autorelease();
-    return op;
-}
-
-IMAPSearchOperation * IMAPAsyncConnection::searchOperation(String * folder, IMAPSearchKind kind, String * searchString)
-{
-    IMAPSearchOperation * op = new IMAPSearchOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setSearchKind(kind);
-    op->setSearchString(searchString);
-    op->autorelease();
-    return op;
-}
-
-IMAPSearchOperation * IMAPAsyncConnection::searchOperation(String * folder, IMAPSearchExpression * expression)
-{
-    IMAPSearchOperation * op = new IMAPSearchOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setSearchExpression(expression);
-    op->autorelease();
-    return op;
-}
-
-IMAPIdleOperation * IMAPAsyncConnection::idleOperation(String * folder, uint32_t lastKnownUID)
-{
-    IMAPIdleOperation * op = new IMAPIdleOperation();
-    op->setSession(this);
-    op->setFolder(folder);
-    op->setLastKnownUID(lastKnownUID);
-    op->autorelease();
-    return op;
-}
-
-IMAPFetchNamespaceOperation * IMAPAsyncConnection::fetchNamespaceOperation()
-{
-    IMAPFetchNamespaceOperation * op = new IMAPFetchNamespaceOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-
-IMAPIdentityOperation * IMAPAsyncConnection::identityOperation(IMAPIdentity * identity)
-{
-    IMAPIdentityOperation * op = new IMAPIdentityOperation();
-    op->setSession(this);
-    op->setClientIdentity(identity);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::connectOperation()
-{
-    IMAPConnectOperation * op = new IMAPConnectOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::checkAccountOperation()
-{
-    IMAPCheckAccountOperation * op = new IMAPCheckAccountOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-
-IMAPOperation * IMAPAsyncConnection::noopOperation()
-{
-    IMAPNoopOperation * op = new IMAPNoopOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-
-IMAPCapabilityOperation * IMAPAsyncConnection::capabilityOperation()
-{
-    IMAPCapabilityOperation * op = new IMAPCapabilityOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-
-IMAPQuotaOperation * IMAPAsyncConnection::quotaOperation()
-{
-    IMAPQuotaOperation * op = new IMAPQuotaOperation();
-    op->setSession(this);
-    op->autorelease();
-    return op;
-}
-#endif
-
 IMAPOperation * IMAPAsyncConnection::disconnectOperation()
 {
     IMAPDisconnectOperation * op = new IMAPDisconnectOperation();
@@ -681,48 +390,6 @@ void IMAPAsyncConnection::logConnection(ConnectionLogType logType, Data * buffer
     pthread_mutex_unlock(&mConnectionLoggerLock);
 }
 
-#if 0
-IMAPMessageRenderingOperation * IMAPAsyncConnection::renderingOperation(IMAPMessage * message,
-                                                                        String * folder,
-                                                                        IMAPMessageRenderingType type)
-{
-    IMAPMessageRenderingOperation * op = new IMAPMessageRenderingOperation();
-    op->setSession(this);
-    op->setMessage(message);
-    op->setFolder(folder);
-    op->setRenderingType(type);
-    op->autorelease();
-    return op;
-}
-
-IMAPMessageRenderingOperation * IMAPAsyncConnection::htmlRenderingOperation(IMAPMessage * message,
-                                                                            String * folder)
-{
-    return renderingOperation(message, folder, IMAPMessageRenderingTypeHTML);
-}
-
-IMAPMessageRenderingOperation * IMAPAsyncConnection::htmlBodyRenderingOperation(IMAPMessage * message,
-                                                                                String * folder)
-{
-    return renderingOperation(message, folder, IMAPMessageRenderingTypeHTMLBody);
-}
-
-IMAPMessageRenderingOperation * IMAPAsyncConnection::plainTextRenderingOperation(IMAPMessage * message,
-                                                                                 String * folder)
-{
-    return renderingOperation(message, folder, IMAPMessageRenderingTypePlainText);
-}
-
-IMAPMessageRenderingOperation * IMAPAsyncConnection::plainTextBodyRenderingOperation(IMAPMessage * message,
-                                                                                     String * folder,
-                                                                                     bool stripWhitespace)
-{
-    return renderingOperation(message, folder,
-                              stripWhitespace ? IMAPMessageRenderingTypePlainTextBodyAndStripWhitespace :
-                                                IMAPMessageRenderingTypePlainTextBody);
-}
-#endif
-
 void IMAPAsyncConnection::setAutomaticConfigurationEnabled(bool enabled)
 {
     mAutomaticConfigurationEnabled = enabled;
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index fdc9addc..50d1409a 100755
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -86,66 +86,8 @@ namespace mailcore {
         virtual dispatch_queue_t dispatchQueue();
 #endif
         
-#if 0
-        virtual IMAPFolderInfoOperation * folderInfoOperation(String * folder);
-        virtual IMAPFolderStatusOperation * folderStatusOperation(String * folder);
-        
-        virtual IMAPFetchFoldersOperation * fetchSubscribedFoldersOperation();
-        virtual IMAPFetchFoldersOperation * fetchAllFoldersOperation();
-        
-        virtual IMAPOperation * renameFolderOperation(String * folder, String * otherName);
-        virtual IMAPOperation * deleteFolderOperation(String * folder);
-        virtual IMAPOperation * createFolderOperation(String * folder);
-        
-        virtual IMAPOperation * subscribeFolderOperation(String * folder);
-        virtual IMAPOperation * unsubscribeFolderOperation(String * folder);
-        
-        virtual IMAPAppendMessageOperation * appendMessageOperation(String * folder, Data * messageData, MessageFlag flags, Array * customFlags);
-        
-        virtual IMAPCopyMessagesOperation * copyMessagesOperation(String * folder, IndexSet * uids, String * destFolder);
-        
-        virtual IMAPOperation * expungeOperation(String * folder);
-        
-        virtual IMAPFetchMessagesOperation * fetchMessagesByUIDOperation(String * folder, IMAPMessagesRequestKind requestKind,
-                                                                         IndexSet * uids);
-        virtual IMAPFetchMessagesOperation * fetchMessagesByNumberOperation(String * folder, IMAPMessagesRequestKind requestKind,
-                                                                            IndexSet * numbers);
-        virtual IMAPFetchMessagesOperation * syncMessagesByUID(String * folder, IMAPMessagesRequestKind requestKind,
-                                                               IndexSet * uids, uint64_t modSeq);
-        
-        virtual IMAPFetchContentOperation * fetchMessageByUIDOperation(String * folder, uint32_t uid);
-        virtual IMAPFetchContentOperation * fetchMessageAttachmentByUIDOperation(String * folder, uint32_t uid, String * partID,
-                                                                                 Encoding encoding);
-        
-        virtual IMAPOperation * storeFlagsOperation(String * folder, IndexSet * uids, IMAPStoreFlagsRequestKind kind, MessageFlag flags, Array * customFlags);
-        virtual IMAPOperation * storeLabelsOperation(String * folder, IndexSet * uids, IMAPStoreFlagsRequestKind kind, Array * labels);
-        
-        virtual IMAPSearchOperation * searchOperation(String * folder, IMAPSearchKind kind, String * searchString);
-        virtual IMAPSearchOperation * searchOperation(String * folder, IMAPSearchExpression * expression);
-        
-        virtual IMAPIdleOperation * idleOperation(String * folder, uint32_t lastKnownUID);
-        
-        virtual IMAPFetchNamespaceOperation * fetchNamespaceOperation();
-        
-        virtual IMAPIdentityOperation * identityOperation(IMAPIdentity * identity);
-        
-        virtual IMAPOperation * connectOperation();
-        virtual IMAPOperation * checkAccountOperation();
-        
-        virtual IMAPOperation * noopOperation();
-        
-        virtual IMAPCapabilityOperation * capabilityOperation();
-        virtual IMAPQuotaOperation * quotaOperation();
-#endif
         virtual IMAPOperation * disconnectOperation();
-        
-#if 0
-        virtual IMAPMessageRenderingOperation * htmlRenderingOperation(IMAPMessage * message, String * folder);
-        virtual IMAPMessageRenderingOperation * htmlBodyRenderingOperation(IMAPMessage * message, String * folder);
-        virtual IMAPMessageRenderingOperation * plainTextRenderingOperation(IMAPMessage * message, String * folder);
-        virtual IMAPMessageRenderingOperation * plainTextBodyRenderingOperation(IMAPMessage * message, String * folder, bool stripWhitespace);
-#endif
-        
+
     private:
         IMAPSession * mSession;
         OperationQueue * mQueue;
@@ -162,12 +104,7 @@ namespace mailcore {
         bool mScheduledAutomaticDisconnect;
         
         virtual void tryAutomaticDisconnectAfterDelay(void * context);
-#if 0
-        virtual IMAPMessageRenderingOperation * renderingOperation(IMAPMessage * message,
-                                                                   String * folder,
-                                                                   IMAPMessageRenderingType type);
-#endif
-        
+
     public: // private
         virtual void runOperation(IMAPOperation * operation);
         virtual IMAPSession * session();