From 5e9c1172ca196bdc8bcdc842e54efc5a74908fff Mon Sep 17 00:00:00 2001
From: Aaron Seigo <aseigo@kde.org>
Date: Wed, 23 Dec 2015 20:31:25 +0100
Subject: move Syntax out of SyntraxTree

---
 akonadi2_cli/syntaxtree.h | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

(limited to 'akonadi2_cli/syntaxtree.h')

diff --git a/akonadi2_cli/syntaxtree.h b/akonadi2_cli/syntaxtree.h
index 54b867f..7282955 100644
--- a/akonadi2_cli/syntaxtree.h
+++ b/akonadi2_cli/syntaxtree.h
@@ -24,32 +24,34 @@
 #include <QStringList>
 #include <QVector>
 
-class SyntaxTree
+class Syntax
 {
 public:
-    struct Syntax
-    {
-        enum Interactivity {
-            NotInteractive = 0,
-            EventDriven
-        };
-
-        Syntax();
-        Syntax(const QString &keyword,
-               const QString &helpText = QString(),
-               std::function<bool(const QStringList &, State &)> lambda = std::function<bool(const QStringList &, State &)>(),
-               Interactivity interactivity = NotInteractive);
-
-        QString keyword;
-        QString help;
-        Interactivity interactivity;
-        std::function<bool(const QStringList &, State &)> lambda;
-
-        QVector<Syntax> children;
+    enum Interactivity {
+        NotInteractive = 0,
+        EventDriven
     };
 
+    Syntax();
+    Syntax(const QString &keyword,
+            const QString &helpText = QString(),
+            std::function<bool(const QStringList &, State &)> lambda = std::function<bool(const QStringList &, State &)>(),
+            Interactivity interactivity = NotInteractive);
+
+    QString keyword;
+    QString help;
+    Interactivity interactivity;
+    std::function<bool(const QStringList &, State &)> lambda;
+
+    QVector<Syntax> children;
+};
+
+class SyntaxTree
+{
+public:
+
     typedef std::pair<const Syntax *, QStringList> Command;
-    typedef QVector<SyntaxTree::Syntax> SyntaxList;
+    typedef QVector<Syntax> SyntaxList;
 
     static SyntaxTree *self();
 
-- 
cgit v1.2.3