From cc5363fe4b0cd4ea95ac98d9d37f2028fe226145 Mon Sep 17 00:00:00 2001 From: Aaron Seigo Date: Mon, 28 Dec 2015 22:00:19 +0100 Subject: typeCompleter and resourceOrTypeCompleter --- akonadish/syntax_modules/akonadi_count.cpp | 2 +- akonadish/syntax_modules/akonadi_list.cpp | 7 +++---- akonadish/syntax_modules/akonadi_modify.cpp | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) (limited to 'akonadish/syntax_modules') diff --git a/akonadish/syntax_modules/akonadi_count.cpp b/akonadish/syntax_modules/akonadi_count.cpp index fa3f1fb..5acdcdd 100644 --- a/akonadish/syntax_modules/akonadi_count.cpp +++ b/akonadish/syntax_modules/akonadi_count.cpp @@ -75,7 +75,7 @@ bool count(const QStringList &args, State &state) Syntax::List syntax() { Syntax count("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count "), &AkonadiCount::count, Syntax::EventDriven); - count.completer = &AkonadishUtils::resourceCompleter; + count.completer = &AkonadishUtils::typeCompleter; return Syntax::List() << count; } diff --git a/akonadish/syntax_modules/akonadi_list.cpp b/akonadish/syntax_modules/akonadi_list.cpp index 18f15e7..82f13b5 100644 --- a/akonadish/syntax_modules/akonadi_list.cpp +++ b/akonadish/syntax_modules/akonadi_list.cpp @@ -106,10 +106,9 @@ bool list(const QStringList &args, State &state) Syntax::List syntax() { - Syntax::List syntax; - syntax << Syntax("list", QObject::tr("List all resources, or the contents of one or more resources"), &AkonadiList::list, Syntax::EventDriven); - - return syntax; + Syntax list("list", QObject::tr("List all resources, or the contents of one or more resources"), &AkonadiList::list, Syntax::EventDriven); + list.completer = &AkonadishUtils::resourceOrTypeCompleter; + return Syntax::List() << list; } REGISTER_SYNTAX(AkonadiList) diff --git a/akonadish/syntax_modules/akonadi_modify.cpp b/akonadish/syntax_modules/akonadi_modify.cpp index 8ab873a..76a7f5e 100644 --- a/akonadish/syntax_modules/akonadi_modify.cpp +++ b/akonadish/syntax_modules/akonadi_modify.cpp @@ -109,7 +109,7 @@ Syntax::List syntax() { Syntax modify("modify", QObject::tr("Modify items in a resource"), &AkonadiModify::modify); Syntax resource("resource", QObject::tr("Modify a resource"), &AkonadiModify::resource);//, Syntax::EventDriven); - resource.completer = &AkonadishUtils::resourceCompleter; + resource.completer = &AkonadishUtils::resourceOrTypeCompleter; modify.children << resource; return Syntax::List() << modify; -- cgit v1.2.3