From f793e70ca0262ae0ac4bf1a1cb06e97e1b1b7ee8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= <slavek.banko@axis.cz>
Date: Sat, 3 Sep 2016 18:04:23 +0200
Subject: Fix FTBFS with GCC6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 639f123064428ade15766104933f092d5020f3d6)
---
 src/utils.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src')

diff --git a/src/utils.cpp b/src/utils.cpp
index e029ede..ec8b799 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -524,7 +524,7 @@ TQStringList Utils::getOpenvpnCiphers()
 		delete OpenvpnCiphersProcess;
 		OpenvpnCiphersProcess=0L;
 		kdError() << "Unable to fetch openvpn ciphers!" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -921,7 +921,7 @@ TQStringList Utils::getOpenvpnDigests()
 		delete OpenvpnDigestProcess;
 		OpenvpnDigestProcess=0L;
 		kdError() << "Unable to fetch openvpn digests!" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -1036,7 +1036,7 @@ TQString Utils::getNameAndPidOfProgramListen( int port )
 		delete NameAndPidOfProgramListenProcess;
 		NameAndPidOfProgramListenProcess=0L;
 		kdError() << "netstat fails!" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -1076,7 +1076,7 @@ TQString Utils::getEmailAddressOfCert(TQString cert)
 		delete GetEmailAddressOfCertProcess;
 		GetEmailAddressOfCertProcess=0L;
 		kdError() << "GetEmailAddressOfCertProcess" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -1125,7 +1125,7 @@ TQStringList Utils::getSmartcardSlots(TQString ProviderLib)
 		delete GetSmartcardSlotsProcess;
 		GetSmartcardCertsFromSlotProcess=0L;
 		config->appendLogEntry(i18n("Unable to fetch smartcard slots via pkcs11-tool!"), config->error);
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -1191,7 +1191,7 @@ TQStringList Utils::getSmartcardCertsFromSlot(TQString slot,TQString IdType,TQSt
 		delete GetSmartcardCertsFromSlotProcess;
 		GetSmartcardCertsFromSlotProcess=0L;
 		kdError() << "Unable to fetch smartcard slots via pkcs11-tool!" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -1248,7 +1248,7 @@ TQStringList Utils::getCertsFromCiscoCertStore(TQString type)
 		delete GetCertsFromCiscoCertStoreProcess;
 		GetCertsFromCiscoCertStoreProcess=0L;
 		kdError() << "Unable to fetch certificates via cisco_cert_mgr!" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
@@ -1287,7 +1287,7 @@ TQStringList Utils::getOpenvpnPkcs11Ids(TQString ProviderLib)
 		delete OpenvpnPkcs11IdsProcess;
 		OpenvpnPkcs11IdsProcess=0L;
 		kdError() << "Unable to fetch pkcs11 ids via openvpn!" << endl;
-		return false;
+		return 0;
 	}
 	else
 	{
-- 
cgit v1.2.1