tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

kconfig: qconf: clean deprecated warnings

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 <mchehab+huawei@kernel.org>
Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

authored by

Mauro Carvalho Chehab and committed by
Masahiro Yamada cf497b92 77342a02

+4 -4
+4 -4
scripts/kconfig/qconf.cc
··· 154 154 155 155 if (!sym_is_changeable(sym) && list->optMode == normalOpt) { 156 156 setPixmap(promptColIdx, QIcon()); 157 - setText(noColIdx, QString::null); 158 - setText(modColIdx, QString::null); 159 - setText(yesColIdx, QString::null); 157 + setText(noColIdx, QString()); 158 + setText(modColIdx, QString()); 159 + setText(yesColIdx, QString()); 160 160 break; 161 161 } 162 162 expr = sym_get_tristate_value(sym); ··· 276 276 if (sym_get_string_value(item->menu->sym)) 277 277 setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym))); 278 278 else 279 - setText(QString::null); 279 + setText(QString()); 280 280 Parent::show(); 281 281 setFocus(); 282 282 }