mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 22:01:30 +00:00
f941156987
This removes about 2/3 of the occurrences of nsXPIDLString in the tree. The places where nsXPIDLStrings are null-checked are replaced with |rv| checks. The patch also removes a couple of unused declarations from nsIStringBundle.idl. Note that nsStringBundle::GetStringFromNameHelper() was merged into GetStringFromName(), because they both would have had the same signature. --HG-- extra : rebase_source : ac40bc31c2a4997f2db0bd5069cc008757a2df6d
76 lines
1.9 KiB
C++
76 lines
1.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* 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/. */
|
|
|
|
#ifndef nsStringBundle_h__
|
|
#define nsStringBundle_h__
|
|
|
|
#include "mozilla/ReentrantMonitor.h"
|
|
#include "nsIStringBundle.h"
|
|
#include "nsCOMPtr.h"
|
|
#include "nsString.h"
|
|
#include "nsCOMArray.h"
|
|
|
|
class nsIPersistentProperties;
|
|
class nsIStringBundleOverride;
|
|
|
|
class nsStringBundle : public nsIStringBundle
|
|
{
|
|
public:
|
|
// init version
|
|
nsStringBundle(const char* aURLSpec, nsIStringBundleOverride*);
|
|
nsresult LoadProperties();
|
|
|
|
NS_DECL_THREADSAFE_ISUPPORTS
|
|
NS_DECL_NSISTRINGBUNDLE
|
|
|
|
nsCOMPtr<nsIPersistentProperties> mProps;
|
|
|
|
protected:
|
|
virtual ~nsStringBundle();
|
|
|
|
nsresult GetCombinedEnumeration(nsIStringBundleOverride* aOverrideString,
|
|
nsISimpleEnumerator** aResult);
|
|
private:
|
|
nsCString mPropertiesURL;
|
|
nsCOMPtr<nsIStringBundleOverride> mOverrideStrings;
|
|
mozilla::ReentrantMonitor mReentrantMonitor;
|
|
bool mAttemptedLoad;
|
|
bool mLoaded;
|
|
|
|
public:
|
|
static nsresult FormatString(const char16_t *formatStr,
|
|
const char16_t **aParams, uint32_t aLength,
|
|
nsAString& aResult);
|
|
};
|
|
|
|
class nsExtensibleStringBundle;
|
|
|
|
/**
|
|
* An extensible implementation of the StringBundle interface.
|
|
*
|
|
* @created 28/Dec/1999
|
|
* @author Catalin Rotaru [CATA]
|
|
*/
|
|
class nsExtensibleStringBundle final : public nsIStringBundle
|
|
{
|
|
NS_DECL_ISUPPORTS
|
|
NS_DECL_NSISTRINGBUNDLE
|
|
|
|
nsresult Init(const char * aCategory, nsIStringBundleService *);
|
|
|
|
public:
|
|
nsExtensibleStringBundle();
|
|
|
|
private:
|
|
virtual ~nsExtensibleStringBundle();
|
|
|
|
nsCOMArray<nsIStringBundle> mBundles;
|
|
bool mLoaded;
|
|
};
|
|
|
|
|
|
|
|
#endif
|