Skip to content
Snippets Groups Projects
Unverified Commit 4734123a authored by Maxim Cournoyer's avatar Maxim Cournoyer
Browse files

qtwrapper: Resolve type discrepancy in fileTransferInfo.

* src/qtwrapper/configurationmanager_wrap.h (fileTransferInfo)
<int64_t&>: Change type of TOTAL and PROGRESS to qlonglong&.  Convert
to int64_t via reinterpret_cast.  This is safe as both types are
guaranteed to be 64 bits.

Change-Id: I91d7e12e751ef5e4d07ac4647b4e99a15b05b507
parent cf359be9
Branches
No related tags found
No related merge requests found
/****************************************************************************** /******************************************************************************
* Copyright (C) 2014-2021 Savoir-faire Linux Inc. * * Copyright (C) 2014-2021 Savoir-faire Linux Inc. *
* Author : Philippe Groarke <philippe.groarke@savoirfairelinux.com> * * Author : Philippe Groarke <philippe.groarke@savoirfairelinux.com> *
* Author : Alexandre Lision <alexandre.lision@savoirfairelinux.com> * * Author : Alexandre Lision <alexandre.lision@savoirfairelinux.com> *
* * * *
...@@ -860,16 +860,16 @@ public Q_SLOTS: // METHODS ...@@ -860,16 +860,16 @@ public Q_SLOTS: // METHODS
QString conversationId, QString conversationId,
QString fileId, QString fileId,
QString& path, QString& path,
int64_t& total, qlonglong& total,
int64_t& progress) qlonglong& progress)
{ {
std::string pathstr; std::string pathstr;
auto result = uint32_t(DRing::fileTransferInfo(accountId.toStdString(), auto result = uint32_t(DRing::fileTransferInfo(accountId.toStdString(),
conversationId.toStdString(), conversationId.toStdString(),
fileId.toStdString(), fileId.toStdString(),
pathstr, pathstr,
total, reinterpret_cast<int64_t&>(total),
progress)); reinterpret_cast<int64_t&>(progress)));
path = pathstr.c_str(); path = pathstr.c_str();
return result; return result;
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment