summaryrefslogtreecommitdiff
path: root/include/vcl/outdevstate.hxx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-09-16 10:09:58 +0200
committerNoel Grandin <noel@peralex.com>2014-09-18 08:54:37 +0200
commit60e78fbb806bb45e635ba1de45ceffe187938ac0 (patch)
tree17ff5aaa57f4d23e177f1fe423def1691139a4a8 /include/vcl/outdevstate.hxx
parent9c818268767d6a1c1bc731ae30c45883bab987e7 (diff)
fdo#82577: Handle Font
Put the VCL Font class in the vcl namespace. Avoids clash with the X11 Font typedef. Change-Id: I1a84f7cad8b31697b9860a3418f7dff794ff6537
Diffstat (limited to 'include/vcl/outdevstate.hxx')
-rw-r--r--include/vcl/outdevstate.hxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/vcl/outdevstate.hxx b/include/vcl/outdevstate.hxx
index 578a1a978843..e53b7c18a923 100644
--- a/include/vcl/outdevstate.hxx
+++ b/include/vcl/outdevstate.hxx
@@ -111,7 +111,7 @@ public:
Region* mpClipRegion;
Color* mpLineColor;
Color* mpFillColor;
- Font* mpFont;
+ vcl::Font* mpFont;
Color* mpTextColor;
Color* mpTextFillColor;
Color* mpTextLineColor;