X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FMain.hh;h=0a3c616a685a4774a4cde93561ad0e4741a2b134;hp=a5ce29336493c95c0115152ef2b0119e3b7116ab;hb=c143f7e806766a73cd69dc6e084e977641019ce6;hpb=e0c0a3b5e7337cde55e520801d2e59e03dc97d9c diff --git a/src/Main.hh b/src/Main.hh index a5ce293..0a3c616 100644 --- a/src/Main.hh +++ b/src/Main.hh @@ -13,7 +13,7 @@ #define _MAIN_HH_ /** - * @file Main.hh + * \file Main.hh * This is where all the fun begins. */ @@ -22,28 +22,30 @@ #include -#include -#include -#include +#include +#include +#include -namespace Mf { -class Settings; -class View; +namespace moof +{ + class settings; + class view; } + class Main; typedef boost::shared_ptr
MainP; -class Main : public Mf::View +class Main : public moof::view { public: - Main(Mf::Settings& settings, Mf::Video& video); + Main(moof::settings& settings, moof::video& video); - void update(Mf::Scalar t, Mf::Scalar dt); - void draw(Mf::Scalar alpha) const; - bool handleEvent(const Mf::Event& event); + void update(moof::scalar t, moof::scalar dt); + void draw(moof::scalar alpha) const; + bool handle_event(const moof::event& event); static std::string getSearchPath(); static std::string getConfigPath(); @@ -58,7 +60,7 @@ private: */ static void setupGL(); - Mf::Dispatch::Handle mNewContextDispatch; + moof::dispatcher::handle mNewContextDispatch; };