Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1295053 (part 6) - Don't use NS_METHOD for intl/uconv/ functions. r=froydnj.

Browse Source 
These don't need __stdcall on Win32.

--HG--
extra : rebase_source : f9dde1306f7e663f3f6c89d4fee5a49324e90494
This commit is contained in:
Nicholas Nethercote 2016-08-16 12:12:29 +10:00
parent e0229c761e
commit 32e3b7a79e
2 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
intl/uconv/util/nsUCConstructors.cpp
View File

@ -3,13 +3,11 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
#include "nsUCSupport.h"
#include "nsUCConstructors.h"
template<class T>
inline NS_METHOD StabilizedQueryInterface(T* aNewObject,
inline nsresult StabilizedQueryInterface(T* aNewObject,
REFNSIID aIID,
void **aResult)
{
@ -19,8 +17,8 @@ inline NS_METHOD StabilizedQueryInterface(T* aNewObject,
return rv;
}
NS_METHOD
CreateMultiTableDecoder(int32_t aTableCount, const uRange * aRangeArray,
nsresult
CreateMultiTableDecoder(int32_t aTableCount, const uRange * aRangeArray,
uScanClassID * aScanClassArray,
uMappingTable ** aMappingTable,
uint32_t aMaxLengthFactor,
@ -31,7 +29,7 @@ CreateMultiTableDecoder(int32_t aTableCount, const uRange * aRangeArray,
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsMultiTableDecoderSupport* decoder =
new nsMultiTableDecoderSupport(aTableCount, aRangeArray,
aScanClassArray, aMappingTable,
@ -42,7 +40,7 @@ CreateMultiTableDecoder(int32_t aTableCount, const uRange * aRangeArray,
return StabilizedQueryInterface(decoder, aIID, aResult);
}
NS_METHOD
nsresult
CreateMultiTableEncoder(int32_t aTableCount,
uScanClassID * aScanClassArray,
uShiftOutTable ** aShiftOutTable,
@ -55,7 +53,7 @@ CreateMultiTableEncoder(int32_t aTableCount,
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsMultiTableEncoderSupport* encoder =
new nsMultiTableEncoderSupport(aTableCount,
aScanClassArray,
@ -68,7 +66,7 @@ CreateMultiTableEncoder(int32_t aTableCount,
return StabilizedQueryInterface(encoder, aIID, aResult);
}
NS_METHOD
nsresult
CreateMultiTableEncoder(int32_t aTableCount,
uScanClassID * aScanClassArray,
uMappingTable ** aMappingTable,
@ -83,7 +81,7 @@ CreateMultiTableEncoder(int32_t aTableCount,
aOuter, aIID, aResult);
}
NS_METHOD
nsresult
CreateTableEncoder(uScanClassID aScanClass,
uShiftOutTable * aShiftOutTable,
uMappingTable * aMappingTable,
@ -94,7 +92,7 @@ CreateTableEncoder(uScanClassID aScanClass,
{
if (aOuter)
return NS_ERROR_NO_AGGREGATION;
nsTableEncoderSupport* encoder =
new nsTableEncoderSupport(aScanClass,
aShiftOutTable, aMappingTable,
@ -105,7 +103,7 @@ CreateTableEncoder(uScanClassID aScanClass,
return StabilizedQueryInterface(encoder, aIID, aResult);
}
NS_METHOD
nsresult
CreateTableEncoder(uScanClassID aScanClass,
uMappingTable * aMappingTable,
uint32_t aMaxLengthFactor,
@ -118,20 +116,19 @@ CreateTableEncoder(uScanClassID aScanClass,
aOuter, aIID, aResult);
}
NS_METHOD
nsresult
CreateOneByteDecoder(uMappingTable * aMappingTable,
nsISupports* aOuter,
REFNSIID aIID,
void** aResult)
{
if (aOuter) return NS_ERROR_NO_AGGREGATION;
nsOneByteDecoderSupport* decoder =
new nsOneByteDecoderSupport(aMappingTable);
if (!decoder)
return NS_ERROR_OUT_OF_MEMORY;
return StabilizedQueryInterface(decoder, aIID, aResult);
}

15
intl/uconv/util/nsUCConstructors.h
View File

@ -14,18 +14,17 @@
class nsISupports;
// all the useful constructors
NS_METHOD
nsresult
CreateMultiTableDecoder(int32_t aTableCount,
const uRange * aRangeArray,
const uRange * aRangeArray,
uScanClassID * aScanClassArray,
uMappingTable ** aMappingTable,
uint32_t aMaxLengthFactor,
nsISupports* aOuter,
REFNSIID aIID,
void** aResult);
NS_METHOD
nsresult
CreateMultiTableEncoder(int32_t aTableCount,
uScanClassID * aScanClassArray,
uShiftOutTable ** aShiftOutTable,
@ -35,7 +34,7 @@ CreateMultiTableEncoder(int32_t aTableCount,
REFNSIID aIID,
void** aResult);
NS_METHOD
nsresult
CreateTableEncoder(uScanClassID aScanClass,
uShiftOutTable * aShiftOutTable,
uMappingTable * aMappingTable,
@ -44,7 +43,7 @@ CreateTableEncoder(uScanClassID aScanClass,
REFNSIID aIID,
void** aResult);
NS_METHOD
nsresult
CreateMultiTableEncoder(int32_t aTableCount,
uScanClassID * aScanClassArray,
uMappingTable ** aMappingTable,
@ -53,7 +52,7 @@ CreateMultiTableEncoder(int32_t aTableCount,
REFNSIID aIID,
void** aResult);
NS_METHOD
nsresult
CreateTableEncoder(uScanClassID aScanClass,
uMappingTable * aMappingTable,
uint32_t aMaxLengthFactor,
@ -61,7 +60,7 @@ CreateTableEncoder(uScanClassID aScanClass,
REFNSIID aIID,
void** aResult);
NS_METHOD
nsresult
CreateOneByteDecoder(uMappingTable * aMappingTable,
nsISupports* aOuter,
REFNSIID aIID,