X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=synfig-core%2Ftrunk%2Fsrc%2Fsynfig%2Ftimepointcollect.cpp;h=b2a04248e54458dd66d0396a0410e628355eff1a;hb=c3ad95144d148602f672e95ddda1f18fc35502f8;hp=77212fd15c7556bc3cfb4decd1484b3c53d3cd5a;hpb=28f28705612902c15cd0702cc891fba35bf2d2df;p=synfig.git diff --git a/synfig-core/trunk/src/synfig/timepointcollect.cpp b/synfig-core/trunk/src/synfig/timepointcollect.cpp index 77212fd..b2a0424 100644 --- a/synfig-core/trunk/src/synfig/timepointcollect.cpp +++ b/synfig-core/trunk/src/synfig/timepointcollect.cpp @@ -1,20 +1,21 @@ /* === S Y N F I G ========================================================= */ -/*! \file template.cpp +/*! \file timepointcollect.cpp ** \brief Template File ** -** $Id: timepointcollect.cpp,v 1.1.1.1 2005/01/04 01:23:15 darco Exp $ +** $Id$ ** ** \legal -** Copyright (c) 2002 Robert B. Quattlebaum Jr. +** Copyright (c) 2002-2005 Robert B. Quattlebaum Jr., Adrian Bentley ** -** This software and associated documentation -** are CONFIDENTIAL and PROPRIETARY property of -** the above-mentioned copyright holder. +** This package is free software; you can redistribute it and/or +** modify it under the terms of the GNU General Public License as +** published by the Free Software Foundation; either version 2 of +** the License, or (at your option) any later version. ** -** You may not copy, print, publish, or in any -** other way distribute this software without -** a prior written agreement with -** the copyright holder. +** This package is distributed in the hope that it will be useful, +** but WITHOUT ANY WARRANTY; without even the implied warranty of +** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +** General Public License for more details. ** \endlegal */ /* ========================================================================= */ @@ -53,7 +54,7 @@ using namespace synfig; //! \writeme int synfig::waypoint_collect(set >& waypoint_set,const Time& time, const etl::handle& node) -{ +{ const TimePointSet& timepoint_set(node->get_times()); // Check to see if there is anything in here at the given time @@ -113,7 +114,7 @@ synfig::waypoint_collect(set >& waypoint_set,const { try{ Waypoint waypoint=*value_node_animated->find(time); - + // If it is already in the waypoint set, then // don't bother adding it again if(waypoint_set.find(waypoint)!=waypoint_set.end()) @@ -133,7 +134,7 @@ synfig::waypoint_collect(set >& waypoint_set,const //! \writeme int -synfig::activepoint_collect(set >& activepoint_set,const Time& time, const etl::handle& node) +synfig::activepoint_collect(set >& /*activepoint_set*/,const Time& time, const etl::handle& node) { const TimePointSet& timepoint_set(node->get_times());