SyntaxTree::SyntaxList -> Syntax::List

7 files changed, 16 insertions, 15 deletions

diff --git a/akonadi2_cli/repl/replStates.cpp b/akonadi2_cli/repl/replStates.cpp
index 0179779..ceb95ed 100644
--- a/akonadi2_cli/repl/replStates.cpp
+++ b/akonadi2_cli/repl/replStates.cpp
@@ -149,7 +149,7 @@ static char **akonadi2_cli_tab_completion(const char *text, int start, int end)
 
 static char *akonadi2_cli_next_tab_complete_match(const char *text, int state)
 {
-    SyntaxTree::SyntaxList nearest = SyntaxTree::self()->nearestSyntax(tab_completion_full_state, QString(text));
+    Syntax::List nearest = SyntaxTree::self()->nearestSyntax(tab_completion_full_state, QString(text));
 
     if (nearest.size() > state) {
         return qstrdup(nearest[state].keyword.toUtf8());
diff --git a/akonadi2_cli/syntax_modules/akonadi_list.cpp b/akonadi2_cli/syntax_modules/akonadi_list.cpp
index 62824ee..6abc853 100644
--- a/akonadi2_cli/syntax_modules/akonadi_list.cpp
+++ b/akonadi2_cli/syntax_modules/akonadi_list.cpp
@@ -39,9 +39,9 @@
 namespace AkonadiList
 {
 
-SyntaxTree::SyntaxList syntax()
+Syntax::List syntax()
 {
-    SyntaxTree::SyntaxList 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;
diff --git a/akonadi2_cli/syntax_modules/akonadi_list.h b/akonadi2_cli/syntax_modules/akonadi_list.h
index f2a123d..61effc5 100644
--- a/akonadi2_cli/syntax_modules/akonadi_list.h
+++ b/akonadi2_cli/syntax_modules/akonadi_list.h
@@ -23,7 +23,7 @@
 
 namespace AkonadiList
 {
-    SyntaxTree::SyntaxList syntax();
+    Syntax::List syntax();
     bool list(const QStringList &commands, State &state);
 }
 
diff --git a/akonadi2_cli/syntax_modules/core_syntax.cpp b/akonadi2_cli/syntax_modules/core_syntax.cpp
index 1231e29..407fcbf 100644
--- a/akonadi2_cli/syntax_modules/core_syntax.cpp
+++ b/akonadi2_cli/syntax_modules/core_syntax.cpp
@@ -27,9 +27,9 @@
 namespace CoreSyntax
 {
 
-SyntaxTree::SyntaxList syntax()
+Syntax::List syntax()
 {
-    SyntaxTree::SyntaxList syntax;
+    Syntax::List syntax;
     syntax << Syntax("exit", QObject::tr("Exits the application. Ctrl-d also works!"), &CoreSyntax::exit);
     syntax << Syntax(QObject::tr("help"), QObject::tr("Print command information: help [command]"), &CoreSyntax::showHelp);
 
diff --git a/akonadi2_cli/syntax_modules/core_syntax.h b/akonadi2_cli/syntax_modules/core_syntax.h
index 4afd69d..521cb8e 100644
--- a/akonadi2_cli/syntax_modules/core_syntax.h
+++ b/akonadi2_cli/syntax_modules/core_syntax.h
@@ -23,7 +23,7 @@
 
 namespace CoreSyntax
 {
-    SyntaxTree::SyntaxList syntax();
+    Syntax::List syntax();
     bool exit(const QStringList &commands, State &state);
     bool showHelp(const QStringList &commands, State &state);
     bool setDebugLevel(const QStringList &commands, State &state);
diff --git a/akonadi2_cli/syntaxtree.cpp b/akonadi2_cli/syntaxtree.cpp
index a4f5d40..968802d 100644
--- a/akonadi2_cli/syntaxtree.cpp
+++ b/akonadi2_cli/syntaxtree.cpp
@@ -43,7 +43,7 @@ Syntax::Syntax(const QString &k, const QString &helpText, std::function<bool(con
 
 SyntaxTree::SyntaxTree()
 {
-    QVector<std::function<SyntaxList()> > syntaxSyntaxTrees;
+    QVector<std::function<Syntax::List()> > syntaxSyntaxTrees;
     syntaxSyntaxTrees << &CoreSyntax::syntax
                       << &AkonadiList::syntax
                       ;
@@ -61,7 +61,7 @@ SyntaxTree *SyntaxTree::self()
     return s_module;
 }
 
-SyntaxTree::SyntaxList SyntaxTree::syntax() const
+Syntax::List SyntaxTree::syntax() const
 {
     return m_syntax;
 }
@@ -115,9 +115,9 @@ SyntaxTree::Command SyntaxTree::match(const QStringList &commandLine) const
     return Command();
 }
 
-SyntaxTree::SyntaxList SyntaxTree::nearestSyntax(const QStringList &words, const QString &fragment) const
+Syntax::List SyntaxTree::nearestSyntax(const QStringList &words, const QString &fragment) const
 {
-    SyntaxList matches;
+    Syntax::List matches;
 
     //qDebug() << "words are" << words;
     if (words.isEmpty()) {
diff --git a/akonadi2_cli/syntaxtree.h b/akonadi2_cli/syntaxtree.h
index 7282955..c7df104 100644
--- a/akonadi2_cli/syntaxtree.h
+++ b/akonadi2_cli/syntaxtree.h
@@ -27,6 +27,8 @@
 class Syntax
 {
 public:
+    typedef QVector<Syntax> List;
+
     enum Interactivity {
         NotInteractive = 0,
         EventDriven
@@ -51,13 +53,12 @@ class SyntaxTree
 public:
 
     typedef std::pair<const Syntax *, QStringList> Command;
-    typedef QVector<Syntax> SyntaxList;
 
     static SyntaxTree *self();
 
-    SyntaxList syntax() const;
+    Syntax::List syntax() const;
     Command match(const QStringList &commands) const;
-    SyntaxList nearestSyntax(const QStringList &words, const QString &fragment) const;
+    Syntax::List nearestSyntax(const QStringList &words, const QString &fragment) const;
 
     bool run(const QStringList &commands);
 
@@ -67,7 +68,7 @@ private:
     SyntaxTree();
     Command matches(const QStringList &commands) const;
 
-    SyntaxList m_syntax;
+    Syntax::List m_syntax;
     State m_state;
     static SyntaxTree *s_module;
 };