| Message ID | 4616510.LvFx2qVVIh@devpool47.emlix.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | improve qconfig C++ code, take 2 | expand |
On Thu, Dec 19, 2024 at 4:23 PM Rolf Eike Beer <eb@emlix.com> wrote: > > A QString constructed from a character literal of length 0, i.e. "", is not > "null" for historical reasons. This does not matter here so use the preferred > method isEmpty() instead. > > Also directly construct empty QString objects instead of passing in an empty > character literal that has to be parsed into an empty object first. > > Signed-off-by: Rolf Eike Beer <eb@emlix.com> > --- Applied to linux-kbuild. Thanks. > 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 6c92ef1e16ef..eaa465b0ccf9 100644 > --- a/scripts/kconfig/qconf.cc > +++ b/scripts/kconfig/qconf.cc > @@ -1464,8 +1464,8 @@ void ConfigMainWindow::loadConfig(void) > { > QString str; > > - str = QFileDialog::getOpenFileName(this, "", configname); > - if (str.isNull()) > + str = QFileDialog::getOpenFileName(this, QString(), configname); > + if (str.isEmpty()) > return; > > if (conf_read(str.toLocal8Bit().constData())) > @@ -1491,8 +1491,8 @@ void ConfigMainWindow::saveConfigAs(void) > { > QString str; > > - str = QFileDialog::getSaveFileName(this, "", configname); > - if (str.isNull()) > + str = QFileDialog::getSaveFileName(this, QString(), configname); > + if (str.isEmpty()) > return; > > if (conf_write(str.toLocal8Bit().constData())) { > -- > 2.47.1 > > > -- > Rolf Eike Beer > > emlix GmbH > Headquarters: Berliner Str. 12, 37073 Göttingen, Germany > Phone +49 (0)551 30664-0, e-mail info@emlix.com > District Court of Göttingen, Registry Number HR B 3160 > Managing Directors: Heike Jordan, Dr. Uwe Kracke > VAT ID No. DE 205 198 055 > Office Berlin: Panoramastr. 1, 10178 Berlin, Germany > Office Bonn: Bachstr. 6, 53115 Bonn, Germany > http://www.emlix.com > > emlix - your embedded Linux partner > >
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc index 6c92ef1e16ef..eaa465b0ccf9 100644 --- a/scripts/kconfig/qconf.cc +++ b/scripts/kconfig/qconf.cc @@ -1464,8 +1464,8 @@ void ConfigMainWindow::loadConfig(void) { QString str; - str = QFileDialog::getOpenFileName(this, "", configname); - if (str.isNull()) + str = QFileDialog::getOpenFileName(this, QString(), configname); + if (str.isEmpty()) return; if (conf_read(str.toLocal8Bit().constData())) @@ -1491,8 +1491,8 @@ void ConfigMainWindow::saveConfigAs(void) { QString str; - str = QFileDialog::getSaveFileName(this, "", configname); - if (str.isNull()) + str = QFileDialog::getSaveFileName(this, QString(), configname); + if (str.isEmpty()) return; if (conf_write(str.toLocal8Bit().constData())) {
A QString constructed from a character literal of length 0, i.e. "", is not "null" for historical reasons. This does not matter here so use the preferred method isEmpty() instead. Also directly construct empty QString objects instead of passing in an empty character literal that has to be parsed into an empty object first. Signed-off-by: Rolf Eike Beer <eb@emlix.com> --- scripts/kconfig/qconf.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)