Fix compilation issues on FreeBSD4

[stg.git] / projects / stargazer / plugins / configuration / rpcconfig / tariffs_methods.cpp

diff --git a/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp b/projects/stargazer/plugins/configuration/rpcconfig/tariffs_methods.cpp
index 23916ae70868e334e5cefddc52e2c9ba5db79270..7614205346e72e83d128bea9068d89b58a96366c 100644 (file)
--- 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,7 +55,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
-ADMIN admin;
+ADMIN * admin;
 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {
@@ -73,9 +71,7 @@ if (!tariff)
     return;
     }
 
-TARIFF_DATA td;
-
-tariff->GetTariffData(&td);
+TARIFF_DATA td(tariff->GetTariffData());
 
 TARIFF_HELPER helper(td);
 
@@ -140,7 +136,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
-ADMIN admin;
+ADMIN * admin;
 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {
@@ -172,7 +168,7 @@ if (config->GetAdminInfo(cookie, &adminInfo))
     return;
     }
 
-ADMIN admin;
+ADMIN * admin;
 
 if (admins->FindAdmin(adminInfo.admin, &admin))
     {