From c7894e122cbd50d6e52642079d2e407adc46d7fe Mon Sep 17 00:00:00 2001 From: "A. Wilcox" Date: Mon, 4 Jul 2022 18:34:32 -0500 Subject: Qt UI: Use 'tain' instead of 'tain_t' This is required to support the newer skalibs releases. We don't need to have good support for older versions because this code is only used in the Install Environment, which we control. --- ui/qt5/netsimplewifipage.cc | 4 ++-- ui/qt5/netsimplewifipage.hh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'ui/qt5') diff --git a/ui/qt5/netsimplewifipage.cc b/ui/qt5/netsimplewifipage.cc index 2ead0c1..4c613f2 100644 --- a/ui/qt5/netsimplewifipage.cc +++ b/ui/qt5/netsimplewifipage.cc @@ -24,7 +24,7 @@ # include # include # include -int scanResults(wpactrl_t *control, char const *s, size_t len, void *page, tain_t *) { +int scanResults(wpactrl_t *control, char const *s, size_t len, void *page, tain *) { NetworkSimpleWirelessPage *our_page = reinterpret_cast(page); return our_page->processScan(control, s, len); } @@ -195,7 +195,7 @@ void NetworkSimpleWirelessPage::doScan() { rescanButton->setEnabled(false); statusLabel->setText(tr("Scanning for networks...")); - tain_t deadline; + tain deadline; wparesponse_t response; std::string suppsock = "/var/run/wpa_supplicant/" + horizonWizard()->chosen_auto_iface; diff --git a/ui/qt5/netsimplewifipage.hh b/ui/qt5/netsimplewifipage.hh index 8d6c9fd..7e2d358 100644 --- a/ui/qt5/netsimplewifipage.hh +++ b/ui/qt5/netsimplewifipage.hh @@ -59,7 +59,7 @@ private: void processAssociateMessage(int); void scanDone(QString message); int processScan(wpactrl_t *, const char *, size_t); - friend int scanResults(wpactrl_t *, char const *, size_t, void *, tain_t *); + friend int scanResults(wpactrl_t *, char const *, size_t, void *, tain *); #endif /* HAS_INSTALL_ENV */ }; -- cgit v1.2.3-60-g2f50