From feae5974464eb027a429b5489383654ef041ebb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Sun, 26 May 2019 01:05:13 +0200 Subject: [PATCH] Adapted to latest dbus-1-tqt version (TQT_DBusObjectPath inheriting from TQString). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko --- .../src/knetworkmanager-cellular_device_tray.cpp | 2 +- knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp | 6 +++--- knetworkmanager-0.8/src/knetworkmanager-tray.cpp | 2 +- .../src/knetworkmanager-wired_device_tray.cpp | 2 +- .../src/knetworkmanager-wireless_device_tray.cpp | 2 +- .../src/knetworkmanager-wireless_menuitem.cpp | 2 +- knetworkmanager-0.8/src/xmlmarshaller.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp index f7c1031..8e2b934 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp @@ -105,7 +105,7 @@ void CellularDeviceTray::addMenuItems(TDEPopupMenu* menu) NMProxy* nm = NMProxy::getInstance(); Connection* active_conn = nm->getActiveConnection(d->dev); if (active_conn) - kdDebug() << active_conn->getObjectPath().data() << endl; + kdDebug() << active_conn->getObjectPath().ascii() << endl; // get all available Connections for cellular devices // WILLTODO : repeat for GSM diff --git a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp index 9ee78b6..67a0470 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp @@ -92,8 +92,8 @@ void NetworkMenuItem::slotActivate() NMProxy* nm = NMProxy::getInstance(); if (nm) { - kdDebug() << "Activate Connection " << d->conn->getObjectPath().data() << " on Device " << d->dev->getObjectPath().ascii() << endl; - printf("Activate Connection %s on Device %s\n", d->conn->getObjectPath().data(), d->dev->getObjectPath().ascii()); + kdDebug() << "Activate Connection " << d->conn->getObjectPath().ascii() << " on Device " << d->dev->getObjectPath().ascii() << endl; + printf("Activate Connection %s on Device %s\n", d->conn->getObjectPath().ascii(), d->dev->getObjectPath().ascii()); #if NM_CHECK_VERSION(0,8,992) if (nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", d->conn->getObjectPath(), TQT_DBusObjectPath(QCString(d->dev->getObjectPath())), d->conn->getObjectPath(), err)) @@ -110,7 +110,7 @@ void NetworkMenuItem::slotActivate() else if (d->conn) { // no device given, just take the default device - printf("Activate Connection %s on default device\n", d->conn->getObjectPath().data()); + printf("Activate Connection %s on default device\n", d->conn->getObjectPath().ascii()); TQT_DBusObjectPath act_conn = nm->getDefaultActiveConnection(); TQT_DBusObjectPath device = nm->getDeviceForActiveConnection(act_conn); vpn_attempt_this_conn = d->conn->getObjectPath(); diff --git a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp index f5503d9..78e68ed 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-tray.cpp @@ -781,7 +781,7 @@ void Tray::slotDeactivateConnection(int index) NMProxy* nm = NMProxy::getInstance(); if (conn) { - TQString actionText = conn->getObjectPath().data(); + TQString actionText = conn->getObjectPath().ascii(); nm->deactivateConnection(conn, dev); } } diff --git a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp index 21d7082..d6ba7c2 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp @@ -102,7 +102,7 @@ void WiredDeviceTray::addMenuItems(TDEPopupMenu* menu) NMProxy* nm = NMProxy::getInstance(); Connection* active_conn = nm->getActiveConnection(d->dev); if (active_conn) - kdDebug() << active_conn->getObjectPath().data() << endl; + kdDebug() << active_conn->getObjectPath().ascii() << endl; // get all available Connections for wired devices TQValueList connections = connectionStore->getConnections(NM_SETTING_WIRED_SETTING_NAME); diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp index 0885a89..ccc8df5 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp @@ -153,7 +153,7 @@ void WirelessDeviceTray::addWirelessNetworks(TDEPopupMenu* menu) NMProxy* nm = NMProxy::getInstance(); Connection* active_conn = nm->getActiveConnection(d->dev); if (active_conn) - kdDebug() << active_conn->getObjectPath().data() << endl; + kdDebug() << active_conn->getObjectPath().ascii() << endl; // add all wireless connections in range // (we may have more then one connection per network) diff --git a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp index 13366f5..7205890 100644 --- a/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp +++ b/knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp @@ -72,7 +72,7 @@ void WirelessNetworkItem::slotActivate() { if ( _conn ) { - kdDebug() << "Activate Connection " << _conn->getObjectPath().data() << " on Device " << _dev->getObjectPath().ascii() << endl; + kdDebug() << "Activate Connection " << _conn->getObjectPath().ascii() << " on Device " << _dev->getObjectPath().ascii() << endl; #if NM_CHECK_VERSION(0,8,992) if (!nm->ActivateConnectionAsync(id, "org.freedesktop.NetworkManagerUserSettings", _conn->getObjectPath(), TQT_DBusObjectPath(QCString(_dev->getObjectPath())), _conn->getObjectPath(), err)) #else diff --git a/knetworkmanager-0.8/src/xmlmarshaller.cpp b/knetworkmanager-0.8/src/xmlmarshaller.cpp index a826e39..99fdff3 100644 --- a/knetworkmanager-0.8/src/xmlmarshaller.cpp +++ b/knetworkmanager-0.8/src/xmlmarshaller.cpp @@ -404,7 +404,7 @@ static TQString toString(const TQDomElement& element) static TQT_DBusObjectPath toObjectPath(const TQDomElement& element) { - return TQCString(element.text().ascii()); + return element.text(); } static TQT_DBusData::Type typeFromEntry(const TQDomElement& element)