rendered paste bodydiff -Naur btg-0.9.8/external/plotmm/compat.h btg-0.9.8-new/external/plotmm/compat.h
--- btg-0.9.8/external/plotmm/compat.h 2008-07-06 18:45:37.000000000 +0200
+++ btg-0.9.8-new/external/plotmm/compat.h 2008-07-06 18:45:37.000000000 +0200
@@ -59,7 +59,7 @@
#else
namespace PlotMM {
- typedef SigC::ObjectBase ObjectBase;
+ typedef sigc::ObjectBase ObjectBase;
}
#endif
diff -Naur btg-0.9.8/external/plotmm/curve.h btg-0.9.8-new/external/plotmm/curve.h
--- btg-0.9.8/external/plotmm/curve.h 2008-07-06 18:45:37.000000000 +0200
+++ btg-0.9.8-new/external/plotmm/curve.h 2008-07-06 18:45:37.000000000 +0200
@@ -140,7 +140,7 @@
int from = 0, int to = -1);
//! Signals that this curve has changed in some way or the other
- SigC::Signal0<void> signal_curve_changed;
+ sigc::signal0<void> signal_curve_changed;
protected:
virtual void init(const Glib::ustring &title);
diff -Naur btg-0.9.8/external/plotmm/plot.cc btg-0.9.8-new/external/plotmm/plot.cc
--- btg-0.9.8/external/plotmm/plot.cc 2008-07-06 18:45:37.000000000 +0200
+++ btg-0.9.8-new/external/plotmm/plot.cc 2008-07-06 18:45:37.000000000 +0200
@@ -322,7 +322,7 @@
connect(sigc::mem_fun(*this,&Plot::on_canvas_expose_event));
#else
canvas_.signal_expose_event().
- connect(SigC::slot(*this,&Plot::on_canvas_expose_event));
+ connect(sigc::slot(*this,&Plot::on_canvas_expose_event));
#endif
show_all();
@@ -406,19 +406,19 @@
}
//! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_press()
{
return canvas_.signal_plot_mouse_press;
}
//! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
+sigc::signal3<void,int,int,GdkEventButton*> Plot::signal_plot_mouse_release()
{
return canvas_.signal_plot_mouse_release;
}
//! Return the signal owned by plot canvas
-SigC::Signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
+sigc::signal3<void,int,int,GdkEventMotion*> Plot::signal_plot_mouse_move()
{
return canvas_.signal_plot_mouse_move;
}
diff -Naur btg-0.9.8/external/plotmm/plot.h btg-0.9.8-new/external/plotmm/plot.h
--- btg-0.9.8/external/plotmm/plot.h 2008-07-06 18:45:37.000000000 +0200
+++ btg-0.9.8-new/external/plotmm/plot.h 2008-07-06 18:45:37.000000000 +0200
@@ -79,9 +79,9 @@
virtual void clear();
virtual void end_replot();
- SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
- SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
- SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press;
+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release;
+ sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move;
protected:
virtual bool on_expose_event(GdkEventExpose* event);
@@ -141,9 +141,9 @@
Scale *scale(PlotAxisID id) { return tickMark_[id]; }
PlotLabel *label(PlotAxisID id) { return axisLabel_[id]; }
- SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
- SigC::Signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
- SigC::Signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_press();
+ sigc::signal3<void,int,int,GdkEventButton*> signal_plot_mouse_release();
+ sigc::signal3<void,int,int,GdkEventMotion*> signal_plot_mouse_move();
void set_selection(const Rectangle &r);
Rectangle get_selection() { return select_; }
diff -Naur btg-0.9.8/external/plotmm/scale.h btg-0.9.8-new/external/plotmm/scale.h
--- btg-0.9.8/external/plotmm/scale.h 2008-07-06 18:45:37.000000000 +0200
+++ btg-0.9.8-new/external/plotmm/scale.h 2008-07-06 18:45:37.000000000 +0200
@@ -133,7 +133,7 @@
/*! This signal is thrown whenever the scale is enabled or disabled
* \sa set_enabled, enabled
*/
- SigC::Signal1<void,bool> signal_enabled;
+ sigc::signal1<void,bool> signal_enabled;
protected:
virtual void on_realize();