Remove ArticleInfo

5 files changed, 12 insertions, 26 deletions

diff --git a/src/async/nntp/MCNNTPAsyncSession.cc b/src/async/nntp/MCNNTPAsyncSession.cc
index fec7b31b..833bf4d5 100644
--- a/src/async/nntp/MCNNTPAsyncSession.cc
+++ b/src/async/nntp/MCNNTPAsyncSession.cc
@@ -172,11 +172,6 @@ NNTPFetchHeaderOperation * NNTPAsyncSession::fetchHeaderOperation(String * group
     return op;
 }
 
-NNTPFetchHeaderOperation * NNTPAsyncSession::fetchHeaderOperation(String * groupName, NNTPArticleInfo * msg) 
-{
-    return fetchHeaderOperation(groupName, msg->index());
-}
-
 NNTPFetchArticleOperation * NNTPAsyncSession::fetchArticleOperation(String * groupName, unsigned int index)
 {
     NNTPFetchArticleOperation * op = new NNTPFetchArticleOperation();
@@ -187,12 +182,6 @@ NNTPFetchArticleOperation * NNTPAsyncSession::fetchArticleOperation(String * gro
     return op;
 }
 
-NNTPFetchArticleOperation * NNTPAsyncSession::fetchArticleOperation(String *groupName, NNTPArticleInfo * msg)
-{
-    return fetchArticleOperation(groupName, msg->index());
-}
-
-
 NNTPListNewsgroupsOperation * NNTPAsyncSession::listAllNewsgroupsOperation()
 {
     NNTPListNewsgroupsOperation * op = new NNTPListNewsgroupsOperation();
diff --git a/src/async/nntp/MCNNTPAsyncSession.h b/src/async/nntp/MCNNTPAsyncSession.h
index 90557326..66f0cc0d 100644
--- a/src/async/nntp/MCNNTPAsyncSession.h
+++ b/src/async/nntp/MCNNTPAsyncSession.h
@@ -9,7 +9,6 @@
 namespace mailcore {
     
     class NNTPOperation;
-    class NNTPArticleInfo;
     class NNTPSession;
     class NNTPFetchHeaderOperation;
     class NNTPFetchArticleOperation;
@@ -55,10 +54,8 @@ namespace mailcore {
         virtual MCNNTPFetchArticlesOperation * fetchArticlesOperation(String * group);
         
         virtual NNTPFetchHeaderOperation * fetchHeaderOperation(String * groupName, unsigned int index);
-        virtual NNTPFetchHeaderOperation * fetchHeaderOperation(String * groupName, NNTPArticleInfo * msg);
         
         virtual NNTPFetchArticleOperation * fetchArticleOperation(String *groupName, unsigned int index);
-        virtual NNTPFetchArticleOperation * fetchArticleOperation(String *groupName, NNTPArticleInfo * msg);
         
         virtual NNTPListNewsgroupsOperation * listAllNewsgroupsOperation();
         virtual NNTPListNewsgroupsOperation * listSubscribedNewsgroupsOperation();
diff --git a/src/async/nntp/MCNNTPFetchArticleOperation.h b/src/async/nntp/MCNNTPFetchArticleOperation.h
index f43799a9..4f607c4f 100644
--- a/src/async/nntp/MCNNTPFetchArticleOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticleOperation.h
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 MailCore. All rights reserved.
 //
 
-#ifndef MAILCORE_MCNNTPFETCHMESSAGEOPERATION_H
+#ifndef MAILCORE_MCNNTPFETCHARTICLEOPERATION_H
 
-#define MAILCORE_MCNNTPFETCHMESSAGEOPERATION_H
+#define MAILCORE_MCNNTPFETCHARTICLEOPERATION_H
 
 #include <MailCore/MCNNTPOperation.h>
 
diff --git a/src/async/nntp/MCNNTPFetchArticlesOperation.cc b/src/async/nntp/MCNNTPFetchArticlesOperation.cc
index 41e3281f..39446f35 100644
--- a/src/async/nntp/MCNNTPFetchArticlesOperation.cc
+++ b/src/async/nntp/MCNNTPFetchArticlesOperation.cc
@@ -16,13 +16,13 @@ using namespace mailcore;
 MCNNTPFetchArticlesOperation::MCNNTPFetchArticlesOperation()
 {
     mGroupName = NULL;
-    mMessages = NULL;
+    mArticles = NULL;
 }
 
 MCNNTPFetchArticlesOperation::~MCNNTPFetchArticlesOperation()
 {
     MC_SAFE_RELEASE(mGroupName);
-    MC_SAFE_RELEASE(mMessages);
+    MC_SAFE_RELEASE(mArticles);
 }
 
 void MCNNTPFetchArticlesOperation::setGroupName(String * groupname)
@@ -35,15 +35,15 @@ String * MCNNTPFetchArticlesOperation::groupName()
     return mGroupName;
 }
 
-Array * MCNNTPFetchArticlesOperation::messages()
+IndexSet * MCNNTPFetchArticlesOperation::articles()
 {
-    return mMessages;
+    return mArticles;
 }
 
 void MCNNTPFetchArticlesOperation::main()
 {
     ErrorCode error;
-    mMessages = session()->session()->fetchArticles(mGroupName, &error);
+    mArticles = session()->session()->fetchArticles(mGroupName, &error);
     setError(error);
-    MC_SAFE_RETAIN(mMessages);
+    MC_SAFE_RETAIN(mArticles);
 }
diff --git a/src/async/nntp/MCNNTPFetchArticlesOperation.h b/src/async/nntp/MCNNTPFetchArticlesOperation.h
index 28f326ab..fa0037c8 100644
--- a/src/async/nntp/MCNNTPFetchArticlesOperation.h
+++ b/src/async/nntp/MCNNTPFetchArticlesOperation.h
@@ -6,9 +6,9 @@
 //  Copyright (c) 2014 MailCore. All rights reserved.
 //
 
-#ifndef MAILCORE_MCNNTPFETCHMESSAGESOPERATION_H
+#ifndef MAILCORE_MCNNTPFETCHARTICLESOPERATION_H
 
-#define MAILCORE_MCNNTPFETCHMESSAGESOPERATION_H
+#define MAILCORE_MCNNTPFETCHARTICLESOPERATION_H
 
 #include <MailCore/MCNNTPOperation.h>
 
@@ -24,14 +24,14 @@ namespace mailcore {
         virtual void setGroupName(String * groupName);
         virtual String * groupName();
         
-        virtual Array * /* NNTPArticleInfo */ messages();
+        virtual IndexSet * articles();
         
     public: // subclass behavior
         virtual void main();
         
     private:
         String * mGroupName;
-        Array * /* NNTPArticleInfo */ mMessages;
+        IndexSet * mArticles;
     };
     
 }