~unity-system-compositor-team/unity-system-compositor/trunk

Viewing changes to src/system_compositor.h

Committer: Tarmac
Author(s): Alexandros Frantzis
Date: 2015-04-28 06:59:14 UTC
mfrom: (203.2.7 powerd-mediator)
Revision ID: tarmac-20150428065914-y1hs68oib8m0nzpy

Reimplement PowerdMediator without Qt. Fixes: https://bugs.launchpad.net/bugs/1389187.

Approved by Alberto Aguirre, PS Jenkins bot.

files added:
tests/integration-tests/test_powerd_mediator.cpp

tests/unit-tests/fake_shared.h

files removed:
src/dbus_screen.cpp

src/dbus_screen.h

src/worker_thread.cpp

src/worker_thread.h

files modified:
CMakeLists.txt

debian/control

src/CMakeLists.txt

src/powerd_mediator.cpp

src/powerd_mediator.h

src/screen_event_handler.cpp

src/screen_event_handler.h

src/server.cpp

src/server.h

src/system_compositor.cpp

src/system_compositor.h

tests/integration-tests/CMakeLists.txt

tests/unit-tests/test_screen_event_handler.cpp

Show diffs side-by-side

added added

removed removed

src/system_compositor.h

#include <memory>

namespace mir

{

namespace input

{

class EventFilter;

}

namespace usc

{

class DMConnection;

class Spinner;

class ScreenEventHandler;

class MirScreen;

class Screen;

class UnityScreenService;

class SystemCompositor

{

void run();

private:

void qt_main();

std::shared_ptr<Server> const server;

std::shared_ptr<DMConnection> dm_connection;

std::shared_ptr<Spinner> const spinner;

std::shared_ptr<MirScreen> mir_screen;

std::shared_ptr<ScreenEventHandler> screen_event_handler;

std::shared_ptr<Screen> screen;

std::shared_ptr<mir::input::EventFilter> screen_event_handler;

std::shared_ptr<UnityScreenService> unity_screen_service;

};

}

Older »