X-Git-Url: https://vaikene.ee/gitweb/pswgen11.html?a=blobdiff_plain;f=src%2Flibs%2FCommon%2Fglobals.cpp;h=b981fff43ceee7f65537fe162d19c58e11475aa4;hb=8e0779e2e5a9f947f79c28e2ff121f6ffdd78b3f;hp=dfb15953292b404f512688fee30b13b8df6a7635;hpb=720224734cb4f6ea2708c6b5ecf93cc666aad378;p=evaf
diff --git a/src/libs/Common/globals.cpp b/src/libs/Common/globals.cpp
index dfb1595..b981fff 100644
--- a/src/libs/Common/globals.cpp
+++ b/src/libs/Common/globals.cpp
@@ -18,8 +18,8 @@
*/
#include "globals.h"
-#include "env.h"
#include "app.h"
+#include "config.h"
#include "logger.h"
#include "version.h"
#include "ilogger.h"
@@ -36,14 +36,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 +52,14 @@ 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())
+ eVaf::Common::Internal::Config * config =
+ qobject_cast(eVaf::Common::iConfig::instance());
+ if (config) {
+ if (!config->init())
return false;
}
- EVAF_INFO("%s.Globals initialized", VER_MODULE_NAME_STR);
+ EVAF_INFO("%s-Globals initialized", VER_MODULE_NAME_STR);
return true;
}