зеркало из https://github.com/mozilla/pjs.git
Deprecated methods deleted.
This commit is contained in:
Родитель
7eb6b5f026
Коммит
a800a1ee88
|
@ -57,16 +57,6 @@ public:
|
||||||
PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
||||||
uMappingTable * aMappingTable) = 0;
|
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.
|
* Converts data using a set of lookup tables.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -57,15 +57,6 @@ public:
|
||||||
char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
||||||
uMappingTable * aMappingTable) = 0;
|
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.
|
* Converts data using a set of lookup tables.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -56,11 +56,6 @@ public:
|
||||||
PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
||||||
uMappingTable * aMappingTable);
|
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,
|
NS_IMETHOD ConvertByMultiTable(const char * aSrc, PRInt32 * aSrcLength,
|
||||||
PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
||||||
uRange * aRangeArray, uShiftTable ** aShiftTable,
|
uRange * aRangeArray, uShiftTable ** aShiftTable,
|
||||||
|
@ -140,21 +135,6 @@ NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByTable(
|
||||||
return res;
|
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(
|
NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByMultiTable(
|
||||||
const char * aSrc,
|
const char * aSrc,
|
||||||
PRInt32 * aSrcLength,
|
PRInt32 * aSrcLength,
|
||||||
|
|
|
@ -56,10 +56,6 @@ public:
|
||||||
char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
||||||
uMappingTable * aMappingTable);
|
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,
|
NS_IMETHOD ConvertByMultiTable(const PRUnichar * aSrc, PRInt32 * aSrcLength,
|
||||||
char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
||||||
uShiftTable ** aShiftTable, uMappingTable ** aMappingTable);
|
uShiftTable ** aShiftTable, uMappingTable ** aMappingTable);
|
||||||
|
@ -84,12 +80,13 @@ nsUnicodeEncodeHelper::~nsUnicodeEncodeHelper()
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
// Interface nsIUnicodeEncodeHelper [implementation]
|
// Interface nsIUnicodeEncodeHelper [implementation]
|
||||||
|
|
||||||
NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc,
|
NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(
|
||||||
PRInt32 * aSrcLength,
|
const PRUnichar * aSrc,
|
||||||
char * aDest,
|
PRInt32 * aSrcLength,
|
||||||
PRInt32 * aDestLength,
|
char * aDest,
|
||||||
uShiftTable * aShiftTable,
|
PRInt32 * aDestLength,
|
||||||
uMappingTable * aMappingTable)
|
uShiftTable * aShiftTable,
|
||||||
|
uMappingTable * aMappingTable)
|
||||||
{
|
{
|
||||||
const PRUnichar * src = aSrc;
|
const PRUnichar * src = aSrc;
|
||||||
const PRUnichar * srcEnd = aSrc + *aSrcLength;
|
const PRUnichar * srcEnd = aSrc + *aSrcLength;
|
||||||
|
@ -122,20 +119,6 @@ NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc,
|
||||||
return res;
|
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(
|
NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByMultiTable(
|
||||||
const PRUnichar * aSrc,
|
const PRUnichar * aSrc,
|
||||||
PRInt32 * aSrcLength,
|
PRInt32 * aSrcLength,
|
||||||
|
|
|
@ -56,11 +56,6 @@ public:
|
||||||
PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
||||||
uMappingTable * aMappingTable);
|
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,
|
NS_IMETHOD ConvertByMultiTable(const char * aSrc, PRInt32 * aSrcLength,
|
||||||
PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
||||||
uRange * aRangeArray, uShiftTable ** aShiftTable,
|
uRange * aRangeArray, uShiftTable ** aShiftTable,
|
||||||
|
@ -140,21 +135,6 @@ NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByTable(
|
||||||
return res;
|
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(
|
NS_IMETHODIMP nsUnicodeDecodeHelper::ConvertByMultiTable(
|
||||||
const char * aSrc,
|
const char * aSrc,
|
||||||
PRInt32 * aSrcLength,
|
PRInt32 * aSrcLength,
|
||||||
|
|
|
@ -56,10 +56,6 @@ public:
|
||||||
char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable,
|
||||||
uMappingTable * aMappingTable);
|
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,
|
NS_IMETHOD ConvertByMultiTable(const PRUnichar * aSrc, PRInt32 * aSrcLength,
|
||||||
char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount,
|
||||||
uShiftTable ** aShiftTable, uMappingTable ** aMappingTable);
|
uShiftTable ** aShiftTable, uMappingTable ** aMappingTable);
|
||||||
|
@ -84,12 +80,13 @@ nsUnicodeEncodeHelper::~nsUnicodeEncodeHelper()
|
||||||
//----------------------------------------------------------------------
|
//----------------------------------------------------------------------
|
||||||
// Interface nsIUnicodeEncodeHelper [implementation]
|
// Interface nsIUnicodeEncodeHelper [implementation]
|
||||||
|
|
||||||
NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc,
|
NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(
|
||||||
PRInt32 * aSrcLength,
|
const PRUnichar * aSrc,
|
||||||
char * aDest,
|
PRInt32 * aSrcLength,
|
||||||
PRInt32 * aDestLength,
|
char * aDest,
|
||||||
uShiftTable * aShiftTable,
|
PRInt32 * aDestLength,
|
||||||
uMappingTable * aMappingTable)
|
uShiftTable * aShiftTable,
|
||||||
|
uMappingTable * aMappingTable)
|
||||||
{
|
{
|
||||||
const PRUnichar * src = aSrc;
|
const PRUnichar * src = aSrc;
|
||||||
const PRUnichar * srcEnd = aSrc + *aSrcLength;
|
const PRUnichar * srcEnd = aSrc + *aSrcLength;
|
||||||
|
@ -122,20 +119,6 @@ NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByTable(const PRUnichar * aSrc,
|
||||||
return res;
|
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(
|
NS_IMETHODIMP nsUnicodeEncodeHelper::ConvertByMultiTable(
|
||||||
const PRUnichar * aSrc,
|
const PRUnichar * aSrc,
|
||||||
PRInt32 * aSrcLength,
|
PRInt32 * aSrcLength,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче