From c6f83e5c166daf3fed08991befcf891d42b3345a Mon Sep 17 00:00:00 2001 From: Matthijs Tijink Date: Tue, 7 Jan 2020 20:49:03 +0000 Subject: [PATCH] CLI improvements for Qt 5.14+ Qt 5.14 adds a "--help-all" option, so include it in the autocompletion. Qt 5.14 also warns on multiple additions of the same option, which we accidently did (KAboutData and we ourselves called it), so don't do that. Also fixes device autocompletion, which I accidently broke. --- cli/kdeconnect-cli.cpp | 3 +-- cli/kdeconnect.zsh | 1 + 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cli/kdeconnect-cli.cpp b/cli/kdeconnect-cli.cpp index 2608a79e6..fa9899193 100644 --- a/cli/kdeconnect-cli.cpp +++ b/cli/kdeconnect-cli.cpp @@ -83,7 +83,6 @@ int main(int argc, char** argv) parser.addOption(deviceAutocomplete); about.setupCommandLine(&parser); - parser.addHelpOption(); parser.process(app); about.processCommandLine(&parser); @@ -167,7 +166,7 @@ int main(int argc, char** argv) } //Exit with 1 if we didn't find a device - return int(!devices.isEmpty()); + return int(devices.isEmpty()); } else if(parser.isSet(QStringLiteral("refresh"))) { QDBusMessage msg = QDBusMessage::createMethodCall(QStringLiteral("org.kde.kdeconnect"), QStringLiteral("/modules/kdeconnect"), QStringLiteral("org.kde.kdeconnect.daemon"), QStringLiteral("forceOnNetworkChange")); blockOnReply(DBusHelper::sessionBus().asyncCall(msg)); diff --git a/cli/kdeconnect.zsh b/cli/kdeconnect.zsh index ef76d218d..15ae27cee 100644 --- a/cli/kdeconnect.zsh +++ b/cli/kdeconnect.zsh @@ -17,6 +17,7 @@ _kdeconnect_device-ids() { local blockoperations="(operation sms)" _arguments -s \ '(-)'{-h,--help}'[display usage information]' \ + '(-)--help-all[display usage information, including Qt specific options]' \ + '(global)' \ $blockoperations{-l,--list-devices}'[list all devices]' \ $blockoperations{-a,--list-available}'[list available (paired and reachable) devices]' \