Swiftdiff options
Diffstat (limited to 'Swift/QtUI/QtFileTransferListItemModel.cpp')
| -rw-r--r-- | Swift/QtUI/QtFileTransferListItemModel.cpp | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp index cf1de07..b9b9fd1 100644 --- a/Swift/QtUI/QtFileTransferListItemModel.cpp +++ b/Swift/QtUI/QtFileTransferListItemModel.cpp @@ -11,11 +11,11 @@ #include <Swiften/Base/boost_bsignals.h> +#include <Swiften/Base/FileSize.h> #include <Swift/Controllers/FileTransfer/FileTransferController.h> #include <Swift/Controllers/FileTransfer/FileTransferOverview.h> +#include "QtSwiftUtil.h" namespace Swift { -extern std::string formatSize(const boost::uintmax_t bytes); - QtFileTransferListItemModel::QtFileTransferListItemModel(QObject *parent) : QAbstractItemModel(parent), fileTransferOverview(0) { } @@ -66,9 +66,12 @@ QVariant QtFileTransferListItemModel::data(const QModelIndex &index, int role) c } if (index.column() == OtherParty) { - return QVariant(QString::fromStdString(controller->getOtherParty().toString())); + return QVariant(P2QSTRING(controller->getOtherParty().toString())); } if (index.column() == State) { FileTransfer::State state = controller->getState(); - switch(state.state) { + switch(state.type) { + case FileTransfer::State::Initial: + assert(false); + return QVariant(""); case FileTransfer::State::WaitingForStart: return QVariant(QObject::tr("Waiting for start")); @@ -92,5 +95,5 @@ QVariant QtFileTransferListItemModel::data(const QModelIndex &index, int role) c } if (index.column() == OverallSize) { - return QVariant(QString::fromStdString(formatSize((controller->getSize())))); + return QVariant(P2QSTRING(formatSize((controller->getSize())))); } return QVariant(); @@ -106,5 +109,5 @@ int QtFileTransferListItemModel::rowCount(const QModelIndex& /* parent */) const QModelIndex QtFileTransferListItemModel::index(int row, int column, const QModelIndex& /* parent */) const { - return createIndex(row, column, 0); + return createIndex(row, column, static_cast<void*>(0)); } |