diff options
| -rw-r--r-- | vcl/inc/headless/svpgdi.hxx | 3 | ||||
| -rw-r--r-- | vcl/inc/ios/iosinst.hxx | 2 | ||||
| -rw-r--r-- | vcl/ios/iosinst.cxx | 7 |
3 files changed, 7 insertions, 5 deletions
diff --git a/vcl/inc/headless/svpgdi.hxx b/vcl/inc/headless/svpgdi.hxx index 58761d0fcb1a..8877b2ebf201 100644 --- a/vcl/inc/headless/svpgdi.hxx +++ b/vcl/inc/headless/svpgdi.hxx @@ -24,7 +24,6 @@ #include <vcl/sysdata.hxx> #include <vcl/metric.hxx> #include <config_cairo_canvas.h> -#include <cairo.h> #include <salgdi.hxx> #include <sallayout.hxx> @@ -35,6 +34,8 @@ #define SvpSalGraphics AquaSalGraphics #else +#include <cairo.h> + //Using formats that match cairo's formats. For android we patch cairo, //which is internal in that case, to swap the rgb components so that //cairo then matches the OpenGL GL_RGBA format so we can use it there diff --git a/vcl/inc/ios/iosinst.hxx b/vcl/inc/ios/iosinst.hxx index 262ef1063076..478ea5c47859 100644 --- a/vcl/inc/ios/iosinst.hxx +++ b/vcl/inc/ios/iosinst.hxx @@ -33,7 +33,7 @@ class IosSalFrame; class IosSalInstance : public SvpSalInstance { public: - IosSalInstance( SalYieldMutex *pMutex ); + IosSalInstance( std::unique_ptr<SalYieldMutex> pMutex ); virtual ~IosSalInstance(); static IosSalInstance *getInstance(); diff --git a/vcl/ios/iosinst.cxx b/vcl/ios/iosinst.cxx index 749541bf964a..588fa07f8a2a 100644 --- a/vcl/ios/iosinst.cxx +++ b/vcl/ios/iosinst.cxx @@ -25,6 +25,7 @@ #include "headless/svpdummies.hxx" #include "unx/gendata.hxx" #include "quartz/utils.h" +#include <o3tl/make_unique.hxx> #include <vcl/layout.hxx> #include <vcl/settings.hxx> @@ -58,8 +59,8 @@ IosSalInstance *IosSalInstance::getInstance() return static_cast<IosSalInstance *>(pData->m_pInstance); } -IosSalInstance::IosSalInstance( SalYieldMutex *pMutex ) - : SvpSalInstance( pMutex ) +IosSalInstance::IosSalInstance( std::unique_ptr<SalYieldMutex> pMutex ) + : SvpSalInstance( std::move(pMutex) ) { } @@ -170,7 +171,7 @@ SalData::~SalData() // This is our main entry point: SalInstance *CreateSalInstance() { - IosSalInstance* pInstance = new IosSalInstance( new SvpSalYieldMutex() ); + IosSalInstance* pInstance = new IosSalInstance( o3tl::make_unique<SvpSalYieldMutex>() ); new IosSalData( pInstance ); pInstance->AcquireYieldMutex(); return pInstance; |