From 26510f1d9ed6795bb70427d14d0e940258740913 Mon Sep 17 00:00:00 2001 From: Slava Monich Date: Tue, 30 Jan 2018 00:24:17 +0200 Subject: [PATCH] [app] A few BooksTask tweaks 1. Added QThread attribute to the constructor 2. Made isCanceled() public --- app/src/BooksTask.cpp | 7 ++++--- app/src/BooksTask.h | 9 ++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/BooksTask.cpp b/app/src/BooksTask.cpp index 8b120f1..a866752 100644 --- a/app/src/BooksTask.cpp +++ b/app/src/BooksTask.cpp @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2017 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2015-2018 Jolla Ltd. + * Copyright (C) 2015-2018 Slava Monich * * You may use this file under the terms of the BSD license as follows: * @@ -38,7 +38,7 @@ #include -BooksTask::BooksTask() : +BooksTask::BooksTask(QThread* aThread) : iAboutToQuit(false), iSubmitted(false), iStarted(false), @@ -46,6 +46,7 @@ BooksTask::BooksTask() : iDone(false) { setAutoDelete(false); + if (aThread) moveToThread(aThread); connect(qApp, SIGNAL(aboutToQuit()), SLOT(onAboutToQuit())); connect(this, SIGNAL(runFinished()), SLOT(onRunFinished()), Qt::QueuedConnection); diff --git a/app/src/BooksTask.h b/app/src/BooksTask.h index 92f499d..cf5de36 100644 --- a/app/src/BooksTask.h +++ b/app/src/BooksTask.h @@ -1,6 +1,6 @@ /* - * Copyright (C) 2015-2017 Jolla Ltd. - * Contact: Slava Monich + * Copyright (C) 2015-2018 Jolla Ltd. + * Copyright (C) 2015-2018 Slava Monich * * You may use this file under the terms of the BSD license as follows: * @@ -45,17 +45,16 @@ class BooksTask : public QObject, public QRunnable friend class BooksTaskQueue; protected: - BooksTask(); + BooksTask(QThread* aThread = NULL); public: virtual ~BooksTask(); bool isStarted() const; + bool isCanceled() const; void release(QObject* aHandler); protected: - bool isCanceled() const; - virtual void run(); virtual void performTask() = 0;