From patchwork Thu Apr 2 09:27:58 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mauro Carvalho Chehab X-Patchwork-Id: 11470397 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 706AB14DD for ; Thu, 2 Apr 2020 09:28:34 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4EFEC206D3 for ; Thu, 2 Apr 2020 09:28:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819714; bh=uW5gIy6Vwri4JjBZCqV2GhL39w/KMjWmxypGxq5SSDw=; h=From:Cc:Subject:Date:In-Reply-To:References:To:List-ID:From; b=Tg9ZImaQ6SQd04MMMnZ2vcvtqaRNNFNE6uZfZpryfuEgknYcII/hpL7DZ24SlfHgD +I2/xpxibd4cJ9iBSRkUUkh+InFyor9qLdPevdSie93zmnFIxAKZIeGGKwvyCSZ0Qa MpgnveLR8NN7QuuhV6lSOGCaajbkPdoKJnwNNe3w= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2387730AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org ([198.145.29.99]:49206 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728135AbgDBJ2I (ORCPT ); Thu, 2 Apr 2020 05:28:08 -0400 Received: from mail.kernel.org (ip5f5ad4d8.dynamic.kabel-deutschland.de [95.90.212.216]) (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 BD52D2073B; Thu, 2 Apr 2020 09:28:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1585819687; bh=uW5gIy6Vwri4JjBZCqV2GhL39w/KMjWmxypGxq5SSDw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H580aSQR61YugH6s4MZW4GdgtvX8Nq0d54fqTDql8QtZ4i4D1B4T81ygOL76yEJyI fed4KFk+QNQ/4Flf5odrDQoOM57gUbLORUwELeFPRiggWb3+CvgvB8FoAMFlY+nqrf F1Zxx6ZyqlR5M4hi9q5eRq2u3fm1kzZXreumy7nc= Received: from mchehab by mail.kernel.org with local (Exim 4.92.3) (envelope-from ) id 1jJw8s-000Aa6-1a; Thu, 02 Apr 2020 11:28:06 +0200 From: Mauro Carvalho Chehab Cc: Mauro Carvalho Chehab , Dan Carpenter , linux-kernel@vger.kernel.org, Masahiro Yamada , linux-kbuild@vger.kernel.org Subject: [PATCH 1/6] kconfig: qconf: clean deprecated warnings Date: Thu, 2 Apr 2020 11:27:58 +0200 Message-Id: <9e939a9af7adbfc1e567ca13955788608aecddd3.1585819250.git.mchehab+huawei@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 To: unlisted-recipients:; (no To-header on input) Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org The recommended way to initialize a null string is with QString(). This is there at least since Qt5.5, with is when qconf was ported to Qt5. Fix those warnings: scripts/kconfig/qconf.cc: In member function ‘void ConfigItem::updateMenu()’: scripts/kconfig/qconf.cc:158:31: warning: ‘QString::null’ is deprecated: use QString() [-Wdeprecated-declarations] 158 | setText(noColIdx, QString::null); | ^~~~ In file included from /usr/include/qt5/QtCore/qobject.h:47, from /usr/include/qt5/QtWidgets/qwidget.h:45, from /usr/include/qt5/QtWidgets/qmainwindow.h:44, from /usr/include/qt5/QtWidgets/QMainWindow:1, from scripts/kconfig/qconf.cc:9: Signed-off-by: Mauro Carvalho Chehab --- scripts/kconfig/qconf.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 82773cc35d35..daa3325c0a49 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -154,9 +154,9 @@ void ConfigItem::updateMenu(void) if (!sym_is_changeable(sym) && list->optMode == normalOpt) { setPixmap(promptColIdx, QIcon()); - setText(noColIdx, QString::null); - setText(modColIdx, QString::null); - setText(yesColIdx, QString::null); + setText(noColIdx, QString()); + setText(modColIdx, QString()); + setText(yesColIdx, QString()); break; } expr = sym_get_tristate_value(sym); @@ -276,7 +276,7 @@ void ConfigLineEdit::show(ConfigItem* i) if (sym_get_string_value(item->menu->sym)) setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym))); else - setText(QString::null); + setText(QString()); Parent::show(); setFocus(); }