qcam: 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>
This commit is contained in:
parent
b3ff91a57d
commit
4f32b0815e
7 changed files with 14 additions and 28 deletions
|
@ -4,8 +4,8 @@
|
||||||
*
|
*
|
||||||
* dng_writer.h - DNG writer
|
* dng_writer.h - DNG writer
|
||||||
*/
|
*/
|
||||||
#ifndef __QCAM_DNG_WRITER_H__
|
|
||||||
#define __QCAM_DNG_WRITER_H__
|
#pragma once
|
||||||
|
|
||||||
#ifdef HAVE_TIFF
|
#ifdef HAVE_TIFF
|
||||||
#define HAVE_DNG
|
#define HAVE_DNG
|
||||||
|
@ -25,5 +25,3 @@ public:
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* HAVE_TIFF */
|
#endif /* HAVE_TIFF */
|
||||||
|
|
||||||
#endif /* __QCAM_DNG_WRITER_H__ */
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
*
|
*
|
||||||
* format_convert.h - qcam - Convert buffer to RGB
|
* format_convert.h - qcam - Convert buffer to RGB
|
||||||
*/
|
*/
|
||||||
#ifndef __QCAM_FORMAT_CONVERTER_H__
|
|
||||||
#define __QCAM_FORMAT_CONVERTER_H__
|
#pragma once
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
|
@ -60,5 +60,3 @@ private:
|
||||||
unsigned int y_pos_;
|
unsigned int y_pos_;
|
||||||
unsigned int cb_pos_;
|
unsigned int cb_pos_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __QCAM_FORMAT_CONVERTER_H__ */
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
*
|
*
|
||||||
* main_window.h - qcam - Main application window
|
* main_window.h - qcam - Main application window
|
||||||
*/
|
*/
|
||||||
#ifndef __QCAM_MAIN_WINDOW_H__
|
|
||||||
#define __QCAM_MAIN_WINDOW_H__
|
#pragma once
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
@ -126,5 +126,3 @@ private:
|
||||||
|
|
||||||
std::vector<std::unique_ptr<libcamera::Request>> requests_;
|
std::vector<std::unique_ptr<libcamera::Request>> requests_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __QCAM_MAIN_WINDOW__ */
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
*
|
*
|
||||||
* message_handler.cpp - qcam - Log message handling
|
* message_handler.cpp - qcam - Log message handling
|
||||||
*/
|
*/
|
||||||
#ifndef __QCAM_MESSAGE_HANDLER_H__
|
|
||||||
#define __QCAM_MESSAGE_HANDLER_H__
|
#pragma once
|
||||||
|
|
||||||
#include <QtGlobal>
|
#include <QtGlobal>
|
||||||
|
|
||||||
|
@ -22,5 +22,3 @@ private:
|
||||||
static QtMessageHandler handler_;
|
static QtMessageHandler handler_;
|
||||||
static bool verbose_;
|
static bool verbose_;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __QCAM_MESSAGE_HANDLER_H__ */
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
*
|
*
|
||||||
* viewfinder.h - qcam - Viewfinder base class
|
* viewfinder.h - qcam - Viewfinder base class
|
||||||
*/
|
*/
|
||||||
#ifndef __QCAM_VIEWFINDER_H__
|
|
||||||
#define __QCAM_VIEWFINDER_H__
|
#pragma once
|
||||||
|
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
#include <QList>
|
#include <QList>
|
||||||
|
@ -30,5 +30,3 @@ public:
|
||||||
|
|
||||||
virtual QImage getCurrentImage() = 0;
|
virtual QImage getCurrentImage() = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __QCAM_VIEWFINDER_H__ */
|
|
||||||
|
|
|
@ -5,8 +5,8 @@
|
||||||
* viewfinder_GL.h - OpenGL Viewfinder for rendering by OpenGL shader
|
* viewfinder_GL.h - OpenGL Viewfinder for rendering by OpenGL shader
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
#ifndef __VIEWFINDER_GL_H__
|
|
||||||
#define __VIEWFINDER_GL_H__
|
#pragma once
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
@ -103,5 +103,3 @@ private:
|
||||||
|
|
||||||
QMutex mutex_; /* Prevent concurrent access to image_ */
|
QMutex mutex_; /* Prevent concurrent access to image_ */
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __VIEWFINDER_GL_H__ */
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
*
|
*
|
||||||
* viewfinder_qt.h - qcam - QPainter-based ViewFinder
|
* viewfinder_qt.h - qcam - QPainter-based ViewFinder
|
||||||
*/
|
*/
|
||||||
#ifndef __QCAM_VIEWFINDER_QT_H__
|
|
||||||
#define __QCAM_VIEWFINDER_QT_H__
|
#pragma once
|
||||||
|
|
||||||
#include <QIcon>
|
#include <QIcon>
|
||||||
#include <QImage>
|
#include <QImage>
|
||||||
|
@ -61,5 +61,3 @@ private:
|
||||||
QImage image_;
|
QImage image_;
|
||||||
QMutex mutex_; /* Prevent concurrent access to image_ */
|
QMutex mutex_; /* Prevent concurrent access to image_ */
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif /* __QCAM_VIEWFINDER_QT_H__ */
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue