From f173041811398817ffce870d30ef3b87d1302736 Mon Sep 17 00:00:00 2001 From: Johannes Schickel Date: Sun, 20 Apr 2008 15:47:11 +0000 Subject: - moved kyra functor code to common/func.h - adapted debugger code to use functor code from common/func.h - adapted kyra engine to use functor code from common/func.h svn-id: r31614 --- engines/kyra/gui.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'engines/kyra/gui.h') diff --git a/engines/kyra/gui.h b/engines/kyra/gui.h index 214f112995..dfbca22441 100644 --- a/engines/kyra/gui.h +++ b/engines/kyra/gui.h @@ -26,18 +26,18 @@ #ifndef KYRA_GUI_H #define KYRA_GUI_H -#include "kyra/util.h" #include "kyra/kyra.h" #include "common/ptr.h" #include "common/array.h" +#include "common/func.h" namespace Kyra { -#define BUTTON_FUNCTOR(type, x, y) Button::Callback(new Functor1Mem(x, y)) +#define BUTTON_FUNCTOR(type, x, y) Button::Callback(new Common::Functor1Mem(x, y)) struct Button { - typedef Functor1 CallbackFunctor; + typedef Common::Functor1 CallbackFunctor; typedef Common::SharedPtr Callback; Button *nextButton; -- cgit v1.2.3