1 files changed, 8 insertions, 20 deletions
diff --git a/src/core/thread/TaskRunner.h b/src/core/thread/TaskRunner.h
index f388a4f6..25187178 100644
--- a/src/core/thread/TaskRunner.h
+++ b/src/core/thread/TaskRunner.h
@@ -29,17 +29,13 @@
 #ifndef GPGFRONTEND_TASKRUNNER_H
 #define GPGFRONTEND_TASKRUNNER_H
 
-#include <cstddef>
-#include <mutex>
-#include <queue>
-
 #include "core/GpgFrontendCore.h"
 
 namespace GpgFrontend::Thread {
 
 class Task;
 
-class GPGFRONTEND_CORE_EXPORT TaskRunner : public QThread {
+class GPGFRONTEND_CORE_EXPORT TaskRunner : public QObject {
   Q_OBJECT
  public:
   /**
@@ -54,11 +50,11 @@ class GPGFRONTEND_CORE_EXPORT TaskRunner : public QThread {
    */
   virtual ~TaskRunner() override;
 
-  /**
-   * @brief
-   *
-   */
-  [[noreturn]] void run() override;
+  void Start();
+
+  QThread* GetThread();
+
+  bool IsRunning();
 
  public slots:
 
@@ -78,16 +74,8 @@ class GPGFRONTEND_CORE_EXPORT TaskRunner : public QThread {
   void PostScheduleTask(Task* task, size_t seconds);
 
  private:
-  std::queue<Task*> tasks;                      ///< The task queue
-  std::map<std::string, Task*> pending_tasks_;  ///< The pending tasks
-  std::mutex tasks_mutex_;                      ///< The task queue mutex
-  QThreadPool thread_pool_{this};               ///< run non-sequency task
-
-  /**
-   * @brief
-   *
-   */
-  void unregister_finished_task(std::string);
+  class Impl;
+  std::unique_ptr<Impl> p_;
 };
 }  // namespace GpgFrontend::Thread