From 1526650fc781514200fed74bff0856b6fdbae850 Mon Sep 17 00:00:00 2001 From: Hirokazu Honda Date: Tue, 5 Oct 2021 16:31:14 +0900 Subject: test: Remove using namespace in header files "using namespace" in a header file propagates the namespace to the files including the header file. So it should be avoided. This removes "using namespace" in header files in test. Signed-off-by: Hirokazu Honda Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- test/libtest/buffer_source.cpp | 2 ++ test/libtest/buffer_source.h | 10 ++++------ test/libtest/camera_test.h | 6 ++---- 3 files changed, 8 insertions(+), 10 deletions(-) (limited to 'test/libtest') diff --git a/test/libtest/buffer_source.cpp b/test/libtest/buffer_source.cpp index 64e7376a..1b261697 100644 --- a/test/libtest/buffer_source.cpp +++ b/test/libtest/buffer_source.cpp @@ -14,6 +14,8 @@ #include "test.h" +using namespace libcamera; + BufferSource::BufferSource() { } diff --git a/test/libtest/buffer_source.h b/test/libtest/buffer_source.h index 14b4770e..84e2fa8f 100644 --- a/test/libtest/buffer_source.h +++ b/test/libtest/buffer_source.h @@ -12,20 +12,18 @@ #include "libcamera/internal/media_device.h" #include "libcamera/internal/v4l2_videodevice.h" -using namespace libcamera; - class BufferSource { public: BufferSource(); ~BufferSource(); - int allocate(const StreamConfiguration &config); - const std::vector> &buffers(); + int allocate(const libcamera::StreamConfiguration &config); + const std::vector> &buffers(); private: - std::shared_ptr media_; - std::vector> buffers_; + std::shared_ptr media_; + std::vector> buffers_; }; #endif /* __LIBCAMERA_BUFFER_SOURCE_TEST_H__ */ diff --git a/test/libtest/camera_test.h b/test/libtest/camera_test.h index f56e343e..23122245 100644 --- a/test/libtest/camera_test.h +++ b/test/libtest/camera_test.h @@ -12,8 +12,6 @@ #include #include -using namespace libcamera; - class CameraTest { public: @@ -21,8 +19,8 @@ public: ~CameraTest(); protected: - CameraManager *cm_; - std::shared_ptr camera_; + libcamera::CameraManager *cm_; + std::shared_ptr camera_; int status_; }; -- cgit v1.2.1