diff options
Diffstat (limited to 'src/gui/MachinaCanvas.cpp')
| -rw-r--r-- | src/gui/MachinaCanvas.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/gui/MachinaCanvas.cpp b/src/gui/MachinaCanvas.cpp index 95a3f14..7a26ef0 100644 --- a/src/gui/MachinaCanvas.cpp +++ b/src/gui/MachinaCanvas.cpp @@ -33,8 +33,8 @@ using namespace Raul; using namespace Ganv; -namespace Machina { -namespace GUI { +namespace machina { +namespace gui { MachinaCanvas::MachinaCanvas(MachinaGUI* app, int width, int height) : Canvas(width, height) @@ -103,9 +103,9 @@ MachinaCanvas::on_event(GdkEvent* event) } void -MachinaCanvas::on_new_object(SPtr<Client::ClientObject> object) +MachinaCanvas::on_new_object(SPtr<client::ClientObject> object) { - const Machina::URIs& uris = URIs::instance(); + const machina::URIs& uris = URIs::instance(); const Raul::Atom& type = object->get(uris.rdf_type); if (!type.is_valid()) { return; @@ -127,9 +127,9 @@ MachinaCanvas::on_new_object(SPtr<Client::ClientObject> object) object->set_view(view); } else if (type.get<URIInt>() == uris.machina_Edge) { - SPtr<Machina::Client::ClientObject> tail = _app->client_model()->find( + SPtr<machina::client::ClientObject> tail = _app->client_model()->find( object->get(uris.machina_tail_id).get_int32()); - SPtr<Machina::Client::ClientObject> head = _app->client_model()->find( + SPtr<machina::client::ClientObject> head = _app->client_model()->find( object->get(uris.machina_head_id).get_int32()); if (!tail || !head) { @@ -150,13 +150,13 @@ MachinaCanvas::on_new_object(SPtr<Client::ClientObject> object) } void -MachinaCanvas::on_erase_object(SPtr<Client::ClientObject> object) +MachinaCanvas::on_erase_object(SPtr<client::ClientObject> object) { const Raul::Atom& type = object->get(URIs::instance().rdf_type); if (type.get<URIInt>() == URIs::instance().machina_Node) { // Destruction of the view will remove from the canvas } else if (type.get<URIInt>() == URIs::instance().machina_Edge) { - object->set_view(SPtr<Client::ClientObject::View>()); + object->set_view(SPtr<client::ClientObject::View>()); } else { std::cerr << "Unknown object type" << std::endl; } @@ -165,7 +165,7 @@ MachinaCanvas::on_erase_object(SPtr<Client::ClientObject> object) void MachinaCanvas::action_create_node(double x, double y) { - Machina::Client::ClientObject obj(0); + machina::client::ClientObject obj(0); obj.set(URIs::instance().rdf_type, _app->forge().make_urid(URIs::instance().machina_Node)); obj.set(URIs::instance().machina_canvas_x, _app->forge().make((float)x)); @@ -188,5 +188,5 @@ MachinaCanvas::action_disconnect(SPtr<NodeView> src, _app->controller()->disconnect(src->node()->id(), head->node()->id()); } -} // namespace Machina -} // namespace GUI +} // namespace machina +} // namespace gui |