Bug 1492204 - Part 3: Remove references to char_iterator. r=froydnj

We can just use 'iterator' now that nsWritingIterator is gone.

--HG--
extra : rebase_source : 3f6fbafc9b57ce89afba581b224b3dc2295fa614

netwerk/cookie/nsCookieService.cpp

@@ -2997,7 +2997,6 @@ nsCookieService::ImportCookies(nsIFile *aCookieFile)
   nsAutoCString buffer, baseDomain;
   bool isMore = true;
   int32_t hostIndex, isDomainIndex, pathIndex, secureIndex, expiresIndex, nameIndex, cookieIndex;
-  nsACString::char_iterator iter;
   int32_t numInts;
   int64_t expires;
   bool isDomain, isHttpOnly = false;
@@ -3065,8 +3064,8 @@ nsCookieService::ImportCookies(nsIFile *aCookieFile)
 
     // check the expirytime first - if it's expired, ignore
     // nullstomp the trailing tab, to avoid copying the string
-    buffer.BeginWriting(iter);
-    *(iter += nameIndex - 1) = char(0);
+    auto iter = buffer.BeginWriting() + nameIndex - 1;
+    *iter = char(0);
     numInts = PR_sscanf(buffer.get() + expiresIndex, "%lld", &expires);
     if (numInts != 1 || expires < currentTime) {
       continue;

parser/htmlparser/nsScannerString.cpp

@@ -437,11 +437,11 @@ nsScannerSharedSubstring::MakeMutable()
 
 // private helper function
 static inline
-nsAString::char_iterator&
-copy_multifragment_string( nsScannerIterator& first, const nsScannerIterator& last, nsAString::char_iterator& result )
+nsAString::iterator&
+copy_multifragment_string( nsScannerIterator& first, const nsScannerIterator& last, nsAString::iterator& result )
   {
     typedef nsCharSourceTraits<nsScannerIterator> source_traits;
-    typedef nsCharSinkTraits<nsAString::char_iterator> sink_traits;
+    typedef nsCharSinkTraits<nsAString::iterator> sink_traits;
 
     while ( first != last )
       {

xpcom/ds/IncrementalTokenizer.cpp

@@ -71,7 +71,7 @@ nsresult IncrementalTokenizer::FeedInput(nsIInputStream * aInput, uint32_t aCoun
       return NS_ERROR_OUT_OF_MEMORY;
     }
 
-    nsCString::char_iterator buffer = mInput.BeginWriting() + remainder;
+    auto buffer = mInput.BeginWriting() + remainder;
 
     uint32_t read;
     rv = aInput->Read(buffer, load, &read);

xpcom/io/nsLinebreakConverter.cpp

@@ -463,8 +463,8 @@ nsLinebreakConverter::ConvertStringLineBreaks(nsString& aIoString,
 
   // remember the old buffer in case
   // we blow it away later
-  nsString::char_iterator stringBuf;
-  if (!aIoString.BeginWriting(stringBuf, mozilla::fallible)) {
+  auto stringBuf = aIoString.BeginWriting(mozilla::fallible);
+  if (!stringBuf) {
     return NS_ERROR_OUT_OF_MEMORY;
   }
 

xpcom/string/nsTDependentString.h

@@ -42,7 +42,6 @@ public:
 
   typedef typename base_string_type::comparator_type comparator_type;
 
-  typedef typename base_string_type::char_iterator char_iterator;
   typedef typename base_string_type::const_char_iterator const_char_iterator;
 
   typedef typename base_string_type::index_type index_type;

xpcom/string/nsTDependentSubstring.h

@@ -42,7 +42,6 @@ public:
 
   typedef typename substring_type::comparator_type comparator_type;
 
-  typedef typename substring_type::char_iterator char_iterator;
   typedef typename substring_type::const_char_iterator const_char_iterator;
 
   typedef typename substring_type::index_type index_type;

xpcom/string/nsTString.h

@@ -51,7 +51,6 @@ public:
 
   typedef typename substring_type::comparator_type comparator_type;
 
-  typedef typename substring_type::char_iterator char_iterator;
   typedef typename substring_type::const_char_iterator const_char_iterator;
 
   typedef typename substring_type::index_type index_type;

xpcom/string/nsTStringRepr.h

@@ -112,7 +112,6 @@ public:
 
   typedef nsTStringComparator<char_type> comparator_type;
 
-  typedef char_type* char_iterator; // TODO(erahm): convert all usages to just `iterator`
   typedef const char_type* const_char_iterator;
 
   typedef uint32_t index_type;

xpcom/string/nsTSubstring.h

@@ -327,7 +327,6 @@ public:
 
   typedef typename base_string_type::comparator_type comparator_type;
 
-  typedef typename base_string_type::char_iterator char_iterator;
   typedef typename base_string_type::const_char_iterator const_char_iterator;
 
   typedef typename base_string_type::index_type index_type;
@@ -366,7 +365,7 @@ public:
    * the above paragraph says.
    */
 
-  char_iterator BeginWriting()
+  iterator BeginWriting()
   {
     if (!EnsureMutable()) {
       AllocFailed(base_string_type::mLength);
@@ -375,12 +374,12 @@ public:
     return base_string_type::mData;
   }
 
-  char_iterator BeginWriting(const fallible_t&)
+  iterator BeginWriting(const fallible_t&)
   {
-    return EnsureMutable() ? base_string_type::mData : char_iterator(0);
+    return EnsureMutable() ? base_string_type::mData : iterator(0);
   }
 
-  char_iterator EndWriting()
+  iterator EndWriting()
   {
     if (!EnsureMutable()) {
       AllocFailed(base_string_type::mLength);
@@ -389,27 +388,27 @@ public:
     return base_string_type::mData + base_string_type::mLength;
   }
 
-  char_iterator EndWriting(const fallible_t&)
+  iterator EndWriting(const fallible_t&)
   {
-    return EnsureMutable() ? (base_string_type::mData + base_string_type::mLength) : char_iterator(0);
+    return EnsureMutable() ? (base_string_type::mData + base_string_type::mLength) : iterator(0);
   }
 
-  char_iterator& BeginWriting(char_iterator& aIter)
+  iterator& BeginWriting(iterator& aIter)
   {
     return aIter = BeginWriting();
   }
 
-  char_iterator& BeginWriting(char_iterator& aIter, const fallible_t& aFallible)
+  iterator& BeginWriting(iterator& aIter, const fallible_t& aFallible)
   {
     return aIter = BeginWriting(aFallible);
   }
 
-  char_iterator& EndWriting(char_iterator& aIter)
+  iterator& EndWriting(iterator& aIter)
   {
     return aIter = EndWriting();
   }
 
-  char_iterator& EndWriting(char_iterator& aIter, const fallible_t& aFallible)
+  iterator& EndWriting(iterator& aIter, const fallible_t& aFallible)
   {
     return aIter = EndWriting(aFallible);
   }