diff options
| author | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-12-03 09:36:59 -0300 |
|---|---|---|
| committer | Renato Araujo Oliveira Filho <renato.filho@canonical.com> | 2012-12-03 09:36:59 -0300 |
| commit | 5c529632253bb8e864b3cc81eaabbd0a423112aa (patch) | |
| tree | 5b8a0afe4655d01714565f6a5fa19b2101931a65 /libqmenumodel/src/qmenumodel.cpp | |
| parent | 15ac92ca2c3a0bfb66288fd270b61891569a9016 (diff) | |
| download | qmenumodel-5c529632253bb8e864b3cc81eaabbd0a423112aa.tar.gz qmenumodel-5c529632253bb8e864b3cc81eaabbd0a423112aa.tar.bz2 qmenumodel-5c529632253bb8e864b3cc81eaabbd0a423112aa.zip | |
Changed getLink function to not be const.
Diffstat (limited to 'libqmenumodel/src/qmenumodel.cpp')
| -rw-r--r-- | libqmenumodel/src/qmenumodel.cpp | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/libqmenumodel/src/qmenumodel.cpp b/libqmenumodel/src/qmenumodel.cpp index b18cc45..51b6863 100644 --- a/libqmenumodel/src/qmenumodel.cpp +++ b/libqmenumodel/src/qmenumodel.cpp @@ -185,11 +185,17 @@ QVariant QMenuModel::data(const QModelIndex &index, int role) const attribute = getStringAttribute(index, G_MENU_ATTRIBUTE_LABEL); break; case LinkSection: - attribute = getLink(index, G_MENU_LINK_SECTION); + { + QMenuModel *self = const_cast<QMenuModel*>(this); + attribute = self->getLink(index, G_MENU_LINK_SECTION); break; + } case LinkSubMenu: - attribute = getLink(index, G_MENU_LINK_SUBMENU); + { + QMenuModel *self = const_cast<QMenuModel*>(this); + attribute = self->getLink(index, G_MENU_LINK_SUBMENU); break; + } case Extra: attribute = getExtraProperties(index); break; @@ -235,7 +241,7 @@ QVariant QMenuModel::getStringAttribute(const QModelIndex &index, /*! \internal */ QVariant QMenuModel::getLink(const QModelIndex &index, - const QString &linkName) const + const QString &linkName) { GMenuModel *link; @@ -254,9 +260,8 @@ QVariant QMenuModel::getLink(const QModelIndex &index, } if (result == 0) { - QMenuModel *self = const_cast<QMenuModel*>(this); - result = new QMenuModel(link, self); - self->m_cache << new CacheData(result, index.row()); + result = new QMenuModel(link, this); + m_cache << new CacheData(result, index.row()); } g_object_unref(link); |