Merge branch 'master' into full-month-stats

[stg.git] / projects / stargazer / admins_impl.cpp

diff --git a/projects/stargazer/admins_impl.cpp b/projects/stargazer/admins_impl.cpp
index 38d2cec0a26b73c75d500d49daf425a5142cb5fb..3fe2c10b6c6c423629ee25ea2bd416a921449fb9 100644 (file)
--- a/projects/stargazer/admins_impl.cpp
+++ b/projects/stargazer/admins_impl.cpp
@@ -32,17 +32,18 @@
 #include <cassert>
 #include <algorithm>
 
+#include "stg/admins.h"
+#include "stg/admin.h"
+#include "stg/common.h"
 #include "admins_impl.h"
-#include "admins.h"
-#include "admin.h"
 #include "admin_impl.h"
-#include "common.h"
 
 using namespace std;
 
 //-----------------------------------------------------------------------------
 ADMINS_IMPL::ADMINS_IMPL(STORE * st)
-    : stg(0xFFFF, "@stargazer", ""),
+    : ADMINS(),
+      stg(0xFFFF, "@stargazer", ""),
       noAdmin(0xFFFF, "NO-ADMIN", ""),
       data(),
       store(st),
@@ -72,7 +73,7 @@ admin_iter ai(find(data.begin(), data.end(), adm));
 
 if (ai != data.end())
     {
-    strError = "Administrator \'" + login + "\' cannot not be added. Administrator alredy exist.";
+    strError = "Administrator \'" + login + "\' cannot not be added. Administrator already exist.";
     WriteServLog("%s %s", admin->GetLogStr().c_str(), strError.c_str());
 
     return -1;