aboutsummaryrefslogtreecommitdiff
path: root/libqmenumodel/src/qdbusactiongroup.cpp
diff options
context:
space:
mode:
authorRenato Araujo Oliveira Filho <renato.filho@canonical.com>2012-11-23 15:10:42 +0000
committerTarmac <>2012-11-23 15:10:42 +0000
commit7cfd1a4cececa6a44aaa3c7c6b35f1886808467e (patch)
treece1737ac7431963279409530ca9f6fec7f812eae /libqmenumodel/src/qdbusactiongroup.cpp
parentde8eea63b919b81132895dfe04ed676778c53f6f (diff)
parent5d755f40091afb5e1f2c4db1c7ba75c36e2d4a74 (diff)
downloadqmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.gz
qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.tar.bz2
qmenumodel-7cfd1a4cececa6a44aaa3c7c6b35f1886808467e.zip
Removed QAction dependency from QStateAction.
Exported activate function on QStateAction. Approved by Ugo Riboni, PS Jenkins bot.
Diffstat (limited to 'libqmenumodel/src/qdbusactiongroup.cpp')
-rw-r--r--libqmenumodel/src/qdbusactiongroup.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/libqmenumodel/src/qdbusactiongroup.cpp b/libqmenumodel/src/qdbusactiongroup.cpp
index 756bb76..824b5f0 100644
--- a/libqmenumodel/src/qdbusactiongroup.cpp
+++ b/libqmenumodel/src/qdbusactiongroup.cpp
@@ -104,7 +104,7 @@ bool QDBusActionGroup::hasAction(const QString &name)
QStateAction *QDBusActionGroup::actionImpl(const QString &name)
{
Q_FOREACH(QStateAction *act, this->findChildren<QStateAction*>()) {
- if (act->text() == name) {
+ if (act->name() == name) {
return act;
}
}
@@ -194,7 +194,7 @@ void QDBusActionGroup::setActionGroup(GDBusActionGroup *ag)
void QDBusActionGroup::clear()
{
Q_FOREACH(QStateAction *act, this->findChildren<QStateAction*>()) {
- Q_EMIT actionVanish(act->text());
+ Q_EMIT actionVanish(act->name());
}
if (m_actionGroup != NULL) {