aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rwxr-xr-xbuild-mac/mailcore2.xcodeproj/project.pbxproj204
-rw-r--r--src/async/nntp/MCAsyncNNTP.h4
-rw-r--r--src/async/nntp/MCNNTPAsyncSession.cc (renamed from src/async/nntp/MCNNTPAsyncSession.cpp)21
-rw-r--r--src/async/nntp/MCNNTPAsyncSession.h14
-rw-r--r--src/async/nntp/MCNNTPCheckAccountOperation.cc (renamed from src/async/nntp/MCNNTPCheckAccountOperation.cpp)0
-rw-r--r--src/async/nntp/MCNNTPDisconnectOperation.cc (renamed from src/async/nntp/MCNNTPDisconnectOperation.cpp)0
-rw-r--r--src/async/nntp/MCNNTPFetchArticleOperation.cc (renamed from src/async/nntp/MCNNTPFetchMessageOperation.cpp)20
-rw-r--r--src/async/nntp/MCNNTPFetchArticleOperation.h (renamed from src/async/nntp/MCNNTPFetchMessageOperation.h)8
-rw-r--r--src/async/nntp/MCNNTPFetchArticlesOperation.cc (renamed from src/async/nntp/MCNNTPFetchMessagesOperation.cpp)16
-rw-r--r--src/async/nntp/MCNNTPFetchArticlesOperation.h (renamed from src/async/nntp/MCNNTPFetchMessagesOperation.h)8
-rw-r--r--src/async/nntp/MCNNTPFetchHeaderOperation.cc (renamed from src/async/nntp/MCNNTPFetchHeaderOperation.cpp)10
-rw-r--r--src/async/nntp/MCNNTPFetchHeaderOperation.h4
-rw-r--r--src/async/nntp/MCNNTPListNewsgroupsOperation.cc (renamed from src/async/nntp/MCNNTPListNewsgroupsOperation.cpp)0
-rw-r--r--src/async/nntp/MCNNTPOperation.cc (renamed from src/async/nntp/MCNNTPOperation.cpp)0
-rw-r--r--src/core/nntp/MCNNTPGroupInfo.cc (renamed from src/core/nntp/MCNNTPGroupInfo.cpp)0
-rw-r--r--src/core/nntp/MCNNTPMessageInfo.cc (renamed from src/core/nntp/MCNNTPMessageInfo.cpp)0
-rw-r--r--src/core/nntp/MCNNTPSession.cc (renamed from src/core/nntp/MCNNTPSession.cpp)14
-rw-r--r--src/core/nntp/MCNNTPSession.h4
-rw-r--r--src/objc/nntp/MCONNTP.h5
-rw-r--r--src/objc/nntp/MCONNTPFetchArticleOperation.h (renamed from src/objc/nntp/MCONNTPFetchMessageOperation.h)4
-rw-r--r--src/objc/nntp/MCONNTPFetchArticleOperation.mm (renamed from src/objc/nntp/MCONNTPFetchMessageOperation.mm)22
-rw-r--r--src/objc/nntp/MCONNTPFetchArticlesOperation.h (renamed from src/objc/nntp/MCONNTPFetchMessagesOperation.h)4
-rw-r--r--src/objc/nntp/MCONNTPFetchArticlesOperation.mm (renamed from src/objc/nntp/MCONNTPFetchMessagesOperation.mm)8
-rw-r--r--src/objc/nntp/MCONNTPMessageInfo.h2
-rw-r--r--src/objc/nntp/MCONNTPSession.h16
-rw-r--r--src/objc/nntp/MCONNTPSession.mm14
26 files changed, 210 insertions, 192 deletions
diff --git a/build-mac/mailcore2.xcodeproj/project.pbxproj b/build-mac/mailcore2.xcodeproj/project.pbxproj
index 5cb37d9d..8d26974e 100755
--- a/build-mac/mailcore2.xcodeproj/project.pbxproj
+++ b/build-mac/mailcore2.xcodeproj/project.pbxproj
@@ -25,14 +25,14 @@
84391345199C3AB400FEFCDD /* MCONNTPDisconnectOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7378D199C02A8005124E5 /* MCONNTPDisconnectOperation.h */; };
84391346199C3ABB00FEFCDD /* MCONNTPGroupInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73791199C0511005124E5 /* MCONNTPGroupInfo.h */; };
84391347199C3ABD00FEFCDD /* MCONNTPGroupInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73791199C0511005124E5 /* MCONNTPGroupInfo.h */; };
- 849189A118C93FB7002063A3 /* MCNNTPSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8491899F18C93FB7002063A3 /* MCNNTPSession.cpp */; };
- 849189A218C93FB7002063A3 /* MCNNTPSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 8491899F18C93FB7002063A3 /* MCNNTPSession.cpp */; };
+ 849189A118C93FB7002063A3 /* MCNNTPSession.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8491899F18C93FB7002063A3 /* MCNNTPSession.cc */; };
+ 849189A218C93FB7002063A3 /* MCNNTPSession.cc in Sources */ = {isa = PBXBuildFile; fileRef = 8491899F18C93FB7002063A3 /* MCNNTPSession.cc */; };
849189A318C94023002063A3 /* MCNNTP.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 8491899C18C93F92002063A3 /* MCNNTP.h */; };
849189A418C94023002063A3 /* MCNNTPSession.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 849189A018C93FB7002063A3 /* MCNNTPSession.h */; };
- 849189A718C9477F002063A3 /* MCNNTPMessageInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cpp */; };
- 849189A818C9477F002063A3 /* MCNNTPMessageInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cpp */; };
- 849189AB18C94986002063A3 /* MCNNTPGroupInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849189A918C94986002063A3 /* MCNNTPGroupInfo.cpp */; };
- 849189AC18C94986002063A3 /* MCNNTPGroupInfo.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 849189A918C94986002063A3 /* MCNNTPGroupInfo.cpp */; };
+ 849189A718C9477F002063A3 /* MCNNTPMessageInfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cc */; };
+ 849189A818C9477F002063A3 /* MCNNTPMessageInfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cc */; };
+ 849189AB18C94986002063A3 /* MCNNTPGroupInfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 849189A918C94986002063A3 /* MCNNTPGroupInfo.cc */; };
+ 849189AC18C94986002063A3 /* MCNNTPGroupInfo.cc in Sources */ = {isa = PBXBuildFile; fileRef = 849189A918C94986002063A3 /* MCNNTPGroupInfo.cc */; };
849F53D817F28443002D417F /* MCOPOPNoopOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84B639EF17F282B4003B5BA2 /* MCOPOPNoopOperation.h */; };
849F53D917F28443002D417F /* MCIMAPNoopOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84B639EC17F280F3003B5BA2 /* MCIMAPNoopOperation.h */; };
849F53DA17F28443002D417F /* MCPOPNoopOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84B639E717F27EBD003B5BA2 /* MCPOPNoopOperation.h */; };
@@ -50,40 +50,40 @@
84B639F417F2839C003B5BA2 /* MCIMAPNoopOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84B639EC17F280F3003B5BA2 /* MCIMAPNoopOperation.h */; };
84B639F517F2839C003B5BA2 /* MCPOPNoopOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84B639E717F27EBD003B5BA2 /* MCPOPNoopOperation.h */; };
84B639F617F2839C003B5BA2 /* MCSMTPNoopOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84B639E217F279BB003B5BA2 /* MCSMTPNoopOperation.h */; };
- 84D7372C199BF66C005124E5 /* MCNNTPAsyncSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cpp */; };
- 84D7372D199BF66C005124E5 /* MCNNTPAsyncSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cpp */; };
- 84D73730199BF704005124E5 /* MCNNTPOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372E199BF704005124E5 /* MCNNTPOperation.cpp */; };
- 84D73731199BF704005124E5 /* MCNNTPOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372E199BF704005124E5 /* MCNNTPOperation.cpp */; };
+ 84D7372C199BF66C005124E5 /* MCNNTPAsyncSession.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cc */; };
+ 84D7372D199BF66C005124E5 /* MCNNTPAsyncSession.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cc */; };
+ 84D73730199BF704005124E5 /* MCNNTPOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372E199BF704005124E5 /* MCNNTPOperation.cc */; };
+ 84D73731199BF704005124E5 /* MCNNTPOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7372E199BF704005124E5 /* MCNNTPOperation.cc */; };
84D73733199BF7A7005124E5 /* MCNNTPProgressCallback.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73732199BF754005124E5 /* MCNNTPProgressCallback.h */; };
84D73734199BF7A9005124E5 /* MCNNTPProgressCallback.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73732199BF754005124E5 /* MCNNTPProgressCallback.h */; };
- 84D73737199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp */; };
- 84D73738199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp */; };
+ 84D73737199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc */; };
+ 84D73738199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc */; };
84D73739199BF81A005124E5 /* MCNNTPOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7372F199BF704005124E5 /* MCNNTPOperation.h */; };
84D7373A199BF81D005124E5 /* MCNNTPOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7372F199BF704005124E5 /* MCNNTPOperation.h */; };
- 84D7373D199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7373B199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp */; };
- 84D7373E199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7373B199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp */; };
- 84D73742199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73740199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp */; };
- 84D73743199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73740199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp */; };
- 84D73746199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp */; };
- 84D73747199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp */; };
+ 84D7373D199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7373B199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc */; };
+ 84D7373E199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7373B199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc */; };
+ 84D73742199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73740199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc */; };
+ 84D73743199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73740199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc */; };
+ 84D73746199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc */; };
+ 84D73747199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc */; };
84D73748199BFACA005124E5 /* MCNNTPAsyncSession.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7372B199BF66C005124E5 /* MCNNTPAsyncSession.h */; };
84D73749199BFACF005124E5 /* MCNNTPAsyncSession.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7372B199BF66C005124E5 /* MCNNTPAsyncSession.h */; };
84D7374A199BFB92005124E5 /* MCAsyncNNTP.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73729199BF63F005124E5 /* MCAsyncNNTP.h */; };
84D7374B199BFB94005124E5 /* MCAsyncNNTP.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73729199BF63F005124E5 /* MCAsyncNNTP.h */; };
84D7374C199BFB9C005124E5 /* MCNNTPFetchHeaderOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73736199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.h */; };
- 84D7374D199BFB9F005124E5 /* MCNNTPFetchMessageOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7373C199BF83B005124E5 /* MCNNTPFetchMessageOperation.h */; };
+ 84D7374D199BFB9F005124E5 /* MCNNTPFetchArticleOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7373C199BF83B005124E5 /* MCNNTPFetchArticleOperation.h */; };
84D7374E199BFBBA005124E5 /* MCNNTPFetchHeaderOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73736199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.h */; };
- 84D7374F199BFBC8005124E5 /* MCNNTPFetchMessagesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73741199BF963005124E5 /* MCNNTPFetchMessagesOperation.h */; };
- 84D73750199BFBD9005124E5 /* MCNNTPFetchMessageOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7373C199BF83B005124E5 /* MCNNTPFetchMessageOperation.h */; };
- 84D73751199BFBDF005124E5 /* MCNNTPFetchMessagesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73741199BF963005124E5 /* MCNNTPFetchMessagesOperation.h */; };
+ 84D7374F199BFBC8005124E5 /* MCNNTPFetchArticlesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73741199BF963005124E5 /* MCNNTPFetchArticlesOperation.h */; };
+ 84D73750199BFBD9005124E5 /* MCNNTPFetchArticleOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7373C199BF83B005124E5 /* MCNNTPFetchArticleOperation.h */; };
+ 84D73751199BFBDF005124E5 /* MCNNTPFetchArticlesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73741199BF963005124E5 /* MCNNTPFetchArticlesOperation.h */; };
84D73752199BFBE3005124E5 /* MCNNTPCheckAccountOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73745199BFA8C005124E5 /* MCNNTPCheckAccountOperation.h */; };
84D73753199BFBE6005124E5 /* MCNNTPCheckAccountOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73745199BFA8C005124E5 /* MCNNTPCheckAccountOperation.h */; };
84D73754199BFBEC005124E5 /* MCNNTPOperationCallback.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7373F199BF887005124E5 /* MCNNTPOperationCallback.h */; };
84D73755199BFBF2005124E5 /* MCNNTPOperationCallback.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7373F199BF887005124E5 /* MCNNTPOperationCallback.h */; };
- 84D73758199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp */; };
- 84D73759199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp */; };
- 84D7375C199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp */; };
- 84D7375D199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp */; };
+ 84D73758199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc */; };
+ 84D73759199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc */; };
+ 84D7375C199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc */; };
+ 84D7375D199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc in Sources */ = {isa = PBXBuildFile; fileRef = 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc */; };
84D7375E199BFF34005124E5 /* MCNNTPListNewsgroupsOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7375B199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.h */; };
84D7375F199BFF38005124E5 /* MCNNTPListNewsgroupsOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7375B199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.h */; };
84D73764199BFFC7005124E5 /* MCONNTPSession.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73763199BFFC7005124E5 /* MCONNTPSession.mm */; };
@@ -92,10 +92,10 @@
84D73769199BFFFC005124E5 /* MCONNTPOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73767199BFFFC005124E5 /* MCONNTPOperation.mm */; };
84D7376D199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D7376C199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm */; };
84D7376E199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D7376C199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm */; };
- 84D73771199C007E005124E5 /* MCONNTPFetchMessageOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73770199C007E005124E5 /* MCONNTPFetchMessageOperation.mm */; };
- 84D73772199C007E005124E5 /* MCONNTPFetchMessageOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73770199C007E005124E5 /* MCONNTPFetchMessageOperation.mm */; };
- 84D73775199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73774199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm */; };
- 84D73776199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73774199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm */; };
+ 84D73771199C007E005124E5 /* MCONNTPFetchArticleOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73770199C007E005124E5 /* MCONNTPFetchArticleOperation.mm */; };
+ 84D73772199C007E005124E5 /* MCONNTPFetchArticleOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73770199C007E005124E5 /* MCONNTPFetchArticleOperation.mm */; };
+ 84D73775199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73774199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm */; };
+ 84D73776199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73774199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm */; };
84D73779199C00C9005124E5 /* MCONNTPMessageInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73778199C00C9005124E5 /* MCONNTPMessageInfo.mm */; };
84D7377A199C00C9005124E5 /* MCONNTPMessageInfo.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D73778199C00C9005124E5 /* MCONNTPMessageInfo.mm */; };
84D7377B199C00F5005124E5 /* MCONNTP.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73761199BFF80005124E5 /* MCONNTP.h */; };
@@ -104,13 +104,13 @@
84D7377E199C0100005124E5 /* MCONNTPSession.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73762199BFFC7005124E5 /* MCONNTPSession.h */; };
84D7377F199C0104005124E5 /* MCONNTPOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73766199BFFFC005124E5 /* MCONNTPOperation.h */; };
84D73780199C0107005124E5 /* MCONNTPFetchHeaderOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7376B199C005A005124E5 /* MCONNTPFetchHeaderOperation.h */; };
- 84D73781199C010A005124E5 /* MCONNTPFetchMessageOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7376F199C007E005124E5 /* MCONNTPFetchMessageOperation.h */; };
- 84D73782199C010B005124E5 /* MCONNTPFetchMessagesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73773199C00AB005124E5 /* MCONNTPFetchMessagesOperation.h */; };
+ 84D73781199C010A005124E5 /* MCONNTPFetchArticleOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7376F199C007E005124E5 /* MCONNTPFetchArticleOperation.h */; };
+ 84D73782199C010B005124E5 /* MCONNTPFetchArticlesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73773199C00AB005124E5 /* MCONNTPFetchArticlesOperation.h */; };
84D73783199C010C005124E5 /* MCONNTPMessageInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73777199C00C9005124E5 /* MCONNTPMessageInfo.h */; };
84D73784199C0114005124E5 /* MCONNTPOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73766199BFFFC005124E5 /* MCONNTPOperation.h */; };
84D73785199C0117005124E5 /* MCONNTPFetchHeaderOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7376B199C005A005124E5 /* MCONNTPFetchHeaderOperation.h */; };
- 84D73786199C0118005124E5 /* MCONNTPFetchMessageOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7376F199C007E005124E5 /* MCONNTPFetchMessageOperation.h */; };
- 84D73787199C011A005124E5 /* MCONNTPFetchMessagesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73773199C00AB005124E5 /* MCONNTPFetchMessagesOperation.h */; };
+ 84D73786199C0118005124E5 /* MCONNTPFetchArticleOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D7376F199C007E005124E5 /* MCONNTPFetchArticleOperation.h */; };
+ 84D73787199C011A005124E5 /* MCONNTPFetchArticlesOperation.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73773199C00AB005124E5 /* MCONNTPFetchArticlesOperation.h */; };
84D73788199C011C005124E5 /* MCONNTPMessageInfo.h in CopyFiles */ = {isa = PBXBuildFile; fileRef = 84D73777199C00C9005124E5 /* MCONNTPMessageInfo.h */; };
84D7378B199C0260005124E5 /* MCONNTPListNewsgroupsOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D7378A199C0260005124E5 /* MCONNTPListNewsgroupsOperation.mm */; };
84D7378C199C0260005124E5 /* MCONNTPListNewsgroupsOperation.mm in Sources */ = {isa = PBXBuildFile; fileRef = 84D7378A199C0260005124E5 /* MCONNTPListNewsgroupsOperation.mm */; };
@@ -940,9 +940,9 @@
C6D6F959171E5D5E006F5B28 /* MCMD5.h in CopyFiles */,
C6F61FA0170187B80073032E /* MCOIMAPFolderInfoOperation.h in CopyFiles */,
C6F61FA4170187C30073032E /* MCOIMAPFetchMessagesOperation.h in CopyFiles */,
- 84D73781199C010A005124E5 /* MCONNTPFetchMessageOperation.h in CopyFiles */,
+ 84D73781199C010A005124E5 /* MCONNTPFetchArticleOperation.h in CopyFiles */,
84D73783199C010C005124E5 /* MCONNTPMessageInfo.h in CopyFiles */,
- 84D73782199C010B005124E5 /* MCONNTPFetchMessagesOperation.h in CopyFiles */,
+ 84D73782199C010B005124E5 /* MCONNTPFetchArticlesOperation.h in CopyFiles */,
C6F61FA3170187BD0073032E /* MCOIMAPCopyMessagesOperation.h in CopyFiles */,
C6D6F95A171E5D60006F5B28 /* MCJSON.h in CopyFiles */,
C6F61FA2170187BC0073032E /* MCOIMAPAppendMessageOperation.h in CopyFiles */,
@@ -969,8 +969,8 @@
C6F5B9F516FEBB4500D9DABD /* MCOIMAPFolder.h in CopyFiles */,
C623C59016FE71B2001BBEFC /* MCOIMAPOperation.h in CopyFiles */,
C6F5B9F616FEBB4900D9DABD /* MCOIMAPMessage.h in CopyFiles */,
- 84D73750199BFBD9005124E5 /* MCNNTPFetchMessageOperation.h in CopyFiles */,
- 84D7374F199BFBC8005124E5 /* MCNNTPFetchMessagesOperation.h in CopyFiles */,
+ 84D73750199BFBD9005124E5 /* MCNNTPFetchArticleOperation.h in CopyFiles */,
+ 84D7374F199BFBC8005124E5 /* MCNNTPFetchArticlesOperation.h in CopyFiles */,
C623C58916FD8B71001BBEFC /* MCOUtils.h in CopyFiles */,
C64EA74F169E859600778456 /* MCAbstractMessage.h in CopyFiles */,
C623C58816FD6DF6001BBEFC /* NSValue+MCO.h in CopyFiles */,
@@ -1107,11 +1107,11 @@
84E65534199BE2BF00EC8CC4 /* MCNNTPGroupInfo.h in CopyFiles */,
84D73785199C0117005124E5 /* MCONNTPFetchHeaderOperation.h in CopyFiles */,
84D73739199BF81A005124E5 /* MCNNTPOperation.h in CopyFiles */,
- 84D73787199C011A005124E5 /* MCONNTPFetchMessagesOperation.h in CopyFiles */,
+ 84D73787199C011A005124E5 /* MCONNTPFetchArticlesOperation.h in CopyFiles */,
84391344199C3AB200FEFCDD /* MCONNTPDisconnectOperation.h in CopyFiles */,
84391343199C3AAA00FEFCDD /* MCONNTPListNewsgroupsOperation.h in CopyFiles */,
84D73788199C011C005124E5 /* MCONNTPMessageInfo.h in CopyFiles */,
- 84D73786199C0118005124E5 /* MCONNTPFetchMessageOperation.h in CopyFiles */,
+ 84D73786199C0118005124E5 /* MCONNTPFetchArticleOperation.h in CopyFiles */,
84391347199C3ABD00FEFCDD /* MCONNTPGroupInfo.h in CopyFiles */,
84D73749199BFACF005124E5 /* MCNNTPAsyncSession.h in CopyFiles */,
84D73752199BFBE3005124E5 /* MCNNTPCheckAccountOperation.h in CopyFiles */,
@@ -1119,10 +1119,10 @@
84D7374E199BFBBA005124E5 /* MCNNTPFetchHeaderOperation.h in CopyFiles */,
84D7375E199BFF34005124E5 /* MCNNTPListNewsgroupsOperation.h in CopyFiles */,
C63D316717C997BA00A4D993 /* MCOIMAPIdentity.h in CopyFiles */,
- 84D7374D199BFB9F005124E5 /* MCNNTPFetchMessageOperation.h in CopyFiles */,
+ 84D7374D199BFB9F005124E5 /* MCNNTPFetchArticleOperation.h in CopyFiles */,
DAE42E8A178F7E2200E0DB8F /* MCOIMAPMessageRenderingOperation.h in CopyFiles */,
C6E6652F1791B2530063F2CF /* MCIMAPMessageRenderingOperation.h in CopyFiles */,
- 84D73751199BFBDF005124E5 /* MCNNTPFetchMessagesOperation.h in CopyFiles */,
+ 84D73751199BFBDF005124E5 /* MCNNTPFetchArticlesOperation.h in CopyFiles */,
9E774D8B1767CD3C0065EB9B /* MCIMAPFolderStatus.h in CopyFiles */,
84D73755199BFBF2005124E5 /* MCNNTPOperationCallback.h in CopyFiles */,
9EF9AB25175F40C70027FA3B /* MCIMAPFolderStatusOperation.h in CopyFiles */,
@@ -1312,11 +1312,11 @@
8416A99F17F2871D00B3C7DA /* MCOIMAPNoopOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOIMAPNoopOperation.h; sourceTree = "<group>"; };
8416A9A017F2871D00B3C7DA /* MCOIMAPNoopOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOIMAPNoopOperation.mm; sourceTree = "<group>"; };
8491899C18C93F92002063A3 /* MCNNTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MCNNTP.h; path = nntp/MCNNTP.h; sourceTree = "<group>"; };
- 8491899F18C93FB7002063A3 /* MCNNTPSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MCNNTPSession.cpp; path = nntp/MCNNTPSession.cpp; sourceTree = "<group>"; };
+ 8491899F18C93FB7002063A3 /* MCNNTPSession.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MCNNTPSession.cc; path = nntp/MCNNTPSession.cc; sourceTree = "<group>"; };
849189A018C93FB7002063A3 /* MCNNTPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MCNNTPSession.h; path = nntp/MCNNTPSession.h; sourceTree = "<group>"; };
- 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MCNNTPMessageInfo.cpp; path = nntp/MCNNTPMessageInfo.cpp; sourceTree = "<group>"; };
+ 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MCNNTPMessageInfo.cc; path = nntp/MCNNTPMessageInfo.cc; sourceTree = "<group>"; };
849189A618C9477F002063A3 /* MCNNTPMessageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MCNNTPMessageInfo.h; path = nntp/MCNNTPMessageInfo.h; sourceTree = "<group>"; };
- 849189A918C94986002063A3 /* MCNNTPGroupInfo.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MCNNTPGroupInfo.cpp; path = nntp/MCNNTPGroupInfo.cpp; sourceTree = "<group>"; };
+ 849189A918C94986002063A3 /* MCNNTPGroupInfo.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = MCNNTPGroupInfo.cc; path = nntp/MCNNTPGroupInfo.cc; sourceTree = "<group>"; };
849189AA18C94986002063A3 /* MCNNTPGroupInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MCNNTPGroupInfo.h; path = nntp/MCNNTPGroupInfo.h; sourceTree = "<group>"; };
84AF9E7D172DBAF600E60AA3 /* providers.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; name = providers.json; path = ../resources/providers.json; sourceTree = "<group>"; };
84B639E117F279BB003B5BA2 /* MCSMTPNoopOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCSMTPNoopOperation.cc; sourceTree = "<group>"; };
@@ -1328,23 +1328,23 @@
84B639EF17F282B4003B5BA2 /* MCOPOPNoopOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCOPOPNoopOperation.h; sourceTree = "<group>"; };
84B639F017F282B4003B5BA2 /* MCOPOPNoopOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCOPOPNoopOperation.mm; sourceTree = "<group>"; };
84D73729199BF63F005124E5 /* MCAsyncNNTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCAsyncNNTP.h; sourceTree = "<group>"; };
- 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPAsyncSession.cpp; sourceTree = "<group>"; };
+ 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPAsyncSession.cc; sourceTree = "<group>"; };
84D7372B199BF66C005124E5 /* MCNNTPAsyncSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPAsyncSession.h; sourceTree = "<group>"; };
- 84D7372E199BF704005124E5 /* MCNNTPOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPOperation.cpp; sourceTree = "<group>"; };
+ 84D7372E199BF704005124E5 /* MCNNTPOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPOperation.cc; sourceTree = "<group>"; };
84D7372F199BF704005124E5 /* MCNNTPOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPOperation.h; sourceTree = "<group>"; };
84D73732199BF754005124E5 /* MCNNTPProgressCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MCNNTPProgressCallback.h; path = nntp/MCNNTPProgressCallback.h; sourceTree = "<group>"; };
- 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPFetchHeaderOperation.cpp; sourceTree = "<group>"; };
+ 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPFetchHeaderOperation.cc; sourceTree = "<group>"; };
84D73736199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPFetchHeaderOperation.h; sourceTree = "<group>"; };
- 84D7373B199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPFetchMessageOperation.cpp; sourceTree = "<group>"; };
- 84D7373C199BF83B005124E5 /* MCNNTPFetchMessageOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPFetchMessageOperation.h; sourceTree = "<group>"; };
+ 84D7373B199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPFetchArticleOperation.cc; sourceTree = "<group>"; };
+ 84D7373C199BF83B005124E5 /* MCNNTPFetchArticleOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPFetchArticleOperation.h; sourceTree = "<group>"; };
84D7373F199BF887005124E5 /* MCNNTPOperationCallback.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPOperationCallback.h; sourceTree = "<group>"; };
- 84D73740199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPFetchMessagesOperation.cpp; sourceTree = "<group>"; };
- 84D73741199BF963005124E5 /* MCNNTPFetchMessagesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPFetchMessagesOperation.h; sourceTree = "<group>"; };
- 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPCheckAccountOperation.cpp; sourceTree = "<group>"; };
+ 84D73740199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPFetchArticlesOperation.cc; sourceTree = "<group>"; };
+ 84D73741199BF963005124E5 /* MCNNTPFetchArticlesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPFetchArticlesOperation.h; sourceTree = "<group>"; };
+ 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPCheckAccountOperation.cc; sourceTree = "<group>"; };
84D73745199BFA8C005124E5 /* MCNNTPCheckAccountOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPCheckAccountOperation.h; sourceTree = "<group>"; };
- 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPDisconnectOperation.cpp; sourceTree = "<group>"; };
+ 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPDisconnectOperation.cc; sourceTree = "<group>"; };
84D73757199BFC8A005124E5 /* MCNNTPDisconnectOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPDisconnectOperation.h; sourceTree = "<group>"; };
- 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPListNewsgroupsOperation.cpp; sourceTree = "<group>"; };
+ 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MCNNTPListNewsgroupsOperation.cc; sourceTree = "<group>"; };
84D7375B199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCNNTPListNewsgroupsOperation.h; sourceTree = "<group>"; };
84D73761199BFF80005124E5 /* MCONNTP.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTP.h; sourceTree = "<group>"; };
84D73762199BFFC7005124E5 /* MCONNTPSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPSession.h; sourceTree = "<group>"; };
@@ -1354,10 +1354,10 @@
84D7376A199C0014005124E5 /* MCONNTPOperation+Private.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "MCONNTPOperation+Private.h"; sourceTree = "<group>"; };
84D7376B199C005A005124E5 /* MCONNTPFetchHeaderOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPFetchHeaderOperation.h; sourceTree = "<group>"; };
84D7376C199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCONNTPFetchHeaderOperation.mm; sourceTree = "<group>"; };
- 84D7376F199C007E005124E5 /* MCONNTPFetchMessageOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPFetchMessageOperation.h; sourceTree = "<group>"; };
- 84D73770199C007E005124E5 /* MCONNTPFetchMessageOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCONNTPFetchMessageOperation.mm; sourceTree = "<group>"; };
- 84D73773199C00AB005124E5 /* MCONNTPFetchMessagesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPFetchMessagesOperation.h; sourceTree = "<group>"; };
- 84D73774199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCONNTPFetchMessagesOperation.mm; sourceTree = "<group>"; };
+ 84D7376F199C007E005124E5 /* MCONNTPFetchArticleOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPFetchArticleOperation.h; sourceTree = "<group>"; };
+ 84D73770199C007E005124E5 /* MCONNTPFetchArticleOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCONNTPFetchArticleOperation.mm; sourceTree = "<group>"; };
+ 84D73773199C00AB005124E5 /* MCONNTPFetchArticlesOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPFetchArticlesOperation.h; sourceTree = "<group>"; };
+ 84D73774199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCONNTPFetchArticlesOperation.mm; sourceTree = "<group>"; };
84D73777199C00C9005124E5 /* MCONNTPMessageInfo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPMessageInfo.h; sourceTree = "<group>"; };
84D73778199C00C9005124E5 /* MCONNTPMessageInfo.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = MCONNTPMessageInfo.mm; sourceTree = "<group>"; };
84D73789199C0260005124E5 /* MCONNTPListNewsgroupsOperation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MCONNTPListNewsgroupsOperation.h; sourceTree = "<group>"; };
@@ -1841,12 +1841,12 @@
isa = PBXGroup;
children = (
8491899C18C93F92002063A3 /* MCNNTP.h */,
- 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cpp */,
+ 849189A518C9477F002063A3 /* MCNNTPMessageInfo.cc */,
849189A618C9477F002063A3 /* MCNNTPMessageInfo.h */,
- 849189A918C94986002063A3 /* MCNNTPGroupInfo.cpp */,
+ 849189A918C94986002063A3 /* MCNNTPGroupInfo.cc */,
849189AA18C94986002063A3 /* MCNNTPGroupInfo.h */,
84D73732199BF754005124E5 /* MCNNTPProgressCallback.h */,
- 8491899F18C93FB7002063A3 /* MCNNTPSession.cpp */,
+ 8491899F18C93FB7002063A3 /* MCNNTPSession.cc */,
849189A018C93FB7002063A3 /* MCNNTPSession.h */,
);
name = nntp;
@@ -1884,21 +1884,21 @@
isa = PBXGroup;
children = (
84D73729199BF63F005124E5 /* MCAsyncNNTP.h */,
- 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cpp */,
+ 84D7372A199BF66C005124E5 /* MCNNTPAsyncSession.cc */,
84D7372B199BF66C005124E5 /* MCNNTPAsyncSession.h */,
- 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp */,
+ 84D73735199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc */,
84D73736199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.h */,
- 84D7373B199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp */,
- 84D7373C199BF83B005124E5 /* MCNNTPFetchMessageOperation.h */,
- 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp */,
+ 84D7373B199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc */,
+ 84D7373C199BF83B005124E5 /* MCNNTPFetchArticleOperation.h */,
+ 84D7375A199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc */,
84D7375B199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.h */,
- 84D73740199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp */,
- 84D73741199BF963005124E5 /* MCNNTPFetchMessagesOperation.h */,
- 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp */,
+ 84D73740199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc */,
+ 84D73741199BF963005124E5 /* MCNNTPFetchArticlesOperation.h */,
+ 84D73744199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc */,
84D73745199BFA8C005124E5 /* MCNNTPCheckAccountOperation.h */,
- 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp */,
+ 84D73756199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc */,
84D73757199BFC8A005124E5 /* MCNNTPDisconnectOperation.h */,
- 84D7372E199BF704005124E5 /* MCNNTPOperation.cpp */,
+ 84D7372E199BF704005124E5 /* MCNNTPOperation.cc */,
84D7372F199BF704005124E5 /* MCNNTPOperation.h */,
84D7373F199BF887005124E5 /* MCNNTPOperationCallback.h */,
);
@@ -1916,12 +1916,12 @@
84D73767199BFFFC005124E5 /* MCONNTPOperation.mm */,
84D7376B199C005A005124E5 /* MCONNTPFetchHeaderOperation.h */,
84D7376C199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm */,
- 84D7376F199C007E005124E5 /* MCONNTPFetchMessageOperation.h */,
- 84D73770199C007E005124E5 /* MCONNTPFetchMessageOperation.mm */,
+ 84D7376F199C007E005124E5 /* MCONNTPFetchArticleOperation.h */,
+ 84D73770199C007E005124E5 /* MCONNTPFetchArticleOperation.mm */,
84D73789199C0260005124E5 /* MCONNTPListNewsgroupsOperation.h */,
84D7378A199C0260005124E5 /* MCONNTPListNewsgroupsOperation.mm */,
- 84D73773199C00AB005124E5 /* MCONNTPFetchMessagesOperation.h */,
- 84D73774199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm */,
+ 84D73773199C00AB005124E5 /* MCONNTPFetchArticlesOperation.h */,
+ 84D73774199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm */,
84D7378D199C02A8005124E5 /* MCONNTPDisconnectOperation.h */,
84D7378E199C02A8005124E5 /* MCONNTPDisconnectOperation.mm */,
84D73777199C00C9005124E5 /* MCONNTPMessageInfo.h */,
@@ -2804,7 +2804,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 84D7373D199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp in Sources */,
+ 84D7373D199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc in Sources */,
C64EA6F4169E847800778456 /* MCAbstractMessage.cc in Sources */,
C64EA6F6169E847800778456 /* MCAbstractMessagePart.cc in Sources */,
84B639ED17F280F3003B5BA2 /* MCIMAPNoopOperation.cc in Sources */,
@@ -2834,7 +2834,7 @@
84D73779199C00C9005124E5 /* MCONNTPMessageInfo.mm in Sources */,
C64EA725169E847800778456 /* MCIMAPMessage.cc in Sources */,
C64EA727169E847800778456 /* MCIMAPMessagePart.cc in Sources */,
- 84D73775199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm in Sources */,
+ 84D73775199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm in Sources */,
C64EA729169E847800778456 /* MCIMAPMultipart.cc in Sources */,
C64EA72B169E847800778456 /* MCIMAPNamespace.cc in Sources */,
C64EA72D169E847800778456 /* MCIMAPNamespaceItem.cc in Sources */,
@@ -2844,7 +2844,7 @@
C68B2AF717797389005E61EF /* MCConnectionLoggerUtils.cc in Sources */,
C64EA737169E847800778456 /* MCPOPMessageInfo.cc in Sources */,
C64EA73A169E847800778456 /* MCPOPSession.cc in Sources */,
- 84D7375C199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp in Sources */,
+ 84D7375C199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc in Sources */,
C64EA73C169E847800778456 /* MCAttachment.cc in Sources */,
C64EA73E169E847800778456 /* MCMessageBuilder.cc in Sources */,
C64EA740169E847800778456 /* MCMessageParser.cc in Sources */,
@@ -2865,17 +2865,17 @@
C64EA80216A295E400778456 /* MCIMAPRenameFolderOperation.cc in Sources */,
C64EA80516A2997E00778456 /* MCIMAPDeleteFolderOperation.cc in Sources */,
C63D315C17C9155C00A4D993 /* MCIMAPIdentity.cc in Sources */,
- 84D73742199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp in Sources */,
+ 84D73742199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc in Sources */,
C64EA80816A2999A00778456 /* MCIMAPCreateFolderOperation.cc in Sources */,
C64EA80B16A299B700778456 /* MCIMAPSubscribeFolderOperation.cc in Sources */,
- 84D7372C199BF66C005124E5 /* MCNNTPAsyncSession.cpp in Sources */,
+ 84D7372C199BF66C005124E5 /* MCNNTPAsyncSession.cc in Sources */,
C64EA81116A299ED00778456 /* MCIMAPAppendMessageOperation.cc in Sources */,
C64EA81416A29A2300778456 /* MCIMAPCopyMessagesOperation.cc in Sources */,
C64EA81716A29A8700778456 /* MCIMAPExpungeOperation.cc in Sources */,
C69BA85B17DEFCCB00D601B7 /* NSIndexSet+MCO.m in Sources */,
C64EA81A16A29AF200778456 /* MCIMAPFetchMessagesOperation.cc in Sources */,
C64EA81D16A29DC500778456 /* MCIMAPFetchContentOperation.cc in Sources */,
- 84D73746199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp in Sources */,
+ 84D73746199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc in Sources */,
C64EA82016A29E4100778456 /* MCIMAPStoreFlagsOperation.cc in Sources */,
C64EA82316A29E5300778456 /* MCIMAPStoreLabelsOperation.cc in Sources */,
C643F492189A3D59007EA2F7 /* NSSet+MCO.mm in Sources */,
@@ -2884,9 +2884,9 @@
C64EA82916A29F2200778456 /* MCIMAPIdleOperation.cc in Sources */,
C6E665B91796500C0063F2CF /* mztools.c in Sources */,
C64EA82C16A2A08B00778456 /* MCIMAPFetchNamespaceOperation.cc in Sources */,
- 84D73758199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp in Sources */,
+ 84D73758199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc in Sources */,
84B639E817F27EBD003B5BA2 /* MCPOPNoopOperation.cc in Sources */,
- 849189A118C93FB7002063A3 /* MCNNTPSession.cpp in Sources */,
+ 849189A118C93FB7002063A3 /* MCNNTPSession.cc in Sources */,
C62C6ED416A2A0E600737497 /* MCIMAPIdentityOperation.cc in Sources */,
C62C6ED816A398FA00737497 /* MCIMAPFolderInfoOperation.cc in Sources */,
C62C6EDA16A3D60700737497 /* MCIMAPAsyncConnection.cc in Sources */,
@@ -2900,7 +2900,7 @@
C6D42C1D16AE03D6002BB4F9 /* NSData+MCO.mm in Sources */,
C6D42C1E16AE03D6002BB4F9 /* NSString+MCO.mm in Sources */,
C64FF39116B3C13000F8C162 /* MCOObjectWrapper.mm in Sources */,
- 84D73737199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp in Sources */,
+ 84D73737199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc in Sources */,
84D7376D199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm in Sources */,
C6E665B71796500B0063F2CF /* ioapi.c in Sources */,
C07ADC28B83E7959BF114D46 /* MCOIMAPSession.mm in Sources */,
@@ -2943,7 +2943,7 @@
C6F5B9EE16FEA3C400D9DABD /* MCOIMAPNamespaceItem.mm in Sources */,
C6F5B9F116FEA3D700D9DABD /* MCOIMAPPart.mm in Sources */,
C6F5B9F416FEAC6C00D9DABD /* MCOIndexSet.mm in Sources */,
- 849189AB18C94986002063A3 /* MCNNTPGroupInfo.cpp in Sources */,
+ 849189AB18C94986002063A3 /* MCNNTPGroupInfo.cc in Sources */,
C6F5B9FE16FED18600D9DABD /* MCOAbstractMessageRendererCallback.mm in Sources */,
C6CCC5C716FFE5190077A5FC /* MCORange.mm in Sources */,
C63D316217C92D8300A4D993 /* MCOIMAPIdentity.mm in Sources */,
@@ -2955,7 +2955,7 @@
C6F61F8717016AD60073032E /* MCOIMAPFetchContentOperation.mm in Sources */,
C6F61F8A17016AE60073032E /* MCOIMAPSearchOperation.mm in Sources */,
C6F61F8D17016AFB0073032E /* MCOIMAPIdleOperation.mm in Sources */,
- 849189A718C9477F002063A3 /* MCNNTPMessageInfo.cpp in Sources */,
+ 849189A718C9477F002063A3 /* MCNNTPMessageInfo.cc in Sources */,
C6F61F9017016B0A0073032E /* MCOIMAPFetchNamespaceOperation.mm in Sources */,
C6F61F9317016B250073032E /* MCOIMAPIdentityOperation.mm in Sources */,
C6F61F9617016B310073032E /* MCOIMAPCapabilityOperation.mm in Sources */,
@@ -2973,7 +2973,7 @@
C6A81BDA1706903E00882C15 /* MCOPOPFetchHeaderOperation.mm in Sources */,
C608167B177635D2001F1018 /* MCIMAPDisconnectOperation.cc in Sources */,
C6A81BDE1706904800882C15 /* MCOPOPFetchMessageOperation.mm in Sources */,
- 84D73730199BF704005124E5 /* MCNNTPOperation.cpp in Sources */,
+ 84D73730199BF704005124E5 /* MCNNTPOperation.cc in Sources */,
C6A81BE21706905600882C15 /* MCOPOPOperation.mm in Sources */,
C6A81BE61706906D00882C15 /* MCOPOPFetchMessagesOperation.mm in Sources */,
C6A81C001707CEE600882C15 /* MCOPOPMessageInfo.mm in Sources */,
@@ -3001,7 +3001,7 @@
BD63713B177DFF080094121B /* MCLibetpan.cc in Sources */,
DAACAD5117886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc in Sources */,
DA89896D178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm in Sources */,
- 84D73771199C007E005124E5 /* MCONNTPFetchMessageOperation.mm in Sources */,
+ 84D73771199C007E005124E5 /* MCONNTPFetchArticleOperation.mm in Sources */,
4B3C1BDE17ABF309008BBF4C /* MCOIMAPQuotaOperation.mm in Sources */,
4B3C1BE117ABF4BC008BBF4C /* MCIMAPQuotaOperation.cc in Sources */,
);
@@ -3030,7 +3030,7 @@
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
- 84D7373E199BF83B005124E5 /* MCNNTPFetchMessageOperation.cpp in Sources */,
+ 84D7373E199BF83B005124E5 /* MCNNTPFetchArticleOperation.cc in Sources */,
C6BA2B991705F4E6003F0E9E /* MCAbstractMessage.cc in Sources */,
C6BA2B9A1705F4E6003F0E9E /* MCAbstractMessagePart.cc in Sources */,
84B639EE17F280F3003B5BA2 /* MCIMAPNoopOperation.cc in Sources */,
@@ -3060,7 +3060,7 @@
84D7377A199C00C9005124E5 /* MCONNTPMessageInfo.mm in Sources */,
C6BA2BAF1705F4E6003F0E9E /* MCIMAPMessage.cc in Sources */,
C6BA2BB01705F4E6003F0E9E /* MCIMAPMessagePart.cc in Sources */,
- 84D73776199C00AB005124E5 /* MCONNTPFetchMessagesOperation.mm in Sources */,
+ 84D73776199C00AB005124E5 /* MCONNTPFetchArticlesOperation.mm in Sources */,
C6BA2BB11705F4E6003F0E9E /* MCIMAPMultipart.cc in Sources */,
C6BA2BB21705F4E6003F0E9E /* MCIMAPNamespace.cc in Sources */,
C6BA2BB31705F4E6003F0E9E /* MCIMAPNamespaceItem.cc in Sources */,
@@ -3070,7 +3070,7 @@
C68B2AF817797389005E61EF /* MCConnectionLoggerUtils.cc in Sources */,
C6BA2BB71705F4E6003F0E9E /* MCPOPMessageInfo.cc in Sources */,
C6BA2BB81705F4E6003F0E9E /* MCPOPSession.cc in Sources */,
- 84D7375D199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cpp in Sources */,
+ 84D7375D199BFDCA005124E5 /* MCNNTPListNewsgroupsOperation.cc in Sources */,
C6BA2BB91705F4E6003F0E9E /* MCAttachment.cc in Sources */,
C6BA2BBA1705F4E6003F0E9E /* MCMessageBuilder.cc in Sources */,
C6BA2BBB1705F4E6003F0E9E /* MCMessageParser.cc in Sources */,
@@ -3091,17 +3091,17 @@
C6BA2BC61705F4E6003F0E9E /* MCIMAPRenameFolderOperation.cc in Sources */,
C6BA2BC71705F4E6003F0E9E /* MCIMAPDeleteFolderOperation.cc in Sources */,
C63D315D17C9155C00A4D993 /* MCIMAPIdentity.cc in Sources */,
- 84D73743199BF963005124E5 /* MCNNTPFetchMessagesOperation.cpp in Sources */,
+ 84D73743199BF963005124E5 /* MCNNTPFetchArticlesOperation.cc in Sources */,
C6BA2BC81705F4E6003F0E9E /* MCIMAPCreateFolderOperation.cc in Sources */,
C6BA2BC91705F4E6003F0E9E /* MCIMAPSubscribeFolderOperation.cc in Sources */,
- 84D7372D199BF66C005124E5 /* MCNNTPAsyncSession.cpp in Sources */,
+ 84D7372D199BF66C005124E5 /* MCNNTPAsyncSession.cc in Sources */,
C6BA2BCA1705F4E6003F0E9E /* MCIMAPAppendMessageOperation.cc in Sources */,
C6BA2BCB1705F4E6003F0E9E /* MCIMAPCopyMessagesOperation.cc in Sources */,
C6BA2BCC1705F4E6003F0E9E /* MCIMAPExpungeOperation.cc in Sources */,
C69BA85C17DEFCCB00D601B7 /* NSIndexSet+MCO.m in Sources */,
C6BA2BCD1705F4E6003F0E9E /* MCIMAPFetchMessagesOperation.cc in Sources */,
C6BA2BCE1705F4E6003F0E9E /* MCIMAPFetchContentOperation.cc in Sources */,
- 84D73747199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cpp in Sources */,
+ 84D73747199BFA8C005124E5 /* MCNNTPCheckAccountOperation.cc in Sources */,
C6BA2BCF1705F4E6003F0E9E /* MCIMAPStoreFlagsOperation.cc in Sources */,
C6BA2BD01705F4E6003F0E9E /* MCIMAPStoreLabelsOperation.cc in Sources */,
C643F493189A3D59007EA2F7 /* NSSet+MCO.mm in Sources */,
@@ -3110,9 +3110,9 @@
C6BA2BD21705F4E6003F0E9E /* MCIMAPIdleOperation.cc in Sources */,
C6E665BA1796500C0063F2CF /* mztools.c in Sources */,
C6BA2BD31705F4E6003F0E9E /* MCIMAPFetchNamespaceOperation.cc in Sources */,
- 84D73759199BFC8A005124E5 /* MCNNTPDisconnectOperation.cpp in Sources */,
+ 84D73759199BFC8A005124E5 /* MCNNTPDisconnectOperation.cc in Sources */,
84B639E917F27EBD003B5BA2 /* MCPOPNoopOperation.cc in Sources */,
- 849189A218C93FB7002063A3 /* MCNNTPSession.cpp in Sources */,
+ 849189A218C93FB7002063A3 /* MCNNTPSession.cc in Sources */,
C6BA2BD41705F4E6003F0E9E /* MCIMAPIdentityOperation.cc in Sources */,
C6BA2BD51705F4E6003F0E9E /* MCIMAPFolderInfoOperation.cc in Sources */,
C6BA2BD61705F4E6003F0E9E /* MCIMAPAsyncConnection.cc in Sources */,
@@ -3126,7 +3126,7 @@
C6BA2BDE1705F4E6003F0E9E /* NSData+MCO.mm in Sources */,
C6BA2BDF1705F4E6003F0E9E /* NSString+MCO.mm in Sources */,
C6BA2BE01705F4E6003F0E9E /* MCOObjectWrapper.mm in Sources */,
- 84D73738199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cpp in Sources */,
+ 84D73738199BF7F2005124E5 /* MCNNTPFetchHeaderOperation.cc in Sources */,
84D7376E199C005A005124E5 /* MCONNTPFetchHeaderOperation.mm in Sources */,
C6E665B81796500B0063F2CF /* ioapi.c in Sources */,
C6BA2BE11705F4E6003F0E9E /* MCOIMAPSession.mm in Sources */,
@@ -3169,7 +3169,7 @@
C6BA2C031705F4E6003F0E9E /* MCOIMAPNamespaceItem.mm in Sources */,
C6BA2C041705F4E6003F0E9E /* MCOIMAPPart.mm in Sources */,
C6BA2C051705F4E6003F0E9E /* MCOIndexSet.mm in Sources */,
- 849189AC18C94986002063A3 /* MCNNTPGroupInfo.cpp in Sources */,
+ 849189AC18C94986002063A3 /* MCNNTPGroupInfo.cc in Sources */,
C6BA2C061705F4E6003F0E9E /* MCOAbstractMessageRendererCallback.mm in Sources */,
C6BA2C071705F4E6003F0E9E /* MCORange.mm in Sources */,
C63D316317C92D8300A4D993 /* MCOIMAPIdentity.mm in Sources */,
@@ -3181,7 +3181,7 @@
C6BA2C0C1705F4E6003F0E9E /* MCOIMAPFetchContentOperation.mm in Sources */,
C6BA2C0D1705F4E6003F0E9E /* MCOIMAPSearchOperation.mm in Sources */,
C6BA2C0E1705F4E6003F0E9E /* MCOIMAPIdleOperation.mm in Sources */,
- 849189A818C9477F002063A3 /* MCNNTPMessageInfo.cpp in Sources */,
+ 849189A818C9477F002063A3 /* MCNNTPMessageInfo.cc in Sources */,
C6BA2C0F1705F4E6003F0E9E /* MCOIMAPFetchNamespaceOperation.mm in Sources */,
C6BA2C101705F4E6003F0E9E /* MCOIMAPIdentityOperation.mm in Sources */,
C6BA2C111705F4E6003F0E9E /* MCOIMAPCapabilityOperation.mm in Sources */,
@@ -3199,7 +3199,7 @@
C6A81BDB1706903E00882C15 /* MCOPOPFetchHeaderOperation.mm in Sources */,
C608167C177635D2001F1018 /* MCIMAPDisconnectOperation.cc in Sources */,
C6A81BDF1706904800882C15 /* MCOPOPFetchMessageOperation.mm in Sources */,
- 84D73731199BF704005124E5 /* MCNNTPOperation.cpp in Sources */,
+ 84D73731199BF704005124E5 /* MCNNTPOperation.cc in Sources */,
C6A81BE31706905600882C15 /* MCOPOPOperation.mm in Sources */,
C6A81BE71706906D00882C15 /* MCOPOPFetchMessagesOperation.mm in Sources */,
C6A81C011707CEE600882C15 /* MCOPOPMessageInfo.mm in Sources */,
@@ -3227,7 +3227,7 @@
BD63713C177DFF080094121B /* MCLibetpan.cc in Sources */,
DAACAD5217886807000B4517 /* MCHTMLRendererIMAPDataCallback.cc in Sources */,
DA89896E178A47D200F6D90A /* MCOIMAPMessageRenderingOperation.mm in Sources */,
- 84D73772199C007E005124E5 /* MCONNTPFetchMessageOperation.mm in Sources */,
+ 84D73772199C007E005124E5 /* MCONNTPFetchArticleOperation.mm in Sources */,
4B3C1BE317ABFF91008BBF4C /* MCOIMAPQuotaOperation.mm in Sources */,
4B3C1BE517AC0176008BBF4C /* MCIMAPQuotaOperation.cc in Sources */,
);
diff --git a/src/async/nntp/MCAsyncNNTP.h b/src/async/nntp/MCAsyncNNTP.h
index e96788ca..56509ff8 100644
--- a/src/async/nntp/MCAsyncNNTP.h
+++ b/src/async/nntp/MCAsyncNNTP.h
@@ -13,8 +13,8 @@
#include <MailCore/MCNNTPAsyncSession.h>
#include <MailCore/MCNNTPOperation.h>
#include <MailCore/MCNNTPFetchHeaderOperation.h>
-#include <MailCore/MCNNTPFetchMessageOperation.h>
-#include <MailCore/MCNNTPFetchMessagesOperation.h>
+#include <MailCore/MCNNTPFetchArticleOperation.h>
+#include <MailCore/MCNNTPFetchArticlesOperation.h>
#include <MailCore/MCNNTPListNewsgroupsOperation.h>
#include <MailCore/MCNNTPOperationCallback.h>
diff --git a/src/async/nntp/MCNNTPAsyncSession.cpp b/src/async/nntp/MCNNTPAsyncSession.cc
index ba3b630b..84b5f318 100644
--- a/src/async/nntp/MCNNTPAsyncSession.cpp
+++ b/src/async/nntp/MCNNTPAsyncSession.cc
@@ -10,8 +10,8 @@
#include "MCNNTP.h"
#include "MCNNTPFetchHeaderOperation.h"
-#include "MCNNTPFetchMessageOperation.h"
-#include "MCNNTPFetchMessagesOperation.h"
+#include "MCNNTPFetchArticleOperation.h"
+#include "MCNNTPFetchArticlesOperation.h"
#include "MCNNTPListNewsgroupsOperation.h"
#include "MCNNTPCheckAccountOperation.h"
#include "MCNNTPDisconnectOperation.h"
@@ -153,32 +153,33 @@ bool NNTPAsyncSession::isCheckCertificateEnabled()
return mSession->isCheckCertificateEnabled();
}
-NNTPFetchMessagesOperation * NNTPAsyncSession::fetchMessagesOperation(String * group)
+MCNNTPFetchArticlesOperation * NNTPAsyncSession::fetchArticlesOperation(String * group)
{
- NNTPFetchMessagesOperation * op = new NNTPFetchMessagesOperation();
+ MCNNTPFetchArticlesOperation * op = new MCNNTPFetchArticlesOperation();
op->setSession(this);
op->setGroupName(group);
op->autorelease();
return op;
}
-NNTPFetchHeaderOperation * NNTPAsyncSession::fetchHeaderOperation(unsigned int index)
+NNTPFetchHeaderOperation * NNTPAsyncSession::fetchHeaderOperation(String * groupName, unsigned int index)
{
NNTPFetchHeaderOperation * op = new NNTPFetchHeaderOperation();
op->setSession(this);
+ op->setGroupName(groupName);
op->setMessageIndex(index);
op->autorelease();
return op;
}
-NNTPFetchHeaderOperation * NNTPAsyncSession::fetchHeaderOperation(NNTPMessageInfo * msg)
+NNTPFetchHeaderOperation * NNTPAsyncSession::fetchHeaderOperation(String * groupName, NNTPMessageInfo * msg)
{
- return fetchHeaderOperation(msg->index());
+ return fetchHeaderOperation(groupName, msg->index());
}
-NNTPFetchMessageOperation * NNTPAsyncSession::fetchArticleOperation(String * groupName, unsigned int index)
+NNTPFetchArticleOperation * NNTPAsyncSession::fetchArticleOperation(String * groupName, unsigned int index)
{
- NNTPFetchMessageOperation * op = new NNTPFetchMessageOperation();
+ NNTPFetchArticleOperation * op = new NNTPFetchArticleOperation();
op->setSession(this);
op->setGroupName(groupName);
op->setMessageIndex(index);
@@ -186,7 +187,7 @@ NNTPFetchMessageOperation * NNTPAsyncSession::fetchArticleOperation(String * gro
return op;
}
-NNTPFetchMessageOperation * NNTPAsyncSession::fetchArticleOperation(String *groupName, NNTPMessageInfo * msg)
+NNTPFetchArticleOperation * NNTPAsyncSession::fetchArticleOperation(String *groupName, NNTPMessageInfo * msg)
{
return fetchArticleOperation(groupName, msg->index());
}
diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h
index 9c214b93..501985bc 100644
--- a/src/async/nntp/MCNNTPAsyncSession.h
+++ b/src/async/nntp/MCNNTPAsyncSession.h
@@ -12,8 +12,8 @@ namespace mailcore {
class NNTPMessageInfo;
class NNTPSession;
class NNTPFetchHeaderOperation;
- class NNTPFetchMessageOperation;
- class NNTPFetchMessagesOperation;
+ class NNTPFetchArticleOperation;
+ class MCNNTPFetchArticlesOperation;
class NNTPListNewsgroupsOperation;
class NNTPOperationQueueCallback;
class NNTPConnectionLogger;
@@ -52,13 +52,13 @@ namespace mailcore {
virtual dispatch_queue_t dispatchQueue();
#endif
- virtual NNTPFetchMessagesOperation * fetchMessagesOperation(String * group);
+ virtual MCNNTPFetchArticlesOperation * fetchArticlesOperation(String * group);
- virtual NNTPFetchHeaderOperation * fetchHeaderOperation(unsigned int index);
- virtual NNTPFetchHeaderOperation * fetchHeaderOperation(NNTPMessageInfo * msg);
+ virtual NNTPFetchHeaderOperation * fetchHeaderOperation(String * groupName, unsigned int index);
+ virtual NNTPFetchHeaderOperation * fetchHeaderOperation(String * groupName, NNTPMessageInfo * msg);
- virtual NNTPFetchMessageOperation * fetchArticleOperation(String *groupName, unsigned int index);
- virtual NNTPFetchMessageOperation * fetchArticleOperation(String *groupName, NNTPMessageInfo * msg);
+ virtual NNTPFetchArticleOperation * fetchArticleOperation(String *groupName, unsigned int index);
+ virtual NNTPFetchArticleOperation * fetchArticleOperation(String *groupName, NNTPMessageInfo * msg);
virtual NNTPListNewsgroupsOperation * listAllNewsgroupsOperation();
virtual NNTPListNewsgroupsOperation * listSubscribedNewsgroupsOperation();
diff --git a/src/async/nntp/MCNNTPCheckAccountOperation.cpp b/src/async/nntp/MCNNTPCheckAccountOperation.cc
index 29b050f0..29b050f0 100644
--- a/src/async/nntp/MCNNTPCheckAccountOperation.cpp
+++ b/src/async/nntp/MCNNTPCheckAccountOperation.cc
diff --git a/src/async/nntp/MCNNTPDisconnectOperation.cpp b/src/async/nntp/MCNNTPDisconnectOperation.cc
index d269904a..d269904a 100644
--- a/src/async/nntp/MCNNTPDisconnectOperation.cpp
+++ b/src/async/nntp/MCNNTPDisconnectOperation.cc
diff --git a/src/async/nntp/MCNNTPFetchMessageOperation.cpp b/src/async/nntp/MCNNTPFetchArticleOperation.cc
index 2fe02f37..a12f346f 100644
--- a/src/async/nntp/MCNNTPFetchMessageOperation.cpp
+++ b/src/async/nntp/MCNNTPFetchArticleOperation.cc
@@ -1,53 +1,53 @@
//
-// MCNNTPFetchMessagesOperation.cpp
+// MCMCNNTPFetchArticlesOperation.cpp
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
// Copyright (c) 2014 MailCore. All rights reserved.
//
-#include "MCNNTPFetchMessageOperation.h"
+#include "MCNNTPFetchArticleOperation.h"
#include "MCNNTPAsyncSession.h"
#include "MCNNTPSession.h"
using namespace mailcore;
-NNTPFetchMessageOperation::NNTPFetchMessageOperation()
+NNTPFetchArticleOperation::NNTPFetchArticleOperation()
{
mMessageIndex = 0;
mData = NULL;
}
-NNTPFetchMessageOperation::~NNTPFetchMessageOperation()
+NNTPFetchArticleOperation::~NNTPFetchArticleOperation()
{
MC_SAFE_RELEASE(mData);
}
-void NNTPFetchMessageOperation::setGroupName(String * groupName) {
+void NNTPFetchArticleOperation::setGroupName(String * groupName) {
MC_SAFE_REPLACE_COPY(String, mGroupName, groupName);
}
-String * NNTPFetchMessageOperation::groupName() {
+String * NNTPFetchArticleOperation::groupName() {
return mGroupName;
}
-void NNTPFetchMessageOperation::setMessageIndex(unsigned int messageIndex)
+void NNTPFetchArticleOperation::setMessageIndex(unsigned int messageIndex)
{
mMessageIndex = messageIndex;
}
-unsigned int NNTPFetchMessageOperation::messageIndex()
+unsigned int NNTPFetchArticleOperation::messageIndex()
{
return mMessageIndex;
}
-Data * NNTPFetchMessageOperation::data()
+Data * NNTPFetchArticleOperation::data()
{
return mData;
}
-void NNTPFetchMessageOperation::main()
+void NNTPFetchArticleOperation::main()
{
ErrorCode error;
mData = session()->session()->fetchArticle(mGroupName, mMessageIndex, this, &error);
diff --git a/src/async/nntp/MCNNTPFetchMessageOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h
index d038a62f..f43799a9 100644
--- a/src/async/nntp/MCNNTPFetchMessageOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticleOperation.h
@@ -1,5 +1,5 @@
//
-// MCNNTPFetchMessagesOperation.h
+// MCMCNNTPFetchArticlesOperation.h
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
@@ -15,10 +15,10 @@
#ifdef __cplusplus
namespace mailcore {
- class NNTPFetchMessageOperation : public NNTPOperation {
+ class NNTPFetchArticleOperation : public NNTPOperation {
public:
- NNTPFetchMessageOperation();
- virtual ~NNTPFetchMessageOperation();
+ NNTPFetchArticleOperation();
+ virtual ~NNTPFetchArticleOperation();
virtual void setGroupName(String * groupName);
virtual String * groupName();
diff --git a/src/async/nntp/MCNNTPFetchMessagesOperation.cpp b/src/async/nntp/MCNNTPFetchArticlesOperation.cc
index 0e0fc239..41e3281f 100644
--- a/src/async/nntp/MCNNTPFetchMessagesOperation.cpp
+++ b/src/async/nntp/MCNNTPFetchArticlesOperation.cc
@@ -1,46 +1,46 @@
//
-// MCNNTPFetchMessagesOperation.cpp
+// MCMCNNTPFetchArticlesOperation.cpp
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
// Copyright (c) 2014 MailCore. All rights reserved.
//
-#include "MCNNTPFetchMessagesOperation.h"
+#include "MCNNTPFetchArticlesOperation.h"
#include "MCNNTPAsyncSession.h"
#include "MCNNTPSession.h"
using namespace mailcore;
-NNTPFetchMessagesOperation::NNTPFetchMessagesOperation()
+MCNNTPFetchArticlesOperation::MCNNTPFetchArticlesOperation()
{
mGroupName = NULL;
mMessages = NULL;
}
-NNTPFetchMessagesOperation::~NNTPFetchMessagesOperation()
+MCNNTPFetchArticlesOperation::~MCNNTPFetchArticlesOperation()
{
MC_SAFE_RELEASE(mGroupName);
MC_SAFE_RELEASE(mMessages);
}
-void NNTPFetchMessagesOperation::setGroupName(String * groupname)
+void MCNNTPFetchArticlesOperation::setGroupName(String * groupname)
{
MC_SAFE_REPLACE_COPY(String, mGroupName, groupname);
}
-String * NNTPFetchMessagesOperation::groupName()
+String * MCNNTPFetchArticlesOperation::groupName()
{
return mGroupName;
}
-Array * NNTPFetchMessagesOperation::messages()
+Array * MCNNTPFetchArticlesOperation::messages()
{
return mMessages;
}
-void NNTPFetchMessagesOperation::main()
+void MCNNTPFetchArticlesOperation::main()
{
ErrorCode error;
mMessages = session()->session()->fetchArticles(mGroupName, &error);
diff --git a/src/async/nntp/MCNNTPFetchMessagesOperation.h b/src/async/nntp/MCNNTPFetchArticlesOperation.h
index 91390c1f..9fe6fd1b 100644
--- a/src/async/nntp/MCNNTPFetchMessagesOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticlesOperation.h
@@ -1,5 +1,5 @@
//
-// MCNNTPFetchMessagesOperation.h
+// MCMCNNTPFetchArticlesOperation.h
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
@@ -16,10 +16,10 @@
namespace mailcore {
- class NNTPFetchMessagesOperation : public NNTPOperation {
+ class MCNNTPFetchArticlesOperation : public NNTPOperation {
public:
- NNTPFetchMessagesOperation();
- virtual ~NNTPFetchMessagesOperation();
+ MCNNTPFetchArticlesOperation();
+ virtual ~MCNNTPFetchArticlesOperation();
virtual void setGroupName(String * groupName);
virtual String * groupName();
diff --git a/src/async/nntp/MCNNTPFetchHeaderOperation.cpp b/src/async/nntp/MCNNTPFetchHeaderOperation.cc
index ea374527..386dc142 100644
--- a/src/async/nntp/MCNNTPFetchHeaderOperation.cpp
+++ b/src/async/nntp/MCNNTPFetchHeaderOperation.cc
@@ -25,6 +25,14 @@ NNTPFetchHeaderOperation::~NNTPFetchHeaderOperation()
MC_SAFE_RELEASE(mHeader);
}
+void NNTPFetchHeaderOperation::setGroupName(String * groupName) {
+ MC_SAFE_REPLACE_COPY(String, mGroupName, groupName);
+}
+
+String * NNTPFetchHeaderOperation::groupName() {
+ return mGroupName;
+}
+
void NNTPFetchHeaderOperation::setMessageIndex(unsigned int messageIndex)
{
mMessageIndex = messageIndex;
@@ -43,7 +51,7 @@ MessageHeader * NNTPFetchHeaderOperation::header()
void NNTPFetchHeaderOperation::main()
{
ErrorCode error;
- mHeader = session()->session()->fetchHeader(mMessageIndex, &error);
+ mHeader = session()->session()->fetchHeader(mGroupName, mMessageIndex, &error);
if (mHeader != NULL) {
mHeader->retain();
}
diff --git a/src/async/nntp/MCNNTPFetchHeaderOperation.h b/src/async/nntp/MCNNTPFetchHeaderOperation.h
index 91ded8ee..97b12b05 100644
--- a/src/async/nntp/MCNNTPFetchHeaderOperation.h
+++ b/src/async/nntp/MCNNTPFetchHeaderOperation.h
@@ -23,6 +23,9 @@ namespace mailcore {
NNTPFetchHeaderOperation();
virtual ~NNTPFetchHeaderOperation();
+ virtual void setGroupName(String * groupName);
+ virtual String * groupName();
+
virtual void setMessageIndex(unsigned int messageIndex);
virtual unsigned int messageIndex();
@@ -32,6 +35,7 @@ namespace mailcore {
virtual void main();
private:
+ String * mGroupName;
unsigned int mMessageIndex;
MessageHeader * mHeader;
diff --git a/src/async/nntp/MCNNTPListNewsgroupsOperation.cpp b/src/async/nntp/MCNNTPListNewsgroupsOperation.cc
index 253b38d0..253b38d0 100644
--- a/src/async/nntp/MCNNTPListNewsgroupsOperation.cpp
+++ b/src/async/nntp/MCNNTPListNewsgroupsOperation.cc
diff --git a/src/async/nntp/MCNNTPOperation.cpp b/src/async/nntp/MCNNTPOperation.cc
index 3368ba0e..3368ba0e 100644
--- a/src/async/nntp/MCNNTPOperation.cpp
+++ b/src/async/nntp/MCNNTPOperation.cc
diff --git a/src/core/nntp/MCNNTPGroupInfo.cpp b/src/core/nntp/MCNNTPGroupInfo.cc
index 0f941348..0f941348 100644
--- a/src/core/nntp/MCNNTPGroupInfo.cpp
+++ b/src/core/nntp/MCNNTPGroupInfo.cc
diff --git a/src/core/nntp/MCNNTPMessageInfo.cpp b/src/core/nntp/MCNNTPMessageInfo.cc
index 474de9b3..474de9b3 100644
--- a/src/core/nntp/MCNNTPMessageInfo.cpp
+++ b/src/core/nntp/MCNNTPMessageInfo.cc
diff --git a/src/core/nntp/MCNNTPSession.cpp b/src/core/nntp/MCNNTPSession.cc
index bad1ebb4..a31abb1d 100644
--- a/src/core/nntp/MCNNTPSession.cpp
+++ b/src/core/nntp/MCNNTPSession.cc
@@ -401,7 +401,7 @@ Array * NNTPSession::listSubscribedNewsgroups(ErrorCode * pError)
return result;
}
-MessageHeader * NNTPSession::fetchHeader(unsigned int index, ErrorCode * pError)
+MessageHeader * NNTPSession::fetchHeader(String *groupName, unsigned int index, ErrorCode * pError)
{
int r;
char * content;
@@ -409,8 +409,14 @@ MessageHeader * NNTPSession::fetchHeader(unsigned int index, ErrorCode * pError)
MCLog("fetch header at index %u", index);
loginIfNeeded(pError);
- if (* pError != ErrorNone)
+ if (* pError != ErrorNone) {
+ return NULL;
+ }
+
+ selectGroup(groupName, pError);
+ if (* pError != ErrorNone) {
return NULL;
+ }
r = newsnntp_head(mNNTP, index, &content, &content_len);
if (r != NEWSNNTP_NO_ERROR) {
@@ -431,9 +437,9 @@ MessageHeader * NNTPSession::fetchHeader(unsigned int index, ErrorCode * pError)
return result;
}
-MessageHeader * NNTPSession::fetchHeader(NNTPMessageInfo * msg, ErrorCode * pError)
+MessageHeader * NNTPSession::fetchHeader(String *groupName, NNTPMessageInfo * msg, ErrorCode * pError)
{
- return fetchHeader(msg->index(), pError);
+ return fetchHeader(groupName, msg->index(), pError);
}
Data * NNTPSession::fetchArticle(String *groupName, unsigned int index, NNTPProgressCallback * callback, ErrorCode * pError)
diff --git a/src/core/nntp/MCNNTPSession.h b/src/core/nntp/MCNNTPSession.h
index 6f8bf73a..d166354c 100644
--- a/src/core/nntp/MCNNTPSession.h
+++ b/src/core/nntp/MCNNTPSession.h
@@ -48,8 +48,8 @@ namespace mailcore {
virtual Array * /* NNTPGroupInfo */ listAllNewsgroups(ErrorCode * pError);
virtual Array * listSubscribedNewsgroups(ErrorCode * pError);
- virtual MessageHeader * fetchHeader(unsigned int index, ErrorCode * pError);
- virtual MessageHeader * fetchHeader(NNTPMessageInfo * msg, ErrorCode * pError);
+ virtual MessageHeader * fetchHeader(String *groupName, unsigned int index, ErrorCode * pError);
+ virtual MessageHeader * fetchHeader(String *groupName, NNTPMessageInfo * msg, ErrorCode * pError);
virtual Array * /* NNTPMessageInfo */ fetchArticles(String * groupname, ErrorCode * pError);
diff --git a/src/objc/nntp/MCONNTP.h b/src/objc/nntp/MCONNTP.h
index f96f296c..20eb035b 100644
--- a/src/objc/nntp/MCONNTP.h
+++ b/src/objc/nntp/MCONNTP.h
@@ -13,11 +13,10 @@
#include <MailCore/MCONNTPSession.h>
#include <MailCore/MCONNTPOperation.h>
#include <MailCore/MCONNTPFetchHeaderOperation.h>
-#include <MailCore/MCONNTPFetchMessageOperation.h>
-#include <MailCore/MCONNTPFetchMessagesOperation.h>
+#include <MailCore/MCONNTPFetchArticleOperation.h>
+#include <MailCore/MCONNTPFetchArticlesOperation.h>
#include <MailCore/MCONNTPListNewsgroupsOperation.h>
#include <MailCore/MCONNTPMessageInfo.h>
#include <MailCore/MCONNTPGroupInfo.h>
-#include <MailCore/MCONNTPOperationCallback.h>
#endif
diff --git a/src/objc/nntp/MCONNTPFetchMessageOperation.h b/src/objc/nntp/MCONNTPFetchArticleOperation.h
index c0cfbf68..c72351d9 100644
--- a/src/objc/nntp/MCONNTPFetchMessageOperation.h
+++ b/src/objc/nntp/MCONNTPFetchArticleOperation.h
@@ -1,5 +1,5 @@
//
-// MCONNTPFetchMessageOperation.h
+// MCONNTPFetchArticleOperation.h
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
@@ -17,7 +17,7 @@
typedef void (^MCONNTPOperationProgressBlock)(unsigned int current, unsigned int maximum);
-@interface MCONNTPFetchMessageOperation : MCONNTPOperation
+@interface MCONNTPFetchArticleOperation : MCONNTPOperation
/** This block will be called as data is downloaded from the network */
@property (nonatomic, copy) MCONNTPOperationProgressBlock progress;
diff --git a/src/objc/nntp/MCONNTPFetchMessageOperation.mm b/src/objc/nntp/MCONNTPFetchArticleOperation.mm
index 6de52de3..1d43d1b6 100644
--- a/src/objc/nntp/MCONNTPFetchMessageOperation.mm
+++ b/src/objc/nntp/MCONNTPFetchArticleOperation.mm
@@ -1,35 +1,35 @@
//
-// MCONNTPFetchMessageOperation.m
+// MCONNTPFetchArticleOperation.m
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
// Copyright (c) 2014 MailCore. All rights reserved.
//
-#import "MCONNTPFetchMessageOperation.h"
+#import "MCONNTPFetchArticleOperation.h"
#import "MCAsyncNNTP.h"
#import "MCOUtils.h"
#import "MCOOperation+Private.h"
-#define nativeType mailcore::NNTPFetchMessageOperation
+#define nativeType mailcore::NNTPFetchArticleOperation
typedef void (^CompletionType)(NSError *error, NSData * messageData);
-@interface MCONNTPFetchMessageOperation ()
+@interface MCONNTPFetchArticleOperation ()
- (void) bodyProgress:(unsigned int)current maximum:(unsigned int)maximum;
@end
-class MCONNTPFetchMessageOperationCallback : public mailcore::NNTPOperationCallback {
+class MCONNTPFetchArticleOperationCallback : public mailcore::NNTPOperationCallback {
public:
- MCONNTPFetchMessageOperationCallback(MCONNTPFetchMessageOperation * op)
+ MCONNTPFetchArticleOperationCallback(MCONNTPFetchArticleOperation * op)
{
mOperation = op;
}
- virtual ~MCONNTPFetchMessageOperationCallback()
+ virtual ~MCONNTPFetchArticleOperationCallback()
{
}
@@ -38,12 +38,12 @@ public:
}
private:
- MCONNTPFetchMessageOperation * mOperation;
+ MCONNTPFetchArticleOperation * mOperation;
};
-@implementation MCONNTPFetchMessageOperation {
+@implementation MCONNTPFetchArticleOperation {
CompletionType _completionBlock;
- MCONNTPFetchMessageOperationCallback * _popCallback;
+ MCONNTPFetchArticleOperationCallback * _popCallback;
MCONNTPOperationProgressBlock _progress;
}
@@ -64,7 +64,7 @@ private:
{
self = [super initWithMCOperation:op];
- _popCallback = new MCONNTPFetchMessageOperationCallback(self);
+ _popCallback = new MCONNTPFetchArticleOperationCallback(self);
((mailcore::NNTPOperation *) op)->setNNTPCallback(_popCallback);
return self;
diff --git a/src/objc/nntp/MCONNTPFetchMessagesOperation.h b/src/objc/nntp/MCONNTPFetchArticlesOperation.h
index 57159ad0..bd28d99d 100644
--- a/src/objc/nntp/MCONNTPFetchMessagesOperation.h
+++ b/src/objc/nntp/MCONNTPFetchArticlesOperation.h
@@ -1,5 +1,5 @@
//
-// MCONNTPFetchMessagesOperation.h
+// MCONNTPFetchArticlesOperation.h
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
@@ -15,7 +15,7 @@
/** This is an asynchronous operation that will fetch the list of a messages on the NNTP3 account. */
-@interface MCONNTPFetchMessagesOperation : MCONNTPOperation
+@interface MCONNTPFetchArticlesOperation : MCONNTPOperation
/**
Starts the asynchronous fetch operation.
diff --git a/src/objc/nntp/MCONNTPFetchMessagesOperation.mm b/src/objc/nntp/MCONNTPFetchArticlesOperation.mm
index 338af1fa..b7c4670e 100644
--- a/src/objc/nntp/MCONNTPFetchMessagesOperation.mm
+++ b/src/objc/nntp/MCONNTPFetchArticlesOperation.mm
@@ -1,12 +1,12 @@
//
-// MCONNTPFetchMessagesOperation.m
+// MCONNTPFetchArticlesOperation.m
// mailcore2
//
// Created by Robert Widmann on 8/13/14.
// Copyright (c) 2014 MailCore. All rights reserved.
//
-#import "MCONNTPFetchMessagesOperation.h"
+#import "MCONNTPFetchArticlesOperation.h"
#include "MCAsyncNNTP.h"
@@ -15,11 +15,11 @@
typedef void (^CompletionType)(NSError *error, NSArray * messages);
-@implementation MCONNTPFetchMessagesOperation {
+@implementation MCONNTPFetchArticlesOperation {
CompletionType _completionBlock;
}
-#define nativeType mailcore::NNTPFetchMessagesOperation
+#define nativeType mailcore::MCNNTPFetchArticlesOperation
+ (void) load
{
diff --git a/src/objc/nntp/MCONNTPMessageInfo.h b/src/objc/nntp/MCONNTPMessageInfo.h
index 0b62547a..d4f06b04 100644
--- a/src/objc/nntp/MCONNTPMessageInfo.h
+++ b/src/objc/nntp/MCONNTPMessageInfo.h
@@ -12,7 +12,7 @@
#import <Foundation/Foundation.h>
-/** This is information of a message fetched by MCONNTPFetchMessagesOperation.*/
+/** This is information of a message fetched by MCONNTPFetchArticlesOperation.*/
@interface MCONNTPMessageInfo : NSObject <NSCopying>
diff --git a/src/objc/nntp/MCONNTPSession.h b/src/objc/nntp/MCONNTPSession.h
index 214e9d9d..6d6ea26f 100644
--- a/src/objc/nntp/MCONNTPSession.h
+++ b/src/objc/nntp/MCONNTPSession.h
@@ -16,9 +16,9 @@
#import <MailCore/MCOConstants.h>
-@class MCONNTPFetchMessagesOperation;
+@class MCONNTPFetchArticlesOperation;
@class MCONNTPFetchHeaderOperation;
-@class MCONNTPFetchMessageOperation;
+@class MCONNTPFetchArticleOperation;
@class MCONNTPListNewsgroupsOperation;
@class MCONNTPOperation;
@@ -68,33 +68,33 @@
/**
Returns an operation that will fetch the list of messages.
- MCONNTPFetchMessagesOperation * op = [session fetchMessagesOperation];
+ MCONNTPFetchArticlesOperation * op = [session fetchMessagesOperation];
[op start:^(NSError * error, NSArray * messages) {
// messages is an array of MCONNTPMessageInfo
// [info index] can be used as reference for a given message in the other operations.
}];
*/
-- (MCONNTPFetchMessagesOperation *) fetchMessagesOperation:(NSString *)group;
+- (MCONNTPFetchArticlesOperation *) fetchArticlesOperation:(NSString *)group;
/**
Returns an operation that will fetch the header of the given message.
- MCONNTPFetchHeaderOperation * op = [session fetchHeaderOperationWithIndex:idx];
+ MCONNTPFetchHeaderOperation * op = [session fetchHeaderOperationWithIndex:idx inGroup:@"Group"];
[op start:^(NSError * error, MCOMessageHeader * header) {
// header is the parsed header of the message.
}];
*/
-- (MCONNTPFetchHeaderOperation *) fetchHeaderOperationWithIndex:(unsigned int)index;
+- (MCONNTPFetchHeaderOperation *) fetchHeaderOperationWithIndex:(unsigned int)index inGroup:(NSString *)group;
/**
Returns an operation that will fetch the content of the given message.
- MCONNTPFetchMessageOperation * op = [session fetchMessageOperationWithIndex:idx inGroup:@"Group"];
+ MCONNTPFetchArticleOperation * op = [session fetchMessageOperationWithIndex:idx inGroup:@"Group"];
[op start:^(NSError * error, NSData * messageData) {
// messageData is the RFC 822 formatted message data.
}];
*/
-- (MCONNTPFetchMessageOperation *) fetchArticleOperationWithIndex:(unsigned int)index inGroup:(NSString *)group;
+- (MCONNTPFetchArticleOperation *) fetchArticleOperationWithIndex:(unsigned int)index inGroup:(NSString *)group;
/**
Returns an operation that will list all available newsgroups.
diff --git a/src/objc/nntp/MCONNTPSession.mm b/src/objc/nntp/MCONNTPSession.mm
index eb7ce4ab..e661eb65 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 "MCONNTPFetchMessagesOperation.h"
+#import "MCONNTPFetchArticlesOperation.h"
#import "MCONNTPOperation+Private.h"
using namespace mailcore;
@@ -121,21 +121,21 @@ MCO_OBJC_SYNTHESIZE_SCALAR(dispatch_queue_t, dispatch_queue_t, setDispatchQueue,
return result;
}
-- (MCONNTPFetchMessagesOperation *) fetchMessagesOperation:(NSString *)group
+- (MCONNTPFetchArticlesOperation *) fetchArticlesOperation:(NSString *)group
{
- mailcore::NNTPFetchMessagesOperation * coreOp = MCO_NATIVE_INSTANCE->fetchMessagesOperation(MCO_FROM_OBJC(mailcore::String, group));
+ mailcore::MCNNTPFetchArticlesOperation * coreOp = MCO_NATIVE_INSTANCE->fetchArticlesOperation(MCO_FROM_OBJC(mailcore::String, group));
return MCO_TO_OBJC_OP(coreOp);
}
-- (MCONNTPFetchHeaderOperation *) fetchHeaderOperationWithIndex:(unsigned int)index
+- (MCONNTPFetchHeaderOperation *) fetchHeaderOperationWithIndex:(unsigned int)index inGroup:(NSString *)group
{
- mailcore::NNTPFetchHeaderOperation * coreOp = MCO_NATIVE_INSTANCE->fetchHeaderOperation(index);
+ mailcore::NNTPFetchHeaderOperation * coreOp = MCO_NATIVE_INSTANCE->fetchHeaderOperation(MCO_FROM_OBJC(mailcore::String, group), index);
return MCO_TO_OBJC_OP(coreOp);
}
-- (MCONNTPFetchMessageOperation *) fetchArticleOperationWithIndex:(unsigned int)index inGroup:(NSString *)group
+- (MCONNTPFetchArticleOperation *) fetchArticleOperationWithIndex:(unsigned int)index inGroup:(NSString *)group
{
- mailcore::NNTPFetchMessageOperation * coreOp = MCO_NATIVE_INSTANCE->fetchArticleOperation(MCO_FROM_OBJC(mailcore::String, group), index);
+ mailcore::NNTPFetchArticleOperation * coreOp = MCO_NATIVE_INSTANCE->fetchArticleOperation(MCO_FROM_OBJC(mailcore::String, group), index);
return MCO_TO_OBJC_OP(coreOp);
}