knetworkmanager-0.8/src/knetworkmanager-cellular_device_tray.cpp

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 @@

 	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

knetworkmanager-0.8/src/knetworkmanager-menuitem.cpp

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 @@

 		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 @@

 	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();

knetworkmanager-0.8/src/knetworkmanager-tray.cpp

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 @@

 	NMProxy* nm = NMProxy::getInstance();

 	if (conn) {

-		TQString actionText = conn->getObjectPath().data();

+		TQString actionText = conn->getObjectPath().ascii();

 		nm->deactivateConnection(conn, dev);

 	}

 }

knetworkmanager-0.8/src/knetworkmanager-wired_device_tray.cpp

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 @@

 		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<Connection*> connections = connectionStore->getConnections(NM_SETTING_WIRED_SETTING_NAME);

knetworkmanager-0.8/src/knetworkmanager-wireless_device_tray.cpp

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 @@

 	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)

knetworkmanager-0.8/src/knetworkmanager-wireless_menuitem.cpp

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 @@

 	{

 		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

knetworkmanager-0.8/src/xmlmarshaller.cpp

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 TQT_DBusObjectPath toObjectPath(const TQDomElement& element)

 {

-    return TQCString(element.text().ascii());

+    return element.text();

 }

 static TQT_DBusData::Type typeFromEntry(const TQDomElement& element)