diff options
| -rw-r--r-- | test/event-thread.cpp | 8 | ||||
| -rw-r--r-- | test/timer-thread.cpp | 8 |
2 files changed, 2 insertions, 14 deletions
diff --git a/test/event-thread.cpp b/test/event-thread.cpp index 5488a44a..714bc984 100644 --- a/test/event-thread.cpp +++ b/test/event-thread.cpp @@ -27,7 +27,7 @@ public: { pipe(pipefd_); - notifier_ = new EventNotifier(pipefd_[0], EventNotifier::Read); + notifier_ = new EventNotifier(pipefd_[0], EventNotifier::Read, this); notifier_->activated.connect(this, &EventHandler::readReady); } @@ -61,12 +61,6 @@ public: return notified_; } - void moveToThread(Thread *thread) - { - Object::moveToThread(thread); - notifier_->moveToThread(thread); - } - private: void readReady(EventNotifier *notifier) { diff --git a/test/timer-thread.cpp b/test/timer-thread.cpp index b9373050..5c1b4ac4 100644 --- a/test/timer-thread.cpp +++ b/test/timer-thread.cpp @@ -20,7 +20,7 @@ class TimeoutHandler : public Object { public: TimeoutHandler() - : timeout_(false) + : timer_(this), timeout_(false) { timer_.timeout.connect(this, &TimeoutHandler::timeoutHandler); timer_.start(100); @@ -31,12 +31,6 @@ public: return timeout_; } - void moveToThread(Thread *thread) - { - Object::moveToThread(thread); - timer_.moveToThread(thread); - } - private: void timeoutHandler(Timer *timer) { |