1. 21 8月, 2020 3 次提交
    • M
      kconfig: qconf: replace deprecated QString::sprintf() with QTextStream · 510bc3cb
      Masahiro Yamada 提交于
      QString::sprintf() is deprecated in the latest Qt version, and spawns
      a lot of warnings:
      
        HOSTCXX scripts/kconfig/qconf.o
      scripts/kconfig/qconf.cc: In member function ‘void ConfigInfoView::menuInfo()’:
      scripts/kconfig/qconf.cc:1090:61: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
       1090 |      head += QString().sprintf("<a href=\"s%s\">", sym->name);
            |                                                             ^
      In file included from /usr/include/qt5/QtGui/qkeysequence.h:44,
                       from /usr/include/qt5/QtWidgets/qaction.h:44,
                       from /usr/include/qt5/QtWidgets/QAction:1,
                       from scripts/kconfig/qconf.cc:7:
      /usr/include/qt5/QtCore/qstring.h:382:14: note: declared here
        382 |     QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
            |              ^~~~~~~
      scripts/kconfig/qconf.cc:1099:60: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
       1099 |     head += QString().sprintf("<a href=\"s%s\">", sym->name);
            |                                                            ^
      In file included from /usr/include/qt5/QtGui/qkeysequence.h:44,
                       from /usr/include/qt5/QtWidgets/qaction.h:44,
                       from /usr/include/qt5/QtWidgets/QAction:1,
                       from scripts/kconfig/qconf.cc:7:
      /usr/include/qt5/QtCore/qstring.h:382:14: note: declared here
        382 |     QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
            |              ^~~~~~~
      scripts/kconfig/qconf.cc:1127:90: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
       1127 |   debug += QString().sprintf("defined at %s:%d<br><br>", _menu->file->name, _menu->lineno);
            |                                                                                          ^
      In file included from /usr/include/qt5/QtGui/qkeysequence.h:44,
                       from /usr/include/qt5/QtWidgets/qaction.h:44,
                       from /usr/include/qt5/QtWidgets/QAction:1,
                       from scripts/kconfig/qconf.cc:7:
      /usr/include/qt5/QtCore/qstring.h:382:14: note: declared here
        382 |     QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
            |              ^~~~~~~
      scripts/kconfig/qconf.cc: In member function ‘QString ConfigInfoView::debug_info(symbol*)’:
      scripts/kconfig/qconf.cc:1150:68: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
       1150 |    debug += QString().sprintf("prompt: <a href=\"m%s\">", sym->name);
            |                                                                    ^
      In file included from /usr/include/qt5/QtGui/qkeysequence.h:44,
                       from /usr/include/qt5/QtWidgets/qaction.h:44,
                       from /usr/include/qt5/QtWidgets/QAction:1,
                       from scripts/kconfig/qconf.cc:7:
      /usr/include/qt5/QtCore/qstring.h:382:14: note: declared here
        382 |     QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
            |              ^~~~~~~
      scripts/kconfig/qconf.cc: In static member function ‘static void ConfigInfoView::expr_print_help(void*, symbol*, const char*)’:
      scripts/kconfig/qconf.cc:1225:59: warning: ‘QString& QString::sprintf(const char*, ...)’ is deprecated: Use asprintf(), arg() or QTextStream instead [-Wdeprecated-declarations]
       1225 |   *text += QString().sprintf("<a href=\"s%s\">", sym->name);
            |                                                           ^
      In file included from /usr/include/qt5/QtGui/qkeysequence.h:44,
                       from /usr/include/qt5/QtWidgets/qaction.h:44,
                       from /usr/include/qt5/QtWidgets/QAction:1,
                       from scripts/kconfig/qconf.cc:7:
      /usr/include/qt5/QtCore/qstring.h:382:14: note: declared here
        382 |     QString &sprintf(const char *format, ...) Q_ATTRIBUTE_FORMAT_PRINTF(2, 3);
            |              ^~~~~~~
      
      The documentation also says:
      "Warning: We do not recommend using QString::asprintf() in new Qt code.
      Instead, consider using QTextStream or arg(), both of which support
      Unicode strings seamlessly and are type-safe."
      
      Use QTextStream as suggested.
      Reported-by: NRobert Crawford <flacycads@cox.net>
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      510bc3cb
    • M
      kconfig: qconf: remove redundant help in the info view · 68fd110b
      Masahiro Yamada 提交于
      The same information is repeated in the info view.
      
      Remove the second one.
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      68fd110b
    • M
      kconfig: qconf: remove qInfo() to get back Qt4 support · 53efe2e7
      Masahiro Yamada 提交于
      qconf is supposed to work with Qt4 and Qt5, but since commit
      c4f7398b ("kconfig: qconf: make debug links work again"),
      building with Qt4 fails as follows:
      
        HOSTCXX scripts/kconfig/qconf.o
      scripts/kconfig/qconf.cc: In member function ‘void ConfigInfoView::clicked(const QUrl&)’:
      scripts/kconfig/qconf.cc:1241:3: error: ‘qInfo’ was not declared in this scope; did you mean ‘setInfo’?
       1241 |   qInfo() << "Clicked link is empty";
            |   ^~~~~
            |   setInfo
      scripts/kconfig/qconf.cc:1254:3: error: ‘qInfo’ was not declared in this scope; did you mean ‘setInfo’?
       1254 |   qInfo() << "Clicked symbol is invalid:" << data;
            |   ^~~~~
            |   setInfo
      make[1]: *** [scripts/Makefile.host:129: scripts/kconfig/qconf.o] Error 1
      make: *** [Makefile:606: xconfig] Error 2
      
      qInfo() does not exist in Qt4. In my understanding, these call-sites
      should be unreachable. Perhaps, qWarning(), assertion, or something
      is better, but qInfo() is not the right one to use here, I think.
      
      Fixes: c4f7398b ("kconfig: qconf: make debug links work again")
      Reported-by: NRonald Warsow <rwarsow@gmx.de>
      Signed-off-by: NMasahiro Yamada <masahiroy@kernel.org>
      53efe2e7
  2. 18 8月, 2020 6 次提交
  3. 14 8月, 2020 24 次提交
  4. 13 8月, 2020 6 次提交
  5. 10 8月, 2020 1 次提交