diff options
Diffstat (limited to 'src/gui/MachinaGUI.hpp')
-rw-r--r-- | src/gui/MachinaGUI.hpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/gui/MachinaGUI.hpp b/src/gui/MachinaGUI.hpp index f9b0857..2636051 100644 --- a/src/gui/MachinaGUI.hpp +++ b/src/gui/MachinaGUI.hpp @@ -29,30 +29,30 @@ using namespace std; -namespace Machina { +namespace machina { class Machine; class Engine; class Evolver; class Controller; -namespace Client { +namespace client { class ClientModel; class ClientObject; } -namespace GUI { +namespace gui { class MachinaCanvas; class MachinaGUI { public: - MachinaGUI(SPtr<Machina::Engine> engine); + MachinaGUI(SPtr<machina::Engine> engine); ~MachinaGUI(); SPtr<MachinaCanvas> canvas() { return _canvas; } - SPtr<Machina::Engine> engine() { return _engine; } + SPtr<machina::Engine> engine() { return _engine; } Raul::Forge& forge() { return _forge; } @@ -63,14 +63,14 @@ public: void attach(); void quit() { _main_window->hide(); } - SPtr<Machina::Controller> controller() { return _controller; } + SPtr<machina::Controller> controller() { return _controller; } inline void queue_refresh() { _refresh = true; } - void on_new_object(SPtr<Machina::Client::ClientObject> object); - void on_erase_object(SPtr<Machina::Client::ClientObject> object); + void on_new_object(SPtr<machina::client::ClientObject> object); + void on_erase_object(SPtr<machina::client::ClientObject> object); - SPtr<Machina::Client::ClientModel> client_model() { + SPtr<machina::client::ClientModel> client_model() { return _client_model; } @@ -91,8 +91,8 @@ protected: void arrange(); void load_target_clicked(); - void random_mutation(SPtr<Machina::Machine> machine); - void mutate(SPtr<Machina::Machine> machine, unsigned mutation); + void random_mutation(SPtr<machina::Machine> machine); + void mutate(SPtr<machina::Machine> machine, unsigned mutation); void zoom(double z); void update_toolbar(); @@ -120,12 +120,12 @@ protected: Raul::TimeUnit _unit; SPtr<MachinaCanvas> _canvas; - SPtr<Machina::Engine> _engine; - SPtr<Machina::Client::ClientModel> _client_model; - SPtr<Machina::Controller> _controller; + SPtr<machina::Engine> _engine; + SPtr<machina::client::ClientModel> _client_model; + SPtr<machina::Controller> _controller; SPtr<Raul::Maid> _maid; - SPtr<Machina::Evolver> _evolver; + SPtr<machina::Evolver> _evolver; Raul::Forge _forge; @@ -174,7 +174,7 @@ protected: Gtk::ToolButton* _adjust_edge_button; }; -} // namespace Machina -} // namespace GUI +} // namespace machina +} // namespace gui #endif // MACHINA_GUI_HPP |