From a6d2242b2333a0c2ebd76baed32bcaa25250dd90 Mon Sep 17 00:00:00 2001
From: "scc%mozilla.org" <scc%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 6 Mar 2001 08:33:00 +0000
Subject: [PATCH] r=jst, avoid deprecated operator

git-svn-id: svn://10.0.0.236/trunk@88652 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/content/base/src/nsPlainTextSerializer.cpp |  2 +-
 mozilla/htmlparser/src/nsHTMLTokens.cpp            | 10 +++++-----
 mozilla/parser/htmlparser/src/nsHTMLTokens.cpp     | 10 +++++-----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/mozilla/content/base/src/nsPlainTextSerializer.cpp b/mozilla/content/base/src/nsPlainTextSerializer.cpp
index 97560fa137c..c9924cc79fe 100644
--- a/mozilla/content/base/src/nsPlainTextSerializer.cpp
+++ b/mozilla/content/base/src/nsPlainTextSerializer.cpp
@@ -1342,7 +1342,7 @@ nsPlainTextSerializer::Write(const nsAReadableString& aString)
       // doesn't have the old FindCharInSet function.
       nsAReadableString::const_iterator iter;           aString.BeginReading(iter);
       nsAReadableString::const_iterator done_searching; aString.EndReading(done_searching);
-      iter += bol; 
+      iter.advance(bol); 
       PRInt32 new_newline = bol;
       newline = kNotFound;
       while(iter != done_searching) {
diff --git a/mozilla/htmlparser/src/nsHTMLTokens.cpp b/mozilla/htmlparser/src/nsHTMLTokens.cpp
index a8750279051..ca77f53c8a2 100644
--- a/mozilla/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/htmlparser/src/nsHTMLTokens.cpp
@@ -554,7 +554,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode)
             if(kLF==theNextChar) {
               // If the "\r" is followed by a "\n", don't replace it and 
               // let it be ignored by the layout system
-              end += 2;
+              end.advance(2);
               result=aScanner.GetChar(theNextChar);
             }
             else {
@@ -658,7 +658,7 @@ nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScann
         if((aMode != eDTDMode_strict) && (aMode != eDTDMode_transitional) && 
            !theLastIteration && !aIgnoreComments) {
           nsReadingIterator<PRUnichar> endComment(theCurrOffset);
-          endComment += 5;
+          endComment.advance(5);
           if ((theStartCommentPos == endPos) && 
               FindInReadable(NS_LITERAL_STRING("<!--"), theCurrOffset, endComment)) {
             theStartCommentPos = theCurrOffset;
@@ -924,7 +924,7 @@ nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32
             if(kLF==theNextChar) {
               // If the "\r" is followed by a "\n", don't replace it and 
               // let it be ignored by the layout system
-              end += 2;
+              end.advance(2);
               result=aScanner.GetChar(theNextChar);
             }
             else {
@@ -1117,7 +1117,7 @@ nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString)
                 temp++;
                 aChar=*temp;
                 if(kMinus==aChar) {
-                  theStartOffset -= 2; // Include "<!" also..
+                  theStartOffset.advance(-2); // Include "<!" also..
                   CopyUnicodeTo(theStartOffset, theCurrOffset, aString);
                   aScanner.SetPosition(theCurrOffset);
                   return result; // We have found the dflt end comment delimiter ("-->")
@@ -1140,7 +1140,7 @@ nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString)
             //If so, rewind just pass than, and use everything up to that point as your comment.
             //If not, the document has no end comment and should be treated as one big comment.
             if(endPos != theBestAltPos) {
-              theStartOffset -= 2;// Include "<!" also..
+              theStartOffset.advance(-2);// Include "<!" also..
               CopyUnicodeTo(theStartOffset, theBestAltPos, aString);
               aScanner.SetPosition(theBestAltPos);
               result=NS_OK;
diff --git a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
index a8750279051..ca77f53c8a2 100644
--- a/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
+++ b/mozilla/parser/htmlparser/src/nsHTMLTokens.cpp
@@ -554,7 +554,7 @@ nsresult CTextToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32 aMode)
             if(kLF==theNextChar) {
               // If the "\r" is followed by a "\n", don't replace it and 
               // let it be ignored by the layout system
-              end += 2;
+              end.advance(2);
               result=aScanner.GetChar(theNextChar);
             }
             else {
@@ -658,7 +658,7 @@ nsresult CTextToken::ConsumeUntil(PRUnichar aChar,PRBool aIgnoreComments,nsScann
         if((aMode != eDTDMode_strict) && (aMode != eDTDMode_transitional) && 
            !theLastIteration && !aIgnoreComments) {
           nsReadingIterator<PRUnichar> endComment(theCurrOffset);
-          endComment += 5;
+          endComment.advance(5);
           if ((theStartCommentPos == endPos) && 
               FindInReadable(NS_LITERAL_STRING("<!--"), theCurrOffset, endComment)) {
             theStartCommentPos = theCurrOffset;
@@ -924,7 +924,7 @@ nsresult CMarkupDeclToken::Consume(PRUnichar aChar, nsScanner& aScanner,PRInt32
             if(kLF==theNextChar) {
               // If the "\r" is followed by a "\n", don't replace it and 
               // let it be ignored by the layout system
-              end += 2;
+              end.advance(2);
               result=aScanner.GetChar(theNextChar);
             }
             else {
@@ -1117,7 +1117,7 @@ nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString)
                 temp++;
                 aChar=*temp;
                 if(kMinus==aChar) {
-                  theStartOffset -= 2; // Include "<!" also..
+                  theStartOffset.advance(-2); // Include "<!" also..
                   CopyUnicodeTo(theStartOffset, theCurrOffset, aString);
                   aScanner.SetPosition(theCurrOffset);
                   return result; // We have found the dflt end comment delimiter ("-->")
@@ -1140,7 +1140,7 @@ nsresult ConsumeComment(PRUnichar aChar, nsScanner& aScanner,nsString& aString)
             //If so, rewind just pass than, and use everything up to that point as your comment.
             //If not, the document has no end comment and should be treated as one big comment.
             if(endPos != theBestAltPos) {
-              theStartOffset -= 2;// Include "<!" also..
+              theStartOffset.advance(-2);// Include "<!" also..
               CopyUnicodeTo(theStartOffset, theBestAltPos, aString);
               aScanner.SetPosition(theBestAltPos);
               result=NS_OK;