~dandrader/qtmir/coordinateTranslator

Viewing changes to src/platforms/mirserver/mirserver.h

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.h

class MirDisplayConfigurationPolicy;

class SessionListener;

class SessionAuthorizer;

using MirShell = mir::shell::Shell;

class PromptSessionListener;

class ScreensModel;

class MirWindowManager;

Q_PROPERTY(SessionAuthorizer* sessionAuthorizer READ sessionAuthorizer CONSTANT)

Q_PROPERTY(SessionListener* sessionListener READ sessionListener CONSTANT)

Q_PROPERTY(MirShell* shell READ shell CONSTANT)

Q_PROPERTY(mir::shell::Shell* shell READ shell CONSTANT)

Q_PROPERTY(PromptSessionListener* promptSessionListener READ promptSessionListener CONSTANT)

public:

/* mir specific */

using mir::Server::run;

using mir::Server::the_compositor;

using mir::Server::the_display;

using mir::Server::the_display_configuration_controller;

using mir::Server::the_gl_config;

using mir::Server::the_main_loop;

using mir::Server::the_prompt_session_listener;

using mir::Server::the_prompt_session_manager;

using mir::Server::the_session_authorizer;

using mir::Server::the_session_listener;

void stop();

SessionListener *sessionListener();

PromptSessionListener *promptSessionListener();

MirWindowManager *windowManager();

MirShell *shell();

mir::shell::Shell *shell();

private:

std::weak_ptr<MirShell> m_shell;

std::weak_ptr<MirWindowManager> m_windowManager;

const QSharedPointer<ScreensModel> m_screensModel;

};

Older »