Changeset 8c076a for src/UIElements/Views/Qt4/QtShapeList.cpp

Timestamp:

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

Author:

Frederik Heber <heber@…>

Children:

4a33f6

Parents:

fa6af2

git-author:

Frederik Heber <heber@…> (05/05/16 11:46:01)

git-committer:

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

Message:

FIX: Replaced all uses of getInstance() inside dstors to signOff() by stored Observable ptrs.

• this is cleaner anyway and how it should be done. We require the pointer eventually to signOff. Also, it serves as an indicator to whether we already received subjectKilled() on it.

File:

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

src/UIElements/Views/Qt4/QtShapeList.cpp

@@ -55 +55 @@
 QtShapeList::QtShapeList(QWidget * _parent) :
     QTreeWidget (_parent),
-    Observer("QtShapeList")
+    Observer("QtShapeList"),
+    observed_shaperegistry(ShapeRegistry::getPointer())
 {
   setColumnCount(COLUMNCOUNT);
@@ -70 +71 @@
         refill(NULL);
 
-        ShapeRegistry::getInstance().signOn(this);
-  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::ShapeInserted);
-  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::ShapeRemoved);
-  ShapeRegistry::getInstance().signOn(this, ShapeRegistry::SelectionChanged);
+        observed_shaperegistry->signOn(this);
+  observed_shaperegistry->signOn(this, ShapeRegistry::ShapeInserted);
+  observed_shaperegistry->signOn(this, ShapeRegistry::ShapeRemoved);
+  observed_shaperegistry->signOn(this, ShapeRegistry::SelectionChanged);
 
   connect(this,SIGNAL(itemSelectionChanged()),this,SLOT(rowSelected()));
@@ -80 +81 @@
 QtShapeList::~QtShapeList()
 {
-  ShapeRegistry::getInstance().signOff(this);
-  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeInserted);
-  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::ShapeRemoved);
-  ShapeRegistry::getInstance().signOff(this, ShapeRegistry::SelectionChanged);
+  if(observed_shaperegistry) {
+    observed_shaperegistry->signOff(this);
+    observed_shaperegistry->signOff(this, ShapeRegistry::ShapeInserted);
+    observed_shaperegistry->signOff(this, ShapeRegistry::ShapeRemoved);
+    observed_shaperegistry->signOff(this, ShapeRegistry::SelectionChanged);
+  }
 }
 
@@ -90 +93 @@
 void QtShapeList::recieveNotification(Observable *publisher, Notification_ptr notification)
 {
-  if (static_cast<ShapeRegistry*>(publisher) == ShapeRegistry::getPointer()) {
+  if (publisher == observed_shaperegistry) {
     switch (notification->getChannelNo()) {
       case ShapeRegistry::ShapeInserted:
@@ -150 +153 @@
 #endif
 
-void QtShapeList::subjectKilled(Observable *publisher) {
+void QtShapeList::subjectKilled(Observable *publisher)
+{
+  if (publisher == observed_shaperegistry)
+    observed_shaperegistry = NULL;
+  else
+    ASSERT(0, "QtShapeList::subjectKilled() - unknown publisher "
+        +toString(publisher));
 }