X-Git-Url: https://git.stg.codes/stg.git/blobdiff_plain/bdd487e027c6f6c752eacc71aa75055e1323cd7f..f9d4d06e7cbe4965c0737baf8da309b1816ca82d:/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp?ds=sidebyside

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
index 16e25eb8..0b110d54 100644
--- a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
+++ b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
@@ -1,10 +1,10 @@
-#include "rpcconfig.h"
 #include "tariffs_methods.h"
+#include "rpcconfig.h"
 #include "tariff_helper.h"
-#include "tariffs.h"
-#include "users.h"
-#include "admins.h"
-#include "admin.h"
+#include "stg/tariffs.h"
+#include "stg/users.h"
+#include "stg/admins.h"
+#include "stg/admin.h"
 
 void METHOD_TARIFF_GET::execute(xmlrpc_c::paramList const & paramList,
                                 xmlrpc_c::value *   const   retvalPtr)
@@ -32,9 +32,7 @@ if (!tariff)
     return;
     }
 
-TARIFF_DATA td;
-
-tariff->GetTariffData(&td);
+TARIFF_DATA td(tariff->GetTariffData());
 
 TARIFF_HELPER helper(td);
 
@@ -57,9 +55,9 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
-ADMIN admin;
+ADMIN * admin;
 
-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
@@ -73,9 +71,7 @@ if (!tariff)
     return;
     }
 
-TARIFF_DATA td;
-
-tariff->GetTariffData(&td);
+TARIFF_DATA td(tariff->GetTariffData());
 
 TARIFF_HELPER helper(td);
 
@@ -140,9 +136,9 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
-ADMIN admin;
+ADMIN * admin;
 
-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;
@@ -172,9 +168,9 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
-ADMIN admin;
+ADMIN * admin;
 
-if (admins->FindAdmin(adminInfo.admin, &admin))
+if (admins->Find(adminInfo.admin, &admin))
     {
     *retvalPtr = xmlrpc_c::value_boolean(false);
     return;