Fixing build warnings. Step 3: remove the old deprecated API.

intl/uconv/tests/nsTestUConv.cpp

@@ -289,7 +289,7 @@ nsresult testStressDecoder(nsIUnicodeDecoder * aDec,
 
   // get estimated length
   PRInt32 estimatedLength;
-  res = aDec->Length(aSrc, 0, aSrcLength, &estimatedLength);
+  res = aDec->GetMaxLength(aSrc, aSrcLength, &estimatedLength);
   if (NS_FAILED(res)) {
     printf("ERROR at %s.stress.Length() code=0x%x.\n",aTestName,res);
     return res;

intl/uconv/ucvcn/nsUCvCnSupport.cpp

@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 

intl/uconv/ucvcn/nsUCvCnSupport.h

@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------

intl/uconv/ucvja/nsUCvJaSupport.cpp

@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 

intl/uconv/ucvja/nsUCvJaSupport.h

@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------

intl/uconv/ucvko/nsUCvKOSupport.cpp

@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 

intl/uconv/ucvko/nsUCvKOSupport.h

@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------

intl/uconv/ucvlatin/nsUCvLatinSupport.cpp

@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 

intl/uconv/ucvlatin/nsUCvLatinSupport.h

@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------

intl/uconv/ucvtw/nsUCvTWSupport.cpp

@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 

intl/uconv/ucvtw/nsUCvTWSupport.h

@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------

intl/uconv/ucvtw2/nsUCvTW2Support.cpp

@@ -75,41 +75,6 @@ nsresult nsBasicDecoderSupport::QueryInterface(REFNSIID aIID,
 //----------------------------------------------------------------------
 // Interface nsIUnicodeDecoder [implementation]
 
-NS_IMETHODIMP nsBasicDecoderSupport::Convert(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength, 
-                                            const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 * aSrcLength)
-{
-  // XXX deprecated
-  return ((nsIUnicodeDecoder *)this)->Convert(aSrc + aSrcOffset, aSrcLength, aDest + aDestOffset, 
-    aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Finish(PRUnichar * aDest, 
-                                            PRInt32 aDestOffset, 
-                                            PRInt32 * aDestLength)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::Length(const char * aSrc, 
-                                            PRInt32 aSrcOffset, 
-                                            PRInt32 aSrcLength, 
-                                            PRInt32 * aDestLength) 
-{
-  // XXX deprecated
-  return GetMaxLength(aSrc + aSrcOffset, aSrcLength, aDestLength);
-}
-
-NS_IMETHODIMP nsBasicDecoderSupport::SetInputErrorBehavior(PRInt32 aBehavior)
-{
-  // XXX deprecated
-  return NS_OK;
-}
-
 //----------------------------------------------------------------------
 // Class nsBufferDecoderSupport [implementation]
 

intl/uconv/ucvtw2/nsUCvTW2Support.h

@@ -64,16 +64,6 @@ public:
 
   //--------------------------------------------------------------------
   // Interface nsIUnicodeDecoder [declaration]
-
-  // XXX deprecated methods - to go away when interface change.
-  NS_IMETHOD Convert(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength, const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 * aSrcLength);
-  NS_IMETHOD Finish(PRUnichar * aDest, PRInt32 aDestOffset, 
-      PRInt32 * aDestLength);
-  NS_IMETHOD Length(const char * aSrc, PRInt32 aSrcOffset, 
-      PRInt32 aSrcLength, PRInt32 * aDestLength);
-  NS_IMETHOD SetInputErrorBehavior(PRInt32 aBehavior);
 };
 
 //----------------------------------------------------------------------