← Back to branch summary

~mir-team/qtmir/mir-0.16-rebuild

« back to all changes in this revision

Viewing changes to src/platforms/mirserver/sessionlistener.cpp

  • Committer: Daniel d'Andrada
  • Date: 2014-12-10 10:33:48 UTC
  • mto: This revision was merged to the branch mainline in revision 294.
  • Revision ID: daniel.dandrada@canonical.com-20141210103348-mn2kmwtxxo0y8yyw
removed :PATH from command line

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/platforms/mirserver/sessionlistener.cpp
15
15
 */
16
16
 
17
17
#include "sessionlistener.h"
18
 
#include "surfaceobserver.h"
19
18
#include "logging.h"
20
19
#include "tracepoints.h" // generated from tracepoints.tp
21
20
 
22
 
#include <mir/scene/surface.h>
23
 
 
24
21
namespace ms = mir::scene;
25
22
 
26
23
Q_DECLARE_METATYPE(std::shared_ptr<ms::Session>)
33
30
    // need to register type to send over threads with signal/slot
34
31
    qRegisterMetaType<std::shared_ptr<ms::Session>>("std::shared_ptr<mir::scene::Session>");
35
32
    qRegisterMetaType<std::shared_ptr<ms::Surface>>("std::shared_ptr<mir::scene::Surface>");
36
 
    qRegisterMetaType<std::shared_ptr<SurfaceObserver>>("std::shared_ptr<SurfaceObserver>");
37
33
}
38
34
 
39
35
SessionListener::~SessionListener()
72
68
    tracepoint(qtmirserver, surfaceCreated);
73
69
    qCDebug(QTMIR_MIR_MESSAGES) << "SessionListener::surface_created - this=" << this << "session=" << &session
74
70
                                   << "surface=" << surface.get();
75
 
    std::shared_ptr<SurfaceObserver> surfaceObserver = std::make_shared<SurfaceObserver>();
76
 
    surface->add_observer(surfaceObserver);
77
 
    Q_EMIT sessionCreatedSurface(&session, surface, surfaceObserver);
 
71
    Q_EMIT sessionCreatedSurface(&session, surface);
78
72
}
79
73
 
80
74
void SessionListener::destroying_surface(ms::Session& session, std::shared_ptr<ms::Surface> const& surface)