Get<Something>Num -> Count in interfaces

diff --git a/include/stg/services.h b/include/stg/services.h
index 2f1eec717f74c9ab53ed2750566f52a5fb33b576..131e2b5520b8fb1d259ec3a4611379e2879badab 100644 (file)
--- 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 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;
 
     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 8c098c8bb6fdfd59830b35a8283d3bb148d893a2..b492833b3de660204c7511d84e8a9089b4ea4fac 100644 (file)
--- 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            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<TARIFF_DATA> * tdl) = 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<TARIFF_DATA> * tdl) = 0;
 

+    virtual size_t         Count() const = 0;
+

     virtual const std::string & GetStrError() const = 0;
 };
 
     virtual const std::string & GetStrError() const = 0;
 };
 

diff --git a/include/stg/users.h b/include/stg/users.h
index 50f5ffe25995a324db77589138e22fdd4aa49a62..862866564a5111f0a57f3fbbeb9b6587e44b55b3 100644 (file)
--- 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 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;
 
     virtual int  FindByIPIdx(uint32_t ip, USER_PTR * user) const = 0;
     virtual bool IsIPInIndex(uint32_t ip) const = 0;