From e0d6d2fe80166f7b778981e8f1fb33ce6ac91fb7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sat, 8 Mar 2008 11:36:10 +0000 Subject: [PATCH] Fixed warnings. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@24299 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/servers/app/DesktopSettings.cpp | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/servers/app/DesktopSettings.cpp b/src/servers/app/DesktopSettings.cpp index 9f13aa5505..8dc9d38a4d 100644 --- a/src/servers/app/DesktopSettings.cpp +++ b/src/servers/app/DesktopSettings.cpp @@ -1,5 +1,5 @@ /* - * Copyright 2005-2007, Haiku. + * Copyright 2005-2008, Haiku. * Distributed under the terms of the MIT License. * * Authors: @@ -216,11 +216,12 @@ DesktopSettingsPrivate::_Load() bool triggersAlwaysShown; if (settings.FindBool("triggers always shown", &triggersAlwaysShown) == B_OK) fMenuInfo.triggers_always_shown = triggersAlwaysShown; - - char colorName[12]; - + 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]); } } @@ -321,10 +322,10 @@ DesktopSettingsPrivate::Save(uint32 mask) settings.AddBool("click to open", fMenuInfo.click_to_open); settings.AddBool("triggers always shown", fMenuInfo.triggers_always_shown); - char colorName[12]; - 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]); }