[Libreoffice-commits] core.git: vcl/inc

Tor Lillqvist tml at collabora.com
Mon Dec 2 01:38:06 PST 2013


 vcl/inc/aqua/atsui/salgdi.h |    6 +++---
 vcl/inc/coretext/salgdi2.h  |    6 +++---
 vcl/inc/unx/salgdi.h        |    6 +++---
 vcl/inc/win/salgdi.h        |    6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 234705792261395d62139a4417504fd4d7a63729
Author: Tor Lillqvist <tml at collabora.com>
Date:   Mon Dec 2 11:17:13 2013 +0200

    Clear up some copypasta
    
    Change-Id: I453bd42e24b059e86e71dc2a64a0d6f524f7a197

diff --git a/vcl/inc/aqua/atsui/salgdi.h b/vcl/inc/aqua/atsui/salgdi.h
index 6d6d532..b543fe1 100644
--- a/vcl/inc/aqua/atsui/salgdi.h
+++ b/vcl/inc/aqua/atsui/salgdi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALGDI_H
-#define _SV_SALGDI_H
+#ifndef INCLUDED_VCL_INC_AQUA_ATSUI_SALGDI_H
+#define INCLUDED_VCL_INC_AQUA_ATSUI_SALGDI_H
 
 #include <vector>
 
@@ -361,6 +361,6 @@ inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
     RefreshRect( rRect.origin.x, rRect.origin.y, rRect.size.width, rRect.size.height );
 }
 
-#endif // _SV_SALGDI_H
+#endif // INCLUDED_VCL_INC_AQUA_ATSUI_SALGDI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/coretext/salgdi2.h b/vcl/inc/coretext/salgdi2.h
index 19525ae..214d12f 100644
--- a/vcl/inc/coretext/salgdi2.h
+++ b/vcl/inc/coretext/salgdi2.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALGDI_H
-#define _SV_SALGDI_H
+#ifndef INCLUDED_VCL_INC_CORETEXT_SALGDI2_H
+#define INCLUDED_VCL_INC_CORETEXT_SALGDI2_H
 
 #include <vector>
 
@@ -431,6 +431,6 @@ inline void AquaSalGraphics::RefreshRect( const NSRect& rRect )
 
 #endif
 
-#endif // _SV_SALGDI_H
+#endif // INCLUDED_VCL_INC_CORETEXT_SALGDI2_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/salgdi.h b/vcl/inc/unx/salgdi.h
index 9e3e9a5..acb3d7e 100644
--- a/vcl/inc/unx/salgdi.h
+++ b/vcl/inc/unx/salgdi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALGDI_H
-#define _SV_SALGDI_H
+#ifndef INCLUDED_VCL_INC_UNX_SALGDI_H
+#define INCLUDED_VCL_INC_UNX_SALGDI_H
 
 #include <prex.h>
 #include <postx.h>
@@ -374,6 +374,6 @@ inline Pixel X11SalGraphics::GetPixel( SalColor nSalColor ) const
 #define stderr0( s )            ;
 #endif
 
-#endif // _SV_SALGDI_H
+#endif // INCLUDED_VCL_INC_UNX_SALGDI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index b54c876..6e96c70 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _SV_SALGDI_H
-#define _SV_SALGDI_H
+#ifndef INCLUDED_VCL_INC_WIN_SALGDI_H
+#define INCLUDED_VCL_INC_WIN_SALGDI_H
 
 #include <sallayout.hxx>
 #include <salgdi.hxx>
@@ -421,6 +421,6 @@ inline bool ImplWinFontData::HasChar( sal_uInt32 cChar ) const
     return mpUnicodeMap->HasChar( cChar );
 }
 
-#endif // _SV_SALGDI_H
+#endif // INCLUDED_VCL_INC_WIN_SALGDI_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list