~mzanetti/+junk/unity-mir-merged

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/application.h

  • Committer: Michael Zanetti
  • Date: 2014-02-20 11:11:52 UTC
  • mfrom: (158.2.22 unity-mir)
  • Revision ID: michael.zanetti@canonical.com-20140220111152-aaxu2ojwz1y5ca0z
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
20
20
// std
21
21
#include <memory>
22
22
 
23
 
// Mir
24
 
#include <mir/shell/snapshot.h>
25
 
 
26
23
//Qt
27
24
#include <QtCore/QtCore>
28
25
#include <QImage>
 
26
#include <QSharedPointer>
29
27
 
30
28
// Unity API
31
29
#include <unity/shell/application/ApplicationInfoInterface.h>
43
41
    Q_PROPERTY(Stage stage READ stage WRITE setStage NOTIFY stageChanged)
44
42
 
45
43
public:
46
 
    Application(const QString &appId, State state, const QStringList &arguments, QObject *parent = 0);
47
 
    Application(DesktopFileReader *desktopFileReader, State state, const QStringList &arguments, QObject *parent = 0);
 
44
    Application(const QSharedPointer<TaskController>& taskController,
 
45
                DesktopFileReader *desktopFileReader,
 
46
                State state,
 
47
                const QStringList &arguments,
 
48
                QObject *parent = 0);
48
49
    virtual ~Application();
49
50
 
50
51
    // ApplicationInfoInterface
86
87
    void setSession(const std::shared_ptr<mir::shell::Session>& session);
87
88
    void setSessionName(const QString& name);
88
89
 
 
90
    QSharedPointer<TaskController> m_taskController;
89
91
    DesktopFileReader* m_desktopData;
90
92
    qint64 m_pid;
91
93
    Stage m_stage;