medvedych/harbour-seaprint
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Plug a leak

Browse source
This commit is contained in:
Anton Thomasson 2022-01-14 22:49:38 +01:00
parent 2ab6a7d979
commit 8b4c2f373b
2 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
src/ippprinter.cpp
View file

@ -7,31 +7,30 @@
Q_DECLARE_METATYPE(QMargins) Q_DECLARE_METATYPE(QMargins)
IppPrinter::IppPrinter() IppPrinter::IppPrinter() : _worker(this)
{ {
QObject::connect(this, &IppPrinter::urlChanged, this, &IppPrinter::onUrlChanged); QObject::connect(this, &IppPrinter::urlChanged, this, &IppPrinter::onUrlChanged);
qRegisterMetaType<QTemporaryFile*>("QTemporaryFile*"); qRegisterMetaType<QTemporaryFile*>("QTemporaryFile*");
_worker = new PrinterWorker(this); _worker.moveToThread(&_workerThread);
_worker->moveToThread(&_workerThread);
connect(&_workerThread, &QThread::finished, _worker, &QObject::deleteLater); connect(&_workerThread, &QThread::finished, &_worker, &QObject::deleteLater);
connect(this, &IppPrinter::doDoGetPrinterAttributes, _worker, &PrinterWorker::getPrinterAttributes); connect(this, &IppPrinter::doDoGetPrinterAttributes, &_worker, &PrinterWorker::getPrinterAttributes);
connect(this, &IppPrinter::doGetJobs, _worker, &PrinterWorker::getJobs); connect(this, &IppPrinter::doGetJobs, &_worker, &PrinterWorker::getJobs);
connect(this, &IppPrinter::doCancelJob, _worker, &PrinterWorker::cancelJob); connect(this, &IppPrinter::doCancelJob, &_worker, &PrinterWorker::cancelJob);
connect(this, &IppPrinter::doJustUpload, _worker, &PrinterWorker::justUpload); connect(this, &IppPrinter::doJustUpload, &_worker, &PrinterWorker::justUpload);
connect(this, &IppPrinter::doConvertPdf, _worker, &PrinterWorker::convertPdf); connect(this, &IppPrinter::doConvertPdf, &_worker, &PrinterWorker::convertPdf);
connect(this, &IppPrinter::doConvertImage, _worker, &PrinterWorker::convertImage); connect(this, &IppPrinter::doConvertImage, &_worker, &PrinterWorker::convertImage);
connect(this, &IppPrinter::doConvertOfficeDocument, _worker, &PrinterWorker::convertOfficeDocument); connect(this, &IppPrinter::doConvertOfficeDocument, &_worker, &PrinterWorker::convertOfficeDocument);
connect(this, &IppPrinter::doConvertPlaintext, _worker, &PrinterWorker::convertPlaintext); connect(this, &IppPrinter::doConvertPlaintext, &_worker, &PrinterWorker::convertPlaintext);
connect(this, &IppPrinter::doGetStrings, _worker, &PrinterWorker::getStrings); connect(this, &IppPrinter::doGetStrings, &_worker, &PrinterWorker::getStrings);
connect(_worker, &PrinterWorker::progress, this, &IppPrinter::setProgress); connect(&_worker, &PrinterWorker::progress, this, &IppPrinter::setProgress);
connect(_worker, &PrinterWorker::busyMessage, this, &IppPrinter::setBusyMessage); connect(&_worker, &PrinterWorker::busyMessage, this, &IppPrinter::setBusyMessage);
connect(_worker, &PrinterWorker::failed, this, &IppPrinter::convertFailed); connect(&_worker, &PrinterWorker::failed, this, &IppPrinter::convertFailed);
qRegisterMetaType<QMargins>(); qRegisterMetaType<QMargins>();
@ -39,7 +38,6 @@ IppPrinter::IppPrinter()
} }
IppPrinter::~IppPrinter() { IppPrinter::~IppPrinter() {
// TODO: delete worker and workerthread?
} }

2
src/ippprinter.h
View file

@ -129,7 +129,7 @@ private:
QString _progress; QString _progress;
QThread _workerThread; QThread _workerThread;
PrinterWorker* _worker; PrinterWorker _worker;
}; };