[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.
This commit is contained in:
parent
a1e08d2236
commit
3ccbcdc1bd
@ -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"
|
||||
|
Loading…
Reference in New Issue
Block a user