Merge pull request #7 from nemomobile/dont-disconnect-dead-signal

Don't disconnect dead signal
sailfishos · Mar 12, 2014 · e2d9eb1 · e2d9eb1
2 parents 39affd4 + 2b3a1b0
commit e2d9eb1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/src/contextkit-subscriber/actor.hpp b/src/contextkit-subscriber/actor.hpp
@@ -16,10 +16,7 @@ class Actor_ : public QThread
     Q_OBJECT;
 protected:
     Actor_(QObject *parent) : QThread(parent) {}
-    virtual ~Actor_() {
-        if (!wait(10000))
-            qWarning() << "Timeout: no quit request was sent!";
-    }
+    virtual ~Actor_() {}
 };
 
 
@@ -43,7 +40,8 @@ class Actor : public Actor_
             if (isRunning())
                 quit();
             if (QThread::currentThread() != this)
-                wait();
+                if (!wait(10000))
+                    qWarning() << "Timeout: no quit from thread!";
         }
     }
 

diff --git a/src/contextkit-subscriber/property.cpp b/src/contextkit-subscriber/property.cpp
@@ -213,10 +213,6 @@ void PropertyMonitor::unsubscribe(UnsubscribeRequest *req)
 
     auto handler = phandlers.value();
 
-    // TODO when qt4 support will be removed
-    // disconnect(handler, &Property::changed
-    //           , tgt, &ContextPropertyPrivate::changed);
-    disconnect(handler, SIGNAL(changed(QVariant)), tgt, SLOT(onChanged(QVariant)));
     if (ptargets->isEmpty()) {
         // last subscriber is gone
         targets_.erase(ptargets);