Resolves fdo#70681: fixincludeguards.pl: all that's left

Change-Id: I3e51a62710bb46c8255fd228d41d9300c90a1fb5
Reviewed-on: https://gerrit.libreoffice.org/9360
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

11 files changed, 25 insertions, 25 deletions

diff --git a/vcl/generic/glyphs/scrptrun.h b/vcl/generic/glyphs/scrptrun.h
index c57619396c43..6e9bbd66cb81 100644
--- a/vcl/generic/glyphs/scrptrun.h
+++ b/vcl/generic/glyphs/scrptrun.h
@@ -34,8 +34,8 @@
  *   created by: Eric R. Mader
  */
 
-#ifndef __SCRPTRUN_H
-#define __SCRPTRUN_H
+#ifndef INCLUDED_VCL_GENERIC_GLYPHS_SCRPTRUN_H
+#define INCLUDED_VCL_GENERIC_GLYPHS_SCRPTRUN_H
 
 #include <sal/config.h>
 
diff --git a/vcl/generic/print/prtsetup.hxx b/vcl/generic/print/prtsetup.hxx
index b7830cf9ab8d..dfa124911c15 100644
--- a/vcl/generic/print/prtsetup.hxx
+++ b/vcl/generic/print/prtsetup.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _PAD_PRTSETUP_HXX_
-#define _PAD_PRTSETUP_HXX_
+#ifndef INCLUDED_VCL_GENERIC_PRINT_PRTSETUP_HXX
+#define INCLUDED_VCL_GENERIC_PRINT_PRTSETUP_HXX
 
 #include "tools/link.hxx"
 
diff --git a/vcl/inc/quartz/salvd.h b/vcl/inc/quartz/salvd.h
index 7b53e06c4260..f48a19a1915d 100644
--- a/vcl/inc/quartz/salvd.h
+++ b/vcl/inc/quartz/salvd.h
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_VCL_INC_OSX_SALVD_H
-#define INCLUDED_VCL_INC_OSX_SALVD_H
+#ifndef INCLUDED_VCL_INC_QUARTZ_SALVD_H
+#define INCLUDED_VCL_INC_QUARTZ_SALVD_H
 
 #include "premac.h"
 #ifdef MACOSX
@@ -64,6 +64,6 @@ public:
     virtual void                       GetSize( long& rWidth, long& rHeight ) SAL_OVERRIDE;
 };
 
-#endif // INCLUDED_VCL_INC_OSX_SALVD_H
+#endif // INCLUDED_VCL_INC_QUARTZ_SALVD_H
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/unx/XIM.h b/vcl/inc/unx/XIM.h
index 0a330003eed9..4239921aee4d 100644
--- a/vcl/inc/unx/XIM.h
+++ b/vcl/inc/unx/XIM.h
@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _XIM_h
-#define _XIM_h
+#ifndef INCLUDED_VCL_INC_UNX_XIM_H
+#define INCLUDED_VCL_INC_UNX_XIM_H
 
 #include <X11/Xlib.h>
 #include <X11/Xresource.h>
diff --git a/vcl/inc/unx/gtk/hudawareness.h b/vcl/inc/unx/gtk/hudawareness.h
index 6eaa7fee55bc..eb80e12fe4f3 100644
--- a/vcl/inc/unx/gtk/hudawareness.h
+++ b/vcl/inc/unx/gtk/hudawareness.h
@@ -7,8 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef _hudawareness_h_
-#define _hudawareness_h_
+#ifndef INCLUDED_VCL_INC_UNX_GTK_HUDAWARENESS_H
+#define INCLUDED_VCL_INC_UNX_GTK_HUDAWARENESS_H
 
 #include <gio/gio.h>
 
@@ -29,4 +29,4 @@ void                    hud_awareness_unregister                        (GDBusCo
 
 G_END_DECLS
 
-#endif /* _hudawareness_h_ */
+#endif // INCLUDED_VCL_INC_UNX_GTK_HUDAWARENESS_H
diff --git a/vcl/inc/unx/tde/tdedata.hxx b/vcl/inc/unx/tde/tdedata.hxx
index bc937765cb5f..2df9bf3cb013 100644
--- a/vcl/inc/unx/tde/tdedata.hxx
+++ b/vcl/inc/unx/tde/tdedata.hxx
@@ -27,8 +27,8 @@
  *
  ************************************************************************/
 
-#ifndef _VCL_TDEDATA_HXX
-#define _VCL_TDEDATA_HXX
+#ifndef INCLUDED_VCL_INC_UNX_TDE_TDEDATA_HXX
+#define INCLUDED_VCL_INC_UNX_TDE_TDEDATA_HXX
 
 #include <unx/saldisp.hxx>
 #include <unx/saldata.hxx>
@@ -109,6 +109,6 @@ public:
     void doStartup();
 };
 
-#endif // _VCL_TDEDATA_HXX
+#endif // INCLUDED_VCL_INC_UNX_TDE_TDEDATA_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx
index 29a1d98b8641..b802474a8da5 100644
--- a/vcl/osx/OSXTransferable.hxx
+++ b/vcl/osx/OSXTransferable.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _TRANSFERABLE_HXX_
-#define _TRANSFERABLE_HXX_
+#ifndef INCLUDED_VCL_OSX_OSXTRANSFERABLE_HXX
+#define INCLUDED_VCL_OSX_OSXTRANSFERABLE_HXX
 
 #include <com/sun/star/datatransfer/XTransferable.hpp>
 #include <cppuhelper/implbase1.hxx>
diff --git a/vcl/source/filter/jpeg/JpegTransform.hxx b/vcl/source/filter/jpeg/JpegTransform.hxx
index fe8ed376c8a0..0711f2337673 100644
--- a/vcl/source/filter/jpeg/JpegTransform.hxx
+++ b/vcl/source/filter/jpeg/JpegTransform.hxx
@@ -37,6 +37,6 @@ public:
     bool perform();
 };
 
-#endif // _JPEG_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEGTRANSFORM_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/source/filter/jpeg/jpeg.hxx b/vcl/source/filter/jpeg/jpeg.hxx
index 1b4ac2e028e1..1280e8b70bfe 100644
--- a/vcl/source/filter/jpeg/jpeg.hxx
+++ b/vcl/source/filter/jpeg/jpeg.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _JPEG_HXX
-#define _JPEG_HXX
+#ifndef INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX
+#define INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX
 
 #include <vcl/graph.hxx>
 #include <vcl/fltcall.hxx>
@@ -33,6 +33,6 @@ bool ExportJPEG(SvStream& rOutputStream,
                     const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >* pFilterData,
                     bool* pExportWasGrey = NULL);
 
-#endif // _JPEG_HXX
+#endif // INCLUDED_VCL_SOURCE_FILTER_JPEG_JPEG_HXX
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/gtk/fpicker/eventnotification.hxx b/vcl/unx/gtk/fpicker/eventnotification.hxx
index 50ad540887be..0697e2599ffe 100644
--- a/vcl/unx/gtk/fpicker/eventnotification.hxx
+++ b/vcl/unx/gtk/fpicker/eventnotification.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _EVENTNOTIFICATION_HXX_
-#define _EVENTNOTIFICATION_HXX_
+#ifndef INCLUDED_VCL_UNX_GTK_FPICKER_EVENTNOTIFICATION_HXX
+#define INCLUDED_VCL_UNX_GTK_FPICKER_EVENTNOTIFICATION_HXX
 
 #include <com/sun/star/uno/XInterface.hpp>
 #include <com/sun/star/uno/Reference.hxx>
diff --git a/vcl/unx/kde/FPServiceInfo.hxx b/vcl/unx/kde/FPServiceInfo.hxx
index 49f30c1da9c4..34096b9f6cf9 100644
--- a/vcl/unx/kde/FPServiceInfo.hxx
+++ b/vcl/unx/kde/FPServiceInfo.hxx
@@ -17,8 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef _FPSERVICEINFO_HXX_
-#define _FPSERVICEINFO_HXX_
+#ifndef INCLUDED_VCL_UNX_KDE_FPSERVICEINFO_HXX
+#define INCLUDED_VCL_UNX_KDE_FPSERVICEINFO_HXX
 
 #include <config_vclplug.h>