Merged the Common::iEnv interface into Common::iApp

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

diff --git a/src/libs/Common/globals.cpp b/src/libs/Common/globals.cpp
index e494908e5f64a48ac86c9b030b08adb5c39c4b78..63d4bce2bd6c3a988c333459d3e42220fb56957d 100644 (file)
--- a/src/libs/Common/globals.cpp
+++ b/src/libs/Common/globals.cpp
@@ -18,7 +18,6 @@
  */
 
 #include "globals.h"
-#include "env.h"
 #include "app.h"
 #include "logger.h"
 #include "version.h"
@@ -40,10 +39,10 @@ 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 =
@@ -52,12 +51,6 @@ bool eVaf::Common::init()
         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())
-            return false;
-    }
 
     EVAF_INFO("%s-Globals initialized", VER_MODULE_NAME_STR);