Opened 11 years ago

Closed 11 years ago

#1480 closed defect (fixed)

Svn version 13157 PaintStyle and EditPaintStyle compilation problems

Reported by: Aleksandar Topuzovic Owned by: cbro@…
Priority: major Milestone:
Component: merkaartor Version:
Keywords: Cc:

Description

Different declarations in PaintStyle?.h than those used in PaintStyle?.cpp (13149) and in EditPaintStyle?.cpp Quick fix:

Index: D:/devel/svn/merkaator/PaintStyle/PaintStyle.h
===================================================================
--- D:/devel/svn/merkaator/PaintStyle/PaintStyle.h	(revision 13157)
+++ D:/devel/svn/merkaator/PaintStyle/PaintStyle.h	(working copy)
@@ -98,8 +98,8 @@
 		bool getLabelHalo() const;
 		bool getLabelArea() const;
 
-		QString toXML() const;
-		static FeaturePainter fromXML(const QDomElement& e);
+		QString toXML(QString filename) const;
+		static FeaturePainter fromXML(const QDomElement& e, QString filename);
 
 		void drawBackground(Road* R, QPainter& thePainter, const Projection& theProjection) const;
 		void drawBackground(Relation* R, QPainter& thePainter, const Projection& theProjection) const;

and:

Index: D:/devel/svn/merkaator/PaintStyle/EditPaintStyle.cpp
===================================================================
--- D:/devel/svn/merkaator/PaintStyle/EditPaintStyle.cpp	(revision 13157)
+++ D:/devel/svn/merkaator/PaintStyle/EditPaintStyle.cpp	(working copy)
@@ -286,7 +286,7 @@
 		out << globalPainter.toXML();
 		for (int i=0; i<Painters.size(); ++i)
 		{
-			QString s = Painters[i].toXML();
+			QString s = Painters[i].toXML(0);
 			out << s;
 		}
 		out << "</mapStyle>\n";
@@ -312,14 +312,14 @@
 	QDomNode n = docElem.firstChild();
 	while(!n.isNull())
 	{
-		QDomElement e = n.toElement(); // try to convert the node to an element.
+		const QDomElement e = n.toElement(); // try to convert the node to an element.
 		if(!e.isNull() && e.tagName() == "global")
 		{
 			globalPainter = GlobalPainter::fromXML(e);
 		} else
 		if(!e.isNull() && e.tagName() == "painter")
 		{
-			FeaturePainter FP = FeaturePainter::fromXML(e);
+			FeaturePainter FP = FeaturePainter::fromXML(e,0L);
 			Painters.push_back(FP);
 		}
 		n = n.nextSibling();

Change History (1)

comment:1 Changed 11 years ago by Chris Browet

Resolution: fixed
Status: newclosed

Solved in [13158] (forgot a commit)

Note: See TracTickets for help on using tickets.