Fixed warnings.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24299 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
parent
b92508756d
commit
e0d6d2fe80
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2005-2007, Haiku.
|
* Copyright 2005-2008, Haiku.
|
||||||
* Distributed under the terms of the MIT License.
|
* Distributed under the terms of the MIT License.
|
||||||
*
|
*
|
||||||
* Authors:
|
* Authors:
|
||||||
@ -216,11 +216,12 @@ DesktopSettingsPrivate::_Load()
|
|||||||
bool triggersAlwaysShown;
|
bool triggersAlwaysShown;
|
||||||
if (settings.FindBool("triggers always shown", &triggersAlwaysShown) == B_OK)
|
if (settings.FindBool("triggers always shown", &triggersAlwaysShown) == B_OK)
|
||||||
fMenuInfo.triggers_always_shown = triggersAlwaysShown;
|
fMenuInfo.triggers_always_shown = triggersAlwaysShown;
|
||||||
|
|
||||||
char colorName[12];
|
|
||||||
|
|
||||||
for (int32 i = 0; i < kNumColors; i++) {
|
for (int32 i = 0; i < kNumColors; i++) {
|
||||||
snprintf(colorName, sizeof(colorName), "color%ld", index_to_color_which(i));
|
char colorName[12];
|
||||||
|
snprintf(colorName, sizeof(colorName), "color%ld",
|
||||||
|
(int32)index_to_color_which(i));
|
||||||
|
|
||||||
settings.FindInt32(colorName, (int32*)&fShared.colors[i]);
|
settings.FindInt32(colorName, (int32*)&fShared.colors[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -321,10 +322,10 @@ DesktopSettingsPrivate::Save(uint32 mask)
|
|||||||
settings.AddBool("click to open", fMenuInfo.click_to_open);
|
settings.AddBool("click to open", fMenuInfo.click_to_open);
|
||||||
settings.AddBool("triggers always shown", fMenuInfo.triggers_always_shown);
|
settings.AddBool("triggers always shown", fMenuInfo.triggers_always_shown);
|
||||||
|
|
||||||
char colorName[12];
|
|
||||||
|
|
||||||
for (int32 i = 0; i < kNumColors; i++) {
|
for (int32 i = 0; i < kNumColors; i++) {
|
||||||
snprintf(colorName, sizeof(colorName), "color%ld", index_to_color_which(i));
|
char colorName[12];
|
||||||
|
snprintf(colorName, sizeof(colorName), "color%ld",
|
||||||
|
(int32)index_to_color_which(i));
|
||||||
settings.AddInt32(colorName, (const int32&)fShared.colors[i]);
|
settings.AddInt32(colorName, (const int32&)fShared.colors[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user