← Back to branch summary

~aacid/qtmir/fix_leaks_application_manager_test

~aacid/qtmir/fix_leaks_application_manager_test

« back to all changes in this revision

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

Committer: CI Train Bot
Author(s): Alan Griffiths
Date: 2016-05-20 08:41:29 UTC
mfrom: (484.2.11 qtmir0)
Revision ID: ci-train-bot@canonical.com-20160520084129-co95olzpjkt1z4lh

Reduce coupling to MirServer - it has been misused as a context object.
Approved by: Alan Griffiths, Unity8 CI Bot, Daniel d'Andrada

files modified:
src/modules/Unity/Application/application.cpp

src/modules/Unity/Application/application_manager.cpp

src/modules/Unity/Application/application_manager.h

src/modules/Unity/Application/mirsurface.cpp

src/modules/Unity/Application/mirsurface.h

src/modules/Unity/Application/mirsurfacemanager.cpp

src/modules/Unity/Application/mirsurfacemanager.h

src/platforms/mirserver/miropenglcontext.cpp

src/platforms/mirserver/miropenglcontext.h

src/platforms/mirserver/mirserver.cpp

src/platforms/mirserver/mirserver.h

src/platforms/mirserver/mirserverintegration.cpp

src/platforms/mirserver/nativeinterface.cpp

src/platforms/mirserver/nativeinterface.h

src/platforms/mirserver/offscreensurface.cpp

src/platforms/mirserver/qmirserver_p.cpp

src/platforms/mirserver/qmirserver_p.h

src/platforms/mirserver/surfaceobserver.h

tests/framework/qtmir_test.cpp

tests/framework/qtmir_test.h

Show diffs side-by-side

added added

removed removed

src/modules/Unity/Application/application.cpp

28

28

// QPA mirserver

29

29

#include "logging.h"

30

30

31

// mir

32

#include <mir/scene/session.h>

33

#include <mir/scene/snapshot.h>

34

35

31

// Unity API

36

32

#include <unity/shell/application/MirSurfaceInterface.h>

37

33

38

34

namespace unityapp = unity::shell::application;

39

namespace ms = mir::scene;

40

35

41

36

#define DEBUG_MSG qCDebug(QTMIR_APPLICATIONS).nospace() << "Application[" << appId() <<"]::" << __func__

42

37

Older »