X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=synfig-studio%2Ftrunk%2Fsrc%2Fgtkmm%2Frenderer_ducks.cpp;h=3df2afef6d84d5bd0d63bc64376adfe530c656de;hb=74d03302d1e6f05f1f90d4c2a3b38a03aa51dc86;hp=90cf842446d7f40d9cb0f48d529ad2c2d7f8b4ca;hpb=3a3c4bca3a17137bec5d7960560934b91ef4146e;p=synfig.git

diff --git a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
index 90cf842..3df2afe 100644
--- a/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
+++ b/synfig-studio/trunk/src/gtkmm/renderer_ducks.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!	\file template.cpp
 **	\brief Template File
 **
 **	$Id: renderer_ducks.cpp,v 1.1.1.1 2005/01/07 03:34:36 darco Exp $
 **
 **	\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
 */
 /* ========================================================================= */
@@ -34,7 +35,7 @@
 #include <ETL/bezier>
 #include <ETL/misc>
 #include "widget_color.h"
-#include <sinfg/distance.h>
+#include <synfig/distance.h>
 #include "app.h"
 
 #endif
@@ -43,7 +44,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -68,7 +69,7 @@ Renderer_Ducks::get_enabled_vfunc()const
 
 struct ScreenDuck
 {
-	sinfg::Point pos;
+	synfig::Point pos;
 	Gdk::Color color;
 	bool selected;
 	bool hover;
@@ -87,7 +88,7 @@ Renderer_Ducks::render_vfunc(
 	if(!get_work_area())
 		return;
 	
-	const sinfg::Vector focus_point(get_work_area()->get_focus_point());
+	const synfig::Vector focus_point(get_work_area()->get_focus_point());
 
 	
 	int drawable_w,drawable_h;
@@ -96,8 +97,8 @@ Renderer_Ducks::render_vfunc(
 	Glib::RefPtr<Gdk::GC> gc(Gdk::GC::create(drawable));
 	
 
-	const sinfg::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]);
-	const sinfg::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]);
+	const synfig::Vector::value_type window_startx(get_work_area()->get_window_tl()[0]);
+	const synfig::Vector::value_type window_starty(get_work_area()->get_window_tl()[1]);
 
 	const float pw(get_pw()),ph(get_ph());
 
@@ -113,7 +114,7 @@ Renderer_Ducks::render_vfunc(
 	{
 		Point window_start(window_startx,window_starty);
 		vector<Gdk::Point> points;
-		std::list<sinfg::Point>::iterator iter2;
+		std::list<synfig::Point>::iterator iter2;
 		Point holder;
 		
 		for(iter2=(*iter)->stroke_data->begin();iter2!=(*iter)->stroke_data->end();++iter2)
@@ -123,7 +124,7 @@ Renderer_Ducks::render_vfunc(
 			points.push_back(Gdk::Point(round_to_int(holder[0]),round_to_int(holder[1])));
 		}
 		
-		gc->set_rgb_fg_color(colorconv_sinfg2gdk((*iter)->color));
+		gc->set_rgb_fg_color(colorconv_synfig2gdk((*iter)->color));
 		gc->set_function(Gdk::COPY);
 		gc->set_line_attributes(1,Gdk::LINE_SOLID,Gdk::CAP_BUTT,Gdk::JOIN_MITER);
 
@@ -233,7 +234,7 @@ Renderer_Ducks::render_vfunc(
 						
 		if(get_work_area()->get_selected_value_node())
 		{
-			sinfgapp::ValueDesc value_desc((*iter)->get_value_desc());
+			synfigapp::ValueDesc value_desc((*iter)->get_value_desc());
 			if(value_desc.is_valid() && value_desc.is_value_node() && get_work_area()->get_selected_value_node()==value_desc.get_value_node())
 			{
 				gc->set_function(Gdk::COPY);