In src/platforms/mirserver/display.cpp:
""" -Display::Display(const QSharedPointer<MirServer> &server, QObject *parent) - : QObject(parent) - , m_mirServer(server) +Display::Display(const QSharedPointer<MirServer> &server) { - std::shared_ptr<mir::graphics::DisplayConfiguration> displayConfig = m_mirServer->the_display()->configuration(); + std::shared_ptr<mir::graphics::DisplayConfiguration> displayConfig = server->the_display()->configuration(); """
I think you could go further and pass the display config already in the constructor instead of the whole server since that's the only thing Display is interested in after all.
-------------------------
In src/platforms/mirserver/miropenglcontext.cpp:
""" MirOpenGLContext::MirOpenGLContext(const QSharedPointer<MirServer> &server, const QSurfaceFormat &format) - : m_mirServer(server) #if GL_DEBUG - , m_logger(new QOpenGLDebugLogger(this)) + : m_logger(new QOpenGLDebugLogger(this)) #endif { - std::shared_ptr<mir::graphics::Display> display = m_mirServer->the_display(); + std::shared_ptr<mir::graphics::Display> display = server->the_display(); """
Likewise here.
« Back to merge proposal
In src/platforms/ mirserver/ display. cpp:
""" :Display( const QSharedPointer< MirServer> &server, QObject *parent) :Display( const QSharedPointer< MirServer> &server) ptr<mir: :graphics: :DisplayConfigu ration> displayConfig = m_mirServer- >the_display( )->configuratio n(); ptr<mir: :graphics: :DisplayConfigu ration> displayConfig = server- >the_display( )->configuratio n();
-Display:
- : QObject(parent)
- , m_mirServer(server)
+Display:
{
- std::shared_
+ std::shared_
"""
I think you could go further and pass the display config already in the constructor instead of the whole server since that's the only thing Display is interested in after all.
------- ------- ------- ----
In src/platforms/ mirserver/ miropenglcontex t.cpp:
""" xt::MirOpenGLCo ntext(const QSharedPointer< MirServer> &server, const QSurfaceFormat &format) ger(this) ) ger(this) ) ptr<mir: :graphics: :Display> display = m_mirServer- >the_display( ); ptr<mir: :graphics: :Display> display = server- >the_display( );
MirOpenGLConte
- : m_mirServer(server)
#if GL_DEBUG
- , m_logger(new QOpenGLDebugLog
+ : m_logger(new QOpenGLDebugLog
#endif
{
- std::shared_
+ std::shared_
"""
Likewise here.