mirror of
https://github.com/mapmapteam/mapmap.git
synced 2026-04-03 14:09:34 +02:00
Replaced Shape by MShape to avoid name conflicts.
This commit is contained in:
@@ -19,7 +19,7 @@
|
||||
|
||||
#include "Shape.h"
|
||||
|
||||
void Shape::translate(int x, int y)
|
||||
void MShape::translate(int x, int y)
|
||||
{
|
||||
for (QVector<QPointF>::iterator it = vertices.begin() ;
|
||||
it != vertices.end(); ++it)
|
||||
@@ -507,10 +507,10 @@ void Ellipse::setVertex(int i, const QPointF& v)
|
||||
transform *= fromUnitCircle();
|
||||
|
||||
// Set vertices.
|
||||
Shape::setVertex(1, transform.map( getVertex(1) ));
|
||||
Shape::setVertex(3, transform.map( getVertex(3) ));
|
||||
MShape::setVertex(1, transform.map( getVertex(1) ));
|
||||
MShape::setVertex(3, transform.map( getVertex(3) ));
|
||||
if (hasCenterControl())
|
||||
Shape::setVertex(4, transform.map( getVertex(4) ));
|
||||
MShape::setVertex(4, transform.map( getVertex(4) ));
|
||||
}
|
||||
|
||||
// If changed one of the two other points, just change the vertical axis.
|
||||
|
||||
Reference in New Issue
Block a user