[Libreoffice-commits] core.git: avmedia/inc avmedia/source

George Bateman (via logerrit) logerrit at kemper.freedesktop.org
Fri Sep 4 06:52:37 UTC 2020


 avmedia/inc/bitmaps.hlst         |    5 +----
 avmedia/inc/helpids.h            |    5 +----
 avmedia/inc/strings.hrc          |    5 +----
 avmedia/source/win/wincommon.hxx |    5 +----
 4 files changed, 4 insertions(+), 16 deletions(-)

New commits:
commit 269497fff04bb5bbe982a7bcd48ea06d1507fc6b
Author:     George Bateman <george.bateman16 at gmail.com>
AuthorDate: Tue Aug 4 21:01:03 2020 +0000
Commit:     Julien Nabet <serval2412 at yahoo.fr>
CommitDate: Fri Sep 4 08:52:02 2020 +0200

    tdf#124176 Use #pragma once in avmedia
    
    This commit was carried out by a Python script, source of which
    is at https://bugs.documentfoundation.org/show_bug.cgi?id=124176#c97.
    
    Change-Id: Iec8964e460e26778bbe9fe33e6130d7f179fae51
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100142
    Tested-by: Jenkins
    Reviewed-by: Julien Nabet <serval2412 at yahoo.fr>

diff --git a/avmedia/inc/bitmaps.hlst b/avmedia/inc/bitmaps.hlst
index 682d090fe7b1..0ce3ca1f77c0 100644
--- a/avmedia/inc/bitmaps.hlst
+++ b/avmedia/inc/bitmaps.hlst
@@ -7,12 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#ifndef INCLUDED_AVMEDIA_INC_BITMAPS_HRC
-#define INCLUDED_AVMEDIA_INC_BITMAPS_HRC
+#pragma once
 
 #define AVMEDIA_BMP_AUDIOLOGO       "avmedia/res/avaudiologo.png"
 #define AVMEDIA_BMP_EMPTYLOGO       "avmedia/res/avemptylogo.png"
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/avmedia/inc/helpids.h b/avmedia/inc/helpids.h
index 3d9a8c782369..c21ba79c9016 100644
--- a/avmedia/inc/helpids.h
+++ b/avmedia/inc/helpids.h
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_AVMEDIA_INC_HELPIDS_H
-#define INCLUDED_AVMEDIA_INC_HELPIDS_H
+#pragma once
 
 #define HID_AVMEDIA_TOOLBOXITEM_PLAY                       "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PLAY"
 #define HID_AVMEDIA_TOOLBOXITEM_PAUSE                      "AVMEDIA_HID_AVMEDIA_TOOLBOXITEM_PAUSE"
@@ -32,6 +31,4 @@
 #define HID_AVMEDIA_VOLUMESLIDER                           "AVMEDIA_HID_AVMEDIA_VOLUMESLIDER"
 #define HID_AVMEDIA_PLAYERWINDOW                           "AVMEDIA_HID_AVMEDIA_PLAYERWINDOW"
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/inc/strings.hrc b/avmedia/inc/strings.hrc
index 2b1b23412ff1..26e6b8fbd478 100644
--- a/avmedia/inc/strings.hrc
+++ b/avmedia/inc/strings.hrc
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_AVMEDIA_INC_STRINGS_HRC
-#define INCLUDED_AVMEDIA_INC_STRINGS_HRC
+#pragma once
 
 #define NC_(Context, String) reinterpret_cast<char const *>(Context "\004" u8##String)
 
@@ -45,6 +44,4 @@
 #define AVMEDIA_STR_ERR_URL         NC_("AVMEDIA_STR_ERR_URL", "The format of the selected file is not supported.")
 #define AVMEDIA_STR_ZOOM_TOOLTIP    NC_("AVMEDIA_STR_ZOOM_TOOLTIP", "View")
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/wincommon.hxx b/avmedia/source/win/wincommon.hxx
index f0277e169132..5572f6c3e63d 100644
--- a/avmedia/source/win/wincommon.hxx
+++ b/avmedia/source/win/wincommon.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
-#define INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
+#pragma once
 
 #include <osl/mutex.hxx>
 #include <rtl/ustring.hxx>
@@ -39,6 +38,4 @@
 
 #define WM_GRAPHNOTIFY (WM_USER + 567)
 
-#endif // INCLUDED_AVMEDIA_SOURCE_WIN_WINCOMMON_HXX
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list