diff --git a/uppsrc/umk/Console.cpp b/uppsrc/umk/Console.cpp index 4b5466fd9..27750a879 100644 --- a/uppsrc/umk/Console.cpp +++ b/uppsrc/umk/Console.cpp @@ -220,7 +220,7 @@ bool Console::Wait() } } -void Console::OnFinish(Callback cb) +void Console::OnFinish(Event<> cb) { Finisher& f = finisher.Add(); f.serial = serial; diff --git a/uppsrc/umk/IdeContext.cpp b/uppsrc/umk/IdeContext.cpp index 0822eea15..c2c9e3f25 100644 --- a/uppsrc/umk/IdeContext.cpp +++ b/uppsrc/umk/IdeContext.cpp @@ -87,7 +87,7 @@ bool Ide::IdeConsoleWait(int slot) return true; } -void Ide::IdeConsoleOnFinish(Callback cb) +void Ide::IdeConsoleOnFinish(Event<> cb) { console.OnFinish(cb); } diff --git a/uppsrc/umk/umake.h b/uppsrc/umk/umake.h index 3d6e4ac08..a3c675e95 100644 --- a/uppsrc/umk/umake.h +++ b/uppsrc/umk/umake.h @@ -37,7 +37,7 @@ protected: struct Finisher { int serial; - Callback cb; + Event<> cb; }; Array processes; @@ -78,7 +78,7 @@ public: void Wait(int slot); bool Wait(); - void OnFinish(Callback cb); + void OnFinish(Event<> cb); void WrapText(bool w) { wrap_text = w; } @@ -115,7 +115,7 @@ struct Ide : public IdeContext, public MakeBuild { virtual void IdeConsoleEndGroup(); virtual bool IdeConsoleWait(); virtual bool IdeConsoleWait(int slot); - virtual void IdeConsoleOnFinish(Callback cb); + virtual void IdeConsoleOnFinish(Event<> cb); virtual bool IdeIsDebug() const ; virtual void IdeEndDebug();