← Back to branch summary

~dandrader/qtmir/coordinateTranslator

~dandrader/qtmir/coordinateTranslator

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/mirserver.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/platforms/mirserver/mirserver.cpp

204

204

return static_cast<PromptSessionListener*>(sharedPtr.get());

205

205

}

206

206

207

MirShell *MirServer::shell()

207

mir::shell::Shell *MirServer::shell()

208

208

{

209

std::weak_ptr<MirShell> m_shell = the_shell();

209

std::weak_ptr<mir::shell::Shell> m_shell = the_shell();

210

210

return m_shell.lock().get();

211

211

}

212

212

Older »