MySQL custom port implemented

[stg.git] / projects / stargazer / user_impl.h

diff --git a/projects/stargazer/user_impl.h b/projects/stargazer/user_impl.h
index 30b6aa78858d4128422bb718b12343b36de31520..8bc696648a0430de96d9bd5ba4a2306151787324 100644 (file)
--- a/projects/stargazer/user_impl.h
+++ b/projects/stargazer/user_impl.h
@@ -66,7 +66,7 @@ private:
 class CHG_PASSIVE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
                              private NONCOPYABLE {
 public:
 class CHG_PASSIVE_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
                              private NONCOPYABLE {
 public:

-    CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_PASSIVE_NOTIFIER(USER_IMPL * u) : user(u) {}

     void Notify(const int & oldPassive, const int & newPassive);
 
 private:
     void Notify(const int & oldPassive, const int & newPassive);
 
 private:


@@ -76,7 +76,7 @@ private:
 class CHG_DISABLED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
                              private NONCOPYABLE {
 public:
 class CHG_DISABLED_NOTIFIER : public PROPERTY_NOTIFIER_BASE<int>,
                              private NONCOPYABLE {
 public:

-    CHG_DISABLED_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_DISABLED_NOTIFIER(USER_IMPL * u) : user(u) {}

     void Notify(const int & oldValue, const int & newValue);
 
 private:
     void Notify(const int & oldValue, const int & newValue);
 
 private:


@@ -86,7 +86,7 @@ private:
 class CHG_TARIFF_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string>,
                             private NONCOPYABLE {
 public:
 class CHG_TARIFF_NOTIFIER : public PROPERTY_NOTIFIER_BASE<std::string>,
                             private NONCOPYABLE {
 public:

-    CHG_TARIFF_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_TARIFF_NOTIFIER(USER_IMPL * u) : user(u) {}

     void Notify(const std::string & oldTariff, const std::string & newTariff);
 
 private:
     void Notify(const std::string & oldTariff, const std::string & newTariff);
 
 private:


@@ -96,7 +96,7 @@ private:
 class CHG_CASH_NOTIFIER : public PROPERTY_NOTIFIER_BASE<double>,
                           private NONCOPYABLE {
 public:
 class CHG_CASH_NOTIFIER : public PROPERTY_NOTIFIER_BASE<double>,
                           private NONCOPYABLE {
 public:

-    CHG_CASH_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_CASH_NOTIFIER(USER_IMPL * u) : user(u) {}

     void Notify(const double & oldCash, const double & newCash);
 
 private:
     void Notify(const double & oldCash, const double & newCash);
 
 private:


@@ -106,7 +106,7 @@ private:
 class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
                          private NONCOPYABLE {
 public:
 class CHG_IPS_NOTIFIER : public PROPERTY_NOTIFIER_BASE<USER_IPS>,
                          private NONCOPYABLE {
 public:

-    CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}
+    explicit CHG_IPS_NOTIFIER(USER_IMPL * u) : user(u) {}

     void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 
 private:
     void Notify(const USER_IPS & oldIPs, const USER_IPS & newIPs);
 
 private:


@@ -125,13 +125,15 @@ public:
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,

-              const USERS * u);
+              const USERS * u,
+              const SERVICES & svcs);

 #else
     USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,
 #else
     USER_IMPL(const SETTINGS_IMPL * settings,
               const STORE * store,
               const TARIFFS * tariffs,
               const ADMIN * sysAdmin,

-              const USERS * u);
+              const USERS * u,
+              const SERVICES & svcs);

 #endif
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();
 #endif
     USER_IMPL(const USER_IMPL & u);
     virtual ~USER_IMPL();


@@ -269,6 +271,8 @@ private:
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 
     const TARIFFS * tariffs;
     const TARIFF *  tariff;
 

+    const SERVICES & m_services;
+

     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;
 
     TRAFF_STAT      traffStat;
     std::pair<time_t, TRAFF_STAT> traffStatSaved;