[PATCH] support gentoo/gcc4 (was: [OSM-talk] New, significantly revised version of osmeditor2)

[Gabriel Ebner]

Attached is a (small) patch that adds commented-out makefile variables for qt3
on gentoo and another one that fixes compiliation with gcc4.

BTW, if I read the source correctly, any tags that osm-editor doesn't
recognize (e.g. because of typos) will be removed when uploading the
parent segment/way, right?

  Gabriel.
-------------- next part --------------
Index: Way.h
===================================================================
--- Way.h	(revision 1132)
+++ Way.h	(working copy)
@@ -107,7 +107,7 @@
 		segments.push_back(i);
 	}
 
-	int Way::removeSegment(Segment *s);
+	int removeSegment(Segment *s);
 	bool addSegmentAt(int index, Segment *s);
 
 	void setComponents(Components2 *c) { components=c; }
Index: SRTMConGen.h
===================================================================
--- SRTMConGen.h	(revision 1132)
+++ SRTMConGen.h	(working copy)
@@ -40,7 +40,7 @@
 	SRTMConGen(Map& map, int f);
 	~SRTMConGen() { delete sampledata; }
 	void generate(DrawSurface *ds);
-	void SRTMConGen::generateShading(DrawSurface *ds,double shadingres);
+	void generateShading(DrawSurface *ds,double shadingres);
 };
 
 }
-------------- next part --------------
Index: Makefile
===================================================================
--- Makefile	(revision 1132)
+++ Makefile	(working copy)
@@ -40,6 +40,12 @@
 #QTLIBPATH = -L/usr/lib
 #MOC=moc
 
+# Gentoo
+#QTINCPATH = /usr/qt/3/include
+#QTLIB = -lqt 
+#QTLIBPATH = -L/usr/qt/3/lib
+#MOC=/usr/qt/3/bin/moc
+
 #set OPTS to -DXMLRPC to compile in XMLRPC stuff
 #OPTS       = -DXMLRPC
 #WARNFLAGS  = -W -Wall
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.openstreetmap.org/pipermail/talk/attachments/20060707/5020b539/attachment.pgp>