Merge lp:~mardy/qmenumodel/root-index into lp:~phablet-team/qmenumodel/trunk

[Alberto Mardegan]

Use invalid index as root index

When emitting the rowsInserted signal for top-level items, use an invalid
QModelIndex as parent.

Use invalid index as root index

When emitting the rowsInserted signal for top-level items, use an invalid
QModelIndex as parent.
This change is needed by the Ubuntu System Settings project.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/3/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-raring-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-raring-armhf-ci/3

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qmenumodel-ci/3/rebuild

review: Approve (continuous-integration)

[Mathieu Trudel-Lapierre (cyphermox)]

Seems fine, but you'd know better. It would be preferable to get another review from others involved directly in qmenumodel..

review: Abstain

[Renato Araujo Oliveira Filho (renatofilho)]

Looks good.
Could you install this on device and check if messaging menu still working?

is not a big deal but could you follow the code style:

if (node == m_root) {
    return QModelIndex();
}
return createIndex(node->position(), 0, node);

[lp:~mardy/qmenumodel/root-index]

69. By Alberto Mardegan on 2013-05-23

style

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:69
http://jenkins.qa.ubuntu.com/job/qmenumodel-ci/4/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-amd64-ci/1
    SUCCESS: http://jenkins.qa.ubuntu.com/job/qmenumodel-saucy-armhf-ci/1

Click here to trigger a rebuild:
http://s-jenkins:8080/job/qmenumodel-ci/4/rebuild

review: Approve (continuous-integration)

[Alberto Mardegan (mardy)]

Hi Renato, I fixed the coding style, and tried the package on my device: the messaging menu still works as before. :-)

[Renato Araujo Oliveira Filho (renatofilho)]

Thanks for the fix.

review: Approve

=== modified file 'libqmenumodel/src/qmenumodel.cpp'
--- libqmenumodel/src/qmenumodel.cpp	2013-01-10 18:54:35 +0000
+++ libqmenumodel/src/qmenumodel.cpp	2013-05-23 08:46:26 +0000
@@ -252,6 +252,9 @@
 /*! \internal */
 QModelIndex QMenuModel::indexFromNode(MenuNode *node) const
 {
+    if (node == m_root) {
+        return QModelIndex();
+    }
     return createIndex(node->position(), 0, node);
 }