improve qconfig C++ code, take 2
cover improve qconfig C++ code, take 2
This is a followup to my earlier series, which has been partially applied already. Other patches that became obsolete by unrelated refactoring have been dropped.
The review comments have been addressed. The nullptr patch should now be complete and catch every "0" in qconf.cc and qconf.h. One additional patch has been added that removes a constructor overload that would have needed this treatment otherwise as well.
Regards,
Eike
Signature · 13 lines
Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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
PATCH 1/4 kconfig: qconf: use preferred form of QString API
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.
--- scripts/kconfig/qconf.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
scripts/kconfig/qconf.cc +4 -4
@@ -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())) {
Signature · 17 lines
2.47.1 -- Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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
Re: [PATCH 1/4] kconfig: qconf: use preferred form of QString API
Quoted 10 lines · Rolf Eike Beer
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 <[email protected]>---
Applied to linux-kbuild. Thanks.
Quoted 49 lines
scripts/kconfig/qconf.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)scripts/kconfig/qconf.cc +4
-5@@ -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 Beeremlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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.comemlix - your embedded Linux partner
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 2/4 kconfig: qconf: use QCommandLineParser
In reply to Rolf Eike BeerThis has a much nicer output without manual processing. It also adds window management options from Qt for free.
--- scripts/kconfig/qconf.cc | 44 ++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 27 deletions(-)
scripts/kconfig/qconf.cc +17 -27
@@ -8,6 +8,7 @@ #include <QActionGroup> #include <QApplication> #include <QCloseEvent> +#include <QCommandLineParser> #include <QDebug> #include <QFileDialog> #include <QLabel>
@@ -1785,41 +1786,30 @@ void fixup_rootmenu(struct menu *menu) } } -static const char *progname; - -static void usage(void) -{ - printf("%s [-s] <config>\n", progname); - exit(0); -} - int main(int ac, char** av) { ConfigMainWindow* v; - const char *name; + configApp = new QApplication(ac, av); + QCommandLineParser cmdline; + QCommandLineOption silent("s", "silent"); - progname = av[0]; - if (ac > 1 && av[1][0] == '-') { - switch (av[1][1]) { - case 's': - conf_set_message_callback(NULL); - break; - case 'h': - case '?': - usage(); - } - name = av[2]; - } else - name = av[1]; - if (!name) - usage(); + cmdline.addOption(silent); + cmdline.addHelpOption(); + cmdline.addPositionalArgument("Kconfig", "Top-level Kconfig file", "Kconfig"); + + cmdline.process(*configApp); + + if (cmdline.isSet(silent)) + conf_set_message_callback(NULL); - conf_parse(name); + QStringList args = cmdline.positionalArguments(); + if (args.isEmpty()) + cmdline.showHelp(1); + + conf_parse(args.first().toLocal8Bit().constData()); fixup_rootmenu(&rootmenu); //zconfdump(stdout); - configApp = new QApplication(ac, av); - configSettings = new ConfigSettings(); configSettings->beginGroup("/kconfig/qconf"); v = new ConfigMainWindow();
Signature · 17 lines
2.47.1 -- Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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
Re: [PATCH 2/4] kconfig: qconf: use QCommandLineParser
Quoted 6 lines · Rolf Eike Beer
This has a much nicer output without manual processing. It also adds window management options from Qt for free.
Signed-off-by Rolf Eike Beer <[email protected]>---
This did not reflect my previous comment.
https://lore.kernel.org/linux-kbuild/CAK7LNASdLT-KQA7+Vn+Y2ZJeropcR-sjmv8p2=DCgzCyQdJAEw@mail.gmail.com/
Quoted 93 lines
scripts/kconfig/qconf.cc | 44 ++++++++++++++++------------------------ 1 file changed, 17 insertions(+), 27 deletions(-)scripts/kconfig/qconf.cc +17
-28@@ -8,6 +8,7 @@ #include <QActionGroup> #include <QApplication> #include <QCloseEvent> +#include <QCommandLineParser> #include <QDebug> #include <QFileDialog> #include <QLabel>@@ -1785,41 +1786,30 @@ void fixup_rootmenu(struct menu *menu) } } -static const char *progname; - -static void usage(void) -{ - printf("%s [-s] <config>\n", progname); - exit(0); -} - int main(int ac, char** av) { ConfigMainWindow* v; - const char *name; + configApp = new QApplication(ac, av); + QCommandLineParser cmdline; + QCommandLineOption silent("s", "silent"); - progname = av[0]; - if (ac > 1 && av[1][0] == '-') { - switch (av[1][1]) { - case 's': - conf_set_message_callback(NULL); - break; - case 'h': - case '?': - usage(); - } - name = av[2]; - } else - name = av[1]; - if (!name) - usage(); + cmdline.addOption(silent); + cmdline.addHelpOption(); + cmdline.addPositionalArgument("Kconfig", "Top-level Kconfig file", "Kconfig"); + + cmdline.process(*configApp); + + if (cmdline.isSet(silent)) + conf_set_message_callback(NULL); - conf_parse(name); + QStringList args = cmdline.positionalArguments(); + if (args.isEmpty()) + cmdline.showHelp(1); + + conf_parse(args.first().toLocal8Bit().constData()); fixup_rootmenu(&rootmenu); //zconfdump(stdout); - configApp = new QApplication(ac, av); - configSettings = new ConfigSettings(); configSettings->beginGroup("/kconfig/qconf"); v = new ConfigMainWindow(); --2.47.1
--
Rolf Eike Beeremlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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.comemlix - your embedded Linux partner
Signature · 2 lines
Best Regards Masahiro Yamada
PATCH 3/4 kconfig: qconf: remove overloaded constructor
In reply to Rolf Eike BeerNo extra implementation is needed for this variant, provide a default argument to the matching sibling instead.
--- scripts/kconfig/qconf.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)
scripts/kconfig/qconf.h +1 -6
@@ -114,7 +114,7 @@ public slots: class ConfigItem : public QTreeWidgetItem { typedef class QTreeWidgetItem Parent; public: - ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m) + ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m = nullptr) : Parent(parent, after), nextItem(0), menu(m), goParent(false) {init ();
@@ -124,11 +124,6 @@ class ConfigItem : public QTreeWidgetItem { {init (); } - ConfigItem(ConfigList *parent, ConfigItem *after) - : Parent(parent, after), nextItem(0), menu(0), goParent(true) - { -init (); - } ~ConfigItem (void);void init (void );void updateMenu (void );
Signature · 17 lines
2.47.1 -- Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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
Re: [PATCH 3/4] kconfig: qconf: remove overloaded constructor
Quoted 3 lines · Rolf Eike Beer
No extra implementation is needed for this variant, provide a default argument to the matching sibling instead.
I am not sure if this is equivalent conversion
because you are changing goParent(true)
into goParent(false).
Quoted 50 lines
Signed-off-by Rolf Eike Beer <[email protected]>--- scripts/kconfig/qconf.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)scripts/kconfig/qconf.h +1
-7@@ -114,7 +114,7 @@ public slots: class ConfigItem : public QTreeWidgetItem { typedef class QTreeWidgetItem Parent; public: - ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m) + ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m = nullptr) : Parent(parent, after), nextItem(0), menu(m), goParent(false) {init ();@@ -124,11 +124,6 @@ class ConfigItem : public QTreeWidgetItem { {init (); } - ConfigItem(ConfigList *parent, ConfigItem *after) - : Parent(parent, after), nextItem(0), menu(0), goParent(true) - { -init (); - } ~ConfigItem (void);void init (void );void updateMenu (void ); --2.47.1
--
Rolf Eike Beeremlix GmbH
Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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.comemlix - your embedded Linux partner
Signature · 2 lines
Best Regards Masahiro Yamada
Re: [PATCH 3/4] kconfig: qconf: remove overloaded constructor
Quoted 7 lines · On Freitag, 10. Januar 2025 18:29:06 Mitteleuropäische Normalzeit Masahiro…
Quoted 2 lines · Rolf Eike Beer
No extra implementation is needed for this variant, provide a default argument to the matching sibling instead.
I am not sure if this is equivalent conversion
because you are changing goParent(true)
into goParent(false).
It is not, for exactly that reason. Found that out the hard way, i.e. it crashes in some situations which I didn't notice before. I'll send an updated patch.
Regards,
Eike
Signature · 13 lines
Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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
PATCH 4/4 kconfig: qconf: use nullptr in C++11 code
In reply to Rolf Eike BeerThis C++11 keyword is typesafe, i.e. it can't be assigned to non-pointers, and it makes it visually clear that this is about a pointer.
--- scripts/kconfig/qconf.cc | 42 ++++++++++++++++++++-------------------- scripts/kconfig/qconf.h | 8 ++++---- 2 files changed, 25 insertions(+), 25 deletions(-)
scripts/kconfig/qconf.cc +21 -21
@@ -303,7 +303,7 @@ ConfigList::ConfigList(QWidget *parent, const char *name) : QTreeWidget(parent), updateAll(false), showName(false), mode(singleMode), optMode(normalOpt), - rootEntry(0), headerPopup(0) + rootEntry(nullptr), headerPopup(nullptr) { setObjectName(name); setSortingEnabled(false);
@@ -417,7 +417,7 @@ void ConfigList::updateSelection(void) void ConfigList::updateList() { - ConfigItem* last = 0; + ConfigItem* last = nullptr; ConfigItem *item; if (!rootEntry) {
@@ -439,7 +439,7 @@ void ConfigList::updateList() if (rootEntry != &rootmenu && mode == singleMode) { item = (ConfigItem *)topLevelItem(0); if (!item) - item = new ConfigItem(this, 0); + item = new ConfigItem(this, nullptr); last = item; } if ((mode == singleMode || (mode == symbolMode && !(rootEntry->flags & MENU_ROOT))) &&
@@ -489,7 +489,7 @@ void ConfigList::setValue(ConfigItem* item, tristate val) int type; tristate oldval; - sym = item->menu ? item->menu->sym : 0; + sym = item->menu ? item->menu->sym : nullptr; if (!sym) return;
@@ -553,7 +553,7 @@ void ConfigList::setRootMenu(struct menu *menu) type = menu && menu->prompt ? menu->prompt->type : P_UNKNOWN; if (type != P_MENU) return; - updateMenuList(0); + updateMenuList(nullptr); rootEntry = menu; updateListAll(); if (currentItem()) {
@@ -610,7 +610,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) last = parent->firstChild(); if (last && !last->goParent) - last = 0; + last = nullptr; for (child = menu->list; child; child = child->next) { item = last ? last->nextSibling() : parent->firstChild(); type = child->prompt ? child->prompt->type : P_UNKNOWN;
@@ -639,7 +639,7 @@ void ConfigList::updateMenuList(ConfigItem *parent, struct menu* menu) if (mode == fullMode || mode == menuMode || type != P_MENU) updateMenuList(item, child); else - updateMenuList(item, 0); + updateMenuList(item, nullptr); last = item; continue; }
@@ -647,7 +647,7 @@ hide: if (item && item->menu == child) { last = parent->firstChild(); if (last == item) - last = 0; + last = nullptr; else while (last->nextSibling() != item) last = last->nextSibling(); delete item;
@@ -673,7 +673,7 @@ void ConfigList::updateMenuList(struct menu *menu) last = (ConfigItem *)topLevelItem(0); if (last && !last->goParent) - last = 0; + last = nullptr; for (child = menu->list; child; child = child->next) { item = last ? last->nextSibling() : (ConfigItem *)topLevelItem(0); type = child->prompt ? child->prompt->type : P_UNKNOWN;
@@ -702,7 +702,7 @@ void ConfigList::updateMenuList(struct menu *menu) if (mode == fullMode || mode == menuMode || type != P_MENU) updateMenuList(item, child); else - updateMenuList(item, 0); + updateMenuList(item, nullptr); last = item; continue; }
@@ -710,7 +710,7 @@ hide: if (item && item->menu == child) { last = (ConfigItem *)topLevelItem(0); if (last == item) - last = 0; + last = nullptr; else while (last->nextSibling() != item) last = last->nextSibling(); delete item;
@@ -853,7 +853,7 @@ skip: void ConfigList::focusInEvent(QFocusEvent *e) { - struct menu *menu = NULL; + struct menu *menu = nullptr; Parent::focusInEvent(e);
@@ -912,7 +912,7 @@ void ConfigList::setAllOpen(bool open) } ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name) - : Parent(parent), sym(0), _menu(0) + : Parent(parent), sym(nullptr), _menu(nullptr) { setObjectName(name); setOpenLinks(false);
@@ -964,7 +964,7 @@ void ConfigInfoView::setInfo(struct menu *m) if (_menu == m) return; _menu = m; - sym = NULL; + sym = nullptr; if (!_menu) clear(); else
@@ -1156,7 +1156,7 @@ void ConfigInfoView::contextMenuEvent(QContextMenuEvent *event) } ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow *parent) - : Parent(parent), result(NULL) + : Parent(parent), result(nullptr) { setObjectName("search"); setWindowTitle("Search Config");
@@ -1228,7 +1228,7 @@ void ConfigSearchWindow::search(void) { struct symbol **p; struct property *prop; - ConfigItem *lastItem = NULL; + ConfigItem *lastItem = nullptr; free(result); list->clear();
@@ -1247,7 +1247,7 @@ void ConfigSearchWindow::search(void) * Construct the complete config widget */ ConfigMainWindow::ConfigMainWindow(void) - : searchWindow(0) + : searchWindow(nullptr) { bool ok = true; QVariant x, y;
@@ -1524,7 +1524,7 @@ void ConfigMainWindow::changeMenu(struct menu *menu) void ConfigMainWindow::setMenuLink(struct menu *menu) { struct menu *parent; - ConfigList* list = NULL; + ConfigList* list = nullptr; ConfigItem* item; if (configList->menuSkip(menu))
@@ -1601,7 +1601,7 @@ void ConfigMainWindow::showSingleView(void) backAction->setEnabled(true); menuList->hide(); - menuList->setRootMenu(0); + menuList->setRootMenu(nullptr); configList->mode = singleMode; if (configList->rootEntry == &rootmenu) configList->updateListAll();
@@ -1647,7 +1647,7 @@ void ConfigMainWindow::showFullView(void) backAction->setEnabled(false); menuList->hide(); - menuList->setRootMenu(0); + menuList->setRootMenu(nullptr); configList->mode = fullMode; if (configList->rootEntry == &rootmenu) configList->updateListAll();
@@ -1800,7 +1800,7 @@ int main(int ac, char** av) cmdline.process(*configApp); if (cmdline.isSet(silent)) - conf_set_message_callback(NULL); + conf_set_message_callback(nullptr); QStringList args = cmdline.positionalArguments(); if (args.isEmpty())
scripts/kconfig/qconf.h +4 -4
@@ -42,7 +42,7 @@ class ConfigList : public QTreeWidget {Q_OBJECT typedef class QTreeWidget Parent; public: - ConfigList(QWidget *parent, const char *name = 0); + ConfigList(QWidget *parent, const char *name = nullptr); ~ConfigList ();void reinit (void );ConfigItem *findConfigItem (struct menu *);
@@ -115,12 +115,12 @@ class ConfigItem : public QTreeWidgetItem { typedef class QTreeWidgetItem Parent; public: ConfigItem(ConfigList *parent, ConfigItem *after, struct menu *m = nullptr) - : Parent(parent, after), nextItem(0), menu(m), goParent(false) + : Parent(parent, after), nextItem(nullptr), menu(m), goParent(false) {init (); } ConfigItem(ConfigItem *parent, ConfigItem *after, struct menu *m) - : Parent(parent, after), nextItem(0), menu(m), goParent(false) + : Parent(parent, after), nextItem(nullptr), menu(m), goParent(false) {init (); }
@@ -180,7 +180,7 @@ class ConfigInfoView : public QTextBrowser { typedef class QTextBrowser Parent;QMenu *contextMenu; public: - ConfigInfoView(QWidget* parent, const char *name = 0); + ConfigInfoView(QWidget* parent, const char *name = nullptr);bool showDebug (void ) const {return _showDebug; } public slots:
Signature · 17 lines
2.47.1 -- Rolf Eike Beer emlix GmbH Headquarters: Berliner Str. 12, 37073 Göttingen, Germany Phone +49 (0)551 30664-0, e-mail [email protected] 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