Change to Andreas Jochens patch for Debian bugs #358474/#359690

[synfig.git] / synfig-studio / trunk / src / gtkmm / widget_vector.cpp

diff --git a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
index 4b9b6bb..98b1152 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
+++ b/synfig-studio/trunk/src/gtkmm/widget_vector.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file widget_vector.cpp
 **     \brief Template File
 **
 **     $Id: widget_vector.cpp,v 1.1.1.1 2005/01/07 03:34:37 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
 */
 /* ========================================================================= */
@@ -38,7 +39,7 @@
 /* === U S I N G =========================================================== */
 
 using namespace std;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -144,7 +145,7 @@ Widget_Vector::set_digits(int x)
 }
 
 void
-Widget_Vector::set_value(const sinfg::Vector &data)
+Widget_Vector::set_value(const synfig::Vector &data)
 {
        vector=data;
 
@@ -157,7 +158,7 @@ Widget_Vector::set_value(const sinfg::Vector &data)
                distance_y->set_value(disty);
                spinbutton_x->hide();
                spinbutton_y->hide();
-       }catch(...) { sinfg::error("Widget_Vector::set_value(): Caught something that was thrown"); }}
+       }catch(...) { synfig::error("Widget_Vector::set_value(): Caught something that was thrown"); }}
        else
        {
                spinbutton_x->set_value(vector[0]);
@@ -167,7 +168,7 @@ Widget_Vector::set_value(const sinfg::Vector &data)
        }
 }
 
-const sinfg::Vector &
+const synfig::Vector &
 Widget_Vector::get_value()
 {
        if(!canvas_ && spinbutton_x)
@@ -183,7 +184,7 @@ Widget_Vector::get_value()
                vector[1]=distance_y->get_value().units(canvas_->rend_desc());
                spinbutton_x->hide();
                spinbutton_y->hide();
-       }catch(...) { sinfg::error("Widget_Vector::set_value(): Caught something that was thrown"); }
+       }catch(...) { synfig::error("Widget_Vector::set_value(): Caught something that was thrown"); }
        return vector;
 }