Tavmjong Bah wrote:

Hi,

Got a few compile errors using svn with Fedora Core 5 which uses g++ 4.1. I could fix the first one by a cast but I am afraid my c++ is a bit too rusty when it comes to the second.

				Tav

ui/dialog/align-and-distribute.cpp:1077: error: conversion from ‘int’ to non-scalar type ‘std::_List_iterator<SPItem*>’ requested

ui/view/edit-widget.cpp: In member function ‘void Inkscape::UI::View::EditWidget::initEdit(SPDocument*)’: ui/view/edit-widget.cpp:1560: error: ‘_namedview_modified’ was not declared in this scope

Hi Tav,

Against svn revision 11105

$ svn diff Index: src/removeoverlap/constraint.h =================================================================== --- src/removeoverlap/constraint.h (revision 11105) +++ src/removeoverlap/constraint.h (working copy) @@ -25,7 +25,7 @@ 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; Index: src/trace/siox.h =================================================================== --- src/trace/siox.h (revision 11105) +++ src/trace/siox.h (working copy) @@ -274,8 +274,8 @@ * * @see #segmentate */ - void SioxSegmentator::subpixelRefine(int x, int y, int brushmode, - float threshold, float *cf, int brushsize); + void subpixelRefine(int x, int y, int brushmode, + float threshold, float *cf, int brushsize);

/** * Refines the classification stored in the confidence matrix by modifying @@ -302,9 +302,8 @@ * * @see #segmentate */ - bool SioxSegmentator::subpixelRefine(int xa, int ya, int dx, int dy, - int brushmode, - float threshold, float *cf); + bool subpixelRefine(int xa, int ya, int dx, int dy, + int brushmode, float threshold, float *cf); /** * A region growing algorithms used to fill up the confidence matrix * with <CODE>CERTAIN_FOREGROUND_CONFIDENCE</CODE> for corresponding Index: src/ui/widget/color-picker.cpp =================================================================== --- src/ui/widget/color-picker.cpp (revision 11105) +++ src/ui/widget/color-picker.cpp (working copy) @@ -43,6 +43,7 @@ closeWindow(); _colorSelector = NULL; } +void sp_color_picker_color_mod(SPColorSelector *csel, GObject *cp);

void ColorPicker::setupDialog(const Glib::ustring &title) Index: src/ui/dialog/align-and-distribute.cpp =================================================================== --- src/ui/dialog/align-and-distribute.cpp (revision 11105) +++ src/ui/dialog/align-and-distribute.cpp (working copy) @@ -1074,7 +1074,7 @@ break;

} // end of switch statement - return NULL; + return list.end(); }

AlignAndDistribute::AlignTarget AlignAndDistribute::getAlignTarget()const { Index: src/ui/view/edit-widget.cpp =================================================================== --- src/ui/view/edit-widget.cpp (revision 11105) +++ src/ui/view/edit-widget.cpp (working copy) @@ -1542,7 +1542,9 @@ return r == Gtk::RESPONSE_YES; }

+void _namedview_modified (SPNamedView* nv, guint flags, EditWidget* ew);

+ void EditWidget::initEdit (SPDocument *doc) { @@ -1557,12 +1559,14 @@

/// \todo convert to sigc++ when SPObject hierarchy gets converted /* Listen on namedview modification */ - g_signal_connect (G_OBJECT (_desktop->namedview), "modified", G_CALLBACK (_namedview_modified), this); + g_signal_connect (G_OBJECT (_desktop->namedview), "modified", + G_CALLBACK (_namedview_modified), this); _layer_selector.setDesktop (_desktop); _selected_style_status.setDesktop (_desktop);

Inkscape::NSApplication::Editor::addDesktop (_desktop);

+ _zoom_status.init (_desktop); _top_ruler.init (_desktop, _svg_canvas.widget()); _left_ruler.init (_desktop, _svg_canvas.widget());

But these are not the only problems, although these changes do allow inkscape to build in FC5, g++ 4.1

When I have a bit more time I'll track down some remaining problems.