diff options
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/whoisonline.cpp | 6 | ||||
| -rw-r--r-- | src/gui/widgets/browserbox.cpp | 4 | ||||
| -rw-r--r-- | src/gui/widgets/itemcontainer.cpp | 12 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/gui/whoisonline.cpp b/src/gui/whoisonline.cpp index 962a0993b..68ea0f67b 100644 --- a/src/gui/whoisonline.cpp +++ b/src/gui/whoisonline.cpp @@ -194,9 +194,9 @@ void WhoIsOnline::updateWindow(std::vector<OnlinePlayer*> &friends, setCaption(_("Who Is Online - ") + toString(numOnline)); //List the online people - sort(friends.begin(), friends.end(), nameCompare); - sort(neutral.begin(), neutral.end(), nameCompare); - sort(disregard.begin(), disregard.end(), nameCompare); + std::sort(friends.begin(), friends.end(), nameCompare); + std::sort(neutral.begin(), neutral.end(), nameCompare); + std::sort(disregard.begin(), disregard.end(), nameCompare); bool addedFromSection(false); for (size_t i = 0, sz = friends.size(); i < sz; i++) { diff --git a/src/gui/widgets/browserbox.cpp b/src/gui/widgets/browserbox.cpp index 18a9df3e2..cac2a53f2 100644 --- a/src/gui/widgets/browserbox.cpp +++ b/src/gui/widgets/browserbox.cpp @@ -319,7 +319,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event) if (!mLinkHandler) return; - const LinkIterator i = find_if(mLinks.begin(), mLinks.end(), + const LinkIterator i = std::find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); if (i != mLinks.end()) @@ -328,7 +328,7 @@ void BrowserBox::mousePressed(gcn::MouseEvent &event) void BrowserBox::mouseMoved(gcn::MouseEvent &event) { - const LinkIterator i = find_if(mLinks.begin(), mLinks.end(), + const LinkIterator i = std::find_if(mLinks.begin(), mLinks.end(), MouseOverLink(event.getX(), event.getY())); mSelectedLink = (i != mLinks.end()) diff --git a/src/gui/widgets/itemcontainer.cpp b/src/gui/widgets/itemcontainer.cpp index 4ccfb566f..e12a15a6b 100644 --- a/src/gui/widgets/itemcontainer.cpp +++ b/src/gui/widgets/itemcontainer.cpp @@ -535,19 +535,21 @@ void ItemContainer::updateMatrix() default: break; case 1: - sort(sortedItems.begin(), sortedItems.end(), itemAlphaSorter); + std::sort(sortedItems.begin(), sortedItems.end(), itemAlphaSorter); break; case 2: - sort(sortedItems.begin(), sortedItems.end(), itemIdSorter); + std::sort(sortedItems.begin(), sortedItems.end(), itemIdSorter); break; case 3: - sort(sortedItems.begin(), sortedItems.end(), itemWeightSorter); + std::sort(sortedItems.begin(), sortedItems.end(), + itemWeightSorter); break; case 4: - sort(sortedItems.begin(), sortedItems.end(), itemAmountSorter); + std::sort(sortedItems.begin(), sortedItems.end(), + itemAmountSorter); break; case 5: - sort(sortedItems.begin(), sortedItems.end(), itemTypeSorter); + std::sort(sortedItems.begin(), sortedItems.end(), itemTypeSorter); break; } |