Refer to things in the driver with abstract ids instead of addresses

[r2c2.git] / source / designer / movetool.cpp

diff --git a/source/designer/movetool.cpp b/source/designer/movetool.cpp
index 57d72928612e95792e4c5801c349ac97deb70b17..fa78ba73c3a38e14b11e15ae59772dce62e83d4b 100644 (file)
--- a/source/designer/movetool.cpp
+++ b/source/designer/movetool.cpp
@@ -6,8 +6,8 @@ using namespace std;
 using namespace Msp;
 using namespace R2C2;
 
-MoveTool::MoveTool(Designer &d, Input::Mouse &m, const set<Object *> &o):
-       Manipulator(d, m, o),
+MoveTool::MoveTool(Designer &d, Input::Keyboard &k, Input::Mouse &m, const set<Object *> &o):
+       Manipulator(d, k, m, o),
        origin(ground_pointer)
 {
        for(ObjectArray::iterator i=objects.begin(); i!=objects.end(); ++i)
@@ -23,10 +23,8 @@ MoveTool::MoveTool(Designer &d, Input::Mouse &m, const set<Object *> &o):
                snap_targets.erase(i->object);
 }
 
-void MoveTool::axis_motion(unsigned axis, float value, float rel)
+void MoveTool::pointer_motion()
 {
-       Manipulator::axis_motion(axis, value, rel);
-
        Vector offset = center+ground_pointer-origin;
        for(vector<MObject>::iterator i=objects.begin(); i!=objects.end(); ++i)
        {