mirror of https://github.com/mgba-emu/mgba.git
Qt: Coverity complains about this but I have no idea if it matters
This commit is contained in:
parent
4cdcfe6dd3
commit
eff1785ce0
|
@ -274,17 +274,17 @@ QNetworkReply* GBAApp::httpGet(const QUrl& url) {
|
||||||
return m_netman.get(req);
|
return m_netman.get(req);
|
||||||
}
|
}
|
||||||
|
|
||||||
qint64 GBAApp::submitWorkerJob(std::function<void ()> job, std::function<void ()> callback) {
|
qint64 GBAApp::submitWorkerJob(std::function<void ()>&& job, std::function<void ()>&& callback) {
|
||||||
return submitWorkerJob(job, nullptr, callback);
|
return submitWorkerJob(std::move(job), nullptr, std::move(callback));
|
||||||
}
|
}
|
||||||
|
|
||||||
qint64 GBAApp::submitWorkerJob(std::function<void ()> job, QObject* context, std::function<void ()> callback) {
|
qint64 GBAApp::submitWorkerJob(std::function<void ()>&& job, QObject* context, std::function<void ()>&& callback) {
|
||||||
qint64 jobId = m_nextJob;
|
qint64 jobId = m_nextJob;
|
||||||
++m_nextJob;
|
++m_nextJob;
|
||||||
WorkerJob* jobRunnable = new WorkerJob(jobId, job, this);
|
WorkerJob* jobRunnable = new WorkerJob(jobId, std::move(job), this);
|
||||||
m_workerJobs.insert(jobId, jobRunnable);
|
m_workerJobs.insert(jobId, jobRunnable);
|
||||||
if (callback) {
|
if (callback) {
|
||||||
waitOnJob(jobId, context, callback);
|
waitOnJob(jobId, context, std::move(callback));
|
||||||
}
|
}
|
||||||
m_workerThreads.start(jobRunnable);
|
m_workerThreads.start(jobRunnable);
|
||||||
return jobId;
|
return jobId;
|
||||||
|
@ -308,7 +308,7 @@ bool GBAApp::removeWorkerJob(qint64 jobId) {
|
||||||
return success;
|
return success;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GBAApp::waitOnJob(qint64 jobId, QObject* context, std::function<void ()> callback) {
|
bool GBAApp::waitOnJob(qint64 jobId, QObject* context, std::function<void ()>&& callback) {
|
||||||
if (!m_workerJobs.contains(jobId)) {
|
if (!m_workerJobs.contains(jobId)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -396,7 +396,7 @@ void GBAApp::finishJob(qint64 jobId) {
|
||||||
m_workerJobCallbacks.remove(jobId);
|
m_workerJobCallbacks.remove(jobId);
|
||||||
}
|
}
|
||||||
|
|
||||||
GBAApp::WorkerJob::WorkerJob(qint64 id, std::function<void ()> job, GBAApp* owner)
|
GBAApp::WorkerJob::WorkerJob(qint64 id, std::function<void ()>&& job, GBAApp* owner)
|
||||||
: m_id(id)
|
: m_id(id)
|
||||||
, m_job(job)
|
, m_job(job)
|
||||||
, m_owner(owner)
|
, m_owner(owner)
|
||||||
|
|
|
@ -74,10 +74,10 @@ public:
|
||||||
QNetworkAccessManager* netman();
|
QNetworkAccessManager* netman();
|
||||||
QNetworkReply* httpGet(const QUrl&);
|
QNetworkReply* httpGet(const QUrl&);
|
||||||
|
|
||||||
qint64 submitWorkerJob(std::function<void ()> job, std::function<void ()> callback = {});
|
qint64 submitWorkerJob(std::function<void ()>&& job, std::function<void ()>&& callback = {});
|
||||||
qint64 submitWorkerJob(std::function<void ()> job, QObject* context, std::function<void ()> callback);
|
qint64 submitWorkerJob(std::function<void ()>&& job, QObject* context, std::function<void ()>&& callback);
|
||||||
bool removeWorkerJob(qint64 jobId);
|
bool removeWorkerJob(qint64 jobId);
|
||||||
bool waitOnJob(qint64 jobId, QObject* context, std::function<void ()> callback);
|
bool waitOnJob(qint64 jobId, QObject* context, std::function<void ()>&& callback);
|
||||||
|
|
||||||
ApplicationUpdater* updater() { return &m_updater; }
|
ApplicationUpdater* updater() { return &m_updater; }
|
||||||
QString invokeOnExit() { return m_invokeOnExit; }
|
QString invokeOnExit() { return m_invokeOnExit; }
|
||||||
|
@ -103,7 +103,7 @@ private slots:
|
||||||
private:
|
private:
|
||||||
class WorkerJob : public QRunnable {
|
class WorkerJob : public QRunnable {
|
||||||
public:
|
public:
|
||||||
WorkerJob(qint64 id, std::function<void ()> job, GBAApp* owner);
|
WorkerJob(qint64 id, std::function<void ()>&& job, GBAApp* owner);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
void run() override;
|
void run() override;
|
||||||
|
|
Loading…
Reference in New Issue