[libcamera-devel,08/15] gstreamer: Convert to pragma once
diff mbox series

Message ID 20211123224015.3619282-9-kieran.bingham@ideasonboard.com
State Accepted
Delegated to: Kieran Bingham
Headers show
Series
  • Use pragma once
Related show

Commit Message

Kieran Bingham Nov. 23, 2021, 10:40 p.m. UTC 
Remove the verbose #ifndef/#define/#endif pattern for maintaining
header idempotency, and replace it with a simple #pragma once.

This simplifies the headers, and prevents redundant changes when
header files get moved.

Signed-off-by: Kieran Bingham <kieran.bingham@ideasonboard.com>
---
 src/gstreamer/gstlibcamera-utils.h    | 5 +----
 src/gstreamer/gstlibcameraallocator.h | 5 +----
 src/gstreamer/gstlibcamerapad.h       | 5 +----
 src/gstreamer/gstlibcamerapool.h      | 6 +-----
 src/gstreamer/gstlibcameraprovider.h  | 6 +-----
 src/gstreamer/gstlibcamerasrc.h       | 5 +----
 6 files changed, 6 insertions(+), 26 deletions(-)

Patch
diff mbox series 

diff --git a/src/gstreamer/gstlibcamera-utils.h b/src/gstreamer/gstlibcamera-utils.h
index 7087fef0a94d..d54f15885d0c 100644
--- a/src/gstreamer/gstlibcamera-utils.h
+++ b/src/gstreamer/gstlibcamera-utils.h
@@ -6,8 +6,7 @@ 
  * gstlibcamera-utils.h - GStreamer libcamera Utility Functions
  */
 
-#ifndef __GST_LIBCAMERA_UTILS_H__
-#define __GST_LIBCAMERA_UTILS_H__
+#pragma once
 
 #include <libcamera/camera_manager.h>
 #include <libcamera/stream.h>
@@ -71,5 +70,3 @@  public:
 private:
 	GRecMutex *mutex_;
 };
-
-#endif /* __GST_LIBCAMERA_UTILS_H__ */
diff --git a/src/gstreamer/gstlibcameraallocator.h b/src/gstreamer/gstlibcameraallocator.h
index 0dbd00d00a20..0a08c3bb3bbe 100644
--- a/src/gstreamer/gstlibcameraallocator.h
+++ b/src/gstreamer/gstlibcameraallocator.h
@@ -6,8 +6,7 @@ 
  * gstlibcameraallocator.h - GStreamer Custom Allocator
  */
 
-#ifndef __GST_LIBCAMERA_ALLOCATOR_H__
-#define __GST_LIBCAMERA_ALLOCATOR_H__
+#pragma once
 
 #include <gst/gst.h>
 #include <gst/allocators/allocators.h>
@@ -30,5 +29,3 @@  gsize gst_libcamera_allocator_get_pool_size(GstLibcameraAllocator *allocator,
 					    libcamera::Stream *stream);
 
 libcamera::FrameBuffer *gst_libcamera_memory_get_frame_buffer(GstMemory *mem);
-
-#endif /* __GST_LIBCAMERA_ALLOCATOR_H__ */
diff --git a/src/gstreamer/gstlibcamerapad.h b/src/gstreamer/gstlibcamerapad.h
index 779f2d13887a..207695173313 100644
--- a/src/gstreamer/gstlibcamerapad.h
+++ b/src/gstreamer/gstlibcamerapad.h
@@ -6,8 +6,7 @@ 
  * gstlibcamerapad.h - GStreamer Capture Element
  */
 
-#ifndef __GST_LIBCAMERA_PAD_H__
-#define __GST_LIBCAMERA_PAD_H__
+#pragma once
 
 #include "gstlibcamerapool.h"
 
@@ -33,5 +32,3 @@  GstFlowReturn gst_libcamera_pad_push_pending(GstPad *pad);
 bool gst_libcamera_pad_has_pending(GstPad *pad);
 
 void gst_libcamera_pad_set_latency(GstPad *pad, GstClockTime latency);
-
-#endif /* __GST_LIBCAMERA_PAD_H__ */
diff --git a/src/gstreamer/gstlibcamerapool.h b/src/gstreamer/gstlibcamerapool.h
index a3f1b685e22e..05795d21223e 100644
--- a/src/gstreamer/gstlibcamerapool.h
+++ b/src/gstreamer/gstlibcamerapool.h
@@ -9,8 +9,7 @@ 
  * only. This pool cannot be configured or activated.
  */
 
-#ifndef __GST_LIBCAMERA_POOL_H__
-#define __GST_LIBCAMERA_POOL_H__
+#pragma once
 
 #include "gstlibcameraallocator.h"
 
@@ -29,6 +28,3 @@  libcamera::Stream *gst_libcamera_pool_get_stream(GstLibcameraPool *self);
 libcamera::Stream *gst_libcamera_buffer_get_stream(GstBuffer *buffer);
 
 libcamera::FrameBuffer *gst_libcamera_buffer_get_frame_buffer(GstBuffer *buffer);
-
-
-#endif /* __GST_LIBCAMERA_POOL_H__ */
diff --git a/src/gstreamer/gstlibcameraprovider.h b/src/gstreamer/gstlibcameraprovider.h
index bdd19db80df1..aaceabf5eff2 100644
--- a/src/gstreamer/gstlibcameraprovider.h
+++ b/src/gstreamer/gstlibcameraprovider.h
@@ -6,8 +6,7 @@ 
  * gstlibcameraprovider.h - GStreamer Device Provider
  */
 
-#ifndef __GST_LIBCAMERA_PROVIDER_H__
-#define __GST_LIBCAMERA_PROVIDER_H__
+#pragma once
 
 #include <gst/gst.h>
 
@@ -18,6 +17,3 @@  G_DECLARE_FINAL_TYPE(GstLibcameraProvider, gst_libcamera_provider,
 		     GST_LIBCAMERA, PROVIDER, GstDeviceProvider)
 
 G_END_DECLS
-
-#endif /* __GST_LIBCAMERA_PROVIDER_H__ */
-
diff --git a/src/gstreamer/gstlibcamerasrc.h b/src/gstreamer/gstlibcamerasrc.h
index 0144cbc42fa6..fdea2f10d95d 100644
--- a/src/gstreamer/gstlibcamerasrc.h
+++ b/src/gstreamer/gstlibcamerasrc.h
@@ -6,8 +6,7 @@ 
  * gstlibcamerasrc.h - GStreamer Capture Element
  */
 
-#ifndef __GST_LIBCAMERA_SRC_H__
-#define __GST_LIBCAMERA_SRC_H__
+#pragma once
 
 #include <gst/gst.h>
 
@@ -18,5 +17,3 @@  G_DECLARE_FINAL_TYPE(GstLibcameraSrc, gst_libcamera_src,
 		     GST_LIBCAMERA, SRC, GstElement)
 
 G_END_DECLS
-
-#endif /* __GST_LIBCAMERA_SRC_H__ */