← Back to branch summary

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

« back to all changes in this revision

Viewing changes to service/GMenuCollector.h

  • 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/GMenuCollector.h
39
39
public:
40
40
        typedef std::shared_ptr<GMenuCollector> Ptr;
41
41
 
42
 
        GMenuCollector(const QString &name, const QDBusObjectPath &actionPath,
 
42
        GMenuCollector(const QString &name,
 
43
                        const QMap<QString, QDBusObjectPath> &actions,
43
44
                        const QDBusObjectPath &menuPath);
44
45
 
45
46
        virtual ~GMenuCollector();
46
47
 
47
48
        virtual bool isValid() const override;
48
49
 
49
 
        virtual CollectorToken::Ptr activate() override;
 
50
        virtual QList<CollectorToken::Ptr> activate() override;
50
51
 
51
52
protected Q_SLOTS:
52
53
        void menuItemsChanged();
58
59
 
59
60
        QString m_name;
60
61
 
61
 
        QDBusObjectPath m_actionPath;
 
62
        QMap<QString, QDBusObjectPath> m_actions;
62
63
 
63
64
        QDBusObjectPath m_menuPath;
64
65