NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

test: Simplify tests with parent-child relationships

Browse source 
Create object instances with a parent to avoid the need for reparenting
objects manually.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jacopo Mondi <jacopo@jmondi.org>
Reviewed-by: Niklas Söderlund <niklas.soderlund@ragnatech.se>
This commit is contained in:
Laurent Pinchart 2019-08-12 14:42:51 +03:00
parent d7aded92d3
commit 778f6b1d70
2 changed files with 2 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
test/event-thread.cpp
View file

@ -27,7 +27,7 @@ public:
{ {
pipe(pipefd_); pipe(pipefd_);
notifier_ = new EventNotifier(pipefd_[0], EventNotifier::Read); notifier_ = new EventNotifier(pipefd_[0], EventNotifier::Read, this);
notifier_->activated.connect(this, &EventHandler::readReady); notifier_->activated.connect(this, &EventHandler::readReady);
} }
@ -61,12 +61,6 @@ public:
return notified_; return notified_;
} }
void moveToThread(Thread *thread)
{
Object::moveToThread(thread);
notifier_->moveToThread(thread);
}
private: private:
void readReady(EventNotifier *notifier) void readReady(EventNotifier *notifier)
{ {

8
test/timer-thread.cpp
View file

@ -20,7 +20,7 @@ class TimeoutHandler : public Object
{ {
public: public:
TimeoutHandler() TimeoutHandler()
: timeout_(false) : timer_(this), timeout_(false)
{ {
timer_.timeout.connect(this, &TimeoutHandler::timeoutHandler); timer_.timeout.connect(this, &TimeoutHandler::timeoutHandler);
timer_.start(100); timer_.start(100);
@ -31,12 +31,6 @@ public:
return timeout_; return timeout_;
} }
void moveToThread(Thread *thread)
{
Object::moveToThread(thread);
timer_.moveToThread(thread);
}
private: private:
void timeoutHandler(Timer *timer) void timeoutHandler(Timer *timer)
{ {