diff options
| author | Fabian Bumberger <fbumberger@rim.com> | 2013-08-01 14:31:50 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-08-01 15:13:04 +0200 |
| commit | 288e64d30585a5da2dafc00d39c803a8c5c541cb (patch) | |
| tree | 0a18bff9f70b080be570246e25ad517337d41bd9 /src/bluetooth | |
| parent | 8b529e3da27b00bf4a20b19cdbfccb085b387267 (diff) | |
| download | qtconnectivity-288e64d30585a5da2dafc00d39c803a8c5c541cb.tar.gz | |
QNX: Fix Compilation error and compiler warnings
Change-Id: I45df1d1e4a4ce42ee7eb1c7c566e6d7a9aeb8ec2
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>
Diffstat (limited to 'src/bluetooth')
| -rw-r--r-- | src/bluetooth/qbluetoothtransferreply_qnx.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/bluetooth/qbluetoothtransferreply_qnx.cpp b/src/bluetooth/qbluetoothtransferreply_qnx.cpp index af5c28f0..a81a6e8e 100644 --- a/src/bluetooth/qbluetoothtransferreply_qnx.cpp +++ b/src/bluetooth/qbluetoothtransferreply_qnx.cpp @@ -70,9 +70,9 @@ QBluetoothTransferReplyQnx::QBluetoothTransferReplyQnx(QIODevice *input, const Q //qsrand(QTime::currentTime().msec()); //m_agent_path = agentPath; //m_agent_path.append(QString::fromLatin1("/%1").arg(qrand())); - ppsRegisterForEvent("opp_update", this); - ppsRegisterForEvent("opp_complete", this); - ppsRegisterForEvent("opp_cancelled", this); + ppsRegisterForEvent(QStringLiteral("opp_update"), this); + ppsRegisterForEvent(QStringLiteral("opp_complete"), this); + ppsRegisterForEvent(QStringLiteral("opp_cancelled"), this); QMetaObject::invokeMethod(this, "start", Qt::QueuedConnection); } @@ -138,7 +138,7 @@ void QBluetoothTransferReplyQnx::copyDone() void QBluetoothTransferReplyQnx::startOPP(QString filename) { qBBBluetoothDebug() << "Sending Push object command"; - ppsSendOpp("push_object", filename.toUtf8(), m_address, this); + ppsSendOpp("push_object", filename.toUtf8(), request().address(), this); } QBluetoothTransferReply::TransferError QBluetoothTransferReplyQnx::error() const @@ -188,7 +188,7 @@ void QBluetoothTransferReplyQnx::controlEvent(ppsResult result) if (!ok) return; qBBBluetoothDebug() << "opp update" << sentBytes << totalBytes; - Q_EMIT uploadProgress(sentBytes, totalBytes); + Q_EMIT transferProgress(sentBytes, totalBytes); } else if (result.msg == QStringLiteral("opp_complete")) { qBBBluetoothDebug() << "opp complete"; m_finished = true; |