summaryrefslogtreecommitdiff
path: root/vcl/unx/generic/gdi
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-10-23 22:28:18 +0200
committerStephan Bergmann <sbergman@redhat.com>2017-10-23 22:45:47 +0200
commitca39dddb8b3c01ff1d8a4cf2961c1b61563397a1 (patch)
treee9f9103fe3045cd56e7a6fc1f19afba3d064bdce /vcl/unx/generic/gdi
parente279245767050c8ca9743b33ab395cb67dd9a63c (diff)
loplugin:includeform: vcl
Change-Id: Id7dea3917740aaf4db8dada5e2bea6e117d714ea
Diffstat (limited to 'vcl/unx/generic/gdi')
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx20
-rw-r--r--vcl/unx/generic/gdi/font.cxx10
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.cxx10
-rw-r--r--vcl/unx/generic/gdi/gcach_xpeer.hxx2
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.cxx38
-rw-r--r--vcl/unx/generic/gdi/gdiimpl.hxx8
-rw-r--r--vcl/unx/generic/gdi/nativewindowhandleprovider.cxx2
-rw-r--r--vcl/unx/generic/gdi/openglx11cairotextrender.cxx4
-rw-r--r--vcl/unx/generic/gdi/salgdi.cxx40
-rw-r--r--vcl/unx/generic/gdi/salgdi2.cxx22
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.cxx4
-rw-r--r--vcl/unx/generic/gdi/x11cairotextrender.hxx8
-rw-r--r--vcl/unx/generic/gdi/xrender_peer.cxx2
13 files changed, 85 insertions, 85 deletions
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index c3d0ecc42e75..77a3539cc81b 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -17,7 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "unx/cairotextrender.hxx"
+#include <unx/cairotextrender.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
#include <vcl/settings.hxx>
@@ -26,18 +26,18 @@
#include <vcl/fontcharmap.hxx>
#include <android/compatibility.hxx>
-#include "unx/printergfx.hxx"
-#include "unx/genpspgraphics.h"
-#include "unx/geninst.h"
-#include "unx/glyphcache.hxx"
-#include "unx/fc_fontoptions.hxx"
-#include "PhysicalFontFace.hxx"
-#include "impfont.hxx"
-#include "impfontmetricdata.hxx"
+#include <unx/printergfx.hxx>
+#include <unx/genpspgraphics.h>
+#include <unx/geninst.h>
+#include <unx/glyphcache.hxx>
+#include <unx/fc_fontoptions.hxx>
+#include <PhysicalFontFace.hxx>
+#include <impfont.hxx>
+#include <impfontmetricdata.hxx>
#include <cairo.h>
#include <cairo-ft.h>
-#include "CommonSalLayout.hxx"
+#include <CommonSalLayout.hxx>
namespace {
diff --git a/vcl/unx/generic/gdi/font.cxx b/vcl/unx/generic/gdi/font.cxx
index 2e8dd081cf35..c872963d159c 100644
--- a/vcl/unx/generic/gdi/font.cxx
+++ b/vcl/unx/generic/gdi/font.cxx
@@ -20,11 +20,11 @@
#include <vcl/sysdata.hxx>
#include <vcl/fontcharmap.hxx>
-#include "unx/saldisp.hxx"
-#include "unx/salgdi.h"
-#include "unx/salvd.h"
-#include "textrender.hxx"
-#include "CommonSalLayout.hxx"
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
+#include <unx/salvd.h>
+#include <textrender.hxx>
+#include <CommonSalLayout.hxx>
GC
X11SalGraphics::GetFontGC()
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.cxx b/vcl/unx/generic/gdi/gcach_xpeer.cxx
index 8dde144a2ada..31195d6fe752 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.cxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.cxx
@@ -17,12 +17,12 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include "rtl/ustring.hxx"
-#include "osl/module.h"
-#include "osl/thread.h"
+#include <rtl/ustring.hxx>
+#include <osl/module.h>
+#include <osl/thread.h>
-#include "unx/saldisp.hxx"
-#include "unx/salgdi.h"
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
#include "gcach_xpeer.hxx"
#include "xrender_peer.hxx"
diff --git a/vcl/unx/generic/gdi/gcach_xpeer.hxx b/vcl/unx/generic/gdi/gcach_xpeer.hxx
index af33b22652ca..9fe75b706433 100644
--- a/vcl/unx/generic/gdi/gcach_xpeer.hxx
+++ b/vcl/unx/generic/gdi/gcach_xpeer.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
#define INCLUDED_VCL_UNX_GENERIC_GDI_GCACH_XPEER_HXX
-#include "unx/glyphcache.hxx"
+#include <unx/glyphcache.hxx>
class X11GlyphCache : public GlyphCache
{
diff --git a/vcl/unx/generic/gdi/gdiimpl.cxx b/vcl/unx/generic/gdi/gdiimpl.cxx
index 8fc0361b0789..fea1b60c9870 100644
--- a/vcl/unx/generic/gdi/gdiimpl.cxx
+++ b/vcl/unx/generic/gdi/gdiimpl.cxx
@@ -28,28 +28,28 @@
#include <vcl/salbtype.hxx>
#include <vcl/gradient.hxx>
-#include "unx/salunx.h"
-#include "unx/saldisp.hxx"
-#include "unx/salbmp.h"
-#include "unx/salgdi.h"
-#include "unx/salvd.h"
+#include <unx/salunx.h>
+#include <unx/saldisp.hxx>
+#include <unx/salbmp.h>
+#include <unx/salgdi.h>
+#include <unx/salvd.h>
#include <unx/x11/xlimits.hxx>
-#include "salframe.hxx"
+#include <salframe.hxx>
#include "xrender_peer.hxx"
-#include "outdata.hxx"
-
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygontools.hxx"
-#include "basegfx/polygon/b2dpolygontools.hxx"
-#include "basegfx/polygon/b2dpolygonclipper.hxx"
-#include "basegfx/polygon/b2dlinegeometry.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include "basegfx/matrix/b2dhommatrixtools.hxx"
-#include "basegfx/polygon/b2dpolypolygoncutter.hxx"
-#include "basegfx/polygon/b2dtrapezoid.hxx"
-#include "ControlCacheKey.hxx"
+#include <outdata.hxx>
+
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/polygon/b2dtrapezoid.hxx>
+#include <ControlCacheKey.hxx>
#undef SALGDI2_TESTTRANS
diff --git a/vcl/unx/generic/gdi/gdiimpl.hxx b/vcl/unx/generic/gdi/gdiimpl.hxx
index 953ea731141f..42fe5b6c9ee2 100644
--- a/vcl/unx/generic/gdi/gdiimpl.hxx
+++ b/vcl/unx/generic/gdi/gdiimpl.hxx
@@ -24,13 +24,13 @@
#include <X11/Xutil.h>
#include <X11/extensions/Xrender.h>
-#include "unx/saltype.h"
-#include "unx/x11/x11gdiimpl.h"
+#include <unx/saltype.h>
+#include <unx/x11/x11gdiimpl.h>
-#include "salgdiimpl.hxx"
+#include <salgdiimpl.hxx>
#include <basegfx/polygon/b2dtrapezoid.hxx>
-#include "ControlCacheKey.hxx"
+#include <ControlCacheKey.hxx>
/* From <X11/Intrinsic.h> */
typedef unsigned long Pixel;
diff --git a/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx b/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
index 3afd26e31498..47986cf2050a 100644
--- a/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
+++ b/vcl/unx/generic/gdi/nativewindowhandleprovider.cxx
@@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#include "unx/nativewindowhandleprovider.hxx"
+#include <unx/nativewindowhandleprovider.hxx>
NativeWindowHandleProvider::~NativeWindowHandleProvider()
{
diff --git a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
index 08618195a036..d1301f1cc2ff 100644
--- a/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/openglx11cairotextrender.cxx
@@ -9,8 +9,8 @@
#include "openglx11cairotextrender.hxx"
-#include "openglgdiimpl.hxx"
-#include "salbmp.hxx"
+#include <openglgdiimpl.hxx>
+#include <salbmp.hxx>
#include <vcl/salbtype.hxx>
#include <cairo.h>
diff --git a/vcl/unx/generic/gdi/salgdi.cxx b/vcl/unx/generic/gdi/salgdi.cxx
index 861232597432..652cb41b7a7e 100644
--- a/vcl/unx/generic/gdi/salgdi.cxx
+++ b/vcl/unx/generic/gdi/salgdi.cxx
@@ -27,38 +27,38 @@
#include <X11/Xproto.h>
-#include "basegfx/polygon/b2dpolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygon.hxx"
-#include "basegfx/polygon/b2dpolypolygontools.hxx"
-#include "basegfx/polygon/b2dpolygontools.hxx"
-#include "basegfx/polygon/b2dpolygonclipper.hxx"
-#include "basegfx/polygon/b2dlinegeometry.hxx"
-#include "basegfx/matrix/b2dhommatrix.hxx"
-#include "basegfx/matrix/b2dhommatrixtools.hxx"
-#include "basegfx/polygon/b2dpolypolygoncutter.hxx"
-#include "basegfx/polygon/b2dtrapezoid.hxx"
+#include <basegfx/polygon/b2dpolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygon.hxx>
+#include <basegfx/polygon/b2dpolypolygontools.hxx>
+#include <basegfx/polygon/b2dpolygontools.hxx>
+#include <basegfx/polygon/b2dpolygonclipper.hxx>
+#include <basegfx/polygon/b2dlinegeometry.hxx>
+#include <basegfx/matrix/b2dhommatrix.hxx>
+#include <basegfx/matrix/b2dhommatrixtools.hxx>
+#include <basegfx/polygon/b2dpolypolygoncutter.hxx>
+#include <basegfx/polygon/b2dtrapezoid.hxx>
#include <basegfx/curve/b2dcubicbezier.hxx>
#include <vcl/jobdata.hxx>
#include <vcl/sysdata.hxx>
#include <vcl/virdev.hxx>
-#include "unx/salunx.h"
-#include "unx/saldisp.hxx"
-#include "unx/salgdi.h"
-#include "unx/salvd.h"
-#include "unx/x11/x11gdiimpl.h"
+#include <unx/salunx.h>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
+#include <unx/salvd.h>
+#include <unx/x11/x11gdiimpl.h>
#include <unx/x11/xlimits.hxx>
-#include "salgdiimpl.hxx"
-#include "unx/nativewindowhandleprovider.hxx"
-#include "textrender.hxx"
+#include <salgdiimpl.hxx>
+#include <unx/nativewindowhandleprovider.hxx>
+#include <textrender.hxx>
#include "gdiimpl.hxx"
-#include "opengl/x11/gdiimpl.hxx"
+#include <opengl/x11/gdiimpl.hxx>
#include "x11cairotextrender.hxx"
#include "openglx11cairotextrender.hxx"
-#include "unx/printergfx.hxx"
+#include <unx/printergfx.hxx>
#include "xrender_peer.hxx"
#include "cairo_xlib_cairo.hxx"
#include <cairo-xlib.h>
diff --git a/vcl/unx/generic/gdi/salgdi2.cxx b/vcl/unx/generic/gdi/salgdi2.cxx
index 76fe85451f86..ed33c0acacaf 100644
--- a/vcl/unx/generic/gdi/salgdi2.cxx
+++ b/vcl/unx/generic/gdi/salgdi2.cxx
@@ -18,27 +18,27 @@
*/
#include <poll.h>
-#include "salgdiimpl.hxx"
+#include <salgdiimpl.hxx>
#include <vcl/salbtype.hxx>
#include <vcl/sysdata.hxx>
-#include "unx/pixmap.hxx"
-#include "unx/salunx.h"
-#include "unx/saldisp.hxx"
-#include "unx/salbmp.h"
-#include "unx/salgdi.h"
-#include "unx/salvd.h"
-#include "unx/x11/x11gdiimpl.h"
+#include <unx/pixmap.hxx>
+#include <unx/salunx.h>
+#include <unx/saldisp.hxx>
+#include <unx/salbmp.h>
+#include <unx/salgdi.h>
+#include <unx/salvd.h>
+#include <unx/x11/x11gdiimpl.h>
#include <unx/x11/xlimits.hxx>
#include "xrender_peer.hxx"
-#include "salframe.hxx"
+#include <salframe.hxx>
-#include "unx/printergfx.hxx"
+#include <unx/printergfx.hxx>
#include <vcl/bitmapaccess.hxx>
#include <outdata.hxx>
-#include "ControlCacheKey.hxx"
+#include <ControlCacheKey.hxx>
void X11SalGraphics::CopyScreenArea( Display* pDisplay,
Drawable aSrc, SalX11Screen nXScreenSrc, int nSrcDepth,
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.cxx b/vcl/unx/generic/gdi/x11cairotextrender.cxx
index a59a54ff9adc..105d0a0392bd 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.cxx
@@ -18,8 +18,8 @@
*/
#include "x11cairotextrender.hxx"
-#include "unx/saldisp.hxx"
-#include "unx/salvd.h"
+#include <unx/saldisp.hxx>
+#include <unx/salvd.h>
#include "gcach_xpeer.hxx"
#include <X11/Xregion.h>
#include <cairo.h>
diff --git a/vcl/unx/generic/gdi/x11cairotextrender.hxx b/vcl/unx/generic/gdi/x11cairotextrender.hxx
index 5e2648b2c3cd..4b90586edf12 100644
--- a/vcl/unx/generic/gdi/x11cairotextrender.hxx
+++ b/vcl/unx/generic/gdi/x11cairotextrender.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX
#define INCLUDED_VCL_UNX_GENERIC_GDI_X11CAIROTEXTRENDER_HXX
-#include "unx/cairotextrender.hxx"
-#include "unx/saldisp.hxx"
-#include "unx/salgdi.h"
-#include "salframe.hxx"
+#include <unx/cairotextrender.hxx>
+#include <unx/saldisp.hxx>
+#include <unx/salgdi.h>
+#include <salframe.hxx>
class X11CairoTextRender : public CairoTextRender
{
diff --git a/vcl/unx/generic/gdi/xrender_peer.cxx b/vcl/unx/generic/gdi/xrender_peer.cxx
index d0f3ec04abe2..2e23499606f1 100644
--- a/vcl/unx/generic/gdi/xrender_peer.cxx
+++ b/vcl/unx/generic/gdi/xrender_peer.cxx
@@ -21,7 +21,7 @@
#include <unx/salunx.h>
#include <unx/saldisp.hxx>
-#include <xrender_peer.hxx>
+#include "xrender_peer.hxx"
XRenderPeer::XRenderPeer()
: mpDisplay( vcl_sal::getSalDisplay(GetGenericUnixSalData())->GetDisplay() )