Skip to content

Commit cf497b9

Browse files
mchehabmasahir0y
authored andcommitted
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 <[email protected]> Signed-off-by: Masahiro Yamada <[email protected]>
1 parent 77342a0 commit cf497b9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

scripts/kconfig/qconf.cc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -154,9 +154,9 @@ void ConfigItem::updateMenu(void)
154154

155155
if (!sym_is_changeable(sym) && list->optMode == normalOpt) {
156156
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());
160160
break;
161161
}
162162
expr = sym_get_tristate_value(sym);
@@ -276,7 +276,7 @@ void ConfigLineEdit::show(ConfigItem* i)
276276
if (sym_get_string_value(item->menu->sym))
277277
setText(QString::fromLocal8Bit(sym_get_string_value(item->menu->sym)));
278278
else
279-
setText(QString::null);
279+
setText(QString());
280280
Parent::show();
281281
setFocus();
282282
}

0 commit comments

Comments
 (0)