i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Tracker: style fixes to Settings class

Browse Source
This commit is contained in:
John Scipione
2014-06-20 21:29:33 -04:00
parent 775ad007b5
commit 262e7c9368
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/tracker/Settings.cpp
+19 -11
View File
@@ -32,6 +32,8 @@ names are registered trademarks or trademarks of their respective holders.
All rights reserved. All rights reserved.
*/ */
// generic setting handler classes
#include <Debug.h> #include <Debug.h>
@@ -44,12 +46,15 @@ All rights reserved.
Settings* settings = NULL; Settings* settings = NULL;
// generic setting handler classes
// #pragma mark - StringValueSetting
StringValueSetting::StringValueSetting(const char* name, StringValueSetting::StringValueSetting(const char* name,
const char* defaultValue, const char* valueExpectedErrorString, const char* defaultValue, const char* valueExpectedErrorString,
const char* wrongValueErrorString) const char* wrongValueErrorString)
: SettingsArgvDispatcher(name), :
SettingsArgvDispatcher(name),
fDefaultValue(defaultValue), fDefaultValue(defaultValue),
fValueExpectedErrorString(valueExpectedErrorString), fValueExpectedErrorString(valueExpectedErrorString),
fWrongValueErrorString(wrongValueErrorString), fWrongValueErrorString(wrongValueErrorString),
@@ -103,13 +108,14 @@ StringValueSetting::Handle(const char* const* argv)
} }
// #pragma mark - // #pragma mark - EnumeratedStringValueSetting
EnumeratedStringValueSetting::EnumeratedStringValueSetting(const char* name, EnumeratedStringValueSetting::EnumeratedStringValueSetting(const char* name,
const char* defaultValue, const char* const* values, const char* defaultValue, const char* const* values,
const char* valueExpectedErrorString, const char* wrongValueErrorString) const char* valueExpectedErrorString, const char* wrongValueErrorString)
: StringValueSetting(name, defaultValue, valueExpectedErrorString, :
StringValueSetting(name, defaultValue, valueExpectedErrorString,
wrongValueErrorString), wrongValueErrorString),
fValues(values) fValues(values)
{ {
@@ -123,7 +129,7 @@ EnumeratedStringValueSetting::ValueChanged(const char* newValue)
// must be one of the enumerated values // must be one of the enumerated values
bool found = false; bool found = false;
for (int32 index = 0; ; index++) { for (int32 index = 0; ; index++) {
if (!fValues[index]) if (fValues[index] == NULL)
break; break;
if (strcmp(fValues[index], newValue) != 0) if (strcmp(fValues[index], newValue) != 0)
@@ -146,7 +152,7 @@ EnumeratedStringValueSetting::Handle(const char* const* argv)
bool found = false; bool found = false;
for (int32 index = 0; ; index++) { for (int32 index = 0; ; index++) {
if (!fValues[index]) if (fValues[index] == NULL)
break; break;
if (strcmp(fValues[index], *argv) != 0) if (strcmp(fValues[index], *argv) != 0)
@@ -164,13 +170,14 @@ EnumeratedStringValueSetting::Handle(const char* const* argv)
} }
// #pragma mark - // #pragma mark - ScalarValueSetting
ScalarValueSetting::ScalarValueSetting(const char* name, int32 defaultValue, ScalarValueSetting::ScalarValueSetting(const char* name, int32 defaultValue,
const char* valueExpectedErrorString, const char* wrongValueErrorString, const char* valueExpectedErrorString, const char* wrongValueErrorString,
int32 min, int32 max) int32 min, int32 max)
: SettingsArgvDispatcher(name), :
SettingsArgvDispatcher(name),
fDefaultValue(defaultValue), fDefaultValue(defaultValue),
fValue(defaultValue), fValue(defaultValue),
fMax(max), fMax(max),
@@ -238,13 +245,14 @@ ScalarValueSetting::NeedsSaving() const
} }
// #pragma mark - // #pragma mark - HexScalarValueSetting
HexScalarValueSetting::HexScalarValueSetting(const char* name, HexScalarValueSetting::HexScalarValueSetting(const char* name,
int32 defaultValue, const char* valueExpectedErrorString, int32 defaultValue, const char* valueExpectedErrorString,
const char* wrongValueErrorString, int32 min, int32 max) const char* wrongValueErrorString, int32 min, int32 max)
: ScalarValueSetting(name, defaultValue, valueExpectedErrorString, :
ScalarValueSetting(name, defaultValue, valueExpectedErrorString,
wrongValueErrorString, min, max) wrongValueErrorString, min, max)
{ {
} }
@@ -264,7 +272,7 @@ HexScalarValueSetting::SaveSettingValue(Settings* settings)
} }
// #pragma mark - // #pragma mark - BooleanValueSetting
BooleanValueSetting::BooleanValueSetting(const char* name, bool defaultValue) BooleanValueSetting::BooleanValueSetting(const char* name, bool defaultValue)
src/kits/tracker/Settings.h
+4 -3
View File
@@ -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. names are registered trademarks or trademarks of their respective holders.
All rights reserved. All rights reserved.
*/ */
#ifndef _SETTINGS_H_ #ifndef _SETTINGS_H
#define _SETTINGS_H_ #define _SETTINGS_H
#include <String.h> #include <String.h>
@@ -138,4 +138,5 @@ protected:
using namespace BPrivate; using namespace BPrivate;
#endif // _SETTINGS_H_
#endif // _SETTINGS_H