summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2011-06-21 13:53:49 -0700
committerAlvaro Soliverez <alvaro.soliverez@collabora.co.uk>2011-06-21 13:53:49 -0700
commit971a033ae1d87606dba4398bbab906d4edba38eb (patch)
treed25700579375e2d31678f6a2deda1ff4771e64ff
parenta1ee79ac31047251a7b37fdfb1dfe225f11651ff (diff)
Revert "Return UTF-8 that is more suitable for QML to handle extended characters"
This reverts commit 01a979e177f7a7f14b88546c73f53ad1d22658b8. The extended characters were being correctly handled before and the error was due to an external problem.
-rw-r--r--TelepathyQt4Yell/Models/contact-model-item.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/TelepathyQt4Yell/Models/contact-model-item.cpp b/TelepathyQt4Yell/Models/contact-model-item.cpp
index f8cb96f..564d831 100644
--- a/TelepathyQt4Yell/Models/contact-model-item.cpp
+++ b/TelepathyQt4Yell/Models/contact-model-item.cpp
@@ -105,13 +105,13 @@ QVariant ContactModelItem::data(int role) const
return mPriv->mContact->id();
case Qt::DisplayRole:
case AccountsModel::AliasRole:
- return mPriv->mContact->alias().toUtf8();
+ return mPriv->mContact->alias();
case AccountsModel::PresenceStatusRole:
return mPriv->mContact->presence().status();
case AccountsModel::PresenceTypeRole:
return mPriv->mContact->presence().type();
case AccountsModel::PresenceMessageRole:
- return mPriv->mContact->presence().statusMessage().toUtf8();
+ return mPriv->mContact->presence().statusMessage();
case AccountsModel::SubscriptionStateRole:
return mPriv->mContact->subscriptionState();
case AccountsModel::PublishStateRole: