diff options
| author | Markus Engel <markus.engel@tum.de> | 2014-03-28 15:13:33 +0000 |
|---|---|---|
| committer | Markus Engel <markus.engel@tum.de> | 2014-03-28 15:13:33 +0000 |
| commit | 24289d6eedbc912f228c21914176b82e8eecee51 (patch) | |
| tree | 941df365b6e4d26c961715b41832cddf04a03dca /src/seltrans.cpp | |
| parent | Merge in pixelArt threading mechanism to stop blocking the UI when performing... (diff) | |
| download | inkscape-24289d6eedbc912f228c21914176b82e8eecee51.tar.gz inkscape-24289d6eedbc912f228c21914176b82e8eecee51.zip | |
Further refactored SPKnot.
(bzr r13226)
Diffstat (limited to '')
| -rw-r--r-- | src/seltrans.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/seltrans.cpp b/src/seltrans.cpp index 858985625..60a0bfa11 100644 --- a/src/seltrans.cpp +++ b/src/seltrans.cpp @@ -650,14 +650,14 @@ void Inkscape::SelTrans::_makeHandles() knots[i]->setFill(info.color[0], info.color[1], info.color[2]); knots[i]->setStroke(info.color[3], info.color[4], info.color[5]); knots[i]->setPixbuf(handles[hands[i].control]); - knots[i]->update_ctrl(); + knots[i]->updateCtrl(); - knots[i]->_request_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_request), &hands[i])); - knots[i]->_moved_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_new_event), &hands[i])); - knots[i]->_grabbed_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_grab), &hands[i])); - knots[i]->_ungrabbed_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_ungrab), &hands[i])); - knots[i]->_click_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_click), &hands[i])); - knots[i]->_event_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_event), &hands[i])); + knots[i]->request_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_request), &hands[i])); + knots[i]->moved_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_new_event), &hands[i])); + knots[i]->grabbed_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_grab), &hands[i])); + knots[i]->ungrabbed_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_ungrab), &hands[i])); + knots[i]->click_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_click), &hands[i])); + knots[i]->event_signal.connect(sigc::bind(sigc::ptr_fun(sp_sel_trans_handle_event), &hands[i])); } } @@ -796,7 +796,7 @@ gboolean Inkscape::SelTrans::handleRequest(SPKnot *knot, Geom::Point *position, return TRUE; } if (request(handle, *position, state)) { - knot->set_position(*position, state); + knot->setPosition(*position, state); SP_CTRL(_grip)->moveto(*position); if (handle.type == HANDLE_CENTER) { SP_CTRL(_norm)->moveto(*position); |