X-Git-Url: https://vaikene.ee/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Flibs%2FCommon%2Fglobals.cpp;h=02aedd84d37a26a93ee8683b85213c1e8da2fe3a;hb=77854ea7bd165f8d9afd2cba1490335a67001ab7;hp=63d4bce2bd6c3a988c333459d3e42220fb56957d;hpb=be0e791df48f5a8c9bb4c16f65b62e41e1149552;p=evaf

diff --git a/src/libs/Common/globals.cpp b/src/libs/Common/globals.cpp
index 63d4bce..02aedd8 100644
--- a/src/libs/Common/globals.cpp
+++ b/src/libs/Common/globals.cpp
@@ -19,6 +19,8 @@
 
 #include "globals.h"
 #include "app.h"
+#include "config.h"
+#include "prop.h"
 #include "logger.h"
 #include "version.h"
 #include "ilogger.h"
@@ -40,17 +42,29 @@ bool eVaf::Common::init()
     // Initialize all the common interface implementations in the proper sequence
 
     eVaf::Common::Internal::App * app =
-        qobject_cast<eVaf::Common::Internal::App *>(eVaf::Common::iApp::instance());
+            qobject_cast<eVaf::Common::Internal::App *>(eVaf::Common::iApp::instance());
     if (app) {
         if (!app->init())
             return false;
     }
     eVaf::Common::Internal::Logger * logger =
-        qobject_cast<eVaf::Common::Internal::Logger *>(eVaf::Common::iLogger::instance());
+            qobject_cast<eVaf::Common::Internal::Logger *>(eVaf::Common::iLogger::instance());
     if (logger) {
         if (!logger->init())
             return false;
     }
+    eVaf::Common::Internal::Config * config =
+            qobject_cast<eVaf::Common::Internal::Config *>(eVaf::Common::iConfig::instance());
+    if (config) {
+        if (!config->init())
+            return false;
+    }
+    eVaf::Common::Internal::Prop * prop =
+            qobject_cast<eVaf::Common::Internal::Prop *>(eVaf::Common::iProp::instance());
+    if (prop) {
+        if (!prop->init())
+            return false;
+    }
 
     EVAF_INFO("%s-Globals initialized", VER_MODULE_NAME_STR);