From 23fe31da44a2e2596335c09ae983217ffbc8f6b1 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Thu, 21 Jun 2018 13:55:36 +0200 Subject: cleanup --- dummy/main.cc | 2 ++ gui/basewindow.cc | 2 +- gui/basewindow.h | 7 +++---- gui/dummy/mainwindow.cc | 1 - gui/ice40/mainwindow.cc | 5 ++--- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dummy/main.cc b/dummy/main.cc index 7a961760..cef70235 100644 --- a/dummy/main.cc +++ b/dummy/main.cc @@ -42,6 +42,8 @@ int main(int argc, char *argv[]) options.add_options()("verbose,v", "verbose output"); options.add_options()("force,f", "keep running after errors"); options.add_options()("gui", "start gui"); + options.add_options()("run", po::value>(), + "python file to execute"); options.add_options()("version,V", "show version"); po::positional_options_description pos; pos.add("run", -1); diff --git a/gui/basewindow.cc b/gui/basewindow.cc index cbf0faae..fa9528fc 100644 --- a/gui/basewindow.cc +++ b/gui/basewindow.cc @@ -1,4 +1,3 @@ -#include "mainwindow.h" #include #include #include @@ -9,6 +8,7 @@ #include "fpgaviewwidget.h" #include "jsonparse.h" #include "log.h" +#include "mainwindow.h" #include "pythontab.h" //#include "pack.h" //#include "pcf.h" diff --git a/gui/basewindow.h b/gui/basewindow.h index 52efd6b1..630e0f84 100644 --- a/gui/basewindow.h +++ b/gui/basewindow.h @@ -5,12 +5,11 @@ #include "nextpnr.h" #include -#include #include #include -#include #include - +#include +#include // FIXME USING_NEXTPNR_NAMESPACE @@ -36,7 +35,7 @@ class BaseMainWindow : public QMainWindow Context *ctx; QTabWidget *tabWidget; InfoTab *info; - + QMenuBar *menuBar; QToolBar *mainToolBar; QStatusBar *statusBar; diff --git a/gui/dummy/mainwindow.cc b/gui/dummy/mainwindow.cc index dad73d7e..a9420524 100644 --- a/gui/dummy/mainwindow.cc +++ b/gui/dummy/mainwindow.cc @@ -15,5 +15,4 @@ void MainWindow::createMenu() { QMenu *menu_Custom = new QMenu("&Dummy", menuBar); menuBar->addAction(menu_Custom->menuAction()); - } diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 4f53c551..3744cdc7 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -1,14 +1,14 @@ #include "mainwindow.h" #include #include +#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" MainWindow::MainWindow(Context *_ctx, QWidget *parent) : BaseMainWindow(_ctx, parent) @@ -25,5 +25,4 @@ void MainWindow::createMenu() { QMenu *menu_Custom = new QMenu("&ICE 40", menuBar); menuBar->addAction(menu_Custom->menuAction()); - } -- cgit v1.2.3