update testMenu

modules/testMenu/src/testMenu.cpp

@@ -1,7 +1,6 @@
 #include "testMenu.h"
 
-TestMenu::TestMenu(void* h) {
+TestMenu::TestMenu(void* h, App& a) : Module(h, a) {
-    handle = h;
     name = "TestMenu";
 }
 
@@ -27,10 +26,10 @@ void TestMenu::run() {
             num--;
             break;
         case 3:
-            App::Get().unload(self);
+            app.stopModule(self);
             break;
         case 4:
-            App::Get().end();
+            app.end();
             break;
         default:
             break;

modules/testMenu/src/testMenu.h

@@ -3,7 +3,7 @@
 class TestMenu : public Module {
 
     public:
-        TestMenu(void*);
+        TestMenu(void*, App&);
         ~TestMenu();
         void run();
 
@@ -13,7 +13,7 @@ class TestMenu : public Module {
 };
 
 extern "C" { 
-    Module* create(void* handle) {
+    Module* create(void* handle, App& app) {
-        return new TestMenu(handle);
+        return new TestMenu(handle, app);
     }
 }

src/App.h

@@ -15,6 +15,13 @@ class App {
         std::list<Module*> modules;
         std::list<Module*> toClose;
         
+        void load(std::string);
+        void unload(std::list<Module*>::iterator);
+        
+        void handleArgs(const int&, char*[]);
+
+        void printHelp();
+
     public:
         App(const int&, char*[]);
         ~App();
@@ -23,15 +30,7 @@ class App {
 
         void run();
 
-        void load(std::string);
+        void stopModule(std::list<Module*>::iterator);
-
-        void unload(decltype(Module::self));
-
-        void stopModule(decltype(Module::self));
-
-        void handleArgs(const int&, char*[]);
-
-        void printHelp();
 
         void end() { done = true; }
 };