← Back to branch summary

~unity-api-team/hud/test-failures

« back to all changes in this revision

Viewing changes to service/Factory.cpp

  • Committer: Charles Kerr
  • Date: 2014-03-17 17:50:58 UTC
  • mfrom: (376.2.5 hud)
  • Revision ID: charles.kerr@canonical.com-20140317175058-7efcri9kck5j3i0q
bzr merge lp:hud

Show diffs side-by-side

added added

removed removed

Lines of Context:
service/Factory.cpp
88
88
        return m_sessionBus;
89
89
}
90
90
 
91
 
Query::Ptr Factory::newQuery(const QString &query, const QString &sender) {
 
91
Query::Ptr Factory::newQuery(const QString &query, const QString &sender,
 
92
                Query::EmptyBehaviour emptyBehaviour) {
92
93
        return Query::Ptr(
93
 
                        new QueryImpl(m_queryCounter++, query, sender,
 
94
                        new QueryImpl(m_queryCounter++, query, sender, emptyBehaviour,
94
95
                                        *singletonHudService(), singletonApplicationList(),
95
96
                                        singletonVoice(), sessionBus()));
96
97
}
166
167
}
167
168
 
168
169
Collector::Ptr Factory::newGMenuCollector(const QString &name,
169
 
                const QDBusObjectPath &actionPath, const QDBusObjectPath &menuPath) {
170
 
        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));
171
173
}
172
174
 
173
175
Collector::Ptr Factory::newGMenuWindowCollector(unsigned int windowId,