Remove the unused 'side' parameter from a bunch more signals and methods.

git-svn-id: http://svn.voria.com/code@1724 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
index 8e9ea82..e2ad77a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.cpp
@@ -765,11 +765,7 @@ CellRenderer_TimeTrack::activate_vfunc(
                                }
 
                                if(clickfound && node)
-                                       signal_waypoint_clicked_cellrenderer()(node,
-                                                                                                                  stime,
-                                                                                                                  time_offset,
-                                                                                                                  2,
-                                                                                                                  actual_time+time_offset<stime?Waypoint::SIDE_LEFT:Waypoint::SIDE_RIGHT);
+                                       signal_waypoint_clicked_cellrenderer()(node, stime, time_offset, 2);
                        }
 
                break;

diff --git a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h
index 34022bb..519ac8d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h
+++ b/synfig-studio/trunk/src/gtkmm/cellrenderer_timetrack.h
@@ -85,7 +85,7 @@ private:
        Gtk::Adjustment adjustment_;
 
        //! Signal for when the user clicks on a waypoint
-       sigc::signal<void, const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, int, synfig::Waypoint::Side> signal_waypoint_clicked_cellrenderer_;
+       sigc::signal<void, const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, int> signal_waypoint_clicked_cellrenderer_;
 
        sigc::signal<void, synfig::Waypoint, synfig::ValueNode::Handle> signal_waypoint_changed_;
 
@@ -153,7 +153,7 @@ public:
 
 public:
 
-       sigc::signal<void, const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, int, synfig::Waypoint::Side> &signal_waypoint_clicked_cellrenderer()
+       sigc::signal<void, const etl::handle<synfig::Node>&, const synfig::Time&, const synfig::Time&, int> &signal_waypoint_clicked_cellrenderer()
        {return signal_waypoint_clicked_cellrenderer_; }
 
        sigc::signal<void, synfig::Waypoint, synfig::ValueNode::Handle> &signal_waypoint_changed()

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.cpp b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
index 90498a7..aa47850 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.cpp
@@ -276,10 +276,8 @@ void
 ChildrenTree::on_waypoint_clicked_childrentree(const etl::handle<synfig::Node>& node __attribute__ ((unused)),
                                                                                           const synfig::Time& time __attribute__ ((unused)),
                                                                                           const synfig::Time& time_offset __attribute__ ((unused)),
-                                                                                          int button __attribute__ ((unused)),
-                                                                                          synfig::Waypoint::Side side __attribute__ ((unused)))
+                                                                                          int button __attribute__ ((unused)))
 {
-       //! \todo finishme - dragging waypoints causes an assert fail at cellrenderer_timetrack.cpp:803
        std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
        synfig::waypoint_collect(waypoint_set,time,node);
 

diff --git a/synfig-studio/trunk/src/gtkmm/childrentree.h b/synfig-studio/trunk/src/gtkmm/childrentree.h
index e2c4c9a..34a216f 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/childrentree.h
+++ b/synfig-studio/trunk/src/gtkmm/childrentree.h
@@ -122,7 +122,7 @@ private:
 
        void on_edited_value(const Glib::ustring&path_string,synfig::ValueBase value);
 
-       void on_waypoint_clicked_childrentree(const etl::handle<synfig::Node>& node,const synfig::Time&,const synfig::Time&,int button,synfig::Waypoint::Side side);
+       void on_waypoint_clicked_childrentree(const etl::handle<synfig::Node>& node,const synfig::Time&,const synfig::Time&,int button);
 
        bool on_tree_event(GdkEvent *event);
 

diff --git a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
index 9e938de..3f93fa6 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_timetrack.cpp
@@ -89,7 +89,7 @@ public:
                        // Set up the value-node cell-renderer
                        cellrenderer_time_track=LayerParamTreeStore::add_cell_renderer_value_node(column);
                        cellrenderer_time_track->property_mode()=Gtk::CELL_RENDERER_MODE_ACTIVATABLE;
-                       cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview) );
+                       cellrenderer_time_track->signal_waypoint_clicked_cellrenderer().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_clicked_timetrackview));
                        cellrenderer_time_track->signal_waypoint_changed().connect(sigc::mem_fun(*this, &TimeTrackView::on_waypoint_changed) );
                        column->add_attribute(cellrenderer_time_track->property_value_desc(), model.value_desc);
                        column->add_attribute(cellrenderer_time_track->property_canvas(), model.canvas);
@@ -308,6 +308,9 @@ public:
        void
        on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node)
        {
+               // is this code used?
+               assert(0);
+
                synfigapp::Action::ParamList param_list;
                param_list.add("canvas",param_tree_store_->canvas_interface()->get_canvas());
                param_list.add("canvas_interface",param_tree_store_->canvas_interface());
@@ -369,8 +372,7 @@ public:
        on_waypoint_clicked_timetrackview(const etl::handle<synfig::Node>& node,
                                                                          const synfig::Time& time,
                                                                          const synfig::Time& time_offset __attribute__ ((unused)),
-                                                                         int button,
-                                                                         synfig::Waypoint::Side side)
+                                                                         int button)
        {
                std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
                synfig::waypoint_collect(waypoint_set,time,node);

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.cpp b/synfig-studio/trunk/src/gtkmm/layertree.cpp
index 72510cf..b660127 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.cpp
+++ b/synfig-studio/trunk/src/gtkmm/layertree.cpp
@@ -742,8 +742,7 @@ void
 LayerTree::on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node __attribute__ ((unused)),
                                                                                 const synfig::Time& time __attribute__ ((unused)),
                                                                                 const synfig::Time& time_offset __attribute__ ((unused)),
-                                                                                int button __attribute__ ((unused)),
-                                                                                synfig::Waypoint::Side side __attribute__ ((unused)))
+                                                                                int button __attribute__ ((unused)))
 {
        std::set<synfig::Waypoint, std::less<UniqueID> > waypoint_set;
        synfig::waypoint_collect(waypoint_set,time,node);

diff --git a/synfig-studio/trunk/src/gtkmm/layertree.h b/synfig-studio/trunk/src/gtkmm/layertree.h
index c01ab06..97b2d27 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/layertree.h
+++ b/synfig-studio/trunk/src/gtkmm/layertree.h
@@ -174,7 +174,7 @@ private:
 
        void on_layer_toggle(const Glib::ustring& path_string);
 
-       void on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node, const synfig::Time&, const synfig::Time&, int button, synfig::Waypoint::Side side);
+       void on_waypoint_clicked_layertree(const etl::handle<synfig::Node>& node, const synfig::Time&, const synfig::Time&, int button);
 
        void on_waypoint_changed( synfig::Waypoint waypoint , synfig::ValueNode::Handle value_node);