public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Rolf Eike Beer <eb@emlix.com>
To: Masahiro Yamada <masahiroy@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 4/7] kconfig: qconf: use QCommandLineParser
Date: Wed, 23 Oct 2024 08:33:26 +0200	[thread overview]
Message-ID: <8441512.T7Z3S40VBb@devpool47.emlix.com> (raw)
In-Reply-To: <4960180.31r3eYUQgx@devpool47.emlix.com>

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 <eb@emlix.com>
---
 scripts/kconfig/qconf.cc | 44 ++++++++++++++++------------------------
 1 file changed, 17 insertions(+), 27 deletions(-)

diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 6a653ebe9df3..313a51941825 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -8,6 +8,7 @@
 #include <QActionGroup>
 #include <QApplication>
 #include <QCloseEvent>
+#include <QCommandLineParser>
 #include <QDebug>
 #include <QFileDialog>
 #include <QLabel>
@@ -1844,41 +1845,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("file", "config file to open", "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.0



-- 
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



  parent reply	other threads:[~2024-10-23  6:33 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-23  6:26 [PATCH 0/7] improve qconfig C++ code Rolf Eike Beer
2024-10-23  6:29 ` [PATCH 1/7] kconfig: qconf: use QByteArray API instead of manually constructing a string Rolf Eike Beer
2024-10-23 16:37   ` Masahiro Yamada
2024-10-23 19:07     ` Masahiro Yamada
2024-10-24  7:02       ` Rolf Eike Beer
2024-10-23  6:31 ` [PATCH 2/7] kconfig: qconf: use QString to store path to configuration file Rolf Eike Beer
2024-10-23 16:37   ` Masahiro Yamada
2024-10-23  6:32 ` [PATCH 3/7] kconfig: qconf: use preferred form of QString API Rolf Eike Beer
2024-10-23 16:38   ` Masahiro Yamada
2024-10-23  6:33 ` Rolf Eike Beer [this message]
2024-10-23 16:39   ` [PATCH 4/7] kconfig: qconf: use QCommandLineParser Masahiro Yamada
2024-10-24 11:28     ` Masahiro Yamada
2024-10-23  6:34 ` [PATCH 5/7] kconfig: qconf: use nullptr in C++11 code Rolf Eike Beer
2024-10-23 16:41   ` Masahiro Yamada
2024-10-24  7:05     ` Rolf Eike Beer
2024-10-23  6:36 ` [PATCH 6/7] kconfig: qconf: use default platform shortcuts Rolf Eike Beer
2024-10-23 16:48   ` Masahiro Yamada
2024-10-23  6:39 ` [PATCH 7/7] kconfig: qconf: simplify character replacement Rolf Eike Beer
2024-10-23 16:51   ` Masahiro Yamada

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8441512.T7Z3S40VBb@devpool47.emlix.com \
    --to=eb@emlix.com \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=masahiroy@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox