X-Git-Url: https://vaikene.ee/gitweb/gitweb.cgi?a=blobdiff_plain;f=src%2Flibs%2FCommon%2Fenv.cpp;h=e0c08348628741c1723d31a2b694ebfbd6a26eee;hb=0ff0ad82c62217a437787b0a54e47415bfb5740f;hp=55b133ed3814a10fcbd79879b8601b2223ec40b6;hpb=5815060246f84e8efdf3143b4e8c7d00778168cf;p=evaf

diff --git a/src/libs/Common/env.cpp b/src/libs/Common/env.cpp
index 55b133e..e0c0834 100644
--- a/src/libs/Common/env.cpp
+++ b/src/libs/Common/env.cpp
@@ -33,7 +33,7 @@ using namespace eVaf::Common;
 
 iEnv * iEnv::instance()
 {
-    static Internal::Env singleton;
+    static eVaf::Common::Internal::Env singleton;
     return &singleton;
 }
 
@@ -46,6 +46,16 @@ Env::Env()
     : iEnv()
 {
     setObjectName(QString("%1-iEnv").arg(VER_MODULE_NAME_STR));
+}
+
+Env::~Env()
+{
+}
+
+bool Env::init()
+{
+    // Register out interface
+    iRegistry::instance()->registerInterface("iEnv", this);
 
     // Set initial bin and root directories
     mRootDir = mBinDir = qApp->applicationDirPath();
@@ -57,18 +67,8 @@ Env::Env()
         mBinDir.append('/');
     if (!mRootDir.endsWith('/'))
         mRootDir.append('/');
-}
-
-Env::~Env()
-{
-}
-
-bool Env::init()
-{
-    // Register out interface
-    iRegistry::instance()->registerInterface("iEnv", this);
 
-    // Clear directories
+    // Clear other directories
     mDataRootDir.clear();
     mQtPluginsDir.clear();
     mEtcDir.clear();