← Back to branch summary

~pete-woods/hud/tweak-search-parameters

« back to all changes in this revision

Viewing changes to service/HudServiceImpl.cpp

  • Committer: Pete Woods
  • Date: 2014-02-18 13:35:12 UTC
  • Revision ID: pete.woods@canonical.com-20140218133512-bnrkd5sbd2jr6fpo
Make legacy queries return no results with an empty search string

Show diffs side-by-side

added added

removed removed

Lines of Context:
service/HudServiceImpl.cpp
62
62
}
63
63
 
64
64
Query::Ptr HudServiceImpl::createQuery(const QString &query,
65
 
                const QString &sender) {
66
 
        Query::Ptr hudQuery(m_factory.newQuery(query, sender));
 
65
                const QString &sender, Query::EmptyBehaviour emptyBehaviour) {
 
66
        Query::Ptr hudQuery(m_factory.newQuery(query, sender, emptyBehaviour));
67
67
        m_queries[hudQuery->path()] = hudQuery;
68
68
 
69
69
        return hudQuery;
73
73
                QString &resultsName, QString &appstackName, int &modelRevision) {
74
74
        QString sender(messageSender());
75
75
 
76
 
        Query::Ptr hudQuery(createQuery(query, sender));
 
76
        Query::Ptr hudQuery(
 
77
                        createQuery(query, sender,
 
78
                                        Query::EmptyBehaviour::SHOW_SUGGESTIONS));
77
79
 
78
80
        resultsName = hudQuery->resultsModel();
79
81
        appstackName = hudQuery->appstackModel();
104
106
 
105
107
        Query::Ptr query(m_legacyQueries[sender]);
106
108
        if (query.isNull()) {
107
 
                query = createQuery(queryString, sender);
 
109
                query = createQuery(queryString, sender,
 
110
                                Query::EmptyBehaviour::NO_SUGGESTIONS);
108
111
                m_legacyQueries[sender] = query;
109
112
        } else {
110
113
                query->UpdateQuery(queryString);