mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-10 20:05:49 +00:00
Remove obsolete string service. Bug 230484, r=dougt, sr=dbaron.
This commit is contained in:
parent
e192f6607b
commit
dac4fa30ed
@ -61,7 +61,6 @@ CPPSRCS = \
|
||||
nsStaticNameTable.cpp \
|
||||
nsStatistics.cpp \
|
||||
nsStringEnumerator.cpp \
|
||||
nsStringService.cpp \
|
||||
nsSupportsArray.cpp \
|
||||
nsSupportsArrayEnumerator.cpp \
|
||||
nsSupportsPrimitives.cpp \
|
||||
@ -130,7 +129,6 @@ XPIDLSRCS = \
|
||||
nsIVariant.idl \
|
||||
nsISerializable.idl \
|
||||
nsIStringEnumerator.idl \
|
||||
nsIStringService.idl \
|
||||
nsISupportsArray.idl \
|
||||
nsISupportsIterators.idl \
|
||||
nsITimelineService.idl \
|
||||
@ -142,7 +140,6 @@ SDK_XPIDLSRCS = \
|
||||
nsIObserver.idl \
|
||||
nsIProperties.idl \
|
||||
nsISimpleEnumerator.idl \
|
||||
nsIStringService.idl \
|
||||
nsISupportsPrimitives.idl \
|
||||
$(NULL)
|
||||
|
||||
|
@ -1,121 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** 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 ***** */
|
||||
|
||||
#include "nsISupports.idl"
|
||||
|
||||
[ptr] native nsAString(nsAString);
|
||||
[ptr] native nsACString(nsACString);
|
||||
|
||||
/**
|
||||
* nsIStringService - A factory for nsAString and nsACString objects.
|
||||
*
|
||||
* UNDER_REVIEW
|
||||
*/
|
||||
|
||||
[uuid(1e66d70c-d649-441b-ac90-bf6429ead7da)]
|
||||
interface nsIStringService : nsISupports
|
||||
{
|
||||
/**
|
||||
* Creates an nsAString from a |PRUnichar| buffer and length.
|
||||
*
|
||||
* Must be destroyed by deleteAString();
|
||||
*
|
||||
* @param aString : A unicode string assigned to the new nsAString
|
||||
* @param aLength : The length of the string to be assigned to the new
|
||||
* nsAString
|
||||
*/
|
||||
|
||||
nsAString createAString(in wstring aString, in long aLength);
|
||||
|
||||
/**
|
||||
* Creates an nsAString from a |char| buffer and lenth.
|
||||
*
|
||||
* Must be destroyed by deleteACString();
|
||||
*
|
||||
* @param aString : A string assigned to the new nsACString
|
||||
* @param aLength : The length of the string to be assigned to the new
|
||||
* nsACString
|
||||
*/
|
||||
|
||||
nsACString createACString(in string aString, in long aLength);
|
||||
|
||||
|
||||
|
||||
/**
|
||||
* Frees memory associated with the |nsAString|. After calling this method,
|
||||
* the |aString| is no longer valid.
|
||||
*
|
||||
* @param aString : The |nsAString| object.
|
||||
*/
|
||||
void deleteAString(in nsAString aString);
|
||||
|
||||
/**
|
||||
* Frees memory associated with the |nsACString|. After calling this method,
|
||||
* the |aString| is no longer valid.
|
||||
*
|
||||
* @param aString : The |nsACString| object.
|
||||
*/
|
||||
void deleteACString(in nsACString aString);
|
||||
|
||||
/**
|
||||
* Returns a new |PRUnichar| buffer containing the bytes of |aString|. This new
|
||||
* buffer may contain embedded null characters. The length of this new buffer
|
||||
* is given by |aString.Length()|.
|
||||
*
|
||||
* Allocates and returns a new |char| buffer which you must free with
|
||||
* |nsMemory::Free|.
|
||||
*
|
||||
* @param aString : The |nsAString| object.
|
||||
* @return a new |PRUnichar| buffer you must free with |nsMemory::Free|.
|
||||
*/
|
||||
|
||||
wstring getWString(in AString aString);
|
||||
|
||||
/**
|
||||
* Returns a new |char| buffer containing the bytes of |aString|. This new
|
||||
* buffer may contain embedded null characters. The length of this new buffer
|
||||
* is given by |aString.Length()|.
|
||||
*
|
||||
* Allocates and returns a new |char| buffer which you must free with
|
||||
* |nsMemory::Free|.
|
||||
*
|
||||
* @param aString : The |nsACString| object.
|
||||
* @return a new |char| buffer you must free with |nsMemory::Free|.
|
||||
*/
|
||||
|
||||
string getString(in ACString aString);
|
||||
};
|
@ -1,117 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; 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 ***** */
|
||||
|
||||
#include "nsStringService.h"
|
||||
|
||||
#include "nsString.h"
|
||||
#include "nsReadableUtils.h"
|
||||
|
||||
nsStringService::nsStringService()
|
||||
{
|
||||
}
|
||||
nsStringService::~nsStringService()
|
||||
{
|
||||
}
|
||||
|
||||
NS_IMPL_ISUPPORTS1(nsStringService,
|
||||
nsIStringService)
|
||||
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsStringService::CreateAString(const PRUnichar *aString, PRInt32 aLength, nsAString * *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
|
||||
nsString* string = new nsString(aString, aLength);
|
||||
if (!string)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
*_retval = string;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsStringService::CreateACString(const char *aString, PRInt32 aLength, nsACString * *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
|
||||
nsCString* string = new nsCString(aString, aLength);
|
||||
if (!string)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
*_retval = string;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsStringService::DeleteAString(nsAString * aString)
|
||||
{
|
||||
delete aString;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsStringService::DeleteACString(nsACString * aString)
|
||||
{
|
||||
delete aString;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsStringService::GetString(const nsACString & aString, char **_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
|
||||
*_retval = ToNewCString(aString);
|
||||
if (!*_retval)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP
|
||||
nsStringService::GetWString(const nsAString & aString, PRUnichar **_retval)
|
||||
{
|
||||
NS_ENSURE_ARG_POINTER(_retval);
|
||||
|
||||
*_retval = ToNewUnicode(aString);
|
||||
if (!*_retval)
|
||||
return NS_ERROR_OUT_OF_MEMORY;
|
||||
|
||||
return NS_OK;
|
||||
}
|
||||
|
@ -1,63 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 2; 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 nsStringService_h___
|
||||
#define nsStringService_h___
|
||||
|
||||
#include "nsIStringService.h"
|
||||
|
||||
#define NS_STRING_SERVICE_CID \
|
||||
{ \
|
||||
0xa0cf8375, \
|
||||
0x0b98, \
|
||||
0x44f5, \
|
||||
{0x97, 0x3f, 0xb2, 0xef, 0xa1, 0xda, 0x67, 0x1e} \
|
||||
}
|
||||
|
||||
#define NS_STRING_SERVICE_CONTRACTID "@mozilla.org/stringService;1"
|
||||
|
||||
class nsStringService : public nsIStringService {
|
||||
|
||||
public:
|
||||
NS_DECL_ISUPPORTS
|
||||
NS_DECL_NSISTRINGSERVICE
|
||||
|
||||
nsStringService();
|
||||
virtual ~nsStringService();
|
||||
};
|
||||
|
||||
#endif
|
@ -1,85 +0,0 @@
|
||||
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
||||
/* ***** 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):
|
||||
* Pierre Phaneuf <pp@ludusdesign.com>
|
||||
*
|
||||
* 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 ***** */
|
||||
|
||||
#include "nsXPCOM.h"
|
||||
#include "nsIServiceManager.h"
|
||||
|
||||
#include "nsIStringService.h"
|
||||
|
||||
int
|
||||
main(void)
|
||||
{
|
||||
nsresult rv;
|
||||
{
|
||||
nsCOMPtr<nsIServiceManager> servMan;
|
||||
rv = NS_InitXPCOM2(getter_AddRefs(servMan), nsnull, nsnull);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("NS_InitXPCOM2 failed\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
nsCOMPtr<nsIStringService> stringService = do_GetService("@mozilla.org/stringService;1");
|
||||
if (!stringService) {
|
||||
printf("String Service not found.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
char in1[] = "The quick brown fox jumped over the lazy dog.";
|
||||
nsACString *aCString;
|
||||
rv = stringService->CreateACString(in1,
|
||||
sizeof in1,
|
||||
&aCString);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("cound not create nsACString.\n");
|
||||
return -1;
|
||||
}
|
||||
|
||||
char* out1;
|
||||
rv = stringService->GetString(*aCString, &out1);
|
||||
if (NS_FAILED(rv)) {
|
||||
printf("Could not obtain string from nsACString.\n");
|
||||
return -1;
|
||||
}
|
||||
}
|
||||
rv = NS_ShutdownXPCOM(nsnull);
|
||||
NS_ASSERTION(NS_SUCCEEDED(rv), "NS_ShutdownXPCOM failed");
|
||||
return 0;
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////////////////////
|
||||
|
Loading…
Reference in New Issue
Block a user