From 9ad539204e7973485a8fafab419e3d28929cdc4a Mon Sep 17 00:00:00 2001 From: "yokoyama%netscape.com" Date: Wed, 17 May 2006 02:37:35 +0000 Subject: [PATCH] Bug 110486 Removing NSGetFactory from UCONV /r=shanjian; /sr=brendan --- intl/uconv/util/nsUnicodeDecodeHelper.cpp | 77 +----------------- intl/uconv/util/nsUnicodeDecodeHelper.h | 96 +++++++++++++++++++++++ intl/uconv/util/nsUnicodeEncodeHelper.cpp | 72 +---------------- intl/uconv/util/nsUnicodeEncodeHelper.h | 90 +++++++++++++++++++++ 4 files changed, 188 insertions(+), 147 deletions(-) create mode 100644 intl/uconv/util/nsUnicodeDecodeHelper.h create mode 100644 intl/uconv/util/nsUnicodeEncodeHelper.h diff --git a/intl/uconv/util/nsUnicodeDecodeHelper.cpp b/intl/uconv/util/nsUnicodeDecodeHelper.cpp index 537bc15f794..9e45af71ed2 100644 --- a/intl/uconv/util/nsUnicodeDecodeHelper.cpp +++ b/intl/uconv/util/nsUnicodeDecodeHelper.cpp @@ -43,56 +43,7 @@ #include "nsMappingCache.h" #include "nsIUnicodeDecodeHelper.h" #include "nsIUnicodeDecoder.h" - -//---------------------------------------------------------------------- -// Class nsUnicodeDecodeHelper [declaration] - -/** - * The actual implementation of the nsIUnicodeDecodeHelper interface. - * - * @created 18/Mar/1998 - * @author Catalin Rotaru [CATA] - */ -class nsUnicodeDecodeHelper : public nsIUnicodeDecodeHelper -{ - NS_DECL_ISUPPORTS - -public: - - /** - * Class constructor. - */ - nsUnicodeDecodeHelper(); - - /** - * Class destructor. - */ - virtual ~nsUnicodeDecodeHelper(); - - //-------------------------------------------------------------------- - // Interface nsIUnicodeDecodeHelper [declaration] - - NS_IMETHOD ConvertByTable(const char * aSrc, PRInt32 * aSrcLength, - PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, - uMappingTable * aMappingTable); - - NS_IMETHOD ConvertByMultiTable(const char * aSrc, PRInt32 * aSrcLength, - PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uRange * aRangeArray, uShiftTable ** aShiftTable, - uMappingTable ** aMappingTable); - - NS_IMETHOD ConvertByFastTable(const char * aSrc, PRInt32 * aSrcLength, - PRUnichar * aDest, PRInt32 * aDestLength, PRUnichar * aFastTable, - PRInt32 aTableSize); - - NS_IMETHOD CreateFastTable( uShiftTable * aShiftTable, - uMappingTable * aMappingTable, PRUnichar * aFastTable, - PRInt32 aTableSize); - - NS_IMETHOD CreateCache(nsMappingCacheType aType, nsIMappingCache* aResult); - - NS_IMETHOD DestroyCache(nsIMappingCache aResult); -}; +#include "nsUnicodeDecodeHelper.h" //---------------------------------------------------------------------- // Class nsUnicodeDecodeHelper [implementation] @@ -314,29 +265,3 @@ NS_IMETHODIMP nsUnicodeDecodeHelper::CreateFastTable( return res; } -//---------------------------------------------------------------------- - -NS_IMETHODIMP -NS_NewUnicodeDecodeHelper(nsISupports* aOuter, - const nsIID &aIID, - void **aResult) -{ - if (!aResult) { - return NS_ERROR_NULL_POINTER; - } - if (aOuter) { - *aResult = nsnull; - return NS_ERROR_NO_AGGREGATION; - } - nsUnicodeDecodeHelper* inst = new nsUnicodeDecodeHelper(); - if (!inst) { - *aResult = nsnull; - return NS_ERROR_OUT_OF_MEMORY; - } - nsresult res = inst->QueryInterface(aIID, aResult); - if (NS_FAILED(res)) { - *aResult = nsnull; - delete inst; - } - return res; -} diff --git a/intl/uconv/util/nsUnicodeDecodeHelper.h b/intl/uconv/util/nsUnicodeDecodeHelper.h new file mode 100644 index 00000000000..e3cccba4534 --- /dev/null +++ b/intl/uconv/util/nsUnicodeDecodeHelper.h @@ -0,0 +1,96 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ +#ifndef nsUnicodeDecodeHelper_h__ +#define nsUnicodeDecodeHelper_h__ + +#include "nsIUnicodeDecodeHelper.h" +#include "nsIUnicodeDecoder.h" + +//---------------------------------------------------------------------- +// Class nsUnicodeDecodeHelper [declaration] + +/** + * The actual implementation of the nsIUnicodeDecodeHelper interface. + * + * @created 18/Mar/1998 + * @author Catalin Rotaru [CATA] + */ +class nsUnicodeDecodeHelper : public nsIUnicodeDecodeHelper +{ + NS_DECL_ISUPPORTS + +public: + + /** + * Class constructor. + */ + nsUnicodeDecodeHelper(); + + /** + * Class destructor. + */ + virtual ~nsUnicodeDecodeHelper(); + + //-------------------------------------------------------------------- + // Interface nsIUnicodeDecodeHelper [declaration] + + NS_IMETHOD ConvertByTable(const char * aSrc, PRInt32 * aSrcLength, + PRUnichar * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, + uMappingTable * aMappingTable); + + NS_IMETHOD ConvertByMultiTable(const char * aSrc, PRInt32 * aSrcLength, + PRUnichar * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, + uRange * aRangeArray, uShiftTable ** aShiftTable, + uMappingTable ** aMappingTable); + + NS_IMETHOD ConvertByFastTable(const char * aSrc, PRInt32 * aSrcLength, + PRUnichar * aDest, PRInt32 * aDestLength, PRUnichar * aFastTable, + PRInt32 aTableSize); + + NS_IMETHOD CreateFastTable( uShiftTable * aShiftTable, + uMappingTable * aMappingTable, PRUnichar * aFastTable, + PRInt32 aTableSize); + + NS_IMETHOD CreateCache(nsMappingCacheType aType, nsIMappingCache* aResult); + + NS_IMETHOD DestroyCache(nsIMappingCache aResult); +}; + +#endif // nsUnicodeDecodeHelper_h__ + + diff --git a/intl/uconv/util/nsUnicodeEncodeHelper.cpp b/intl/uconv/util/nsUnicodeEncodeHelper.cpp index dceb95b5629..61743ca1e86 100644 --- a/intl/uconv/util/nsUnicodeEncodeHelper.cpp +++ b/intl/uconv/util/nsUnicodeEncodeHelper.cpp @@ -43,50 +43,7 @@ #include "nsUConvDll.h" #include "nsIMappingCache.h" #include "nsMappingCache.h" - -//---------------------------------------------------------------------- -// Class nsUnicodeEncodeHelper [declaration] - -/** - * The actual implementation of the nsIUnicodeEncodeHelper interface. - * - * @created 22/Nov/1998 - * @author Catalin Rotaru [CATA] - */ -class nsUnicodeEncodeHelper : public nsIUnicodeEncodeHelper -{ - NS_DECL_ISUPPORTS - -public: - - /** - * Class constructor. - */ - nsUnicodeEncodeHelper(); - - /** - * Class destructor. - */ - virtual ~nsUnicodeEncodeHelper(); - - //-------------------------------------------------------------------- - // Interface nsIUnicodeEncodeHelper [declaration] - - NS_IMETHOD ConvertByTable(const PRUnichar * aSrc, PRInt32 * aSrcLength, - char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, - uMappingTable * aMappingTable); - - NS_IMETHOD ConvertByMultiTable(const PRUnichar * aSrc, PRInt32 * aSrcLength, - char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, - uShiftTable ** aShiftTable, uMappingTable ** aMappingTable); - - NS_IMETHOD CreateCache(nsMappingCacheType aType, nsIMappingCache* aResult); - - NS_IMETHOD DestroyCache(nsIMappingCache aCache); - - NS_IMETHOD FillInfo(PRUint32* aInfo, uMappingTable * aMappingTable); - NS_IMETHOD FillInfo(PRUint32* aInfo, PRInt32 aTableCount, uMappingTable ** aMappingTable); -}; +#include "nsUnicodeEncodeHelper.h" //---------------------------------------------------------------------- // Class nsUnicodeEncodeHelper [implementation] @@ -211,30 +168,3 @@ NS_IMETHODIMP nsUnicodeEncodeHelper::FillInfo(PRUint32 *aInfo, PRInt32 aTableCou uFillInfo((uTable*) aMappingTable[i], aInfo); return NS_OK; } - -//---------------------------------------------------------------------- - -NS_IMETHODIMP -NS_NewUnicodeEncodeHelper(nsISupports* aOuter, - const nsIID &aIID, - void **aResult) -{ - if (!aResult) { - return NS_ERROR_NULL_POINTER; - } - if (aOuter) { - *aResult = nsnull; - return NS_ERROR_NO_AGGREGATION; - } - nsUnicodeEncodeHelper* inst = new nsUnicodeEncodeHelper(); - if (!inst) { - *aResult = nsnull; - return NS_ERROR_OUT_OF_MEMORY; - } - nsresult res = inst->QueryInterface(aIID, aResult); - if (NS_FAILED(res)) { - *aResult = nsnull; - delete inst; - } - return res; -} diff --git a/intl/uconv/util/nsUnicodeEncodeHelper.h b/intl/uconv/util/nsUnicodeEncodeHelper.h new file mode 100644 index 00000000000..d7ba03a377a --- /dev/null +++ b/intl/uconv/util/nsUnicodeEncodeHelper.h @@ -0,0 +1,90 @@ +/* -*- Mode: C; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* ***** BEGIN LICENSE BLOCK ***** + * Version: NPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Netscape Public License + * Version 1.1 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/NPL/ + * + * Software distributed under the License is distributed on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License + * for the specific language governing rights and limitations under the + * License. + * + * The Original Code is mozilla.org code. + * + * The Initial Developer of the Original Code is + * Netscape Communications Corporation. + * Portions created by the Initial Developer are Copyright (C) 1998 + * the Initial Developer. All Rights Reserved. + * + * Contributor(s): + * + * + * Alternatively, the contents of this file may be used under the terms of + * either the GNU General Public License Version 2 or later (the "GPL"), or + * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"), + * in which case the provisions of the GPL or the LGPL are applicable instead + * of those above. If you wish to allow use of your version of this file only + * under the terms of either the GPL or the LGPL, and not to allow others to + * use your version of this file under the terms of the NPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under + * the terms of any one of the NPL, the GPL or the LGPL. + * + * ***** END LICENSE BLOCK ***** */ +#ifndef nsUnicodeEncodeHelper_h__ +#define nsUnicodeEncodeHelper_h__ + +#include "nsIUnicodeEncoder.h" +#include "nsIUnicodeEncodeHelper.h" + +//---------------------------------------------------------------------- +// Class nsUnicodeEncodeHelper [declaration] + +/** + * The actual implementation of the nsIUnicodeEncodeHelper interface. + * + * @created 22/Nov/1998 + * @author Catalin Rotaru [CATA] + */ +class nsUnicodeEncodeHelper : public nsIUnicodeEncodeHelper +{ + NS_DECL_ISUPPORTS + +public: + + /** + * Class constructor. + */ + nsUnicodeEncodeHelper(); + + /** + * Class destructor. + */ + virtual ~nsUnicodeEncodeHelper(); + + //-------------------------------------------------------------------- + // Interface nsIUnicodeEncodeHelper [declaration] + + NS_IMETHOD ConvertByTable(const PRUnichar * aSrc, PRInt32 * aSrcLength, + char * aDest, PRInt32 * aDestLength, uShiftTable * aShiftTable, + uMappingTable * aMappingTable); + + NS_IMETHOD ConvertByMultiTable(const PRUnichar * aSrc, PRInt32 * aSrcLength, + char * aDest, PRInt32 * aDestLength, PRInt32 aTableCount, + uShiftTable ** aShiftTable, uMappingTable ** aMappingTable); + + NS_IMETHOD CreateCache(nsMappingCacheType aType, nsIMappingCache* aResult); + + NS_IMETHOD DestroyCache(nsIMappingCache aCache); + + NS_IMETHOD FillInfo(PRUint32* aInfo, uMappingTable * aMappingTable); + NS_IMETHOD FillInfo(PRUint32* aInfo, PRInt32 aTableCount, uMappingTable ** aMappingTable); +}; + +#endif // nsUnicodeEncodeHelper_h__ + +