From 83f8c09c2f67faad5acad6f51db2ddb66a135c0a Mon Sep 17 00:00:00 2001 From: Laurent Pinchart Date: Mon, 29 Apr 2019 20:41:46 +0300 Subject: (q)cam: Unify naming of configurations in applications MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Name all instances of CameraConfiguration "config", and all instances of StreamConfiguration "cfg" accross the cam and qcam applications. Signed-off-by: Laurent Pinchart Reviewed-by: Niklas Söderlund --- src/qcam/main_window.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/qcam') diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp index 6e92f6a1..ee06d751 100644 --- a/src/qcam/main_window.cpp +++ b/src/qcam/main_window.cpp @@ -105,9 +105,9 @@ int MainWindow::startCapture() return ret; } - const StreamConfiguration &sconf = config_[stream]; - ret = viewfinder_->setFormat(sconf.pixelFormat, sconf.size.width, - sconf.size.height); + const StreamConfiguration &cfg = config_[stream]; + ret = viewfinder_->setFormat(cfg.pixelFormat, cfg.size.width, + cfg.size.height); if (ret < 0) { std::cout << "Failed to set viewfinder format" << std::endl; return ret; -- cgit v1.2.1