X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;f=src%2Flibs%2FCommon%2Fglobals.cpp;h=63d4bce2bd6c3a988c333459d3e42220fb56957d;hb=09e5758f2e8557be2f23ed7a8a51ca4ef855e9ab;hp=dfb15953292b404f512688fee30b13b8df6a7635;hpb=720224734cb4f6ea2708c6b5ecf93cc666aad378;p=evaf
diff --git a/src/libs/Common/globals.cpp b/src/libs/Common/globals.cpp
index dfb1595..63d4bce 100644
--- 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"
@@ -36,14 +35,14 @@ bool eVaf::Common::init()
return false;
}
- EVAF_INFO("Initializing %s.Globals", VER_MODULE_NAME_STR);
+ EVAF_INFO("Initializing %s-Globals", VER_MODULE_NAME_STR);
// Initialize all the common interface implementations in the proper sequence
- eVaf::Common::Internal::Env * env =
- qobject_cast(eVaf::Common::iEnv::instance());
- if (env) {
- if (!env->init())
+ eVaf::Common::Internal::App * app =
+ qobject_cast(eVaf::Common::iApp::instance());
+ if (app) {
+ if (!app->init())
return false;
}
eVaf::Common::Internal::Logger * logger =
@@ -52,14 +51,8 @@ bool eVaf::Common::init()
if (!logger->init())
return false;
}
- eVaf::Common::Internal::App * app =
- qobject_cast(eVaf::Common::iApp::instance());
- if (app) {
- if (!app->init())
- return false;
- }
- EVAF_INFO("%s.Globals initialized", VER_MODULE_NAME_STR);
+ EVAF_INFO("%s-Globals initialized", VER_MODULE_NAME_STR);
return true;
}