← Back to branch summary

~ted/hud/filter-underscores

« back to all changes in this revision

Viewing changes to service/Factory.cpp

  • Committer: CI bot
  • Author(s): Pete Woods
  • Date: 2014-03-14 16:37:28 UTC
  • mfrom: (376.1.22 trunk)
  • Revision ID: ps-jenkins@lists.canonical.com-20140314163728-lnn0hb4vmsb016ya
Support multiple GMenuCollectors for each window, and multiple QtGActionGroups for each QtGMenuModel. Fixes: 1288025

Show diffs side-by-side

added added

removed removed

Lines of Context:
service/Factory.cpp
167
167
}
168
168
 
169
169
Collector::Ptr Factory::newGMenuCollector(const QString &name,
170
 
                const QDBusObjectPath &actionPath, const QDBusObjectPath &menuPath) {
171
 
        return Collector::Ptr(new GMenuCollector(name, actionPath, menuPath));
 
170
                const QMap<QString, QDBusObjectPath> &actions,
 
171
                const QDBusObjectPath &menuPath) {
 
172
        return Collector::Ptr(new GMenuCollector(name, actions, menuPath));
172
173
}
173
174
 
174
175
Collector::Ptr Factory::newGMenuWindowCollector(unsigned int windowId,