Fix 1859663: don't use the deprecated sigc++ compatibility API. This allows sigc...

git-svn-id: http://svn.voria.com/code@1242 1f10aa63-cdf2-0310-b900-c93c546f37ac

diff --git a/synfig-studio/trunk/src/gtkmm/app.h b/synfig-studio/trunk/src/gtkmm/app.h
index 5dba4f3..a6d87cf 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/app.h
+++ b/synfig-studio/trunk/src/gtkmm/app.h
@@ -28,7 +28,6 @@
 
 /* === H E A D E R S ======================================================= */
 
-#include <sigc++/compatibility.h>
 #include <sigc++/bind.h>
 
 #include <gtkmm/main.h>

diff --git a/synfig-studio/trunk/src/gtkmm/autorecover.h b/synfig-studio/trunk/src/gtkmm/autorecover.h
index 425942d..7375dd9 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/autorecover.h
+++ b/synfig-studio/trunk/src/gtkmm/autorecover.h
@@ -42,7 +42,7 @@ namespace studio {
 class AutoRecover
 {
        int timeout;
-       SigC::Connection auto_backup_connect;
+       sigc::connection auto_backup_connect;
 public:
        AutoRecover();
        ~AutoRecover();

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.cpp b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
index 89ce488..ab88fed 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.cpp
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.cpp
@@ -109,7 +109,7 @@ using namespace std;
 using namespace etl;
 using namespace synfig;
 using namespace studio;
-using namespace SigC;
+using namespace sigc;
 
 /* === M A C R O S ========================================================= */
 

diff --git a/synfig-studio/trunk/src/gtkmm/canvasview.h b/synfig-studio/trunk/src/gtkmm/canvasview.h
index 39658a4..7448377 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/canvasview.h
+++ b/synfig-studio/trunk/src/gtkmm/canvasview.h
@@ -201,8 +201,8 @@ private:
        etl::handle<AudioContainer>             audio;
        studio::Widget_Sound                    *disp_audio; //should this be put into thing too?
 
-       SigC::Connection                                playcon;
-       SigC::Connection                                stopcon;
+       sigc::connection                                playcon;
+       sigc::connection                                stopcon;
 
        std::auto_ptr<UniversalScrubber> universal_scrubber;
 

diff --git a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h
index 8351a8e..24efc78 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h
+++ b/synfig-studio/trunk/src/gtkmm/dock_canvasspecific.h
@@ -44,7 +44,7 @@ class Instance;
 
 class Dock_CanvasSpecific : public Dockable
 {
-       SigC::Connection canvas_delete_connection;
+       sigc::connection canvas_delete_connection;
 protected:
        virtual void init_instance_vfunc(etl::loose_handle<Instance> instance);
 

diff --git a/synfig-studio/trunk/src/gtkmm/dock_info.h b/synfig-studio/trunk/src/gtkmm/dock_info.h
index 86da1ed..a324f86 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_info.h
+++ b/synfig-studio/trunk/src/gtkmm/dock_info.h
@@ -47,7 +47,7 @@ class Dock_Info : public Dock_CanvasSpecific
        Gtk::Label  r,g,b,a;
        Gtk::Label      x,y;
 
-       SigC::Connection mousecon;
+       sigc::connection mousecon;
 
        void on_mouse_move();
 

diff --git a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
index d332518..6f88bbf 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
+++ b/synfig-studio/trunk/src/gtkmm/dock_navigator.cpp
@@ -222,7 +222,7 @@ void studio::Widget_NavView::on_finish_render()
                        dw,     // width
                        dh,     // height
                        dw*synfig::channels(pf), // stride (pitch)
-                       SigC::slot(freegu8)
+                       sigc::ptr_fun(freegu8)
                );
        }
        else

diff --git a/synfig-studio/trunk/src/gtkmm/dockable.h b/synfig-studio/trunk/src/gtkmm/dockable.h
index 9b37db0..7b0083a 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dockable.h
+++ b/synfig-studio/trunk/src/gtkmm/dockable.h
@@ -59,7 +59,7 @@ class Dockable : public Gtk::Table
 
 
        sigc::signal<void> signal_stock_id_changed_;
-       SigC::Connection prev_widget_delete_connection;
+       sigc::connection prev_widget_delete_connection;
 protected:
 
 //     DialogSettings dialog_settings;

diff --git a/synfig-studio/trunk/src/gtkmm/dockdialog.h b/synfig-studio/trunk/src/gtkmm/dockdialog.h
index f35c08b..551ecba 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/dockdialog.h
+++ b/synfig-studio/trunk/src/gtkmm/dockdialog.h
@@ -59,7 +59,7 @@ class DockDialog : public Gtk::Window
        friend class DockManager;
        friend class DockBook;
        friend class Dockable;
-       SigC::Connection empty_sig;
+       sigc::connection empty_sig;
 
        bool composition_selector_;
 

diff --git a/synfig-studio/trunk/src/gtkmm/instance.cpp b/synfig-studio/trunk/src/gtkmm/instance.cpp
index 89981ad..51385a0 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/instance.cpp
+++ b/synfig-studio/trunk/src/gtkmm/instance.cpp
@@ -62,7 +62,7 @@ using namespace std;
 using namespace etl;
 using namespace synfig;
 using namespace studio;
-using namespace SigC;
+using namespace sigc;
 
 /* === M A C R O S ========================================================= */
 

diff --git a/synfig-studio/trunk/src/gtkmm/preview.h b/synfig-studio/trunk/src/gtkmm/preview.h
index 880e3f8..962a537 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/preview.h
+++ b/synfig-studio/trunk/src/gtkmm/preview.h
@@ -201,7 +201,7 @@ class Widget_Preview : public Gtk::Table
        etl::clock      timer;
 
        //int           curindex; //for later
-       SigC::Connection        timecon;
+       sigc::connection        timecon;
 
        void slider_move(); //later to be a time_slider that's cooler
        bool play_update();

diff --git a/synfig-studio/trunk/src/gtkmm/state_draw.cpp b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
index 457cd5b..a3d8855 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/state_draw.cpp
+++ b/synfig-studio/trunk/src/gtkmm/state_draw.cpp
@@ -99,7 +99,7 @@ class studio::StateDraw_Context : public sigc::trackable
        bool prev_workarea_layer_status_;
 
        int nested;
-       SigC::Connection process_queue_connection;
+       sigc::connection process_queue_connection;
 
        ValueNode_BLine::Handle last_stroke;
        synfig::String last_stroke_id;

diff --git a/synfig-studio/trunk/src/gtkmm/toolbox.cpp b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
index aeed4f5..45c7104 100644 (file)
--- a/synfig-studio/trunk/src/gtkmm/toolbox.cpp
+++ b/synfig-studio/trunk/src/gtkmm/toolbox.cpp
@@ -87,7 +87,7 @@ using namespace std;
 using namespace etl;
 using namespace synfig;
 using namespace studio;
-using namespace SigC;
+using namespace sigc;
 
 /* === M A C R O S ========================================================= */