Branch: master

08094835 2019-05-20 15:24:42 Michele Calgaro
Adapted to latest dbus-1-tqt version (TQT_DBusObjectPath inheriting from TQString).

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

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 a7e8148..f889a58 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
@@ -4602,7 +4602,7 @@
 				PRINT_ERROR((d->nmAddConnectionAsyncErrorResponse[asyncCallID].name() + ": " + d->nmAddConnectionAsyncErrorResponse[asyncCallID].message()));
 				d->nmAddConnectionAsyncErrorResponse.remove(asyncCallID);
 			}
-			if (!d->nmAddConnectionAsyncResponse[asyncCallID].data()) {
+			if (!d->nmAddConnectionAsyncResponse[asyncCallID].ascii()) {
 				PRINT_ERROR(TQString("NetworkManager did not return a new connection object!"))
 				command_failed = true;
 			}
@@ -4878,7 +4878,7 @@
 					PRINT_ERROR((d->nmAddConnectionAsyncErrorResponse[asyncCallID].name() + ": " + d->nmAddConnectionAsyncErrorResponse[asyncCallID].message()));
 					d->nmAddConnectionAsyncErrorResponse.remove(asyncCallID);
 				}
-				if (!d->nmAddConnectionAsyncResponse[asyncCallID].data()) {
+				if (!d->nmAddConnectionAsyncResponse[asyncCallID].ascii()) {
 					PRINT_ERROR(TQString("NetworkManager did not return a new connection object!"))
 				}
 				if (d->nmAddConnectionAsyncResponse.contains(asyncCallID)) {
@@ -4929,7 +4929,7 @@
 	}
 }
 
-TQCString TDENetworkConnectionManager_BackendNM::getActiveConnectionPath(TQString uuid) {
+TQT_DBusObjectPath TDENetworkConnectionManager_BackendNM::getActiveConnectionPath(TQString uuid) {
 	TQT_DBusObjectPath existingConnection;
 	TQT_DBusError error;
 	if (d->m_networkManagerProxy) {

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

diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.h b/tdecore/tdehw/networkbackends/network-manager/network-manager.h
index 92b4b0a..f14e499 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.h
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.h
@@ -206,6 +206,7 @@
 #define NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED	54
 //====================================================================================================
 
+class TQT_DBusObjectPath;
 class TDENetworkConnectionManager_BackendNMPrivate;
 
 class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager
@@ -253,7 +254,7 @@
 		bool loadConnectionSecretsForGroup(TQString uuid, TQString group);
 		TDENetworkWiFiAPInfo* getAccessPointDetails(TQString dbusPath);
 		TDENetworkConnectionType::TDENetworkConnectionType connectionType(TQString dbusPath);
-		TQCString getActiveConnectionPath(TQString uuid);
+		TQT_DBusObjectPath getActiveConnectionPath(TQString uuid);
 
 	private:
 		TDENetworkConnectionManager_BackendNMPrivate* d;