From: Maxim Mamontov Date: Tue, 2 Aug 2011 12:09:28 +0000 (+0300) Subject: Replace some unsigned types with size_t X-Git-Tag: 2.408-alpha~50 X-Git-Url: https://git.stg.codes/stg.git/commitdiff_plain/0cfd1e2a9dfa559bf50e3884b556824537e3daf7?hp=0cc864dabe50dc3012380bd957241d508335e1da Replace some unsigned types with size_t --- diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp index 6c25e099..23c7d32a 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.cpp @@ -46,7 +46,7 @@ if (cp->currParser) } else { - for (unsigned int i = 0; i < cp->dataParser.size(); i++) + for (size_t i = 0; i < cp->dataParser.size(); i++) { cp->dataParser[i]->SetAnswerList(&cp->answerList); cp->dataParser[i]->SetCurrAdmin(*cp->currAdmin); @@ -76,7 +76,7 @@ if (cp->currParser) } else { - for (unsigned int i = 0; i < cp->dataParser.size(); i++) + for (size_t i = 0; i < cp->dataParser.size(); i++) { if (cp->dataParser[i]->ParseEnd(data, el) == 0) { @@ -195,7 +195,7 @@ port = p; void CONFIGPROTO::SetAdmins(ADMINS * a) { admins = a; -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetAdmins(a); } @@ -204,7 +204,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetUsers(USERS * u) { -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetUsers(u); } @@ -213,7 +213,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetTariffs(TARIFFS * t) { -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetTariffs(t); } @@ -221,7 +221,7 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetStore(STORE * s) { -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetStore(s); } @@ -229,19 +229,9 @@ for (unsigned int i = 0; i < dataParser.size(); i++) //----------------------------------------------------------------------------- void CONFIGPROTO::SetStgSettings(const SETTINGS * s) { -for (unsigned int i = 0; i < dataParser.size(); i++) +for (size_t i = 0; i < dataParser.size(); i++) { dataParser[i]->SetStgSettings(s); } } //----------------------------------------------------------------------------- -const string & CONFIGPROTO::GetStrError() const -{ -return errorStr; -} -//----------------------------------------------------------------------------- -uint32_t CONFIGPROTO::GetAdminIP() const -{ -return adminIP; -} -//----------------------------------------------------------------------------- diff --git a/projects/stargazer/plugins/configuration/sgconfig/configproto.h b/projects/stargazer/plugins/configuration/sgconfig/configproto.h index 787267e6..3a6e814c 100644 --- a/projects/stargazer/plugins/configuration/sgconfig/configproto.h +++ b/projects/stargazer/plugins/configuration/sgconfig/configproto.h @@ -61,10 +61,10 @@ public: void SetTariffs(TARIFFS * t); void SetStore(STORE * s); void SetStgSettings(const SETTINGS * s); - uint32_t GetAdminIP() const; + uint32_t GetAdminIP() const { return adminIP; } int Prepare(); int Stop(); - const std::string & GetStrError() const; + const std::string & GetStrError() const { return errorStr; } void Run(); private: