summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2022-07-04 18:34:32 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2022-07-04 18:34:32 -0500
commitc7894e122cbd50d6e52642079d2e407adc46d7fe (patch)
treef36be5a9c5a64a007f228b946e9ad47521b3eba7 /ui
parent69e4b95ac36115b8273a784041ba097b9aabc592 (diff)
downloadhorizon-c7894e122cbd50d6e52642079d2e407adc46d7fe.tar.gz
horizon-c7894e122cbd50d6e52642079d2e407adc46d7fe.tar.bz2
horizon-c7894e122cbd50d6e52642079d2e407adc46d7fe.tar.xz
horizon-c7894e122cbd50d6e52642079d2e407adc46d7fe.zip
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.
Diffstat (limited to 'ui')
-rw-r--r--ui/qt5/netsimplewifipage.cc4
-rw-r--r--ui/qt5/netsimplewifipage.hh2
2 files changed, 3 insertions, 3 deletions
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 <QApplication>
# include <QMessageBox>
# include <QProgressBar>
-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<NetworkSimpleWirelessPage *>(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 */
};