avmedia/source/win/framegrabber.hxx | 5 +----
avmedia/source/win/interface.hxx | 5 +----
avmedia/source/win/player.hxx | 5 +----
avmedia/source/win/window.hxx | 5 +----
basctl/source/basicide/brkdlg.hxx | 5 +----
basctl/source/basicide/documentenumeration.hxx | 6 +-----
basctl/source/basicide/iderdll2.hxx | 5 +----
basctl/source/basicide/linenumberwindow.hxx | 6 +-----
svx/source/gallery2/codec.hxx | 5 +----
svx/source/gallery2/galbrws1.hxx | 5 +----
svx/source/gallery2/gallerydrawmodel.hxx | 5 +----
11 files changed, 11 insertions(+), 46 deletions(-)
New commits:
commit fd1cd5522283f279a01d6d673f676a1346e9358b
Author: Harshit Jain <harshitjain1371...@gmail.com>
AuthorDate: Mon Mar 23 13:33:40 2020 +0530
Commit: Muhammet Kara <muhammet.k...@collabora.com>
CommitDate: Mon Mar 23 12:35:57 2020 +0100
tdf#124176: Use pragma once instead of include guards
Change-Id: Ia4a6b35a9a734e9fa1dc9dea702fc1ec370021f2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90901
Tested-by: Jenkins
Reviewed-by: Muhammet Kara <muhammet.k...@collabora.com>
diff --git a/avmedia/source/win/framegrabber.hxx
b/avmedia/source/win/framegrabber.hxx
index ba496fa5b99f..cfd708b08353 100644
--- a/avmedia/source/win/framegrabber.hxx
+++ b/avmedia/source/win/framegrabber.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
-#define INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
+#pragma once
#include "wincommon.hxx"
#include <cppuhelper/implbase.hxx>
@@ -55,6 +54,4 @@ private:
} // namespace win
} // namespace avmedia
-#endif // INCLUDED_AVMEDIA_SOURCE_WIN_FRAMEGRABBER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/interface.hxx b/avmedia/source/win/interface.hxx
index 08584777c7e6..a52c6ab1f36c 100644
--- a/avmedia/source/win/interface.hxx
+++ b/avmedia/source/win/interface.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_INTERFACE_HXX
-#define INCLUDED_AVMEDIA_SOURCE_WIN_INTERFACE_HXX
+#pragma once
extern "C" const CLSID CLSID_MediaDet;
extern "C" const IID IID_IMediaDet;
@@ -118,6 +117,4 @@ protected:
~ISampleGrabber() {}
};
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx
index a95445bf33a0..9bdc0cb69c79 100644
--- a/avmedia/source/win/player.hxx
+++ b/avmedia/source/win/player.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
-#define INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
+#pragma once
#include <sal/config.h>
@@ -117,6 +116,4 @@ private:
} // namespace win
} // namespace avmedia
-#endif // INCLUDED_AVMEDIA_SOURCE_WIN_PLAYER_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx
index 32ae3504f6d5..84b5423d9815 100644
--- a/avmedia/source/win/window.hxx
+++ b/avmedia/source/win/window.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
-#define INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
+#pragma once
#include <sal/config.h>
@@ -113,6 +112,4 @@ private:
} // namespace win
} // namespace avmedia
-#endif // INCLUDED_AVMEDIA_SOURCE_WIN_WINDOW_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/brkdlg.hxx
b/basctl/source/basicide/brkdlg.hxx
index c11f15c1ea98..c0db6576ca9a 100644
--- a/basctl/source/basicide/brkdlg.hxx
+++ b/basctl/source/basicide/brkdlg.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
+#pragma once
#include <vcl/weld.hxx>
#include "breakpoint.hxx"
@@ -57,6 +56,4 @@ public:
} // namespace basctl
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_BRKDLG_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/documentenumeration.hxx
b/basctl/source/basicide/documentenumeration.hxx
index 2dbe7b6621f3..381f2aaf867d 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX
+#pragma once
#include <com/sun/star/frame/XController.hpp>
#include <memory>
@@ -90,7 +89,4 @@ namespace basctl { namespace docs {
} } // namespace basctl::docs
-
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_DOCUMENTENUMERATION_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/iderdll2.hxx
b/basctl/source/basicide/iderdll2.hxx
index 975811c769c3..99534119f815 100644
--- a/basctl/source/basicide/iderdll2.hxx
+++ b/basctl/source/basicide/iderdll2.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_IDERDLL2_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_IDERDLL2_HXX
+#pragma once
class StarBASIC;
class SvxSearchItem;
@@ -65,6 +64,4 @@ public:
} // namespace basctl
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_IDERDLL2_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/basctl/source/basicide/linenumberwindow.hxx
b/basctl/source/basicide/linenumberwindow.hxx
index 38cf6788fa7b..5e268c69254b 100644
--- a/basctl/source/basicide/linenumberwindow.hxx
+++ b/basctl/source/basicide/linenumberwindow.hxx
@@ -7,9 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
-#ifndef INCLUDED_BASCTL_SOURCE_BASICIDE_LINENUMBERWINDOW_HXX
-#define INCLUDED_BASCTL_SOURCE_BASICIDE_LINENUMBERWINDOW_HXX
-
+#pragma once
#include <vcl/window.hxx>
@@ -45,6 +43,4 @@ public:
} // namespace basctl
-#endif // INCLUDED_BASCTL_SOURCE_BASICIDE_LINENUMBERWINDOW_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/codec.hxx b/svx/source/gallery2/codec.hxx
index efde247c9475..35ead899ccb7 100644
--- a/svx/source/gallery2/codec.hxx
+++ b/svx/source/gallery2/codec.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SOURCE_GALLERY2_CODEC_HXX
-#define INCLUDED_SVX_SOURCE_GALLERY2_CODEC_HXX
+#pragma once
#include <sal/types.h>
@@ -40,6 +39,4 @@ public:
static bool IsCoded( SvStream& rStm, sal_uInt32& rVersion );
};
-#endif // INCLUDED_SVX_SOURCE_GALLERY2_CODEC_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx
index 3164aadcbb3b..128ef5accb1a 100644
--- a/svx/source/gallery2/galbrws1.hxx
+++ b/svx/source/gallery2/galbrws1.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SOURCE_GALLERY2_GALBRWS1_HXX
-#define INCLUDED_SVX_SOURCE_GALLERY2_GALBRWS1_HXX
+#pragma once
#include <svl/lstner.hxx>
#include <vector>
@@ -87,6 +86,4 @@ public:
void GrabFocus();
};
-#endif // INCLUDED_SVX_SOURCE_GALLERY2_GALBRWS1_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/gallery2/gallerydrawmodel.hxx
b/svx/source/gallery2/gallerydrawmodel.hxx
index 75dc966cd2f5..0b2ef2582125 100644
--- a/svx/source/gallery2/gallerydrawmodel.hxx
+++ b/svx/source/gallery2/gallerydrawmodel.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SVX_SOURCE_GALLERY2_GALLERYDRAWMODEL_HXX
-#define INCLUDED_SVX_SOURCE_GALLERY2_GALLERYDRAWMODEL_HXX
+#pragma once
#include <sfx2/objsh.hxx>
@@ -37,6 +36,4 @@ private:
FmFormModel* mpFormModel;
};
-#endif // INCLUDED_SVX_SOURCE_GALLERY2_GALLERYDRAWMODEL_HXX
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
