Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-11-18 12:51:22 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2013-04-05 17:57:48 (GMT) |
| commit | b9ef4566d31219d66a615b1eae042a01828c8b7d (patch) | |
| tree | 49e7f254b0543146f86404773048101149c937a6 /Swift/QtUI/QtFileTransferListItemModel.cpp | |
| parent | 92640bf4e5ff215b9e83e64d78777c7b163409db (diff) | |
| download | swift-b9ef4566d31219d66a615b1eae042a01828c8b7d.zip swift-b9ef4566d31219d66a615b1eae042a01828c8b7d.tar.bz2 | |
Remove QString::fromStdString usage.
Change-Id: I27e91b18e64385bc28a5eee816293c66e34bfbb0
Diffstat (limited to 'Swift/QtUI/QtFileTransferListItemModel.cpp')
| -rw-r--r-- | Swift/QtUI/QtFileTransferListItemModel.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Swift/QtUI/QtFileTransferListItemModel.cpp b/Swift/QtUI/QtFileTransferListItemModel.cpp index fac0761..9f7ccdc 100644 --- a/Swift/QtUI/QtFileTransferListItemModel.cpp +++ b/Swift/QtUI/QtFileTransferListItemModel.cpp @@ -14,6 +14,7 @@ #include <Swiften/Base/boost_bsignals.h> #include <Swift/Controllers/FileTransfer/FileTransferController.h> #include <Swift/Controllers/FileTransfer/FileTransferOverview.h> +#include "QtSwiftUtil.h" namespace Swift { @@ -65,7 +66,7 @@ QVariant QtFileTransferListItemModel::data(const QModelIndex &index, int role) c return controller->isIncoming() ? QVariant(QObject::tr("Incoming")) : QVariant(QObject::tr("Outgoing")); } 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(); @@ -91,7 +92,7 @@ QVariant QtFileTransferListItemModel::data(const QModelIndex &index, int role) c return QVariant(QString::number(controller->getProgress())); } if (index.column() == OverallSize) { - return QVariant(QString::fromStdString(formatSize((controller->getSize())))); + return QVariant(P2QSTRING(formatSize((controller->getSize())))); } return QVariant(); } |