ba3d model: rename -> m_objects etc, provide accessors

GUI/ba3d/model/model.cpp

@@ -26,12 +26,12 @@ Model::Model()
 
 Model::~Model()
 {
-    for (auto* o : objects) {
+    for (auto* o : m_objects) {
         o->model = nullptr;
         delete o;
     }
 
-    for (auto* o : objectsBlend) {
+    for (auto* o : m_objectsBlend) {
         o->model = nullptr;
         delete o;
     }
@@ -39,15 +39,15 @@ Model::~Model()
 
 void Model::clearOpaque()
 {
-    while (!objects.isEmpty())
-        delete objects.first();
+    while (!m_objects.isEmpty())
+        delete m_objects.first();
     emit updated(false);
 }
 
 void Model::clearBlend()
 {
-    while (!objectsBlend.isEmpty())
-        delete objectsBlend.first();
+    while (!m_objectsBlend.isEmpty())
+        delete m_objectsBlend.first();
     emit updated(false);
 }
 
@@ -131,7 +131,7 @@ void Model::add(Object* o)
     ASSERT(o);
     ASSERT(!o->model);
     o->model = this;
-    objects.append(o);
+    m_objects.append(o);
 }
 
 void Model::addBlend(Object* o)
@@ -139,15 +139,15 @@ void Model::addBlend(Object* o)
     ASSERT(o);
     ASSERT(!o->model);
     o->model = this;
-    objectsBlend.append(o);
+    m_objectsBlend.append(o);
 }
 
 void Model::rem(Object* o)
 {
-    if (int i = objects.indexOf(o); i >= 0)
-        objects.remove(i);
-    else if (int i = objectsBlend.indexOf(o); i >= 0)
-        objectsBlend.remove(i);
+    if (int i = m_objects.indexOf(o); i >= 0)
+        m_objects.remove(i);
+    else if (int i = m_objectsBlend.indexOf(o); i >= 0)
+        m_objectsBlend.remove(i);
     else
         ASSERT(false); // object not found, should not happen, bad caller!
 
@@ -157,26 +157,26 @@ void Model::rem(Object* o)
 
 void Model::releaseGeometries()
 {
-    for (auto* o : objects)
+    for (auto* o : m_objects)
         o->releaseGeometry();
-    for (auto* o : objectsBlend)
+    for (auto* o : m_objectsBlend)
         o->releaseGeometry();
 }
 
 bool Model::modelIsEmpty()
 {
-    return objects.isEmpty() && objectsBlend.isEmpty();
+    return m_objects.isEmpty() && m_objectsBlend.isEmpty();
 }
 
 void Model::draw(Canvas& canvas) const
 {
-    for (auto* o : objects)
+    for (auto* o : objects())
         canvas.drawObject(*o);
 }
 
 void Model::drawBlend(Canvas& canvas) const
 {
-    for (auto* o : objectsBlend)
+    for (auto* o : objectsBlend())
         canvas.drawObject(*o);
 }
 

GUI/ba3d/model/model.h

@@ -51,11 +51,15 @@ public:
 
     Position defCamPos; //!< default camera params
 
+    const QVector<Object*>& objects() const { return m_objects; }
+    const QVector<Object*>& objectsBlend() const { return m_objectsBlend; }
+
 signals:
     void updated(bool withEye);
 
 private:
-    QVector<Object*> objects, objectsBlend;
+    QVector<Object*> m_objects;
+    QVector<Object*> m_objectsBlend;
 
     void draw(Canvas&) const;
     void drawBlend(Canvas&) const;