Differential D19913 Diff 80344 src/declarativeimports/plasmacomponents/qmenu.cpp

Changeset View

Standalone View

View Options

src/declarativeimports/plasmacomponents/qmenu.cpp

Show First 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)93 if (action) {
94 action->setMenu(nullptr); 94​ action->setMenu(nullptr);
95 m_menu->clear(); 95​ m_menu->clear();
96 } 96​ }
97 //if parent is a QAction, become a submenu 97​ //if parent is a QAction, become a submenu
98 action = qobject_cast<QAction *>(parent); 98​ action = qobject_cast<QAction *>(parent);
99 if (action) { 99​ if (action) {
100 action->setMenu(m_menu); 100​ action->setMenu(m_menu);
101 m_menu->clear(); 101​ m_menu->clear();
102 foreach (QMenuItem *item, m_items) { 102​ for (QMenuItem *item : qAsConst(m_items)) {
103 if (item->section()) { 103​ if (item->section()) {
104 if (!item->isVisible()) { 104​ if (!item->isVisible()) {
105 continue; 105​ continue;
106 } 106​ }
107 107​
108 m_menu->addSection(item->text()); 108​ m_menu->addSection(item->text());
109 } else { 109​ } else {
110 m_menu->addAction(item->action()); 110​ m_menu->addAction(item->action());
▲ Show 20 Lines • Show All 173 Lines • ▼ Show 20 Line(s)276{
284 284​
285 } 285​ }
286} 286​}
287 287​
288void QMenuProxy::rebuildMenu() 288​void QMenuProxy::rebuildMenu()
289{ 289​{
290 m_menu->clear(); 290​ m_menu->clear();
291 291​
292 foreach (QMenuItem *item, m_items) { 292​ for (QMenuItem *item : qAsConst(m_items)) {
293 if (item->section()) { 293​ if (item->section()) {
294 if (!item->isVisible()) { 294​ if (!item->isVisible()) {
295 continue; 295​ continue;
296 } 296​ }
297 297​
298 m_menu->addSection(item->text()); 298​ m_menu->addSection(item->text());
299 } else { 299​ } else {
300 m_menu->addAction(item->action()); 300​ m_menu->addAction(item->action());
▲ Show 20 Lines • Show All 179 Lines • Show Last 20 Lines