Code cleanups

This commit is contained in:
eelke 2018-12-31 15:43:22 +01:00
parent b0cd47ef46
commit 456180325e
10 changed files with 10 additions and 90 deletions

View file

@ -1,47 +0,0 @@
#include "WorkManager.h"
#include <QRunnable>
#include <QThreadPool>
#include <deque>
#include <functional>
#include <mutex>
class WorkManagerImpl: public WorkManager {
public:
void addRunnable(QRunnable *runnable) override;
void addWork(Work work) override;
};
std::shared_ptr<WorkManager> WorkManager::getWorkManager()
{
static std::shared_ptr<WorkManager> wm = std::make_shared<WorkManagerImpl>();
return wm;
}
void WorkManagerImpl::addRunnable(QRunnable *runnable)
{
auto tp = QThreadPool::globalInstance();
tp->start(runnable);
}
class CallableTask : public QRunnable {
public:
CallableTask(WorkManager::Work &&w)
: work(std::move(w))
{}
protected:
void run() final
{
work();
}
private:
WorkManager::Work work;
};
void WorkManagerImpl::addWork(Work work)
{
addRunnable(new CallableTask(std::move(work)));
}

View file

@ -1,22 +0,0 @@
#ifndef WORKMANAGER_H
#define WORKMANAGER_H
#include <functional>
#include <memory>
class QRunnable;
class WorkManager {
public:
static std::shared_ptr<WorkManager> getWorkManager();
using Work = std::function<void()>;
virtual ~WorkManager() = default;
virtual void addRunnable(QRunnable *runnable) = 0;
virtual void addWork(Work work) = 0;
};
#endif // WORKMANAGER_H

View file

@ -31,7 +31,6 @@ SOURCES += my_boost_assert_handler.cpp \
QueuedBackgroundTask.cpp \
ExplainTreeModelItem.cpp \
jsoncpp.cpp \
WorkManager.cpp \
SqlParser.cpp \
SqlAstNode.cpp \
SqlAstSelectList.cpp \
@ -48,7 +47,6 @@ HEADERS += PasswordManager.h \
Expected.h \
ExplainTreeModelItem.h \
json/json.h \
WorkManager.h \
TaskControl.h \
ControllableTask.h \
RunControllableTask.h \