← Back to branch summary

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

« back to all changes in this revision

Viewing changes to service/WindowImpl.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/WindowImpl.cpp
45
45
        return m_tokens;
46
46
}
47
47
 
48
 
void WindowTokenImpl::search(const QString &query, QList<Result> &results) {
49
 
        m_items->search(query, results);
 
48
void WindowTokenImpl::search(const QString &query,
 
49
                Query::EmptyBehaviour emptyBehaviour, QList<Result> &results) {
 
50
        m_items->search(query, emptyBehaviour, results);
50
51
}
51
52
 
52
53
void WindowTokenImpl::execute(unsigned long long commandId) {
94
95
        QList<CollectorToken::Ptr> tokens;
95
96
        for (Collector::Ptr collector : collectors) {
96
97
                if (collector && collector->isValid()) {
97
 
                        CollectorToken::Ptr token(collector->activate());
98
 
                        if (token) {
99
 
                                tokens << token;
100
 
                        }
 
98
                        tokens.append(collector->activate());
101
99
                }
102
100
        }
103
101