From a481fc599ada84cd7f557a6dd4cbf7d98aeddea4 Mon Sep 17 00:00:00 2001 From: "cata%netscape.com" Date: Mon, 19 Apr 1999 21:15:09 +0000 Subject: [PATCH] Deprecated methods deleted. git-svn-id: svn://10.0.0.236/trunk@28080 18797224-902f-48f8-a5cc-f745e15eee43 --- .../uconv/public/nsIUnicodeDecodeHelper.h | 10 ------ .../uconv/public/nsIUnicodeEncodeHelper.h | 9 ------ .../intl/uconv/src/nsUnicodeDecodeHelper.cpp | 20 ------------ .../intl/uconv/src/nsUnicodeEncodeHelper.cpp | 31 +++++-------------- .../intl/uconv/util/nsUnicodeDecodeHelper.cpp | 20 ------------ .../intl/uconv/util/nsUnicodeEncodeHelper.cpp | 31 +++++-------------- 6 files changed, 14 insertions(+), 107 deletions(-) diff --git a/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h b/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h index fc8837ec1b3..75a3f5ee616 100644 --- a/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h +++ b/mozilla/intl/uconv/public/nsIUnicodeDecodeHelper.h @@ -57,16 +57,6 @@ public: PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, uMappingTable * aMappingTable) = 0; - /** - * Converts data using a set of lookup tables. - * - * XXX deprecated - */ - NS_IMETHOD ConvertByTables(const char * aSrc, PRInt32 * aSrcLength, - PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uRange * aRangeArray, uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable) = 0; - /** * Converts data using a set of lookup tables. */ diff --git a/mozilla/intl/uconv/public/nsIUnicodeEncodeHelper.h b/mozilla/intl/uconv/public/nsIUnicodeEncodeHelper.h index 14ca54ad6b0..19450415db0 100644 --- a/mozilla/intl/uconv/public/nsIUnicodeEncodeHelper.h +++ b/mozilla/intl/uconv/public/nsIUnicodeEncodeHelper.h @@ -57,15 +57,6 @@ public: char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, uMappingTable * aMappingTable) = 0; - /** - * Converts data using a set of lookup tables. - * - * XXX deprecated - */ - NS_IMETHOD ConvertByTables(const PRUnichar * aSrc, PRInt32 * aSrcLength, - char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uShiftTable ** aShiftTable, uMappingTable ** aMappingTable) = 0; - /** * Converts data using a set of lookup tables. */ diff --git a/mozilla/intl/uconv/src/nsUnicodeDecodeHelper.cpp b/mozilla/intl/uconv/src/nsUnicodeDecodeHelper.cpp index 8d41a254434..37911f2c950 100644 --- a/mozilla/intl/uconv/src/nsUnicodeDecodeHelper.cpp +++ b/mozilla/intl/uconv/src/nsUnicodeDecodeHelper.cpp @@ -56,11 +56,6 @@ public: PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, uMappingTable * aMappingTable); - NS_IMETHOD ConvertByTables(const char * aSrc, PRInt32 * aSrcLength, - PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uRange * aRangeArray, uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable); - NS_IMETHOD ConvertByMultiTable(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, uRange * aRangeArray, uShiftTable ** aShiftTable, @@ -140,21 +135,6 @@ NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByTable( return res; } -NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByTables( - const char * aSrc, - PRInt32 * aSrcLength, - PRUnichar * aDest, - PRInt32 * aDestLength, - PRInt32 aTableCount, - uRange * aRangeArray, - uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable) -{ - // XXX deprecated - return ConvertByMultiTable(aSrc, aSrcLength, aDest, aDestLength, - aTableCount, aRangeArray, aShiftTable, aMappingTable); -} - NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByMultiTable( const char * aSrc, PRInt32 * aSrcLength, diff --git a/mozilla/intl/uconv/src/nsUnicodeEncodeHelper.cpp b/mozilla/intl/uconv/src/nsUnicodeEncodeHelper.cpp index 401e0475c1c..ddd27481262 100644 --- a/mozilla/intl/uconv/src/nsUnicodeEncodeHelper.cpp +++ b/mozilla/intl/uconv/src/nsUnicodeEncodeHelper.cpp @@ -56,10 +56,6 @@ public: char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, uMappingTable * aMappingTable); - NS_IMETHOD ConvertByTables(const PRUnichar * aSrc, PRInt32 * aSrcLength, - char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uShiftTable ** aShiftTable, uMappingTable ** aMappingTable); - NS_IMETHOD ConvertByMultiTable(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, uShiftTable ** aShiftTable, uMappingTable ** aMappingTable); @@ -84,12 +80,13 @@ nsUnicodeEncodeHelper::~nsUnicodeEncodeHelper() //---------------------------------------------------------------------- // Interface nsIUnicodeEncodeHelper [implementation] -NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc, - PRInt32 * aSrcLength, - char * aDest, - PRInt32 * aDestLength, - uShiftTable * aShiftTable, - uMappingTable * aMappingTable) +NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable( + const PRUnichar * aSrc, + PRInt32 * aSrcLength, + char * aDest, + PRInt32 * aDestLength, + uShiftTable * aShiftTable, + uMappingTable * aMappingTable) { const PRUnichar * src = aSrc; const PRUnichar * srcEnd = aSrc + *aSrcLength; @@ -122,20 +119,6 @@ NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc, return res; } -NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTables( - const PRUnichar * aSrc, - PRInt32 * aSrcLength, - char * aDest, - PRInt32 * aDestLength, - PRInt32 aTableCount, - uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable) -{ - // XXX deprecated - return ConvertByMultiTable(aSrc, aSrcLength, aDest, aDestLength, aTableCount, - aShiftTable, aMappingTable); -} - NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByMultiTable( const PRUnichar * aSrc, PRInt32 * aSrcLength, diff --git a/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp b/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp index 8d41a254434..37911f2c950 100644 --- a/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp +++ b/mozilla/intl/uconv/util/nsUnicodeDecodeHelper.cpp @@ -56,11 +56,6 @@ public: PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, uMappingTable * aMappingTable); - NS_IMETHOD ConvertByTables(const char * aSrc, PRInt32 * aSrcLength, - PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uRange * aRangeArray, uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable); - NS_IMETHOD ConvertByMultiTable(const char * aSrc, PRInt32 * aSrcLength, PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, uRange * aRangeArray, uShiftTable ** aShiftTable, @@ -140,21 +135,6 @@ NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByTable( return res; } -NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByTables( - const char * aSrc, - PRInt32 * aSrcLength, - PRUnichar * aDest, - PRInt32 * aDestLength, - PRInt32 aTableCount, - uRange * aRangeArray, - uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable) -{ - // XXX deprecated - return ConvertByMultiTable(aSrc, aSrcLength, aDest, aDestLength, - aTableCount, aRangeArray, aShiftTable, aMappingTable); -} - NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByMultiTable( const char * aSrc, PRInt32 * aSrcLength, diff --git a/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp b/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp index 401e0475c1c..ddd27481262 100644 --- a/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp +++ b/mozilla/intl/uconv/util/nsUnicodeEncodeHelper.cpp @@ -56,10 +56,6 @@ public: char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, uMappingTable * aMappingTable); - NS_IMETHOD ConvertByTables(const PRUnichar * aSrc, PRInt32 * aSrcLength, - char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uShiftTable ** aShiftTable, uMappingTable ** aMappingTable); - NS_IMETHOD ConvertByMultiTable(const PRUnichar * aSrc, PRInt32 * aSrcLength, char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, uShiftTable ** aShiftTable, uMappingTable ** aMappingTable); @@ -84,12 +80,13 @@ nsUnicodeEncodeHelper::~nsUnicodeEncodeHelper() //---------------------------------------------------------------------- // Interface nsIUnicodeEncodeHelper [implementation] -NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc, - PRInt32 * aSrcLength, - char * aDest, - PRInt32 * aDestLength, - uShiftTable * aShiftTable, - uMappingTable * aMappingTable) +NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable( + const PRUnichar * aSrc, + PRInt32 * aSrcLength, + char * aDest, + PRInt32 * aDestLength, + uShiftTable * aShiftTable, + uMappingTable * aMappingTable) { const PRUnichar * src = aSrc; const PRUnichar * srcEnd = aSrc + *aSrcLength; @@ -122,20 +119,6 @@ NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc, return res; } -NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTables( - const PRUnichar * aSrc, - PRInt32 * aSrcLength, - char * aDest, - PRInt32 * aDestLength, - PRInt32 aTableCount, - uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable) -{ - // XXX deprecated - return ConvertByMultiTable(aSrc, aSrcLength, aDest, aDestLength, aTableCount, - aShiftTable, aMappingTable); -} - NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByMultiTable( const PRUnichar * aSrc, PRInt32 * aSrcLength,