diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-10-30 11:56:37 +0000 |
|---|---|---|
| committer | Tarmac <> | 2012-10-30 11:56:37 +0000 |
| commit | 035b6086485dcd3b42abc5d1fab2b155ccd16027 (patch) | |
| tree | 43710ebf85e54277d0d084ac284781b4035a41c8 /libqmenumodel/src/qmenumodel.cpp | |
| parent | 4d47b26a31dc1c337b47ded055e5f6613972fc97 (diff) | |
| parent | 307b793ca5deacfde7c787352f54f4f1aebc95e8 (diff) | |
| download | qmenumodel-035b6086485dcd3b42abc5d1fab2b155ccd16027.tar.gz qmenumodel-035b6086485dcd3b42abc5d1fab2b155ccd16027.tar.bz2 qmenumodel-035b6086485dcd3b42abc5d1fab2b155ccd16027.zip | |
Replaced gchar <-> QString convertion function, from Latin1 to Utf8.
Approved by PS Jenkins bot, Olivier Tilloy.
Diffstat (limited to 'libqmenumodel/src/qmenumodel.cpp')
| -rw-r--r-- | libqmenumodel/src/qmenumodel.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp index a45e5ff..f0c2274 100644 --- a/libqmenumodel/src/qmenumodel.cpp +++ b/libqmenumodel/src/qmenumodel.cpp @@ -156,10 +156,10 @@ QVariant QMenuModel::getStringAttribute(const QModelIndex &index, gchar* value = NULL; g_menu_model_get_item_attribute(m_menuModel, index.row(), - attribute.toLatin1(), + attribute.toUtf8().data(), "s", &value); if (value) { - result = QVariant(QString::fromLatin1(value)); + result = QVariant(QString::fromUtf8(value)); g_free(value); } return result; @@ -173,7 +173,7 @@ QVariant QMenuModel::getLink(const QModelIndex &index, link = g_menu_model_get_item_link(m_menuModel, index.row(), - linkName.toLatin1()); + linkName.toUtf8().data()); if (link) { QMenuModel *other = new QMenuModel(link, const_cast<QMenuModel*>(this)); |