loplugin:includeform: vcl (Windows)

Change-Id: I4a0fc4b483069141d2b943079adf5aa741df968e

26 files changed, 97 insertions, 97 deletions

diff --git a/vcl/inc/opengl/win/WinDeviceInfo.hxx b/vcl/inc/opengl/win/WinDeviceInfo.hxx
index 2e6360d4af07..b207b2f9c9df 100644
--- a/vcl/inc/opengl/win/WinDeviceInfo.hxx
+++ b/vcl/inc/opengl/win/WinDeviceInfo.hxx
@@ -12,7 +12,7 @@
 
 #include <vcl/dllapi.h>
 
-#include "opengl/DeviceInfo.hxx"
+#include <opengl/DeviceInfo.hxx>
 
 #include <rtl/ustring.hxx>
 #include <vector>
diff --git a/vcl/inc/opengl/win/blocklist_parser.hxx b/vcl/inc/opengl/win/blocklist_parser.hxx
index 6b716ab3d7e0..1d1ea314d6f7 100644
--- a/vcl/inc/opengl/win/blocklist_parser.hxx
+++ b/vcl/inc/opengl/win/blocklist_parser.hxx
@@ -10,7 +10,7 @@
 #include <vcl/dllapi.h>
 #include <xmlreader/xmlreader.hxx>
 #include <vector>
-#include "opengl/win/WinDeviceInfo.hxx"
+#include <opengl/win/WinDeviceInfo.hxx>
 
 class InvalidFileException
 {
diff --git a/vcl/inc/opengl/win/gdiimpl.hxx b/vcl/inc/opengl/win/gdiimpl.hxx
index ba92f571986c..bd0bea4ef246 100644
--- a/vcl/inc/opengl/win/gdiimpl.hxx
+++ b/vcl/inc/opengl/win/gdiimpl.hxx
@@ -13,12 +13,12 @@
 #include <memory>
 #include <vcl/dllapi.h>
 
-#include "openglgdiimpl.hxx"
-#include "svdata.hxx"
-#include "win/salgdi.h"
+#include <openglgdiimpl.hxx>
+#include <svdata.hxx>
+#include <win/salgdi.h>
 #include <o3tl/lru_map.hxx>
 #include <vcl/opengl/OpenGLContext.hxx>
-#include "ControlCacheKey.hxx"
+#include <ControlCacheKey.hxx>
 
 class WinOpenGLSalGraphicsImpl : public OpenGLSalGraphicsImpl
 {
diff --git a/vcl/inc/win/DWriteTextRenderer.hxx b/vcl/inc/win/DWriteTextRenderer.hxx
index c95fe47eab0e..f6781d5c1c1d 100644
--- a/vcl/inc/win/DWriteTextRenderer.hxx
+++ b/vcl/inc/win/DWriteTextRenderer.hxx
@@ -24,7 +24,7 @@
 #include <d2d1.h>
 #include <dwrite.h>
 
-#include "win/winlayout.hxx"
+#include <win/winlayout.hxx>
 
 enum class D2DTextAntiAliasMode
 {
diff --git a/vcl/inc/win/saldata.hxx b/vcl/inc/win/saldata.hxx
index 659fd68f7dda..45c402363119 100644
--- a/vcl/inc/win/saldata.hxx
+++ b/vcl/inc/win/saldata.hxx
@@ -21,7 +21,7 @@
 #define INCLUDED_VCL_INC_WIN_SALDATA_HXX
 
 #include <memory>
-#include "osl/module.h"
+#include <osl/module.h>
 
 #include <svdata.hxx>
 #include <salwtype.hxx>
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index d975b5d70773..6d92b48de9e5 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -20,13 +20,13 @@
 #ifndef INCLUDED_VCL_INC_WIN_SALGDI_H
 #define INCLUDED_VCL_INC_WIN_SALGDI_H
 
-#include "sallayout.hxx"
-#include "salgeom.hxx"
-#include "salgdi.hxx"
-#include "fontinstance.hxx"
-#include "fontattributes.hxx"
-#include "PhysicalFontFace.hxx"
-#include "impfont.hxx"
+#include <sallayout.hxx>
+#include <salgeom.hxx>
+#include <salgdi.hxx>
+#include <fontinstance.hxx>
+#include <fontattributes.hxx>
+#include <PhysicalFontFace.hxx>
+#include <impfont.hxx>
 #include <vcl/fontcapabilities.hxx>
 #include <vcl/fontcharmap.hxx>
 
@@ -35,8 +35,8 @@
 
 #ifndef INCLUDED_PRE_POST_WIN_H
 #define INCLUDED_PRE_POST_WIN_H
-#  include "prewin.h"
-#  include "postwin.h"
+#  include <prewin.h>
+#  include <postwin.h>
 #endif
 
 #include <hb-ot.h>
diff --git a/vcl/inc/win/winlayout.hxx b/vcl/inc/win/winlayout.hxx
index 343b5671fcad..af9eaef473e1 100644
--- a/vcl/inc/win/winlayout.hxx
+++ b/vcl/inc/win/winlayout.hxx
@@ -26,7 +26,7 @@
 #include <svsys.h>
 #include <win/salgdi.h>
 
-#include "opengl/PackedTextureAtlas.hxx"
+#include <opengl/PackedTextureAtlas.hxx>
 
 class WinFontInstance;
 
diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx
index b6d39e51b88c..9b4438cbccdb 100644
--- a/vcl/opengl/win/WinDeviceInfo.cxx
+++ b/vcl/opengl/win/WinDeviceInfo.cxx
@@ -7,9 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "opengl/win/WinDeviceInfo.hxx"
+#include <opengl/win/WinDeviceInfo.hxx>
 
-#include "opengl/win/blocklist_parser.hxx"
+#include <opengl/win/blocklist_parser.hxx>
 #include <config_folders.h>
 
 #if !defined WIN32_LEAN_AND_MEAN
diff --git a/vcl/opengl/win/blocklist_parser.cxx b/vcl/opengl/win/blocklist_parser.cxx
index 2f72472cdf70..8a6f9dbc4cda 100644
--- a/vcl/opengl/win/blocklist_parser.cxx
+++ b/vcl/opengl/win/blocklist_parser.cxx
@@ -7,7 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include "opengl/win/blocklist_parser.hxx"
+#include <opengl/win/blocklist_parser.hxx>
 
 WinBlocklistParser::WinBlocklistParser(const OUString& rURL,
         std::vector<wgl::DriverInfo>& rDriverList)
diff --git a/vcl/opengl/win/gdiimpl.cxx b/vcl/opengl/win/gdiimpl.cxx
index 0d2a0c0a8f0c..b22e9dc78688 100644
--- a/vcl/opengl/win/gdiimpl.cxx
+++ b/vcl/opengl/win/gdiimpl.cxx
@@ -9,7 +9,7 @@
 
 #include <memory>
 #include <thread>
-#include "opengl/win/gdiimpl.hxx"
+#include <opengl/win/gdiimpl.hxx>
 
 #include <comphelper/windowserrorstring.hxx>
 #include <opengl/zone.hxx>
@@ -18,7 +18,7 @@
 #include <win/salframe.h>
 #include <win/salinst.h>
 #include <epoxy/wgl.h>
-#include "ControlCacheKey.hxx"
+#include <ControlCacheKey.hxx>
 
 static std::vector<HGLRC> g_vShareList;
 static bool g_bAnyCurrent;
diff --git a/vcl/qa/cppunit/blocklistparsertest.cxx b/vcl/qa/cppunit/blocklistparsertest.cxx
index 228e4bad9377..f9a692585ca0 100644
--- a/vcl/qa/cppunit/blocklistparsertest.cxx
+++ b/vcl/qa/cppunit/blocklistparsertest.cxx
@@ -16,7 +16,7 @@
 
 #include <unotest/bootstrapfixturebase.hxx>
 
-#include "opengl/win/blocklist_parser.hxx"
+#include <opengl/win/blocklist_parser.hxx>
 
 namespace
 {
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index 8be97308eb38..5fa327948971 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -22,7 +22,7 @@
 #include <officecfg/Office/Common.hxx>
 
 #ifdef _WIN32
-#include "win/svsys.h"
+#include <win/svsys.h>
 #endif
 
 #include <comphelper/processfactory.hxx>
diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx
index ca9be1d3ad34..e48894168ac6 100644
--- a/vcl/source/opengl/OpenGLHelper.cxx
+++ b/vcl/source/opengl/OpenGLHelper.cxx
@@ -44,7 +44,7 @@
 #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID
 #include <opengl/x11/X11DeviceInfo.hxx>
 #elif defined (_WIN32)
-#include "opengl/win/WinDeviceInfo.hxx"
+#include <opengl/win/WinDeviceInfo.hxx>
 #endif
 
 static bool volatile gbInShaderCompile = false;
diff --git a/vcl/win/app/saldata.cxx b/vcl/win/app/saldata.cxx
index 4de375277a10..0b45716a2980 100644
--- a/vcl/win/app/saldata.cxx
+++ b/vcl/win/app/saldata.cxx
@@ -18,10 +18,10 @@
  */
 
 #include <svsys.h>
-#include "rtl/tencinfo.h"
+#include <rtl/tencinfo.h>
 #include <vcl/svapp.hxx>
 
-#include "win/saldata.hxx"
+#include <win/saldata.hxx>
 
 rtl_TextEncoding ImplSalGetSystemEncoding()
 {
diff --git a/vcl/win/app/salinfo.cxx b/vcl/win/app/salinfo.cxx
index 3aa33ef08f57..90fa81b04d0e 100644
--- a/vcl/win/app/salinfo.cxx
+++ b/vcl/win/app/salinfo.cxx
@@ -17,18 +17,18 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "svsys.h"
-#include "rtl/ustrbuf.hxx"
+#include <svsys.h>
+#include <rtl/ustrbuf.hxx>
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #include <vcl/window.hxx>
 
-#include "win/salsys.h"
-#include "win/salframe.h"
-#include "win/salinst.h"
-#include "win/saldata.hxx"
+#include <win/salsys.h>
+#include <win/salframe.h>
+#include <win/salinst.h>
+#include <win/saldata.hxx>
 
-#include "svdata.hxx"
+#include <svdata.hxx>
 
 #include <unordered_map>
 
diff --git a/vcl/win/app/salinst.cxx b/vcl/win/app/salinst.cxx
index 40be2b1e4180..442a937af6ee 100644
--- a/vcl/win/app/salinst.cxx
+++ b/vcl/win/app/salinst.cxx
@@ -32,20 +32,20 @@
 #include <vcl/opengl/OpenGLContext.hxx>
 #include <vcl/timer.hxx>
 
-#include "opengl/salbmp.hxx"
-#include "opengl/win/gdiimpl.hxx"
-#include "win/wincomp.hxx"
-#include "win/salids.hrc"
-#include "win/saldata.hxx"
-#include "win/salinst.h"
-#include "win/salframe.h"
-#include "win/salobj.h"
-#include "win/saltimer.h"
-#include "win/salbmp.h"
-#include "win/winlayout.hxx"
-
-#include "salimestatus.hxx"
-#include "salsys.hxx"
+#include <opengl/salbmp.hxx>
+#include <opengl/win/gdiimpl.hxx>
+#include <win/wincomp.hxx>
+#include <win/salids.hrc>
+#include <win/saldata.hxx>
+#include <win/salinst.h>
+#include <win/salframe.h>
+#include <win/salobj.h>
+#include <win/saltimer.h>
+#include <win/salbmp.h>
+#include <win/winlayout.hxx>
+
+#include <salimestatus.hxx>
+#include <salsys.hxx>
 
 #include <desktop/crashreport.hxx>
 
@@ -63,12 +63,12 @@
 #pragma warning( disable: 4917 )
 #endif
 
-#include "prewin.h"
+#include <prewin.h>
 
 #include <gdiplus.h>
 #include <shlobj.h>
 
-#include "postwin.h"
+#include <postwin.h>
 
 #if defined _MSC_VER
 #pragma warning(pop)
diff --git a/vcl/win/gdi/DWriteTextRenderer.cxx b/vcl/win/gdi/DWriteTextRenderer.cxx
index bd9c012d55fc..95dd9e9d9b97 100644
--- a/vcl/win/gdi/DWriteTextRenderer.cxx
+++ b/vcl/win/gdi/DWriteTextRenderer.cxx
@@ -21,11 +21,11 @@
 #include <win/saldata.hxx>
 #include <outdev.h>
 
-#include "win/DWriteTextRenderer.hxx"
+#include <win/DWriteTextRenderer.hxx>
 
-#include "sft.hxx"
-#include "sallayout.hxx"
-#include "CommonSalLayout.hxx"
+#include <sft.hxx>
+#include <sallayout.hxx>
+#include <CommonSalLayout.hxx>
 
 #include <shlwapi.h>
 #include <winver.h>
diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 6e694efafed8..4d3d382c97f7 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -30,14 +30,14 @@
 #include <win/wincomp.hxx>
 #include <win/saldata.hxx>
 #include <win/salgdi.h>
-#include "win/salbmp.h"
+#include <win/salbmp.h>
 #include <vcl/salbtype.hxx>
 #include <win/salframe.h>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-#include "outdata.hxx"
-#include "win/salids.hrc"
-#include "ControlCacheKey.hxx"
+#include <outdata.hxx>
+#include <win/salids.hrc>
+#include <ControlCacheKey.hxx>
 
 #if defined _MSC_VER
 #ifndef min
@@ -48,13 +48,13 @@
 #endif
 #endif
 
-#include "prewin.h"
+#include <prewin.h>
 
 #include <gdiplus.h>
 #include <gdiplusenums.h>
 #include <gdipluscolor.h>
 
-#include "postwin.h"
+#include <postwin.h>
 
 #define SAL_POLYPOLYCOUNT_STACKBUF          8
 #define SAL_POLYPOLYPOINTS_STACKBUF         64
diff --git a/vcl/win/gdi/gdiimpl.hxx b/vcl/win/gdi/gdiimpl.hxx
index 5eb63a21d1ae..9409a75a3fa4 100644
--- a/vcl/win/gdi/gdiimpl.hxx
+++ b/vcl/win/gdi/gdiimpl.hxx
@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#include "salgdiimpl.hxx"
-#include "win/salgdi.h"
+#include <salgdiimpl.hxx>
+#include <win/salgdi.h>
 
 #include <vcl/gradient.hxx>
 
-#include "svsys.h"
-#include "ControlCacheKey.hxx"
+#include <svsys.h>
+#include <ControlCacheKey.hxx>
 
 class WinSalGraphics;
 
diff --git a/vcl/win/gdi/salbmp.cxx b/vcl/win/gdi/salbmp.cxx
index f4d2a578ae64..3cef654924f3 100644
--- a/vcl/win/gdi/salbmp.cxx
+++ b/vcl/win/gdi/salbmp.cxx
@@ -38,9 +38,9 @@
 #endif
 #endif
 
-#include "prewin.h"
+#include <prewin.h>
 #include <gdiplus.h>
-#include "postwin.h"
+#include <postwin.h>
 
 #if defined _MSC_VER
 #undef min
diff --git a/vcl/win/gdi/salfont.cxx b/vcl/win/gdi/salfont.cxx
index 53de8bcad5ba..f1f7dfeffb87 100644
--- a/vcl/win/gdi/salfont.cxx
+++ b/vcl/win/gdi/salfont.cxx
@@ -44,15 +44,15 @@
 #include <vcl/fontcharmap.hxx>
 #include <vcl/opengl/OpenGLWrapper.hxx>
 
-#include "fontsubset.hxx"
-#include "outdev.h"
-#include "PhysicalFontCollection.hxx"
-#include "PhysicalFontFace.hxx"
-#include "sft.hxx"
-#include "win/saldata.hxx"
-#include "win/salgdi.h"
-#include "impfontcharmap.hxx"
-#include "impfontmetricdata.hxx"
+#include <fontsubset.hxx>
+#include <outdev.h>
+#include <PhysicalFontCollection.hxx>
+#include <PhysicalFontFace.hxx>
+#include <sft.hxx>
+#include <win/saldata.hxx>
+#include <win/salgdi.h>
+#include <impfontcharmap.hxx>
+#include <impfontmetricdata.hxx>
 
 using namespace vcl;
 
diff --git a/vcl/win/gdi/salgdi.cxx b/vcl/win/gdi/salgdi.cxx
index c79ecc098bcf..474abf69df4b 100644
--- a/vcl/win/gdi/salgdi.cxx
+++ b/vcl/win/gdi/salgdi.cxx
@@ -31,9 +31,9 @@
 #include <win/salvd.h>
 #include <basegfx/matrix/b2dhommatrixtools.hxx>
 
-#include "salgdiimpl.hxx"
+#include <salgdiimpl.hxx>
 #include "gdiimpl.hxx"
-#include "opengl/win/gdiimpl.hxx"
+#include <opengl/win/gdiimpl.hxx>
 
 #include <vcl/opengl/OpenGLHelper.hxx>
 
diff --git a/vcl/win/gdi/salgdi2.cxx b/vcl/win/gdi/salgdi2.cxx
index 93573843677b..5f9cb45913b2 100644
--- a/vcl/win/gdi/salgdi2.cxx
+++ b/vcl/win/gdi/salgdi2.cxx
@@ -33,9 +33,9 @@
 
 #include <vcl/salbtype.hxx>
 #include <vcl/bitmapaccess.hxx>
-#include "outdata.hxx"
-#include "salgdiimpl.hxx"
-#include "opengl/win/gdiimpl.hxx"
+#include <outdata.hxx>
+#include <salgdiimpl.hxx>
+#include <opengl/win/gdiimpl.hxx>
 
 
 bool WinSalGraphics::supportsOperation( OutDevSupportType eType ) const
diff --git a/vcl/win/gdi/salnativewidgets-luna.cxx b/vcl/win/gdi/salnativewidgets-luna.cxx
index a04fbfcf06dc..73e780ca1584 100644
--- a/vcl/win/gdi/salnativewidgets-luna.cxx
+++ b/vcl/win/gdi/salnativewidgets-luna.cxx
@@ -31,26 +31,26 @@
 // Drawing in non-client area (general DWM-related info):
 //   http://msdn.microsoft.com/en-us/library/windows/desktop/bb688195%28v=vs.85%29.aspx
 
-#include "rtl/ustring.h"
+#include <rtl/ustring.h>
 
-#include "osl/module.h"
+#include <osl/module.h>
 #include <o3tl/char16_t2wchar_t.hxx>
 
 #include <opengl/win/gdiimpl.hxx>
 #include <vcl/svapp.hxx>
 #include <vcl/settings.hxx>
 
-#include "win/svsys.h"
-#include "win/salgdi.h"
-#include "win/saldata.hxx"
+#include <win/svsys.h>
+#include <win/salgdi.h>
+#include <win/saldata.hxx>
 
-#include "uxtheme.h"
-#include "vssym32.h"
+#include <uxtheme.h>
+#include <vssym32.h>
 
 #include <map>
 #include <string>
 #include <boost/optional.hpp>
-#include "ControlCacheKey.hxx"
+#include <ControlCacheKey.hxx>
 using namespace std;
 
 typedef map< wstring, HTHEME > ThemeMap;
diff --git a/vcl/win/gdi/salvd.cxx b/vcl/win/gdi/salvd.cxx
index afd4fc7a7399..615bf3ee2207 100644
--- a/vcl/win/gdi/salvd.cxx
+++ b/vcl/win/gdi/salvd.cxx
@@ -28,7 +28,7 @@
 #include <win/salinst.h>
 #include <win/salgdi.h>
 #include <win/salvd.h>
-#include "opengl/win/gdiimpl.hxx"
+#include <opengl/win/gdiimpl.hxx>
 
 HBITMAP WinSalVirtualDevice::ImplCreateVirDevBitmap(HDC hDC, long nDX, long nDY, sal_uInt16 nBitCount, void **ppData)
 {
diff --git a/vcl/win/gdi/winlayout.cxx b/vcl/win/gdi/winlayout.cxx
index cb70d9268514..5561657fbf5a 100644
--- a/vcl/win/gdi/winlayout.cxx
+++ b/vcl/win/gdi/winlayout.cxx
@@ -18,8 +18,8 @@
  */
 
 #include <memory>
-#include "osl/module.h"
-#include "osl/file.h"
+#include <osl/module.h>
+#include <osl/file.h>
 
 #include <comphelper/windowserrorstring.hxx>
 
@@ -31,12 +31,12 @@
 #include <win/saldata.hxx>
 #include <outdev.h>
 
-#include "win/DWriteTextRenderer.hxx"
+#include <win/DWriteTextRenderer.hxx>
 
-#include "sft.hxx"
-#include "sallayout.hxx"
-#include "CommonSalLayout.hxx"
-#include "win/ScopedHDC.hxx"
+#include <sft.hxx>
+#include <sallayout.hxx>
+#include <CommonSalLayout.hxx>
+#include <win/ScopedHDC.hxx>
 
 #include <cstdio>
 #include <cstdlib>