aboutsummaryrefslogtreecommitdiffstats
path: root/gui/ice40
diff options
context:
space:
mode:
authorMiodrag Milanovic <mmicko@gmail.com>2018-06-28 18:06:31 +0200
committerMiodrag Milanovic <mmicko@gmail.com>2018-06-28 18:06:31 +0200
commit960c65047877c72498d65ecc401371ab1552c82a (patch)
tree5b0a4aa7063fd6a24ff4a74b9786e8b1daad0a57 /gui/ice40
parent1676b285ae726eb858d4d7ed089496133ce3de4b (diff)
downloadnextpnr-960c65047877c72498d65ecc401371ab1552c82a.tar.gz
nextpnr-960c65047877c72498d65ecc401371ab1552c82a.tar.bz2
nextpnr-960c65047877c72498d65ecc401371ab1552c82a.zip
clangformat cleanup
Diffstat (limited to 'gui/ice40')
-rw-r--r--gui/ice40/mainwindow.cc12
-rw-r--r--gui/ice40/worker.cc6
2 files changed, 7 insertions, 11 deletions
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index 2563a767..c89b5d2d 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -58,8 +58,8 @@ MainWindow::MainWindow(QWidget *parent) : BaseMainWindow(parent), timing_driven(
connect(task, SIGNAL(taskStarted()), this, SLOT(taskStarted()));
connect(task, SIGNAL(taskPaused()), this, SLOT(taskPaused()));
- connect(this, SIGNAL(contextChanged(Context*)), this, SLOT(newContext(Context*)));
- connect(this, SIGNAL(contextChanged(Context*)), task, SIGNAL(contextChanged(Context*)));
+ connect(this, SIGNAL(contextChanged(Context *)), this, SLOT(newContext(Context *)));
+ connect(this, SIGNAL(contextChanged(Context *)), task, SIGNAL(contextChanged(Context *)));
createMenu();
}
@@ -184,10 +184,10 @@ void MainWindow::new_proj()
ArchArgs chipArgs;
chipArgs.type = ArchArgs::HX1K;
chipArgs.package = "tq144";
- if (ctx)
+ if (ctx)
delete ctx;
ctx = new Context(chipArgs);
-
+
Q_EMIT contextChanged(ctx);
actionLoadJSON->setEnabled(true);
@@ -352,7 +352,7 @@ void MainWindow::taskStarted()
disableActions();
actionPause->setEnabled(true);
actionStop->setEnabled(true);
-
+
actionNew->setEnabled(false);
actionOpen->setEnabled(false);
}
@@ -362,7 +362,7 @@ void MainWindow::taskPaused()
disableActions();
actionPlay->setEnabled(true);
actionStop->setEnabled(true);
-
+
actionNew->setEnabled(false);
actionOpen->setEnabled(false);
}
diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc
index c49b8769..ce513a05 100644
--- a/gui/ice40/worker.cc
+++ b/gui/ice40/worker.cc
@@ -56,10 +56,7 @@ Worker::Worker(TaskManager *parent) : ctx(nullptr)
};
}
-void Worker::newContext(Context *ctx_)
-{
- ctx = ctx_;
-}
+void Worker::newContext(Context *ctx_) { ctx = ctx_; }
void Worker::loadfile(const std::string &filename)
{
@@ -156,7 +153,6 @@ TaskManager::TaskManager() : toTerminate(false), toPause(false)
connect(this, &TaskManager::place, worker, &Worker::place);
connect(this, &TaskManager::route, worker, &Worker::route);
-
connect(this, &TaskManager::contextChanged, worker, &Worker::newContext);
connect(worker, &Worker::log, this, &TaskManager::info);