1
=== modified file 'src/platforms/mirserver/mirserverhooks.cpp'
2
--- src/platforms/mirserver/mirserverhooks.cpp	2017-03-13 16:49:49 +0000
3
+++ src/platforms/mirserver/mirserverhooks.cpp	2017-03-30 09:15:23 +0000
4
@@ -70,11 +70,11 @@
5
70
70
6
71
struct qtmir::MirServerHooks::Self
71
struct qtmir::MirServerHooks::Self
7
72
{
72
{
13
73
    std::weak_ptr<PromptSessionListener> m_promptSessionListener;
73
    std::shared_ptr<PromptSessionListener> m_promptSessionListener;
14
74
    std::weak_ptr<mir::graphics::Display> m_mirDisplay;
74
    std::shared_ptr<mir::graphics::Display> m_mirDisplay;
15
75
    std::weak_ptr<mir::shell::DisplayConfigurationController> m_mirDisplayConfigurationController;
75
    std::shared_ptr<mir::shell::DisplayConfigurationController> m_mirDisplayConfigurationController;
16
76
    std::weak_ptr<mir::scene::PromptSessionManager> m_mirPromptSessionManager;
76
    std::shared_ptr<mir::scene::PromptSessionManager> m_mirPromptSessionManager;
17
77
    std::weak_ptr<mir::input::InputDeviceHub> m_inputDeviceHub;
77
    std::shared_ptr<mir::input::InputDeviceHub> m_inputDeviceHub;
18
78
};
78
};
19
79
79
20
80
qtmir::MirServerHooks::MirServerHooks() :
80
qtmir::MirServerHooks::MirServerHooks() :
21
@@ -104,36 +104,44 @@
22
104
            self->m_mirPromptSessionManager = server.the_prompt_session_manager();
104
            self->m_mirPromptSessionManager = server.the_prompt_session_manager();
23
105
            self->m_inputDeviceHub = server.the_input_device_hub();
105
            self->m_inputDeviceHub = server.the_input_device_hub();
24
106
        });
106
        });
25
107
26
108
    server.add_stop_callback([this]
27
109
        {
28
110
            self->m_mirDisplay.reset();
29
111
            self->m_mirDisplayConfigurationController.reset();
30
112
            self->m_mirPromptSessionManager.reset();
31
113
            self->m_inputDeviceHub.reset();
32
114
        });
33
107
}
115
}
34
108
116
35
109
PromptSessionListener *qtmir::MirServerHooks::promptSessionListener() const
117
PromptSessionListener *qtmir::MirServerHooks::promptSessionListener() const
36
110
{
118
{
39
111
    if (auto result = self->m_promptSessionListener.lock())
119
    if (self->m_promptSessionListener)
40
112
        return result.get();
120
        return self->m_promptSessionListener.get();
41
113
121
42
114
    throw std::logic_error("No prompt session listener available. Server not running?");
122
    throw std::logic_error("No prompt session listener available. Server not running?");
43
115
}
123
}
44
116
124
45
117
std::shared_ptr<mir::scene::PromptSessionManager> qtmir::MirServerHooks::thePromptSessionManager() const
125
std::shared_ptr<mir::scene::PromptSessionManager> qtmir::MirServerHooks::thePromptSessionManager() const
46
118
{
126
{
49
119
    if (auto result = self->m_mirPromptSessionManager.lock())
127
    if (self->m_mirPromptSessionManager)
50
120
        return result;
128
        return self->m_mirPromptSessionManager;
51
121
129
52
122
    throw std::logic_error("No prompt session manager available. Server not running?");
130
    throw std::logic_error("No prompt session manager available. Server not running?");
53
123
}
131
}
54
124
132
55
125
std::shared_ptr<mir::graphics::Display> qtmir::MirServerHooks::theMirDisplay() const
133
std::shared_ptr<mir::graphics::Display> qtmir::MirServerHooks::theMirDisplay() const
56
126
{
134
{
59
127
    if (auto result = self->m_mirDisplay.lock())
135
    if (self->m_mirDisplay)
60
128
        return result;
136
        return self->m_mirDisplay;
61
129
137
62
130
    throw std::logic_error("No display available. Server not running?");
138
    throw std::logic_error("No display available. Server not running?");
63
131
}
139
}
64
132
140
65
133
std::shared_ptr<mir::input::InputDeviceHub> qtmir::MirServerHooks::theInputDeviceHub() const
141
std::shared_ptr<mir::input::InputDeviceHub> qtmir::MirServerHooks::theInputDeviceHub() const
66
134
{
142
{
69
135
    if (auto result = self->m_inputDeviceHub.lock())
143
    if (self->m_inputDeviceHub)
70
136
        return result;
144
        return self->m_inputDeviceHub;
71
137
145
72
138
    throw std::logic_error("No input device hub available. Server not running?");
146
    throw std::logic_error("No input device hub available. Server not running?");
73
139
}
147
}
74
@@ -141,7 +149,7 @@
75
141
QSharedPointer<ScreensController> qtmir::MirServerHooks::createScreensController(QSharedPointer<ScreensModel> const &screensModel) const
149
QSharedPointer<ScreensController> qtmir::MirServerHooks::createScreensController(QSharedPointer<ScreensModel> const &screensModel) const
76
142
{
150
{
77
143
    return QSharedPointer<ScreensController>(
151
    return QSharedPointer<ScreensController>(
79
144
        new ScreensController(screensModel, theMirDisplay(), self->m_mirDisplayConfigurationController.lock()));
152
        new ScreensController(screensModel, theMirDisplay(), self->m_mirDisplayConfigurationController));
80
145
}
153
}
81
146
154
82
147
void qtmir::MirServerHooks::createInputDeviceObserver()
155
void qtmir::MirServerHooks::createInputDeviceObserver()
Status:	Needs review
Proposed branch:	lp:~andreas-pokorny/qtmir/keep-mir-types-alive
Merge into:	lp:qtmir
Diff against target:	82 lines (+22/-14) 1 file modified src/platforms/mirserver/mirserverhooks.cpp (+22/-14)
To merge this branch:	bzr merge lp:~andreas-pokorny/qtmir/keep-mir-types-alive
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Alan Griffiths		2017-03-30	Disapprove on 2017-04-04
Unity8 CI Bot (community)	continuous-integration		Approve on 2017-03-30
Review via email: mp+321427@code.launchpad.net