From 6baede8a07f110617ba49a82f6d8b616f27c1425 Mon Sep 17 00:00:00 2001 From: Thomas Flueeli Date: Thu, 28 Oct 2010 15:50:09 +0200 Subject: [PATCH 4/5] add workaround for qdbus_cast default argument MSVC9 isn't able to call the specialisation with the default argument and gives the following error: error C2440: 'default argument' : cannot convert from 'T *' to 'Tp::SocketAddressIPv4 *' Types pointed to are unrelated; conversion requires reinterpret_cast, C-style cast or function-style cast --- TelepathyQt4/incoming-file-transfer-channel.cpp | 2 +- TelepathyQt4/outgoing-file-transfer-channel.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/TelepathyQt4/incoming-file-transfer-channel.cpp b/TelepathyQt4/incoming-file-transfer-channel.cpp index 17b8e5a..88c449d 100644 --- a/TelepathyQt4/incoming-file-transfer-channel.cpp +++ b/TelepathyQt4/incoming-file-transfer-channel.cpp @@ -210,7 +210,7 @@ void IncomingFileTransferChannel::onAcceptFileFinished(PendingOperation *op) } PendingVariant *pv = qobject_cast(op); - mPriv->addr = qdbus_cast(pv->result()); + mPriv->addr = qdbus_cast(pv->result(), 0); debug().nospace() << "Got address " << mPriv->addr.address << ":" << mPriv->addr.port; diff --git a/TelepathyQt4/outgoing-file-transfer-channel.cpp b/TelepathyQt4/outgoing-file-transfer-channel.cpp index 903c2e9..5815903 100644 --- a/TelepathyQt4/outgoing-file-transfer-channel.cpp +++ b/TelepathyQt4/outgoing-file-transfer-channel.cpp @@ -201,7 +201,7 @@ void OutgoingFileTransferChannel::onProvideFileFinished(PendingOperation *op) } PendingVariant *pv = qobject_cast(op); - mPriv->addr = qdbus_cast(pv->result()); + mPriv->addr = qdbus_cast(pv->result(), 0); debug().nospace() << "Got address " << mPriv->addr.address << ":" << mPriv->addr.port; -- 1.7.2.3