← Back to branch summary

~mir-team/qtmir/compatibility-with-mir-API-changes

« back to all changes in this revision

Viewing changes to src/modules/Unity/Application/application_manager.cpp

  • Committer: Robert Carr
  • Date: 2015-02-02 15:22:58 UTC
  • mfrom: (266.1.43 qtmir)
  • Revision ID: racarr@ocelot-20150202152258-mwpui9t69jr3liyl
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/Unity/Application/application_manager.cpp
20
20
#include "desktopfilereader.h"
21
21
#include "dbuswindowstack.h"
22
22
#include "session.h"
 
23
#include "sharedwakelock.h"
23
24
#include "proc_info.h"
24
25
#include "taskcontroller.h"
25
26
#include "upstart/applicationcontroller.h"
150
151
    QSharedPointer<TaskController> taskController(new TaskController(nullptr, appController));
151
152
    QSharedPointer<DesktopFileReader::Factory> fileReaderFactory(new DesktopFileReader::Factory());
152
153
    QSharedPointer<ProcInfo> procInfo(new ProcInfo());
 
154
    QSharedPointer<SharedWakelock> sharedWakelock(new SharedWakelock);
153
155
 
154
156
    // FIXME: We should use a QSharedPointer to wrap this ApplicationManager object, which requires us
155
157
    // to use the data() method to pass the raw pointer to the QML engine. However the QML engine appears
159
161
    ApplicationManager* appManager = new ApplicationManager(
160
162
                                             mirServer,
161
163
                                             taskController,
 
164
                                             sharedWakelock,
162
165
                                             fileReaderFactory,
163
166
                                             procInfo
164
167
                                         );
193
196
ApplicationManager::ApplicationManager(
194
197
        const QSharedPointer<MirServer>& mirServer,
195
198
        const QSharedPointer<TaskController>& taskController,
 
199
        const QSharedPointer<SharedWakelock>& sharedWakelock,
196
200
        const QSharedPointer<DesktopFileReader::Factory>& desktopFileReaderFactory,
197
201
        const QSharedPointer<ProcInfo>& procInfo,
198
202
        QObject *parent)
206
210
    , m_taskController(taskController)
207
211
    , m_desktopFileReaderFactory(desktopFileReaderFactory)
208
212
    , m_procInfo(procInfo)
 
213
    , m_sharedWakelock(sharedWakelock)
209
214
    , m_suspended(false)
210
215
    , m_forceDashActive(false)
211
216
{
493
498
    } else {
494
499
        application = new Application(
495
500
                    m_taskController,
 
501
                    m_sharedWakelock,
496
502
                    m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
497
503
                    Application::Starting,
498
504
                    arguments,
522
528
    if (!application) { // then shell did not start this application, so ubuntu-app-launch must have - add to list
523
529
        application = new Application(
524
530
                    m_taskController,
 
531
                    m_sharedWakelock,
525
532
                    m_desktopFileReaderFactory->createInstance(appId, m_taskController->findDesktopFileForAppId(appId)),
526
533
                    Application::Starting,
527
534
                    QStringList(),
796
803
    QStringList arguments(info->asStringList());
797
804
    application = new Application(
798
805
        m_taskController,
 
806
        m_sharedWakelock,
799
807
        desktopData,
800
808
        Application::Starting,
801
809
        arguments,