[core] fold HeadlessDisplay into the headless RenderBackend implementation

2 files changed, 6 insertions, 8 deletions

diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake
index 1bcb869fc9..7b3c7fe1a2 100644
--- a/platform/qt/qt.cmake
+++ b/platform/qt/qt.cmake
@@ -17,8 +17,6 @@ set(MBGL_QT_CORE_FILES
     PRIVATE platform/default/mbgl/gl/headless_frontend.hpp
     PRIVATE platform/default/mbgl/gl/headless_backend.cpp
     PRIVATE platform/default/mbgl/gl/headless_backend.hpp
-    PRIVATE platform/default/mbgl/gl/headless_display.cpp
-    PRIVATE platform/default/mbgl/gl/headless_display.hpp
     PRIVATE platform/qt/src/headless_backend_qt.cpp
 
     # Thread pool
diff --git a/platform/qt/src/headless_backend_qt.cpp b/platform/qt/src/headless_backend_qt.cpp
index 5f95b2f96a..7985ca9f2d 100644
--- a/platform/qt/src/headless_backend_qt.cpp
+++ b/platform/qt/src/headless_backend_qt.cpp
@@ -12,7 +12,10 @@
 
 namespace mbgl {
 
-struct QtImpl : public HeadlessBackend::Impl {
+class QtImpl : public HeadlessBackend::Impl {
+public:
+    ~QtImpl() final = default;
+
     void activateContext() final {
         widget.makeCurrent();
     }
@@ -21,6 +24,7 @@ struct QtImpl : public HeadlessBackend::Impl {
         widget.doneCurrent();
     }
 
+private:
     QGLWidget widget;
 };
 
@@ -34,13 +38,9 @@ gl::ProcAddress HeadlessBackend::initializeExtension(const char* name) {
 #endif
 }
 
-bool HeadlessBackend::hasDisplay() {
-    return true;
-};
-
 void HeadlessBackend::createContext() {
     assert(!hasContext());
-    impl.reset(new QtImpl);
+    impl = std::make_unique<QtImpl>();
 }
 
 } // namespace mbgl