diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-13 21:04:19 +0100 |
|---|---|---|
| committer | Jan-Marek Glogowski <glogow@fbihome.de> | 2022-01-14 16:13:04 +0100 |
| commit | 7d990aafdc363b2a12b5db78637d7f3bef7780bd (patch) | |
| tree | 3d32337824b6003769318510822110ba09351b9d /vcl/quartz | |
| parent | 4bdf28b404f90236d93ce207671f755a71f28496 (diff) | |
VCL drop m_pInstance from *nix SalData
AKA the "*nix SalData untangling" commit.
The original plan was to get rid of vcl/inc/saldatabasic.hxx and
even SalData for all the *nix backends. But after many backs and
forths, reinspecting the code and imagining the resulting code, I
decided against that plan. All these variants would have resulted
in reinterpret_cast calls, I wanted to prevent. And they would
have required larger renames for no benefit.
An other, related idea was to include all SalData implementations
in the vcl/inc/svdata.hxx header, but that seemed like an include
explosion, so was also dropped.
I tried to untangling iOS from using GenericUnixSalData, as it
doesn't use any of it's features. The new, minimal SalData should
be sufficient.
I'm leaving the easier drop of mpInstance from the Windows and
MacOSX backend as a minimal interesting EasyHack.
Change-Id: I5be01c1f42131a7e31cb30899392308e1e2de53b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/128402
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Diffstat (limited to 'vcl/quartz')
| -rw-r--r-- | vcl/quartz/AquaGraphicsBackend.cxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/salbmp.cxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/salgdi.cxx | 2 | ||||
| -rw-r--r-- | vcl/quartz/salgdicommon.cxx | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/vcl/quartz/AquaGraphicsBackend.cxx b/vcl/quartz/AquaGraphicsBackend.cxx index 056d2cd0e32f..fdcbae1e3870 100644 --- a/vcl/quartz/AquaGraphicsBackend.cxx +++ b/vcl/quartz/AquaGraphicsBackend.cxx @@ -41,7 +41,7 @@ #endif #include <quartz/utils.h> #ifdef IOS -#include "saldatabasic.hxx" +#include <svdata.hxx> #endif #include <sft.hxx> diff --git a/vcl/quartz/salbmp.cxx b/vcl/quartz/salbmp.cxx index 8fadba1b509e..f0f5fb9a5b8f 100644 --- a/vcl/quartz/salbmp.cxx +++ b/vcl/quartz/salbmp.cxx @@ -42,7 +42,7 @@ #ifdef MACOSX #include <osx/saldata.hxx> #else -#include "saldatabasic.hxx" +#include <svdata.hxx> #endif const unsigned long k32BitRedColorMask = 0x00ff0000; diff --git a/vcl/quartz/salgdi.cxx b/vcl/quartz/salgdi.cxx index cbeaea4fc62b..98b00b305366 100644 --- a/vcl/quartz/salgdi.cxx +++ b/vcl/quartz/salgdi.cxx @@ -51,7 +51,7 @@ #endif #include <quartz/utils.h> #ifdef IOS -#include "saldatabasic.hxx" +#include <svdata.hxx> #endif #include <sallayout.hxx> #include <sft.hxx> diff --git a/vcl/quartz/salgdicommon.cxx b/vcl/quartz/salgdicommon.cxx index b4b24d4e5f4d..197f4b38f6bf 100644 --- a/vcl/quartz/salgdicommon.cxx +++ b/vcl/quartz/salgdicommon.cxx @@ -40,7 +40,7 @@ #endif #include <quartz/utils.h> #ifdef IOS -#include "saldatabasic.hxx" +#include <svdata.hxx> #endif #include <sft.hxx> |