Move some includes.

[stg.git] / tests / teststore.h

diff --git a/tests/teststore.h b/tests/teststore.h
index cb9a333c5d469dde111f56be1dbe26d310d821b0..59b6a47ebdab9fc4ff21a2f9ffdc7073a7617772 100644 (file)
--- a/tests/teststore.h
+++ b/tests/teststore.h
@@ -3,17 +3,17 @@
 
 #include "stg/store.h"
 
 
 #include "stg/store.h"
 

-class TEST_STORE : public STORE {
+class TEST_STORE : public STG::Store {

     public:
         TEST_STORE() {}
 
     public:
         TEST_STORE() {}
 

-        int GetUsersList(std::vector<std::string> * /*usersList*/) const { return 0; }
-        int AddUser(const std::string & /*login*/) const { return 0; }
-        int DelUser(const std::string & /*login*/) const { return 0; }
-        int SaveUserStat(const USER_STAT & /*stat*/, const std::string & /*login*/) const { return 0; }
-        int SaveUserConf(const USER_CONF & /*conf*/, const std::string & /*login*/) const { return 0; }
-        int RestoreUserStat(USER_STAT * /*stat*/, const std::string & /*login*/) const { return 0; }
-        int RestoreUserConf(USER_CONF * /*conf*/, const std::string & /*login*/) const { return 0; }
+        int GetUsersList(std::vector<std::string> * /*usersList*/) const override { return 0; }
+        int AddUser(const std::string & /*login*/) const override { return 0; }
+        int DelUser(const std::string & /*login*/) const override { return 0; }
+        int SaveUserStat(const STG::UserStat & /*stat*/, const std::string & /*login*/) const override { return 0; }
+        int SaveUserConf(const STG::UserConf & /*conf*/, const std::string & /*login*/) const override { return 0; }
+        int RestoreUserStat(STG::UserStat * /*stat*/, const std::string & /*login*/) const override { return 0; }
+        int RestoreUserConf(STG::UserConf * /*conf*/, const std::string & /*login*/) const override { return 0; }

 
         int WriteUserChgLog(const std::string & /*login*/,
                             const std::string & /*admLogin*/,
 
         int WriteUserChgLog(const std::string & /*login*/,
                             const std::string & /*admLogin*/,


@@ -21,59 +21,59 @@ class TEST_STORE : public STORE {
                             const std::string & /*paramName*/,
                             const std::string & /*oldValue*/,
                             const std::string & /*newValue*/,
                             const std::string & /*paramName*/,
                             const std::string & /*oldValue*/,
                             const std::string & /*newValue*/,

-                            const std::string & /*message*/) const { return 0; }
+                            const std::string & /*message*/) const override { return 0; }

 
 

-        int WriteUserConnect(const std::string & /*login*/, uint32_t /*ip*/) const { return 0; }
+        int WriteUserConnect(const std::string & /*login*/, uint32_t /*ip*/) const override { return 0; }

 
         int WriteUserDisconnect(const std::string & /*login*/,
 
         int WriteUserDisconnect(const std::string & /*login*/,

-                                const DIR_TRAFF & /*up*/,
-                                const DIR_TRAFF & /*down*/,
-                                const DIR_TRAFF & /*sessionUp*/,
-                                const DIR_TRAFF & /*sessionDown*/,
+                                const STG::DirTraff & /*up*/,
+                                const STG::DirTraff & /*down*/,
+                                const STG::DirTraff & /*sessionUp*/,
+                                const STG::DirTraff & /*sessionDown*/,

                                 double /*cash*/,
                                 double /*freeMb*/,
                                 double /*cash*/,
                                 double /*freeMb*/,

-                                const std::string & /*reason*/) const { return 0; }
+                                const std::string & /*reason*/) const override { return 0; }

 
 

-        int WriteDetailedStat(const TRAFF_STAT & /*statTree*/,
+        int WriteDetailedStat(const STG::TraffStat & /*statTree*/,

                               time_t /*lastStat*/,
                               time_t /*lastStat*/,

-                              const std::string & /*login*/) const { return 0; }
-
-        int AddMessage(STG_MSG * /*msg*/, const std::string & /*login*/) const { return 0; }
-        int EditMessage(const STG_MSG & /*msg*/, const std::string & /*login*/) const { return 0; }
-        int GetMessage(uint64_t /*id*/, STG_MSG * /*msg*/, const std::string & /*login*/) const { return 0; }
-        int DelMessage(uint64_t /*id*/, const std::string & /*login*/) const { return 0; }
-        int GetMessageHdrs(std::vector<STG_MSG_HDR> * /*hdrsList*/, const std::string & /*login*/) const { return 0; }
-
-        int SaveMonthStat(const USER_STAT & /*stat*/, int /*month*/, int /*year*/, const std::string & /*login*/) const { return 0; }
-
-        int GetAdminsList(std::vector<std::string> * /*adminsList*/) const { return 0; }
-        int SaveAdmin(const ADMIN_CONF & /*ac*/) const { return 0; }
-        int RestoreAdmin(ADMIN_CONF * /*ac*/, const std::string & /*login*/) const { return 0; }
-        int AddAdmin(const std::string & /*login*/) const { return 0; }
-        int DelAdmin(const std::string & /*login*/) const { return 0; }
-
-        int GetTariffsList(std::vector<std::string> * /*tariffsList*/) const { return 0; }
-        int AddTariff(const std::string & /*name*/) const { return 0; }
-        int DelTariff(const std::string & /*name*/) const { return 0; }
-        int SaveTariff(const TARIFF_DATA & /*td*/, const std::string & /*tariffName*/) const { return 0; }
-        int RestoreTariff(TARIFF_DATA * /*td*/, const std::string & /*tariffName*/) const { return 0; }
-
-        int GetCorpsList(std::vector<std::string> * /*corpsList*/) const { return 0; }
-        int SaveCorp(const CORP_CONF & /*cc*/) const { return 0; }
-        int RestoreCorp(CORP_CONF * /*cc*/, const std::string & /*name*/) const { return 0; }
-        int AddCorp(const std::string & /*name*/) const { return 0; }
-        int DelCorp(const std::string & /*name*/) const { return 0; }
-
-        int GetServicesList(std::vector<std::string> * /*corpsList*/) const { return 0; }
-        int SaveService(const SERVICE_CONF & /*sc*/) const { return 0; }
-        int RestoreService(SERVICE_CONF * /*sc*/, const std::string & /*name*/) const { return 0; }
-        int AddService(const std::string & /*name*/) const { return 0; }
-        int DelService(const std::string & /*name*/) const { return 0; }
-
-        void SetSettings(const MODULE_SETTINGS & /*s*/) {}
-        int ParseSettings() { return 0; }
-        const std::string & GetStrError() const { return strError; }
-        const std::string & GetVersion() const { return version; }
+                              const std::string & /*login*/) const override { return 0; }
+
+        int AddMessage(STG::Message * /*msg*/, const std::string & /*login*/) const override { return 0; }
+        int EditMessage(const STG::Message & /*msg*/, const std::string & /*login*/) const override { return 0; }
+        int GetMessage(uint64_t /*id*/, STG::Message * /*msg*/, const std::string & /*login*/) const override { return 0; }
+        int DelMessage(uint64_t /*id*/, const std::string & /*login*/) const override { return 0; }
+        int GetMessageHdrs(std::vector<STG::Message::Header> * /*hdrsList*/, const std::string & /*login*/) const override { return 0; }
+
+        int SaveMonthStat(const STG::UserStat & /*stat*/, int /*month*/, int /*year*/, const std::string & /*login*/) const override { return 0; }
+
+        int GetAdminsList(std::vector<std::string> * /*adminsList*/) const override { return 0; }
+        int SaveAdmin(const STG::AdminConf & /*ac*/) const override { return 0; }
+        int RestoreAdmin(STG::AdminConf * /*ac*/, const std::string & /*login*/) const override { return 0; }
+        int AddAdmin(const std::string & /*login*/) const override { return 0; }
+        int DelAdmin(const std::string & /*login*/) const override { return 0; }
+
+        int GetTariffsList(std::vector<std::string> * /*tariffsList*/) const override { return 0; }
+        int AddTariff(const std::string & /*name*/) const override { return 0; }
+        int DelTariff(const std::string & /*name*/) const override { return 0; }
+        int SaveTariff(const STG::TariffData & /*td*/, const std::string & /*tariffName*/) const override { return 0; }
+        int RestoreTariff(STG::TariffData * /*td*/, const std::string & /*tariffName*/) const override { return 0; }
+
+        int GetCorpsList(std::vector<std::string> * /*corpsList*/) const override { return 0; }
+        int SaveCorp(const STG::CorpConf & /*cc*/) const override { return 0; }
+        int RestoreCorp(STG::CorpConf * /*cc*/, const std::string & /*name*/) const override { return 0; }
+        int AddCorp(const std::string & /*name*/) const override { return 0; }
+        int DelCorp(const std::string & /*name*/) const override { return 0; }
+
+        int GetServicesList(std::vector<std::string> * /*corpsList*/) const override { return 0; }
+        int SaveService(const STG::ServiceConf & /*sc*/) const override { return 0; }
+        int RestoreService(STG::ServiceConf * /*sc*/, const std::string & /*name*/) const override { return 0; }
+        int AddService(const std::string & /*name*/) const override { return 0; }
+        int DelService(const std::string & /*name*/) const override { return 0; }
+
+        void SetSettings(const STG::ModuleSettings & /*s*/) override {}
+        int ParseSettings() override { return 0; }
+        const std::string & GetStrError() const override { return strError; }
+        const std::string & GetVersion() const override { return version; }

 
     private:
         std::string strError;
 
     private:
         std::string strError;