From 2c72ca70e2918b6bd919bcb2fa5b0fdb5f6d5165 Mon Sep 17 00:00:00 2001
From: Kieran Bingham <kieran.bingham@ideasonboard.com>
Date: Tue, 23 Nov 2021 17:23:07 +0000
Subject: cam: Convert to pragma once

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>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Jean-Michel Hautbois <jeanmichel.hautbois@ideasonboard.com>
---
 src/cam/camera_session.h | 6 ++----
 src/cam/drm.h            | 6 ++----
 src/cam/event_loop.h     | 6 ++----
 src/cam/file_sink.h      | 6 ++----
 src/cam/frame_sink.h     | 6 ++----
 src/cam/image.h          | 6 ++----
 src/cam/kms_sink.h       | 6 ++----
 src/cam/main.h           | 6 ++----
 src/cam/options.h        | 6 ++----
 src/cam/stream_options.h | 6 ++----
 10 files changed, 20 insertions(+), 40 deletions(-)

(limited to 'src')

diff --git a/src/cam/camera_session.h b/src/cam/camera_session.h
index a7f92d61..bf966bd1 100644
--- a/src/cam/camera_session.h
+++ b/src/cam/camera_session.h
@@ -4,8 +4,8 @@
  *
  * camera_session.h - Camera capture session
  */
-#ifndef __CAM_CAMERA_SESSION_H__
-#define __CAM_CAMERA_SESSION_H__
+
+#pragma once
 
 #include <memory>
 #include <stdint.h>
@@ -74,5 +74,3 @@ private:
 	std::unique_ptr<libcamera::FrameBufferAllocator> allocator_;
 	std::vector<std::unique_ptr<libcamera::Request>> requests_;
 };
-
-#endif /* __CAM_CAMERA_SESSION_H__ */
diff --git a/src/cam/drm.h b/src/cam/drm.h
index 0b88f9a3..de57e445 100644
--- a/src/cam/drm.h
+++ b/src/cam/drm.h
@@ -4,8 +4,8 @@
  *
  * drm.h - DRM/KMS Helpers
  */
-#ifndef __CAM_DRM_H__
-#define __CAM_DRM_H__
+
+#pragma once
 
 #include <array>
 #include <list>
@@ -330,5 +330,3 @@ private:
 };
 
 } /* namespace DRM */
-
-#endif /* __CAM_DRM_H__ */
diff --git a/src/cam/event_loop.h b/src/cam/event_loop.h
index 57bb6fb3..a4613eb2 100644
--- a/src/cam/event_loop.h
+++ b/src/cam/event_loop.h
@@ -4,8 +4,8 @@
  *
  * event_loop.h - cam - Event loop
  */
-#ifndef __CAM_EVENT_LOOP_H__
-#define __CAM_EVENT_LOOP_H__
+
+#pragma once
 
 #include <functional>
 #include <memory>
@@ -61,5 +61,3 @@ private:
 				     void *param);
 	void dispatchCall();
 };
-
-#endif /* __CAM_EVENT_LOOP_H__ */
diff --git a/src/cam/file_sink.h b/src/cam/file_sink.h
index 8de93a01..067736f5 100644
--- a/src/cam/file_sink.h
+++ b/src/cam/file_sink.h
@@ -4,8 +4,8 @@
  *
  * file_sink.h - File Sink
  */
-#ifndef __CAM_FILE_SINK_H__
-#define __CAM_FILE_SINK_H__
+
+#pragma once
 
 #include <map>
 #include <memory>
@@ -38,5 +38,3 @@ private:
 	std::string pattern_;
 	std::map<libcamera::FrameBuffer *, std::unique_ptr<Image>> mappedBuffers_;
 };
-
-#endif /* __CAM_FILE_SINK_H__ */
diff --git a/src/cam/frame_sink.h b/src/cam/frame_sink.h
index 76e1fc30..ca4347cb 100644
--- a/src/cam/frame_sink.h
+++ b/src/cam/frame_sink.h
@@ -4,8 +4,8 @@
  *
  * frame_sink.h - Base Frame Sink Class
  */
-#ifndef __CAM_FRAME_SINK_H__
-#define __CAM_FRAME_SINK_H__
+
+#pragma once
 
 #include <libcamera/base/signal.h>
 
@@ -30,5 +30,3 @@ public:
 	virtual bool processRequest(libcamera::Request *request) = 0;
 	libcamera::Signal<libcamera::Request *> requestProcessed;
 };
-
-#endif /* __CAM_FRAME_SINK_H__ */
diff --git a/src/cam/image.h b/src/cam/image.h
index f7fc5b27..7953b177 100644
--- a/src/cam/image.h
+++ b/src/cam/image.h
@@ -4,8 +4,8 @@
  *
  * image.h - Multi-planar image with access to pixel data
  */
-#ifndef __CAM_IMAGE_H__
-#define __CAM_IMAGE_H__
+
+#pragma once
 
 #include <memory>
 #include <stdint.h>
@@ -48,5 +48,3 @@ private:
 namespace libcamera {
 LIBCAMERA_FLAGS_ENABLE_OPERATORS(Image::MapMode)
 }
-
-#endif /* __CAM_IMAGE_H__ */
diff --git a/src/cam/kms_sink.h b/src/cam/kms_sink.h
index 072ef1c9..1e4290ad 100644
--- a/src/cam/kms_sink.h
+++ b/src/cam/kms_sink.h
@@ -4,8 +4,8 @@
  *
  * kms_sink.h - KMS Sink
  */
-#ifndef __CAM_KMS_SINK_H__
-#define __CAM_KMS_SINK_H__
+
+#pragma once
 
 #include <list>
 #include <memory>
@@ -68,5 +68,3 @@ private:
 	std::unique_ptr<Request> queued_;
 	std::unique_ptr<Request> active_;
 };
-
-#endif /* __CAM_KMS_SINK_H__ */
diff --git a/src/cam/main.h b/src/cam/main.h
index 1c2fab76..62f7bbc9 100644
--- a/src/cam/main.h
+++ b/src/cam/main.h
@@ -4,8 +4,8 @@
  *
  * main.h - Cam application
  */
-#ifndef __CAM_MAIN_H__
-#define __CAM_MAIN_H__
+
+#pragma once
 
 enum {
 	OptCamera = 'c',
@@ -22,5 +22,3 @@ enum {
 	OptStrictFormats = 257,
 	OptMetadata = 258,
 };
-
-#endif /* __CAM_MAIN_H__ */
diff --git a/src/cam/options.h b/src/cam/options.h
index 0047b4f2..4ddd4987 100644
--- a/src/cam/options.h
+++ b/src/cam/options.h
@@ -4,8 +4,8 @@
  *
  * options.h - cam - Options parsing
  */
-#ifndef __CAM_OPTIONS_H__
-#define __CAM_OPTIONS_H__
+
+#pragma once
 
 #include <ctype.h>
 #include <list>
@@ -155,5 +155,3 @@ private:
 	std::vector<OptionValue> array_;
 	OptionsParser::Options children_;
 };
-
-#endif /* __CAM_OPTIONS_H__ */
diff --git a/src/cam/stream_options.h b/src/cam/stream_options.h
index fbbc13a3..d235b77f 100644
--- a/src/cam/stream_options.h
+++ b/src/cam/stream_options.h
@@ -4,8 +4,8 @@
  *
  * stream_options.h - Helper to parse options for streams
  */
-#ifndef __CAM_STREAM_OPTIONS_H__
-#define __CAM_STREAM_OPTIONS_H__
+
+#pragma once
 
 #include <libcamera/camera.h>
 
@@ -26,5 +26,3 @@ private:
 	static bool parseRole(libcamera::StreamRole *role,
 			      const KeyValueParser::Options &options);
 };
-
-#endif /* __CAM_STREAM_OPTIONS_H__ */
-- 
cgit v1.2.1