From 8902bf118c9a96cc6f071561e36d211842341792 Mon Sep 17 00:00:00 2001 From: "cata%netscape.com" Date: Thu, 2 Sep 1999 21:41:40 +0000 Subject: [PATCH] Fixing build warnings. Step 3: remove the old deprecated API. --- intl/uconv/tests/nsTestUConv.cpp | 2 +- intl/uconv/ucvcn/nsUCvCnSupport.cpp | 35 ----------------------- intl/uconv/ucvcn/nsUCvCnSupport.h | 10 ------- intl/uconv/ucvja/nsUCvJaSupport.cpp | 35 ----------------------- intl/uconv/ucvja/nsUCvJaSupport.h | 10 ------- intl/uconv/ucvko/nsUCvKOSupport.cpp | 35 ----------------------- intl/uconv/ucvko/nsUCvKOSupport.h | 10 ------- intl/uconv/ucvlatin/nsUCvLatinSupport.cpp | 35 ----------------------- intl/uconv/ucvlatin/nsUCvLatinSupport.h | 10 ------- intl/uconv/ucvtw/nsUCvTWSupport.cpp | 35 ----------------------- intl/uconv/ucvtw/nsUCvTWSupport.h | 10 ------- intl/uconv/ucvtw2/nsUCvTW2Support.cpp | 35 ----------------------- intl/uconv/ucvtw2/nsUCvTW2Support.h | 10 ------- 13 files changed, 1 insertion(+), 271 deletions(-) diff --git a/intl/uconv/tests/nsTestUConv.cpp b/intl/uconv/tests/nsTestUConv.cpp index 748a43495cc8..6c4f729f3672 100644 --- a/intl/uconv/tests/nsTestUConv.cpp +++ b/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; diff --git a/intl/uconv/ucvcn/nsUCvCnSupport.cpp b/intl/uconv/ucvcn/nsUCvCnSupport.cpp index 9e8558f1d43a..bfe644efd5e0 100644 --- a/intl/uconv/ucvcn/nsUCvCnSupport.cpp +++ b/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] diff --git a/intl/uconv/ucvcn/nsUCvCnSupport.h b/intl/uconv/ucvcn/nsUCvCnSupport.h index 7db5556bb085..27956bfad7d0 100644 --- a/intl/uconv/ucvcn/nsUCvCnSupport.h +++ b/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); }; //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvja/nsUCvJaSupport.cpp b/intl/uconv/ucvja/nsUCvJaSupport.cpp index f2d21f619a01..4e71662e3aff 100644 --- a/intl/uconv/ucvja/nsUCvJaSupport.cpp +++ b/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] diff --git a/intl/uconv/ucvja/nsUCvJaSupport.h b/intl/uconv/ucvja/nsUCvJaSupport.h index cd7373e58955..30a4dcd2650a 100644 --- a/intl/uconv/ucvja/nsUCvJaSupport.h +++ b/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); }; //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvko/nsUCvKOSupport.cpp b/intl/uconv/ucvko/nsUCvKOSupport.cpp index 22abc411c62d..2514c47f519b 100644 --- a/intl/uconv/ucvko/nsUCvKOSupport.cpp +++ b/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] diff --git a/intl/uconv/ucvko/nsUCvKOSupport.h b/intl/uconv/ucvko/nsUCvKOSupport.h index ac09d8059f16..33a318de4bed 100644 --- a/intl/uconv/ucvko/nsUCvKOSupport.h +++ b/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); }; //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp b/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp index 8320c00ccbcd..f5bc6f07bc1b 100644 --- a/intl/uconv/ucvlatin/nsUCvLatinSupport.cpp +++ b/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] diff --git a/intl/uconv/ucvlatin/nsUCvLatinSupport.h b/intl/uconv/ucvlatin/nsUCvLatinSupport.h index 0f12e8d60e32..a48bfbaf8275 100644 --- a/intl/uconv/ucvlatin/nsUCvLatinSupport.h +++ b/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); }; //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvtw/nsUCvTWSupport.cpp b/intl/uconv/ucvtw/nsUCvTWSupport.cpp index c63990dc4956..8ff61213c83b 100644 --- a/intl/uconv/ucvtw/nsUCvTWSupport.cpp +++ b/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] diff --git a/intl/uconv/ucvtw/nsUCvTWSupport.h b/intl/uconv/ucvtw/nsUCvTWSupport.h index f5ad5a024dd9..8c9397277bcf 100644 --- a/intl/uconv/ucvtw/nsUCvTWSupport.h +++ b/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); }; //---------------------------------------------------------------------- diff --git a/intl/uconv/ucvtw2/nsUCvTW2Support.cpp b/intl/uconv/ucvtw2/nsUCvTW2Support.cpp index 6b617c93fb93..9e23bbc251c2 100644 --- a/intl/uconv/ucvtw2/nsUCvTW2Support.cpp +++ b/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] diff --git a/intl/uconv/ucvtw2/nsUCvTW2Support.h b/intl/uconv/ucvtw2/nsUCvTW2Support.h index 2169acb586ed..bf5ab58453fa 100644 --- a/intl/uconv/ucvtw2/nsUCvTW2Support.h +++ b/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); }; //----------------------------------------------------------------------