Numeric character and character entity references are now also supported when convert...

[evaf] / src / libs / Common / globals.cpp

diff --git a/src/libs/Common/globals.cpp b/src/libs/Common/globals.cpp
index e494908e5f64a48ac86c9b030b08adb5c39c4b78..02aedd84d37a26a93ee8683b85213c1e8da2fe3a 100644 (file)
--- a/src/libs/Common/globals.cpp
+++ b/src/libs/Common/globals.cpp
@@ -18,8 +18,9 @@
  */
 
 #include "globals.h"
-#include "env.h"
 #include "app.h"
+#include "config.h"
+#include "prop.h"
 #include "logger.h"
 #include "version.h"
 #include "ilogger.h"
@@ -40,22 +41,28 @@ bool eVaf::Common::init()
 
     // Initialize all the common interface implementations in the proper sequence
 
-    eVaf::Common::Internal::Env * env =
-        qobject_cast<eVaf::Common::Internal::Env *>(eVaf::Common::iEnv::instance());
-    if (env) {
-        if (!env->init())
+    eVaf::Common::Internal::App * app =
+            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::App * app =
-        qobject_cast<eVaf::Common::Internal::App *>(eVaf::Common::iApp::instance());
-    if (app) {
-        if (!app->init())
+    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;
     }