Hello community, here is the log from the commit of package threadweaver for openSUSE:Factory checked in at 2018-06-22 13:26:04 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/threadweaver (Old) and /work/SRC/openSUSE:Factory/.threadweaver.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "threadweaver" Fri Jun 22 13:26:04 2018 rev:54 rq:616807 version:5.47.0 Changes: -------- --- /work/SRC/openSUSE:Factory/threadweaver/threadweaver.changes 2018-05-18 14:25:39.643308111 +0200 +++ /work/SRC/openSUSE:Factory/.threadweaver.new/threadweaver.changes 2018-06-22 13:26:06.975201842 +0200 @@ -1,0 +2,10 @@ +Tue Jun 12 21:26:11 UTC 2018 - [email protected] + +- Update to 5.47.0 + * New feature release + * For more details please see: + * https://www.kde.org/announcements/kde-frameworks-5.47.0.php +- Changes since 5.46.0: + * Warning-- + +------------------------------------------------------------------- Old: ---- threadweaver-5.46.0.tar.xz New: ---- threadweaver-5.47.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ threadweaver.spec ++++++ --- /var/tmp/diff_new_pack.udSD67/_old 2018-06-22 13:26:07.915167104 +0200 +++ /var/tmp/diff_new_pack.udSD67/_new 2018-06-22 13:26:07.915167104 +0200 @@ -17,13 +17,13 @@ %define lname libKF5ThreadWeaver5 -%define _tar_path 5.46 +%define _tar_path 5.47 # Full KF5 version (e.g. 5.33.0) %{!?_kf5_version: %global _kf5_version %{version}} # Last major and minor KF5 version (e.g. 5.33) %{!?_kf5_bugfix_version: %global _kf5_bugfix_version %(echo %{_kf5_version} | awk -F. '{print $1"."$2}')} Name: threadweaver -Version: 5.46.0 +Version: 5.47.0 Release: 0 BuildRequires: cmake >= 3.0 BuildRequires: extra-cmake-modules >= %{_kf5_bugfix_version} ++++++ threadweaver-5.46.0.tar.xz -> threadweaver-5.47.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/CMakeLists.txt new/threadweaver-5.47.0/CMakeLists.txt --- old/threadweaver-5.46.0/CMakeLists.txt 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/CMakeLists.txt 2018-06-02 18:30:49.000000000 +0200 @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.0) -set(KF5_VERSION "5.46.0") # handled by release scripts +set(KF5_VERSION "5.47.0") # handled by release scripts project(ThreadWeaver VERSION ${KF5_VERSION}) include(FeatureSummary) -find_package(ECM 5.46.0 NO_MODULE) +find_package(ECM 5.47.0 NO_MODULE) set_package_properties(ECM PROPERTIES TYPE REQUIRED DESCRIPTION "Extra CMake Modules." URL "https://projects.kde.org/projects/kdesupport/extra-cmake-modules";) feature_summary(WHAT REQUIRED_PACKAGES_NOT_FOUND FATAL_ON_MISSING_REQUIRED_PACKAGES) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/AppendCharacterAndVerifyJob.h new/threadweaver-5.47.0/autotests/AppendCharacterAndVerifyJob.h --- old/threadweaver-5.46.0/autotests/AppendCharacterAndVerifyJob.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/AppendCharacterAndVerifyJob.h 2018-06-02 18:30:49.000000000 +0200 @@ -35,7 +35,7 @@ public: AppendCharacterAndVerifyJob(); void setValues(QChar character, QString *stringref, const QString &expected); - void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) Q_DECL_OVERRIDE; + void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) override; private: QString m_expected; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/AppendCharacterJob.h new/threadweaver-5.47.0/autotests/AppendCharacterJob.h --- old/threadweaver-5.46.0/autotests/AppendCharacterJob.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/AppendCharacterJob.h 2018-06-02 18:30:49.000000000 +0200 @@ -54,7 +54,7 @@ m_stringref = stringref; } - void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) Q_DECL_OVERRIDE + void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) override { QMutexLocker locker(&s_GlobalMutex); m_stringref->append(m_c); @@ -87,7 +87,7 @@ { } - void run(ThreadWeaver::JobPointer job, ThreadWeaver::Thread* thread) Q_DECL_OVERRIDE + void run(ThreadWeaver::JobPointer job, ThreadWeaver::Thread* thread) override { AppendCharacterJob::run(job, thread); setStatus(Job::Status_Failed); @@ -110,7 +110,7 @@ TWDEBUG(3, "~BusyJob\n"); } - void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) Q_DECL_OVERRIDE + void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) override { using namespace ThreadWeaver; TWDEBUG(3, "BusyJob: entered run()\n"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/JobLoggingDecorator.h new/threadweaver-5.47.0/autotests/JobLoggingDecorator.h --- old/threadweaver-5.46.0/autotests/JobLoggingDecorator.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/JobLoggingDecorator.h 2018-06-02 18:30:49.000000000 +0200 @@ -49,7 +49,7 @@ }; explicit JobLoggingDecorator(const ThreadWeaver::JobPointer &job, JobLoggingDecoratorCollector* collector); - void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; + void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override; private: JobData data_; JobLoggingDecoratorCollector* collector_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/JobLoggingWeaver.h new/threadweaver-5.47.0/autotests/JobLoggingWeaver.h --- old/threadweaver-5.46.0/autotests/JobLoggingWeaver.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/JobLoggingWeaver.h 2018-06-02 18:30:49.000000000 +0200 @@ -37,7 +37,7 @@ Q_OBJECT public: explicit JobLoggingWeaver(QObject* parent = nullptr); - void enqueue(const QVector<ThreadWeaver::JobPointer> &jobs) Q_DECL_OVERRIDE; + void enqueue(const QVector<ThreadWeaver::JobPointer> &jobs) override; private: JobLoggingDecoratorCollector collector_; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/JobTests.cpp new/threadweaver-5.47.0/autotests/JobTests.cpp --- old/threadweaver-5.46.0/autotests/JobTests.cpp 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/JobTests.cpp 2018-06-02 18:30:49.000000000 +0200 @@ -176,7 +176,7 @@ class GeneratingCollection : public Collection { public: - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { std::for_each(SequenceTemplate.cbegin(), SequenceTemplate.cend(), [this](QChar it) { *this << new AppendCharacterJob(it, &sequence_); } ); @@ -187,7 +187,7 @@ class GeneratingSequence : public Sequence { public: - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { std::for_each(SequenceTemplate.cbegin(), SequenceTemplate.cend(), [this](QChar it) { *this << new AppendCharacterJob(it, &sequence_); } ); @@ -954,7 +954,7 @@ struct InstanceCountedJob : public Job { static QAtomicInt counter; - void run(JobPointer, Thread *) Q_DECL_OVERRIDE + void run(JobPointer, Thread *) override { } @@ -1000,7 +1000,7 @@ using namespace ThreadWeaver; struct FailingJob : public Job { - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { throw JobFailed(); } }; @@ -1010,7 +1010,7 @@ QCOMPARE(failing.status(), Job::Status_Failed); struct AbortingJob : public Job { - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { throw JobAborted(); } }; @@ -1020,7 +1020,7 @@ QCOMPARE(aborting.status(), Job::Status_Aborted); struct SuccessfulJob : public Job { - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { // do nothing } }; @@ -1034,7 +1034,7 @@ using namespace ThreadWeaver; struct FailingJob : public Job { - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { setStatus(Job::Status_Failed); } }; @@ -1044,7 +1044,7 @@ QCOMPARE(failing.status(), Job::Status_Failed); struct AbortingJob : public Job { - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { setStatus(Job::Status_Aborted); } }; @@ -1054,7 +1054,7 @@ QCOMPARE(aborting.status(), Job::Status_Aborted); struct SuccessfulJob : public Job { - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { // do nothing } }; @@ -1110,7 +1110,7 @@ : start_(start), count_(count), numbers_(numbers) {} - void run(JobPointer, Thread*) Q_DECL_OVERRIDE { + void run(JobPointer, Thread*) override { numbers_->append(start_); for(int index = start_ + 1; index < start_+count_; ++index) { *this << new GeneratingEnumeratorSequence(numbers_, index, 1); @@ -1129,7 +1129,7 @@ : start_(start), count_(count), numbers_(numbers) {} - void run(JobPointer, Thread*) Q_DECL_OVERRIDE { + void run(JobPointer, Thread*) override { numbers_->append(start_); QVector<GeneratingEnumeratorCollection*> elements; for(int index = start_ + 1; index < start_+count_; ++index) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/LifecycleTests.cpp new/threadweaver-5.47.0/autotests/LifecycleTests.cpp --- old/threadweaver-5.46.0/autotests/LifecycleTests.cpp 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/LifecycleTests.cpp 2018-06-02 18:30:49.000000000 +0200 @@ -46,7 +46,7 @@ m_exists = false; } - void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) Q_DECL_OVERRIDE {} + void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) override {} private: bool &m_exists; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/QueueFactoryTests.cpp new/threadweaver-5.47.0/autotests/QueueFactoryTests.cpp --- old/threadweaver-5.46.0/autotests/QueueFactoryTests.cpp 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/QueueFactoryTests.cpp 2018-06-02 18:30:49.000000000 +0200 @@ -44,7 +44,7 @@ , original_(job) {} - void run(JobPointer self, Thread *thread) Q_DECL_OVERRIDE { + void run(JobPointer self, Thread *thread) override { counter.fetchAndAddRelease(1); IdDecorator::run(self, thread); counter.fetchAndAddAcquire(1); @@ -58,7 +58,7 @@ Q_OBJECT public: explicit JobCountingWeaver(QObject *parent = nullptr) : Weaver(parent) {} - void enqueue(const QVector<JobPointer> &jobs) Q_DECL_OVERRIDE { + void enqueue(const QVector<JobPointer> &jobs) override { QVector<JobPointer> decorated; std::transform(jobs.begin(), jobs.end(), std::back_inserter(decorated), [](const JobPointer & job) @@ -71,7 +71,7 @@ class CountingGlobalQueueFactory : public Queue::GlobalQueueFactory { - Queue *create(QObject *parent = nullptr) Q_DECL_OVERRIDE { + Queue *create(QObject *parent = nullptr) override { return new Queue(new JobCountingWeaver, parent); } }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/autotests/QueueTests.h new/threadweaver-5.47.0/autotests/QueueTests.h --- old/threadweaver-5.46.0/autotests/QueueTests.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/autotests/QueueTests.h 2018-06-02 18:30:49.000000000 +0200 @@ -37,7 +37,7 @@ public: LowPriorityAppendCharacterJob(QChar character = QChar(), QString *stringref = nullptr); - int priority() const Q_DECL_OVERRIDE; + int priority() const override; }; class HighPriorityAppendCharacterJob : public AppendCharacterJob @@ -45,7 +45,7 @@ public: HighPriorityAppendCharacterJob(QChar character = QChar(), QString *stringref = nullptr); - int priority() const Q_DECL_OVERRIDE; + int priority() const override; }; namespace ThreadWeaver @@ -65,7 +65,7 @@ SecondThreadThatQueues(); protected: - void run() Q_DECL_OVERRIDE; + void run() override; }; class QueueTests : public QObject diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/benchmarks/QueueBenchmarks.cpp new/threadweaver-5.47.0/benchmarks/QueueBenchmarks.cpp --- old/threadweaver-5.46.0/benchmarks/QueueBenchmarks.cpp 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/benchmarks/QueueBenchmarks.cpp 2018-06-02 18:30:49.000000000 +0200 @@ -72,7 +72,7 @@ } protected: - void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) Q_DECL_OVERRIDE + void run(ThreadWeaver::JobPointer, ThreadWeaver::Thread *) override { payload(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/HelloInternet/MainWidget.h new/threadweaver-5.47.0/examples/HelloInternet/MainWidget.h --- old/threadweaver-5.46.0/examples/HelloInternet/MainWidget.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/HelloInternet/MainWidget.h 2018-06-02 18:30:49.000000000 +0200 @@ -14,7 +14,7 @@ ~MainWidget(); protected: - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) override; public Q_SLOTS: void setImage(QImage image); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/HelloWorldRaw/HelloWorldRaw.cpp new/threadweaver-5.47.0/examples/HelloWorldRaw/HelloWorldRaw.cpp --- old/threadweaver-5.46.0/examples/HelloWorldRaw/HelloWorldRaw.cpp 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/HelloWorldRaw/HelloWorldRaw.cpp 2018-06-02 18:30:49.000000000 +0200 @@ -34,7 +34,7 @@ public: QDebugJob(const char* message = nullptr) : m_message(message) {} protected: - void run(JobPointer, Thread*) Q_DECL_OVERRIDE { + void run(JobPointer, Thread*) override { qDebug() << m_message; } private: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/ComputeThumbNailJob.h new/threadweaver-5.47.0/examples/ThumbNailer/ComputeThumbNailJob.h --- old/threadweaver-5.46.0/examples/ThumbNailer/ComputeThumbNailJob.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/ComputeThumbNailJob.h 2018-06-02 18:30:49.000000000 +0200 @@ -39,8 +39,8 @@ { public: ComputeThumbNailJob(Image* image, ThreadWeaver::ResourceRestrictionPolicy* throttle); - int priority() const Q_DECL_OVERRIDE; - void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; + int priority() const override; + void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override; private: Image* m_image; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/FileLoaderJob.h new/threadweaver-5.47.0/examples/ThumbNailer/FileLoaderJob.h --- old/threadweaver-5.46.0/examples/ThumbNailer/FileLoaderJob.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/FileLoaderJob.h 2018-06-02 18:30:49.000000000 +0200 @@ -39,8 +39,8 @@ { public: explicit FileLoaderJob(Image* image, ThreadWeaver::ResourceRestrictionPolicy* throttle); - int priority() const Q_DECL_OVERRIDE; - void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; + int priority() const override; + void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override; private: Image* m_image; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/ImageListFilter.h new/threadweaver-5.47.0/examples/ThumbNailer/ImageListFilter.h --- old/threadweaver-5.46.0/examples/ThumbNailer/ImageListFilter.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/ImageListFilter.h 2018-06-02 18:30:49.000000000 +0200 @@ -34,7 +34,7 @@ Q_OBJECT public: explicit ImageListFilter(Image::Steps step, QObject* parent = nullptr); - bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const Q_DECL_OVERRIDE; + bool filterAcceptsRow(int source_row, const QModelIndex & source_parent) const override; private: Image::Steps m_step; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/ImageLoaderJob.h new/threadweaver-5.47.0/examples/ThumbNailer/ImageLoaderJob.h --- old/threadweaver-5.46.0/examples/ThumbNailer/ImageLoaderJob.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/ImageLoaderJob.h 2018-06-02 18:30:49.000000000 +0200 @@ -39,8 +39,8 @@ { public: explicit ImageLoaderJob(Image* image, ThreadWeaver::ResourceRestrictionPolicy* throttle); - int priority() const Q_DECL_OVERRIDE; - void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; + int priority() const override; + void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override; private: Image* m_image; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/ItemDelegate.h new/threadweaver-5.47.0/examples/ThumbNailer/ItemDelegate.h --- old/threadweaver-5.46.0/examples/ThumbNailer/ItemDelegate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/ItemDelegate.h 2018-06-02 18:30:49.000000000 +0200 @@ -29,8 +29,8 @@ static const int TextMargin; static const int Margin; private: - QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex& index) const Q_DECL_OVERRIDE; - void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const Q_DECL_OVERRIDE; + QSize sizeHint(const QStyleOptionViewItem & option, const QModelIndex& index) const override; + void paint(QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const override; }; #endif // SMIVITEMDELEGATE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/MainWindow.h new/threadweaver-5.47.0/examples/ThumbNailer/MainWindow.h --- old/threadweaver-5.46.0/examples/ThumbNailer/MainWindow.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/MainWindow.h 2018-06-02 18:30:49.000000000 +0200 @@ -48,7 +48,7 @@ ~MainWindow(); protected: - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void closeEvent(QCloseEvent*) override; public Q_SLOTS: void slotProgress(int step, int total); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/Model.h new/threadweaver-5.47.0/examples/ThumbNailer/Model.h --- old/threadweaver-5.46.0/examples/ThumbNailer/Model.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/Model.h 2018-06-02 18:30:49.000000000 +0200 @@ -70,9 +70,9 @@ void progressChanged(); void elementChanged(int id); - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QVariant data(const QModelIndex &index, int role) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; Q_SIGNALS: void completed(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/examples/ThumbNailer/PriorityDecorator.h new/threadweaver-5.47.0/examples/ThumbNailer/PriorityDecorator.h --- old/threadweaver-5.46.0/examples/ThumbNailer/PriorityDecorator.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/examples/ThumbNailer/PriorityDecorator.h 2018-06-02 18:30:49.000000000 +0200 @@ -34,9 +34,9 @@ explicit PriorityDecorator(int priority, ThreadWeaver::JobInterface* job, bool autoDelete = true); //FIXME temp - void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) Q_DECL_OVERRIDE; + void run(ThreadWeaver::JobPointer self, ThreadWeaver::Thread *thread) override; - int priority() const Q_DECL_OVERRIDE; + int priority() const override; private: int m_priority; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/collection.cpp new/threadweaver-5.47.0/src/collection.cpp --- old/threadweaver-5.46.0/src/collection.cpp 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/collection.cpp 2018-06-02 18:30:49.000000000 +0200 @@ -54,7 +54,7 @@ collection = collection_; } - void begin(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE { + void begin(const JobPointer& job, Thread *thread) override { TWDEBUG(4, "CollectionExecuteWrapper::begin: collection %p\n", collection); ExecuteWrapper::begin(job, thread); Q_ASSERT(collection); @@ -62,14 +62,14 @@ ExecuteWrapper::begin(job, thread); } - void end(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE { + void end(const JobPointer& job, Thread *thread) override { TWDEBUG(4, "CollectionExecuteWrapper::end: collection %p\n", collection); Q_ASSERT(collection); ExecuteWrapper::end(job, thread); collection->d()->elementFinished(collection, job, thread); } - void cleanup(const JobPointer& job, Thread *) Q_DECL_OVERRIDE { + void cleanup(const JobPointer& job, Thread *) override { //Once job is unwrapped from us, this object is dangling. Job::executor points to the next higher up execute wrapper. //It is thus safe to "delete this". By no means add any later steps after delete! delete unwrap(job); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/collection.h new/threadweaver-5.47.0/src/collection.h --- old/threadweaver-5.46.0/src/collection.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/collection.h 2018-06-02 18:30:49.000000000 +0200 @@ -49,7 +49,7 @@ public: Collection(); Collection(ThreadWeaver::Private::Collection_Private * d); - ~Collection(); + ~Collection() override; /** Append a job to the collection. * @@ -81,10 +81,10 @@ protected: /** Overload to queue the collection. */ - void aboutToBeQueued_locked(QueueAPI *api) Q_DECL_OVERRIDE; + void aboutToBeQueued_locked(QueueAPI *api) override; /** Overload to dequeue the collection. */ - void aboutToBeDequeued_locked(QueueAPI *api) Q_DECL_OVERRIDE; + void aboutToBeDequeued_locked(QueueAPI *api) override; /** Return a ref-erence to the job in the job list at position i. */ JobPointer jobAt(int i); @@ -97,11 +97,11 @@ protected: /** Overload the execute method. */ - void execute(const JobPointer& job, Thread *) Q_DECL_OVERRIDE; + void execute(const JobPointer& job, Thread *) override; /** Overload run(). * We have to. */ - void run(JobPointer self, Thread *thread) Q_DECL_OVERRIDE; + void run(JobPointer self, Thread *thread) override; protected: friend class CollectionExecuteWrapper; //needs to access d() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/collection_p.h new/threadweaver-5.47.0/src/collection_p.h --- old/threadweaver-5.46.0/src/collection_p.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/collection_p.h 2018-06-02 18:30:49.000000000 +0200 @@ -42,8 +42,8 @@ class CollectionSelfExecuteWrapper : public ThreadWeaver::ExecuteWrapper { public: - void begin(const JobPointer&, Thread *) Q_DECL_OVERRIDE; - void end(const JobPointer&, Thread *) Q_DECL_OVERRIDE; + void begin(const JobPointer&, Thread *) override; + void end(const JobPointer&, Thread *) override; void callBegin(); void callEnd(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/dependencypolicy.h new/threadweaver-5.47.0/src/dependencypolicy.h --- old/threadweaver-5.46.0/src/dependencypolicy.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/dependencypolicy.h 2018-06-02 18:30:49.000000000 +0200 @@ -52,7 +52,7 @@ { public: /** Destructor. */ - ~DependencyPolicy(); + ~DependencyPolicy() override; /** @brief Add jobB as a dependency of jobA. * jobA will only be executed after jobB has been successfully processed. @@ -84,13 +84,13 @@ static DependencyPolicy &instance(); - bool canRun(JobPointer) Q_DECL_OVERRIDE; + bool canRun(JobPointer) override; - void free(JobPointer) Q_DECL_OVERRIDE; + void free(JobPointer) override; - void release(JobPointer) Q_DECL_OVERRIDE; + void release(JobPointer) override; - void destructed(JobInterface *job) Q_DECL_OVERRIDE; + void destructed(JobInterface *job) override; bool isEmpty() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/destructedstate.h new/threadweaver-5.47.0/src/destructedstate.h --- old/threadweaver-5.46.0/src/destructedstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/destructedstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -43,25 +43,25 @@ { public: explicit DestructedState(QueueSignals *weaver); - void shutDown() Q_DECL_OVERRIDE; - Weaver *weaver() Q_DECL_OVERRIDE; - const Weaver *weaver() const Q_DECL_OVERRIDE; - void setMaximumNumberOfThreads(int cap) Q_DECL_OVERRIDE; - int maximumNumberOfThreads() const Q_DECL_OVERRIDE; - int currentNumberOfThreads() const Q_DECL_OVERRIDE; - void enqueue(const QVector<JobPointer> &job) Q_DECL_OVERRIDE; - bool dequeue(const JobPointer &job) Q_DECL_OVERRIDE; - void dequeue() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - bool isIdle() const Q_DECL_OVERRIDE; - int queueLength() const Q_DECL_OVERRIDE; - void requestAbort() Q_DECL_OVERRIDE; - void suspend() Q_DECL_OVERRIDE; - void resume() Q_DECL_OVERRIDE; - JobPointer applyForWork(Thread *th, bool wasBusy) Q_DECL_OVERRIDE; - void waitForAvailableJob(Thread *th) Q_DECL_OVERRIDE; - StateId stateId() const Q_DECL_OVERRIDE; + void shutDown() override; + Weaver *weaver() override; + const Weaver *weaver() const override; + void setMaximumNumberOfThreads(int cap) override; + int maximumNumberOfThreads() const override; + int currentNumberOfThreads() const override; + void enqueue(const QVector<JobPointer> &job) override; + bool dequeue(const JobPointer &job) override; + void dequeue() override; + void finish() override; + bool isEmpty() const override; + bool isIdle() const override; + int queueLength() const override; + void requestAbort() override; + void suspend() override; + void resume() override; + JobPointer applyForWork(Thread *th, bool wasBusy) override; + void waitForAvailableJob(Thread *th) override; + StateId stateId() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/executewrapper_p.h new/threadweaver-5.47.0/src/executewrapper_p.h --- old/threadweaver-5.46.0/src/executewrapper_p.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/executewrapper_p.h 2018-06-02 18:30:49.000000000 +0200 @@ -46,10 +46,10 @@ ExecuteWrapper(); Executor *wrap(Executor *previous); Executor *unwrap(const JobPointer& job); - void begin(const JobPointer& job, Thread *) Q_DECL_OVERRIDE; - void execute(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; + void begin(const JobPointer& job, Thread *) override; + void execute(const JobPointer& job, Thread *thread) override; void executeWrapped(const JobPointer& job, Thread *thread); - void end(const JobPointer& job, Thread *) Q_DECL_OVERRIDE; + void end(const JobPointer& job, Thread *) override; private: QAtomicPointer<Executor> wrapped; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/iddecorator.h new/threadweaver-5.47.0/src/iddecorator.h --- old/threadweaver-5.46.0/src/iddecorator.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/iddecorator.h 2018-06-02 18:30:49.000000000 +0200 @@ -45,7 +45,7 @@ { public: explicit IdDecorator(JobInterface *job, bool autoDelete = true); - ~IdDecorator(); + ~IdDecorator() override; /** Retrieve the decorated job. */ const JobInterface *job() const; /** Retrieve the decorated job. */ @@ -67,29 +67,29 @@ * If the decorated Job is not a Sequence, 0 is returned. */ Sequence *sequence(); - void execute(const JobPointer& job, Thread *) Q_DECL_OVERRIDE; - void blockingExecute() Q_DECL_OVERRIDE; - Executor *setExecutor(Executor *executor) Q_DECL_OVERRIDE; - Executor *executor() const Q_DECL_OVERRIDE; - int priority() const Q_DECL_OVERRIDE; - void setStatus(Status) Q_DECL_OVERRIDE; - Status status() const Q_DECL_OVERRIDE; - bool success() const Q_DECL_OVERRIDE; - void requestAbort() Q_DECL_OVERRIDE; - void aboutToBeQueued(QueueAPI *api) Q_DECL_OVERRIDE; - void aboutToBeQueued_locked(QueueAPI *api) Q_DECL_OVERRIDE; - void aboutToBeDequeued(QueueAPI *api) Q_DECL_OVERRIDE; - void aboutToBeDequeued_locked(QueueAPI *api) Q_DECL_OVERRIDE; - bool isFinished() const Q_DECL_OVERRIDE; - void assignQueuePolicy(QueuePolicy *) Q_DECL_OVERRIDE; - void removeQueuePolicy(QueuePolicy *) Q_DECL_OVERRIDE; - QList<QueuePolicy *> queuePolicies() const Q_DECL_OVERRIDE; - QMutex *mutex() const Q_DECL_OVERRIDE; + void execute(const JobPointer& job, Thread *) override; + void blockingExecute() override; + Executor *setExecutor(Executor *executor) override; + Executor *executor() const override; + int priority() const override; + void setStatus(Status) override; + Status status() const override; + bool success() const override; + void requestAbort() override; + void aboutToBeQueued(QueueAPI *api) override; + void aboutToBeQueued_locked(QueueAPI *api) override; + void aboutToBeDequeued(QueueAPI *api) override; + void aboutToBeDequeued_locked(QueueAPI *api) override; + bool isFinished() const override; + void assignQueuePolicy(QueuePolicy *) override; + void removeQueuePolicy(QueuePolicy *) override; + QList<QueuePolicy *> queuePolicies() const override; + QMutex *mutex() const override; protected: - void run(JobPointer self, Thread *thread) Q_DECL_OVERRIDE; - void defaultBegin(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; - void defaultEnd(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; + void run(JobPointer self, Thread *thread) override; + void defaultBegin(const JobPointer& job, Thread *thread) override; + void defaultEnd(const JobPointer& job, Thread *thread) override; private: class Private1; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/inconstructionstate.h new/threadweaver-5.47.0/src/inconstructionstate.h --- old/threadweaver-5.46.0/src/inconstructionstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/inconstructionstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -45,13 +45,13 @@ public: explicit InConstructionState(QueueSignals *weaver); /** Suspend job processing. */ - void suspend() Q_DECL_OVERRIDE; + void suspend() override; /** Resume job processing. */ - void resume() Q_DECL_OVERRIDE; + void resume() override; /** Assign a job to an idle thread. */ - JobPointer applyForWork(Thread *th, bool wasBusy) Q_DECL_OVERRIDE; + JobPointer applyForWork(Thread *th, bool wasBusy) override; /** reimpl */ - StateId stateId() const Q_DECL_OVERRIDE; + StateId stateId() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/job.h new/threadweaver-5.47.0/src/job.h --- old/threadweaver-5.46.0/src/job.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/job.h 2018-06-02 18:30:49.000000000 +0200 @@ -67,7 +67,7 @@ Job(Private::Job_Private* d); /** Destructor. */ - virtual ~Job(); + ~Job() override; /** Perform the job. The thread in which this job is executed is given as a parameter. * @@ -78,20 +78,20 @@ * job is the Job that the queue is executing. It is not necessarily equal to this. For example, Jobs that are * decorated expose the decorator's address, not the address of the decorated object. */ - void execute(const JobPointer& job, Thread *) Q_DECL_OVERRIDE; + void execute(const JobPointer& job, Thread *) override; /** Perform the job synchroneously in the current thread. */ - void blockingExecute() Q_DECL_OVERRIDE; + void blockingExecute() override; /** Set the Executor object that is supposed to run the job. * * Returns the previously set executor. The executor can never be unset. If zero is passed in as the new executor, the Job * will internally reset to a default executor that only invokes run(). */ - Executor *setExecutor(Executor *executor) Q_DECL_OVERRIDE; + Executor *setExecutor(Executor *executor) override; /** Returns the executor currently set on the Job. */ - Executor *executor() const Q_DECL_OVERRIDE; + Executor *executor() const override; /** The queueing priority of the job. * Jobs will be sorted by their queueing priority when enqueued. A higher queueing priority will place the job in front of all @@ -102,18 +102,18 @@ * * The default implementation returns zero. Only if this method is overloaded for some job classes, priorities will influence * the execution order of jobs. */ - int priority() const Q_DECL_OVERRIDE; + int priority() const override; /** @brief Set the status of the Job. * * Do not call this method unless you know what you are doing, please :-) */ - void setStatus(Status) Q_DECL_OVERRIDE; + void setStatus(Status) override; /** @brief The status of the job. * * The status will be changed to Status_Success if the run() method exits normally. */ - Status status() const Q_DECL_OVERRIDE; + Status status() const override; /** Return whether the Job finished successfully or not. * The default implementation simply returns true. Overload in derived classes if the derived Job class can fail. @@ -125,7 +125,7 @@ * not be executed after a failure, it is important to dequeue those before deleting the failed Job. A Sequence may be * helpful for that purpose. */ - bool success() const Q_DECL_OVERRIDE; + bool success() const override; /** Abort the execution of the job. * @@ -137,7 +137,7 @@ * The method is not pure virtual because users are not supposed to be forced to always implement requestAbort(). Also, this * method is supposed to return immediately, not after the abort has completed. It requests the abort, the Job has to act on * the request. */ - void requestAbort() Q_DECL_OVERRIDE {} + void requestAbort() override {} /** The job is about to be added to the weaver's job queue. * @@ -148,10 +148,10 @@ * is save to assume that recursive queueing is atomic from the queues perspective. * * @param api the QueueAPI object the job will be queued in */ - void aboutToBeQueued(QueueAPI *api) Q_DECL_OVERRIDE; + void aboutToBeQueued(QueueAPI *api) override; /** Called from aboutToBeQueued() while the mutex is being held. */ - void aboutToBeQueued_locked(QueueAPI *api) Q_DECL_OVERRIDE; + void aboutToBeQueued_locked(QueueAPI *api) override; /** This Job is about the be dequeued from the weaver's job queue. * @@ -162,29 +162,29 @@ * Note: The default implementation does nothing. * * @param weaver the Weaver object from which the job will be dequeued */ - void aboutToBeDequeued(QueueAPI *api) Q_DECL_OVERRIDE; + void aboutToBeDequeued(QueueAPI *api) override; /** Called from aboutToBeDequeued() while the mutex is being held. */ - void aboutToBeDequeued_locked(QueueAPI *api) Q_DECL_OVERRIDE; + void aboutToBeDequeued_locked(QueueAPI *api) override; /** Returns true if the jobs's execute method finished. */ - bool isFinished() const Q_DECL_OVERRIDE; + bool isFinished() const override; /** Assign a queue policy. * * Queue Policies customize the queueing (running) behaviour of sets of jobs. Examples for queue policies are dependencies * and resource restrictions. Every queue policy object can only be assigned once to a job, multiple assignments will be * IGNORED. */ - void assignQueuePolicy(QueuePolicy *) Q_DECL_OVERRIDE; + void assignQueuePolicy(QueuePolicy *) override; /** Remove a queue policy from this job. */ - void removeQueuePolicy(QueuePolicy *) Q_DECL_OVERRIDE; + void removeQueuePolicy(QueuePolicy *) override; /** @brief Return the queue policies assigned to this Job. */ - QList<QueuePolicy *> queuePolicies() const Q_DECL_OVERRIDE; + QList<QueuePolicy *> queuePolicies() const override; /** The mutex used to protect this job. */ - QMutex *mutex() const Q_DECL_OVERRIDE; + QMutex *mutex() const override; private: Private::Job_Private *d_; @@ -204,21 +204,21 @@ * counted object handled by the queue. Using it as signal parameters will amongst other things prevent thejob from being * memory managed and deleted. */ - virtual void run(JobPointer self, Thread *thread) Q_DECL_OVERRIDE = 0; + virtual void run(JobPointer self, Thread *thread) override = 0; /** @brief Perform standard tasks before starting the execution of a job. * * The default implementation is empty. * job is the Job that the queue is executing. It is not necessarily equal to this. For example, Jobs that are * decorated expose the decorator's address, not the address of the decorated object. */ - void defaultBegin(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; + void defaultBegin(const JobPointer& job, Thread *thread) override; /** @brief Perform standard task after the execution of a job. * * The default implementation is empty. * job is the Job that the queue is executing. It is not necessarily equal to this. For example, Jobs that are * decorated expose the decorator's address, not the address of the decorated object. */ - void defaultEnd(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; + void defaultEnd(const JobPointer& job, Thread *thread) override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/job_p.h new/threadweaver-5.47.0/src/job_p.h --- old/threadweaver-5.46.0/src/job_p.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/job_p.h 2018-06-02 18:30:49.000000000 +0200 @@ -38,9 +38,9 @@ class THREADWEAVER_EXPORT DefaultExecutor : public ThreadWeaver::Executor { public: - void begin(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; - void execute(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; - void end(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; + void begin(const JobPointer& job, Thread *thread) override; + void execute(const JobPointer& job, Thread *thread) override; + void end(const JobPointer& job, Thread *thread) override; }; extern DefaultExecutor defaultExecutor; @@ -48,7 +48,7 @@ class DebugExecuteWrapper : public ThreadWeaver::ExecuteWrapper { public: - void execute(const JobPointer &job, ThreadWeaver::Thread *th) Q_DECL_OVERRIDE; + void execute(const JobPointer &job, ThreadWeaver::Thread *th) override; }; class Job_Private diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/lambda.h new/threadweaver-5.47.0/src/lambda.h --- old/threadweaver-5.46.0/src/lambda.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/lambda.h 2018-06-02 18:30:49.000000000 +0200 @@ -43,7 +43,7 @@ {} protected: - void run(JobPointer, Thread *) Q_DECL_OVERRIDE { + void run(JobPointer, Thread *) override { t(); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/qobjectdecorator.h new/threadweaver-5.47.0/src/qobjectdecorator.h --- old/threadweaver-5.46.0/src/qobjectdecorator.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/qobjectdecorator.h 2018-06-02 18:30:49.000000000 +0200 @@ -56,8 +56,8 @@ void failed(ThreadWeaver::JobPointer); protected: - void defaultBegin(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; - void defaultEnd(const JobPointer& job, Thread *thread) Q_DECL_OVERRIDE; + void defaultBegin(const JobPointer& job, Thread *thread) override; + void defaultEnd(const JobPointer& job, Thread *thread) override; }; typedef QSharedPointer<QObjectDecorator> QJobPointer; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/queue.h new/threadweaver-5.47.0/src/queue.h --- old/threadweaver-5.46.0/src/queue.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/queue.h 2018-06-02 18:30:49.000000000 +0200 @@ -60,30 +60,30 @@ /** @brief Construct a queue with a customized implementation * The queue takes ownership and will delete the implementation upon destruction. */ explicit Queue(QueueSignals *implementation, QObject *parent = nullptr); - virtual ~Queue(); + ~Queue() override; QueueStream stream(); - const State *state() const Q_DECL_OVERRIDE; + const State *state() const override; - void setMaximumNumberOfThreads(int cap) Q_DECL_OVERRIDE; - int maximumNumberOfThreads() const Q_DECL_OVERRIDE; - int currentNumberOfThreads() const Q_DECL_OVERRIDE; + void setMaximumNumberOfThreads(int cap) override; + int maximumNumberOfThreads() const override; + int currentNumberOfThreads() const override; static ThreadWeaver::Queue *instance(); - void enqueue(const QVector<JobPointer> &jobs) Q_DECL_OVERRIDE; + void enqueue(const QVector<JobPointer> &jobs) override; void enqueue(const JobPointer &job); - bool dequeue(const JobPointer &) Q_DECL_OVERRIDE; - void dequeue() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; - void suspend() Q_DECL_OVERRIDE; - void resume() Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - bool isIdle() const Q_DECL_OVERRIDE; - int queueLength() const Q_DECL_OVERRIDE; - void requestAbort() Q_DECL_OVERRIDE; - void reschedule() Q_DECL_OVERRIDE; - void shutDown() Q_DECL_OVERRIDE; + bool dequeue(const JobPointer &) override; + void dequeue() override; + void finish() override; + void suspend() override; + void resume() override; + bool isEmpty() const override; + bool isIdle() const override; + int queueLength() const override; + void requestAbort() override; + void reschedule() override; + void shutDown() override; /** @brief Interface for the global queue factory. */ struct GlobalQueueFactory { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/queueapi.h new/threadweaver-5.47.0/src/queueapi.h --- old/threadweaver-5.46.0/src/queueapi.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/queueapi.h 2018-06-02 18:30:49.000000000 +0200 @@ -45,7 +45,7 @@ explicit QueueAPI(ThreadWeaver::Private::QueueSignals_Private* d, QObject *parent = nullptr); virtual void shutDown_p() = 0; - const State *state() const Q_DECL_OVERRIDE = 0; + const State *state() const override = 0; virtual State *state() = 0; virtual void setMaximumNumberOfThreads_p(int cap) = 0; virtual int maximumNumberOfThreads_p() const = 0; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/resourcerestrictionpolicy.h new/threadweaver-5.47.0/src/resourcerestrictionpolicy.h --- old/threadweaver-5.46.0/src/resourcerestrictionpolicy.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/resourcerestrictionpolicy.h 2018-06-02 18:30:49.000000000 +0200 @@ -55,7 +55,7 @@ { public: explicit ResourceRestrictionPolicy(int cap = 0); - ~ResourceRestrictionPolicy(); + ~ResourceRestrictionPolicy() override; /** @brief Cap the number of simultaneously executing jobs. * Capping the amount of jobs will make sure that at max the number of jobs executing at any time is @@ -65,10 +65,10 @@ */ void setCap(int newCap); int cap() const; - bool canRun(JobPointer) Q_DECL_OVERRIDE; - void free(JobPointer) Q_DECL_OVERRIDE; - void release(JobPointer) Q_DECL_OVERRIDE; - void destructed(JobInterface *job) Q_DECL_OVERRIDE; + bool canRun(JobPointer) override; + void free(JobPointer) override; + void release(JobPointer) override; + void destructed(JobInterface *job) override; private: class Private; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/sequence_p.h new/threadweaver-5.47.0/src/sequence_p.h --- old/threadweaver-5.46.0/src/sequence_p.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/sequence_p.h 2018-06-02 18:30:49.000000000 +0200 @@ -39,10 +39,10 @@ class BlockerPolicy : public QueuePolicy { public: - bool canRun(JobPointer) Q_DECL_OVERRIDE; - void free(JobPointer) Q_DECL_OVERRIDE; - void release(JobPointer) Q_DECL_OVERRIDE; - void destructed(JobInterface *job) Q_DECL_OVERRIDE; + bool canRun(JobPointer) override; + void free(JobPointer) override; + void release(JobPointer) override; + void destructed(JobInterface *job) override; }; class Sequence_Private : public Collection_Private @@ -50,9 +50,9 @@ public: Sequence_Private(); BlockerPolicy* blocker(); - void prepareToEnqueueElements() Q_DECL_OVERRIDE; - void processCompletedElement(Collection* collection, JobPointer job, Thread *thread) Q_DECL_OVERRIDE; - void elementDequeued(const JobPointer& job) Q_DECL_OVERRIDE; + void prepareToEnqueueElements() override; + void processCompletedElement(Collection* collection, JobPointer job, Thread *thread) override; + void elementDequeued(const JobPointer& job) override; BlockerPolicy blocker_; QAtomicInt completed_; }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/shuttingdownstate.h new/threadweaver-5.47.0/src/shuttingdownstate.h --- old/threadweaver-5.46.0/src/shuttingdownstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/shuttingdownstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -45,17 +45,17 @@ explicit ShuttingDownState(QueueSignals *weaver); /** Shut down the queue. */ - void shutDown() Q_DECL_OVERRIDE; + void shutDown() override; /** Suspend job processing. */ - void suspend() Q_DECL_OVERRIDE; + void suspend() override; /** Resume job processing. */ - void resume() Q_DECL_OVERRIDE; + void resume() override; /** Assign a job to an idle thread. */ - JobPointer applyForWork(Thread *th, bool wasBusy) Q_DECL_OVERRIDE; + JobPointer applyForWork(Thread *th, bool wasBusy) override; /** Wait (by suspending the calling thread) until a job becomes available. */ - void waitForAvailableJob(Thread *th) Q_DECL_OVERRIDE; + void waitForAvailableJob(Thread *th) override; /** reimpl */ - StateId stateId() const Q_DECL_OVERRIDE; + StateId stateId() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/suspendedstate.h new/threadweaver-5.47.0/src/suspendedstate.h --- old/threadweaver-5.46.0/src/suspendedstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/suspendedstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -42,13 +42,13 @@ public: explicit SuspendedState(Weaver *weaver); /** Suspend job processing. */ - void suspend() Q_DECL_OVERRIDE; + void suspend() override; /** Resume job processing. */ - void resume() Q_DECL_OVERRIDE; + void resume() override; /** Assign a job to an idle thread. */ - JobPointer applyForWork(Thread *th, bool wasBusy) Q_DECL_OVERRIDE; + JobPointer applyForWork(Thread *th, bool wasBusy) override; /** reimpl */ - StateId stateId() const Q_DECL_OVERRIDE; + StateId stateId() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/suspendingstate.h new/threadweaver-5.47.0/src/suspendingstate.h --- old/threadweaver-5.46.0/src/suspendingstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/suspendingstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -43,15 +43,15 @@ public: explicit SuspendingState(Weaver *weaver); /** Suspend job processing. */ - void suspend() Q_DECL_OVERRIDE; + void suspend() override; /** Resume job processing. */ - void resume() Q_DECL_OVERRIDE; + void resume() override; /** Assign a job to an idle thread. */ - JobPointer applyForWork(Thread *th, bool wasBusy) Q_DECL_OVERRIDE; + JobPointer applyForWork(Thread *th, bool wasBusy) override; /** Overload. */ - void activated() Q_DECL_OVERRIDE; + void activated() override; /** reimpl */ - StateId stateId() const Q_DECL_OVERRIDE; + StateId stateId() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/thread.h new/threadweaver-5.47.0/src/thread.h --- old/threadweaver-5.46.0/src/thread.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/thread.h 2018-06-02 18:30:49.000000000 +0200 @@ -55,14 +55,14 @@ explicit Thread(Weaver *parent = nullptr); /** The destructor. */ - ~Thread(); + ~Thread() override; /** @brief The run method is reimplemented to execute jobs from the queue. * * Whenever the thread is idle, it will ask its Weaver parent for a Job to do. The Weaver will either return a Job or a null * pointer. When a null pointer is returned, it tells the thread to exit. */ - void run() Q_DECL_OVERRIDE; + void run() override; /** @brief Returns the thread id. * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/weaver.h new/threadweaver-5.47.0/src/weaver.h --- old/threadweaver-5.46.0/src/weaver.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/weaver.h 2018-06-02 18:30:49.000000000 +0200 @@ -53,29 +53,29 @@ Q_OBJECT public: explicit Weaver(QObject *parent = nullptr); - virtual ~Weaver(); - void shutDown() Q_DECL_OVERRIDE; - void shutDown_p() Q_DECL_OVERRIDE; - - const State *state() const Q_DECL_OVERRIDE; - State *state() Q_DECL_OVERRIDE; - - void setMaximumNumberOfThreads(int cap) Q_DECL_OVERRIDE; - int maximumNumberOfThreads() const Q_DECL_OVERRIDE; - int currentNumberOfThreads() const Q_DECL_OVERRIDE; + ~Weaver() override; + void shutDown() override; + void shutDown_p() override; + + const State *state() const override; + State *state() override; + + void setMaximumNumberOfThreads(int cap) override; + int maximumNumberOfThreads() const override; + int currentNumberOfThreads() const override; void setState(StateId); - void enqueue(const QVector<JobPointer> &jobs) Q_DECL_OVERRIDE; - bool dequeue(const JobPointer &job) Q_DECL_OVERRIDE; - void dequeue() Q_DECL_OVERRIDE; - void finish() Q_DECL_OVERRIDE; - void suspend() Q_DECL_OVERRIDE; - void resume() Q_DECL_OVERRIDE; - bool isEmpty() const Q_DECL_OVERRIDE; - bool isIdle() const Q_DECL_OVERRIDE; - int queueLength() const Q_DECL_OVERRIDE; - JobPointer applyForWork(Thread *thread, bool wasBusy) Q_DECL_OVERRIDE; - void waitForAvailableJob(Thread *th) Q_DECL_OVERRIDE; + void enqueue(const QVector<JobPointer> &jobs) override; + bool dequeue(const JobPointer &job) override; + void dequeue() override; + void finish() override; + void suspend() override; + void resume() override; + bool isEmpty() const override; + bool isIdle() const override; + int queueLength() const override; + JobPointer applyForWork(Thread *thread, bool wasBusy) override; + void waitForAvailableJob(Thread *th) override; void blockThreadUntilJobsAreBeingAssigned(Thread *th); void blockThreadUntilJobsAreBeingAssigned_locked(Thread *th); void incActiveThreadCount(); @@ -85,26 +85,26 @@ void threadEnteredRun(Thread *thread); JobPointer takeFirstAvailableJobOrSuspendOrWait(Thread *th, bool threadWasBusy, bool suspendIfAllThreadsInactive, bool justReturning); - void requestAbort() Q_DECL_OVERRIDE; - void reschedule() Q_DECL_OVERRIDE; + void requestAbort() override; + void reschedule() override; //FIXME: rename _p to _locked: friend class WeaverImplState; friend class SuspendingState; void setState_p(StateId); - void setMaximumNumberOfThreads_p(int cap) Q_DECL_OVERRIDE; - int maximumNumberOfThreads_p() const Q_DECL_OVERRIDE; - int currentNumberOfThreads_p() const Q_DECL_OVERRIDE; + void setMaximumNumberOfThreads_p(int cap) override; + int maximumNumberOfThreads_p() const override; + int currentNumberOfThreads_p() const override; void enqueue_p(const QVector<JobPointer> &jobs); - bool dequeue_p(JobPointer job) Q_DECL_OVERRIDE; - void dequeue_p() Q_DECL_OVERRIDE; - void finish_p() Q_DECL_OVERRIDE; - void suspend_p() Q_DECL_OVERRIDE; - void resume_p() Q_DECL_OVERRIDE; - bool isEmpty_p() const Q_DECL_OVERRIDE; - bool isIdle_p() const Q_DECL_OVERRIDE; - int queueLength_p() const Q_DECL_OVERRIDE; - void requestAbort_p() Q_DECL_OVERRIDE; + bool dequeue_p(JobPointer job) override; + void dequeue_p() override; + void finish_p() override; + void suspend_p() override; + void resume_p() override; + bool isEmpty_p() const override; + bool isIdle_p() const override; + int queueLength_p() const override; + void requestAbort_p() override; Q_SIGNALS: /** @brief A Thread has been created. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/weaverimplstate.h new/threadweaver-5.47.0/src/weaverimplstate.h --- old/threadweaver-5.46.0/src/weaverimplstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/weaverimplstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -43,41 +43,41 @@ public: explicit WeaverImplState(QueueSignals *weaver); - const State *state() const Q_DECL_OVERRIDE; + const State *state() const override; /** Shut down the queue. */ - void shutDown() Q_DECL_OVERRIDE; + void shutDown() override; /** Set the maximum number of threads this Weaver object may start. */ - void setMaximumNumberOfThreads(int cap) Q_DECL_OVERRIDE; + void setMaximumNumberOfThreads(int cap) override; /** Get the maximum number of threads this Weaver may start. */ - int maximumNumberOfThreads() const Q_DECL_OVERRIDE; + int maximumNumberOfThreads() const override; /** Returns the current number of threads in the inventory. */ - int currentNumberOfThreads() const Q_DECL_OVERRIDE; + int currentNumberOfThreads() const override; /** Enqueue a job. */ - void enqueue(const QVector<JobPointer> &jobs) Q_DECL_OVERRIDE; + void enqueue(const QVector<JobPointer> &jobs) override; /** Dequeue a job. */ - bool dequeue(const JobPointer &job) Q_DECL_OVERRIDE; + bool dequeue(const JobPointer &job) override; /** Dequeue all jobs. */ - void dequeue() Q_DECL_OVERRIDE; + void dequeue() override; /** Finish all queued jobs. */ - void finish() Q_DECL_OVERRIDE; + void finish() override; /** Are no more jobs queued? */ - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; /** Are all threads waiting? */ - bool isIdle() const Q_DECL_OVERRIDE; + bool isIdle() const override; /** How many jobs are currently queued? */ - int queueLength() const Q_DECL_OVERRIDE; + int queueLength() const override; /** Request abort for all queued and currently executed jobs. */ - void requestAbort() Q_DECL_OVERRIDE; + void requestAbort() override; /** Reschedule jobs to threads. */ - void reschedule() Q_DECL_OVERRIDE; + void reschedule() override; /** Wait (by suspending the calling thread) until a job becomes available. */ - void waitForAvailableJob(Thread *th) Q_DECL_OVERRIDE; + void waitForAvailableJob(Thread *th) override; protected: /** Provide correct return type for WeaverImpl states. */ - Weaver *weaver() Q_DECL_OVERRIDE; - const Weaver *weaver() const Q_DECL_OVERRIDE; + Weaver *weaver() override; + const Weaver *weaver() const override; }; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/threadweaver-5.46.0/src/workinghardstate.h new/threadweaver-5.47.0/src/workinghardstate.h --- old/threadweaver-5.46.0/src/workinghardstate.h 2018-05-05 14:40:22.000000000 +0200 +++ new/threadweaver-5.47.0/src/workinghardstate.h 2018-06-02 18:30:49.000000000 +0200 @@ -42,15 +42,15 @@ public: explicit WorkingHardState(Weaver *weaver); /** Suspend job processing. */ - void suspend() Q_DECL_OVERRIDE; + void suspend() override; /** Resume job processing. */ - void resume() Q_DECL_OVERRIDE; + void resume() override; /** Assign a job to an idle thread. */ - JobPointer applyForWork(Thread *th, bool wasBusy) Q_DECL_OVERRIDE; + JobPointer applyForWork(Thread *th, bool wasBusy) override; /** Overload. */ - void activated() Q_DECL_OVERRIDE; + void activated() override; /** reimpl */ - StateId stateId() const Q_DECL_OVERRIDE; + StateId stateId() const override; }; }
