{"id":3638,"url":"https://patchwork.libcamera.org/api/1.1/patches/3638/?format=json","web_url":"https://patchwork.libcamera.org/patch/3638/","project":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/projects/1/?format=json","name":"libcamera","link_name":"libcamera","list_id":"libcamera_core","list_email":"libcamera-devel@lists.libcamera.org","web_url":"","scm_url":"","webscm_url":""},"msgid":"<20200430155946.15605-2-email@uajain.com>","date":"2020-04-30T16:00:01","name":"[libcamera-devel,v2,1/2] qcam: main_window: Make cameraCombo_ private","commit_ref":null,"pull_url":null,"state":"accepted","archived":false,"hash":"b28373f22be1f1867692b6daf6784bb2bc536af7","submitter":{"id":1,"url":"https://patchwork.libcamera.org/api/1.1/people/1/?format=json","name":"Umang Jain","email":"email@uajain.com"},"delegate":null,"mbox":"https://patchwork.libcamera.org/patch/3638/mbox/","series":[{"id":861,"url":"https://patchwork.libcamera.org/api/1.1/series/861/?format=json","web_url":"https://patchwork.libcamera.org/project/libcamera/list/?series=861","date":"2020-04-30T16:00:00","name":"Fix combo-box entry selection on startup","version":2,"mbox":"https://patchwork.libcamera.org/series/861/mbox/"}],"comments":"https://patchwork.libcamera.org/api/patches/3638/comments/","check":"pending","checks":"https://patchwork.libcamera.org/api/patches/3638/checks/","tags":{},"headers":{"Return-Path":"","Received":["from o1.f.az.sendgrid.net (o1.f.az.sendgrid.net [208.117.55.132])\n\tby lancelot.ideasonboard.com (Postfix) with ESMTPS id 581B7613F3\n\tfor ;\n\tThu, 30 Apr 2020 18:00:03 +0200 (CEST)","by filter0084p3las1.sendgrid.net with SMTP id\n\tfilter0084p3las1-1974-5EAAF601-5B\n\t2020-04-30 16:00:01.363742507 +0000 UTC m=+1274293.850613641","from mail.uajain.com (unknown)\n\tby ismtpd0003p1maa1.sendgrid.net (SG) with ESMTP\n\tid CJeV-LQeTQuTgIr21OSOZQ Thu, 30 Apr 2020 16:00:00.870 +0000 (UTC)"],"Authentication-Results":"lancelot.ideasonboard.com; dkim=pass (1024-bit key; \n\tunprotected) header.d=uajain.com\n\theader.i=@uajain.com header.b=\"ugvLudgV\"; \n\tdkim-atps=neutral","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=uajain.com;\n\th=from:subject:in-reply-to:references:mime-version:to:cc:\n\tcontent-transfer-encoding:content-type;\n\ts=s1; bh=i3uAe5AXAlWJzvdmy8ks40Y2+ZFAQCdzYLxJH+4vc74=;\n\tb=ugvLudgV+lhYUQyhPDnKE1Xpjyn/WHwxgncZfOKjzV4EQDWq07uLYu+ErSRMXMjPiPyr\n\t4+O5/3nsg0dugRfPeW0E5J1/OmywQ+NOm5Q/2aZ2+WxMEt9OTTw4XGamRGkCj8fxvf1bbF\n\tKs1+eGGTKeHu/9whVpmvp36SVSsMUDfCM=","From":"Umang Jain ","Date":"Thu, 30 Apr 2020 16:00:01 +0000 (UTC)","Message-Id":"<20200430155946.15605-2-email@uajain.com>","In-Reply-To":"<20200430155946.15605-1-email@uajain.com>","References":"<20200430155946.15605-1-email@uajain.com>","Mime-Version":"1.0","X-SG-EID":"1Q40EQ7YGir8a9gjSIAdTjhngY657NMk9ckeo4dbHZDiOpywc/L3L9rFqlwE4KPc6PesGYbv37LpAT9IAi6gfXfncOY+tO4ZhcClrvriHNAxns0xSPQhYyYDfTz7h3cMiKa43IFQ1MR3DS8ou0CYbtK9w9qnQPKlLLjP/i53HuBp7FlBbxUXCEDMvzLtqXflXtHEqJgK8xTXWWDPLc24Bhqosbz2gI85E6gOF7BV3GRbFA8Y/lU1FWlZpUTMat9X","To":"libcamera-devel ","Content-Transfer-Encoding":"7bit","Content-Type":"text/plain; charset=us-ascii","Subject":"[libcamera-devel] [PATCH v2 1/2] qcam: main_window: Make\n\tcameraCombo_ private","X-BeenThere":"libcamera-devel@lists.libcamera.org","X-Mailman-Version":"2.1.29","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","X-List-Received-Date":"Thu, 30 Apr 2020 16:00:03 -0000"},"content":"This commit introduces no functional changes.\nThis is required so that the combo-box list can be managed\nconveniently from various private functions in subsequent\ncommit.\n\nSigned-off-by: Umang Jain \nReviewed-by: Kieran Bingham \nReviewed-by: Laurent Pinchart \n---\n src/qcam/main_window.cpp | 8 ++++----\n src/qcam/main_window.h | 2 ++\n 2 files changed, 6 insertions(+), 4 deletions(-)","diff":"diff --git a/src/qcam/main_window.cpp b/src/qcam/main_window.cpp\nindex d021fa9..c95d097 100644\n--- a/src/qcam/main_window.cpp\n+++ b/src/qcam/main_window.cpp\n@@ -114,14 +114,14 @@ int MainWindow::createToolbars()\n \tconnect(action, &QAction::triggered, this, &MainWindow::quit);\n \n \t/* Camera selector. */\n-\tQComboBox *cameraCombo = new QComboBox();\n-\tconnect(cameraCombo, QOverload::of(&QComboBox::activated),\n+\tcameraCombo_ = new QComboBox();\n+\tconnect(cameraCombo_, QOverload::of(&QComboBox::activated),\n \t\tthis, &MainWindow::switchCamera);\n \n \tfor (const std::shared_ptr &cam : cm_->cameras())\n-\t\tcameraCombo->addItem(QString::fromStdString(cam->name()));\n+\t\tcameraCombo_->addItem(QString::fromStdString(cam->name()));\n \n-\ttoolbar_->addWidget(cameraCombo);\n+\ttoolbar_->addWidget(cameraCombo_);\n \n \ttoolbar_->addSeparator();\n \ndiff --git a/src/qcam/main_window.h b/src/qcam/main_window.h\nindex 5d6251c..4ec37d4 100644\n--- a/src/qcam/main_window.h\n+++ b/src/qcam/main_window.h\n@@ -29,6 +29,7 @@\n using namespace libcamera;\n \n class QAction;\n+class QComboBox;\n \n enum {\n \tOptCamera = 'c',\n@@ -72,6 +73,7 @@ private:\n \t/* UI elements */\n \tQToolBar *toolbar_;\n \tQAction *startStopAction_;\n+\tQComboBox *cameraCombo_;\n \tViewFinder *viewfinder_;\n \n \tQIcon iconPlay_;\n","prefixes":["libcamera-devel","v2","1/2"]}