@@ -48,7 +48,7 @@ void ApplicationMenuRegistry::RegisterAppMenu(pid_t processId,
48 << ", actionPath=" << actionObjectPath.path()
48 << ", actionPath=" << actionObjectPath.path()
49 << ", service=" << service;
49 << ", service=" << service;
51− QMultiMap<pid_t, MenuServicePath*>::iterator i = m_appMenus.find(processId);
51+ auto i = m_appMenus.find(processId);
52 while (i != m_appMenus.end() && i.key() == processId) {
52 while (i != m_appMenus.end() && i.key() == processId) {
53 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
53 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
54 WARNING_MSG << "Already have a menu for application (pid= " << processId
54 WARNING_MSG << "Already have a menu for application (pid= " << processId
@@ -71,7 +71,7 @@ void ApplicationMenuRegistry::UnregisterAppMenu(pid_t processId, const QDBusObje
71 DEBUG_MSG << "(pid=" << processId
71 DEBUG_MSG << "(pid=" << processId
72 << ", menuPath=" << menuObjectPath.path();
72 << ", menuPath=" << menuObjectPath.path();
74− QMultiMap<pid_t, MenuServicePath*>::iterator i = m_appMenus.find(processId);
74+ auto i = m_appMenus.find(processId);
75 while (i != m_appMenus.end() && i.key() == processId) {
75 while (i != m_appMenus.end() && i.key() == processId) {
76 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
76 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
77 i.value()->deleteLater();
77 i.value()->deleteLater();
@@ -93,7 +93,7 @@ void ApplicationMenuRegistry::RegisterSurfaceMenu(const QString &surfaceId,
93 << ", actionPath=" << actionObjectPath.path()
93 << ", actionPath=" << actionObjectPath.path()
94 << ", service=" << service;
94 << ", service=" << service;
96− QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
96+ auto i = m_surfaceMenus.find(surfaceId);
97 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
97 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
98 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
98 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
99 WARNING_MSG << "Already have a menu for surface (surfaceId= " << surfaceId
99 WARNING_MSG << "Already have a menu for surface (surfaceId= " << surfaceId
@@ -116,7 +116,7 @@ void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, co
116 DEBUG_MSG << "(surfaceId=" << surfaceId
116 DEBUG_MSG << "(surfaceId=" << surfaceId
117 << ", menuPath=" << menuObjectPath.path();
117 << ", menuPath=" << menuObjectPath.path();
119− QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
119+ auto i = m_surfaceMenus.find(surfaceId);
120 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
120 while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
121 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
121 if (i.value()->m_menuPath == menuObjectPath.path().toUtf8()) {
122 i.value()->deleteLater();
122 i.value()->deleteLater();
@@ -128,12 +128,12 @@ void ApplicationMenuRegistry::UnregisterSurfaceMenu(const QString &surfaceId, co
131−QList<QObject*> ApplicationMenuRegistry::getMenusForSurface(const QString &surfaceId)
131+QList<QObject*> ApplicationMenuRegistry::getMenusForSurface(const QString &surfaceId) const
133 QList<QObject*> list;
133 QList<QObject*> list;
135− QMultiMap<QString, MenuServicePath*>::iterator i = m_surfaceMenus.find(surfaceId);
135+ auto i = m_surfaceMenus.find(surfaceId);
136− while (i != m_surfaceMenus.end() && i.key() == surfaceId) {
136+ while (i != m_surfaceMenus.constEnd() && i.key() == surfaceId) {
137 list << i.value();
137 list << i.value();