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

Use the new Get* BMessage methods to simplify code.

Browse Source 
Thanks Axel!
This commit is contained in:
John Scipione
2013-03-18 11:48:58 -04:00
parent c7047b8fd2
commit cf7c89ff4a
1 changed files with 48 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/apps/deskbar/BarApp.cpp
+47 -69
View File
@@ -289,76 +289,54 @@ TBarApp::InitSettings()
BMessage prefs; BMessage prefs;
if (fSettingsFile->InitCheck() == B_OK if (fSettingsFile->InitCheck() == B_OK
&& prefs.Unflatten(fSettingsFile) == B_OK) { && prefs.Unflatten(fSettingsFile) == B_OK) {
if (prefs.FindBool("vertical", &settings.vertical) != B_OK) settings.vertical = prefs.GetBool("vertical",
settings.vertical = fDefaultSettings.vertical; fDefaultSettings.vertical);
if (prefs.FindBool("left", &settings.left) != B_OK) settings.left = prefs.GetBool("left",
settings.left = fDefaultSettings.left; fDefaultSettings.left);
if (prefs.FindBool("top", &settings.top) != B_OK) settings.top = prefs.GetBool("top",
settings.top = fDefaultSettings.top; fDefaultSettings.top);
if (prefs.FindUInt32("state", &settings.state) != B_OK) settings.state = prefs.GetUInt32("state",
settings.state = fDefaultSettings.state; fDefaultSettings.state);
if (prefs.FindFloat("width", &settings.width) != B_OK) settings.width = prefs.GetFloat("width",
settings.width = fDefaultSettings.width; fDefaultSettings.width);
if (prefs.FindPoint("switcherLoc", &settings.switcherLoc) != B_OK) settings.switcherLoc = prefs.GetPoint("switcherLoc",
settings.switcherLoc = fDefaultSettings.switcherLoc; fDefaultSettings.switcherLoc);
if (prefs.FindBool("showClock", &settings.showClock) != B_OK) settings.showClock = prefs.GetBool("showClock",
settings.showClock = fDefaultSettings.showClock; fDefaultSettings.showClock);
// applications // applications
if (prefs.FindBool("trackerAlwaysFirst", settings.trackerAlwaysFirst = prefs.GetBool("trackerAlwaysFirst",
&settings.trackerAlwaysFirst) != B_OK) { fDefaultSettings.trackerAlwaysFirst);
settings.trackerAlwaysFirst settings.sortRunningApps = prefs.GetBool("sortRunningApps",
= fDefaultSettings.trackerAlwaysFirst; fDefaultSettings.sortRunningApps);
} settings.superExpando = prefs.GetBool("superExpando",
if (prefs.FindBool("sortRunningApps", fDefaultSettings.superExpando);
&settings.sortRunningApps) != B_OK) { settings.expandNewTeams = prefs.GetBool("expandNewTeams",
settings.sortRunningApps = fDefaultSettings.sortRunningApps; fDefaultSettings.expandNewTeams);
} settings.hideLabels = prefs.GetBool("hideLabels",
if (prefs.FindBool("superExpando", &settings.superExpando) != B_OK) fDefaultSettings.hideLabels);
settings.superExpando = fDefaultSettings.superExpando; settings.iconSize = prefs.GetInt32("iconSize",
if (prefs.FindBool("expandNewTeams", fDefaultSettings.iconSize);
&settings.expandNewTeams) != B_OK) {
settings.expandNewTeams = fDefaultSettings.expandNewTeams;
}
if (prefs.FindBool("hideLabels", &settings.hideLabels) != B_OK)
settings.hideLabels = fDefaultSettings.hideLabels;
if (prefs.FindInt32("iconSize", &settings.iconSize) != B_OK)
settings.iconSize = fDefaultSettings.iconSize;
// recent items // recent items
if (prefs.FindBool("recentDocsEnabled", settings.recentDocsEnabled = prefs.GetBool("recentDocsEnabled",
&settings.recentDocsEnabled) != B_OK) { fDefaultSettings.recentDocsEnabled);
settings.recentDocsEnabled
= fDefaultSettings.recentDocsEnabled;
}
if (prefs.FindBool("recentFoldersEnabled",
&settings.recentFoldersEnabled) != B_OK) {
settings.recentFoldersEnabled settings.recentFoldersEnabled
= fDefaultSettings.recentFoldersEnabled; = prefs.GetBool("recentFoldersEnabled",
} fDefaultSettings.recentFoldersEnabled);
if (prefs.FindBool("recentAppsEnabled", settings.recentAppsEnabled = prefs.GetBool("recentAppsEnabled",
&settings.recentAppsEnabled) != B_OK) { fDefaultSettings.recentAppsEnabled);
settings.recentAppsEnabled settings.recentDocsCount = prefs.GetInt32("recentDocsCount",
= fDefaultSettings.recentAppsEnabled; fDefaultSettings.recentDocsCount);
} settings.recentFoldersCount = prefs.GetInt32("recentFoldersCount",
if (prefs.FindInt32("recentDocsCount", fDefaultSettings.recentFoldersCount);
&settings.recentDocsCount) != B_OK) { settings.recentAppsCount = prefs.GetInt32("recentAppsCount",
settings.recentDocsCount = fDefaultSettings.recentDocsCount; fDefaultSettings.recentAppsCount);
}
if (prefs.FindInt32("recentFoldersCount",
&settings.recentFoldersCount) != B_OK) {
settings.recentFoldersCount
= fDefaultSettings.recentFoldersCount;
}
if (prefs.FindInt32("recentAppsCount",
&settings.recentAppsCount) != B_OK) {
settings.recentAppsCount = fDefaultSettings.recentAppsCount;
}
// window // window
if (prefs.FindBool("alwaysOnTop", &settings.alwaysOnTop) != B_OK) settings.alwaysOnTop = prefs.GetBool("alwaysOnTop",
settings.alwaysOnTop = fDefaultSettings.alwaysOnTop; fDefaultSettings.alwaysOnTop);
if (prefs.FindBool("autoRaise", &settings.autoRaise) != B_OK) settings.autoRaise = prefs.GetBool("autoRaise",
settings.autoRaise = fDefaultSettings.autoRaise; fDefaultSettings.autoRaise);
if (prefs.FindBool("autoHide", &settings.autoHide) != B_OK) settings.autoHide = prefs.GetBool("autoHide",
settings.autoHide = fDefaultSettings.autoHide; fDefaultSettings.autoHide);
} }
filePath = dirPath; filePath = dirPath;
@@ -372,9 +350,9 @@ TBarApp::InitSettings()
if (fClockSettingsFile->InitCheck() == B_OK if (fClockSettingsFile->InitCheck() == B_OK
&& prefs.Unflatten(fClockSettingsFile) == B_OK) { && prefs.Unflatten(fClockSettingsFile) == B_OK) {
prefs.FindBool("showSeconds", &clock.showSeconds); clock.showSeconds = prefs.GetBool("showSeconds", false);
prefs.FindBool("showDayOfWeek", &clock.showDayOfWeek); clock.showDayOfWeek = prefs.GetBool("showDayOfWeek", false);
prefs.FindBool("showTimeZone", &clock.showTimeZone); clock.showTimeZone = prefs.GetBool("showTimeZone", false);
} }
} }