diff options
| author | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-09-02 12:35:22 +0200 |
|---|---|---|
| committer | LogicParrot <LogicParrot@users.noreply.github.com> | 2017-09-02 12:35:22 +0200 |
| commit | 07a5bf0984559d04fce1091b82b0952217ac64cc (patch) | |
| tree | 0d1eee372a782213c9e2b84deaefe717b379a04b /src/UI/Window.cpp | |
| parent | Skeletons (diff) | |
| parent | Revert "Replace ItemCallbacks with lambdas (#3948)" (diff) | |
| download | cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.tar cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.tar.gz cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.tar.bz2 cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.tar.lz cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.tar.xz cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.tar.zst cuberite-07a5bf0984559d04fce1091b82b0952217ac64cc.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/UI/Window.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/UI/Window.cpp b/src/UI/Window.cpp index 9fbc4d988..8bbc4f482 100644 --- a/src/UI/Window.cpp +++ b/src/UI/Window.cpp @@ -1,4 +1,4 @@ -#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules +#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules #include "Window.h" #include "WindowOwner.h" @@ -362,12 +362,12 @@ void cWindow::OwnerDestroyed() -bool cWindow::ForEachPlayer(const cPlayerListCallback & a_Callback) +bool cWindow::ForEachPlayer(cItemCallback<cPlayer> & a_Callback) { cCSLock Lock(m_CS); - for (auto & Player : m_OpenedBy) + for (cPlayerList::iterator itr = m_OpenedBy.begin(), end = m_OpenedBy.end(); itr != end; ++itr) { - if (a_Callback(*Player)) + if (a_Callback.Item(*itr)) { return false; } @@ -379,12 +379,12 @@ bool cWindow::ForEachPlayer(const cPlayerListCallback & a_Callback) -bool cWindow::ForEachClient(cClientHandleCallback & a_Callback) +bool cWindow::ForEachClient(cItemCallback<cClientHandle> & a_Callback) { cCSLock Lock(m_CS); - for (auto & Player : m_OpenedBy) + for (cPlayerList::iterator itr = m_OpenedBy.begin(), end = m_OpenedBy.end(); itr != end; ++itr) { - if (a_Callback(*Player->GetClientHandle())) + if (a_Callback.Item((*itr)->GetClientHandle())) { return false; } |