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

@@ -28,7 +28,7 @@ SourceGLCanvas::SourceGLCanvas(MainWindow* mainWindow, QWidget* parent)
{
}
Shape* SourceGLCanvas::getShapeFromMappingId(uid mappingId)
MShape* SourceGLCanvas::getShapeFromMappingId(uid mappingId)
{
if (mappingId == NULL_UID)
return NULL;