From beb5f9d4df1685a39a02548147e0c7ada40eae48 Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 4 Aug 2018 11:37:41 +0200 Subject: not needed anymore --- gui/ice40/mainwindow.cc | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gui/ice40/mainwindow.cc') diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 2fa2e561..677b3166 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -78,18 +78,11 @@ void MainWindow::createMenu() menuDesign->addAction(actionSaveAsc); } -#if defined(_MSC_VER) -void load_chipdb(); -#endif - static const ChipInfoPOD *get_chip_info(const RelPtr *ptr) { return ptr->get(); } QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip) { QStringList packages; -#if defined(_MSC_VER) - load_chipdb(); -#endif const ChipInfoPOD *chip_info; #ifdef ICE40_HX1K_ONLY if (chip == ArchArgs::HX1K) { -- cgit v1.2.3 From dc4bd1b55fba763792e3e8826a9fee63d486006b Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 4 Aug 2018 11:52:07 +0200 Subject: Move ArchArgs to BaseWindow --- gui/ice40/mainwindow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/ice40/mainwindow.cc') 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, ArchArgs args, QWidget *parent) - : BaseMainWindow(std::move(context), parent), chipArgs(args) + : BaseMainWindow(std::move(context), args, parent) { initMainResource(); -- cgit v1.2.3 From 0cb349b60ea17378a4c163f0c8b12e8b17988cee Mon Sep 17 00:00:00 2001 From: Miodrag Milanovic Date: Sat, 4 Aug 2018 11:54:34 +0200 Subject: Utility calls static --- gui/ice40/mainwindow.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gui/ice40/mainwindow.cc') diff --git a/gui/ice40/mainwindow.cc b/gui/ice40/mainwindow.cc index 3463e122..40b863e9 100644 --- a/gui/ice40/mainwindow.cc +++ b/gui/ice40/mainwindow.cc @@ -80,7 +80,7 @@ void MainWindow::createMenu() static const ChipInfoPOD *get_chip_info(const RelPtr *ptr) { return ptr->get(); } -QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip) +static QStringList getSupportedPackages(ArchArgs::ArchArgsTypes chip) { QStringList packages; const ChipInfoPOD *chip_info; -- cgit v1.2.3