In the middle of chasing down MDI not activating bug, renaming of Graphic to

[architektonas] / src / base / drawing.cpp

diff --git a/src/base/drawing.cpp b/src/base/drawing.cpp
index d376e049a4bb12c80e5104407a096723b7303955..27f49356deb2995cd66cc47e3f79fd0068bd6977 100644 (file)
--- a/src/base/drawing.cpp
+++ b/src/base/drawing.cpp
@@ -67,10 +67,10 @@ Drawing::~Drawing()
 {
 }
 
-/** @return RS2::EntityGraphic */
+/** @return RS2::EntityDrawing */
 /*virtual*/ RS2::EntityType Drawing::rtti() const
 {
-       return RS2::EntityGraphic;
+       return RS2::EntityDrawing;
 }
 
 /**
@@ -84,7 +84,7 @@ unsigned long int Drawing::countLayerEntities(Layer * layer)
        {
         for(Entity * t=firstEntity(RS2::ResolveNone); t!=NULL; t=nextEntity(RS2::ResolveNone))
                {
-            if (t->getLayer()!=NULL && t->getLayer()->getName()==layer->getName())
+            if (t->getLayer() != NULL && t->getLayer()->getName() == layer->getName())
                        {
                 c += t->countDeep();
             }
@@ -113,13 +113,9 @@ void Drawing::newDoc()
        DEBUG->print("Drawing::newDoc");
 
        clear();
-
        clearLayers();
        clearBlocks();
-
        addLayer(new Layer("0"));
-       //addLayer(new Layer("ByBlock"));
-
        setModified(false);
 }