From patchwork Wed Oct 23 18:17:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847783 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 739D81D0F77; Wed, 23 Oct 2024 18:18:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707508; cv=none; b=MNOmpIlMyCOpT/VDNd3fNUnITPxtFBNgrOVEAqH/8TAIskhjp8MSullET62Kf7Q+GPtXSAvbK9g9iTSc2M50HqsPohTWFZyd1pLZrb8iVAdQp4yfiI+VGtjTDZ8v7vykmd73t+k+2N7ejng7RmRvmqgKoBDpWdiTF6jLGoOpRsQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707508; c=relaxed/simple; bh=r6wjnhku+DknLdFNwLezf9sp74rPJJIDaA8wS+ADw2s=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=h2rFC9bfArYnq5KUABmaGHnwuKYgiYoVDuR/z+4cdZOLcJERLJ3eiwn+pkiJXTwegzuiuTUIRNeqkY5ygByi58dxIYBcXp4aDO1y/dfVhVatz6TEfbJHCQTEC51AujQ22N11ucrKFYHt96fSBRmvIHwdErXrswiVH6ibudECrf8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=kfMUw8Pb; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="kfMUw8Pb" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 60870C4CEC6; Wed, 23 Oct 2024 18:18:27 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707508; bh=r6wjnhku+DknLdFNwLezf9sp74rPJJIDaA8wS+ADw2s=; h=From:To:Cc:Subject:Date:From; b=kfMUw8Pb1n7yYh/U8gVi0w8+Is8EXmAli72QwO0gHP9L1tUj5vQ4D2lsYZCI1X9YQ ZN/RN9/NfouFqk1CrH8RXQ0oggd43PPr8XetlcJbz4+Qb+UaoBDZ7a42sW7zYPvU7H dA5ISJjqmgKVZAMevdsa91h2nTHAq285K5gqFdXb9pxP+vgW7KmbWaNTH0BL2PuKSi KBhHsyHWjD1v608xPqKO5zkeiijjId8nOsKaEIwjeieVVCk44iA99SYI+J/0OOY7Mi +ecLs87I7Btd0jMR3+4BlIB5NvVfxCzF7PEAmTyirLWLXqUE0enAtUgt7kjf/9zk9a UNmzhWkPA/E+w== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 01/13] kconfig: qconf: remove mouse{Press,Move}Event() functions Date: Thu, 24 Oct 2024 03:17:51 +0900 Message-ID: <20241023181823.138524-1-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 These functions simply passes the event to the parent. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 14 -------------- scripts/kconfig/qconf.h | 2 -- 2 files changed, 16 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 90f139480eda..18cc5c184f56 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -781,13 +781,6 @@ void ConfigList::keyPressEvent(QKeyEvent* ev) ev->accept(); } -void ConfigList::mousePressEvent(QMouseEvent* e) -{ - //QPoint p(contentsToViewport(e->pos())); - //printf("contentsMousePressEvent: %d,%d\n", p.x(), p.y()); - Parent::mousePressEvent(e); -} - void ConfigList::mouseReleaseEvent(QMouseEvent* e) { QPoint p = e->pos(); @@ -834,13 +827,6 @@ skip: Parent::mouseReleaseEvent(e); } -void ConfigList::mouseMoveEvent(QMouseEvent* e) -{ - //QPoint p(contentsToViewport(e->pos())); - //printf("contentsMouseMoveEvent: %d,%d\n", p.x(), p.y()); - Parent::mouseMoveEvent(e); -} - void ConfigList::mouseDoubleClickEvent(QMouseEvent* e) { QPoint p = e->pos(); diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index aab25ece95c6..0b62fb26821a 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h @@ -55,9 +55,7 @@ class ConfigList : public QTreeWidget { protected: void keyPressEvent(QKeyEvent *e); - void mousePressEvent(QMouseEvent *e); void mouseReleaseEvent(QMouseEvent *e); - void mouseMoveEvent(QMouseEvent *e); void mouseDoubleClickEvent(QMouseEvent *e); void focusInEvent(QFocusEvent *e); void contextMenuEvent(QContextMenuEvent *e); From patchwork Wed Oct 23 18:17:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847784 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A73911D1726; Wed, 23 Oct 2024 18:18:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707509; cv=none; b=AWCIZAa6kSpdx4oF/c0arodOKDOGZBt28V3pISwtQJL0YefPKr+ibeeUCABR4YjMgPlZEWd8smwMhUi7Xnjyl93ETbwmlaFs0RFZHfuTJ7YWGDW8j1N/cm8k1lVe9tL3I3z8ZlN/yA/tXZvAneZD/973tAlOcDVvtdZ+q69BUaI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707509; c=relaxed/simple; bh=NLERFIn12bpXm8efVGcmTQPNdOx1Jj+S+1cvkw4hdG8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=a8PJxtscNUq7BpqJ5vx9ko5h4Wsek+qwq8i1WKw8cc9z8IXysenFyDZx67ZQ/6b7OPmDZMXE+FMBb3VC1SJmON0DlKY9QavygM6Lo24oDERKrfRihg74IuC/GgMglBAquMbp359Jjh/QoeHIHkCauwqrOOQ7p73+kgwtpM41NkQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=dZcNTbJF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="dZcNTbJF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 7DB06C4CEC7; Wed, 23 Oct 2024 18:18:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707509; bh=NLERFIn12bpXm8efVGcmTQPNdOx1Jj+S+1cvkw4hdG8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=dZcNTbJFegj1EO16Urhpm0/746k8rLYj0f3bZhMMFKZJQytfiSxYVVsOzn0EKxd1y 0yTbvj55+3CYRX3aSmPtVDldMvcEX8SmSV5Zkc3B81KQoPemD1iBwj/q5maJ0sShwc ACJl05Kt9lN4AOXKjfmQI+EKORvT88VTaJMXTYCGW0vwJJ4/Qz38NfevmsxEesVens uQ96uzr1isSLvmye7Z8sFHwdlCpoRMS6ra0FM8OuPId0UW43td12IpVkbWGxJMhqw1 iQmyu5J72iaxHStgd74aM9qNWM0K8SNVRQpJTaT1QaHxf8do6Fgu2nuGPNbaj59WZ2 TCsI9yv5wUtAQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 02/13] kconfig: qconf: remove redundant type check for choice members Date: Thu, 24 Oct 2024 03:17:52 +0900 Message-ID: <20241023181823.138524-2-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Since commit fde192511bdb ("kconfig: remove tristate choice support"), choice members are always boolean. The type check is redundant. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 18cc5c184f56..58c57c908149 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -159,7 +159,7 @@ void ConfigItem::updateMenu(void) ch = 'M'; break; default: - if (sym_is_choice_value(sym) && type == S_BOOLEAN) + if (sym_is_choice_value(sym)) setIcon(promptColIdx, choiceNoIcon); else setIcon(promptColIdx, symbolNoIcon); From patchwork Wed Oct 23 18:17:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847785 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id C53E71D433C; Wed, 23 Oct 2024 18:18:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707510; cv=none; b=XFSrXDkMSXnQdd00ONUuYIrNbDs5gzvS7UJqru1uNJfYViGgOxplfKc/NXqi1/wlh6kjfNLg1mKVpQA/iTD450km0LY7132AzP9st1lfxnhlSUjI9TqXt445I5ZoR8HOtTWMk7IKeuD/B3NWm3FoEB1bNBNPmDxqqKx1scXsS4c= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707510; c=relaxed/simple; bh=s2VPAdI8Tith/AXHG8JzGiQ2Aol3WjhoEw6k7kH8kOk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=IYsfOigAifBuk1LMiMd2sVXTtALVBmCQLDBwmP5spIoMgiEjIPYd2MLdWXCUcJFYtsqaUDuSZlpyDhcK01wmvCfdbZ8aXwXB1qUp5qVtxuoQkL9DawazgeV/z7RdU8uZVx+clHLHmhDAYa8V7pgFVU5j63MfhfB1jwPGsyaPRck= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=KDT3Ok5B; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="KDT3Ok5B" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A0759C4CEE5; Wed, 23 Oct 2024 18:18:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707510; bh=s2VPAdI8Tith/AXHG8JzGiQ2Aol3WjhoEw6k7kH8kOk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KDT3Ok5BuHYalzGe3qit45hLmgFwN/2R6N0BC2cYBnKKw6lnwOXW7jVz2DXNAPw7W VP9e22UJwvRoQSr6G5DV/WLnQmg026Xr1zZFa65b9sUnqZuo+Sub6pRyJR6WxiZ8yC lJgs5acgL7CA0cFpDRmJTEMmDBS7uPrWJIH6D+VXnzpSY9Yv4mQseqFZScaQfFt8pP bLq9TzknMbNi57nMgAPyPnPBplgUFd6HqQ9K6AAlbRrdz1iKqfuo5NjwxykKUpWgI5 HwjpkBG6TXMlLaTjfO612j/rTtv/TcD3X+g4nbKbkL+N6rbyMyyrpshFjyMX+6URNE k0u5jxGUqprpQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 03/13] kconfig: qconf: remove unnecessary setRootIsDecorated() call Date: Thu, 24 Oct 2024 03:17:53 +0900 Message-ID: <20241023181823.138524-3-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The default value of the rootIsDecorated property is true. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 58c57c908149..120090fa4ac9 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -307,7 +307,6 @@ ConfigList::ConfigList(QWidget *parent, const char *name) { setObjectName(name); setSortingEnabled(false); - setRootIsDecorated(true); setVerticalScrollMode(ScrollPerPixel); setHorizontalScrollMode(ScrollPerPixel); From patchwork Wed Oct 23 18:17:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847786 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E04161D0943; Wed, 23 Oct 2024 18:18:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707512; cv=none; b=htTR7qk8nNdJBWwcy9fJRuUJtiSqaSk2gqVt/0J7GBYuNJp1YGcnSHJHXNz2Ca3U/pVAbGBa0dlEcMCNwVjGyGGw3BuxY6XeULVtKLvasub5AYPymrZF79BWj/lPcamuVMDAaHXnrM/TP6bBJfLMVXOLGNhCWHPc2mGygOQyeJ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707512; c=relaxed/simple; bh=1Xw1GANyGX0qxoALffwPujd1Kewy0FeubsmLmM2gp28=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Wc+LLfF77WFEnjhsM9fH6HCwLTyXc1T44utqzixHw7qnx5rq2JW3poe1qSF6r+tZvlCZFPkie6vzIlFZ546e5MX18SQz4uIct024+6oE9KaOhVoPOUKO5KgQyDyXFn5kAdyFqtR0X59nmJ/UWhVbUNS7o431+zMqE2Q3zRbZcTc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=OUiP1NBF; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="OUiP1NBF" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3342C4CEC6; Wed, 23 Oct 2024 18:18:30 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707511; bh=1Xw1GANyGX0qxoALffwPujd1Kewy0FeubsmLmM2gp28=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OUiP1NBFbrPZ+qQBL+DnidiI6bkbcvbaUb/SmyLRrowV+98mUorn7mOrgSXPz55J3 nGXSFe6ymf2eg0zzeJziqR25OmG7O7/V62aoWHh4quraVM+ZBP6MmtDuATzO+MXAF9 XT3jIYfoMqluehjGaKfpC80jw5MTH7Apz5Zcpl28f7mXV1FVx/mOfrNozeC5px8LqM 2KWO2I58I+M9+fm9oY2mCGwX7RuE/SzM6+jXbank0U9v4VdkQY1C8H5RRVyr0Pz9OH cqczmSUBFfTxjQVE5AA33F0/bjI6dNYy4OfcZ/vEdMlcLiZ6y4Fm9Gh0ZZtj3CSlCY jQSB7oSn//aLg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 04/13] kconfig: qconf: remove unnecessary lastWindowClosed() signal connection Date: Thu, 24 Oct 2024 03:17:54 +0900 Message-ID: <20241023181823.138524-4-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The default value of the quitOnLastWindowClosed property is true. Hence, the application implicitly quits when the last window is closed. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 120090fa4ac9..49a3d0365c39 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1863,7 +1863,6 @@ int main(int ac, char** av) v = new ConfigMainWindow(); //zconfdump(stdout); - configApp->connect(configApp, SIGNAL(lastWindowClosed()), SLOT(quit())); configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings())); v->show(); From patchwork Wed Oct 23 18:17:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847787 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6D411D31AA; Wed, 23 Oct 2024 18:18:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707512; cv=none; b=LVdmPeDH9wHsFblYxgi7pp29N0hsWRs1VPI2i0LWQiy8tfuMl7NFy8YK6a2x1JZ4v1nTB2lHnzKa0cPNypiFpe7UH42jyHZLOglyw4NnT+CwbregONEPcdU2aKm01TelhnNW8icC0XmDDamYGFxaf4P6wmb6+6iTGcEK2H5tF8s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707512; c=relaxed/simple; bh=rGFLDdEDcXdLhWCQJth3ha92KDg0EspfCkl2dGR49gw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=R60+xtcxL62PhLjlpUkNlOKShU9NPHcCjzftonJVOovDeqCpweKKELHnxjH8GpPPcByLP4qKTpg3jpkgU3Aq4NqKIuHo5MAZR8UFUk//MiPbL4ZJftwQiahV58omkR1hjddIci9+5DTfi3CHc0RYc9OaI/jNs1V9KrQdUIkc/Ak= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=szUQKiKR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="szUQKiKR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E510AC4CEE6; Wed, 23 Oct 2024 18:18:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707512; bh=rGFLDdEDcXdLhWCQJth3ha92KDg0EspfCkl2dGR49gw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=szUQKiKRNAWUxU4rzT4bAphVi6/Lx91i0TYLYV5+v4XvsJlweJwKs6NbbcOL4erFE u9DGQRVcTXcmbeACuqK9ByyssR2oo37DQnJIfthmRrCh5XERNKOwAde1kZvGDZEeGu auvxjfh+etfI22M8NTyAh8vs6ymLlBVB0Zw/nmzVdhKw52kezn0aO/E0qATxeuafXx eEEaV4JqbDvqE+LUjDHeNwMH+91dly0qcV3Zi4Eo9qJYSeeIb8Ud5pAZj/Px8gvkih axZbv1ohd3IIAPlLaSUH6DjuVp6hu+wniZSC57bdX5oyorxIijtAeii9w/p3UAYwFt mnhBitfNkwkHQ== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 05/13] kconfig: qconf: convert the last old connection syntax to Qt5 style Date: Thu, 24 Oct 2024 03:17:55 +0900 Message-ID: <20241023181823.138524-5-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Commit a2574c12df0d ("kconfig: qconf: convert to Qt5 new signal/slot connection syntax") converted most of the old string-based connections, but one more instance still remains. Convert it to the new style. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 49a3d0365c39..c922c34621a4 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1475,6 +1475,9 @@ ConfigMainWindow::ConfigMainWindow(void) connect(helpText, &ConfigInfoView::menuSelected, this, &ConfigMainWindow::setMenuLink); + connect(configApp, &QApplication::aboutToQuit, + this, &ConfigMainWindow::saveSettings); + conf_read(NULL); QString listMode = configSettings->value("/listMode", "symbol").toString(); @@ -1863,7 +1866,6 @@ int main(int ac, char** av) v = new ConfigMainWindow(); //zconfdump(stdout); - configApp->connect(configApp, SIGNAL(aboutToQuit()), v, SLOT(saveSettings())); v->show(); configApp->exec(); From patchwork Wed Oct 23 18:17:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847788 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 25C5E1D0BA4; Wed, 23 Oct 2024 18:18:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707514; cv=none; b=nwil+SLtmfPnDA3y1OJqnA+BECrqtgXWnx9QooeTERPdOoF4nc7l975KqdFzAciNeHIX1bX7W7yxsUrUThewh0ONfyL0lcxs0SUK1EO7kn2DZn2WqcVbzXTyN7HRKx1TfcSaUQXS6oHF5yiSAJXoe/YkO4qDpWMAZQj11AV2TpM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707514; c=relaxed/simple; bh=RB7y93I9LNK5locviyv6hDKYHXT35/Jru69K1LVDmic=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GzqUpiv+zYQq7b4RaHKXgHbRillRqxcwG1WbEjSa4n1kBFCSpoAx5D4nI/mhyJApl+/hRjbET/vMX4bwYm8jRkp346LJHGqhnOSfU/cctieLhPu9DWCJP+7IfjpMiANfJnHemneLlH1znzhHGCRxHyyR7U8yXx+HSaBObFTme+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Z4thB5RL; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Z4thB5RL" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 0B8E3C4CEC6; Wed, 23 Oct 2024 18:18:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707513; bh=RB7y93I9LNK5locviyv6hDKYHXT35/Jru69K1LVDmic=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Z4thB5RL6TjI66fYKyVAsWn/31yuKokY1pf1JH5FgI7o1nP4zmNHwCuDKKY9gxuEi TELWTW1d2qf2iwThRclJobQV8OOflORMlBHvC7k8B4oJCUujZmVNYX/oGBWQPsUv9a Euv7Tv1AVs7vKAyRp2OngZhFBwAf7yGO08GgixelZ/c0BRXidde7d1ONLQJLq8jjw2 oLH0Fb6y8/2cgKGHfa5MTbsW2GzcoKMBQVeatZqPy529AxZskwTfvXq8WHflRW6JX8 MkP+lgjrLAToVtWsvmql90CuLpLK7EgyYlDEelP9YcMXxit/M0zIQMDqiZD3dktBTI T+QOK0xH6Ipzg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 06/13] kconfig: qconf: do not show goParent button in split view Date: Thu, 24 Oct 2024 03:17:56 +0900 Message-ID: <20241023181823.138524-6-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When a menu is selected in the split view, the right pane displays the goParent button, but it is never functional. This is unnecessary, as you can select a menu from the menu tree in the left pane. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index c922c34621a4..7c844c4a119e 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -436,8 +436,7 @@ void ConfigList::updateList() return; } - if (rootEntry != &rootmenu && (mode == singleMode || - (mode == symbolMode && rootEntry->parent != &rootmenu))) { + if (rootEntry != &rootmenu && mode == singleMode) { item = (ConfigItem *)topLevelItem(0); if (!item) item = new ConfigItem(this, 0, true); From patchwork Wed Oct 23 18:17:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847789 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 451211E5704; Wed, 23 Oct 2024 18:18:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707515; cv=none; b=hZcKzxzMi+idGLGaekFU8txT7iviZPoZmbzR3KHYoPUQ5UZXvKzbNXMxr3PaxaVoZNrlkt48WNUh1kBhi4ncAJZLN1zxeAgI+f+ZXVhJ6uu1u49cH4sMCTXWgy1m7QlYNeXQp4lEaFaG1Ee6iaKzIQc3iarJJaklGzGfwrPlPaU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707515; c=relaxed/simple; bh=A1r7zP0PIncfUZS87tTmj6EBYB7OCJiCmMceL7+bLy8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Euz8l7j1V5GkAbvBAVlKw8cgKyfoag9Dnbwp3BG+gEskI5sjm3Bxa/Si8hFpyqNAwGo/iRIReF7BeCpo2Ztm8nuy/i9cGkJ6ZF3Kr4QnmJ/VU2pP9/TPwUV/TbCwF60xh4ehPxTyrgB79QQCxMnM06ucgZl0r+pyWg1c1NTQOnQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=h0oEtqX5; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="h0oEtqX5" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 23F24C4CEC7; Wed, 23 Oct 2024 18:18:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707514; bh=A1r7zP0PIncfUZS87tTmj6EBYB7OCJiCmMceL7+bLy8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=h0oEtqX58sAs99904//ZkZxCC/Llc65kbhdZ89Bds1W8EgAdRB5jMyFOSYJ00/tdM KggFiuzQ7jFeuvzho7ekJMHI6AjOKXTOHnzRIu3WPdJWKWubbmDOx8D8l06BK4njbd U6NM4MVUERw8cCq+9hbcTS7tJCEYU8B1jZ9bLkW/2fm1tqq7+4TDo5ukdnP/S5WmCf StmJ2mhtBjiKh1RdkkMw25K1uEVwHvIKmgRnhJrdjZUxPEImilydcfO3Wi1wbFrJNo PFnL5too5w7XAef+vcZWVUXwMCVxv82+v7TnTj15K82FaCbt/BK1yt/vlGmlovmBga CyhlVsIhLjCug== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 07/13] kconfig: qconf: remove ConfigItem::visible member Date: Thu, 24 Oct 2024 03:17:57 +0900 Message-ID: <20241023181823.138524-7-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The " (NEW)" string should be displayed regardless of the visibility of the associated menu. The ConfigItem::visible member is not used for any other purpose. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 28 +++++++++++----------------- scripts/kconfig/qconf.h | 15 +++++++-------- 2 files changed, 18 insertions(+), 25 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 7c844c4a119e..5b1237bf085a 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -175,17 +175,16 @@ void ConfigItem::updateMenu(void) setText(dataColIdx, sym_get_string_value(sym)); break; } - if (!sym_has_value(sym) && visible) + if (!sym_has_value(sym)) prompt += " (NEW)"; set_prompt: setText(promptColIdx, prompt); } -void ConfigItem::testUpdateMenu(bool v) +void ConfigItem::testUpdateMenu(void) { ConfigItem* i; - visible = v; if (!menu) return; @@ -429,7 +428,7 @@ void ConfigList::updateList() item = (ConfigItem*)(*it); if (!item->menu) continue; - item->testUpdateMenu(menu_is_visible(item->menu)); + item->testUpdateMenu(); ++it; } @@ -439,16 +438,16 @@ void ConfigList::updateList() if (rootEntry != &rootmenu && mode == singleMode) { item = (ConfigItem *)topLevelItem(0); if (!item) - item = new ConfigItem(this, 0, true); + item = new ConfigItem(this, 0); last = item; } if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) && rootEntry->sym && rootEntry->prompt) { item = last ? last->nextSibling() : nullptr; if (!item) - item = new ConfigItem(this, last, rootEntry, true); + item = new ConfigItem(this, last, rootEntry); else - item->testUpdateMenu(true); + item->testUpdateMenu(); updateMenuList(item, rootEntry); update(); @@ -597,7 +596,6 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) struct menu* child; ConfigItem* item; ConfigItem* last; - bool visible; enum prop_type type; if (!menu) { @@ -629,14 +627,13 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) break; } - visible = menu_is_visible(child); if (!menuSkip(child)) { if (!child->sym && !child->list && !child->prompt) continue; if (!item || item->menu != child) - item = new ConfigItem(parent, last, child, visible); + item = new ConfigItem(parent, last, child); else - item->testUpdateMenu(visible); + item->testUpdateMenu(); if (mode == fullMode || mode == menuMode || type != P_MENU) updateMenuList(item, child); @@ -662,7 +659,6 @@ void ConfigList::updateMenuList(struct menu *menu) struct menu* child; ConfigItem* item; ConfigItem* last; - bool visible; enum prop_type type; if (!menu) { @@ -694,14 +690,13 @@ void ConfigList::updateMenuList(struct menu *menu) break; } - visible = menu_is_visible(child); if (!menuSkip(child)) { if (!child->sym && !child->list && !child->prompt) continue; if (!item || item->menu != child) - item = new ConfigItem(this, last, child, visible); + item = new ConfigItem(this, last, child); else - item->testUpdateMenu(visible); + item->testUpdateMenu(); if (mode == fullMode || mode == menuMode || type != P_MENU) updateMenuList(item, child); @@ -1274,8 +1269,7 @@ void ConfigSearchWindow::search(void) return; for (p = result; *p; p++) { for_all_prompts((*p), prop) - lastItem = new ConfigItem(list, lastItem, prop->menu, - menu_is_visible(prop->menu)); + lastItem = new ConfigItem(list, lastItem, prop->menu); } } diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h index 0b62fb26821a..62ab3286d04f 100644 --- a/scripts/kconfig/qconf.h +++ b/scripts/kconfig/qconf.h @@ -114,25 +114,25 @@ public slots: class ConfigItem : public QTreeWidgetItem { typedef class QTreeWidgetItem Parent; public: - ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m, bool v) - : Parent(parent, after), nextItem(0), menu(m), visible(v), goParent(false) + ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m) + : Parent(parent, after), nextItem(0), menu(m), goParent(false) { init(); } - ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m, bool v) - : Parent(parent, after), nextItem(0), menu(m), visible(v), goParent(false) + ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m) + : Parent(parent, after), nextItem(0), menu(m), goParent(false) { init(); } - ConfigItem(ConfigList *parent, ConfigItem *after, bool v) - : Parent(parent, after), nextItem(0), menu(0), visible(v), goParent(true) + ConfigItem(ConfigList *parent, ConfigItem *after) + : Parent(parent, after), nextItem(0), menu(0), goParent(true) { init(); } ~ConfigItem(void); void init(void); void updateMenu(void); - void testUpdateMenu(bool v); + void testUpdateMenu(void); ConfigList* listView() const { return (ConfigList*)Parent::treeWidget(); @@ -159,7 +159,6 @@ class ConfigItem : public QTreeWidgetItem { ConfigItem* nextItem; struct menu *menu; - bool visible; bool goParent; static QIcon symbolYesIcon, symbolModIcon, symbolNoIcon; From patchwork Wed Oct 23 18:17:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847790 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0520B1E8822; Wed, 23 Oct 2024 18:18:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707516; cv=none; b=ATh1zu2cleGlzD5m1VC6/+ZwNl8vzYOkPNtFGlXMTpXDVfLkpDsjvmFNS+kuItv4RoKPjNkidI3civ0og0kqZ53TrqRF8GdsfgbU+FD7VzjK3Dun+/1mrzmMfF+UkKpTI9Gvh+ow7c25rtM8vhuJ+EArVISoa0LAwSv3fs6hAKM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707516; c=relaxed/simple; bh=GBdvS28YS75rH62yiPtB0hM0b5IeDi5QhyAWFnPK+hg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=qi8sfT7Ho6/5YYSV7pVZ3ALnzRl8Ft/XtyKB7zrteadXuGDnNWU2RkfCwXKJMxrQNf8L9KnxyzMxrf+bsiQC0IF7ymWXERYIfygP0hxw1cTNhr8Jlco4Q40MYpN5NNn5xPhcmTHJlquUXlV4ci2hJWQRUNv6GickfHbkYXKQYNA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=p1rb2+rR; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="p1rb2+rR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3D249C4CEE6; Wed, 23 Oct 2024 18:18:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707515; bh=GBdvS28YS75rH62yiPtB0hM0b5IeDi5QhyAWFnPK+hg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=p1rb2+rR36ss36eKMN+EeqvgOVIPOoPtVslS1LWDBkkyzd/1aPvl7kcbZyAoT5rKH vv3l2Z1Q93kFJWCgK9za9F6ZyIQU41tBoSX+kuA1ozwzTnGE9oTsZFvyjxIyZW4vgV lgkYRKEvaaqvh2kd2aS07zVUqYRQQmEhGAE+l6VCd8IJsuJqVGjbTNosB+zCyq6LW/ sHjipJXjcv4DeSDB6v4n5THq36zI02/9L/L3I+M1WYFKcfk3e+CqIXR+6NX6akaQwl 6BacoJuEtTIdr+PF7pzXiZzTqWXiI8/fVUSLSjaXuAHna4VhxR8DNa7siwuXkP7B5q ASedA/ZgcKM6A== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 08/13] kconfig: qconf: avoid unnecessary parentSelected() when ESC is pressed Date: Thu, 24 Oct 2024 03:17:58 +0900 Message-ID: <20241023181823.138524-8-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When the ESC key is pressed, the parentSelected() signal is currently emitted for singleMode, menuMode, and symbolMode. However, parentSelected() signal is functional only for singleMode. In menuMode, the signal is connected to the goBack() slot, but nothing occurs because configList->rootEntry is always &rootmenu. In symbolMode (in the right pane), the parentSelected() signal is not connected to any slot. This commit prevents the unnecessary emission of the parentSelected() signal. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 5b1237bf085a..1948cda048d2 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -724,7 +724,7 @@ void ConfigList::keyPressEvent(QKeyEvent* ev) struct menu *menu; enum prop_type type; - if (ev->key() == Qt::Key_Escape && mode != fullMode && mode != listMode) { + if (ev->key() == Qt::Key_Escape && mode == singleMode) { emit parentSelected(); ev->accept(); return; From patchwork Wed Oct 23 18:17:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847791 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39EF71E8822; Wed, 23 Oct 2024 18:18:39 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707519; cv=none; b=tfel8KjcWjMYqnrgHMjGd0EEpoR5BDjo2mSrg52SlsQ9DumiFjYBV84I8uRRm7qfLf2WA+p6MJYLW7ztynVIUjh8mDPyHS7YoqZi2zHc8qhB6qymxZjkK6g9t81ybFcvmVvOVFr+RYB+BFPpIEhqjLLTwS4hR/ffs3MX1aq+qDQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707519; c=relaxed/simple; bh=6jH1pGp9KLXa8qr/56f45ENyIc/rPq0yIj5+AxK0D1I=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Q3Oc8ZD9wQuQ+K6+k2/1LWvI14XcXvlhTb46YOo/Vzq2qrEk+IsSSN97Q2gKRsX+5xgsMveuu+6czll30vejDUedAxLTuBO2sNtH+uu/mpuSVIBIlq9iAMJZymu5cE8+eU17x0xHZenENnirYWw1jQI8QGShrBZjbuWSeIBgm2c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Rg0J4DB6; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Rg0J4DB6" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6B5BEC4CEC6; Wed, 23 Oct 2024 18:18:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707519; bh=6jH1pGp9KLXa8qr/56f45ENyIc/rPq0yIj5+AxK0D1I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rg0J4DB6oADSAKAb8nEUz14U//mb/GWfkkFGoCD3/NkQRc0CfW0t5Spk5bRVsvr7U TkMAnimUKry0b98wekLK45vm74X/OLPWEFZbl2R9h6Rr8R8DLzuZ3yN8/dAaUD3EWh yX3SBH/a8KepDpvtxlq1UK8qsnk2h5XCg5mt814YXXla9zB3IebnWWmGh6uVIM1RMB RHznZhvZUZiB2Xm7yWwuWX4Ir0tL3MnymOmhPdm65p2dbDrDwpzJmPmGxW8AEK/URa JjWfFCuNqc8RKF3iJvUDfuVPCnikko50gLbv5CDyzKN8QO1gRi94LZpAwx/tA0y7w8 WYBBXQyUAnW1A== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 09/13] kconfig: qconf: remove redundant check in goBack() Date: Thu, 24 Oct 2024 03:17:59 +0900 Message-ID: <20241023181823.138524-9-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The same check is performed in the configList->setParentMenu() call. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 3 --- 1 file changed, 3 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 1948cda048d2..acbc4331ebc5 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1616,9 +1616,6 @@ void ConfigMainWindow::listFocusChanged(void) void ConfigMainWindow::goBack(void) { - if (configList->rootEntry == &rootmenu) - return; - configList->setParentMenu(); } From patchwork Wed Oct 23 18:18:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847792 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 5296D1F80B1; Wed, 23 Oct 2024 18:18:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707520; cv=none; b=IOaw5tAANFJPHxuDEqJiVjMs9oK0t6QTEnH39YhqDgWk5agO0RWJ3B5GbNXOdM02uzJ5maLfirLE3jlTwwMnGx2180RsbwK9x7E8faprlAdLg2XLQa2+mwa65X6/L7Mtqbf6q+Ltc8jOL0B4PoIQclqBjNfA4zrGaWTKO+Z4Kwo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707520; c=relaxed/simple; bh=K00qyjigorjR5oV/0gvj6r3uws0hpbfnhwCGMESVbuc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NLITHEibv/Zl5URaMmFdpYmlQuV/yus7HavL1Js+XilQ8Ti3lEm+6WuAXr70NDswJnv6MD7wBjVT0+9IkhMl1oi/qQAoY++X+zxrRO5wB4KNoUBhDfdgfgF0q1J5QGx10vsce+gwbPhGdOqchdjYWNLGwNVrDO+mac+3LKeNgyE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=VbGZWTZT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="VbGZWTZT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8DE2CC4CEC7; Wed, 23 Oct 2024 18:18:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707520; bh=K00qyjigorjR5oV/0gvj6r3uws0hpbfnhwCGMESVbuc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VbGZWTZTCTSGm+oLPf6mAlVa/wwke6rl0nue1/PGyTMN1jMn3ydWTCQMHx8GW/AKY e3FukNqqroj+TIIpdzgVKn9yqE3SfAadbxxIr3L3ejDoJvwgp5ijhXLsOmPH7X4RqM 3lfOitq8FmRD0NIpgcsGbuPy4g6a/4InXnoh5UXwICdRFdwkRJZXvpSD8lsKcCPIPK uewiGUtuV4UoLyTqzwLQJh4wek37Eu0UdAfOdvkxsRdR/G1L+TzzWYvcffrDDkonmA TiuHm/3T81TjhylheJIvutJwjQa1yQD3p2kkldOqUcVmehs+akdlKdcwY3IvGcNCM4 tyyGatskx+9Rg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 10/13] kconfig: qconf: remove non-functional href="m..." tag Date: Thu, 24 Oct 2024 03:18:00 +0900 Message-ID: <20241023181823.138524-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The only functional tag is href="s". Commit c4f7398bee9c ("kconfig: qconf: make debug links work again") changed prop->name to sym->name for this reference, but it missed to change the tag "m" to "s". This tag is not functional at all. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index acbc4331ebc5..a208ef33128f 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1065,9 +1065,9 @@ QString ConfigInfoView::debug_info(struct symbol *sym) switch (prop->type) { case P_PROMPT: case P_MENU: - stream << "prompt: name << "\">"; + stream << "prompt: "; stream << print_filter(prop->text); - stream << "
"; + stream << "
"; break; case P_DEFAULT: case P_SELECT: From patchwork Wed Oct 23 18:18:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847793 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B6E831D0E3E; Wed, 23 Oct 2024 18:18:41 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707521; cv=none; b=oI+41gok6qBQIeyl/w0wyltr1SwYl/jGwFR39CJmQjKIIRK5yCoolh0ERcIsyikAbNkhWVMQstYxyRZan9QzNXtu80H9iYIT13okrYuBaZq1BhDtEbq5pgqfF/P/HRfUOQeaOW2B526JjyQRtveKmNwJqvM0kVPPpHUcB/d1N94= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707521; c=relaxed/simple; bh=LIylYfq3W+Z7C+TuWMmSTLzgP9BFGIyXtCZHD975w/Q=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=efbjfvvhMnT4190sh+scSSRnNjNyTKUQBSixUlYsO6IvFBL3UUqe9UCEvlVRjfhWriH3HWraKPfm6rvh3w4TnFniJZA+bUmVASQM4YtmYarHk09rMpDoFOVJquIzIX21p3DbRqLA9GAzr7jAjKi6t2Z3tc2nMcY6jFY8lD98aN4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=NmDt1FCK; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="NmDt1FCK" Received: by smtp.kernel.org (Postfix) with ESMTPSA id A4977C4CEC7; Wed, 23 Oct 2024 18:18:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707521; bh=LIylYfq3W+Z7C+TuWMmSTLzgP9BFGIyXtCZHD975w/Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NmDt1FCK+IaevsR35hvwRvkkX2HO602rv2EOxDCpiuaHDKGNkjW9kGJ3fJIIVBWQU nOOKzzveWVCi2kBhByWEY/rItQq8zuZFvFlf2I5DbTy2Ef3kYywyEPAWp1+BcfhDTM 5pf8ljZ7XZyAtMc0W42Xjl3raseGcpqt+KPl+EbjNccd3aDibuy9DLs8DCm143gHGk HhnwUsfoRlgDUNNmcQfdnXbBN062Jc5nggvscxyD6qWXZRLplvOiDGPXMEpZpi53Ci QGsyaJG/jCcje2I6Le0G0ReUkaxQvOIvcija0mDcpaByGHV5UBEmEBAzccnXVgs0qx 3cdBOop3DEgOw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 11/13] kconfig: add sym_get_prompt_menu() helper function Date: Thu, 24 Oct 2024 03:18:01 +0900 Message-ID: <20241023181823.138524-11-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Split out the code that retrieves the menu entry with a prompt, so it can be reused in other functions. Signed-off-by: Masahiro Yamada --- scripts/kconfig/lkc_proto.h | 1 + scripts/kconfig/symbol.c | 26 +++++++++++++++++++------- 2 files changed, 20 insertions(+), 7 deletions(-) diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h index 63519cd24bc7..8914b4e8f2a8 100644 --- a/scripts/kconfig/lkc_proto.h +++ b/scripts/kconfig/lkc_proto.h @@ -34,6 +34,7 @@ bool sym_string_valid(struct symbol *sym, const char *newval); bool sym_string_within_range(struct symbol *sym, const char *str); bool sym_set_string_value(struct symbol *sym, const char *newval); bool sym_is_changeable(const struct symbol *sym); +struct menu *sym_get_prompt_menu(const struct symbol *sym); struct menu *sym_get_choice_menu(const struct symbol *sym); const char * sym_get_string_value(struct symbol *sym); diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c index a3af93aaaf32..89b84bf8e21f 100644 --- a/scripts/kconfig/symbol.c +++ b/scripts/kconfig/symbol.c @@ -70,6 +70,24 @@ const char *sym_type_name(enum symbol_type type) return "???"; } +/** + * sym_get_prompt_menu - get the menu entry with a prompt + * + * @sym: a symbol pointer + * + * Return: the menu entry with a prompt. + */ +struct menu *sym_get_prompt_menu(const struct symbol *sym) +{ + struct menu *m; + + list_for_each_entry(m, &sym->menus, link) + if (m->prompt) + return m; + + return NULL; +} + /** * sym_get_choice_menu - get the parent choice menu if present * @@ -80,18 +98,12 @@ const char *sym_type_name(enum symbol_type type) struct menu *sym_get_choice_menu(const struct symbol *sym) { struct menu *menu = NULL; - struct menu *m; /* * Choice members must have a prompt. Find a menu entry with a prompt, * and assume it resides inside a choice block. */ - list_for_each_entry(m, &sym->menus, link) - if (m->prompt) { - menu = m; - break; - } - + menu = sym_get_prompt_menu(sym); if (!menu) return NULL; From patchwork Wed Oct 23 18:18:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847794 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 96F971FDFA8; Wed, 23 Oct 2024 18:18:42 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707522; cv=none; b=Xdf7darvw2KCTMGp+KYd7/1LRiMkfUSmUXh58wKXAp3GR1HIzxdMYGjGV9G7OvlGMOe6EzPAWzGNX5OUeeW/MD8klXOzGA+1zrXeJuPV1edRqi9fsq2JqdqnETGaXqbmEqhNj51U2X0xHMlTGd/UsttoMsfpWjiwf2NQEyzzwN8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707522; c=relaxed/simple; bh=Qbz+BtbLJT4dt8gyCwggBQrk2rj7FzPUJGKaNNbd0N8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ky7XaDytYXBjKPK0BTpG9T+udu+g06c+67E6WzIlYH5YglnPaF8B/09ElC9Q1Wl/EoPNz0RQC5sRqJqKQs5/Xt9Fh/WldcgWojmmbTojVOstgJVnBNtvoJbGX8VGoDR5IEJT7z4Rugh90HEPmja834G06aQn/HO+myESzgd57ew= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=nv2htbso; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="nv2htbso" Received: by smtp.kernel.org (Postfix) with ESMTPSA id BE92AC4CECD; Wed, 23 Oct 2024 18:18:41 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707522; bh=Qbz+BtbLJT4dt8gyCwggBQrk2rj7FzPUJGKaNNbd0N8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=nv2htbsoyF5gbDRd2C1eFYrUoAX8a8BJ8QID2d6aWySnFCXnu4Lj13/N8uiR6zWwM J2LoJY5YB/4YIiSiI1k6ozWTJo1zXvGA2gyLLg0DhMGyQN5s9i7HwjH6hnAXQuOiYQ AeKzQg0acm6O605VYLQgDQM3/nsvLSsyThMVyigBu9khGFgTpEalvslBAiws/4Sipy EsmANJvfxA3fZfuP9xtkG34C6neYdlQuRjLLs/t+9Hy4mSo2RS6tuShBHHjje1BI2i 6EA/Soycq+4wzf/4nsrmK8R3ssekVzre92H+t76HGyZhjnJ9pQ9FmpU8cgaAhYKkYr lXuEhqfeGZJDw== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 12/13] kconfig: qconf: refactor ConfigInfoView::clicked() Date: Thu, 24 Oct 2024 03:18:02 +0900 Message-ID: <20241023181823.138524-12-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Most of the code in ConfigInfoView::clicked() is unnecessary. There is no need to use the regular expression to search for a symbol. Calling sym_find() is simpler and faster. The hyperlink always begins with the "s" tag, and there is no other tag used. Remove it. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 43 ++++++---------------------------------- 1 file changed, 6 insertions(+), 37 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index a208ef33128f..f59a9597f09b 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1001,7 +1001,7 @@ void ConfigInfoView::menuInfo(void) if (sym->name) { stream << " ("; if (showDebug()) - stream << "name << "\">"; + stream << "name << "\">"; stream << print_filter(sym->name); if (showDebug()) stream << ""; @@ -1010,7 +1010,7 @@ void ConfigInfoView::menuInfo(void) } else if (sym->name) { stream << ""; if (showDebug()) - stream << "name << "\">"; + stream << "name << "\">"; stream << print_filter(sym->name); if (showDebug()) stream << ""; @@ -1124,7 +1124,7 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char QTextStream *stream = reinterpret_cast(data); if (sym && sym->name && !(sym->flags & SYMBOL_CONST)) { - *stream << "name << "\">"; + *stream << "name << "\">"; *stream << print_filter(str); *stream << ""; } else { @@ -1134,39 +1134,11 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char void ConfigInfoView::clicked(const QUrl &url) { - QByteArray str = url.toEncoded(); - const std::size_t count = str.size(); - char *data = new char[count + 2]; // '$' + '\0' - struct symbol **result; - struct menu *m = NULL; + struct menu *m; - if (count < 1) { - delete[] data; - return; - } - - memcpy(data, str.constData(), count); - data[count] = '\0'; - - /* Seek for exact match */ - data[0] = '^'; - strcat(data, "$"); - result = sym_re_search(data); - if (!result) { - delete[] data; - return; - } - - sym = *result; - - /* Seek for the menu which holds the symbol */ - for (struct property *prop = sym->prop; prop; prop = prop->next) { - if (prop->type != P_PROMPT && prop->type != P_MENU) - continue; - m = prop->menu; - break; - } + sym = sym_find(url.toEncoded().constData()); + m = sym_get_prompt_menu(sym); if (!m) { /* Symbol is not visible as a menu */ symbolInfo(); @@ -1174,9 +1146,6 @@ void ConfigInfoView::clicked(const QUrl &url) } else { emit menuSelected(m); } - - free(result); - delete[] data; } void ConfigInfoView::contextMenuEvent(QContextMenuEvent *event) From patchwork Wed Oct 23 18:18:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 13847795 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A98201FEFBA; Wed, 23 Oct 2024 18:18:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707523; cv=none; b=mt03BipOIqU6U9d4iKyN7MWujZ2eh9plLheVrVjBltwzlTjC2RrnkRm4cgjHBxv2kpzt1jCG5bRGsyyuYeiLtG0eUNFTE0WA3ZhopFzyPZXnQsuUPowjWLmDSQ1BChsraJ1Wj4N4egnt8muTCpFma5nllnRKjcN4e2stin2P/fg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729707523; c=relaxed/simple; bh=bBkWm6b5FnrriFJ7mmupA76YK842HVi3CQmnB9tpUjg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N7yvhirXfrV6BezPi+42J/rGAQ3rXK3hY8dahAfIjmXAljTuAFtBzh200n3bRHt6McLcWfdvwT7YRteh89ri81qbmoFPHaFaG6gx2dPzASpjngkGGLlUfs3+BJ8PyeZBQDSGK/2QBoL0th0OrTSTZxzV5gh/NkgkLPv5UKGkazQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=t3eT8NkT; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="t3eT8NkT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id E15E3C4CEC6; Wed, 23 Oct 2024 18:18:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1729707523; bh=bBkWm6b5FnrriFJ7mmupA76YK842HVi3CQmnB9tpUjg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=t3eT8NkTIrEOJpWU3e5lGyv0l4qeGjHpLUlya0aa89w2cCt9hoH+V/2OZFCHmcEn0 txaiHLMQry334Y52Teib3GBte3M2qmzObC97QBiKGwIpnWPZQuLblH6w9y4n6zxKXf MZm9M610qHu063NIRlrgiiqMFJhXudnfd2RGlLq0WJCo5ABAg77TbSt+h7hJXScJ+R cwpV3n5QR+ojhWyPQtD2uR2EhvcktgMuStfE8dkkxlf5k7hFXVTqAdOJp7UDSOgXlv X694jbcKVCKGEgm+NtXJ6g0tuv3PrUgv2gpt0mavmOfAS8dNFD0wFnKQb9OB6jrIkV bDFm6PM/egbsg== From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada , linux-kernel@vger.kernel.org Subject: [PATCH 13/13] kconfig: qconf: remove unnecessary mode check in ConfigItem::updateMenu() Date: Thu, 24 Oct 2024 03:18:03 +0900 Message-ID: <20241023181823.138524-13-masahiroy@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20241023181823.138524-1-masahiroy@kernel.org> References: <20241023181823.138524-1-masahiroy@kernel.org> Precedence: bulk X-Mailing-List: linux-kbuild@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 The P_MENU entries ("menu" and "menuconfig") are never displayed in symbolMode. The condition, list->mode == symbolMode, is never met here. Signed-off-by: Masahiro Yamada --- scripts/kconfig/qconf.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index f59a9597f09b..6c92ef1e16ef 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -110,7 +110,7 @@ void ConfigItem::updateMenu(void) if (prop) switch (prop->type) { case P_MENU: - if (list->mode == singleMode || list->mode == symbolMode) { + if (list->mode == singleMode) { /* a menuconfig entry is displayed differently * depending whether it's at the view root or a child. */