aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/qdbusactiongroup.cpp
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-10-30 13:06:35 +0100
committerRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-10-30 13:06:35 +0100
commitfac3a657a39bb9c3e9fa3c0b3ff22533b2e7e3ba (patch)
treeccd8ebede33d7d8b7385b7d67c4ad172dc6d0607 /libqmenumodel/src/qdbusactiongroup.cpp
parentfd715d4758a1ebf92c30b7194af39fd7e924a473 (diff)
parent035b6086485dcd3b42abc5d1fab2b155ccd16027 (diff)
downloadqmenumodel-fac3a657a39bb9c3e9fa3c0b3ff22533b2e7e3ba.tar.gz
qmenumodel-fac3a657a39bb9c3e9fa3c0b3ff22533b2e7e3ba.tar.bz2
qmenumodel-fac3a657a39bb9c3e9fa3c0b3ff22533b2e7e3ba.zip
Used utf8 instead of latin1 for strings.
Diffstat (limited to 'libqmenumodel/src/qdbusactiongroup.cpp')
-rw-r--r--libqmenumodel/src/qdbusactiongroup.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp
index 6d3515a..756bb76 100644
--- a/libqmenumodel/src/qdbusactiongroup.cpp
+++ b/libqmenumodel/src/qdbusactiongroup.cpp
@@ -83,7 +83,7 @@ QStateAction *QDBusActionGroup::action(const QString &name)
QVariant QDBusActionGroup::actionState(const QString &name)
{
QVariant result;
- GVariant *state = g_action_group_get_action_state(m_actionGroup, name.toLatin1());
+ GVariant *state = g_action_group_get_action_state(m_actionGroup, name.toUtf8().data());
result = Converter::toQVariant(state);
if (state) {
g_variant_unref(state);
@@ -95,7 +95,7 @@ QVariant QDBusActionGroup::actionState(const QString &name)
bool QDBusActionGroup::hasAction(const QString &name)
{
if (m_actionGroup) {
- return g_action_group_has_action(m_actionGroup, name.toLatin1());
+ return g_action_group_has_action(m_actionGroup, name.toUtf8().data());
} else {
return false;
}
@@ -121,8 +121,8 @@ void QDBusActionGroup::serviceVanish(GDBusConnection *)
void QDBusActionGroup::serviceAppear(GDBusConnection *connection)
{
GDBusActionGroup *ag = g_dbus_action_group_get(connection,
- busName().toLatin1(),
- objectPath().toLatin1());
+ busName().toUtf8().data(),
+ objectPath().toUtf8().data());
setActionGroup(ag);
if (ag == NULL) {
stop();
@@ -160,7 +160,7 @@ void QDBusActionGroup::setActionGroup(GDBusActionGroup *ag)
g_signal_handler_disconnect(m_actionGroup, m_signalActionAddId);
g_signal_handler_disconnect(m_actionGroup, m_signalActionRemovedId);
g_signal_handler_disconnect(m_actionGroup, m_signalStateChangedId);
- m_signalActionAddId = m_signalActionRemovedId = m_signalStateChangedId = 0;
+ m_signalActionAddId = m_signalActionRemovedId = m_signalStateChangedId = 0;
clear();
}
@@ -207,14 +207,14 @@ void QDBusActionGroup::clear()
void QDBusActionGroup::updateActionState(const QString &name, const QVariant &state)
{
if (m_actionGroup != NULL) {
- g_action_group_change_action_state(m_actionGroup, name.toLatin1(), Converter::toGVariant(state));
+ g_action_group_change_action_state(m_actionGroup, name.toUtf8().data(), Converter::toGVariant(state));
}
}
void QDBusActionGroup::activateAction(const QString &name, const QVariant &parameter)
{
if (m_actionGroup != NULL) {
- g_action_group_activate_action(m_actionGroup, name.toLatin1(), Converter::toGVariant(parameter));
+ g_action_group_activate_action(m_actionGroup, name.toUtf8().data(), Converter::toGVariant(parameter));
}
}