Sophie

Sophie

distrib > Fedora > 18 > i386 > by-pkgid > d9fdd171738afafa24be6c16ccb93bc3 > files > 3

mingw-plotmm-0.1.2-15.fc18.src.rpm

diff -up plotmm-0.1.2/plotmm/curve.h.BAD plotmm-0.1.2/plotmm/curve.h
--- plotmm-0.1.2/plotmm/curve.h.BAD	2008-08-29 08:03:17.000000000 -0400
+++ plotmm-0.1.2/plotmm/curve.h	2008-08-29 08:04:49.000000000 -0400
@@ -140,7 +140,7 @@ namespace PlotMM {
 			  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 -up plotmm-0.1.2/plotmm/plot.cc.BAD plotmm-0.1.2/plotmm/plot.cc
--- plotmm-0.1.2/plotmm/plot.cc.BAD	2008-08-29 08:07:38.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.cc	2008-08-29 08:08:01.000000000 -0400
@@ -352,6 +352,7 @@
 bool Plot::on_canvas_expose_event(GdkEventExpose* event)
 {
     replot();
+    return true;
 }
 
 /*! Replot all curves
@@ -406,19 +407,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 -up plotmm-0.1.2/plotmm/plot.h.BAD plotmm-0.1.2/plotmm/plot.h
--- plotmm-0.1.2/plotmm/plot.h.BAD	2008-08-29 08:08:18.000000000 -0400
+++ plotmm-0.1.2/plotmm/plot.h	2008-08-29 08:08:45.000000000 -0400
@@ -79,9 +79,9 @@ namespace PlotMM 
 	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 @@ namespace PlotMM 
 	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 -up plotmm-0.1.2/plotmm/scale.h.BAD plotmm-0.1.2/plotmm/scale.h
--- plotmm-0.1.2/plotmm/scale.h.BAD	2008-08-29 08:05:52.000000000 -0400
+++ plotmm-0.1.2/plotmm/scale.h	2008-08-29 08:05:24.000000000 -0400
@@ -133,7 +133,7 @@ namespace PlotMM
 	/*! 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();
--- plotmm-0.1.2/plotmm/paint.cc.BAD	2013-03-02 12:06:38.051397476 +0100
+++ plotmm-0.1.2/plotmm/paint.cc	2013-03-02 12:07:04.185655198 +0100
@@ -34,12 +34,14 @@
 {
 }
 
-bool Paint::operator!=(const Paint &) const
+bool Paint::operator!=(const Paint &x) const
 {
+    return !(*this == x);
 }
 
 bool Paint::operator==(const Paint &) const
 {
+    return false;
 }
 
 /*! Set the color of the pen