Differential D9271 Diff 23839 kcms/standard_actions/standard_actions_module.cpp

Changeset View

Standalone View

View Options

kcms/standard_actions/standard_actions_module.cpp

Show First 20 Lines • Show All 127 Lines • ▼ Show 20 Line(s)125 if(!shortcutIdsAdded.contains(shortcutId))
128 action->setWhatsThis(KStandardShortcut::whatsThis(shortcutId)); 128​ action->setWhatsThis(KStandardShortcut::whatsThis(shortcutId));
129 dressUpAction(action, shortcutId); 129​ dressUpAction(action, shortcutId);
130 m_actionCollection->addAction(KStandardShortcut::name(shortcutId), action); 130​ m_actionCollection->addAction(KStandardShortcut::name(shortcutId), action);
131 } 131​ }
132 } 132​ }
133 133​
134 // Hand the collection to the editor 134​ // Hand the collection to the editor
135 m_editor->addCollection(m_actionCollection, i18n("Standard Shortcuts")); 135​ m_editor->addCollection(m_actionCollection, i18n("Standard Shortcuts"));
136​
anthonyfieroniUnsubmitted
Not Done

unrelated

anthonyfieroni: unrelated
136 } 137​ }
davidedmundsonUnsubmitted
Not Done

We've just passed this to
m_editor->addCollection(m_actionCollection,
in the line above...I expect we still need our actionCollection.

Please make sure you test your changes before posting them.

davidedmundson: We've just passed this to m_editor->addCollection(m_actionCollection, in the line above...I…
137 138​
138 139​
139void StandardActionsModule::save() 140​void StandardActionsModule::save()
140 { 141​ {
141 m_editor->commit(); 142​ m_editor->commit();
142 143​
143 Q_FOREACH(QAction* action, m_actionCollection->actions()) 144​ Q_FOREACH(QAction* action, m_actionCollection->actions())
144 { 145​ {
Show All 19 Lines