more g++ 4.1 fixes (by inkblotter)

diff --git a/src/removeoverlap/constraint.h b/src/removeoverlap/constraint.h
index c8273376b9fa2aae0ee66ad5831b735cefe5ee5b..de8ccebd48763373c27db7fe8a1cba86c507ccc5 100644 (file)
--- a/src/removeoverlap/constraint.h
+++ b/src/removeoverlap/constraint.h
@@ -25,7 +25,7 @@ public:
        double lm;
        Constraint(Variable *left, Variable *right, double gap);
        ~Constraint(void){};
-       inline double Constraint::slack() const { return right->position() - gap - left->position(); }
+       inline double slack() const { return right->position() - gap - left->position(); }
        //inline bool operator<(Constraint const &o) const { return slack() < o.slack(); }
        long timeStamp;
        bool active;

diff --git a/src/trace/siox.h b/src/trace/siox.h
index cfb7ea19cc92523b3cdce7448674271f3dcdf179..4020fe343d8c9d77f78321e6d2b6ca4f8d85bc9e 100644 (file)
--- a/src/trace/siox.h
+++ b/src/trace/siox.h
@@ -274,7 +274,7 @@ public:
      *\r
      * @see #segmentate\r
      */\r
-    void SioxSegmentator::subpixelRefine(int x, int y, int brushmode,\r
+    void subpixelRefine(int x, int y, int brushmode,\r
                              float threshold, float *cf, int brushsize);\r
 \r
     /**\r
@@ -302,7 +302,7 @@ public:
      *\r
      * @see #segmentate\r
      */\r
-    bool SioxSegmentator::subpixelRefine(int xa, int ya, int dx, int dy,\r
+    bool subpixelRefine(int xa, int ya, int dx, int dy,\r
                                      int brushmode,\r
                                      float threshold, float *cf);\r
     /**\r

diff --git a/src/ui/widget/color-picker.cpp b/src/ui/widget/color-picker.cpp
index ef8c491d0fe458a4c953c74b6cb5a61fa50336b5..a8cdba61e973cfb7129a8e216bd88c04cbfa5e16 100644 (file)
--- a/src/ui/widget/color-picker.cpp
+++ b/src/ui/widget/color-picker.cpp
@@ -25,6 +25,7 @@ namespace Inkscape {
 namespace UI {
 namespace Widget {
 
+void sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp);
 
 ColorPicker::ColorPicker (const Glib::ustring& title, const Glib::ustring& tip,
                           guint32 rgba, bool undo)