diff options
author | David Edmundson <david@davidedmundson.co.uk> | 2012-04-24 14:54:28 +0100 |
---|---|---|
committer | David Edmundson <david@davidedmundson.co.uk> | 2012-04-24 14:54:28 +0100 |
commit | 99dd0583ac23a46efb2df9b5bb1934b1317f45af (patch) | |
tree | f1be16252cad616c162161c6ce0ffe34fffd8d62 /liblightdm-qt | |
parent | 2c4404e30d4fdbfb222556ce1e918e349f75ed99 (diff) | |
download | lightdm-99dd0583ac23a46efb2df9b5bb1934b1317f45af.tar.gz |
Move from QString::fromLocal8Bit to QString::fromUtf8 when converting from gchar.
gchars are always UTF8. This fixes issues with special characters in usernames.
Diffstat (limited to 'liblightdm-qt')
-rw-r--r-- | liblightdm-qt/greeter.cpp | 14 | ||||
-rw-r--r-- | liblightdm-qt/sessionsmodel.cpp | 6 | ||||
-rw-r--r-- | liblightdm-qt/usersmodel.cpp | 34 |
3 files changed, 27 insertions, 27 deletions
diff --git a/liblightdm-qt/greeter.cpp b/liblightdm-qt/greeter.cpp index 55889f27..02e8cd8c 100644 --- a/liblightdm-qt/greeter.cpp +++ b/liblightdm-qt/greeter.cpp @@ -56,7 +56,7 @@ void GreeterPrivate::cb_showPrompt(LightDMGreeter *greeter, const gchar *text, L Q_UNUSED(greeter); GreeterPrivate *that = static_cast<GreeterPrivate*>(data); - QString message = QString::fromLocal8Bit(text); + QString message = QString::fromUtf8(text); //FIXME prompt type @@ -68,7 +68,7 @@ void GreeterPrivate::cb_showMessage(LightDMGreeter *greeter, const gchar *text, Q_UNUSED(greeter); GreeterPrivate *that = static_cast<GreeterPrivate*>(data); - QString message = QString::fromLocal8Bit(text); + QString message = QString::fromUtf8(text); //FIXME prompt type @@ -147,7 +147,7 @@ bool Greeter::isAuthenticated() const QString Greeter::authenticationUser() const { Q_D(const Greeter); - return QString::fromLocal8Bit(lightdm_greeter_get_authentication_user(d->ldmGreeter)); + return QString::fromUtf8(lightdm_greeter_get_authentication_user(d->ldmGreeter)); } void Greeter::setLanguage (const QString &language) @@ -172,7 +172,7 @@ QString Greeter::getHint(const QString &name) const QString Greeter::defaultSessionHint() const { Q_D(const Greeter); - return QString::fromLocal8Bit(lightdm_greeter_get_default_session_hint(d->ldmGreeter)); + return QString::fromUtf8(lightdm_greeter_get_default_session_hint(d->ldmGreeter)); } bool Greeter::hideUsersHint() const @@ -202,7 +202,7 @@ bool Greeter::hasGuestAccountHint() const QString Greeter::selectUserHint() const { Q_D(const Greeter); - return QString::fromLocal8Bit(lightdm_greeter_get_select_user_hint(d->ldmGreeter)); + return QString::fromUtf8(lightdm_greeter_get_select_user_hint(d->ldmGreeter)); } bool Greeter::selectGuestHint() const @@ -214,7 +214,7 @@ bool Greeter::selectGuestHint() const QString Greeter::autologinUserHint() const { Q_D(const Greeter); - return QString::fromLocal8Bit(lightdm_greeter_get_autologin_user_hint(d->ldmGreeter)); + return QString::fromUtf8(lightdm_greeter_get_autologin_user_hint(d->ldmGreeter)); } bool Greeter::autologinGuestHint() const @@ -231,7 +231,7 @@ int Greeter::autologinTimeoutHint() const QString Greeter::hostname() const { - return QString::fromLocal8Bit(lightdm_get_hostname()); + return QString::fromUtf8(lightdm_get_hostname()); } #include "greeter_moc.cpp" diff --git a/liblightdm-qt/sessionsmodel.cpp b/liblightdm-qt/sessionsmodel.cpp index f1cc9505..a43d8d73 100644 --- a/liblightdm-qt/sessionsmodel.cpp +++ b/liblightdm-qt/sessionsmodel.cpp @@ -60,9 +60,9 @@ void SessionsModelPrivate::loadSessions() Q_ASSERT(ldmSession); SessionItem session; - session.key = QString::fromLocal8Bit(lightdm_session_get_key(ldmSession)); - session.name = QString::fromLocal8Bit(lightdm_session_get_name(ldmSession)); - session.comment = QString::fromLocal8Bit(lightdm_session_get_comment(ldmSession)); + session.key = QString::fromUtf8(lightdm_session_get_key(ldmSession)); + session.name = QString::fromUtf8(lightdm_session_get_name(ldmSession)); + session.comment = QString::fromUtf8(lightdm_session_get_comment(ldmSession)); qDebug() << "adding session" << session.key; diff --git a/liblightdm-qt/usersmodel.cpp b/liblightdm-qt/usersmodel.cpp index 187ff0ac..ca57c9ad 100644 --- a/liblightdm-qt/usersmodel.cpp +++ b/liblightdm-qt/usersmodel.cpp @@ -90,12 +90,12 @@ void UsersModelPrivate::loadUsers() LightDMUser *ldmUser = static_cast<LightDMUser*>(item->data); UserItem user; - user.name = QString::fromLocal8Bit(lightdm_user_get_name(ldmUser)); - user.homeDirectory = QString::fromLocal8Bit(lightdm_user_get_home_directory(ldmUser)); - user.realName = QString::fromLocal8Bit(lightdm_user_get_real_name(ldmUser)); - user.image = QString::fromLocal8Bit(lightdm_user_get_image(ldmUser)); - user.background = QString::fromLocal8Bit(lightdm_user_get_background(ldmUser)); - user.session = QString::fromLocal8Bit(lightdm_user_get_session(ldmUser)); + user.name = QString::fromUtf8(lightdm_user_get_name(ldmUser)); + user.homeDirectory = QString::fromUtf8(lightdm_user_get_home_directory(ldmUser)); + user.realName = QString::fromUtf8(lightdm_user_get_real_name(ldmUser)); + user.image = QString::fromUtf8(lightdm_user_get_image(ldmUser)); + user.background = QString::fromUtf8(lightdm_user_get_background(ldmUser)); + user.session = QString::fromUtf8(lightdm_user_get_session(ldmUser)); user.isLoggedIn = lightdm_user_get_logged_in(ldmUser); user.hasMessages = lightdm_user_get_has_messages(ldmUser); users.append(user); @@ -118,11 +118,11 @@ void UsersModelPrivate::cb_userAdded(LightDMUserList *user_list, LightDMUser *ld that->q_func()->beginInsertRows(QModelIndex(), that->users.size(), that->users.size()); UserItem user; - user.name = QString::fromLocal8Bit(lightdm_user_get_name(ldmUser)); - user.homeDirectory = QString::fromLocal8Bit(lightdm_user_get_home_directory(ldmUser)); - user.realName = QString::fromLocal8Bit(lightdm_user_get_real_name(ldmUser)); - user.image = QString::fromLocal8Bit(lightdm_user_get_image(ldmUser)); - user.background = QString::fromLocal8Bit(lightdm_user_get_background(ldmUser)); + user.name = QString::fromUtf8(lightdm_user_get_name(ldmUser)); + user.homeDirectory = QString::fromUtf8(lightdm_user_get_home_directory(ldmUser)); + user.realName = QString::fromUtf8(lightdm_user_get_real_name(ldmUser)); + user.image = QString::fromUtf8(lightdm_user_get_image(ldmUser)); + user.background = QString::fromUtf8(lightdm_user_get_background(ldmUser)); user.isLoggedIn = lightdm_user_get_logged_in(ldmUser); user.hasMessages = lightdm_user_get_has_messages(ldmUser); that->users.append(user); @@ -136,15 +136,15 @@ void UsersModelPrivate::cb_userChanged(LightDMUserList *user_list, LightDMUser * Q_UNUSED(user_list) UsersModelPrivate *that = static_cast<UsersModelPrivate*>(data); - QString userToChange = QString::fromLocal8Bit(lightdm_user_get_name(ldmUser)); + QString userToChange = QString::fromUtf8(lightdm_user_get_name(ldmUser)); for (int i=0;i<that->users.size();i++) { if (that->users[i].name == userToChange) { - that->users[i].homeDirectory = QString::fromLocal8Bit(lightdm_user_get_home_directory(ldmUser)); - that->users[i].realName = QString::fromLocal8Bit(lightdm_user_get_real_name(ldmUser)); - that->users[i].image = QString::fromLocal8Bit(lightdm_user_get_image(ldmUser)); - that->users[i].background = QString::fromLocal8Bit(lightdm_user_get_background(ldmUser)); + that->users[i].homeDirectory = QString::fromUtf8(lightdm_user_get_home_directory(ldmUser)); + that->users[i].realName = QString::fromUtf8(lightdm_user_get_real_name(ldmUser)); + that->users[i].image = QString::fromUtf8(lightdm_user_get_image(ldmUser)); + that->users[i].background = QString::fromUtf8(lightdm_user_get_background(ldmUser)); that->users[i].isLoggedIn = lightdm_user_get_logged_in(ldmUser); that->users[i].hasMessages = lightdm_user_get_has_messages(ldmUser); @@ -161,7 +161,7 @@ void UsersModelPrivate::cb_userRemoved(LightDMUserList *user_list, LightDMUser * Q_UNUSED(user_list) UsersModelPrivate *that = static_cast<UsersModelPrivate*>(data); - QString userToRemove = QString::fromLocal8Bit(lightdm_user_get_name(ldmUser)); + QString userToRemove = QString::fromUtf8(lightdm_user_get_name(ldmUser)); for (int i=0;i<that->users.size();i++) { if (that->users[i].name == userToRemove) { |