4 files changed, 24 insertions, 102 deletions

diff --git a/akonadi2_cli/modules/help/help.cpp b/akonadi2_cli/modules/core_syntax.cpp
index aaff6fb..8324c31 100644
--- a/akonadi2_cli/modules/help/help.cpp
+++ b/akonadi2_cli/modules/core_syntax.cpp
@@ -17,39 +17,45 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
  */
 
-#include "help.h"
+#include "core_syntax.h"
 
-#include <QObject>
+#include <QObject> // tr()
 #include <QSet>
 #include <QTextStream>
 
-#include "module.h"
+namespace CoreSyntax
+{
 
-namespace CLI
+Module::SyntaxList syntax()
 {
+    Module::SyntaxList syntax;
+    syntax << Module::Syntax("exit", QObject::tr("Exits the application. Ctrl-d also works!"), &CoreSyntax::exit);
+    syntax << Module::Syntax(QObject::tr("help"), QObject::tr("Print command information: help [command]"), &CoreSyntax::showHelp);
+    return syntax;
+}
 
-Help::Help()
+bool exit(const QStringList &, State &)
 {
-    Syntax topLevel = Syntax(QObject::tr("help"), &Help::showHelp, QObject::tr("Print command information: help [command]"));
-    setSyntax(topLevel);
+    ::exit(0);
+    return true;
 }
 
-bool Help::showHelp(const QStringList &commands, State &)
+bool showHelp(const QStringList &commands, State &)
 {
-    Module::Command command = Module::match(commands);
+    Module::Command command = Module::self()->match(commands);
     QTextStream stream(stdout);
     if (commands.isEmpty()) {
         stream << QObject::tr("Welcome to the Akonadi2 command line tool!") << "\n";
         stream << QObject::tr("Top-level commands:") << "\n";
         QSet<QString> sorted;
-        for (auto module: Module::modules()) {
-            sorted.insert(module.syntax().keyword);
+        for (auto syntax: Module::self()->syntax()) {
+            sorted.insert(syntax.keyword);
         }
 
         for (auto keyword: sorted) {
             stream << "\t" << keyword << "\n";
         }
-    } else if (const Syntax *syntax = command.first) {
+    } else if (const Module::Syntax *syntax = command.first) {
         //TODO: get parent!
         stream << QObject::tr("Command `%1`").arg(syntax->keyword);
 
@@ -72,9 +78,8 @@ bool Help::showHelp(const QStringList &commands, State &)
     } else {
         stream << "Unknown command: " << commands.join(" ") << "\n";
     }
-
     return true;
 }
 
-} // namespace CLI
+} // namespace CoreSyntax
 
diff --git a/akonadi2_cli/modules/exit/exit.h b/akonadi2_cli/modules/core_syntax.h
index 5ed4174..beb8528 100644
--- a/akonadi2_cli/modules/exit/exit.h
+++ b/akonadi2_cli/modules/core_syntax.h
@@ -21,17 +21,10 @@
 
 #include "module.h"
 
-namespace CLI
+namespace CoreSyntax
 {
-
-class Exit : public Module
-{
-public:
-    Exit();
-
-private:
-    static bool exit(const QStringList &commands, State &state);
-};
-
-} // namespace CLI
+    Module::SyntaxList syntax();
+    bool exit(const QStringList &commands, State &state);
+    bool showHelp(const QStringList &commands, State &);
+}
 
diff --git a/akonadi2_cli/modules/exit/exit.cpp b/akonadi2_cli/modules/exit/exit.cpp
deleted file mode 100644
index 64828be..0000000
--- a/akonadi2_cli/modules/exit/exit.cpp
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright (C) 2014 Aaron Seigo <aseigo@kde.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-
-#include "exit.h"
-
-#include <QObject>
-
-namespace CLI
-{
-
-Exit::Exit()
-{
-    setSyntax(Syntax("exit", &Exit::exit, QObject::tr("Exits the application. Ctrl-d also works!")));
-}
-
-bool Exit::exit(const QStringList &, State &)
-{
-    ::exit(0);
-    return true;
-}
-
-} // namespace CLI
-
diff --git a/akonadi2_cli/modules/help/help.h b/akonadi2_cli/modules/help/help.h
deleted file mode 100644
index df1cfc2..0000000
--- a/akonadi2_cli/modules/help/help.h
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (C) 2014 Aaron Seigo <aseigo@kde.org>
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- *   This program is distributed in the hope that it will be useful,
- *   but WITHOUT ANY WARRANTY; without even the implied warranty of
- *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *   GNU General Public License for more details.
- *
- *   You should have received a copy of the GNU General Public License
- *   along with this program; if not, write to the
- *   Free Software Foundation, Inc.,
- *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA.
- */
-
-#pragma once
-
-#include "module.h"
-
-namespace CLI
-{
-
-class Help : public Module
-{
-public:
-    Help();
-
-private:
-    static bool showHelp(const QStringList &commands, State &state);
-};
-
-} // namespace CLI
-