renamed getQuotaOperation to quotaOperation, removed debug stuff

13 files changed, 34 insertions, 36 deletions

diff --git a/src/async/imap/MCAsyncIMAP.h b/src/async/imap/MCAsyncIMAP.h
index 511a5cf6..66ba6c7b 100755
--- a/src/async/imap/MCAsyncIMAP.h
+++ b/src/async/imap/MCAsyncIMAP.h
@@ -27,7 +27,7 @@
 #include <MailCore/MCIMAPFetchNamespaceOperation.h>
 #include <MailCore/MCIMAPIdentityOperation.h>
 #include <MailCore/MCIMAPCapabilityOperation.h>
-#include <MailCore/MCIMAPGetQuotaOperation.h>
+#include <MailCore/MCIMAPQuotaOperation.h>
 #include <MailCore/MCIMAPOperationCallback.h>
 #include <MailCore/MCIMAPMessageRenderingOperation.h>
 
diff --git a/src/async/imap/MCIMAPAsyncConnection.cc b/src/async/imap/MCIMAPAsyncConnection.cc
index 77800bca..1472d974 100755
--- a/src/async/imap/MCIMAPAsyncConnection.cc
+++ b/src/async/imap/MCIMAPAsyncConnection.cc
@@ -30,7 +30,7 @@
 #include "MCIMAPIdleOperation.h"
 #include "MCIMAPIdentityOperation.h"
 #include "MCIMAPCapabilityOperation.h"
-#include "MCIMAPGetQuotaOperation.h"
+#include "MCIMAPQuotaOperation.h"
 #include "MCOperationQueueCallback.h"
 #include "MCIMAPDisconnectOperation.h"
 #include "MCIMAPAsyncSession.h"
@@ -495,9 +495,9 @@ IMAPCapabilityOperation * IMAPAsyncConnection::capabilityOperation()
     return op;
 }
 
-IMAPGetQuotaOperation * IMAPAsyncConnection::getQuotaOperation()
+IMAPQuotaOperation * IMAPAsyncConnection::quotaOperation()
 {
-    IMAPGetQuotaOperation * op = new IMAPGetQuotaOperation();
+    IMAPQuotaOperation * op = new IMAPQuotaOperation();
     op->setSession(this);
     op->autorelease();
     return op;
diff --git a/src/async/imap/MCIMAPAsyncConnection.h b/src/async/imap/MCIMAPAsyncConnection.h
index 8fe025c9..13f9ff7b 100755
--- a/src/async/imap/MCIMAPAsyncConnection.h
+++ b/src/async/imap/MCIMAPAsyncConnection.h
@@ -25,7 +25,7 @@ namespace mailcore {
     class IMAPFetchNamespaceOperation;
     class IMAPIdentityOperation;
     class IMAPCapabilityOperation;
-    class IMAPGetQuotaOperation;
+    class IMAPQuotaOperation;
     class IMAPOperationQueueCallback;
     class IMAPAsyncSession;
     class IMAPConnectionLogger;
@@ -121,7 +121,7 @@ namespace mailcore {
         virtual IMAPOperation * checkAccountOperation();
         
         virtual IMAPCapabilityOperation * capabilityOperation();
-        virtual IMAPGetQuotaOperation * getQuotaOperation();
+        virtual IMAPQuotaOperation * quotaOperation();
         
         virtual IMAPMessageRenderingOperation * htmlRenderingOperation(IMAPMessage * message, String * folder);
         virtual IMAPMessageRenderingOperation * htmlBodyRenderingOperation(IMAPMessage * message, String * folder);
diff --git a/src/async/imap/MCIMAPAsyncSession.cc b/src/async/imap/MCIMAPAsyncSession.cc
index 205b57b2..26c0feca 100755
--- a/src/async/imap/MCIMAPAsyncSession.cc
+++ b/src/async/imap/MCIMAPAsyncSession.cc
@@ -449,10 +449,10 @@ IMAPCapabilityOperation * IMAPAsyncSession::capabilityOperation()
     return session->capabilityOperation();
 }
 
-IMAPGetQuotaOperation * IMAPAsyncSession::getQuotaOperation()
+IMAPQuotaOperation * IMAPAsyncSession::quotaOperation()
 {
     IMAPAsyncConnection * session = sessionForFolder(MCSTR("INBOX"));
-    return session->getQuotaOperation();
+    return session->quotaOperation();
 }
 
 void IMAPAsyncSession::setConnectionLogger(ConnectionLogger * logger)
diff --git a/src/async/imap/MCIMAPAsyncSession.h b/src/async/imap/MCIMAPAsyncSession.h
index 212cdaab..e5c17078 100755
--- a/src/async/imap/MCIMAPAsyncSession.h
+++ b/src/async/imap/MCIMAPAsyncSession.h
@@ -33,7 +33,7 @@ namespace mailcore {
     class IMAPIdentityOperation;
     class IMAPAsyncConnection;
     class IMAPCapabilityOperation;
-    class IMAPGetQuotaOperation;
+    class IMAPQuotaOperation;
     class IMAPMessageRenderingOperation;
     class IMAPMessage;
     
@@ -134,7 +134,7 @@ namespace mailcore {
         virtual IMAPOperation * checkAccountOperation();
         
         virtual IMAPCapabilityOperation * capabilityOperation();
-        virtual IMAPGetQuotaOperation * getQuotaOperation();
+        virtual IMAPQuotaOperation * quotaOperation();
         
         virtual IMAPMessageRenderingOperation * htmlRenderingOperation(IMAPMessage * message, String * folder);
         virtual IMAPMessageRenderingOperation * htmlBodyRenderingOperation(IMAPMessage * message, String * folder);
diff --git a/src/async/imap/MCIMAPGetQuotaOperation.cc b/src/async/imap/MCIMAPQuotaOperation.cc
index 572bd583..6744ac4b 100644
--- a/src/async/imap/MCIMAPGetQuotaOperation.cc
+++ b/src/async/imap/MCIMAPQuotaOperation.cc
@@ -1,42 +1,41 @@
 //
-//  MCIMAPGetQuotaOperation.cc
+//  MCIMAPQuotaOperation.cc
 //  mailcore2
 //
 //  Created by Petro Korenev on 8/2/13.
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#include "MCIMAPGetQuotaOperation.h"
+#include "MCIMAPQuotaOperation.h"
 
 #include "MCIMAPSession.h"
 #include "MCIMAPAsyncConnection.h"
 
 using namespace mailcore;
 
-IMAPGetQuotaOperation::IMAPGetQuotaOperation()
+IMAPQuotaOperation::IMAPQuotaOperation()
 {
     mLimit = 0;
     mUsage = 0;
 }
 
-IMAPGetQuotaOperation::~IMAPGetQuotaOperation()
+IMAPQuotaOperation::~IMAPQuotaOperation()
 {
 }
 
-uint32_t IMAPGetQuotaOperation::limit()
+uint32_t IMAPQuotaOperation::limit()
 {
     return mLimit;
 }
 
-uint32_t IMAPGetQuotaOperation::usage()
+uint32_t IMAPQuotaOperation::usage()
 {
     return mUsage;
 }
 
-void IMAPGetQuotaOperation::main()
+void IMAPQuotaOperation::main()
 {
     ErrorCode error;
     session()->session()->getQuota(&mUsage, &mLimit, &error);
-    fprintf(stderr, "QnIQuESeqUeNcE %d %d", mUsage, mLimit);
     setError(error);
 }
diff --git a/src/async/imap/MCIMAPGetQuotaOperation.h b/src/async/imap/MCIMAPQuotaOperation.h
index bea3d2f6..5cef943c 100644
--- a/src/async/imap/MCIMAPGetQuotaOperation.h
+++ b/src/async/imap/MCIMAPQuotaOperation.h
@@ -1,14 +1,14 @@
 //
-//  MCIMAPGetQuotaOperation.h
+//  MCIMAPQuotaOperation.h
 //  mailcore2
 //
 //  Created by Petro Korenev on 8/2/13.
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#ifndef __MAILCORE_MCIMAPGETQUOTAOPERATION_H_
+#ifndef __MAILCORE_MCIMAPQuotaOperation_H_
 
-#define __MAILCORE_MCIMAPGETQUOTAOPERATION_H_
+#define __MAILCORE_MCIMAPQuotaOperation_H_
 
 #include "MCIMAPOperation.h"
 
@@ -16,10 +16,10 @@
 
 namespace mailcore {
     
-    class IMAPGetQuotaOperation : public IMAPOperation {
+    class IMAPQuotaOperation : public IMAPOperation {
     public:
-        IMAPGetQuotaOperation();
-        virtual ~IMAPGetQuotaOperation();
+        IMAPQuotaOperation();
+        virtual ~IMAPQuotaOperation();
         
         // Result.
         virtual uint32_t limit();
diff --git a/src/core/imap/MCIMAPSession.cc b/src/core/imap/MCIMAPSession.cc
index f423de1c..09f78ec1 100755
--- a/src/core/imap/MCIMAPSession.cc
+++ b/src/core/imap/MCIMAPSession.cc
@@ -2445,7 +2445,6 @@ IndexSet * IMAPSession::search(String * folder, IMAPSearchExpression * expressio
 
 	clist * result_list = NULL;
     
-//    int r = mailimap_uid_search(mImap, expression->shouldAvoidCharset() ? NULL : "utf-8", key, &result_list);
     int r = mailimap_uid_search(mImap, "utf-8", key, &result_list);
     mailimap_search_key_free(key);
     MCLog("had error : %i", r);
diff --git a/src/objc/imap/MCOIMAP.h b/src/objc/imap/MCOIMAP.h
index 9e4cf6c0..e2036291 100755
--- a/src/objc/imap/MCOIMAP.h
+++ b/src/objc/imap/MCOIMAP.h
@@ -36,7 +36,7 @@
 #import <MailCore/MCOIMAPFetchNamespaceOperation.h>
 #import <MailCore/MCOIMAPIdentityOperation.h>
 #import <MailCore/MCOIMAPCapabilityOperation.h>
-#import <MailCore/MCOIMAPGetQuotaOperation.h>
+#import <MailCore/MCOIMAPQuotaOperation.h>
 #import <MailCore/MCOIMAPSearchExpression.h>
 #import <MailCore/MCOIMAPMessageRenderingOperation.h>
 
diff --git a/src/objc/imap/MCOIMAPGetQuotaOperation.h b/src/objc/imap/MCOIMAPQuotaOperation.h
index 401b5aaa..c0463bb0 100644
--- a/src/objc/imap/MCOIMAPGetQuotaOperation.h
+++ b/src/objc/imap/MCOIMAPQuotaOperation.h
@@ -1,5 +1,5 @@
 //
-//  MCOIMAPGetQuotaOperation.h
+//  MCOIMAPQuotaOperation.h
 //  mailcore2
 //
 //  Created by Petro Korenev on 8/2/13.
@@ -8,7 +8,7 @@
 
 #import "MCOIMAPBaseOperation.h"
 
-@interface MCOIMAPGetQuotaOperation : MCOIMAPBaseOperation
+@interface MCOIMAPQuotaOperation : MCOIMAPBaseOperation
 
 - (void) start:(void (^)(NSError * error, NSUInteger usage, NSUInteger limit))completionBlock;
 
diff --git a/src/objc/imap/MCOIMAPGetQuotaOperation.mm b/src/objc/imap/MCOIMAPQuotaOperation.mm
index 25a6dc98..5be2571f 100644
--- a/src/objc/imap/MCOIMAPGetQuotaOperation.mm
+++ b/src/objc/imap/MCOIMAPQuotaOperation.mm
@@ -1,12 +1,12 @@
 //
-//  MCOIMAPGetQuotaOperation.m
+//  MCOIMAPQuotaOperation.m
 //  mailcore2
 //
 //  Created by Petro Korenev on 8/2/13.
 //  Copyright (c) 2013 MailCore. All rights reserved.
 //
 
-#import "MCOIMAPGetQuotaOperation.h"
+#import "MCOIMAPQuotaOperation.h"
 
 #include "MCAsyncIMAP.h"
 
@@ -15,11 +15,11 @@
 
 typedef void (^CompletionType)(NSError *error, NSUInteger usage, NSUInteger limit);
 
-@implementation MCOIMAPGetQuotaOperation {
+@implementation MCOIMAPQuotaOperation {
     CompletionType _completionBlock;
 }
 
-#define nativeType mailcore::IMAPGetQuotaOperation
+#define nativeType mailcore::IMAPQuotaOperation
 
 + (void) load
 {
diff --git a/src/objc/imap/MCOIMAPSession.h b/src/objc/imap/MCOIMAPSession.h
index 9776ab11..ea920114 100755
--- a/src/objc/imap/MCOIMAPSession.h
+++ b/src/objc/imap/MCOIMAPSession.h
@@ -29,7 +29,7 @@
 @class MCOIMAPSearchExpression;
 @class MCOIMAPIdentityOperation;
 @class MCOIMAPCapabilityOperation;
-@class MCOIMAPGetQuotaOperation;
+@class MCOIMAPQuotaOperation;
 @class MCOIMAPMessageRenderingOperation;
 @class MCOIMAPMessage;
 
@@ -508,7 +508,7 @@
 */
 - (MCOIMAPCapabilityOperation *) capabilityOperation;
 
-- (MCOIMAPGetQuotaOperation *) getQuotaOperation;
+- (MCOIMAPQuotaOperation *) quotaOperation;
 
 /** @name Search Operations */
 
diff --git a/src/objc/imap/MCOIMAPSession.mm b/src/objc/imap/MCOIMAPSession.mm
index 62899b37..a9bbeb5c 100755
--- a/src/objc/imap/MCOIMAPSession.mm
+++ b/src/objc/imap/MCOIMAPSession.mm
@@ -362,9 +362,9 @@ MCO_OBJC_SYNTHESIZE_SCALAR(unsigned int, unsigned int, setMaximumConnections, ma
     return MCO_TO_OBJC_OP(coreOp);
 }
 
-- (MCOIMAPGetQuotaOperation *) getQuotaOperation
+- (MCOIMAPQuotaOperation *) quotaOperation
 {
-    IMAPGetQuotaOperation * coreOp = MCO_NATIVE_INSTANCE->getQuotaOperation();
+    IMAPQuotaOperation * coreOp = MCO_NATIVE_INSTANCE->quotaOperation();
     return MCO_TO_OBJC_OP((IMAPOperation*)coreOp);
 }