From d4ba562710c3d9630bd704e5731e1b234569536c Mon Sep 17 00:00:00 2001
From: Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>
Date: Fri, 1 Mar 2013 23:13:24 +0900
Subject: Implement IndexedList::iterator

It is dangerous to expose internal iterator to the outside, which is
easily misused.
---
 src/SessionSerializer.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/SessionSerializer.cc')

diff --git a/src/SessionSerializer.cc b/src/SessionSerializer.cc
index 45e7b591..d3d16f09 100644
--- a/src/SessionSerializer.cc
+++ b/src/SessionSerializer.cc
@@ -216,9 +216,9 @@ bool SessionSerializer::save(BufferedFile& fp) const
 {
   std::set<a2_gid_t> metainfoCache;
   const DownloadResultList& results = rgman_->getDownloadResults();
-  for(DownloadResultList::SeqType::const_iterator itr = results.begin(),
+  for(DownloadResultList::const_iterator itr = results.begin(),
         eoi = results.end(); itr != eoi; ++itr) {
-    const SharedHandle<DownloadResult>& dr = (*itr).second;
+    const SharedHandle<DownloadResult>& dr = *itr;
     if(dr->result == error_code::FINISHED ||
        dr->result == error_code::REMOVED) {
       if(dr->option->getAsBool(PREF_FORCE_SAVE)) {
@@ -246,9 +246,9 @@ bool SessionSerializer::save(BufferedFile& fp) const
   {
     // Save active downloads.
     const RequestGroupList& groups = rgman_->getRequestGroups();
-    for(RequestGroupList::SeqType::const_iterator itr = groups.begin(),
+    for(RequestGroupList::const_iterator itr = groups.begin(),
           eoi = groups.end(); itr != eoi; ++itr) {
-      const SharedHandle<RequestGroup>& rg = (*itr).second;
+      const SharedHandle<RequestGroup>& rg = *itr;
       SharedHandle<DownloadResult> dr = rg->createDownloadResult();
       bool stopped = dr->result == error_code::FINISHED ||
         dr->result == error_code::REMOVED;
@@ -262,9 +262,9 @@ bool SessionSerializer::save(BufferedFile& fp) const
   }
   if(saveWaiting_) {
     const RequestGroupList& groups = rgman_->getReservedGroups();
-    for(RequestGroupList::SeqType::const_iterator itr = groups.begin(),
+    for(RequestGroupList::const_iterator itr = groups.begin(),
           eoi = groups.end(); itr != eoi; ++itr) {
-      const SharedHandle<RequestGroup>& rg = (*itr).second;
+      const SharedHandle<RequestGroup>& rg = *itr;
       SharedHandle<DownloadResult> result = rg->createDownloadResult();
       if(!writeDownloadResult(fp, metainfoCache, result)) {
         return false;
-- 
cgit