diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-21 19:31:50 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-21 19:31:50 +0200 |
| commit | bfae4663fcb6028e8c20f28d5ffa15fd20d8e1fa (patch) | |
| tree | b5dd0075a7a75ef9c24e0f758b80b5da5ee18b3f /gui/ice40/worker.h | |
| parent | 38dc1cc5504961f666da32d7249532a23d5876ad (diff) | |
| parent | c33a039ac388bfcb5e068a04a7cb1b05ebec7d7f (diff) | |
| download | nextpnr-bfae4663fcb6028e8c20f28d5ffa15fd20d8e1fa.tar.gz nextpnr-bfae4663fcb6028e8c20f28d5ffa15fd20d8e1fa.tar.bz2 nextpnr-bfae4663fcb6028e8c20f28d5ffa15fd20d8e1fa.zip | |
Merge branch 'master' of gitlab.com:SymbioticEDA/nextpnr
# Conflicts:
# common/route.cc
Diffstat (limited to 'gui/ice40/worker.h')
| -rw-r--r-- | gui/ice40/worker.h | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/gui/ice40/worker.h b/gui/ice40/worker.h index 5dc25d89..12d740dd 100644 --- a/gui/ice40/worker.h +++ b/gui/ice40/worker.h @@ -1,8 +1,8 @@ #ifndef WORKER_H #define WORKER_H -#include "nextpnr.h" #include <QThread> +#include "nextpnr.h" // FIXME USING_NEXTPNR_NAMESPACE @@ -10,13 +10,14 @@ USING_NEXTPNR_NAMESPACE class Worker : public QObject { Q_OBJECT -public: + public: Worker(Context *ctx); -public Q_SLOTS: + public Q_SLOTS: void parsejson(const std::string &filename); -Q_SIGNALS: + Q_SIGNALS: void log(const std::string &text); -private: + + private: Context *ctx; }; @@ -24,12 +25,13 @@ class TaskManager : public QObject { Q_OBJECT QThread workerThread; -public: + + public: TaskManager(Context *ctx); ~TaskManager(); -public Q_SLOTS: + public Q_SLOTS: void info(const std::string &text); -Q_SIGNALS: + Q_SIGNALS: void parsejson(const std::string &); void log(const std::string &text); }; |