summaryrefslogtreecommitdiff
path: root/test/libtest
diff options
context:
space:
mode:
authorHirokazu Honda <hiroh@chromium.org>2021-10-05 16:31:14 +0900
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2021-10-15 05:05:43 +0300
commit1526650fc781514200fed74bff0856b6fdbae850 (patch)
tree6e8d82422a88665eb13f65e28a206d2fc3df0e9e /test/libtest
parentaf60569cbc16e3c0f96e6a7a9602cf80318a9a41 (diff)
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 <hiroh@chromium.org> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Diffstat (limited to 'test/libtest')
-rw-r--r--test/libtest/buffer_source.cpp2
-rw-r--r--test/libtest/buffer_source.h10
-rw-r--r--test/libtest/camera_test.h6
3 files changed, 8 insertions, 10 deletions
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<std::unique_ptr<FrameBuffer>> &buffers();
+ int allocate(const libcamera::StreamConfiguration &config);
+ const std::vector<std::unique_ptr<libcamera::FrameBuffer>> &buffers();
private:
- std::shared_ptr<MediaDevice> media_;
- std::vector<std::unique_ptr<FrameBuffer>> buffers_;
+ std::shared_ptr<libcamera::MediaDevice> media_;
+ std::vector<std::unique_ptr<libcamera::FrameBuffer>> 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 <libcamera/camera.h>
#include <libcamera/camera_manager.h>
-using namespace libcamera;
-
class CameraTest
{
public:
@@ -21,8 +19,8 @@ public:
~CameraTest();
protected:
- CameraManager *cm_;
- std::shared_ptr<Camera> camera_;
+ libcamera::CameraManager *cm_;
+ std::shared_ptr<libcamera::Camera> camera_;
int status_;
};