From a7e67ab3f234f0a66c363d434b0469fabf73010a Mon Sep 17 00:00:00 2001 From: Rene Gollent Date: Sat, 18 Apr 2009 16:58:28 +0000 Subject: [PATCH] gcc4 build fix by Maxime Simon. Resolves ticket #3786. Thanks! git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30241 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/preferences/cpufrequency/PreferencesWindow.h | 7 ++++--- src/preferences/cpufrequency/StatusView.cpp | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/preferences/cpufrequency/PreferencesWindow.h b/src/preferences/cpufrequency/PreferencesWindow.h index 90ee52872b..d689ad53da 100644 --- a/src/preferences/cpufrequency/PreferencesWindow.h +++ b/src/preferences/cpufrequency/PreferencesWindow.h @@ -33,6 +33,7 @@ #include // headers PreferencesWindow +#include #include #include #include @@ -375,14 +376,14 @@ PreferencesWindow::MessageReceived(BMessage *msg) break; case kDefaultMsg: - Defaults(); + PreferencesStorage::Defaults(); fRevertButton->SetEnabled(true); if (fPreferencesView) PostMessage(kDefaultMsg, fPreferencesView); break; case kRevertMsg: - Revert(); + PreferencesStorage::Revert(); fRevertButton->SetEnabled(false); if (fPreferencesView) PostMessage(kRevertMsg, fPreferencesView); @@ -425,7 +426,7 @@ template void PreferencesWindow::_MoveToPosition() { - BPoint position = WindowPosition(); + BPoint position = PreferencesStorage::WindowPosition(); // center window on screen if it had a bad position if(position.x < 0 && position.y < 0){ BRect rect = BScreen().Frame(); diff --git a/src/preferences/cpufrequency/StatusView.cpp b/src/preferences/cpufrequency/StatusView.cpp index 36f3f93012..f64a3b7247 100644 --- a/src/preferences/cpufrequency/StatusView.cpp +++ b/src/preferences/cpufrequency/StatusView.cpp @@ -339,7 +339,7 @@ FrequencyMenu::UpdateMenu() StatusView::StatusView(BRect frame, bool inDeskbar, - PreferencesStorage* storage = NULL) + PreferencesStorage* storage) : BView(frame, kDeskbarItemName, B_FOLLOW_LEFT | B_FOLLOW_TOP, B_WILL_DRAW | B_FRAME_EVENTS), fInDeskbar(inDeskbar), @@ -600,7 +600,7 @@ StatusView::ResizeToPreferred(void) void -StatusView::ShowPopUpMenu(bool show = true) +StatusView::ShowPopUpMenu(bool show) { fShowPopUpMenu = show; }