X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/0fc9896e27b94093ccde0b8566e2b8109ae8f657..14fbadc58e3d6f6faa45d1d90fe1340f177ef045:/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
diff --git a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
index 5bc68d2a..b1285a77 100644
--- a/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
+++ b/projects/stargazer/plugins/configuration/sgconfig/parser_admin.cpp
@@ -37,7 +37,7 @@ if (!priv->adminChg)
return;
}
-string s;
+std::string s;
//answerList->clear();
answerList->erase(answerList->begin(), answerList->end());
@@ -99,7 +99,7 @@ if (admins->Del(adminToDel, currAdmin) == 0)
}
else
{
- string s;
+ std::string s;
strprintf(&s, "", admins->GetStrError().c_str());
answerList->push_back(s);
}
@@ -155,7 +155,7 @@ if (admins->Add(adminToAdd, currAdmin) == 0)
}
else
{
- string s;
+ std::string s;
strprintf(&s, "", admins->GetStrError().c_str());
answerList->push_back(s);
}
@@ -213,11 +213,11 @@ void PARSER_CHG_ADMIN::CreateAnswer()
answerList->erase(answerList->begin(), answerList->end());
-if (!login.res_empty())
+if (!login.empty())
{
ADMIN * origAdmin = NULL;
- if (admins->Find(login, &origAdmin))
+ if (admins->Find(login.data(), &origAdmin))
{
answerList->push_back(std::string("");
return;
@@ -225,10 +225,10 @@ if (!login.res_empty())
ADMIN_CONF conf(origAdmin->GetConf());
- if (!password.res_empty())
+ if (!password.empty())
conf.password = password.data();
- if (!privAsString.res_empty())
+ if (!privAsString.empty())
{
int p = 0;
if (str2x(privAsString.data().c_str(), p) < 0)
@@ -242,7 +242,7 @@ if (!login.res_empty())
if (admins->Change(conf, currAdmin) != 0)
{
- string s;
+ std::string s;
strprintf(&s, "", admins->GetStrError().c_str());
answerList->push_back(s);
}