Received: by 2002:a25:1985:0:0:0:0:0 with SMTP id 127csp4457907ybz; Tue, 28 Apr 2020 11:37:34 -0700 (PDT) X-Google-Smtp-Source: APiQypJThHKgI7Eaf+CPbpkCj0kvuz8qaCfBPea+tudmDPcBqmQqMrmJpj76LJFg+O2Eq7HTYxJv X-Received: by 2002:a05:6402:698:: with SMTP id f24mr23270490edy.260.1588099054027; Tue, 28 Apr 2020 11:37:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1588099054; cv=none; d=google.com; s=arc-20160816; b=Qd2jM3uWujkaIvSxmAkNMDqgR4ZrKZZ6XWo3zedoUzC4rrJfJxtulwnIezs/GCUfEg mEHLyvK/qBc0/hbAJIypH1AydSld2gZDBb/L6eCLUacW8RXSyxYWkjRM1H0eUzg837LO q9OYYF+JznsSKuWtBehdHICSer1x5njHfRa503NHyW7sAnXxfz7VNLBsR/2n/H+ibPeD xNyWRioGsOHIVlHNuORz3nFqEhsaPxIo/1E24nlZizcI8Clq72drV/TwOrHbfTu+YZw8 sxvItnxwKlhD+Xx3LPb5WfsdvgnMfdT3btERGI4XvngF6b/vaicgqy4v/UcSUeMxxHOs CuKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=YgWC0cd7AEOKJfjMEoL7HhcfNqNBlnRDuh21ysQzU4A=; b=utu3x0x6v6XajCuzEuQpCBCU6IdLbRhh+H5VljJpJIHOFPN9PKjR5gP5604OTzglzo maKPXDMRBtBj5BsrlpAx+0PvNobX4aWORoTfYM7p0PNodNA6GVTzM7WwpVzix8lUI+Tx reJcnSEZWlCAXfDDV3+flOd2edRDXx1M6xpsX6Nvwhubxca0vfZiiiLv0IIbjl+nymnN 8VaYUdoaKDvkQ17GNGVBaykPi9qGeKjawwBAuZsePhLlY6cYoG1M8sW0yJHgatJd9318 PuGlRkG+OF1Meq2K27zTzXN3VYAU8rnx81/CE9+HRMQNi/dfu9IteWPsTB1OasWLMkYC TqKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=k1JZhG9J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id ks15si2460068ejb.223.2020.04.28.11.37.10; Tue, 28 Apr 2020 11:37:34 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=k1JZhG9J; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730162AbgD1Ses (ORCPT + 99 others); Tue, 28 Apr 2020 14:34:48 -0400 Received: from mail.kernel.org ([198.145.29.99]:51674 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730158AbgD1Seq (ORCPT ); Tue, 28 Apr 2020 14:34:46 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 999FA21707; Tue, 28 Apr 2020 18:34:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588098886; bh=8FF1v0rY69L8p6oHi3x5IgDbWvw9BTh5mmYIlqVDmCE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=k1JZhG9JjdYIWMJMQ8bK5NP9/aWgimPLPqjwSlaOe1sft0QRgsQFzBa571XYjSuTM nZSyBS0zwJzdf2B9/OZnJGbvzmjs6nIQsGzxSa5TKVnw20ghfF5YC6lFwRTPS8TW6i 06HDFzZoK+S9Ssaohc3iExJ1au9ev/ELDUkS9XiE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mauro Carvalho Chehab , Masahiro Yamada , Sasha Levin Subject: [PATCH 5.4 027/168] kconfig: qconf: Fix a few alignment issues Date: Tue, 28 Apr 2020 20:23:21 +0200 Message-Id: <20200428182235.161885390@linuxfoundation.org> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20200428182231.704304409@linuxfoundation.org> References: <20200428182231.704304409@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mauro Carvalho Chehab [ Upstream commit 60969f02f07ae1445730c7b293c421d179da729c ] There are a few items with wrong alignments. Solve them. Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Masahiro Yamada Signed-off-by: Sasha Levin --- scripts/kconfig/qconf.cc | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 82773cc35d356..0f8c77f847114 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -627,7 +627,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) last = item; continue; } - hide: +hide: if (item && item->menu == child) { last = parent->firstChild(); if (last == item) @@ -692,7 +692,7 @@ void ConfigList::updateMenuList(ConfigList *parent, struct menu* menu) last = item; continue; } - hide: +hide: if (item && item->menu == child) { last = (ConfigItem*)parent->topLevelItem(0); if (last == item) @@ -1225,10 +1225,11 @@ QMenu* ConfigInfoView::createStandardContextMenu(const QPoint & pos) { QMenu* popup = Parent::createStandardContextMenu(pos); QAction* action = new QAction("Show Debug Info", popup); - action->setCheckable(true); - connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); - connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); - action->setChecked(showDebug()); + + action->setCheckable(true); + connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool))); + connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool))); + action->setChecked(showDebug()); popup->addSeparator(); popup->addAction(action); return popup; -- 2.20.1