diff options
-rw-r--r-- | src/qcam/dng_writer.h | 6 | ||||
-rw-r--r-- | src/qcam/format_converter.h | 6 | ||||
-rw-r--r-- | src/qcam/main_window.h | 6 | ||||
-rw-r--r-- | src/qcam/message_handler.h | 6 | ||||
-rw-r--r-- | src/qcam/viewfinder.h | 6 | ||||
-rw-r--r-- | src/qcam/viewfinder_gl.h | 6 | ||||
-rw-r--r-- | src/qcam/viewfinder_qt.h | 6 |
7 files changed, 14 insertions, 28 deletions
diff --git a/src/qcam/dng_writer.h b/src/qcam/dng_writer.h index e4486288..c044bf8b 100644 --- a/src/qcam/dng_writer.h +++ b/src/qcam/dng_writer.h @@ -4,8 +4,8 @@ * * dng_writer.h - DNG writer */ -#ifndef __QCAM_DNG_WRITER_H__ -#define __QCAM_DNG_WRITER_H__ + +#pragma once #ifdef HAVE_TIFF #define HAVE_DNG @@ -25,5 +25,3 @@ public: }; #endif /* HAVE_TIFF */ - -#endif /* __QCAM_DNG_WRITER_H__ */ diff --git a/src/qcam/format_converter.h b/src/qcam/format_converter.h index 9da2df5d..37dbfae2 100644 --- a/src/qcam/format_converter.h +++ b/src/qcam/format_converter.h @@ -4,8 +4,8 @@ * * format_convert.h - qcam - Convert buffer to RGB */ -#ifndef __QCAM_FORMAT_CONVERTER_H__ -#define __QCAM_FORMAT_CONVERTER_H__ + +#pragma once #include <stddef.h> @@ -60,5 +60,3 @@ private: unsigned int y_pos_; unsigned int cb_pos_; }; - -#endif /* __QCAM_FORMAT_CONVERTER_H__ */ diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 4d8e806b..3fbe872c 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -4,8 +4,8 @@ * * main_window.h - qcam - Main application window */ -#ifndef __QCAM_MAIN_WINDOW_H__ -#define __QCAM_MAIN_WINDOW_H__ + +#pragma once #include <memory> #include <vector> @@ -126,5 +126,3 @@ private: std::vector<std::unique_ptr<libcamera::Request>> requests_; }; - -#endif /* __QCAM_MAIN_WINDOW__ */ diff --git a/src/qcam/message_handler.h b/src/qcam/message_handler.h index 4534db9d..56294d37 100644 --- a/src/qcam/message_handler.h +++ b/src/qcam/message_handler.h @@ -4,8 +4,8 @@ * * message_handler.cpp - qcam - Log message handling */ -#ifndef __QCAM_MESSAGE_HANDLER_H__ -#define __QCAM_MESSAGE_HANDLER_H__ + +#pragma once #include <QtGlobal> @@ -22,5 +22,3 @@ private: static QtMessageHandler handler_; static bool verbose_; }; - -#endif /* __QCAM_MESSAGE_HANDLER_H__ */ diff --git a/src/qcam/viewfinder.h b/src/qcam/viewfinder.h index 4c2102a6..260074ae 100644 --- a/src/qcam/viewfinder.h +++ b/src/qcam/viewfinder.h @@ -4,8 +4,8 @@ * * viewfinder.h - qcam - Viewfinder base class */ -#ifndef __QCAM_VIEWFINDER_H__ -#define __QCAM_VIEWFINDER_H__ + +#pragma once #include <QImage> #include <QList> @@ -30,5 +30,3 @@ public: virtual QImage getCurrentImage() = 0; }; - -#endif /* __QCAM_VIEWFINDER_H__ */ diff --git a/src/qcam/viewfinder_gl.h b/src/qcam/viewfinder_gl.h index 37b1ddd0..0a9275ba 100644 --- a/src/qcam/viewfinder_gl.h +++ b/src/qcam/viewfinder_gl.h @@ -5,8 +5,8 @@ * viewfinder_GL.h - OpenGL Viewfinder for rendering by OpenGL shader * */ -#ifndef __VIEWFINDER_GL_H__ -#define __VIEWFINDER_GL_H__ + +#pragma once #include <array> #include <memory> @@ -103,5 +103,3 @@ private: QMutex mutex_; /* Prevent concurrent access to image_ */ }; - -#endif /* __VIEWFINDER_GL_H__ */ diff --git a/src/qcam/viewfinder_qt.h b/src/qcam/viewfinder_qt.h index 756f3fa3..8c621452 100644 --- a/src/qcam/viewfinder_qt.h +++ b/src/qcam/viewfinder_qt.h @@ -4,8 +4,8 @@ * * viewfinder_qt.h - qcam - QPainter-based ViewFinder */ -#ifndef __QCAM_VIEWFINDER_QT_H__ -#define __QCAM_VIEWFINDER_QT_H__ + +#pragma once #include <QIcon> #include <QImage> @@ -61,5 +61,3 @@ private: QImage image_; QMutex mutex_; /* Prevent concurrent access to image_ */ }; - -#endif /* __QCAM_VIEWFINDER_QT_H__ */ |