From ced941f5f08e231e4c7a8ecde88441e70128ada5 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Tue, 19 Nov 2019 15:39:24 -0600
Subject: Qt UI: Use public members instead of fields for non-widget backed
 answers

---
 ui/qt5/firmwarepage.cc   | 4 ++--
 ui/qt5/horizonwizard.hh  | 4 ++++
 ui/qt5/networkingpage.cc | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

(limited to 'ui/qt5')

diff --git a/ui/qt5/firmwarepage.cc b/ui/qt5/firmwarepage.cc
index 235d9af..4d5893e 100644
--- a/ui/qt5/firmwarepage.cc
+++ b/ui/qt5/firmwarepage.cc
@@ -46,8 +46,8 @@ FirmwarePage::FirmwarePage(QWidget *parent) : HorizonWizardPage(parent) {
     setField("firmware", QVariant(false));
     connect(firmwareChoice, static_cast<void (QButtonGroup:: *)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
             [=](QAbstractButton *button) {
-        if(button == yesButton) setField("firmware", QVariant(true));
-        else setField("firmware", QVariant(false));
+        if(button == yesButton) horizonWizard()->firmware = true;
+        else horizonWizard()->firmware = false;
     });
 
     setLayout(layout);
diff --git a/ui/qt5/horizonwizard.hh b/ui/qt5/horizonwizard.hh
index 2941f08..3986f46 100644
--- a/ui/qt5/horizonwizard.hh
+++ b/ui/qt5/horizonwizard.hh
@@ -81,7 +81,11 @@ public:
 
     std::string mirror_domain;
     std::string version;
+#ifdef NON_LIBRE_FIRMWARE
+    bool firmware;
+#endif  /* NON_LIBRE_FIRMWARE */
     std::map<std::string, NetworkInterface> interfaces;
+    bool network;
     std::string chosen_auto_iface;
 };
 
diff --git a/ui/qt5/networkingpage.cc b/ui/qt5/networkingpage.cc
index c1bf372..15fea56 100644
--- a/ui/qt5/networkingpage.cc
+++ b/ui/qt5/networkingpage.cc
@@ -14,7 +14,6 @@
 #include "horizonwizard.hh"
 
 #include <QLabel>
-#include <QVariant>
 #include <QVBoxLayout>
 
 NetworkingPage::NetworkingPage(QWidget *parent) : HorizonWizardPage(parent) {
@@ -56,8 +55,8 @@ void NetworkingPage::initializePage() {
 
     QObject::connect(radioGroup, static_cast<void (QButtonGroup:: *)(QAbstractButton *)>(&QButtonGroup::buttonClicked),
                      [=](QAbstractButton *button) {
-        if(button == skip) setField("network", QVariant(false));
-        else setField("network", QVariant(true));
+        if(button == skip) horizonWizard()->network = false;
+        else horizonWizard()->network = true;
 
         emit completeChanged();
     });
-- 
cgit v1.2.3-70-g09d2