From af49b18c81a3998b59b1aae0daa16ec5050e44fc Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Sun, 18 Aug 2019 03:22:45 +0300 Subject: qcam: Pass camera manager to MainWindow class Pass the CameraManager instance from the main() function to the MainWindow class instead of accessing it through CameraManager::instance(). This prepares for the removal of the CameraManager::instance() method. Signed-off-by: Laurent Pinchart Reviewed-by: Jacopo Mondi --- src/qcam/main_window.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/qcam/main_window.h') diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index b45cbca7..6873155a 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -16,6 +16,7 @@ #include #include +#include #include #include "../cam/options.h" @@ -35,14 +36,14 @@ class MainWindow : public QMainWindow Q_OBJECT public: - MainWindow(const OptionsParser::Options &options); + MainWindow(CameraManager *cm, const OptionsParser::Options &options); ~MainWindow(); private Q_SLOTS: void updateTitle(); private: - int openCamera(); + int openCamera(CameraManager *cm); int startCapture(); void stopCapture(); -- cgit v1.2.1