@@ -48,7 +48,7 @@ void ApplicationMenuRegistry::RegisterAppMenu(pid_t processId,
4848 << ", actionPath=" << actionObjectPath.path()
4949 << ", service=" << service;
5050
51− QMultiMap<pid_t, MenuServicePath*>::iterator i = m_appMenus.find(processId);
51+ auto i = m_appMenus.find(processId);
5252 while (i != m_appMenus.end() && i.key() == processId) {
5353 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
5454 WARNING_MSG << "Already have a menu for application (pid= " << processId
@@ -71,7 +71,7 @@ void ApplicationMenuRegistry::UnregisterAppMenu(pid_t processId, const QDBusObje
7171 DEBUG_MSG << "(pid=" << processId
7272 << ", menuPath=" << menuObjectPath.path();
7373
74− QMultiMap<pid_t, MenuServicePath*>::iterator i = m_appMenus.find(processId);
74+ auto i = m_appMenus.find(processId);
7575 while (i != m_appMenus.end() && i.key() == processId) {
7676 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
7777 i.value()->deleteLater();
@@ -93,7 +93,7 @@ void ApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surfaceId,
9393 << ", actionPath=" << actionObjectPath.path()
9494 << ", service=" << service;
9595
96− QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
96+ auto i = m_surfaceMenus.find(surfaceId);
9797 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
9898 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
9999 WARNING_MSG << "Already have a menu for surface (surfaceId= " << surfaceId
@@ -116,7 +116,7 @@ void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, co
116116 DEBUG_MSG << "(surfaceId=" << surfaceId
117117 << ", menuPath=" << menuObjectPath.path();
118118
119− QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
119+ auto i = m_surfaceMenus.find(surfaceId);
120120 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
121121 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
122122 i.value()->deleteLater();
@@ -128,12 +128,12 @@ void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, co
128128 }
129129}
130130
131−QList<QObject*> ApplicationMenuRegistry::getMenusForSurface(const QString &surfaceId)
131+QList<QObject*> ApplicationMenuRegistry::getMenusForSurface(const QString &surfaceId) const
132132{
133133 QList<QObject*> list;
134134
135− QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
136− while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
135+ auto i = m_surfaceMenus.find(surfaceId);
136+ while (i != m_surfaceMenus.constEnd() && i.key() == surfaceId) {
137137 list << i.value();
138138 ++i;
139139 }