From dc4bd1b55fba763792e3e8826a9fee63d486006b Mon Sep 17 00:00:00 2001
From: Miodrag Milanovic <mmicko@gmail.com>
Date: Sat, 4 Aug 2018 11:52:07 +0200
Subject: [PATCH] Move ArchArgs to BaseWindow

---
 gui/basewindow.cc         | 4 ++--
 gui/basewindow.h          | 3 ++-
 gui/ecp5/mainwindow.cc    | 2 +-
 gui/generic/mainwindow.cc | 2 +-
 gui/generic/mainwindow.h  | 3 ---
 gui/ice40/mainwindow.cc   | 2 +-
 gui/ice40/mainwindow.h    | 2 --
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/gui/basewindow.cc b/gui/basewindow.cc
index 37141fd6..53720156 100644
--- a/gui/basewindow.cc
+++ b/gui/basewindow.cc
@@ -37,8 +37,8 @@ static void initBasenameResource() { Q_INIT_RESOURCE(base); }
 
 NEXTPNR_NAMESPACE_BEGIN
 
-BaseMainWindow::BaseMainWindow(std::unique_ptr<Context> context, QWidget *parent)
-        : QMainWindow(parent), ctx(std::move(context)), timing_driven(false)
+BaseMainWindow::BaseMainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)
+        : QMainWindow(parent), chipArgs(args), ctx(std::move(context)), timing_driven(false)
 {
     initBasenameResource();
     qRegisterMetaType<std::string>();
diff --git a/gui/basewindow.h b/gui/basewindow.h
index 5cec24c5..341cc8e2 100644
--- a/gui/basewindow.h
+++ b/gui/basewindow.h
@@ -45,7 +45,7 @@ class BaseMainWindow : public QMainWindow
     Q_OBJECT
 
   public:
-    explicit BaseMainWindow(std::unique_ptr<Context> context, QWidget *parent = 0);
+    explicit BaseMainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent = 0);
     virtual ~BaseMainWindow();
     Context *getContext() { return ctx.get(); }
 
@@ -88,6 +88,7 @@ class BaseMainWindow : public QMainWindow
 
   protected:
     // state variables
+    ArchArgs chipArgs;
     std::unique_ptr<Context> ctx;
     TaskManager *task;
     bool timing_driven;
diff --git a/gui/ecp5/mainwindow.cc b/gui/ecp5/mainwindow.cc
index d16a622f..510b0201 100644
--- a/gui/ecp5/mainwindow.cc
+++ b/gui/ecp5/mainwindow.cc
@@ -29,7 +29,7 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 
 NEXTPNR_NAMESPACE_BEGIN
 
-MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), parent), chipArgs(args)
+MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), args, parent)
 {
     initMainResource();
 
diff --git a/gui/generic/mainwindow.cc b/gui/generic/mainwindow.cc
index 353668b9..050c0fb8 100644
--- a/gui/generic/mainwindow.cc
+++ b/gui/generic/mainwindow.cc
@@ -23,7 +23,7 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 
 NEXTPNR_NAMESPACE_BEGIN
 
-MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), parent), chipArgs(args)
+MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent) : BaseMainWindow(std::move(context), args, parent)
 {
     initMainResource();
 
diff --git a/gui/generic/mainwindow.h b/gui/generic/mainwindow.h
index fd7cb7d2..375436b6 100644
--- a/gui/generic/mainwindow.h
+++ b/gui/generic/mainwindow.h
@@ -40,9 +40,6 @@ class MainWindow : public BaseMainWindow
     virtual void open_proj();
     virtual bool save_proj();
     void newContext(Context *ctx);
-
-private:
-    ArchArgs chipArgs;    
 };
 
 NEXTPNR_NAMESPACE_END
diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc
index 677b3166..3463e122 100644
--- a/gui/ice40/mainwindow.cc
+++ b/gui/ice40/mainwindow.cc
@@ -37,7 +37,7 @@ static void initMainResource() { Q_INIT_RESOURCE(nextpnr); }
 NEXTPNR_NAMESPACE_BEGIN
 
 MainWindow::MainWindow(std::unique_ptr<Context> context, ArchArgs args, QWidget *parent)
-        : BaseMainWindow(std::move(context), parent), chipArgs(args)
+        : BaseMainWindow(std::move(context), args, parent)
 {
     initMainResource();
 
diff --git a/gui/ice40/mainwindow.h b/gui/ice40/mainwindow.h
index 230ccc4e..829375e2 100644
--- a/gui/ice40/mainwindow.h
+++ b/gui/ice40/mainwindow.h
@@ -55,8 +55,6 @@ class MainWindow : public BaseMainWindow
     QAction *actionLoadPCF;
     QAction *actionSaveAsc;
 
-    ArchArgs chipArgs;
-
     std::string currentProj;
     std::string currentPCF;
 };