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

Tracepoints.h.in is not modified to use the pragma as it requires
self-inclusion.

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>
This commit is contained in:
Kieran Bingham 2021-11-23 17:23:07 +00:00
parent 0701f756b9
commit df131ad088
33 changed files with 64 additions and 132 deletions

View file

@ -4,8 +4,8 @@
*
* bayer_format.h - Bayer Pixel Format
*/
#ifndef __LIBCAMERA_INTERNAL_BAYER_FORMAT_H__
#define __LIBCAMERA_INTERNAL_BAYER_FORMAT_H__
#pragma once
#include <stdint.h>
#include <string>
@ -69,5 +69,3 @@ static inline bool operator!=(const BayerFormat &lhs, const BayerFormat &rhs)
}
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_BAYER_FORMAT_H__ */

View file

@ -4,8 +4,8 @@
*
* byte_stream_buffer.h - Byte stream buffer
*/
#ifndef __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__
#define __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__
#pragma once
#include <stddef.h>
#include <stdint.h>
@ -85,5 +85,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_BYTE_STREAM_BUFFER_H__ */

View file

@ -4,8 +4,8 @@
*
* camera.h - Camera private data
*/
#ifndef __LIBCAMERA_INTERNAL_CAMERA_H__
#define __LIBCAMERA_INTERNAL_CAMERA_H__
#pragma once
#include <atomic>
#include <list>
@ -72,5 +72,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_CAMERA_H__ */

View file

@ -4,8 +4,8 @@
*
* camera_controls.h - Camera controls
*/
#ifndef __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__
#define __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__
#pragma once
#include "libcamera/internal/control_validator.h"
@ -26,5 +26,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_CAMERA_CONTROLS_H__ */

View file

@ -4,8 +4,8 @@
*
* camera_sensor.h - A camera sensor
*/
#ifndef __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__
#define __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__
#pragma once
#include <memory>
#include <string>
@ -94,5 +94,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_CAMERA_SENSOR_H__ */

View file

@ -4,8 +4,8 @@
*
* camera_sensor_properties.h - Database of camera sensor properties
*/
#ifndef __LIBCAMERA_SENSOR_CAMERA_SENSOR_PROPERTIES_H__
#define __LIBCAMERA_SENSOR_CAMERA_SENSOR_PROPERTIES_H__
#pragma once
#include <map>
#include <string>
@ -22,5 +22,3 @@ struct CameraSensorProperties {
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_SENSOR_CAMERA_SENSOR_PROPERTIES_H__ */

View file

@ -4,8 +4,8 @@
*
* control_serializer.h - Control (de)serializer
*/
#ifndef __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__
#define __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__
#pragma once
#include <map>
#include <memory>
@ -60,5 +60,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_CONTROL_SERIALIZER_H__ */

View file

@ -4,8 +4,8 @@
*
* control_validator.h - Control validator
*/
#ifndef __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__
#define __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__
#pragma once
#include <string>
@ -23,5 +23,3 @@ public:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_CONTROL_VALIDATOR_H__ */

View file

@ -4,8 +4,8 @@
*
* delayed_controls.h - Helper to deal with controls that take effect with a delay
*/
#ifndef __LIBCAMERA_INTERNAL_DELAYED_CONTROLS_H__
#define __LIBCAMERA_INTERNAL_DELAYED_CONTROLS_H__
#pragma once
#include <stdint.h>
#include <unordered_map>
@ -82,5 +82,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_DELAYED_CONTROLS_H__ */

View file

@ -4,8 +4,8 @@
*
* device_enumerator.h - API to enumerate and find media devices
*/
#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__
#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__
#pragma once
#include <memory>
#include <string>
@ -55,5 +55,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_H__ */

View file

@ -4,8 +4,8 @@
*
* device_enumerator_sysfs.h - sysfs-based device enumerator
*/
#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__
#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__
#pragma once
#include <memory>
#include <string>
@ -28,5 +28,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_SYSFS_H__ */

View file

@ -4,8 +4,8 @@
*
* device_enumerator_udev.h - udev-based device enumerator
*/
#ifndef __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__
#define __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__
#pragma once
#include <list>
#include <map>
@ -71,5 +71,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_DEVICE_ENUMERATOR_UDEV_H__ */

View file

@ -5,8 +5,7 @@
* formats.h - libcamera image formats
*/
#ifndef __LIBCAMERA_INTERNAL_FORMATS_H__
#define __LIBCAMERA_INTERNAL_FORMATS_H__
#pragma once
#include <array>
#include <map>
@ -68,5 +67,3 @@ public:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_FORMATS_H__ */

View file

@ -4,8 +4,8 @@
*
* framebuffer.h - Internal frame buffer handling
*/
#ifndef __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__
#define __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__
#pragma once
#include <libcamera/base/class.h>
@ -29,5 +29,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_FRAMEBUFFER_H__ */

View file

@ -4,8 +4,8 @@
*
* ipa_data_serializer.h - Image Processing Algorithm data serializer
*/
#ifndef __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_H__
#define __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_H__
#pragma once
#include <deque>
#include <iostream>
@ -304,5 +304,3 @@ public:
#endif /* __DOXYGEN__ */
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPA_DATA_SERIALIZER_H__ */

View file

@ -4,8 +4,8 @@
*
* ipa_manager.h - Image Processing Algorithm module manager
*/
#ifndef __LIBCAMERA_INTERNAL_IPA_MANAGER_H__
#define __LIBCAMERA_INTERNAL_IPA_MANAGER_H__
#pragma once
#include <stdint.h>
#include <vector>
@ -68,5 +68,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPA_MANAGER_H__ */

View file

@ -4,8 +4,8 @@
*
* ipa_module.h - Image Processing Algorithm module
*/
#ifndef __LIBCAMERA_INTERNAL_IPA_MODULE_H__
#define __LIBCAMERA_INTERNAL_IPA_MODULE_H__
#pragma once
#include <stdint.h>
#include <string>
@ -58,5 +58,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPA_MODULE_H__ */

View file

@ -4,8 +4,8 @@
*
* ipa_proxy.h - Image Processing Algorithm proxy
*/
#ifndef __LIBCAMERA_INTERNAL_IPA_PROXY_H__
#define __LIBCAMERA_INTERNAL_IPA_PROXY_H__
#pragma once
#include <memory>
#include <string>
@ -44,5 +44,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPA_PROXY_H__ */

View file

@ -4,8 +4,8 @@
*
* ipc_pipe.h - Image Processing Algorithm IPC module for IPA proxies
*/
#ifndef __LIBCAMERA_INTERNAL_IPA_IPC_H__
#define __LIBCAMERA_INTERNAL_IPA_IPC_H__
#pragma once
#include <vector>
@ -67,5 +67,3 @@ protected:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPA_IPC_H__ */

View file

@ -4,8 +4,8 @@
*
* ipc_pipe_unixsocket.h - Image Processing Algorithm IPC module using unix socket
*/
#ifndef __LIBCAMERA_INTERNAL_IPA_IPC_UNIXSOCKET_H__
#define __LIBCAMERA_INTERNAL_IPA_IPC_UNIXSOCKET_H__
#pragma once
#include <map>
#include <memory>
@ -45,5 +45,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPA_IPC_UNIXSOCKET_H__ */

View file

@ -5,8 +5,7 @@
* ipc_unixsocket.h - IPC mechanism based on Unix sockets
*/
#ifndef __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__
#define __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__
#pragma once
#include <stdint.h>
#include <sys/types.h>
@ -57,5 +56,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_IPC_UNIXSOCKET_H__ */

View file

@ -4,8 +4,8 @@
*
* mapped_framebuffer.h - Frame buffer memory mapping support
*/
#ifndef __LIBCAMERA_INTERNAL_MAPPED_FRAMEBUFFER_H__
#define __LIBCAMERA_INTERNAL_MAPPED_FRAMEBUFFER_H__
#pragma once
#include <stdint.h>
#include <vector>
@ -60,5 +60,3 @@ public:
LIBCAMERA_FLAGS_ENABLE_OPERATORS(MappedFrameBuffer::MapFlag)
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_MAPPED_FRAMEBUFFER_H__ */

View file

@ -4,8 +4,8 @@
*
* media_device.h - Media device handler
*/
#ifndef __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__
#define __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__
#pragma once
#include <map>
#include <sstream>
@ -92,5 +92,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_MEDIA_DEVICE_H__ */

View file

@ -4,8 +4,8 @@
*
* media_object.h - Media Device objects: entities, pads and links.
*/
#ifndef __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__
#define __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__
#pragma once
#include <string>
#include <vector>
@ -132,5 +132,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_MEDIA_OBJECT_H__ */

View file

@ -4,8 +4,8 @@
*
* pipeline_handler.h - Pipeline handler infrastructure
*/
#ifndef __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
#define __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__
#pragma once
#include <memory>
#include <set>
@ -118,5 +118,3 @@ private: \
static handler##Factory global_##handler##Factory;
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_PIPELINE_HANDLER_H__ */

View file

@ -4,8 +4,8 @@
*
* process.h - Process object
*/
#ifndef __LIBCAMERA_INTERNAL_PROCESS_H__
#define __LIBCAMERA_INTERNAL_PROCESS_H__
#pragma once
#include <signal.h>
#include <string>
@ -80,5 +80,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_PROCESS_H__ */

View file

@ -4,8 +4,8 @@
*
* pub_key.h - Public key signature verification
*/
#ifndef __LIBCAMERA_INTERNAL_PUB_KEY_H__
#define __LIBCAMERA_INTERNAL_PUB_KEY_H__
#pragma once
#include <stdint.h>
@ -34,5 +34,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_PUB_KEY_H__ */

View file

@ -4,8 +4,8 @@
*
* source_paths.h - Identify libcamera source and build paths
*/
#ifndef __LIBCAMERA_INTERNAL_SOURCE_PATHS_H__
#define __LIBCAMERA_INTERNAL_SOURCE_PATHS_H__
#pragma once
#include <string>
@ -15,5 +15,3 @@ std::string libcameraBuildPath();
std::string libcameraSourcePath();
} /* namespace libcamera::utils */
#endif /* __LIBCAMERA_INTERNAL_SOURCE_PATHS_H__ */

View file

@ -4,8 +4,8 @@
*
* sysfs.h - Miscellaneous utility functions to access sysfs
*/
#ifndef __LIBCAMERA_INTERNAL_SYSFS_H__
#define __LIBCAMERA_INTERNAL_SYSFS_H__
#pragma once
#include <string>
@ -20,5 +20,3 @@ std::string firmwareNodePath(const std::string &device);
} /* namespace sysfs */
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_SYSFS_H__ */

View file

@ -4,8 +4,8 @@
*
* v4l2_device.h - Common base for V4L2 video devices and subdevices
*/
#ifndef __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__
#define __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__
#pragma once
#include <map>
#include <memory>
@ -79,5 +79,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_V4L2_DEVICE_H__ */

View file

@ -5,8 +5,8 @@
*
* v4l2_pixelformat.h - V4L2 Pixel Format
*/
#ifndef __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__
#define __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__
#pragma once
#include <stdint.h>
#include <string>
@ -51,5 +51,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_V4L2_PIXELFORMAT_H__ */

View file

@ -4,8 +4,8 @@
*
* v4l2_subdevice.h - V4L2 Subdevice
*/
#ifndef __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__
#define __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__
#pragma once
#include <memory>
#include <string>
@ -78,5 +78,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_V4L2_SUBDEVICE_H__ */

View file

@ -4,8 +4,8 @@
*
* v4l2_videodevice.h - V4L2 Video Device
*/
#ifndef __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__
#define __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__
#pragma once
#include <array>
#include <atomic>
@ -278,5 +278,3 @@ private:
};
} /* namespace libcamera */
#endif /* __LIBCAMERA_INTERNAL_V4L2_VIDEODEVICE_H__ */