Changed USER_STAT_RES.

[stg.git] / include / stg / user_conf.h

diff --git a/include/stg/user_conf.h b/include/stg/user_conf.h
index 9a6efb23dc5d8ce4271be5af043434b3049c9d7e..dcc19afa0c9e430674e8d83711ecc46f1568ebe9 100644 (file)
--- a/include/stg/user_conf.h
+++ b/include/stg/user_conf.h
@@ -9,7 +9,7 @@
 
 #include <string>
 #include <vector>
 
 #include <string>
 #include <vector>

-#include "stg_const.h"
+#include "const.h"

 #include "user_ips.h"
 #include "resetable.h"
 #include "os_int.h"
 #include "user_ips.h"
 #include "resetable.h"
 #include "os_int.h"


@@ -37,7 +37,7 @@ struct USER_CONF
           userdata(USERDATA_NUM),
           creditExpire(0),
           ips()
           userdata(USERDATA_NUM),
           creditExpire(0),
           ips()

-    {};
+    {}

 
     std::string              password;
     int                      passive;
 
     std::string              password;
     int                      passive;


@@ -81,7 +81,7 @@ struct USER_CONF_RES
           creditExpire(),
           ips()
     {
           creditExpire(),
           ips()
     {

-    };
+    }

 
     USER_CONF_RES & operator=(const USER_CONF & uc)
     {
 
     USER_CONF_RES & operator=(const USER_CONF & uc)
     {


@@ -107,30 +107,30 @@ struct USER_CONF_RES
         creditExpire = uc.creditExpire;
         ips          = uc.ips;
         return *this;
         creditExpire = uc.creditExpire;
         ips          = uc.ips;
         return *this;

-    };
-    operator USER_CONF() const
+    }
+    USER_CONF GetData() const

     {
         USER_CONF uc;
     {
         USER_CONF uc;

-        uc.password     = password;
-        uc.passive      = passive;
-        uc.disabled     = disabled;
-        uc.disabledDetailStat = disabledDetailStat;
-        uc.alwaysOnline = alwaysOnline;
-        uc.tariffName   = tariffName;
-        uc.address      = address;
-        uc.phone        = phone;
-        uc.email        = email;
-        uc.note         = note;
-        uc.realName     = realName;
-        uc.group        = group;
-        uc.credit       = credit;
-        uc.nextTariff   = nextTariff;
+        uc.password     = password.data();
+        uc.passive      = passive.data();
+        uc.disabled     = disabled.data();
+        uc.disabledDetailStat = disabledDetailStat.data();
+        uc.alwaysOnline = alwaysOnline.data();
+        uc.tariffName   = tariffName.data();
+        uc.address      = address.data();
+        uc.phone        = phone.data();
+        uc.email        = email.data();
+        uc.note         = note.data();
+        uc.realName     = realName.data();
+        uc.group        = group.data();
+        uc.credit       = credit.data();
+        uc.nextTariff   = nextTariff.data();

         for (int i = 0; i < USERDATA_NUM; i++)
             {
         for (int i = 0; i < USERDATA_NUM; i++)
             {

-            uc.userdata[i]  = userdata[i];
+            uc.userdata[i]  = userdata[i].data();

             }
             }

-        uc.creditExpire = creditExpire;
-        uc.ips          = ips;
+        uc.creditExpire = creditExpire.data();
+        uc.ips          = ips.data();

         return uc;
     }
     //-------------------------------------------------------------------------
         return uc;
     }
     //-------------------------------------------------------------------------


@@ -155,4 +155,3 @@ struct USER_CONF_RES
 };
 //-----------------------------------------------------------------------------
 #endif
 };
 //-----------------------------------------------------------------------------
 #endif

-