diff options
author | Chris Sherlock <chris.sherlock79@gmail.com> | 2021-09-26 08:17:26 +1000 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2021-09-27 22:13:02 +0200 |
commit | 2f51bf35daa7d2e1612647e1768c443028e87c39 (patch) | |
tree | 95fd29350da03666c21319d8d2b275a479ad94b2 /vcl/qt5 | |
parent | 5e4e1cdb1e14354b42838e1dfcf82873b3071896 (diff) |
vcl: move FontSelectPattern to own file and into vcl::font namespace
Change-Id: I2f01a8e67c52ece9b434777203aa9fbc9ac8be02
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122613
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'vcl/qt5')
-rw-r--r-- | vcl/qt5/Qt5Font.cxx | 2 | ||||
-rw-r--r-- | vcl/qt5/Qt5FontFace.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vcl/qt5/Qt5Font.cxx b/vcl/qt5/Qt5Font.cxx index 83d290bb7ff1..bbf99f92ef61 100644 --- a/vcl/qt5/Qt5Font.cxx +++ b/vcl/qt5/Qt5Font.cxx @@ -120,7 +120,7 @@ static inline void applyStyle(Qt5Font& rFont, FontItalic eItalic) } } -Qt5Font::Qt5Font(const PhysicalFontFace& rPFF, const FontSelectPattern& rFSP) +Qt5Font::Qt5Font(const PhysicalFontFace& rPFF, const vcl::font::FontSelectPattern& rFSP) : LogicalFontInstance(rPFF, rFSP) { setFamily(toQString(rPFF.GetFamilyName())); diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx index e8f13c412e91..6168811daea8 100644 --- a/vcl/qt5/Qt5FontFace.cxx +++ b/vcl/qt5/Qt5FontFace.cxx @@ -28,7 +28,7 @@ #include <sft.hxx> #include <impfontcharmap.hxx> #include <fontinstance.hxx> -#include <fontselect.hxx> +#include <font/FontSelectPattern.hxx> #include <PhysicalFontCollection.hxx> #include <QtGui/QFont> @@ -185,7 +185,7 @@ QFont Qt5FontFace::CreateFont() const } rtl::Reference<LogicalFontInstance> -Qt5FontFace::CreateFontInstance(const FontSelectPattern& rFSD) const +Qt5FontFace::CreateFontInstance(const vcl::font::FontSelectPattern& rFSD) const { return new Qt5Font(*this, rFSD); } |