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

* Cleanup, no functional change.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@39078 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2010-10-23 19:48:29 +00:00
parent ad0bdcaa37
commit fb5adc1f7b
1 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/showimage/ShowImageSettings.cpp
+38 -56
View File
@@ -1,11 +1,12 @@
/* /*
* Copyright 2003-2009 Haiku Inc. All rights reserved. * Copyright 2003-2010 Haiku Inc. All rights reserved.
* Distributed under the terms of the MIT License. * Distributed under the terms of the MIT License.
* *
* Authors: * Authors:
* Michael Pfeiffer, [email protected] * Michael Pfeiffer, [email protected]
*/ */
#include "ShowImageSettings.h" #include "ShowImageSettings.h"
#include <File.h> #include <File.h>
@@ -46,35 +47,32 @@ bool
ShowImageSettings::GetBool(const char* name, bool defaultValue) ShowImageSettings::GetBool(const char* name, bool defaultValue)
{ {
bool value; bool value;
if (fSettings.FindBool(name, &value) == B_OK) { if (fSettings.FindBool(name, &value) == B_OK)
return value; return value;
} else {
return defaultValue; return defaultValue;
}
} }
int32 int32
ShowImageSettings::GetInt32(const char* name, int32 defaultValue) ShowImageSettings::GetInt32(const char* name, int32 defaultValue)
{ {
int32 value; int32 value;
if (fSettings.FindInt32(name, &value) == B_OK) { if (fSettings.FindInt32(name, &value) == B_OK)
return value; return value;
} else {
return defaultValue; return defaultValue;
}
} }
float float
ShowImageSettings::GetFloat(const char* name, float defaultValue) ShowImageSettings::GetFloat(const char* name, float defaultValue)
{ {
float value; float value;
if (fSettings.FindFloat(name, &value) == B_OK) { if (fSettings.FindFloat(name, &value) == B_OK)
return value; return value;
} else {
return defaultValue; return defaultValue;
}
} }
@@ -82,11 +80,10 @@ BRect
ShowImageSettings::GetRect(const char* name, BRect defaultValue) ShowImageSettings::GetRect(const char* name, BRect defaultValue)
{ {
BRect value; BRect value;
if (fSettings.FindRect(name, &value) == B_OK) { if (fSettings.FindRect(name, &value) == B_OK)
return value; return value;
} else {
return defaultValue; return defaultValue;
}
} }
@@ -94,87 +91,75 @@ const char*
ShowImageSettings::GetString(const char* name, const char* defaultValue) ShowImageSettings::GetString(const char* name, const char* defaultValue)
{ {
const char* value; const char* value;
if (fSettings.FindString(name, &value) == B_OK) { if (fSettings.FindString(name, &value) == B_OK)
return value; return value;
} else {
return defaultValue; return defaultValue;
}
} }
void void
ShowImageSettings::SetBool(const char* name, bool value) ShowImageSettings::SetBool(const char* name, bool value)
{ {
if (fSettings.HasBool(name)) { if (fSettings.HasBool(name))
fSettings.ReplaceBool(name, value); fSettings.ReplaceBool(name, value);
} else { else
fSettings.AddBool(name, value); fSettings.AddBool(name, value);
}
} }
void void
ShowImageSettings::SetInt32(const char* name, int32 value) ShowImageSettings::SetInt32(const char* name, int32 value)
{ {
if (fSettings.HasInt32(name)) { if (fSettings.HasInt32(name))
fSettings.ReplaceInt32(name, value); fSettings.ReplaceInt32(name, value);
} else { else
fSettings.AddInt32(name, value); fSettings.AddInt32(name, value);
}
} }
void void
ShowImageSettings::SetFloat(const char* name, float value) ShowImageSettings::SetFloat(const char* name, float value)
{ {
if (fSettings.HasFloat(name)) { if (fSettings.HasFloat(name))
fSettings.ReplaceFloat(name, value); fSettings.ReplaceFloat(name, value);
} else { else
fSettings.AddFloat(name, value); fSettings.AddFloat(name, value);
}
} }
void void
ShowImageSettings::SetRect(const char* name, BRect value) ShowImageSettings::SetRect(const char* name, BRect value)
{ {
if (fSettings.HasRect(name)) { if (fSettings.HasRect(name))
fSettings.ReplaceRect(name, value); fSettings.ReplaceRect(name, value);
} else { else
fSettings.AddRect(name, value); fSettings.AddRect(name, value);
}
} }
void void
ShowImageSettings::SetString(const char* name, const char* value) ShowImageSettings::SetString(const char* name, const char* value)
{ {
if (fSettings.HasString(name)) { if (fSettings.HasString(name))
fSettings.ReplaceString(name, value); fSettings.ReplaceString(name, value);
} else { else
fSettings.AddString(name, value); fSettings.AddString(name, value);
}
} }
bool bool
ShowImageSettings::OpenSettingsFile(BFile* file, bool forReading) ShowImageSettings::OpenSettingsFile(BFile* file, bool forReading)
{ {
status_t st;
BPath path; BPath path;
uint32 openMode; status_t status = find_directory(B_USER_SETTINGS_DIRECTORY, &path);
if (status != B_OK)
st = find_directory(B_USER_SETTINGS_DIRECTORY, &path); return false;
if (st != B_OK) return false;
path.Append("ShowImage_settings"); path.Append("ShowImage_settings");
if (forReading) {
openMode = B_READ_ONLY; return file->SetTo(path.Path(), forReading
} else { ? B_READ_ONLY : B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE) == B_OK;
openMode = B_WRITE_ONLY | B_CREATE_FILE | B_ERASE_FILE;
}
st = file->SetTo(path.Path(), openMode);
return st == B_OK;
} }
@@ -182,9 +167,8 @@ void
ShowImageSettings::Load() ShowImageSettings::Load()
{ {
BFile file; BFile file;
if (OpenSettingsFile(&file, true)) { if (OpenSettingsFile(&file, true))
fSettings.Unflatten(&file); fSettings.Unflatten(&file);
}
} }
@@ -192,8 +176,6 @@ void
ShowImageSettings::Save() ShowImageSettings::Save()
{ {
BFile file; BFile file;
if (OpenSettingsFile(&file, false)) { if (OpenSettingsFile(&file, false))
fSettings.Flatten(&file); fSettings.Flatten(&file);
}
} }