From 32248221316271f3a09a771ce35b77236f4bbeed Mon Sep 17 00:00:00 2001 From: Maxim Mamontov Date: Sat, 13 Aug 2011 19:09:21 +0300 Subject: [PATCH 1/1] GetNum -> Count in interfaces --- include/stg/services.h | 1 + include/stg/tariffs.h | 3 ++- include/stg/users.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/stg/services.h b/include/stg/services.h index 2f1eec71..131e2b55 100644 --- a/include/stg/services.h +++ b/include/stg/services.h @@ -33,6 +33,7 @@ public: virtual bool FindService(const std::string & name, SERVICE_CONF & service) = 0; virtual bool ServiceExists(const std::string & name) const = 0; virtual const std::string & GetStrError() const = 0; + virtual size_t Count() const = 0; virtual int OpenSearch() const = 0; virtual int SearchNext(int, SERVICE_CONF * service) const = 0; diff --git a/include/stg/tariffs.h b/include/stg/tariffs.h index 8c098c8b..b492833b 100644 --- a/include/stg/tariffs.h +++ b/include/stg/tariffs.h @@ -33,13 +33,14 @@ public: virtual int ReadTariffs () = 0; virtual const TARIFF * FindByName(const std::string & name) const = 0; virtual const TARIFF * GetNoTariff() const = 0; - virtual int GetTariffsNum() const = 0; virtual int Del(const std::string & name, const ADMIN * admin) = 0; virtual int Add(const std::string & name, const ADMIN * admin) = 0; virtual int Chg(const TARIFF_DATA & td, const ADMIN * admin) = 0; virtual void GetTariffsData(std::list * tdl) = 0; + virtual size_t Count() const = 0; + virtual const std::string & GetStrError() const = 0; }; diff --git a/include/stg/users.h b/include/stg/users.h index 50f5ffe2..86286656 100644 --- a/include/stg/users.h +++ b/include/stg/users.h @@ -44,7 +44,7 @@ public: virtual void Del(const std::string & login, const ADMIN * admin) = 0; virtual int ReadUsers() = 0; - virtual int GetUserNum() const = 0; + virtual size_t Count() const = 0; virtual int FindByIPIdx(uint32_t ip, USER_PTR * user) const = 0; virtual bool IsIPInIndex(uint32_t ip) const = 0; -- 2.44.2