aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--libqmenumodel/src/unitymenumodel.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index 70649c9..a7040ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
qmenumodel (0.2.12) UNRELEASED; urgency=medium
[ Albert Astals Cid ]
- * Add UnityMenuModel::aboutToShow
+ * Add UnityMenuModel::aboutToShow ((LP: 1664578)
-- Albert Astals Cid <albert.astals@canonical.com> Tue, 07 Mar 2017 13:08:46 +0100
diff --git a/libqmenumodel/src/unitymenumodel.cpp b/libqmenumodel/src/unitymenumodel.cpp
index ebadaf7..43fe1b3 100644
--- a/libqmenumodel/src/unitymenumodel.cpp
+++ b/libqmenumodel/src/unitymenumodel.cpp
@@ -736,7 +736,7 @@ void UnityMenuModel::aboutToShow(int index)
return;
}
- GtkMenuTrackerItem *item = (GtkMenuTrackerItem *) g_sequence_get (it);
+ auto item = static_cast<GtkMenuTrackerItem*>(g_sequence_get(it));
if (!item) {
return;
}
@@ -746,7 +746,7 @@ void UnityMenuModel::aboutToShow(int index)
// Child UnityMenuModel have priv->connection null, so climb to the parent until we find a non null one
UnityMenuModelPrivate *privToUse = priv;
while (privToUse && !privToUse->connection) {
- UnityMenuModel *pModel = dynamic_cast<UnityMenuModel*>(privToUse->model->QObject::parent());
+ auto pModel = dynamic_cast<UnityMenuModel*>(privToUse->model->QObject::parent());
if (pModel) {
privToUse = pModel->priv;
} else {