[libcamera-devel] [PATCH 1/2] qcam: main_window: Make cameraCombo_ private

Umang Jain email at uajain.com
Thu Apr 30 16:15:01 CEST 2020


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 <email at uajain.com>
---
 src/qcam/main_window.cpp | 9 ++++-----
 src/qcam/main_window.h   | 2 ++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp
index d021fa9..344b7ec 100644
--- a/src/qcam/main_window.cpp
+++ b/src/qcam/main_window.cpp
@@ -11,7 +11,6 @@
 #include <string>
 #include <sys/mman.h>
 
-#include <QComboBox>
 #include <QCoreApplication>
 #include <QFileDialog>
 #include <QImage>
@@ -114,14 +113,14 @@ int MainWindow::createToolbars()
 	connect(action, &QAction::triggered, this, &MainWindow::quit);
 
 	/* Camera selector. */
-	QComboBox *cameraCombo = new QComboBox();
-	connect(cameraCombo, QOverload<int>::of(&QComboBox::activated),
+	cameraCombo_ = new QComboBox();
+	connect(cameraCombo_, QOverload<int>::of(&QComboBox::activated),
 		this, &MainWindow::switchCamera);
 
 	for (const std::shared_ptr<Camera> &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 5d6251c..28c325f 100644
--- a/src/qcam/main_window.h
+++ b/src/qcam/main_window.h
@@ -9,6 +9,7 @@
 
 #include <memory>
 
+#include <QComboBox>
 #include <QElapsedTimer>
 #include <QIcon>
 #include <QMainWindow>
@@ -72,6 +73,7 @@ private:
 	/* UI elements */
 	QToolBar *toolbar_;
 	QAction *startStopAction_;
+	QComboBox *cameraCombo_;
 	ViewFinder *viewfinder_;
 
 	QIcon iconPlay_;
-- 
2.26.0



More information about the libcamera-devel mailing list