libcamera: 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>

17 files changed, 29 insertions, 68 deletions

diff --git a/include/libcamera/camera.h b/include/libcamera/camera.h
index 601ee46e..a7759ccb 100644
--- a/include/libcamera/camera.h
+++ b/include/libcamera/camera.h
@@ -4,8 +4,8 @@
  *
  * camera.h - Camera object interface
  */
-#ifndef __LIBCAMERA_CAMERA_H__
-#define __LIBCAMERA_CAMERA_H__
+
+#pragma once
 
 #include <memory>
 #include <set>
@@ -121,5 +121,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_CAMERA_H__ */
diff --git a/include/libcamera/camera_manager.h b/include/libcamera/camera_manager.h
index 744e5a06..7647c2a1 100644
--- a/include/libcamera/camera_manager.h
+++ b/include/libcamera/camera_manager.h
@@ -4,8 +4,8 @@
  *
  * camera_manager.h - Camera management
  */
-#ifndef __LIBCAMERA_CAMERA_MANAGER_H__
-#define __LIBCAMERA_CAMERA_MANAGER_H__
+
+#pragma once
 
 #include <memory>
 #include <string>
@@ -51,5 +51,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_CAMERA_MANAGER_H__ */
diff --git a/include/libcamera/compiler.h b/include/libcamera/compiler.h
index dc56dbb8..02564f2f 100644
--- a/include/libcamera/compiler.h
+++ b/include/libcamera/compiler.h
@@ -4,13 +4,11 @@
  *
  * compiler.h - Compiler support
  */
-#ifndef __LIBCAMERA_COMPILER_H__
-#define __LIBCAMERA_COMPILER_H__
+
+#pragma once
 
 #if __cplusplus >= 201703L
 #define __nodiscard		[[nodiscard]]
 #else
 #define __nodiscard
 #endif
-
-#endif /* __LIBCAMERA_COMPILER_H__ */
diff --git a/include/libcamera/control_ids.h.in b/include/libcamera/control_ids.h.in
index 7edeb6b6..0718a888 100644
--- a/include/libcamera/control_ids.h.in
+++ b/include/libcamera/control_ids.h.in
@@ -7,8 +7,7 @@
  * This file is auto-generated. Do not edit.
  */
 
-#ifndef __LIBCAMERA_CONTROL_IDS_H__
-#define __LIBCAMERA_CONTROL_IDS_H__
+#pragma once
 
 #include <array>
 #include <stdint.h>
@@ -36,5 +35,3 @@ ${draft_controls}
 } /* namespace controls */
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_CONTROL_IDS_H__ */
diff --git a/include/libcamera/controls.h b/include/libcamera/controls.h
index af851b46..665bcac1 100644
--- a/include/libcamera/controls.h
+++ b/include/libcamera/controls.h
@@ -5,8 +5,7 @@
  * controls.h - Control handling
  */
 
-#ifndef __LIBCAMERA_CONTROLS_H__
-#define __LIBCAMERA_CONTROLS_H__
+#pragma once
 
 #include <assert.h>
 #include <set>
@@ -421,5 +420,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_CONTROLS_H__ */
diff --git a/include/libcamera/file_descriptor.h b/include/libcamera/file_descriptor.h
index 988f9b7a..8d764f8b 100644
--- a/include/libcamera/file_descriptor.h
+++ b/include/libcamera/file_descriptor.h
@@ -4,8 +4,8 @@
  *
  * file_descriptor.h - File descriptor wrapper
  */
-#ifndef __LIBCAMERA_FILE_DESCRIPTOR_H__
-#define __LIBCAMERA_FILE_DESCRIPTOR_H__
+
+#pragma once
 
 #include <memory>
 #include <sys/types.h>
@@ -47,5 +47,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_FILE_DESCRIPTOR_H__ */
diff --git a/include/libcamera/formats.h.in b/include/libcamera/formats.h.in
index 8e7b9581..ead5287d 100644
--- a/include/libcamera/formats.h.in
+++ b/include/libcamera/formats.h.in
@@ -6,8 +6,8 @@
  *
  * This file is auto-generated. Do not edit.
  */
-#ifndef __LIBCAMERA_FORMATS_H__
-#define __LIBCAMERA_FORMATS_H__
+
+#pragma once
 
 #include <stdint.h>
 
@@ -40,5 +40,3 @@ ${formats}
 } /* namespace formats */
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_FORMATS_H__ */
diff --git a/include/libcamera/framebuffer.h b/include/libcamera/framebuffer.h
index 7f2f176a..4e710e33 100644
--- a/include/libcamera/framebuffer.h
+++ b/include/libcamera/framebuffer.h
@@ -4,8 +4,8 @@
  *
  * framebuffer.h - Frame buffer handling
  */
-#ifndef __LIBCAMERA_FRAMEBUFFER_H__
-#define __LIBCAMERA_FRAMEBUFFER_H__
+
+#pragma once
 
 #include <assert.h>
 #include <limits>
@@ -81,5 +81,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_FRAMEBUFFER_H__ */
diff --git a/include/libcamera/framebuffer_allocator.h b/include/libcamera/framebuffer_allocator.h
index cbc9ce10..45ff232b 100644
--- a/include/libcamera/framebuffer_allocator.h
+++ b/include/libcamera/framebuffer_allocator.h
@@ -4,8 +4,8 @@
  *
  * framebuffer_allocator.h - FrameBuffer allocator
  */
-#ifndef __LIBCAMERA_FRAMEBUFFER_ALLOCATOR_H__
-#define __LIBCAMERA_FRAMEBUFFER_ALLOCATOR_H__
+
+#pragma once
 
 #include <map>
 #include <memory>
@@ -39,5 +39,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_FRAMEBUFFER_ALLOCATOR_H__ */
diff --git a/include/libcamera/geometry.h b/include/libcamera/geometry.h
index fa7ae7bc..713f71c1 100644
--- a/include/libcamera/geometry.h
+++ b/include/libcamera/geometry.h
@@ -5,8 +5,7 @@
  * geometry.h - Geometry-related classes
  */
 
-#ifndef __LIBCAMERA_GEOMETRY_H__
-#define __LIBCAMERA_GEOMETRY_H__
+#pragma once
 
 #include <algorithm>
 #include <string>
@@ -293,5 +292,3 @@ static inline bool operator!=(const Rectangle &lhs, const Rectangle &rhs)
 }
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_GEOMETRY_H__ */
diff --git a/include/libcamera/logging.h b/include/libcamera/logging.h
index 2b6dd3f4..c36882b9 100644
--- a/include/libcamera/logging.h
+++ b/include/libcamera/logging.h
@@ -4,8 +4,8 @@
  *
  * logging.h - Logging infrastructure
  */
-#ifndef __LIBCAMERA_LOGGING_H__
-#define __LIBCAMERA_LOGGING_H__
+
+#pragma once
 
 namespace libcamera {
 
@@ -22,5 +22,3 @@ int logSetTarget(LoggingTarget target);
 void logSetLevel(const char *category, const char *level);
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_LOGGING_H__ */
diff --git a/include/libcamera/pixel_format.h b/include/libcamera/pixel_format.h
index c4ae0883..a9d7c03d 100644
--- a/include/libcamera/pixel_format.h
+++ b/include/libcamera/pixel_format.h
@@ -4,8 +4,8 @@
  *
  * pixel_format.h - libcamera Pixel Format
  */
-#ifndef __LIBCAMERA_PIXEL_FORMAT_H__
-#define __LIBCAMERA_PIXEL_FORMAT_H__
+
+#pragma once
 
 #include <set>
 #include <stdint.h>
@@ -46,5 +46,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_PIXEL_FORMAT_H__ */
diff --git a/include/libcamera/property_ids.h.in b/include/libcamera/property_ids.h.in
index 52646c1f..ff019408 100644
--- a/include/libcamera/property_ids.h.in
+++ b/include/libcamera/property_ids.h.in
@@ -7,8 +7,7 @@
  * This file is auto-generated. Do not edit.
  */
 
-#ifndef __LIBCAMERA_PROPERTY_IDS_H__
-#define __LIBCAMERA_PROPERTY_IDS_H__
+#pragma once
 
 #include <stdint.h>
 
@@ -35,5 +34,3 @@ extern const ControlIdMap properties;
 } /* namespace properties */
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_PROPERTY_IDS_H__ */
diff --git a/include/libcamera/request.h b/include/libcamera/request.h
index d16904e6..f434335b 100644
--- a/include/libcamera/request.h
+++ b/include/libcamera/request.h
@@ -4,8 +4,8 @@
  *
  * request.h - Capture request handling
  */
-#ifndef __LIBCAMERA_REQUEST_H__
-#define __LIBCAMERA_REQUEST_H__
+
+#pragma once
 
 #include <map>
 #include <memory>
@@ -83,5 +83,3 @@ private:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_REQUEST_H__ */
diff --git a/include/libcamera/stream.h b/include/libcamera/stream.h
index 0c55e716..41ec02b1 100644
--- a/include/libcamera/stream.h
+++ b/include/libcamera/stream.h
@@ -4,8 +4,8 @@
  *
  * stream.h - Video stream for a Camera
  */
-#ifndef __LIBCAMERA_STREAM_H__
-#define __LIBCAMERA_STREAM_H__
+
+#pragma once
 
 #include <map>
 #include <memory>
@@ -81,5 +81,3 @@ protected:
 };
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_STREAM_H__ */
diff --git a/include/libcamera/transform.h b/include/libcamera/transform.h
index 71b43da7..2e76b940 100644
--- a/include/libcamera/transform.h
+++ b/include/libcamera/transform.h
@@ -5,8 +5,7 @@
  * transform.h - 2D plane transforms
  */
 
-#ifndef __LIBCAMERA_TRANSFORM_H__
-#define __LIBCAMERA_TRANSFORM_H__
+#pragma once
 
 #include <string>
 
@@ -74,5 +73,3 @@ Transform transformFromRotation(int angle, bool *success = nullptr);
 const char *transformToString(Transform t);
 
 } /* namespace libcamera */
-
-#endif /* __LIBCAMERA_TRANSFORM_H__ */
diff --git a/include/libcamera/version.h.in b/include/libcamera/version.h.in
index 5e9a3091..6e24d0a8 100644
--- a/include/libcamera/version.h.in
+++ b/include/libcamera/version.h.in
@@ -6,11 +6,9 @@
  *
  * This file is auto-generated. Do not edit.
  */
-#ifndef __LIBCAMERA_VERSION_H__
-#define __LIBCAMERA_VERSION_H__
+
+#pragma once
 
 #define LIBCAMERA_VERSION_MAJOR		@LIBCAMERA_VERSION_MAJOR@
 #define LIBCAMERA_VERSION_MINOR		@LIBCAMERA_VERSION_MINOR@
 #define LIBCAMERA_VERSION_PATCH		@LIBCAMERA_VERSION_PATCH@
-
-#endif /* __LIBCAMERA_VERSION_H__ */