resource automcompletion

6 files changed, 20 insertions, 22 deletions

diff --git a/akonadish/syntax_modules/akonadi_clear.cpp b/akonadish/syntax_modules/akonadi_clear.cpp
index d17fac2..d328849 100644
--- a/akonadish/syntax_modules/akonadi_clear.cpp
+++ b/akonadish/syntax_modules/akonadi_clear.cpp
@@ -50,10 +50,10 @@ bool clear(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax::List syntax;
-    syntax << Syntax("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &AkonadiClear::clear);
+    Syntax clear("clear", QObject::tr("Clears the local cache of one or more resources (be careful!)"), &AkonadiClear::clear);
+    clear.completer = &AkonadishUtils::resourceCompleter;
 
-    return syntax;
+    return Syntax::List() << clear;
 }
 
 REGISTER_SYNTAX(AkonadiClear)
diff --git a/akonadish/syntax_modules/akonadi_count.cpp b/akonadish/syntax_modules/akonadi_count.cpp
index cda7235..fa3f1fb 100644
--- a/akonadish/syntax_modules/akonadi_count.cpp
+++ b/akonadish/syntax_modules/akonadi_count.cpp
@@ -74,10 +74,10 @@ bool count(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax::List syntax;
-    syntax << Syntax("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count <type> <resource>"), &AkonadiCount::count, Syntax::EventDriven);
+    Syntax count("count", QObject::tr("Returns the number of items of a given type in a resource. Usage: count <type> <resource>"), &AkonadiCount::count, Syntax::EventDriven);
+    count.completer = &AkonadishUtils::resourceCompleter;
 
-    return syntax;
+    return Syntax::List() << count;
 }
 
 REGISTER_SYNTAX(AkonadiCount)
diff --git a/akonadish/syntax_modules/akonadi_modify.cpp b/akonadish/syntax_modules/akonadi_modify.cpp
index 8438301..8ab873a 100644
--- a/akonadish/syntax_modules/akonadi_modify.cpp
+++ b/akonadish/syntax_modules/akonadi_modify.cpp
@@ -107,13 +107,12 @@ bool resource(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax::List syntax;
-
     Syntax modify("modify", QObject::tr("Modify items in a resource"), &AkonadiModify::modify);
-    modify.children << Syntax("resource", QObject::tr("Modify a resource"), &AkonadiModify::resource);//, Syntax::EventDriven);
+    Syntax resource("resource", QObject::tr("Modify a resource"), &AkonadiModify::resource);//, Syntax::EventDriven);
+    resource.completer = &AkonadishUtils::resourceCompleter;
+    modify.children << resource;
 
-    syntax << modify;
-    return syntax;
+    return Syntax::List() << modify;
 }
 
 REGISTER_SYNTAX(AkonadiModify)
diff --git a/akonadish/syntax_modules/akonadi_remove.cpp b/akonadish/syntax_modules/akonadi_remove.cpp
index bf09e2e..9691d78 100644
--- a/akonadish/syntax_modules/akonadi_remove.cpp
+++ b/akonadish/syntax_modules/akonadi_remove.cpp
@@ -97,13 +97,12 @@ bool resource(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax::List syntax;
-
     Syntax remove("remove", QObject::tr("Remove items in a resource"), &AkonadiRemove::remove);
-    remove.children << Syntax("resource", QObject::tr("Removes a resource"), &AkonadiRemove::resource);//, Syntax::EventDriven);
+    Syntax resource("resource", QObject::tr("Removes a resource"), &AkonadiRemove::resource);//, Syntax::EventDriven);
+    resource.completer = &AkonadishUtils::resourceCompleter;
+    remove.children << resource;
 
-    syntax << remove;
-    return syntax;
+    return Syntax::List() << remove;
 }
 
 REGISTER_SYNTAX(AkonadiRemove)
diff --git a/akonadish/syntax_modules/akonadi_stat.cpp b/akonadish/syntax_modules/akonadi_stat.cpp
index 0ea65dd..9270f9d 100644
--- a/akonadish/syntax_modules/akonadi_stat.cpp
+++ b/akonadish/syntax_modules/akonadi_stat.cpp
@@ -111,10 +111,10 @@ bool stat(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax::List syntax;
-    syntax << Syntax("stat", QObject::tr("Shows database usage for the resources requested"), &AkonadiStat::stat, Syntax::EventDriven);
+    Syntax state("stat", QObject::tr("Shows database usage for the resources requested"), &AkonadiStat::stat, Syntax::EventDriven);
+    state.completer = &AkonadishUtils::resourceCompleter;
 
-    return syntax;
+    return Syntax::List() << state;
 }
 
 REGISTER_SYNTAX(AkonadiStat)
diff --git a/akonadish/syntax_modules/akonadi_sync.cpp b/akonadish/syntax_modules/akonadi_sync.cpp
index 1cf097d..03abbb4 100644
--- a/akonadish/syntax_modules/akonadi_sync.cpp
+++ b/akonadish/syntax_modules/akonadi_sync.cpp
@@ -58,10 +58,10 @@ bool sync(const QStringList &args, State &state)
 
 Syntax::List syntax()
 {
-    Syntax::List syntax;
-    syntax << Syntax("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &AkonadiSync::sync, Syntax::EventDriven );
+    Syntax sync("sync", QObject::tr("Syncronizes all resources that are listed; and empty list triggers a syncronizaton on all resources"), &AkonadiSync::sync, Syntax::EventDriven );
+    sync.completer = &AkonadishUtils::resourceCompleter;
 
-    return syntax;
+    return Syntax::List() << sync;
 }
 
 REGISTER_SYNTAX(AkonadiSync)