TDE
/
tdelibs
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tdelibs
0
0
Fork 0
Code Issues Releases Wiki Activity

Adapted to latest dbus-1-tqt version (TQT_DBusObjectPath inheriting from TQString).

Browse Source 
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
pull/34/head
Michele Calgaro 6 years ago
parent 536cfddc84
commit 080948356f
Signed by: MicheleC
GPG Key ID: 2A75B7CA8ADED5CF
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File

6
tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
Unescape View File

@ -4602,7 +4602,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
PRINT_ERROR((d->nmAddConnectionAsyncErrorResponse[asyncCallID].name() + ": " + d->nmAddConnectionAsyncErrorResponse[asyncCallID].message())); PRINT_ERROR((d->nmAddConnectionAsyncErrorResponse[asyncCallID].name() + ": " + d->nmAddConnectionAsyncErrorResponse[asyncCallID].message()));
d->nmAddConnectionAsyncErrorResponse.remove(asyncCallID); 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!")) PRINT_ERROR(TQString("NetworkManager did not return a new connection object!"))
command_failed = true; command_failed = true;
} }
@ -4878,7 +4878,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
PRINT_ERROR((d->nmAddConnectionAsyncErrorResponse[asyncCallID].name() + ": " + d->nmAddConnectionAsyncErrorResponse[asyncCallID].message())); PRINT_ERROR((d->nmAddConnectionAsyncErrorResponse[asyncCallID].name() + ": " + d->nmAddConnectionAsyncErrorResponse[asyncCallID].message()));
d->nmAddConnectionAsyncErrorResponse.remove(asyncCallID); 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!")) PRINT_ERROR(TQString("NetworkManager did not return a new connection object!"))
} }
if (d->nmAddConnectionAsyncResponse.contains(asyncCallID)) { 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_DBusObjectPath existingConnection;
TQT_DBusError error; TQT_DBusError error;
if (d->m_networkManagerProxy) { if (d->m_networkManagerProxy) {

3
tdecore/tdehw/networkbackends/network-manager/network-manager.h
Unescape View File

@ -206,6 +206,7 @@
#define NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED 54 #define NM_DEVICE_STATE_REASON_SECONDARY_CONNECTION_FAILED 54
//==================================================================================================== //====================================================================================================
class TQT_DBusObjectPath;
class TDENetworkConnectionManager_BackendNMPrivate; class TDENetworkConnectionManager_BackendNMPrivate;
class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkConnectionManager
@ -253,7 +254,7 @@ class TDECORE_EXPORT TDENetworkConnectionManager_BackendNM : public TDENetworkCo
bool loadConnectionSecretsForGroup(TQString uuid, TQString group); bool loadConnectionSecretsForGroup(TQString uuid, TQString group);
TDENetworkWiFiAPInfo* getAccessPointDetails(TQString dbusPath); TDENetworkWiFiAPInfo* getAccessPointDetails(TQString dbusPath);
TDENetworkConnectionType::TDENetworkConnectionType connectionType(TQString dbusPath); TDENetworkConnectionType::TDENetworkConnectionType connectionType(TQString dbusPath);
TQCString getActiveConnectionPath(TQString uuid); TQT_DBusObjectPath getActiveConnectionPath(TQString uuid);
private: private:
TDENetworkConnectionManager_BackendNMPrivate* d; TDENetworkConnectionManager_BackendNMPrivate* d;

Write Preview
Loading…
Cancel
Save