From 3ccbcdc1bd7522847d1c1fc7ee5d058af1f02968 Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Thu, 18 Apr 2019 12:16:27 +0200 Subject: [PATCH] [libcalamares] Don't moc on JobQueue - There is no reason for JobThread to have a Q_OBJECT macro, so drop the moccing (this also stops some warnings from the generated moc code). - Define the (virtual) destructor out-of-line to avoid vtable warnings. --- src/libcalamares/JobQueue.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/libcalamares/JobQueue.cpp b/src/libcalamares/JobQueue.cpp index 46d58d429..6ef055ffc 100644 --- a/src/libcalamares/JobQueue.cpp +++ b/src/libcalamares/JobQueue.cpp @@ -35,7 +35,6 @@ namespace Calamares class JobThread : public QThread { - Q_OBJECT public: JobThread( JobQueue* queue ) : QThread( queue ) @@ -44,6 +43,8 @@ public: { } + virtual ~JobThread() override; + void setJobs( const JobList& jobs ) { m_jobs = jobs; @@ -122,6 +123,10 @@ private: } }; +JobThread::~JobThread() +{ +} + JobQueue* JobQueue::s_instance = nullptr; @@ -184,5 +189,3 @@ JobQueue::enqueue( const JobList& jobs ) } } // namespace Calamares - -#include "JobQueue.moc"