← Back to branch summary

~stolowski/+junk/logintoaccount

« back to all changes in this revision

Viewing changes to src/Unity/scope.h

  • Committer: CI Train Bot
  • Author(s): Pawel Stolowski
  • Date: 2015-08-10 12:02:35 UTC
  • mfrom: (226.2.12 activation-fix)
  • Revision ID: ci-train-bot@canonical.com-20150810120235-acjrnnfzqogw7t4y
Implemented special casing for activation and previews (and removed it from unity8) and respect intercept_activation flag. Fixes: #1428063

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/Unity/scope.h
145
145
    void setActive(const bool) override;
146
146
    void setFavorite(const bool) override;
147
147
 
148
 
    Q_INVOKABLE void activate(QVariant const& result) override;
149
 
    Q_INVOKABLE unity::shell::scopes::PreviewStackInterface* preview(QVariant const& result) override;
 
148
    Q_INVOKABLE void activate(QVariant const& result, QString const& categoryId) override;
 
149
    Q_INVOKABLE unity::shell::scopes::PreviewStackInterface* preview(QVariant const& result, QString const& categoryId) override;
150
150
    Q_INVOKABLE void cancelActivation() override;
151
151
    Q_INVOKABLE void closeScope(unity::shell::scopes::ScopeInterface* scope) override;
152
152
    Q_INVOKABLE unity::shell::scopes::NavigationInterface* getNavigation(QString const& id) override;