REGISTER_SYNTAX for automagic adding of syntax

a fun abuse of static initialization and std::function

1 files changed, 6 insertions, 9 deletions

diff --git a/akonadish/syntaxtree.cpp b/akonadish/syntaxtree.cpp
index 2d7c127..cd7348e 100644
--- a/akonadish/syntaxtree.cpp
+++ b/akonadish/syntaxtree.cpp
@@ -45,15 +45,12 @@ Syntax::Syntax(const QString &k, const QString &helpText, std::function<bool(con
 
 SyntaxTree::SyntaxTree()
 {
-    QVector<std::function<Syntax::List()> > syntaxSyntaxTrees;
-    syntaxSyntaxTrees << &CoreSyntax::syntax
-                      << &AkonadiList::syntax
-                      << &AkonadiCount::syntax
-                      << &AkonadiSync::syntax
-                      ;
-    for (auto syntaxSyntaxTree: syntaxSyntaxTrees) {
-        m_syntax += syntaxSyntaxTree();
-    }
+}
+
+int SyntaxTree::registerSyntax(std::function<Syntax::List()> f)
+{
+    m_syntax += f();
+    return m_syntax.size();
 }
 
 SyntaxTree *SyntaxTree::self()