More std::jthread

[stg.git] / projects / stargazer / plugins / other / smux / tables.h

diff --git a/projects/stargazer/plugins/other/smux/tables.h b/projects/stargazer/plugins/other/smux/tables.h
index ea0bc627b67261b7df4959ed66e702684066e318..1e27b326c30d17fa78c54bf1f2b43b20e05806d7 100644 (file)
--- a/projects/stargazer/plugins/other/smux/tables.h
+++ b/projects/stargazer/plugins/other/smux/tables.h
@@ -6,12 +6,15 @@
 
 #include "sensors.h"
 
 
 #include "sensors.h"
 

-class TARIFFS;
-class USERS;
+namespace STG
+{
+struct Tariffs;
+struct Users;
+}

 
 class TableSensor {
     public:
 
 class TableSensor {
     public:

-        TableSensor(const std::string & p) : prefix(p) {}
+        explicit TableSensor(const std::string & p) : prefix(p) {}

         virtual ~TableSensor() {}
 
         const std::string & GetPrefix() const { return prefix; }
         virtual ~TableSensor() {}
 
         const std::string & GetPrefix() const { return prefix; }


@@ -24,19 +27,18 @@ class TableSensor {
 class TariffUsersTable : public TableSensor {
     public:
         TariffUsersTable(const std::string & p,
 class TariffUsersTable : public TableSensor {
     public:
         TariffUsersTable(const std::string & p,

-                         TARIFFS & t,
-                         USERS & u)
+                         STG::Tariffs & t,
+                         STG::Users & u)

             : TableSensor(p),
               tariffs(t),
               users(u)
         {}
             : TableSensor(p),
               tariffs(t),
               users(u)
         {}

-        virtual ~TariffUsersTable() {}

 
 

-        void UpdateSensors(Sensors & sensors) const;
+        void UpdateSensors(Sensors & sensors) const override;

 
     private:
 
     private:

-        TARIFFS & tariffs;
-        USERS & users;
+        STG::Tariffs & tariffs;
+        STG::Users & users;

 };
 
 typedef std::map<std::string, TableSensor *> Tables;
 };
 
 typedef std::map<std::string, TableSensor *> Tables;