Remove .gitignore do nothing is ignored.

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

diff --git a/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp b/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp
index 4d2da18..5fbf61c 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dialog_waypoint.cpp
@@ -1,20 +1,21 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file dialog_waypoint.cpp
 **     \brief Template Header
 **
-**     $Id: dialog_waypoint.cpp,v 1.1.1.1 2005/01/07 03:34:36 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
 */
 /* ========================================================================= */
@@ -41,9 +42,11 @@
 #include "widget_time.h"
 #include "widget_waypoint.h"
 
+#include "general.h"
+
 #endif
 
-using namespace sinfg;
+using namespace synfig;
 using namespace std;
 using namespace etl;
 using namespace studio;
@@ -56,7 +59,7 @@ using namespace studio;
 
 /* === M E T H O D S ======================================================= */
 
-Dialog_Waypoint::Dialog_Waypoint(Gtk::Window& parent,etl::handle<sinfg::Canvas> canvas):
+Dialog_Waypoint::Dialog_Waypoint(Gtk::Window& parent,etl::handle<synfig::Canvas> canvas):
        Dialog(_("Waypoint Editor"),parent,false,true),
        canvas(canvas)
 {
@@ -84,7 +87,7 @@ Dialog_Waypoint::Dialog_Waypoint(Gtk::Window& parent,etl::handle<sinfg::Canvas>
        add_action_widget(*cancel_button,0);
        cancel_button->signal_clicked().connect(sigc::mem_fun(*this, &Dialog_Waypoint::hide));
 
-       
+
        waypointwidget->show_all();
 }
 
@@ -102,30 +105,30 @@ Dialog_Waypoint::on_ok_pressed()
 void
 Dialog_Waypoint::on_apply_pressed()
 {
-    signal_changed_(); 
+    signal_changed_();
 }
 
 void
 Dialog_Waypoint::on_delete_pressed()
 {
        hide();
-    signal_delete_();  
+    signal_delete_();
 }
 
 void
-Dialog_Waypoint::set_waypoint(sinfg::ValueNode_Animated::Waypoint x)
+Dialog_Waypoint::set_waypoint(synfig::ValueNode_Animated::Waypoint x)
 {
        waypointwidget->set_waypoint(x);
 }
 
-const sinfg::ValueNode_Animated::Waypoint &
+const synfig::ValueNode_Animated::Waypoint &
 Dialog_Waypoint::get_waypoint()const
 {
        return waypointwidget->get_waypoint();
 }
 
 void
-Dialog_Waypoint::set_value_desc(sinfgapp::ValueDesc value_desc)
+Dialog_Waypoint::set_value_desc(synfigapp::ValueDesc value_desc)
 {
        value_desc_=value_desc;
        if(value_desc.get_value_node() && value_desc.get_value_node()->get_parent_canvas())