Fixing build warnings. Step 2: switch to use new method from the interface.

htmlparser/src/nsScanner.cpp

@@ -255,7 +255,7 @@ PRBool nsScanner::Append(const char* aBuffer, PRUint32 aLen){
 	  do {
 	    PRInt32 srcLength = aLen;
 		  PRInt32 unicharLength = unicharBufLen;
-		  res = mUnicodeDecoder->Convert(unichars, 0, &unicharLength,aBuffer, 0, &srcLength );
+		  res = mUnicodeDecoder->Convert(aBuffer, &srcLength, unichars, &unicharLength);
       unichars[unicharLength]=0;  //add this since the unicode converters can't be trusted to do so.
 
 

intl/chardet/tools/GenCyrillicClass.cpp

@@ -85,7 +85,7 @@ PRUint8 CyrillicClass(nsIUnicodeDecoder* decoder, PRUint8 byte)
 
    PRInt32 blen = 1;
    PRInt32 ulen = 1;
-   nsresult res = decoder->Convert(ubuf,0,&ulen, (char*)&byte, 0, &blen);
+   nsresult res = decoder->Convert((char*)&byte, &blen, ubuf, &ulen);
    if(NS_SUCCEEDED(res) && (1 == ulen ))
    {
      ubuf[0] = nsCRT::ToUpper(ubuf[0]);

intl/locale/src/mac/nsDateTimeFormatMac.cpp

@@ -360,8 +360,8 @@ nsresult nsDateTimeFormatMac::FormatTMTime(nsILocale* locale,
       PRUnichar *unichars = new PRUnichar [ unicharLength ];
   
       if (nsnull != unichars) {
-        res = decoder->Convert(unichars, 0, &unicharLength,
+        res = decoder->Convert(aBuffer, &srcLength,
-                               aBuffer, 0, &srcLength);
+                               unichars, &unicharLength);
         if (NS_SUCCEEDED(res)) {
           stringOut.SetString(unichars, unicharLength);
         }

intl/locale/src/unix/nsDateTimeFormatUnix.cpp

@@ -152,8 +152,8 @@ nsresult nsDateTimeFormatUnix::FormatTMTime(nsILocale* locale,
       PRUnichar *unichars = new PRUnichar [ unicharLength ];
   
       if (nsnull != unichars) {
-        res = decoder->Convert(unichars, 0, &unicharLength,
+        res = decoder->Convert(strOut, &srcLength,
-                               strOut, 0, &srcLength);
+                               unichars, &unicharLength);
         if (NS_SUCCEEDED(res)) {
           stringOut.SetString(unichars, unicharLength);
         }

intl/locale/src/windows/nsDateTimeFormatWin.cpp

@@ -242,8 +242,8 @@ nsresult nsDateTimeFormatWin::ConvertToUnicode(const char *inString, const PRInt
       PRUnichar *unichars = outString;
 
       if (nsnull != unichars) {
-        res = decoder->Convert(unichars, 0, &unicharLength,
+        res = decoder->Convert(inString, &srcLength,
-                               inString, 0, &srcLength);
+                               unichars, &unicharLength);
         if (NS_SUCCEEDED(res)) {
           *outLen = unicharLength;
         }

intl/uconv/tests/convperf.cpp

@@ -152,7 +152,7 @@ int main(int argc, const char** argv)
      {
         medsize=MEDBUFSIZE;
         
-	res = decoder->Convert(medbuffer, 0, &medsize,inbuffer,0,&insize);
+	res = decoder->Convert(inbuffer,&insize, medbuffer, &medsize);
         if(NS_FAILED(res)) {
             fprintf(stderr, "failed in decoder->Convert %x\n",res);
 	    return -1;

intl/uconv/tests/nsTestUConv.cpp

@@ -183,7 +183,7 @@ nsresult testDecoder(nsIUnicodeDecoder * aDec,
   PRInt32 destLen = GENERAL_BUFFER/2;
 
   // conversion
-  res = aDec->Convert(dest, 0, &destLen, aSrc, 0, &srcLen);
+  res = aDec->Convert(aSrc, &srcLen, dest, &destLen);
   // we want a perfect result here - the test data should be complete!
   if (res != NS_OK) {
     printf("ERROR at %s.easy.Decode() code=0x%x.\n",aTestName,res);
@@ -305,7 +305,7 @@ nsresult testStressDecoder(nsIUnicodeDecoder * aDec,
 
   // controlled conversion
   for (;srcOff < aSrcLength;) {
-    res = aDec->Convert(dest, destOff, &destLen, aSrc, srcOff, &srcLen);
+    res = aDec->Convert(aSrc + srcOff, &srcLen, dest + destOff, &destLen);
     if (NS_FAILED(res)) {
       printf("ERROR at %s.stress.Convert() code=0x%x.\n",aTestName,res);
       return res;

intl/uconv/tests/nsconv.cpp

@@ -107,7 +107,7 @@ int main(int argc, const char** argv)
      {
         medsize=MEDBUFSIZE;
         
-	res = decoder->Convert(medbuffer, 0, &medsize,inbuffer,0,&insize);
+	res = decoder->Convert(inbuffer,&insize, medbuffer, &medsize);
         if(NS_FAILED(res)) {
             fprintf(stderr, "failed in decoder->Convert %x\n",res);
 	    return -1;

parser/htmlparser/src/nsScanner.cpp

@@ -255,7 +255,7 @@ PRBool nsScanner::Append(const char* aBuffer, PRUint32 aLen){
 	  do {
 	    PRInt32 srcLength = aLen;
 		  PRInt32 unicharLength = unicharBufLen;
-		  res = mUnicodeDecoder->Convert(unichars, 0, &unicharLength,aBuffer, 0, &srcLength );
+		  res = mUnicodeDecoder->Convert(aBuffer, &srcLength, unichars, &unicharLength);
       unichars[unicharLength]=0;  //add this since the unicode converters can't be trusted to do so.
 
 

xpcom/io/nsUnicharInputStream.cpp

@@ -280,8 +280,8 @@ PRInt32 ConverterInputStream::Fill(nsresult * aErrorCode)
   // Now convert as much of the byte buffer to unicode as possible
   PRInt32 dstLen = mUnicharData->GetBufferSize();
   PRInt32 srcLen = remainder + nb;
-  *aErrorCode = mConverter->Convert(mUnicharData->GetBuffer(), 0, &dstLen,
+  *aErrorCode = mConverter->Convert(mByteData->GetBuffer(), &srcLen,
-                                    mByteData->GetBuffer(), 0, &srcLen);
+                                    mUnicharData->GetBuffer(), &dstLen);
   mUnicharDataOffset = 0;
   mUnicharDataLength = dstLen;
   mByteDataOffset += srcLen;