i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BMenu: Replace min_c and max_c

Browse Source 
... with std:min and std:max
This commit is contained in:
John Scipione
2014-04-24 15:31:13 -04:00
parent b7096fd76b
commit ca6cc0aa50
1 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/interface/Menu.cpp
+11 -9
View File
@@ -13,7 +13,9 @@
#include <Menu.h> #include <Menu.h>
#include <algorithm>
#include <new> #include <new>
#include <ctype.h> #include <ctype.h>
#include <string.h> #include <string.h>
@@ -2039,11 +2041,11 @@ BMenu::_RemoveItems(int32 index, int32 count, BMenuItem* item,
} }
} else { } else {
// We iterate backwards because it's simpler // We iterate backwards because it's simpler
int32 i = min_c(index + count - 1, fItems.CountItems() - 1); int32 i = std::min(index + count - 1, fItems.CountItems() - 1);
// NOTE: the range check for "index" is done after // NOTE: the range check for "index" is done after
// calculating the last index to be removed, so // calculating the last index to be removed, so
// that the range is not "shifted" unintentionally // that the range is not "shifted" unintentionally
index = max_c(0, index); index = std::max((int32)0, index);
for (; i >= index; i--) { for (; i >= index; i--) {
item = static_cast<BMenuItem*>(fItems.ItemAt(i)); item = static_cast<BMenuItem*>(fItems.ItemAt(i));
if (item != NULL) { if (item != NULL) {
@@ -2235,7 +2237,7 @@ BMenu::_ComputeColumnLayout(int32 index, bool bestFit, bool moveItems,
if (item->fSubmenu != NULL) if (item->fSubmenu != NULL)
width += item->Frame().Height(); width += item->Frame().Height();
frame.right = max_c(frame.right, width + fPad.left + fPad.right); frame.right = std::max(frame.right, width + fPad.left + fPad.right);
frame.bottom = item->fBounds.bottom; frame.bottom = item->fBounds.bottom;
} }
@@ -2257,7 +2259,7 @@ BMenu::_ComputeColumnLayout(int32 index, bool bestFit, bool moveItems,
} }
if (fMaxContentWidth > 0) if (fMaxContentWidth > 0)
frame.right = min_c(frame.right, fMaxContentWidth); frame.right = std::min(frame.right, fMaxContentWidth);
if (moveItems) { if (moveItems) {
for (int32 i = 0; i < fItems.CountItems(); i++) for (int32 i = 0; i < fItems.CountItems(); i++)
@@ -2290,7 +2292,7 @@ BMenu::_ComputeRowLayout(int32 index, bool bestFit, bool moveItems,
+ fPad.right; + fPad.right;
frame.right = item->Frame().right + 1.0f; frame.right = item->Frame().right + 1.0f;
frame.bottom = max_c(frame.bottom, height + fPad.top + fPad.bottom); frame.bottom = std::max(frame.bottom, height + fPad.top + fPad.bottom);
} }
if (moveItems) { if (moveItems) {
@@ -2312,10 +2314,10 @@ BMenu::_ComputeMatrixLayout(BRect &frame)
for (int32 i = 0; i < CountItems(); i++) { for (int32 i = 0; i < CountItems(); i++) {
BMenuItem* item = ItemAt(i); BMenuItem* item = ItemAt(i);
if (item != NULL) { if (item != NULL) {
frame.left = min_c(frame.left, item->Frame().left); frame.left = std::min(frame.left, item->Frame().left);
frame.right = max_c(frame.right, item->Frame().right); frame.right = std::max(frame.right, item->Frame().right);
frame.top = min_c(frame.top, item->Frame().top); frame.top = std::min(frame.top, item->Frame().top);
frame.bottom = max_c(frame.bottom, item->Frame().bottom); frame.bottom = std::max(frame.bottom, item->Frame().bottom);
} }
} }
} }