Tracker: style fixes to Settings class
This commit is contained in:
@@ -32,6 +32,8 @@ names are registered trademarks or trademarks of their respective holders.
|
||||
All rights reserved.
|
||||
*/
|
||||
|
||||
// generic setting handler classes
|
||||
|
||||
|
||||
#include <Debug.h>
|
||||
|
||||
@@ -44,16 +46,19 @@ All rights reserved.
|
||||
|
||||
Settings* settings = NULL;
|
||||
|
||||
// generic setting handler classes
|
||||
|
||||
// #pragma mark - StringValueSetting
|
||||
|
||||
|
||||
StringValueSetting::StringValueSetting(const char* name,
|
||||
const char* defaultValue, const char* valueExpectedErrorString,
|
||||
const char* wrongValueErrorString)
|
||||
: SettingsArgvDispatcher(name),
|
||||
fDefaultValue(defaultValue),
|
||||
fValueExpectedErrorString(valueExpectedErrorString),
|
||||
fWrongValueErrorString(wrongValueErrorString),
|
||||
fValue(defaultValue)
|
||||
:
|
||||
SettingsArgvDispatcher(name),
|
||||
fDefaultValue(defaultValue),
|
||||
fValueExpectedErrorString(valueExpectedErrorString),
|
||||
fWrongValueErrorString(wrongValueErrorString),
|
||||
fValue(defaultValue)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -103,15 +108,16 @@ StringValueSetting::Handle(const char* const* argv)
|
||||
}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
// #pragma mark - EnumeratedStringValueSetting
|
||||
|
||||
|
||||
EnumeratedStringValueSetting::EnumeratedStringValueSetting(const char* name,
|
||||
const char* defaultValue, const char* const* values,
|
||||
const char* valueExpectedErrorString, const char* wrongValueErrorString)
|
||||
: StringValueSetting(name, defaultValue, valueExpectedErrorString,
|
||||
wrongValueErrorString),
|
||||
fValues(values)
|
||||
:
|
||||
StringValueSetting(name, defaultValue, valueExpectedErrorString,
|
||||
wrongValueErrorString),
|
||||
fValues(values)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -123,7 +129,7 @@ EnumeratedStringValueSetting::ValueChanged(const char* newValue)
|
||||
// must be one of the enumerated values
|
||||
bool found = false;
|
||||
for (int32 index = 0; ; index++) {
|
||||
if (!fValues[index])
|
||||
if (fValues[index] == NULL)
|
||||
break;
|
||||
|
||||
if (strcmp(fValues[index], newValue) != 0)
|
||||
@@ -146,7 +152,7 @@ EnumeratedStringValueSetting::Handle(const char* const* argv)
|
||||
|
||||
bool found = false;
|
||||
for (int32 index = 0; ; index++) {
|
||||
if (!fValues[index])
|
||||
if (fValues[index] == NULL)
|
||||
break;
|
||||
|
||||
if (strcmp(fValues[index], *argv) != 0)
|
||||
@@ -164,19 +170,20 @@ EnumeratedStringValueSetting::Handle(const char* const* argv)
|
||||
}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
// #pragma mark - ScalarValueSetting
|
||||
|
||||
|
||||
ScalarValueSetting::ScalarValueSetting(const char* name, int32 defaultValue,
|
||||
const char* valueExpectedErrorString, const char* wrongValueErrorString,
|
||||
int32 min, int32 max)
|
||||
: SettingsArgvDispatcher(name),
|
||||
fDefaultValue(defaultValue),
|
||||
fValue(defaultValue),
|
||||
fMax(max),
|
||||
fMin(min),
|
||||
fValueExpectedErrorString(valueExpectedErrorString),
|
||||
fWrongValueErrorString(wrongValueErrorString)
|
||||
:
|
||||
SettingsArgvDispatcher(name),
|
||||
fDefaultValue(defaultValue),
|
||||
fValue(defaultValue),
|
||||
fMax(max),
|
||||
fMin(min),
|
||||
fValueExpectedErrorString(valueExpectedErrorString),
|
||||
fWrongValueErrorString(wrongValueErrorString)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -238,14 +245,15 @@ ScalarValueSetting::NeedsSaving() const
|
||||
}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
// #pragma mark - HexScalarValueSetting
|
||||
|
||||
|
||||
HexScalarValueSetting::HexScalarValueSetting(const char* name,
|
||||
int32 defaultValue, const char* valueExpectedErrorString,
|
||||
const char* wrongValueErrorString, int32 min, int32 max)
|
||||
: ScalarValueSetting(name, defaultValue, valueExpectedErrorString,
|
||||
wrongValueErrorString, min, max)
|
||||
:
|
||||
ScalarValueSetting(name, defaultValue, valueExpectedErrorString,
|
||||
wrongValueErrorString, min, max)
|
||||
{
|
||||
}
|
||||
|
||||
@@ -264,7 +272,7 @@ HexScalarValueSetting::SaveSettingValue(Settings* settings)
|
||||
}
|
||||
|
||||
|
||||
// #pragma mark -
|
||||
// #pragma mark - BooleanValueSetting
|
||||
|
||||
|
||||
BooleanValueSetting::BooleanValueSetting(const char* name, bool defaultValue)
|
||||
|
||||
@@ -31,8 +31,8 @@ of Be Incorporated in the United States and other countries. Other brand product
|
||||
names are registered trademarks or trademarks of their respective holders.
|
||||
All rights reserved.
|
||||
*/
|
||||
#ifndef _SETTINGS_H_
|
||||
#define _SETTINGS_H_
|
||||
#ifndef _SETTINGS_H
|
||||
#define _SETTINGS_H
|
||||
|
||||
|
||||
#include <String.h>
|
||||
@@ -138,4 +138,5 @@ protected:
|
||||
|
||||
using namespace BPrivate;
|
||||
|
||||
#endif // _SETTINGS_H_
|
||||
|
||||
#endif // _SETTINGS_H
|
||||
|
||||
Reference in New Issue
Block a user