From e5716bebb365c7c744ab1c3a9609b155ed48a251 Mon Sep 17 00:00:00 2001 From: Umang Jain Date: Thu, 30 Apr 2020 16:00:01 +0000 Subject: qcam: main_window: Make cameraCombo_ private This commit introduces no functional changes. This is required so that the combo-box list can be managed conveniently from various private functions in subsequent commit. Signed-off-by: Umang Jain Reviewed-by: Kieran Bingham Reviewed-by: Laurent Pinchart Signed-off-by: Laurent Pinchart --- src/qcam/main_window.cpp | 8 ++++---- src/qcam/main_window.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'src/qcam') diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index d021fa95..c95d0973 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -114,14 +114,14 @@ int MainWindow::createToolbars() connect(action, &QAction::triggered, this, &MainWindow::quit); /* Camera selector. */ - QComboBox *cameraCombo = new QComboBox(); - connect(cameraCombo, QOverload::of(&QComboBox::activated), + cameraCombo_ = new QComboBox(); + connect(cameraCombo_, QOverload::of(&QComboBox::activated), this, &MainWindow::switchCamera); for (const std::shared_ptr &cam : cm_->cameras()) - cameraCombo->addItem(QString::fromStdString(cam->name())); + cameraCombo_->addItem(QString::fromStdString(cam->name())); - toolbar_->addWidget(cameraCombo); + toolbar_->addWidget(cameraCombo_); toolbar_->addSeparator(); diff --git a/src/qcam/main_window.h b/src/qcam/main_window.h index 5d6251c8..4ec37d40 100644 --- a/src/qcam/main_window.h +++ b/src/qcam/main_window.h @@ -29,6 +29,7 @@ using namespace libcamera; class QAction; +class QComboBox; enum { OptCamera = 'c', @@ -72,6 +73,7 @@ private: /* UI elements */ QToolBar *toolbar_; QAction *startStopAction_; + QComboBox *cameraCombo_; ViewFinder *viewfinder_; QIcon iconPlay_; -- cgit v1.2.1