Replaced Shape by MShape to avoid name conflicts.

This commit is contained in:
Tats
2014-10-31 17:03:18 -04:00
parent 8c3a66344a
commit e8870db92a
16 changed files with 66 additions and 66 deletions

View File

@@ -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.