← Back to branch summary

~mir-team/mir/trunk

« back to all changes in this revision

Viewing changes to src/client/mir_connection.h

  • Committer: Tarmac
  • Author(s): Alan Griffiths
  • Date: 2013-04-25 23:50:01 UTC
  • mfrom: (526.2.22 mir1)
  • Revision ID: tarmac-20130425235001-c3b3x2yyb3eldyx1
frontend, shell, tests: surface-states updated to avoid supplying dependencies through public member functions.

Approved by PS Jenkins bot, Chris Halse Rogers, Robert Ancell, Kevin DuBois.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/mir_connection.h
34
34
#include "client_context.h"
35
35
 
36
36
#include "mir_wait_handle.h"
37
 
#include "mir/event_sink.h"
 
37
#include "mir/events/event_sink.h"
38
38
 
39
39
namespace mir
40
40
{
44
44
class Logger;
45
45
class ClientBufferDepository;
46
46
class ClientPlatformFactory;
 
47
class MirBasicRpcChannel;
 
48
 
47
49
namespace input
48
50
{
49
51
class InputPlatform;
51
53
}
52
54
}
53
55
 
54
 
struct MirConnection : public mir::client::ClientContext,
55
 
                       public mir::EventSink
 
56
struct MirConnection : mir::client::ClientContext, private mir::events::EventSink
56
57
{
57
58
public:
58
59
    MirConnection();
59
60
 
60
 
    MirConnection(std::shared_ptr<google::protobuf::RpcChannel> const& channel,
 
61
    MirConnection(std::shared_ptr<mir::client::MirBasicRpcChannel> const& channel,
61
62
                  std::shared_ptr<mir::client::Logger> const & log,
62
63
                  std::shared_ptr<mir::client::ClientPlatformFactory> const& client_platform_factory);
63
64
    ~MirConnection() noexcept;