Changeset 9274f3

Timestamp:

May 5, 2016, 5:14:19 PM (10 years ago)

Author:

Frederik Heber <heber@…>

Children:

4a319a

Parents:

35e83a

git-author:

Frederik Heber <heber@…> (05/05/16 14:24:11)

git-committer:

Frederik Heber <heber@…> (05/05/16 17:14:19)

Message:

QtShapeList uses getLockedInstance on refill().

File:

• src/UIElements/Views/Qt4/QtShapeList.cpp (modified) (2 diffs)

src/UIElements/Views/Qt4/QtShapeList.cpp

@@ -123 +123 @@
   shapeSelection.clear();
 
-  ShapeRegistry &reg = ShapeRegistry::getInstance();
-  ShapeFactory &factory = ShapeFactory::getInstance();
+  const AtomicInstance<ShapeRegistry> reg = ShapeRegistry::getLockedInstance();
+  const ShapeFactory &factory = ShapeFactory::getConstInstance();
 
   ShapeRegistry::const_iterator iter;
-  for (iter = reg.getBeginIter(); iter != reg.getEndIter(); iter ++){
+  for (iter = (*reg).getBeginIter(); iter != (*reg).getEndIter(); iter ++){
     ::Shape *s = iter->second;
     if (s == ignore)
@@ -137 +137 @@
     treeItem->setText(CENTER, QString(toString(s->getCenter()).c_str()));
     treeItem->setText(RADIUS, QString::number(s->getRadius()));
-    treeItem->setSelected(reg.isSelected(s));
+    treeItem->setSelected((*reg).isSelected(s));
 
-    shapeSelection.push_back(reg.isSelected(s));
+    shapeSelection.push_back((*reg).isSelected(s));
   }
   clearing = false;