- 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

1 files changed, 3 insertions, 3 deletions

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<Button*, int, type>(x, y))
+#define BUTTON_FUNCTOR(type, x, y) Button::Callback(new Common::Functor1Mem<Button*, int, type>(x, y))
 
 struct Button {
-	typedef Functor1<Button*, int> CallbackFunctor;
+	typedef Common::Functor1<Button*, int> CallbackFunctor;
 	typedef Common::SharedPtr<CallbackFunctor> Callback;
 
 	Button *nextButton;