memops wrapper, remove unused includes

5 files changed, 34 insertions, 41 deletions

diff --git a/src/ui/imgui_extensions.cpp b/src/ui/imgui_extensions.cpp
index 4e8270a..ee0bebb 100644
--- a/src/ui/imgui_extensions.cpp
+++ b/src/ui/imgui_extensions.cpp
@@ -1,7 +1,6 @@
-#include <stdlib.h>
-
 #include "ui.hpp"
 #include "strops.hpp"
+#include "memops.hpp"
 #include "config.hpp"
 #include "locales.hpp"
 #include "administration.hpp"
@@ -225,7 +224,7 @@ namespace ImGui
 
         for (int i = 0; i < autocomplete_count; i++)
         {
-            autocomplete_strings[i] = (char*)malloc(200);
+            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);
         }
 
@@ -234,19 +233,19 @@ namespace ImGui
 
         if (autocomplete_index != -1)
         {
-            memcpy(buffer, &autocomplete_list[autocomplete_index], sizeof(contact));
+            memops::copy(buffer, &autocomplete_list[autocomplete_index], sizeof(contact));
         }
 
         for (int i = 0; i < autocomplete_count; i++)
         {
-            free(autocomplete_strings[i]);
+            memops::unalloc(autocomplete_strings[i]);
         }
     }
 
     void FormCostCenterCombo(char* costcenter_id)
     {
         u32 costcenter_count = administration::cost_center_count();
-        cost_center* buffer = (cost_center*) malloc(sizeof(cost_center) * costcenter_count);
+        cost_center* buffer = (cost_center*) memops::alloc(sizeof(cost_center) * costcenter_count);
 
         cost_center* selected_costcenter = NULL;
         costcenter_count = administration::cost_center_get_all(buffer);
@@ -281,13 +280,13 @@ namespace ImGui
             strops::copy(costcenter_id, buffer[selected_costcenter_index].id, MAX_LEN_ID);
         }
 
-        free(buffer);
+        memops::unalloc(buffer);
     }
 
     void FormProjectCombo(char* project_id)
     {
         u32 project_count = administration::project_count();
-        project* buffer = (project*) malloc(sizeof(project) * project_count);
+        project* buffer = (project*) memops::alloc(sizeof(project) * project_count);
 
         project* selected_project = NULL;
         project_count = administration::project_get_all(buffer);
@@ -322,13 +321,13 @@ namespace ImGui
             strops::copy(project_id, buffer[selected_project_index].id, MAX_LEN_ID);
         }
 
-        free(buffer);
+        memops::unalloc(buffer);
     }
 
     void FormTaxRateCombo(char* tax_rate_id, char* orig_country, char* dest_country, bool has_error)
     {
         u32 tax_rate_count = administration::tax_rate_count();
-        tax_rate* buffer = (tax_rate*) malloc(sizeof(tax_rate) * tax_rate_count);
+        tax_rate* buffer = (tax_rate*) memops::alloc(sizeof(tax_rate) * tax_rate_count);
 
         tax_rate* selected_tax_rate = NULL;
         char* tax_country_codes[2] = {orig_country, dest_country};
@@ -394,7 +393,7 @@ namespace ImGui
             strops::copy(tax_rate_id, buffer[selected_tax_rate_index].id, MAX_LEN_ID);
         }
 
-        free(buffer);
+        memops::unalloc(buffer);
     }
 
     bool FormCurrencyCombo(char* currency)
diff --git a/src/ui/ui_earnings.cpp b/src/ui/ui_earnings.cpp
index 1ceabbe..8f08bcb 100644
--- a/src/ui/ui_earnings.cpp
+++ b/src/ui/ui_earnings.cpp
@@ -14,24 +14,24 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
 
 #include "ui.hpp"
 #include "imgui.h"
-#include "administration.hpp"
+#include "memops.hpp"
 #include "locales.hpp"
+#include "administration.hpp"
 
 income_statement* statement = 0;
 
 void ui::setup_earnings()
 {
-    statement = (income_statement*)malloc(sizeof(income_statement));
+    statement = (income_statement*)memops::alloc(sizeof(income_statement));
     administration::create_income_statement(statement);
 }
 
 void ui::destroy_earnings()
 {
-    free(statement);
+    memops::unalloc(statement);
 }
 
 void ui::draw_earnings()
diff --git a/src/ui/ui_expenses.cpp b/src/ui/ui_expenses.cpp
index 8812273..e22b5b1 100644
--- a/src/ui/ui_expenses.cpp
+++ b/src/ui/ui_expenses.cpp
@@ -14,20 +14,17 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#define _CRT_SECURE_NO_WARNINGS
-#include <stdio.h>
 #include <time.h>
+#include <ImGuiDatePicker/ImGuiDatePicker.hpp>
 
-#include "ImGuiDatePicker/ImGuiDatePicker.hpp"
-//#include "tinyfiledialogs/tinyfiledialogs.h"
-
-#include "strops.hpp"
 #include "ui.hpp"
 #include "imgui.h"
-#include "administration.hpp"
-#include "administration_writer.hpp"
+#include "memops.hpp"
+#include "strops.hpp"
 #include "locales.hpp"
 #include "importer.hpp"
+#include "administration.hpp"
+#include "administration_writer.hpp"
 
 static importer::invoice_request* active_import_request = 0;
 
@@ -43,7 +40,7 @@ void draw_invoice_items_form(invoice* invoice);
 
 void ui::destroy_expenses()
 {
-    free(invoice_items_buffer);
+    memops::unalloc(invoice_items_buffer);
 }
 
 void ui::setup_expenses()
@@ -58,7 +55,7 @@ void ui::setup_expenses()
     active_invoice = administration::invoice_create_empty();
 
     u32 invoice_items_count = MAX_BILLING_ITEMS;
-    invoice_items_buffer = (billing_item*)malloc(sizeof(billing_item) * invoice_items_count);
+    invoice_items_buffer = (billing_item*)memops::alloc(sizeof(billing_item) * invoice_items_count);
 }
 
 static void draw_expense_form(invoice* buffer, bool viewing_only = false)
diff --git a/src/ui/ui_invoices.cpp b/src/ui/ui_invoices.cpp
index 4dd44e8..850c9a3 100644
--- a/src/ui/ui_invoices.cpp
+++ b/src/ui/ui_invoices.cpp
@@ -14,19 +14,16 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#define _CRT_SECURE_NO_WARNINGS
-#include <stdio.h>
 #include <time.h>
+#include <ImGuiDatePicker/ImGuiDatePicker.hpp>
 
-#include "ImGuiDatePicker/ImGuiDatePicker.hpp"
-//#include "tinyfiledialogs/tinyfiledialogs.h"
-
-#include "strops.hpp"
 #include "ui.hpp"
 #include "imgui.h"
+#include "memops.hpp"
+#include "strops.hpp"
+#include "locales.hpp"
 #include "administration.hpp"
 #include "administration_writer.hpp"
-#include "locales.hpp"
 
 
 static ui::view_state current_view_state = ui::view_state::LIST_ALL;
@@ -40,7 +37,7 @@ void draw_addressee_form_ex(delivery_info* buffer, bool viewing_only = false);
 
 void ui::destroy_invoices()
 {
-    free(invoice_items_buffer);
+    memops::unalloc(invoice_items_buffer);
 }
 
 void ui::setup_invoices()
@@ -49,7 +46,7 @@ void ui::setup_invoices()
     active_invoice = administration::invoice_create_empty();
 
     u32 invoice_items_count = MAX_BILLING_ITEMS;
-    invoice_items_buffer = (billing_item*)malloc(sizeof(billing_item) * invoice_items_count);
+    invoice_items_buffer = (billing_item*)memops::alloc(sizeof(billing_item) * invoice_items_count);
 }
 
 void draw_invoice_items_form(invoice* invoice)
diff --git a/src/ui/ui_settings.cpp b/src/ui/ui_settings.cpp
index 8177f07..dd59323 100644
--- a/src/ui/ui_settings.cpp
+++ b/src/ui/ui_settings.cpp
@@ -14,14 +14,14 @@
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 */
 
-#include <stdlib.h>
 
-#include "strops.hpp"
 #include "ui.hpp"
 #include "imgui.h"
-#include "administration.hpp"
+#include "strops.hpp"
+#include "memops.hpp"
 #include "locales.hpp"
 #include "importer.hpp"
+#include "administration.hpp"
 #include "administration_writer.hpp"
 
 extern void draw_contact_form(contact* buffer, bool viewing_only = false);
@@ -39,8 +39,8 @@ static ai_service new_service;
 
 void ui::destroy_settings()
 {
-    free(tax_rates);
-    free(cost_centers);
+    memops::unalloc(tax_rates);
+    memops::unalloc(cost_centers);
 }
 
 void ui::setup_settings()
@@ -49,11 +49,11 @@ void ui::setup_settings()
     company_info = administration::company_info_get();
 
     tax_rate_count = administration::tax_rate_count();
-    tax_rates = (tax_rate*)malloc(tax_rate_count * sizeof(tax_rate));
+    tax_rates = (tax_rate*)memops::alloc(tax_rate_count * sizeof(tax_rate));
     administration::tax_rate_get_all(tax_rates);
 
     cost_center_count = administration::cost_center_count();
-    cost_centers = (cost_center*)malloc(cost_center_count * sizeof(cost_center));
+    cost_centers = (cost_center*)memops::alloc(cost_center_count * sizeof(cost_center));
     administration::cost_center_get_all(cost_centers);
 
     new_service = administration::get_ai_service();