From 4b78ae15dfbcdb197cfe4a8e27cdae6e4005c292 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 23 Jun 2018 16:06:49 +0200 Subject: clangformat cleanup --- gui/ice40/mainwindow.cc | 27 +++++++-------------------- gui/ice40/worker.cc | 9 +++------ 2 files changed, 10 insertions(+), 26 deletions(-) (limited to 'gui/ice40') diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index b4cb14ed..c8df0677 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -36,8 +36,7 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); } NEXTPNR_NAMESPACE_BEGIN -MainWindow::MainWindow(Context *_ctx, QWidget *parent) - : BaseMainWindow(_ctx, parent), timing_driven(false) +MainWindow::MainWindow(Context *_ctx, QWidget *parent) : BaseMainWindow(_ctx, parent), timing_driven(false) { initMainResource(); @@ -47,20 +46,16 @@ MainWindow::MainWindow(Context *_ctx, QWidget *parent) task = new TaskManager(_ctx); connect(task, SIGNAL(log(std::string)), this, SLOT(writeInfo(std::string))); - connect(task, SIGNAL(loadfile_finished(bool)), this, - SLOT(loadfile_finished(bool))); + connect(task, SIGNAL(loadfile_finished(bool)), this, SLOT(loadfile_finished(bool))); connect(task, SIGNAL(pack_finished(bool)), this, SLOT(pack_finished(bool))); connect(task, SIGNAL(budget_finish(bool)), this, SLOT(budget_finish(bool))); - connect(task, SIGNAL(place_finished(bool)), this, - SLOT(place_finished(bool))); - connect(task, SIGNAL(route_finished(bool)), this, - SLOT(route_finished(bool))); + connect(task, SIGNAL(place_finished(bool)), this, SLOT(place_finished(bool))); + connect(task, SIGNAL(route_finished(bool)), this, SLOT(route_finished(bool))); connect(task, SIGNAL(taskCanceled()), this, SLOT(taskCanceled())); connect(task, SIGNAL(taskStarted()), this, SLOT(taskStarted())); connect(task, SIGNAL(taskPaused()), this, SLOT(taskPaused())); - connect(this, SIGNAL(budget(double)), task, SIGNAL(budget(double))); connect(this, SIGNAL(place(bool)), task, SIGNAL(place(bool))); @@ -153,8 +148,7 @@ void MainWindow::createMenu() void MainWindow::open() { - QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(), - QString("*.json")); + QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(), QString("*.json")); if (!fileName.isEmpty()) { tabWidget->setCurrentWidget(info); @@ -254,21 +248,14 @@ void MainWindow::taskPaused() void MainWindow::budget() { bool ok; - double freq = QInputDialog::getDouble(this, "Assign timing budget", - "Frequency [MHz]:", - 50, 0, 250, 2, &ok); + double freq = QInputDialog::getDouble(this, "Assign timing budget", "Frequency [MHz]:", 50, 0, 250, 2, &ok); if (ok) { freq *= 1e6; timing_driven = true; Q_EMIT budget(freq); } - -} - -void MainWindow::place() -{ - Q_EMIT place(timing_driven); } +void MainWindow::place() { Q_EMIT place(timing_driven); } NEXTPNR_NAMESPACE_END \ No newline at end of file diff --git a/gui/ice40/worker.cc b/gui/ice40/worker.cc index 3f2a381b..1558bc0c 100644 --- a/gui/ice40/worker.cc +++ b/gui/ice40/worker.cc @@ -125,14 +125,11 @@ TaskManager::TaskManager(Context *ctx) : toTerminate(false), toPause(false) connect(this, &TaskManager::route, worker, &Worker::route); connect(worker, &Worker::log, this, &TaskManager::info); - connect(worker, &Worker::loadfile_finished, this, - &TaskManager::loadfile_finished); + connect(worker, &Worker::loadfile_finished, this, &TaskManager::loadfile_finished); connect(worker, &Worker::pack_finished, this, &TaskManager::pack_finished); connect(worker, &Worker::budget_finish, this, &TaskManager::budget_finish); - connect(worker, &Worker::place_finished, this, - &TaskManager::place_finished); - connect(worker, &Worker::route_finished, this, - &TaskManager::route_finished); + connect(worker, &Worker::place_finished, this, &TaskManager::place_finished); + connect(worker, &Worker::route_finished, this, &TaskManager::route_finished); connect(worker, &Worker::taskCanceled, this, &TaskManager::taskCanceled); connect(worker, &Worker::taskStarted, this, &TaskManager::taskStarted); -- cgit v1.2.3