From 1af247a60d2a3a995b7f5efa615b14cccc1dd69c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= Date: Wed, 16 Jan 2008 22:08:33 +0000 Subject: [PATCH] Fix gcc4 errors and warnings. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@23569 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- 3rdparty/mmu_man/themes/ThemeInterfaceView.cpp | 2 +- 3rdparty/mmu_man/themes/Utils.cpp | 4 ++-- 3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp | 5 +---- 3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp b/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp index 99c2e37c70..569ee61c77 100644 --- a/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp +++ b/3rdparty/mmu_man/themes/ThemeInterfaceView.cpp @@ -88,7 +88,7 @@ class MyInvoker : public BInvoker { }; -MyInvoker::MyInvoker(BMessage* message, const BHandler* handler, const BLooper* looper = NULL) +MyInvoker::MyInvoker(BMessage* message, const BHandler* handler, const BLooper* looper) : BInvoker(message, handler, looper) { } diff --git a/3rdparty/mmu_man/themes/Utils.cpp b/3rdparty/mmu_man/themes/Utils.cpp index 591c3ab2fc..c27b4b45b7 100644 --- a/3rdparty/mmu_man/themes/Utils.cpp +++ b/3rdparty/mmu_man/themes/Utils.cpp @@ -36,8 +36,8 @@ extern status_t _get_nth_font_folder_(long, font_folder_info **); status_t find_font_file(entry_ref *to, font_family family, font_style style, float size) { - status_t err = ENOENT; #ifdef B_BEOS_VERSION_DANO + status_t err = ENOENT; long i, fontcount, foldercount; font_file_info *ffi; font_folder_info *fdi; @@ -331,7 +331,7 @@ FindFont(BMessage &message, const char *name, int32 index, BFont *f) status_t -AddFont(BMessage &message, const char *name, BFont *f, int32 count = 1) +AddFont(BMessage &message, const char *name, BFont *f, int32 count) { #ifdef B_BEOS_VERSION_DANO return message.AddFlat(name, f, count); diff --git a/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp b/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp index 4578fc6372..90c43d462f 100644 --- a/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp +++ b/3rdparty/mmu_man/themes/addons/HaikuUISettingsAddon.cpp @@ -137,9 +137,6 @@ status_t UISettingsThemesAddon::RunPreferencesPanel() status_t UISettingsThemesAddon::AddNames(BMessage &names) { - const char *str, *value; - type_code code; - int32 i; FENTRY; names.AddString(Z_THEME_UI_SETTINGS, "UI Settings"); @@ -266,10 +263,10 @@ status_t UISettingsThemesAddon::ApplyDefaultTheme(uint32 flags) BMessage theme; BMessage uisettings; BFont fnt; - status_t err; FENTRY; /* + status_t err; err = get_default_settings(&uisettings); if (err) return err; diff --git a/3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp b/3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp index 32481e6dd1..431bd2df53 100644 --- a/3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp +++ b/3rdparty/mmu_man/themes/addons/SoundplayColorAddon.cpp @@ -88,7 +88,7 @@ status_t SoundplayThemesAddon::ApplyTheme(BMessage &theme, uint32 flags) BMessage command(B_COUNT_PROPERTIES); BMessage answer; command.AddSpecifier("Window"); - err = msgr.SendMessage(&command, &answer,2E6,2E6); + err = msgr.SendMessage(&command, &answer,2000000LL,2000000LL); if(B_OK == err) { if (answer.FindInt32("result", &wincnt) != B_OK) wincnt = 1; @@ -100,7 +100,7 @@ status_t SoundplayThemesAddon::ApplyTheme(BMessage &theme, uint32 flags) for (int32 i = 0; i < wincnt; i++) { BMessage wmsg(msg); wmsg.AddSpecifier("Window", i); - msgr.SendMessage(&wmsg, (BHandler *)NULL, 2E6); + msgr.SendMessage(&wmsg, (BHandler *)NULL, 2000000LL); } return B_OK;