From 49c443896dcac8c4eaf08c4024e8bd2366ad899a Mon Sep 17 00:00:00 2001 From: LogicParrot Date: Sat, 2 Sep 2017 10:45:06 +0300 Subject: Revert "Replace ItemCallbacks with lambdas (#3948)" This reverts commit 496c337cdfa593654018c171f6a74c28272265b5. --- src/UI/Window.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/UI/Window.cpp') 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 & 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 & 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; } -- cgit v1.2.3