Page MenuHome GnuPG
Files F40810842

No OneTemporary
Actions

View Options

diff --git a/src/kleopatra_options.h b/src/kleopatra_options.h
index 6da15ed32..488f5bb62 100644
--- a/src/kleopatra_options.h
+++ b/src/kleopatra_options.h
@@ -1,91 +1,59 @@
/*
kleopatra_options.h
This file is part of Kleopatra, the KDE keymanager
SPDX-FileCopyrightText: 2015 Bundesamt für Sicherheit in der Informationstechnik
SPDX-FileContributor: Intevation GmbH
SPDX-License-Identifier: GPL-2.0-or-later
*/
#pragma once
#include <config-kleopatra.h>
#include <QCommandLineParser>
#include <KLocalizedString>
static void kleopatra_options(QCommandLineParser *parser)
{
- QList<QCommandLineOption> options;
-
- options << QCommandLineOption(QStringList() << QStringLiteral("openpgp")
- << QStringLiteral("p"),
- i18n("Use OpenPGP for the following operation"))
- << QCommandLineOption(QStringList() << QStringLiteral("cms")
- << QStringLiteral("c"),
- i18n("Use CMS (X.509, S/MIME) for the following operation"))
+ parser->addOptions({
+ QCommandLineOption({QStringLiteral("openpgp"), QStringLiteral("p")}, i18n("Use OpenPGP for the following operation")),
+ QCommandLineOption({QStringLiteral("cms"), QStringLiteral("c")}, i18n("Use CMS (X.509, S/MIME) for the following operation")),
#ifdef HAVE_USABLE_ASSUAN
- << QCommandLineOption(QStringLiteral("uiserver-socket"),
- i18n("Location of the socket the ui server is listening on"),
- QStringLiteral("argument"))
- << QCommandLineOption(QStringLiteral("daemon"),
- i18n("Run UI server only, hide main window"))
+ QCommandLineOption(QStringLiteral("uiserver-socket"), i18n("Location of the socket the ui server is listening on"), QStringLiteral("argument")),
+ QCommandLineOption(QStringLiteral("daemon"), i18n("Run UI server only, hide main window")),
#endif
- << QCommandLineOption(QStringList() << QStringLiteral("import-certificate")
- << QStringLiteral("i"),
- i18n("Import certificate file(s)"))
- << QCommandLineOption(QStringList() << QStringLiteral("encrypt")
- << QStringLiteral("e"),
- i18n("Encrypt file(s)"))
- << QCommandLineOption(QStringList() << QStringLiteral("sign")
- << QStringLiteral("s"),
- i18n("Sign file(s)"))
- << QCommandLineOption(QStringList() << QStringLiteral("sign-encrypt")
- << QStringLiteral("E"),
- i18n("Sign and/or encrypt file(s)"))
- << QCommandLineOption(QStringLiteral("encrypt-sign"),
- i18n("Same as --sign-encrypt, do not use"))
- << QCommandLineOption(QStringList() << QStringLiteral("decrypt")
- << QStringLiteral("d"),
- i18n("Decrypt file(s)"))
- << QCommandLineOption(QStringList() << QStringLiteral("verify")
- << QStringLiteral("V"),
- i18n("Verify file/signature"))
- << QCommandLineOption(QStringList() << QStringLiteral("decrypt-verify")
- << QStringLiteral("D"),
- i18n("Decrypt and/or verify file(s)"))
- << QCommandLineOption(QStringList() << QStringLiteral("search"),
- i18n("Search for a certificate on a keyserver"))
- << QCommandLineOption(QStringList() << QStringLiteral("checksum"),
- i18n("Create or check a checksum file"))
- << QCommandLineOption(QStringList() << QStringLiteral("query")
- << QStringLiteral("q"),
- i18nc("If a certificate is already known it shows the certificate details dialog."
- "Otherwise it brings up the certificate search dialog.",
- "Show details of a local certificate or search for it on a keyserver"
- " by fingerprint"))
- << QCommandLineOption(QStringList() << QStringLiteral("gen-key"),
- i18n("Create a new key pair or certificate signing request"))
- << QCommandLineOption(QStringLiteral("parent-windowid"),
- i18n("Parent Window Id for dialogs"),
- QStringLiteral("windowId"))
- << QCommandLineOption(QStringList() << QStringLiteral("config"),
- i18n("Open the config dialog"));
-
- parser->addOptions(options);
+ QCommandLineOption({QStringLiteral("import-certificate"), QStringLiteral("i")}, i18n("Import certificate file(s)")),
+ QCommandLineOption({QStringLiteral("encrypt"), QStringLiteral("e")}, i18n("Encrypt file(s)")),
+ QCommandLineOption({QStringLiteral("sign"), QStringLiteral("s")}, i18n("Sign file(s)")),
+ QCommandLineOption({QStringLiteral("sign-encrypt"), QStringLiteral("E")}, i18n("Sign and/or encrypt file(s)")),
+ QCommandLineOption(QStringLiteral("encrypt-sign"), i18n("Same as --sign-encrypt, do not use")),
+ QCommandLineOption({QStringLiteral("decrypt"), QStringLiteral("d")}, i18n("Decrypt file(s)")),
+ QCommandLineOption({QStringLiteral("verify"), QStringLiteral("V")}, i18n("Verify file/signature")),
+ QCommandLineOption({QStringLiteral("decrypt-verify"), QStringLiteral("D")}, i18n("Decrypt and/or verify file(s)")),
+ QCommandLineOption(QStringLiteral("search"), i18n("Search for a certificate on a keyserver")),
+ QCommandLineOption(QStringLiteral("checksum"), i18n("Create or check a checksum file")),
+ QCommandLineOption({QStringLiteral("query"), QStringLiteral("q")},
+ i18nc("If a certificate is already known it shows the certificate details dialog. "
+ "Otherwise it brings up the certificate search dialog.",
+ "Show details of a local certificate or search for it on a keyserver by fingerprint")),
+ QCommandLineOption(QStringLiteral("gen-key"), i18n("Create a new key pair or certificate signing request")),
+ QCommandLineOption(QStringLiteral("parent-windowid"), i18n("Parent Window Id for dialogs"), QStringLiteral("windowId")),
+ QCommandLineOption(QStringLiteral("config"), i18n("Open the config dialog")),
+ });
/* Security note: To avoid code execution by shared library injection
* through e.g. -platformpluginpath any external input should be seperated
* by a double dash -- this is why query / search uses positional arguments.
*
* For example on Windows there is an URLhandler for openpgp4fpr:
* be opened with Kleopatra's query function. And while a browser should
* urlescape such a query there might be tricks to inject a quote character
* and as such inject command line options for Kleopatra in an URL. */
parser->addPositionalArgument(QStringLiteral("files"),
i18n("File(s) to process"),
QStringLiteral("-- [files..]"));
parser->addPositionalArgument(QStringLiteral("query"),
i18n("String or Fingerprint for query and search"),
QStringLiteral("-- [query..]"));
}

File Metadata

Mime Type
text/x-diff
Expires
Sat, Apr 25, 3:29 PM (1 d, 18 h)
Storage Engine
local-disk
Storage Format
Raw Data
Storage Handle
54/5d/3b68eea0cac853374c343f7ba1bc

Event Timeline