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.h | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'src/UI/Window.h') diff --git a/src/UI/Window.h b/src/UI/Window.h index f2023c731..d7a29dc47 100644 --- a/src/UI/Window.h +++ b/src/UI/Window.h @@ -1,4 +1,4 @@ - + // Window.h // Interfaces to the cWindow class representing a UI window for a specific block @@ -9,7 +9,6 @@ #pragma once -#include #include "../ItemGrid.h" @@ -32,8 +31,7 @@ class cWorld; typedef std::list cPlayerList; typedef std::vector cSlotAreas; -using cPlayerListCallback = std::function; -using cClientHandleCallback = std::function; + @@ -153,10 +151,10 @@ public: void OwnerDestroyed(void); /** Calls the callback safely for each player that has this window open; returns true if all players have been enumerated */ - bool ForEachPlayer(const cPlayerListCallback & a_Callback); + bool ForEachPlayer(cItemCallback & a_Callback); /** Calls the callback safely for each client that has this window open; returns true if all clients have been enumerated */ - bool ForEachClient(cClientHandleCallback & a_Callback); + bool ForEachClient(cItemCallback & a_Callback); /** Called on shift-clicking to distribute the stack into other areas; Modifies a_ItemStack as it is distributed! if a_ShouldApply is true, the changes are written into the slots; -- cgit v1.2.3