From 54549d36e911aac8d0b0a2eea6074654c06c9717 Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Thu, 21 Jun 2018 17:44:18 +0200
Subject: log_error now trows exception, main is covering catch

---
 gui/basewindow.cc       |  1 -
 gui/basewindow.h        |  2 +-
 gui/dummy/mainwindow.cc |  9 ++-------
 gui/dummy/mainwindow.h  |  2 +-
 gui/ice40/mainwindow.cc |  8 ++------
 gui/ice40/worker.cc     | 16 ++++++----------
 gui/ice40/worker.h      | 18 ++++++++++--------
 7 files changed, 22 insertions(+), 34 deletions(-)

(limited to 'gui')

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 1e6b171f..9020a719 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -10,7 +10,6 @@
 #include "mainwindow.h"
 #include "pythontab.h"
 
-
 BaseMainWindow::BaseMainWindow(Context *_ctx, QWidget *parent)
         : QMainWindow(parent), ctx(_ctx)
 {
diff --git a/gui/basewindow.h b/gui/basewindow.h
index d6915ae9..b20d4621 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -30,7 +30,7 @@ class BaseMainWindow : public QMainWindow
 
   protected Q_SLOTS:
     void writeInfo(std::string text);
-    
+
     virtual void open() = 0;
     virtual bool save() = 0;
 
diff --git a/gui/dummy/mainwindow.cc b/gui/dummy/mainwindow.cc
index f714e30e..7982c5f5 100644
--- a/gui/dummy/mainwindow.cc
+++ b/gui/dummy/mainwindow.cc
@@ -17,11 +17,6 @@ void MainWindow::createMenu()
     menuBar->addAction(menu_Custom->menuAction());
 }
 
-void MainWindow::open()
-{
-}
+void MainWindow::open() {}
 
-bool MainWindow::save()
-{
-    return false;
-}
\ No newline at end of file
+bool MainWindow::save() { return false; }
\ No newline at end of file
diff --git a/gui/dummy/mainwindow.h b/gui/dummy/mainwindow.h
index ea4480fb..c9690f2c 100644
--- a/gui/dummy/mainwindow.h
+++ b/gui/dummy/mainwindow.h
@@ -19,7 +19,7 @@ class MainWindow : public BaseMainWindow
 
   protected Q_SLOTS:
     virtual void open();
-    virtual bool save();    
+    virtual bool save();
 };
 
 #endif // MAINWINDOW_H
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index dafd92e9..934798bb 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -20,8 +20,7 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent)
     createMenu();
 
     task = new TaskManager(_ctx);
-    connect(task, SIGNAL(log(std::string)), this,
-            SLOT(writeInfo(std::string)));
+    connect(task, SIGNAL(log(std::string)), this, SLOT(writeInfo(std::string)));
 }
 
 MainWindow::~MainWindow() {}
@@ -43,7 +42,4 @@ void MainWindow::open()
         task->parsejson(fn);
     }
 }
-bool MainWindow::save()
-{
-    return false;
-}
\ No newline at end of file
+bool MainWindow::save() { return false; }
\ No newline at end of file
diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc
index bd22f552..92a0f6ac 100644
--- a/gui/ice40/worker.cc
+++ b/gui/ice40/worker.cc
@@ -1,13 +1,13 @@
 #include "worker.h"
 #include <fstream>
+#include "bitstream.h"
+#include "design_utils.h"
 #include "jsonparse.h"
 #include "log.h"
 #include "pack.h"
 #include "pcf.h"
 #include "place_sa.h"
 #include "route.h"
-#include "bitstream.h"
-#include "design_utils.h"
 #include "timing.h"
 
 Worker::Worker(Context *_ctx) : ctx(_ctx)
@@ -15,7 +15,7 @@ Worker::Worker(Context *_ctx) : ctx(_ctx)
     log_write_function = [this](std::string text) { Q_EMIT log(text); };
 }
 
-void Worker::parsejson(const std::string &filename) 
+void Worker::parsejson(const std::string &filename)
 {
     std::string fn = filename;
     std::ifstream f(fn);
@@ -35,8 +35,7 @@ void Worker::parsejson(const std::string &filename)
     Q_EMIT log("done");
 }
 
-
-TaskManager::TaskManager(Context *ctx) 
+TaskManager::TaskManager(Context *ctx)
 {
     Worker *worker = new Worker(ctx);
     worker->moveToThread(&workerThread);
@@ -46,13 +45,10 @@ TaskManager::TaskManager(Context *ctx)
     workerThread.start();
 }
 
-TaskManager::~TaskManager() 
+TaskManager::~TaskManager()
 {
     workerThread.quit();
     workerThread.wait();
 }
 
-void TaskManager::info(const std::string &result)
-{
-    Q_EMIT log(result);
-}
\ No newline at end of file
+void TaskManager::info(const std::string &result) { Q_EMIT log(result); }
\ No newline at end of file
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);
 };
-- 
cgit v1.2.3