diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/async/nntp/MCAsyncNNTP.h | 2 | ||||
-rw-r--r-- | src/async/nntp/MCNNTPAsyncSession.cc | 6 | ||||
-rw-r--r-- | src/async/nntp/MCNNTPAsyncSession.h | 4 | ||||
-rw-r--r-- | src/async/nntp/MCNNTPFetchAllArticlesOperation.cc (renamed from src/async/nntp/MCNNTPFetchArticlesOperation.cc) | 16 | ||||
-rw-r--r-- | src/async/nntp/MCNNTPFetchAllArticlesOperation.h (renamed from src/async/nntp/MCNNTPFetchArticlesOperation.h) | 8 | ||||
-rw-r--r-- | src/async/nntp/MCNNTPFetchArticleOperation.cc | 2 | ||||
-rw-r--r-- | src/async/nntp/MCNNTPFetchArticleOperation.h | 2 | ||||
-rw-r--r-- | src/cmake/async.cmake | 2 | ||||
-rw-r--r-- | src/cmake/objc.cmake | 2 | ||||
-rw-r--r-- | src/cmake/public-headers.cmake | 4 | ||||
-rw-r--r-- | src/objc/nntp/MCONNTP.h | 2 | ||||
-rw-r--r-- | src/objc/nntp/MCONNTPFetchAllArticlesOperation.h (renamed from src/objc/nntp/MCONNTPFetchArticlesOperation.h) | 4 | ||||
-rw-r--r-- | src/objc/nntp/MCONNTPFetchAllArticlesOperation.mm (renamed from src/objc/nntp/MCONNTPFetchArticlesOperation.mm) | 8 | ||||
-rw-r--r-- | src/objc/nntp/MCONNTPSession.h | 6 | ||||
-rw-r--r-- | src/objc/nntp/MCONNTPSession.mm | 6 |
15 files changed, 37 insertions, 37 deletions
diff --git a/src/async/nntp/MCAsyncNNTP.h b/src/async/nntp/MCAsyncNNTP.h index 4bc85241..914cc754 100644 --- a/src/async/nntp/MCAsyncNNTP.h +++ b/src/async/nntp/MCAsyncNNTP.h @@ -14,7 +14,7 @@ #include <MailCore/MCNNTPOperation.h> #include <MailCore/MCNNTPFetchHeaderOperation.h> #include <MailCore/MCNNTPFetchArticleOperation.h> -#include <MailCore/MCNNTPFetchArticlesOperation.h> +#include <MailCore/MCNNTPFetchAllArticlesOperation.h> #include <MailCore/MCNNTPListNewsgroupsOperation.h> #include <MailCore/MCNNTPFetchOverviewOperation.h> #include <MailCore/MCNNTPFetchServerTimeOperation.h> diff --git a/src/async/nntp/MCNNTPAsyncSession.cc b/src/async/nntp/MCNNTPAsyncSession.cc index 5c3aa36a..a78a70b4 100644 --- a/src/async/nntp/MCNNTPAsyncSession.cc +++ b/src/async/nntp/MCNNTPAsyncSession.cc @@ -11,7 +11,7 @@ #include "MCNNTP.h" #include "MCNNTPFetchHeaderOperation.h" #include "MCNNTPFetchArticleOperation.h" -#include "MCNNTPFetchArticlesOperation.h" +#include "MCNNTPFetchAllArticlesOperation.h" #include "MCNNTPListNewsgroupsOperation.h" #include "MCNNTPFetchOverviewOperation.h" #include "MCNNTPCheckAccountOperation.h" @@ -155,9 +155,9 @@ bool NNTPAsyncSession::isCheckCertificateEnabled() return mSession->isCheckCertificateEnabled(); } -NNTPFetchArticlesOperation * NNTPAsyncSession::fetchAllArticlesOperation(String * group) +NNTPFetchAllArticlesOperation * NNTPAsyncSession::fetchAllArticlesOperation(String * group) { - NNTPFetchArticlesOperation * op = new NNTPFetchArticlesOperation(); + NNTPFetchAllArticlesOperation * op = new NNTPFetchAllArticlesOperation(); op->setSession(this); op->setGroupName(group); op->autorelease(); diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h index bbcc4036..d18ea119 100644 --- a/src/async/nntp/MCNNTPAsyncSession.h +++ b/src/async/nntp/MCNNTPAsyncSession.h @@ -12,7 +12,7 @@ namespace mailcore { class NNTPSession; class NNTPFetchHeaderOperation; class NNTPFetchArticleOperation; - class NNTPFetchArticlesOperation; + class NNTPFetchAllArticlesOperation; class NNTPFetchOverviewOperation; class NNTPListNewsgroupsOperation; class NNTPFetchServerTimeOperation; @@ -53,7 +53,7 @@ namespace mailcore { virtual dispatch_queue_t dispatchQueue(); #endif - virtual NNTPFetchArticlesOperation * fetchAllArticlesOperation(String * group); + virtual NNTPFetchAllArticlesOperation * fetchAllArticlesOperation(String * group); virtual NNTPFetchHeaderOperation * fetchHeaderOperation(String * groupName, unsigned int index); diff --git a/src/async/nntp/MCNNTPFetchArticlesOperation.cc b/src/async/nntp/MCNNTPFetchAllArticlesOperation.cc index a73c9000..044e9e5e 100644 --- a/src/async/nntp/MCNNTPFetchArticlesOperation.cc +++ b/src/async/nntp/MCNNTPFetchAllArticlesOperation.cc @@ -1,46 +1,46 @@ // -// MCMCNNTPFetchArticlesOperation.cpp +// MCNNTPFetchAllArticlesOperation.cpp // mailcore2 // // Created by Robert Widmann on 8/13/14. // Copyright (c) 2014 MailCore. All rights reserved. // -#include "MCNNTPFetchArticlesOperation.h" +#include "MCNNTPFetchAllArticlesOperation.h" #include "MCNNTPAsyncSession.h" #include "MCNNTPSession.h" using namespace mailcore; -NNTPFetchArticlesOperation::NNTPFetchArticlesOperation() +NNTPFetchAllArticlesOperation::NNTPFetchAllArticlesOperation() { mGroupName = NULL; mArticles = NULL; } -NNTPFetchArticlesOperation::~NNTPFetchArticlesOperation() +NNTPFetchAllArticlesOperation::~NNTPFetchAllArticlesOperation() { MC_SAFE_RELEASE(mGroupName); MC_SAFE_RELEASE(mArticles); } -void NNTPFetchArticlesOperation::setGroupName(String * groupname) +void NNTPFetchAllArticlesOperation::setGroupName(String * groupname) { MC_SAFE_REPLACE_COPY(String, mGroupName, groupname); } -String * NNTPFetchArticlesOperation::groupName() +String * NNTPFetchAllArticlesOperation::groupName() { return mGroupName; } -IndexSet * NNTPFetchArticlesOperation::articles() +IndexSet * NNTPFetchAllArticlesOperation::articles() { return mArticles; } -void NNTPFetchArticlesOperation::main() +void NNTPFetchAllArticlesOperation::main() { ErrorCode error; mArticles = session()->session()->fetchAllArticles(mGroupName, &error); diff --git a/src/async/nntp/MCNNTPFetchArticlesOperation.h b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h index e5fdc22e..88395dee 100644 --- a/src/async/nntp/MCNNTPFetchArticlesOperation.h +++ b/src/async/nntp/MCNNTPFetchAllArticlesOperation.h @@ -1,5 +1,5 @@ // -// MCMCNNTPFetchArticlesOperation.h +// MCNNTPFetchAllArticlesOperation.h // mailcore2 // // Created by Robert Widmann on 8/13/14. @@ -16,10 +16,10 @@ namespace mailcore { - class NNTPFetchArticlesOperation : public NNTPOperation { + class NNTPFetchAllArticlesOperation : public NNTPOperation { public: - NNTPFetchArticlesOperation(); - virtual ~NNTPFetchArticlesOperation(); + NNTPFetchAllArticlesOperation(); + virtual ~NNTPFetchAllArticlesOperation(); virtual void setGroupName(String * groupName); virtual String * groupName(); diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.cc b/src/async/nntp/MCNNTPFetchArticleOperation.cc index 1ad2ae85..1df0dc33 100644 --- a/src/async/nntp/MCNNTPFetchArticleOperation.cc +++ b/src/async/nntp/MCNNTPFetchArticleOperation.cc @@ -1,5 +1,5 @@ // -// MCMCNNTPFetchArticlesOperation.cpp +// MCNNTPFetchArticleOperation.cpp // mailcore2 // // Created by Robert Widmann on 8/13/14. diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h index 0ffa817c..7b11ae16 100644 --- a/src/async/nntp/MCNNTPFetchArticleOperation.h +++ b/src/async/nntp/MCNNTPFetchArticleOperation.h @@ -1,5 +1,5 @@ // -// MCMCNNTPFetchArticlesOperation.h +// MCNNTPFetchArticleOperation.h // mailcore2 // // Created by Robert Widmann on 8/13/14. diff --git a/src/cmake/async.cmake b/src/cmake/async.cmake index 43cced00..58f410d4 100644 --- a/src/cmake/async.cmake +++ b/src/cmake/async.cmake @@ -57,7 +57,7 @@ set(async_nntp_files async/nntp/MCNNTPCheckAccountOperation.cc async/nntp/MCNNTPDisconnectOperation.cc async/nntp/MCNNTPFetchArticleOperation.cc - async/nntp/MCNNTPFetchArticlesOperation.cc + async/nntp/MCNNTPFetchAllArticlesOperation.cc async/nntp/MCNNTPFetchHeaderOperation.cc async/nntp/MCNNTPListNewsgroupsOperation.cc async/nntp/MCNNTPFetchOverviewOperation.cc diff --git a/src/cmake/objc.cmake b/src/cmake/objc.cmake index 72d50147..de4d8d06 100644 --- a/src/cmake/objc.cmake +++ b/src/cmake/objc.cmake @@ -77,7 +77,7 @@ set(objc_smtp_files set(objc_nntp_files objc/nntp/MCONNTPDisconnectOperation.mm objc/nntp/MCONNTPFetchArticleOperation.mm - objc/nntp/MCONNTPFetchArticlesOperation.mm + objc/nntp/MCONNTPFetchAllArticlesOperation.mm objc/nntp/MCONNTPFetchHeaderOperation.mm objc/nntp/MCONNTPGroupInfo.mm objc/nntp/MCONNTPListNewsgroupsOperation.mm diff --git a/src/cmake/public-headers.cmake b/src/cmake/public-headers.cmake index 0050aadf..d25e44a9 100644 --- a/src/cmake/public-headers.cmake +++ b/src/cmake/public-headers.cmake @@ -108,7 +108,7 @@ async/nntp/MCNNTPAsyncSession.h async/nntp/MCNNTPCheckAccountOperation.h async/nntp/MCNNTPDisconnectOperation.h async/nntp/MCNNTPFetchArticleOperation.h -async/nntp/MCNNTPFetchArticlesOperation.h +async/nntp/MCNNTPFetchAllArticlesOperation.h async/nntp/MCNNTPFetchHeaderOperation.h async/nntp/MCNNTPListNewsgroupsOperation.h async/nntp/MCNNTPFetchOverviewOperation.h @@ -189,7 +189,7 @@ objc/nntp/MCONNTP.h objc/nntp/MCONNTPDisconnectOperation.h objc/nntp/MCONNTPFetchArticleOperation.h objc/nntp/MCONNTPFetchArticleOperation.mm -objc/nntp/MCONNTPFetchArticlesOperation.h +objc/nntp/MCONNTPFetchAllArticlesOperation.h objc/nntp/MCONNTPFetchArticlesOperation.mm objc/nntp/MCONNTPFetchHeaderOperation.h objc/nntp/MCONNTPFetchHeaderOperation.mm diff --git a/src/objc/nntp/MCONNTP.h b/src/objc/nntp/MCONNTP.h index 364db25b..71979dfa 100644 --- a/src/objc/nntp/MCONNTP.h +++ b/src/objc/nntp/MCONNTP.h @@ -14,7 +14,7 @@ #include <MailCore/MCONNTPOperation.h> #include <MailCore/MCONNTPFetchHeaderOperation.h> #include <MailCore/MCONNTPFetchArticleOperation.h> -#include <MailCore/MCONNTPFetchArticlesOperation.h> +#include <MailCore/MCONNTPFetchAllArticlesOperation.h> #include <MailCore/MCONNTPListNewsgroupsOperation.h> #include <MailCore/MCONNTPFetchOverviewOperation.h> #include <MailCore/MCONNTPFetchServerTimeOperation.h> diff --git a/src/objc/nntp/MCONNTPFetchArticlesOperation.h b/src/objc/nntp/MCONNTPFetchAllArticlesOperation.h index 35a0889d..34ccee7e 100644 --- a/src/objc/nntp/MCONNTPFetchArticlesOperation.h +++ b/src/objc/nntp/MCONNTPFetchAllArticlesOperation.h @@ -1,5 +1,5 @@ // -// MCONNTPFetchArticlesOperation.h +// MCONNTPFetchAllArticlesOperation.h // mailcore2 // // Created by Robert Widmann on 8/13/14. @@ -16,7 +16,7 @@ @class MCOIndexSet; /** This is an asynchronous operation that will fetch the list of a messages on the NNTP server. */ -@interface MCONNTPFetchArticlesOperation : MCONNTPOperation +@interface MCONNTPFetchAllArticlesOperation : MCONNTPOperation /** Starts the asynchronous fetch operation. diff --git a/src/objc/nntp/MCONNTPFetchArticlesOperation.mm b/src/objc/nntp/MCONNTPFetchAllArticlesOperation.mm index 75c21cb9..947f0324 100644 --- a/src/objc/nntp/MCONNTPFetchArticlesOperation.mm +++ b/src/objc/nntp/MCONNTPFetchAllArticlesOperation.mm @@ -1,12 +1,12 @@ // -// MCONNTPFetchArticlesOperation.m +// MCONNTPFetchAllArticlesOperation.m // mailcore2 // // Created by Robert Widmann on 8/13/14. // Copyright (c) 2014 MailCore. All rights reserved. // -#import "MCONNTPFetchArticlesOperation.h" +#import "MCONNTPFetchAllArticlesOperation.h" #include "MCAsyncNNTP.h" @@ -15,11 +15,11 @@ typedef void (^CompletionType)(NSError *error, MCOIndexSet * articles); -@implementation MCONNTPFetchArticlesOperation { +@implementation MCONNTPFetchAllArticlesOperation { CompletionType _completionBlock; } -#define nativeType mailcore::NNTPFetchArticlesOperation +#define nativeType mailcore::NNTPFetchAllArticlesOperation + (void) load { diff --git a/src/objc/nntp/MCONNTPSession.h b/src/objc/nntp/MCONNTPSession.h index 566756a1..413de507 100644 --- a/src/objc/nntp/MCONNTPSession.h +++ b/src/objc/nntp/MCONNTPSession.h @@ -16,7 +16,7 @@ #import <MailCore/MCOConstants.h> -@class MCONNTPFetchArticlesOperation; +@class MCONNTPFetchAllArticlesOperation; @class MCONNTPFetchHeaderOperation; @class MCONNTPFetchArticleOperation; @class MCONNTPListNewsgroupsOperation; @@ -71,11 +71,11 @@ /** Returns an operation that will fetch the list of article numbers. - MCONNTPFetchArticlesOperation * op = [session fetchAllArticlesOperation:@"comp.lang.c"]; + MCONNTPFetchAllArticlesOperation * op = [session fetchAllArticlesOperation:@"comp.lang.c"]; [op start:^(NSError * error, MCOIndexSet * articles) { }]; */ -- (MCONNTPFetchArticlesOperation *) fetchAllArticlesOperation:(NSString *)group; +- (MCONNTPFetchAllArticlesOperation *) fetchAllArticlesOperation:(NSString *)group; /** Returns an operation that will fetch the header of the given message. diff --git a/src/objc/nntp/MCONNTPSession.mm b/src/objc/nntp/MCONNTPSession.mm index 10011e6e..95c87364 100644 --- a/src/objc/nntp/MCONNTPSession.mm +++ b/src/objc/nntp/MCONNTPSession.mm @@ -13,7 +13,7 @@ #import "MCOUtils.h" #import "MCONNTPOperation.h" #import "MCOOperation+Private.h" -#import "MCONNTPFetchArticlesOperation.h" +#import "MCONNTPFetchAllArticlesOperation.h" #import "MCONNTPOperation+Private.h" using namespace mailcore; @@ -122,9 +122,9 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue, return result; } -- (MCONNTPFetchArticlesOperation *) fetchAllArticlesOperation:(NSString *)group +- (MCONNTPFetchAllArticlesOperation *) fetchAllArticlesOperation:(NSString *)group { - mailcore::NNTPFetchArticlesOperation * coreOp = MCO_NATIVE_INSTANCE->fetchAllArticlesOperation(MCO_FROM_OBJC(mailcore::String, group)); + mailcore::NNTPFetchAllArticlesOperation * coreOp = MCO_NATIVE_INSTANCE->fetchAllArticlesOperation(MCO_FROM_OBJC(mailcore::String, group)); return MCO_TO_OBJC_OP(coreOp); } |