Make include guards sane in vcl

We have a convention. Use it. Kill copypasta.

Change-Id: I512e1c8e75b5da20b6756ffc88209a27674ad7c7

vcl/aqua/source/a11y/aqua11ywrappercheckbox.h

@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERCHECKOBOX_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERCHECKBOX_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/aqua/source/a11y/aqua11ywrapperradiobutton.h

@@ -30,6 +30,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERRADIOGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOBUTTON_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/aqua/source/a11y/aqua11ywrapperradiogroup.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_AQUA11WRAPPERRADIOGROUP_H
-#define _SV_AQUA11WRAPPERRADIOGROUP_H
+#ifndef INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
+#define INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
 
 #include "aqua/aqua11ywrapper.h"
 
@@ -28,6 +28,6 @@
 -(NSArray *)accessibilityAttributeNames;
 @end
 
-#endif // _SV_AQUA11WRAPPERRADIOGROUP_H
+#endif // INCLUDED_VCL_AQUA_SOURCE_A11Y_AQUA11YWRAPPERRADIOGROUP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/saldata.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_AQUA_SALDATA_HXX
+#define INCLUDED_VCL_INC_AQUA_SALDATA_HXX
 
 #include <config_features.h>
 
@@ -118,6 +118,6 @@ sal_Bool ImplSalYieldMutexTryToAcquire();
 void ImplSalYieldMutexAcquire();
 void ImplSalYieldMutexRelease();
 
-#endif  // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_AQUA_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salframe.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALFRAME_H
+#define INCLUDED_VCL_INC_AQUA_SALFRAME_H
 
 #include <premac.h>
 #include <IOKit/pwr_mgt/IOPMLib.h>
@@ -212,6 +212,6 @@ public:
     AquaSalFrame& operator=(const AquaSalFrame&);
 };
 
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_AQUA_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salinst.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALINST_H
+#define INCLUDED_VCL_INC_AQUA_SALINST_H
 
 #include "comphelper/solarmutex.hxx"
 #include "osl/thread.hxx"
@@ -170,6 +170,6 @@ class YieldMutexReleaser
 CGImageRef CreateCGImage( const Image& );
 NSImage*   CreateNSImage( const Image& );
 
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_AQUA_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salmenu.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALMENU_H
+#define INCLUDED_VCL_INC_AQUA_SALMENU_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>
@@ -109,6 +109,6 @@ public:
     NSMenuItem*         mpMenuItem;           // The NSMenuItem
 };
 
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_AQUA_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salobj.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALOBJ_H
+#define INCLUDED_VCL_INC_AQUA_SALOBJ_H
 
 #include "vcl/sysdata.hxx"
 #include "salobj.hxx"
@@ -70,6 +70,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_AQUA_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salprn.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALPRN_H
-#define _SV_SALPRN_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALPRN_H
+#define INCLUDED_VCL_INC_AQUA_SALPRN_H
 
 #include "aqua/aquavcltypes.h"
 
@@ -160,6 +160,6 @@ inline double TenMuToPt( double nUnits ) { return floor(((nUnits)/fPtTo100thMM)+
 
 
 
-#endif // _SV_SALPRN_H
+#endif // INCLUDED_VCL_INC_AQUA_SALPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/salsys.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALSYS_H
-#define _SV_SALSYS_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALSYS_H
+#define INCLUDED_VCL_INC_AQUA_SALSYS_H
 
 #include "salsys.hxx"
 
@@ -46,6 +46,6 @@ public:
 };
 
 
-#endif // _SV_SALSYS_H
+#endif // INCLUDED_VCL_INC_AQUA_SALSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/saltimer.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALTIMER_H
+#define INCLUDED_VCL_INC_AQUA_SALTIMER_H
 
 #include "premac.h"
 #include <Cocoa/Cocoa.h>

vcl/inc/aqua/salvd.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_AQUA_SALVD_H
+#define INCLUDED_VCL_INC_AQUA_SALVD_H
 
 #include "premac.h"
 #include <ApplicationServices/ApplicationServices.h>
@@ -80,6 +80,6 @@ public:
 
 // =======================================================================
 
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_AQUA_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/aqua/svsys.h

@@ -17,13 +17,13 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_AQUA_SVSYS_H
+#define INCLUDED_VCL_INC_AQUA_SVSYS_H
 
 #include "premac.h"
 #include "Cocoa/Cocoa.h"
 #include "postmac.h"
 
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_AQUA_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/generic/genprn.h

@@ -95,7 +95,6 @@ public:
     virtual sal_uIntPtr                 GetErrorCode();
 };
 
-#endif // _SV_SALPRN_H
-
+#endif // INCLUDED_VCL_INC_GENERIC_GENPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/headless/svpinst.hxx

@@ -163,6 +163,6 @@ public:
     virtual GenPspGraphics *CreatePrintGraphics();
 };
 
-#endif // _SV_SALINST_HXX
+#endif // INCLUDED_VCL_INC_HEADLESS_SVPINST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/salbmp.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALBMP_HXX
-#define _SV_SALBMP_HXX
+#ifndef INCLUDED_VCL_INC_SALBMP_HXX
+#define INCLUDED_VCL_INC_SALBMP_HXX
 
 #include <tools/gen.hxx>
 #include <vcl/dllapi.h>

vcl/inc/salinst.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_HXX
-#define _SV_SALINST_HXX
+#ifndef INCLUDED_VCL_INC_SALINST_HXX
+#define INCLUDED_VCL_INC_SALINST_HXX
 
 #include "com/sun/star/uno/Reference.hxx"
 #include "com/sun/star/uno/XComponentContext.hpp"
@@ -196,6 +196,6 @@ void InitSalMain();
 
 VCL_DLLPUBLIC int SVMain();
 
-#endif // _SV_SALINST_HXX
+#endif // INCLUDED_VCL_INC_SALINST_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/svids.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SVIDS_HRC
-#define _SV_SVIDS_HRC
+#ifndef INCLUDED_VCL_INC_SVIDS_HRC
+#define INCLUDED_VCL_INC_SVIDS_HRC
 
 #define SV_RESID_STDOFFSET                  0
 #define SV_RESID_MONOOFFSET                 1
@@ -251,6 +251,6 @@
 #define SV_ICON_ID_FORMULA                     13
 #define SV_ICON_ID_PRINTERADMIN               501
 
-#endif  // _SV_SVIDS_HRC
+#endif // INCLUDED_VCL_INC_SVIDS_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/gtk/gtkobject.hxx

@@ -58,6 +58,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_UNX_GTK_GTKOBJECT_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/salbmp.h

@@ -17,14 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALBMP_H
-#define _SV_SALBMP_H
+#ifndef INCLUDED_VCL_INC_UNX_SALBMP_H
+#define INCLUDED_VCL_INC_UNX_SALBMP_H
 
 #include <prex.h>
 #include <postx.h>
-#ifndef _SV_SALGTYPE
 #include <vcl/salgtype.hxx>
-#endif
 #include <unx/saldisp.hxx>
 #include <salbmp.hxx>
 #include <vclpluginapi.h>
@@ -245,6 +243,6 @@ public:
     void            ImplClear();
 };
 
-#endif // _SV_SALBMP_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALBMP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/saldata.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SALDATA_HXX
+#define INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
 #include <prex.h>
 #include <postx.h>
@@ -93,6 +93,6 @@ public:
 
 X11SalData* GetX11SalData();
 
-#endif // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/saldisp.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDISP_HXX
-#define _SV_SALDISP_HXX
+#ifndef INCLUDED_VCL_INC_UNX_SALDISP_HXX
+#define INCLUDED_VCL_INC_UNX_SALDISP_HXX
 
 class   SalDisplay;
 class   SalColormap;
@@ -416,6 +416,6 @@ namespace vcl_sal {
 }
 
 
-#endif // _SV_SALDISP_HXX
+#endif // INCLUDED_VCL_INC_UNX_SALDISP_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/salframe.h

@@ -16,8 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+
+#ifndef INCLUDED_VCL_INC_UNX_SALFRAME_H
+#define INCLUDED_VCL_INC_UNX_SALFRAME_H
 
 #include <prex.h>
 #include <postx.h>
@@ -269,16 +270,6 @@ public:
     void setPendingSizeEvent();
 };
 
-#ifdef _SV_SALDISP_HXX
-
-inline Display *X11SalFrame::GetXDisplay() const
-{ return pDisplay_->GetDisplay(); }
-
-inline XLIB_Window X11SalFrame::GetDrawable() const
-{ return GetWindow(); }
-
-#endif
-
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_UNX_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/salinst.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_UNX_SALINST_H
+#define INCLUDED_VCL_INC_UNX_SALINST_H
 
 #include <tools/solar.h>
 #include <osl/thread.hxx>
@@ -82,6 +82,6 @@ public:
     virtual void            AddToRecentDocumentList(const OUString& rFileUrl, const OUString& rMimeType, const OUString& rDocumentService);
 };
 
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_UNX_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/salmenu.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_UNX_SALMENU_H
+#define INCLUDED_VCL_INC_UNX_SALMENU_H
 
 #include <tools/solar.h>
 #include <vcl/bitmap.hxx>
@@ -53,6 +53,6 @@ public:
         virtual ~X11SalMenuItem();
 };
 
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_UNX_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/salobj.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_UNX_SALOBJ_H
+#define INCLUDED_VCL_INC_UNX_SALOBJ_H
 
 #include <tools/solar.h>
 #include <vcl/sysdata.hxx>
@@ -88,6 +88,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_UNX_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/saltimer.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_UNX_SALTIMER_H
+#define INCLUDED_VCL_INC_UNX_SALTIMER_H
 
 #include <saltimer.hxx>
 

vcl/inc/unx/salvd.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_UNX_SALVD_H
+#define INCLUDED_VCL_INC_UNX_SALVD_H
 
 #include <prex.h>
 #include <postx.h>
@@ -73,22 +73,6 @@ public:
     virtual void            GetSize( long& rWidth, long& rHeight );
 };
 
-#ifdef _SV_SALDISP_HXX
-
-inline void X11SalVirtualDevice::InitGraphics( X11SalVirtualDevice *pVD )
-{ pGraphics_->Init( pVD ); }
-
-inline Display *X11SalVirtualDevice::GetXDisplay() const
-{ return pDisplay_->GetDisplay(); }
-
-inline SalDisplay *X11SalVirtualDevice::GetDisplay() const
-{ return pDisplay_; }
-
-inline sal_Bool X11SalVirtualDevice::IsDisplay() const
-{ return pDisplay_->IsDisplay(); }
-
-#endif
-
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_UNX_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/unx/svsys.h

@@ -16,12 +16,12 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_UNX_SVSYS_H
+#define INCLUDED_VCL_INC_UNX_SVSYS_H
 
 #include <prex.h>
 #include <postx.h>
 
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_UNX_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salbmp.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALBMP_H
-#define _SV_SALBMP_H
+#ifndef INCLUDED_VCL_INC_WIN_SALBMP_H
+#define INCLUDED_VCL_INC_WIN_SALBMP_H
 
 #include <tools/gen.hxx>
 #include <win/wincomp.hxx>
@@ -100,6 +100,6 @@ public:
     virtual bool                GetSystemData( BitmapSystemData& rData );
 };
 
-#endif // _SV_SALBMP_HXX
+#endif // INCLUDED_VCL_INC_WIN_SALBMP_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/saldata.hxx

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALDATA_HXX
-#define _SV_SALDATA_HXX
+#ifndef INCLUDED_VCL_INC_WIN_SALDATA_HXX
+#define INCLUDED_VCL_INC_WIN_SALDATA_HXX
 
 #include "osl/module.h"
 
@@ -313,6 +313,6 @@ inline WinSalObject* GetSalObjWindowPtr( HWND hWnd )
     return (WinSalObject*)GetWindowLongPtr( hWnd, SAL_OBJECT_THIS );
 }
 
-#endif  // _SV_SALDATA_HXX
+#endif // INCLUDED_VCL_INC_WIN_SALDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salframe.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALFRAME_H
-#define _SV_SALFRAME_H
+#ifndef INCLUDED_VCL_INC_WIN_SALFRAME_H
+#define INCLUDED_VCL_INC_WIN_SALFRAME_H
 
 #include <vcl/sysdata.hxx>
 #include <salframe.hxx>
@@ -146,6 +146,6 @@ namespace vcl_sal {
         LONG nSymbol );
 }
 
-#endif // _SV_SALFRAME_H
+#endif // INCLUDED_VCL_INC_WIN_SALFRAME_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salids.hrc

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALIDS_HRC
-#define _SV_SALIDS_HRC
+#ifndef INCLUDED_VCL_INC_WIN_SALIDS_HRC
+#define INCLUDED_VCL_INC_WIN_SALIDS_HRC
 
 // Cursor
 #define SAL_RESID_POINTER_NULL                      10000
@@ -106,6 +106,6 @@
 
 #define SAL_RESID_ICON_DEFAULT                      1
 
-#endif // _SV_SALIDS_HRC
+#endif // INCLUDED_VCL_INC_WIN_SALIDS_HRC
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salinst.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALINST_H
-#define _SV_SALINST_H
+#ifndef INCLUDED_VCL_INC_WIN_SALINST_H
+#define INCLUDED_VCL_INC_WIN_SALINST_H
 
 #include <salinst.hxx>
 
@@ -83,6 +83,6 @@ HWND ImplSalReCreateHWND( HWND hWndParent, HWND oldhWnd, sal_Bool bAsChild );
 void ImplSalStartTimer( sal_uIntPtr nMS, sal_Bool bMutex = sal_False );
 void ImplSalPrinterAbortJobAsync( HDC hPrnDC );
 
-#endif // _SV_SALINST_H
+#endif // INCLUDED_VCL_INC_WIN_SALINST_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salmenu.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALMENU_H
-#define _SV_SALMENU_H
+#ifndef INCLUDED_VCL_INC_WIN_SALMENU_H
+#define INCLUDED_VCL_INC_WIN_SALMENU_H
 
 #include <vcl/bitmap.hxx>
 #include <salmenu.hxx>
@@ -64,6 +64,6 @@ public:
     WinSalMenu*  mpSalMenu;    // the menu where this item is inserted
 };
 
-#endif // _SV_SALMENU_H
+#endif // INCLUDED_VCL_INC_WIN_SALMENU_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salobj.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALOBJ_H
-#define _SV_SALOBJ_H
+#ifndef INCLUDED_VCL_INC_WIN_SALOBJ_H
+#define INCLUDED_VCL_INC_WIN_SALOBJ_H
 
 #include <salobj.hxx>
 
@@ -55,6 +55,6 @@ public:
     virtual const SystemEnvData*    GetSystemData() const;
 };
 
-#endif // _SV_SALOBJ_H
+#endif // INCLUDED_VCL_INC_WIN_SALOBJ_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salprn.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALPRN_H
-#define _SV_SALPRN_H
+#ifndef INCLUDED_VCL_INC_WIN_SALPRN_H
+#define INCLUDED_VCL_INC_WIN_SALPRN_H
 
 #include <salprn.hxx>
 
@@ -115,6 +115,6 @@ public:
     bool isValid() const { return mbValid; }
 };
 
-#endif // _SV_SALPRN_H
+#endif // INCLUDED_VCL_INC_WIN_SALPRN_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/salsys.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALSYS_H
-#define _SV_SALSYS_H
+#ifndef INCLUDED_VCL_INC_WIN_SALSYS_H
+#define INCLUDED_VCL_INC_WIN_SALSYS_H
 
 #include <salsys.hxx>
 
@@ -75,6 +75,6 @@ public:
                                 sal_IntPtr /*LPRECT*/ );
 };
 
-#endif // _SV_SALSYS_H
+#endif // INCLUDED_VCL_INC_WIN_SALSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/saltimer.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALTIMER_H
-#define _SV_SALTIMER_H
+#ifndef INCLUDED_VCL_INC_WIN_SALTIMER_H
+#define INCLUDED_VCL_INC_WIN_SALTIMER_H
 
 #include <saltimer.hxx>
 

vcl/inc/win/salvd.h

@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALVD_H
-#define _SV_SALVD_H
+#ifndef INCLUDED_VCL_INC_WIN_SALVD_H
+#define INCLUDED_VCL_INC_WIN_SALVD_H
 
 #include <salvd.hxx>
 
@@ -55,6 +55,6 @@ public:
     virtual void                    GetSize( long& rWidth, long& rHeight );
 };
 
-#endif // _SV_SALVD_H
+#endif // INCLUDED_VCL_INC_WIN_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

vcl/inc/win/svsys.h

@@ -17,14 +17,14 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SVSYS_H
-#define _SV_SVSYS_H
+#ifndef INCLUDED_VCL_INC_WIN_SVSYS_H
+#define INCLUDED_VCL_INC_WIN_SVSYS_H
 
 #ifdef WNT
 #include <prewin.h>
 #include <postwin.h>
 #endif
 
-#endif // _SV_SVSYS_H
+#endif // INCLUDED_VCL_INC_WIN_SVSYS_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */