add a checkall

4 files changed, 36 insertions, 13 deletions

diff --git a/tests/hawd/module.cpp b/tests/hawd/module.cpp
index d4c3059..eb45def 100644
--- a/tests/hawd/module.cpp
+++ b/tests/hawd/module.cpp
@@ -50,6 +50,10 @@ void Module::loadModules()
 {
     addModule(List());
     addModule(Check());
+    addModule(CheckAll());
+//    addModule(Print());
+//    addModule(Annotate());
+//    addModule(Remove());
 }
 
 void Module::printCommands()
@@ -134,7 +138,7 @@ bool Module::matches(const QStringList &commands, State &state) const
         return false;
     }
 
-    QListIterator<Syntax> syntaxIt(m_syntax.children);
+    QVectorIterator<Syntax> syntaxIt(m_syntax.children);
     const Syntax *syntax = &m_syntax;
     QStringList tailCommands;
     while (commandIt.hasNext() && syntaxIt.hasNext()) {
diff --git a/tests/hawd/module.h b/tests/hawd/module.h
index 8f94707..856c09c 100644
--- a/tests/hawd/module.h
+++ b/tests/hawd/module.h
@@ -36,7 +36,7 @@ public:
         Syntax(const QString &keyword, std::function<bool(const QStringList &, State &)> lambda = std::function<bool(const QStringList &, State &)>(), bool eventDriven = false);
         QString keyword;
         std::function<bool(const QStringList &, State &)> lambda;
-        QList<Syntax> children;
+        QVector<Syntax> children;
         bool eventDriven;
     };
 
diff --git a/tests/hawd/modules/check.cpp b/tests/hawd/modules/check.cpp
index 1359b3d..e334fb8 100644
--- a/tests/hawd/modules/check.cpp
+++ b/tests/hawd/modules/check.cpp
@@ -29,12 +29,30 @@
 namespace HAWD
 {
 
+CheckAll::CheckAll()
+    : Module()
+{
+    setSyntax(Syntax("checkall", &CheckAll::check));
+}
+
+bool CheckAll::check(const QStringList &commands, State &state)
+{
+    QDir project(state.projectPath());
+    project.setFilter(QDir::Files | QDir::Readable | QDir::NoDotAndDotDot | QDir::NoSymLinks);
+    for (const QString &entry: project.entryList()) {
+        Check::checkFile(entry, state);
+    }
+
+    return true;
+}
+
 Check::Check()
     : Module()
 {
     Syntax top("check", &Check::check);
-    setDescription(QObject::tr("Checks a dataset description for validity and prints out any errors it finds"));
     setSyntax(top);
+
+    setDescription(QObject::tr("Checks a dataset description for validity and prints out any errors it finds"));
 }
 
 bool Check::check(const QStringList &commands, State &state)
@@ -43,15 +61,7 @@ bool Check::check(const QStringList &commands, State &state)
         std::cout << QObject::tr("Please provide the name of a dataset definition file. (Use the 'list' command to see available datasets.)").toStdString() << std::endl;
     } else {
         for (const QString &name: commands) {
-            if (name == "*") {
-                QDir project(state.projectPath());
-                project.setFilter(QDir::Files | QDir::Readable | QDir::NoDotAndDotDot | QDir::NoSymLinks);
-                for (const QString &entry: project.entryList()) {
-                    checkFile(entry, state);
-                }
-            } else {
-                checkFile(name, state);
-            }
+            checkFile(name, state);
         }
     }
 
diff --git a/tests/hawd/modules/check.h b/tests/hawd/modules/check.h
index 035f45a..44721f4 100644
--- a/tests/hawd/modules/check.h
+++ b/tests/hawd/modules/check.h
@@ -28,10 +28,19 @@ class Check : public Module
 {
 public:
     Check();
+    static void checkFile(const QString &name, State &state);
+
+private:
+    static bool check(const QStringList &commands, State &state);
+};
+
+class CheckAll : public Module
+{
+public:
+    CheckAll();
 
 private:
     static bool check(const QStringList &commands, State &state);
-    static void checkFile(const QString &name, State &state);
 };
 
 } // namespace HAWD