diff options
Diffstat (limited to 'libqmenumodel/src/qmenumodel.cpp')
-rw-r--r-- | libqmenumodel/src/qmenumodel.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp index 5bf740d..7f4c383 100644 --- a/libqmenumodel/src/qmenumodel.cpp +++ b/libqmenumodel/src/qmenumodel.cpp @@ -65,16 +65,15 @@ QMenuModel::~QMenuModel() QVariantMap QMenuModel::get(int row) const { QVariantMap result; - int rowCountValue = rowCount(); - if ((rowCountValue > 0) && (row >= 0) && (row < rowCountValue)) { - QModelIndex i = index(row); - result.insert("action", data(i, Action)); - result.insert("label", data(i, Label)); - result.insert("linkSection", data(i, LinkSection)); - result.insert("linkSubMenu", data(i, LinkSubMenu)); - result.insert("extra", data(i, Extra)); - } + QModelIndex index = this->index(row); + if (index.isValid()) { + QMap<int, QVariant> data = itemData(index); + const QHash<int, QByteArray> roleNames = this->roleNames(); + Q_FOREACH(int i, roleNames.keys()) { + result.insert(roleNames[i], data[i]); + } + } return result; } |