From bf97f54d1769f791546b2a9bbcf2350e0226659b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Wed, 15 Oct 2014 23:30:19 +0200 Subject: [PATCH] PowerStatus: removed unused uninitialized variable. * Might help with #11329; I can't test this right now. --- src/apps/powerstatus/PowerStatusView.cpp | 16 +++------------- src/apps/powerstatus/PowerStatusView.h | 5 +---- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/src/apps/powerstatus/PowerStatusView.cpp b/src/apps/powerstatus/PowerStatusView.cpp index b36a9d1568..649f3a40a8 100644 --- a/src/apps/powerstatus/PowerStatusView.cpp +++ b/src/apps/powerstatus/PowerStatusView.cpp @@ -52,17 +52,15 @@ const uint32 kMsgToggleExtInfo = 'texi'; const uint32 kMinIconWidth = 16; const uint32 kMinIconHeight = 16; + PowerStatusView::PowerStatusView(PowerStatusDriverInterface* interface, - BRect frame, int32 resizingMode, int batteryID, bool inDeskbar) - : - BView(frame, kDeskbarItemName, resizingMode, + BRect frame, int32 resizingMode, int batteryID, bool inDeskbar) + : BView(frame, kDeskbarItemName, resizingMode, B_WILL_DRAW | B_FULL_UPDATE_ON_RESIZE), fDriverInterface(interface), fBatteryID(batteryID), fInDeskbar(inDeskbar) { - fPreferredSize.width = frame.Width(); - fPreferredSize.height = frame.Height(); _Init(); } @@ -139,14 +137,6 @@ PowerStatusView::MessageReceived(BMessage *message) } -void -PowerStatusView::GetPreferredSize(float *width, float *height) -{ - *width = fPreferredSize.width; - *height = fPreferredSize.height; -} - - void PowerStatusView::_DrawBattery(BRect rect) { diff --git a/src/apps/powerstatus/PowerStatusView.h b/src/apps/powerstatus/PowerStatusView.h index 837bb2d3e1..006cb0658e 100644 --- a/src/apps/powerstatus/PowerStatusView.h +++ b/src/apps/powerstatus/PowerStatusView.h @@ -1,5 +1,5 @@ /* - * Copyright 2006-2009, Haiku, Inc. All Rights Reserved. + * Copyright 2006-2014, Haiku, Inc. All Rights Reserved. * Distributed under the terms of the MIT License. * * Authors: @@ -34,7 +34,6 @@ public: virtual void MessageReceived(BMessage* message); virtual void Draw(BRect updateRect); - virtual void GetPreferredSize(float *width, float *height); protected: @@ -67,8 +66,6 @@ protected: time_t fTimeLeft; bool fOnline; bool fHasBattery; - - BSize fPreferredSize; };