Branch: master

536cfddc 2019-05-15 15:00:57 Michele Calgaro 
Use new function TQT_DBusData::getAsVariantData() instead of local
version of it.

Signed-off-by: Michele Calgaro <michele.calgaro@...>
M tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
M tdecore/tdehw/tdehardwaredevices.cpp
M tdecore/tdehw/tdestoragedevice.cpp

tdecore/tdehw/networkbackends/network-manager/network-manager.cpp

diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
index 2f11dd5..a7e8148 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
@@ -37,8 +37,9 @@
 #define PRINT_WARNING(x)
 #endif
 
-#define UPDATE_STRING_SETTING_IF_VALID(string, key, settingsMap)	if (!string.isNull()) settingsMap[key] = convertDBUSDataToVariantData(TQT_DBusData::fromString(string));	\
-									else settingsMap.remove(key);
+#define UPDATE_STRING_SETTING_IF_VALID(string, key, settingsMap)	\
+    if (!string.isNull()) { settingsMap[key] = (TQT_DBusData::fromString(string)).getAsVariantData();	} \
+		else { settingsMap.remove(key); }
 
 #define NM_ASYNC_TIMEOUT_MS 1000
 // Give the user 5 minutes to authenticate to DBUS before timing out
@@ -46,9 +47,6 @@
 
 // #define WAIT_FOR_OPERATION_BEFORE_RETURNING 1
 #define USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS 1
-
-// Defined in tdehardwaredevices.cpp
-TQT_DBusData convertDBUSDataToVariantData(TQT_DBusData);
 
 TQ_UINT32 reverseIPV4ByteOrder(TQ_UINT32 address) {
 	TQ_UINT32 ret;
@@ -3358,7 +3356,7 @@
 		{
 			TQMap<TQString, TQT_DBusData> settingsMap = dbusData.toStringKeyMap().toTQMap();
 			{
-				settingsMap["id"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(connection->friendlyName));
+				settingsMap["id"] = (TQT_DBusData::fromString(connection->friendlyName)).getAsVariantData();
 				{
 					TQString type;
 					if (ethernetConnection) type = "802-3-ethernet";
@@ -3377,9 +3375,9 @@
 							type = "gsm";
 						}
 					}
-					if (!type.isNull()) settingsMap["type"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(type));
+					if (!type.isNull()) settingsMap["type"] = (TQT_DBusData::fromString(type)).getAsVariantData();
 				}
-				settingsMap["uuid"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(connection->UUID));
+				settingsMap["uuid"] = (TQT_DBusData::fromString(connection->UUID)).getAsVariantData();
 				{
 					TQT_DBusDataValueList valueList;
 					{
@@ -3388,18 +3386,18 @@
 							valueList.append(TQT_DBusData::fromString(assembledString));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["permissions"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["permissions"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("permissions");
 				}
-				settingsMap["autoconnect"] = convertDBUSDataToVariantData(TQT_DBusData::fromBool(connection->autoConnect));
-				settingsMap["read-only"] = convertDBUSDataToVariantData(TQT_DBusData::fromBool(connection->readOnly));
+				settingsMap["autoconnect"] = (TQT_DBusData::fromBool(connection->autoConnect)).getAsVariantData();
+				settingsMap["read-only"] = (TQT_DBusData::fromBool(connection->readOnly)).getAsVariantData();
 				UPDATE_STRING_SETTING_IF_VALID(connection->masterConnectionUUID, "master", settingsMap)
 				{
 					TQString slaveType = tdeSlaveTypeToNMSlaveType(connection->slaveType);
-					if (slaveType != "") settingsMap["slave-type"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(slaveType));
+					if (slaveType != "") settingsMap["slave-type"] = (TQT_DBusData::fromString(slaveType)).getAsVariantData();
 					else settingsMap.remove("slave-type");
 				}
-				// settingsMap["timestamp"] = convertDBUSDataToVariantData(TQT_DBusData::fromUInt64(connection->lastKnownConnection.toTime_t()));	// Probably read-only to us
+				// settingsMap["timestamp"] = (TQT_DBusData::fromUInt64(connection->lastKnownConnection.toTime_t())).getAsVariantData();	// Probably read-only to us
 			}
 			dbusData = TQT_DBusData::fromStringKeyMap(TQT_DBusDataMap<TQString>(settingsMap));
 			groupValid = (settingsMap.count() > 0);
@@ -3418,7 +3416,7 @@
 						// EAP type
 						valueList.append(TQT_DBusData::fromString(tdeEAPTypeToNMEAPType(connection->eapConfig.type)));
 					}
-					settingsMap["eap"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					settingsMap["eap"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("eap");
@@ -3441,7 +3439,7 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.caCertificate[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["ca-cert"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["ca-cert"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("ca-cert");
 				}
 				else {
@@ -3462,7 +3460,7 @@
 							valueList.append(TQT_DBusData::fromString(*it));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["altsubject-matches"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["altsubject-matches"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("altsubject-matches");
 				}
 				else {
@@ -3476,7 +3474,7 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.clientCertificate[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["client-cert"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["client-cert"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("client-cert");
 				}
 				else {
@@ -3493,8 +3491,8 @@
 					settingsMap.remove("phase1-fast-provisioning");
 				}
 				if (connection->eapConfig.valid) {
-					settingsMap["phase2-auth"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(tdeEAPTypeToNMEAPType(connection->eapConfig.phase2NonEAPAuthMethod)));
-					settingsMap["phase2-autheap"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(tdeEAPTypeToNMEAPType(connection->eapConfig.phase2EAPAuthMethod)));
+					settingsMap["phase2-auth"] = (TQT_DBusData::fromString(tdeEAPTypeToNMEAPType(connection->eapConfig.phase2NonEAPAuthMethod))).getAsVariantData();
+					settingsMap["phase2-autheap"] = (TQT_DBusData::fromString(tdeEAPTypeToNMEAPType(connection->eapConfig.phase2EAPAuthMethod))).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("phase2-auth");
@@ -3508,7 +3506,7 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.phase2CaCertificate[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["phase2-ca-cert"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["phase2-ca-cert"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("phase2-ca-cert");
 				}
 				else {
@@ -3529,7 +3527,7 @@
 							valueList.append(TQT_DBusData::fromString(*it));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["phase2-altsubject-matches"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["phase2-altsubject-matches"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("phase2-altsubject-matches");
 				}
 				else {
@@ -3543,15 +3541,15 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.phase2ClientCertificate[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["phase2-client-cert"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["phase2-client-cert"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("phase2-client-cert");
 				}
 				else {
 					settingsMap.remove("phase2-client-cert");
 				}
 				if (connection->eapConfig.valid) {
-					settingsMap["password-flags"] = convertDBUSDataToVariantData(TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.passwordFlags)));
-					settingsMap["password-raw-flags"] = convertDBUSDataToVariantData(TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.binaryPasswordFlags)));
+					settingsMap["password-flags"] = (TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.passwordFlags))).getAsVariantData();
+					settingsMap["password-raw-flags"] = (TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.binaryPasswordFlags))).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("password-flags");
@@ -3565,14 +3563,14 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.privateKey[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["private-key"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["private-key"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("private-key");
 				}
 				else {
 					settingsMap.remove("private-key");
 				}
 				if (connection->eapConfig.valid) {
-					settingsMap["private-key-password-flags"] = convertDBUSDataToVariantData(TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.privateKeyPasswordFlags)));
+					settingsMap["private-key-password-flags"] = (TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.privateKeyPasswordFlags))).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("private-key-password-flags");
@@ -3585,26 +3583,26 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.phase2PrivateKey[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["phase2-private-key"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["phase2-private-key"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("phase2-private-key");
 				}
 				else {
 					settingsMap.remove("phase2-private-key");
 				}
 				if (connection->eapConfig.valid) {
-					settingsMap["phase2-private-key-password-flags"] = convertDBUSDataToVariantData(TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.phase2PrivateKeyPasswordFlags)));
+					settingsMap["phase2-private-key-password-flags"] = (TQT_DBusData::fromUInt32(tdePasswordFlagsToNMPasswordFlags(connection->eapConfig.phase2PrivateKeyPasswordFlags))).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("phase2-private-key-password-flags");
 				}
 				if (connection->eapConfig.valid) {
-					settingsMap["system-ca-certs"] = convertDBUSDataToVariantData(TQT_DBusData::fromBool(connection->eapConfig.forceSystemCaCertificates));
+					settingsMap["system-ca-certs"] = (TQT_DBusData::fromBool(connection->eapConfig.forceSystemCaCertificates)).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("system-ca-certs");
 				}
 				if (connection->eapConfig.secretsValid) {
-					settingsMap["password"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(connection->eapConfig.password));
+					settingsMap["password"] = (TQT_DBusData::fromString(connection->eapConfig.password)).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("password");
@@ -3617,15 +3615,15 @@
 							valueList.append(TQT_DBusData::fromByte(connection->eapConfig.binaryPassword[count]));
 						}
 					}
-					if (valueList.count() > 0) settingsMap["password-raw"] = convertDBUSDataToVariantData(TQT_DBusData::fromTQValueList(valueList));
+					if (valueList.count() > 0) settingsMap["password-raw"] = (TQT_DBusData::fromTQValueList(valueList)).getAsVariantData();
 					else settingsMap.remove("password-raw");
 				}
 				else {
 					settingsMap.remove("password-raw");
 				}
 				if (connection->eapConfig.secretsValid) {
-					settingsMap["private-key-password"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(connection->eapConfig.privateKeyPassword));
-					settingsMap["phase2-private-key-password"] = convertDBUSDataToVariantData(TQT_DBusData::fromString(connection->eapConfig.phase2PrivateKeyPassword));
+					settingsMap["private-key-password"] = (TQT_DBusData::fromString(connection->eapConfig.privateKeyPassword)).getAsVariantData();
+					settingsMap["phase2-private-key-password"] = (TQT_DBusData::fromString(connection->eapConfig.phase2PrivateKeyPassword)).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("private-key-password");
@@ -3642,7 +3640,7 @@
 		if (ethernetConnection) {
 			TQMap<TQString, TQT_DBusData> settingsMap = dbusData.toStringKeyMap().toTQMap();
 			{
-				settingsMap["duplex"] = convertDBUSDataToVariantData(TQT_DBusData::fromString((connection->fullDuplex)?"full":"half"));
+				settingsMap["duplex"] = (TQT_DBusData::fromString((connection->fullDuplex)?"full":"half")).getAsVariantData();
 				if (connection->lockedHWAddress.isValid()) {
 					TDENetworkByteList address = connection->lockedHWAddress.address();
 					TQT_DBusDataValueList valueList;
@@ -3652,7 +3650,7 @@
 						valueList.append(innerDataValue);
 					}
 					TQT_DBusData nmHWAddress = TQT_DBusData::fromTQValueList(valueList);
-					settingsMap["mac-address"] = convertDBUSDataToVariantData(nmHWAddress);
+					settingsMap["mac-address"] = (nmHWAddress).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("mac-address");
@@ -3666,13 +3664,13 @@
 						valueList.append(innerDataValue);
 					}
 					TQT_DBusData nmHWAddress = TQT_DBusData::fromTQValueList(valueList);
-					settingsMap["cloned-mac-address"] = convertDBUSDataToVariantData(nmHWAddress);
+					settingsMap["cloned-mac-address"] = (nmHWAddress).getAsVariantData();
 				}
 				else {
 					settingsMap.remove("cloned-mac-address");
 				}
** Diff limit reached (max: 250 lines) **