fix warnings

5 files changed, 15 insertions, 15 deletions

diff --git a/src/ui/imgui_extensions.cpp b/src/ui/imgui_extensions.cpp
index 2c13546..4112568 100644
--- a/src/ui/imgui_extensions.cpp
+++ b/src/ui/imgui_extensions.cpp
@@ -455,7 +455,7 @@ namespace ImGui
         for (int i = 0; i < autocomplete_count; i++)
         {
             autocomplete_strings[i] = (char*)memops::alloc(200);
-            strops::format(autocomplete_strings[i], 200, "%s (%s %s)", autocomplete_list[i].name, autocomplete_list[i].address.address1, autocomplete_list[i].address.address2);
+            strops::format(autocomplete_strings[i], 200, "%s (%s %s)", autocomplete_list[i].name, autocomplete_list[i].addr.address1, autocomplete_list[i].addr.address2);
         }
 
         int autocomplete_index = ImGui::InputTextWithAutocomplete(locale::get("contact.form.fullname"), 
@@ -486,7 +486,7 @@ namespace ImGui
         if (with_autocomplete) _ContactFormNameAutocomplete(buffer, last_err & A_ERR_MISSING_NAME);
         else ImGui::InputTextWithErrorHint(locale::get("contact.form.fullname"), buffer->name, IM_ARRAYSIZE(buffer->name), last_err & A_ERR_MISSING_NAME);
 
-        ImGui::AddressForm(&buffer->address, last_err, active_countries_only);
+        ImGui::AddressForm(&buffer->addr, last_err, active_countries_only);
 
         ImGui::ContactTypeDropdown(&buffer->type);
 
@@ -775,7 +775,7 @@ namespace ImGui
 
         ImGui::InputTextWithErrorHint(locale::get("contact.form.fullname"), buffer->name, IM_ARRAYSIZE(buffer->name), last_err & A_ERR_MISSING_NAME);
 
-        ImGui::AddressForm(&buffer->address, last_err);
+        ImGui::AddressForm(&buffer->addr, last_err);
 
         if (viewing_only) ImGui::EndDisabled();
         ImGui::PopID();
@@ -799,7 +799,7 @@ namespace ImGui
         static time_t status_changed_at = 0;
         static e_err last_err;
 
-        if (active_request && active_request->status == exporter::status::EXPORT_DONE && is_new_request)
+        if (active_request && active_request->status == exporter::export_status::EXPORT_DONE && is_new_request)
         {
             is_new_request = false;
             show_status_change = true;
@@ -807,7 +807,7 @@ namespace ImGui
             status_changed_at = time(NULL);
         }
 
-        if (active_request && active_request->status != exporter::status::EXPORT_DONE) {
+        if (active_request && active_request->status != exporter::export_status::EXPORT_DONE) {
             is_new_request = true;
             ImGui::BeginDisabled();
             ImGui::BeginCombo("##sendStatus", NULL, 1 << 20);
diff --git a/src/ui/ui_contacts.cpp b/src/ui/ui_contacts.cpp
index b1fa01b..99896ce 100644
--- a/src/ui/ui_contacts.cpp
+++ b/src/ui/ui_contacts.cpp
@@ -110,7 +110,7 @@ static void draw_contact_list()
             }
 
             ImGui::TableSetColumnIndex(1); ImGui::Text(c.name);
-            ImGui::TableSetColumnIndex(2); ImGui::Text("%s %s", c.address.address1, c.address.address2);
+            ImGui::TableSetColumnIndex(2); ImGui::Text("%s %s", c.addr.address1, c.addr.address2);
 
             ImGui::TableSetColumnIndex(3);
             
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 168517f..6ac043f 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -109,8 +109,8 @@ static void draw_expense_form(invoice* buffer, bool viewing_only = false)
     ImGui::Separator();
     ImGui::Spacing();
 
-    if (ImGui::FileSelect(locale::get("ui.fileselect.text"), buffer->document.original_path)) {
-        buffer->document.copy_path[0] = 0;
+    if (ImGui::FileSelect(locale::get("ui.fileselect.text"), buffer->orig_document.original_path)) {
+        buffer->orig_document.copy_path[0] = 0;
     }
 
     ImGui::Spacing();
@@ -415,7 +415,7 @@ static void draw_import_request()
 {
     assert(active_import_request);
 
-    if (active_import_request->status == importer::status::IMPORT_DONE) {
+    if (active_import_request->status == importer::import_status::IMPORT_DONE) {
         if (active_import_request->error == I_ERR_SUCCESS) {
             active_invoice = active_import_request->result;
             current_view_state = ui::view_state::CREATE;
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 7356207..c222050 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -225,8 +225,8 @@ static void draw_invoice_form(invoice* buffer, bool viewing_only = false)
     ImGui::Separator();
     ImGui::Spacing();
 
-    if (ImGui::FileSelect(locale::get("ui.fileselect.text"), buffer->document.original_path)) {
-        buffer->document.copy_path[0] = 0;
+    if (ImGui::FileSelect(locale::get("ui.fileselect.text"), buffer->orig_document.original_path)) {
+        buffer->orig_document.copy_path[0] = 0;
     }
 
     ImGui::Spacing();
diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index 854d065..f0a0a53 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -54,7 +54,7 @@ void ui::setup_settings()
 
     if (administration::company_info_is_valid()) {
         tax_rates = (tax_rate*)memops::alloc(sizeof(tax_rate) * 400);
-        tax_rate_count = country::get_available_tax_rates(administration::company_info_get().address.country_code, tax_rates, 400);
+        tax_rate_count = country::get_available_tax_rates(administration::company_info_get().addr.country_code, tax_rates, 400);
 
         cost_center_count = administration::cost_center_count();
         cost_centers = (cost_center*)memops::alloc(cost_center_count * sizeof(cost_center));
@@ -296,7 +296,7 @@ static void draw_ai_service_ui()
         }
 
         // Default to first result in model list, or hardcoded default model.
-        if (model_request->status == importer::status::IMPORT_DONE) {
+        if (model_request->status == importer::import_status::IMPORT_DONE) {
             if (set_model_on_load) {
                 set_model_on_load = false;
 
@@ -309,7 +309,7 @@ static void draw_ai_service_ui()
             }
         }
 
-        if (model_request->status == importer::status::IMPORT_DONE && model_request->error == I_ERR_SUCCESS) {
+        if (model_request->status == importer::import_status::IMPORT_DONE && model_request->error == I_ERR_SUCCESS) {
             if (ImGui::BeginCombo(locale::get("settings.services.ai_service.model"), new_ai_service.model_name))
             {
                 for (u32 n = 0; n < model_request->result_count; n++)
@@ -328,7 +328,7 @@ static void draw_ai_service_ui()
             {
                 if (ImGui::BeginComboPreview())
                 {         
-                    if (model_request->status != importer::status::IMPORT_DONE) {
+                    if (model_request->status != importer::import_status::IMPORT_DONE) {
                         ImGui::LoadingIndicatorCircleSmall();
                         ImGui::SameLine();
                     }