my log

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

diff --git a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
index 3cda4f8..01aeb7d 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_smoothmove.cpp
@@ -1,4 +1,4 @@
-/* === S I N F G =========================================================== */
+/* === S Y N F I G ========================================================= */
 /*!    \file state_smooth_move.cpp
 **     \brief Template File
 **
@@ -31,15 +31,15 @@
 #include <gtkmm/dialog.h>
 #include <gtkmm/entry.h>
 
-#include <sinfg/valuenode_dynamiclist.h>
-#include <sinfgapp/action_system.h>
+#include <synfig/valuenode_dynamiclist.h>
+#include <synfigapp/action_system.h>
 
 #include "state_smoothmove.h"
 #include "canvasview.h"
 #include "workarea.h"
 #include "app.h"
 
-#include <sinfgapp/action.h>
+#include <synfigapp/action.h>
 #include "event_mouse.h"
 #include "event_layerclick.h"
 #include "toolbox.h"
@@ -47,7 +47,7 @@
 #include <gtkmm/optionmenu.h>
 #include "duck.h"
 #include "onemoment.h"
-#include <sinfgapp/main.h>
+#include <synfigapp/main.h>
 
 #endif
 
@@ -55,7 +55,7 @@
 
 using namespace std;
 using namespace etl;
-using namespace sinfg;
+using namespace synfig;
 using namespace studio;
 
 /* === M A C R O S ========================================================= */
@@ -70,18 +70,18 @@ class DuckDrag_SmoothMove : public DuckDrag_Base
 {
        float radius;
 
-       sinfg::Vector last_translate_;
-       sinfg::Vector drag_offset_;
-       sinfg::Vector snap;
+       synfig::Vector last_translate_;
+       synfig::Vector drag_offset_;
+       synfig::Vector snap;
        
-       std::vector<sinfg::Vector> last_;
-       std::vector<sinfg::Vector> positions;
+       std::vector<synfig::Vector> last_;
+       std::vector<synfig::Vector> positions;
        
 public:
        DuckDrag_SmoothMove();
-       void begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& begin);
+       void begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& begin);
        bool end_duck_drag(Duckmatic* duckmatic);
-       void duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector);
+       void duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector);
 
        void set_radius(float x) { radius=x; }
        float get_radius()const { return radius; }      
@@ -94,7 +94,7 @@ class studio::StateSmoothMove_Context : public sigc::trackable
        
        //Duckmatic::Push duckmatic_push;
        
-       sinfgapp::Settings& settings;
+       synfigapp::Settings& settings;
 
        etl::handle<DuckDrag_SmoothMove> duck_dragger_;
 
@@ -122,8 +122,8 @@ public:
        ~StateSmoothMove_Context();
 
        const etl::handle<CanvasView>& get_canvas_view()const{return canvas_view_;}
-       etl::handle<sinfgapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
-       sinfg::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
+       etl::handle<synfigapp::CanvasInterface> get_canvas_interface()const{return canvas_view_->canvas_interface();}
+       synfig::Canvas::Handle get_canvas()const{return canvas_view_->get_canvas();}
        WorkArea * get_work_area()const{return canvas_view_->get_work_area();}
        
        void load_settings();
@@ -162,7 +162,7 @@ StateSmoothMove_Context::save_settings()
 StateSmoothMove_Context::StateSmoothMove_Context(CanvasView* canvas_view):
        canvas_view_(canvas_view),
 //     duckmatic_push(get_work_area()),
-       settings(sinfgapp::Main::get_selected_input_device()->settings()),
+       settings(synfigapp::Main::get_selected_input_device()->settings()),
        duck_dragger_(new DuckDrag_SmoothMove()),
        adj_radius(1,0,100000,0.01,0.1),
        spin_radius(adj_radius,0.1,3)
@@ -229,7 +229,7 @@ DuckDrag_SmoothMove::DuckDrag_SmoothMove():radius(1.0f)
 }
 
 void
-DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector& offset)
+DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const synfig::Vector& offset)
 {
        last_translate_=Vector(0,0);
                drag_offset_=duckmatic->find_duck(offset)->get_trans_point();
@@ -251,11 +251,11 @@ DuckDrag_SmoothMove::begin_duck_drag(Duckmatic* duckmatic, const sinfg::Vector&
 }
 
 void
-DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector)
+DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const synfig::Vector& vector)
 {
        const DuckList selected_ducks(duckmatic->get_selected_ducks());
        DuckList::const_iterator iter;
-       sinfg::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_+snap);
+       synfig::Vector vect(duckmatic->snap_point_to_grid(vector)-drag_offset_+snap);
        
        int i;
        
@@ -292,7 +292,7 @@ DuckDrag_SmoothMove::duck_drag(Duckmatic* duckmatic, const sinfg::Vector& vector
 bool
 DuckDrag_SmoothMove::end_duck_drag(Duckmatic* duckmatic)
 {
-       //sinfg::info("end_duck_drag(): Diff= %f",last_translate_.mag());
+       //synfig::info("end_duck_drag(): Diff= %f",last_translate_.mag());
        if(last_translate_.mag()>0.0001)
        {
                const DuckList selected_ducks(duckmatic->get_selected_ducks());