1 files changed, 6 insertions, 7 deletions
diff --git a/src/Core/ConfigManager.h b/src/Core/ConfigManager.h
index 10b378d..2c11de9 100644
--- a/src/Core/ConfigManager.h
+++ b/src/Core/ConfigManager.h
@@ -22,6 +22,8 @@
 
 #include "export.h"
 
+#include "ConfigEntry.h"
+
 #include <memory>
 #include <set>
 #include <string>
@@ -30,10 +32,9 @@ namespace Mad {
 namespace Core {
 
 class Application;
-class ConfigEntry;
 class Configurable;
 
-class MAD_CORE_EXPORT ConfigManager {
+class MAD_CORE_EXPORT ConfigManager : public ConfigEntry {
   private:
     struct MAD_CORE_EXPORT Compare {
       bool operator() (const Configurable *c1, const Configurable *c2);
@@ -44,15 +45,13 @@ class MAD_CORE_EXPORT ConfigManager {
     Application *application;
 
     std::set<Configurable*, Compare> configurables;
-    bool finished;
-
-    ConfigManager(Application *application0) : application(application0), finished(false) {}
+    bool configured;
 
-    void handleConfigEntry(const ConfigEntry &entry);
+    ConfigManager(Application *application0) : application(application0), configured(false) {}
 
   public:
     bool loadFile(const std::string &filename);
-    void finish();
+    void configure();
 
     void registerConfigurable(Configurable *c) {
       configurables.insert(c);