mirror of
https://repo.dactyloidae.xyz/Dactyloidae/UXP.git
synced 2026-09-08 16:58:38 +09:00
Bug 1338306 - nsIPrefBranch.get*Pref should support providing a default value, r=bsmedberg.
This commit is contained in:
parent
2f3189f5a4
commit
a85e8de713
4 changed files with 126 additions and 4 deletions
|
|
@ -141,6 +141,20 @@ NS_IMETHODIMP nsPrefBranch::GetPrefType(const char *aPrefName, int32_t *_retval)
|
|||
return NS_OK;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetBoolPrefWithDefault(const char *aPrefName,
|
||||
bool aDefaultValue,
|
||||
uint8_t _argc, bool *_retval)
|
||||
{
|
||||
nsresult rv = GetBoolPref(aPrefName, _retval);
|
||||
|
||||
if (NS_FAILED(rv) && _argc == 1) {
|
||||
*_retval = aDefaultValue;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetBoolPref(const char *aPrefName, bool *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG(aPrefName);
|
||||
|
|
@ -156,6 +170,20 @@ NS_IMETHODIMP nsPrefBranch::SetBoolPref(const char *aPrefName, bool aValue)
|
|||
return PREF_SetBoolPref(pref, aValue, mIsDefault);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetFloatPrefWithDefault(const char *aPrefName,
|
||||
float aDefaultValue,
|
||||
uint8_t _argc, float *_retval)
|
||||
{
|
||||
nsresult rv = GetFloatPref(aPrefName, _retval);
|
||||
|
||||
if (NS_FAILED(rv) && _argc == 1) {
|
||||
*_retval = aDefaultValue;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetFloatPref(const char *aPrefName, float *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG(aPrefName);
|
||||
|
|
@ -169,6 +197,21 @@ NS_IMETHODIMP nsPrefBranch::GetFloatPref(const char *aPrefName, float *_retval)
|
|||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetCharPrefWithDefault(const char *aPrefName,
|
||||
const char *aDefaultValue,
|
||||
uint8_t _argc, char **_retval)
|
||||
{
|
||||
nsresult rv = GetCharPref(aPrefName, _retval);
|
||||
|
||||
if (NS_FAILED(rv) && _argc == 1) {
|
||||
NS_ENSURE_ARG(aDefaultValue);
|
||||
*_retval = NS_strdup(aDefaultValue);
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetCharPref(const char *aPrefName, char **_retval)
|
||||
{
|
||||
NS_ENSURE_ARG(aPrefName);
|
||||
|
|
@ -195,6 +238,20 @@ nsresult nsPrefBranch::SetCharPrefInternal(const char *aPrefName, const char *aV
|
|||
return PREF_SetCharPref(pref, aValue, mIsDefault);
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetIntPrefWithDefault(const char *aPrefName,
|
||||
int32_t aDefaultValue,
|
||||
uint8_t _argc, int32_t *_retval)
|
||||
{
|
||||
nsresult rv = GetIntPref(aPrefName, _retval);
|
||||
|
||||
if (NS_FAILED(rv) && _argc == 1) {
|
||||
*_retval = aDefaultValue;
|
||||
return NS_OK;
|
||||
}
|
||||
|
||||
return rv;
|
||||
}
|
||||
|
||||
NS_IMETHODIMP nsPrefBranch::GetIntPref(const char *aPrefName, int32_t *_retval)
|
||||
{
|
||||
NS_ENSURE_ARG(aPrefName);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue