dhcpcd-qt: Switch to Qt5


(kamil)

$NetBSD: patch-src_dhcpcd-qt_dhcpcd-preferences.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $

Port to Qt5.

--- src/dhcpcd-qt/dhcpcd-preferences.cpp.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/dhcpcd-preferences.cpp
@@ -182,10 +182,10 @@ void DhcpcdPreferences::listBlocks(const
 	blocks->disconnect(this);
 
 	free(eWhat);
-	eWhat = strdup(txt.toLower().toAscii());
+	eWhat = strdup(txt.toLower().toLatin1());
 
 	list = dhcpcd_config_blocks(parent->getConnection(),
-	    txt.toLower().toAscii());
+	    txt.toLower().toLatin1());
 
 	if (txt == "interface") {
 		char **ifaces, **i;
@@ -294,7 +294,7 @@ const char *DhcpcdPreferences::getString
 {
 	if (le->text().isEmpty())
 		return NULL;
-	return le->text().trimmed().toAscii();
+	return le->text().trimmed().toLatin1();
 }
 
 bool DhcpcdPreferences::setOption(const char *opt, const char *val, bool *ret)
@@ -405,7 +405,7 @@ void DhcpcdPreferences::showBlock(const 
 	if (txt.isEmpty())
 		eBlock = NULL;
 	else
-		eBlock = strdup(txt.toAscii());
+		eBlock = strdup(txt.toLatin1());
 
 	dhcpcd_config_free(config);
 	iface = NULL;

$NetBSD: patch-src_dhcpcd-qt_dhcpcd-qt.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $

Port to Qt5.

--- src/dhcpcd-qt/dhcpcd-qt.cpp.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/dhcpcd-qt.cpp
@@ -226,9 +226,9 @@ void DhcpcdQt::updateOnline(bool showIf)
 			if (showIf)
 				qDebug() << msg;
 			if (msgs.isEmpty())
-				msgs = QString::fromAscii(msg);
+				msgs = QString::fromLatin1(msg);
 			else
-				msgs += '\n' + QString::fromAscii(msg);
+				msgs += '\n' + QString::fromLatin1(msg);
 			free(msg);
 		} else if (showIf)
 			qDebug() << i->ifname << i->reason;

$NetBSD: patch-src_dhcpcd-qt_dhcpcd-qt.pro,v 1.1 2019/10/29 12:39:13 kamil Exp $

Port to Qt5.

--- src/dhcpcd-qt/dhcpcd-qt.pro.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/dhcpcd-qt.pro
@@ -1,5 +1,6 @@
 CONFIG+=		qt gui c++11 debug
 QMAKE_CXXFLAGS+=	-std=c++11 -O2
+QT+=			core gui widgets
 
 HEADERS=		dhcpcd-qt.h dhcpcd-about.h dhcpcd-preferences.h \
 			dhcpcd-wi.h dhcpcd-ifmenu.h \

$NetBSD: patch-src_dhcpcd-qt_dhcpcd-ssid.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $

Fix compiler warning.

--- src/dhcpcd-qt/dhcpcd-ssid.cpp.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/dhcpcd-ssid.cpp
@@ -74,8 +74,6 @@ DhcpcdSsid::DhcpcdSsid(DhcpcdWi *parent,
 
 QString DhcpcdSsid::getPsk(bool *ok)
 {
-	int r;
-
 	exec();
 	if (result() == QDialog::Rejected) {
 		if (ok)

$NetBSD: patch-src_dhcpcd-qt_dhcpcd-ssidmenuwidget.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $

Port to Qt5.

--- src/dhcpcd-qt/dhcpcd-ssidmenuwidget.cpp.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/dhcpcd-ssidmenuwidget.cpp
@@ -115,7 +115,8 @@ void DhcpcdSsidMenuWidget::setScan(DHCPC
 		selicon->setPixmap(picon);
 		ssid->setStyleSheet("font:bold;");
 	} else {
-		selicon->setPixmap(NULL);
+		QPixmap		emptyPixmap;
+		selicon->setPixmap(emptyPixmap);
 		ssid->setStyleSheet(NULL);
 	}
 	ssid->setText(scan->ssid);

$NetBSD: patch-src_dhcpcd-qt_dhcpcd-wi.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $

Port to Qt5.

--- src/dhcpcd-qt/dhcpcd-wi.cpp.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/dhcpcd-wi.cpp
@@ -300,7 +300,7 @@ void DhcpcdWi::connectSsid(DHCPCD_WI_SCA
 		if (pwd.isNull() || pwd.isEmpty())
 			err = dhcpcd_wpa_select(wpa, &s);
 		else
-			err = dhcpcd_wpa_configure(wpa, &s, pwd.toAscii());
+			err = dhcpcd_wpa_configure(wpa, &s, pwd.toLatin1());
 	} else
 		err = dhcpcd_wpa_configure(wpa, &s, NULL);
 

$NetBSD: patch-src_dhcpcd-qt_main.cpp,v 1.1 2019/10/29 12:39:13 kamil Exp $

Port to Qt5.

--- src/dhcpcd-qt/main.cpp.orig	2015-01-07 09:18:28.000000000 +0000
+++ src/dhcpcd-qt/main.cpp
@@ -24,6 +24,7 @@
  * SUCH DAMAGE.
  */
 
+#include <QApplication>
 #include <QtGui>
 
 #include "dhcpcd-qt.h"