fix warnings

1 files changed, 25 insertions, 25 deletions

diff --git a/src/administration.cpp b/src/administration.cpp
index 3905c74..41ad2fc 100644
--- a/src/administration.cpp
+++ b/src/administration.cpp
@@ -134,7 +134,7 @@ void administration_create()
     list_init(&g_administration.cost_centers);
     strops::copy(g_administration.path, "", sizeof(g_administration.path));
 
-    memops::zero(&g_administration.ai_service, sizeof(ai_service));
+    memops::zero(&g_administration.active_ai_service, sizeof(ai_service));
     memops::zero(&g_administration.all_ai_services, sizeof(g_administration.all_ai_services));
 
     // Load all tax rates.
@@ -235,7 +235,7 @@ void administration::create_default(const char* save_file)
 // =======================
 ai_service administration::get_active_ai_service()
 {
-    return g_administration.ai_service;
+    return g_administration.active_ai_service;
 }
 
 ai_service administration::get_ai_service(ai_provider provider)
@@ -245,12 +245,12 @@ ai_service administration::get_ai_service(ai_provider provider)
 
 email_service administration::get_email_service()
 {
-    return g_administration.email_service;
+    return g_administration.active_email_service;
 }
 
 void administration::set_email_service(email_service provider)
 {
-    g_administration.email_service = provider;
+    g_administration.active_email_service = provider;
     if (administration_data_changed_event_callback) administration_data_changed_event_callback();
 }
 
@@ -262,7 +262,7 @@ void administration::import_ai_service(ai_service service)
 void administration::set_active_ai_service(ai_service service)
 {
     g_administration.all_ai_services[(u32)service.provider] = service;
-    g_administration.ai_service = service;
+    g_administration.active_ai_service = service;
     if (administration_data_changed_event_callback) administration_data_changed_event_callback();
 }
 
@@ -375,7 +375,7 @@ void administration::create_tax_statement(tax_statement* statement)
 {
     STOPWATCH_START;
 
-    char* country_code = company_info_get().address.country_code;
+    char* country_code = company_info_get().addr.country_code;
 
     assert(statement);
     statement->report_count = 0;
@@ -676,14 +676,14 @@ contact administration::company_info_get()
 void administration::company_info_import(contact data)
 {
     g_administration.company_info = data;
-    strops::copy(g_administration.default_currency, get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
+    strops::copy(g_administration.default_currency, get_default_currency_for_country(g_administration.company_info.addr.country_code), MAX_LEN_CURRENCY);
 }
 
 void administration::company_info_set(contact data)
 {
     strops::copy(data.id, MY_COMPANY_ID, sizeof(data.id));
     g_administration.company_info = data;
-    strops::copy(g_administration.default_currency, get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
+    strops::copy(g_administration.default_currency, get_default_currency_for_country(g_administration.company_info.addr.country_code), MAX_LEN_CURRENCY);
 
     if (contact_changed_event_callback) contact_changed_event_callback(&data);
 }
@@ -877,10 +877,10 @@ a_err administration::addressee_is_valid(delivery_info data)
 {
     a_err result = A_ERR_SUCCESS;
     if (strops::empty(data.name)) result |= A_ERR_MISSING_NAME;
-    if (strops::empty(data.address.city)) result |= A_ERR_MISSING_CITY;
-    if (strops::empty(data.address.postal)) result |= A_ERR_MISSING_POSTAL;
-    if (strops::empty(data.address.address1)) result |= A_ERR_MISSING_ADDRESS1;
-    if (strops::empty(data.address.country_code)) result |= A_ERR_MISSING_COUNTRYCODE;
+    if (strops::empty(data.addr.city)) result |= A_ERR_MISSING_CITY;
+    if (strops::empty(data.addr.postal)) result |= A_ERR_MISSING_POSTAL;
+    if (strops::empty(data.addr.address1)) result |= A_ERR_MISSING_ADDRESS1;
+    if (strops::empty(data.addr.country_code)) result |= A_ERR_MISSING_COUNTRYCODE;
 
     return result;
 }
@@ -890,10 +890,10 @@ a_err administration::contact_is_valid(contact data)
     a_err result = A_ERR_SUCCESS;
     if (strops::empty(data.name)) result |= A_ERR_MISSING_NAME;
     if (strops::empty(data.email)) result |= A_ERR_MISSING_EMAIL;
-    if (strops::empty(data.address.city)) result |= A_ERR_MISSING_CITY;
-    if (strops::empty(data.address.postal)) result |= A_ERR_MISSING_POSTAL;
-    if (strops::empty(data.address.address1)) result |= A_ERR_MISSING_ADDRESS1;
-    if (strops::empty(data.address.country_code)) result |= A_ERR_MISSING_COUNTRYCODE;
+    if (strops::empty(data.addr.city)) result |= A_ERR_MISSING_CITY;
+    if (strops::empty(data.addr.postal)) result |= A_ERR_MISSING_POSTAL;
+    if (strops::empty(data.addr.address1)) result |= A_ERR_MISSING_ADDRESS1;
+    if (strops::empty(data.addr.country_code)) result |= A_ERR_MISSING_COUNTRYCODE;
 
     if (data.type == contact_type::CONTACT_BUSINESS)
     {
@@ -1414,7 +1414,7 @@ invoice administration::invoice_create_empty()
     result.delivered_at = result.issued_at;
     result.expires_at = result.issued_at + administration::get_default_invoice_expire_duration();
     list_init(&result.billing_items);
-    strops::copy(result.currency, get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
+    strops::copy(result.currency, get_default_currency_for_country(g_administration.company_info.addr.country_code), MAX_LEN_CURRENCY);
     return result;
 }
 
@@ -1505,12 +1505,12 @@ a_err administration::invoice_remove(invoice* inv)
 static void invoice_set_addressee(invoice* inv, contact contact)
 {
     memops::copy(&inv->addressee.name, &contact.name, sizeof(inv->addressee.name));
-    memops::copy(&inv->addressee.address.address1, &contact.address.address1, sizeof(inv->addressee.address.address1));
-    memops::copy(&inv->addressee.address.address2, &contact.address.address2, sizeof(inv->addressee.address.address2));
-    memops::copy(&inv->addressee.address.city, &contact.address.city, sizeof(inv->addressee.address.city));
-    memops::copy(&inv->addressee.address.postal, &contact.address.postal, sizeof(inv->addressee.address.postal));
-    memops::copy(&inv->addressee.address.region, &contact.address.region, sizeof(inv->addressee.address.region));
-    memops::copy(&inv->addressee.address.country_code, &contact.address.country_code, sizeof(inv->addressee.address.country_code));
+    memops::copy(&inv->addressee.addr.address1, &contact.addr.address1, sizeof(inv->addressee.addr.address1));
+    memops::copy(&inv->addressee.addr.address2, &contact.addr.address2, sizeof(inv->addressee.addr.address2));
+    memops::copy(&inv->addressee.addr.city, &contact.addr.city, sizeof(inv->addressee.addr.city));
+    memops::copy(&inv->addressee.addr.postal, &contact.addr.postal, sizeof(inv->addressee.addr.postal));
+    memops::copy(&inv->addressee.addr.region, &contact.addr.region, sizeof(inv->addressee.addr.region));
+    memops::copy(&inv->addressee.addr.country_code, &contact.addr.country_code, sizeof(inv->addressee.addr.country_code));
 }
 
 a_err administration::invoice_update(invoice* inv)
@@ -1542,7 +1542,7 @@ a_err administration::invoice_update(invoice* inv)
 
 a_err administration::invoice_import(invoice* inv)
 {
-    inv->is_triangulation = !memops::equals(&inv->addressee.address, &inv->customer.address, sizeof(address));
+    inv->is_triangulation = !memops::equals(&inv->addressee.addr, &inv->customer.addr, sizeof(address));
 
     inv->issued_at -= (inv->issued_at % 86400);
     inv->delivered_at -= (inv->delivered_at % 86400);
@@ -1574,7 +1574,7 @@ a_err administration::invoice_add(invoice* inv)
     inv->expires_at -= (inv->expires_at % 86400);
     inv->is_outgoing = strops::equals(inv->supplier.id, MY_COMPANY_ID);
 
-    inv->payment_means.payment_method = PAYMENT_METHOD_STANDING_AGREEMENT;
+    inv->payment_means.method = PAYMENT_METHOD_STANDING_AGREEMENT;
     strops::copy(inv->payment_means.payee_bank_account, inv->supplier.bank_account,  sizeof(inv->payment_means.payee_bank_account));
     strops::copy(inv->payment_means.payee_account_name, inv->supplier.name,          sizeof(inv->payment_means.payee_account_name));
     strops::copy(inv->payment_means.service_provider_id, "",                         sizeof(inv->payment_means.service_provider_id));