summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2019-05-21 00:24:42 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2019-05-21 00:24:42 +0900
commit080948356f99f601ae4328ca01867547a412a376 (patch)
treedb94306dde4205f3f97bcdb052703931c97c6305
parent536cfddc84c7e3ff417938d77db32db41b7202dd (diff)
downloadtdelibs-080948356f99f601ae4328ca01867547a412a376.zip
tdelibs-080948356f99f601ae4328ca01867547a412a376.tar.gz
Adapted to latest dbus-1-tqt version (TQT_DBusObjectPath inheriting from TQString).
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
-rw-r--r--tdecore/tdehw/networkbackends/network-manager/network-manager.cpp6
-rw-r--r--tdecore/tdehw/networkbackends/network-manager/network-manager.h3
2 files changed, 5 insertions, 4 deletions
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 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
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 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
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 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
}
}
-TQCString TDENetworkConnectionManager_BackendNM::getActiveConnectionPath(TQString uuid) {
+TQT_DBusObjectPath TDENetworkConnectionManager_BackendNM::getActiveConnectionPath(TQString uuid) {
TQT_DBusObjectPath existingConnection;
TQT_DBusError error;
if (d->m_networkManagerProxy) {
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 @@ class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkCo
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;