[haiku-commits] haiku: hrev45459 - src/tests/kits/net/preflet/InterfacesAddOn
- From: kallisti5@xxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Sun, 7 Apr 2013 18:16:55 +0200 (CEST)
hrev45459 adds 1 changeset to branch 'master'
old head: 17c9912b9084d25d3d7a9f6b8e53e27918120ca1
new head: 7cb974614f0e6b997d9fb61d1088475614b5c2e1
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=7cb9746+%5E17c9912
----------------------------------------------------------------------------
7cb9746: NetworkSetup: Use std max vs max_c
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45459
Commit: 7cb974614f0e6b997d9fb61d1088475614b5c2e1
URL: http://cgit.haiku-os.org/haiku/commit/?id=7cb9746
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sun Apr 7 16:16:24 2013 UTC
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 3 deletions(-)
.../kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp | 5 ++---
----------------------------------------------------------------------------
diff --git a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
index 6f38243..e530e1e 100644
--- a/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
+++ b/src/tests/kits/net/preflet/InterfacesAddOn/InterfacesListView.cpp
@@ -37,7 +37,6 @@
#include <Resources.h>
#include <String.h>
#include <SeparatorItem.h>
-#include <SupportDefs.h>
#include <Window.h>
#include <AutoDeleter.h>
@@ -105,7 +104,7 @@ InterfaceListItem::DrawItem(BView* owner, BRect /*bounds*/,
bool complete)
BRect bounds = list->ItemFrame(list->IndexOf(this));
- rgb_color highColor = list->HighColor();
+ //rgb_color highColor = list->HighColor();
rgb_color lowColor = list->LowColor();
if (IsSelected() || complete) {
@@ -225,7 +224,7 @@ InterfaceListItem::Update(BView* owner, const BFont* font)
fSecondlineOffset = fFirstlineOffset + lineHeight;
fThirdlineOffset = fFirstlineOffset + (lineHeight * 2);
- SetHeight(max_c(3 * lineHeight + 4, fIcon->Bounds().Height() + 8));
+ SetHeight(std::max(3 * lineHeight + 4, fIcon->Bounds().Height() + 8));
// either to the text height or icon height, whichever is taller
}
Other related posts:
- » [haiku-commits] haiku: hrev45459 - src/tests/kits/net/preflet/InterfacesAddOn - kallisti5
