strops and memops refactor

1 files changed, 23 insertions, 23 deletions

diff --git a/src/administration.cpp b/src/administration.cpp
index 724f25f..8af6e86 100644
--- a/src/administration.cpp
+++ b/src/administration.cpp
@@ -542,7 +542,7 @@ void administration::create_income_statement(income_statement* statement)
                 report->expenses_total += inv->total;
                 quarter->profit -= inv->total;
 
-                if (strops::equals(inv->cost_center_id, "") != 0) {
+                if (!strops::equals(inv->cost_center_id, "")) {
                     int expense_report_index = -1;
                     for (u32 x = 0; x < report->expense_count; x++)
                     {
@@ -599,7 +599,7 @@ void administration::set_file_path(char* path)
 
 char* administration::get_file_path()
 {
-    return strlen(g_administration.path) == 0 ? NULL : g_administration.path;
+    return strops::empty(g_administration.path) ? NULL : g_administration.path;
 }
 
 contact administration::company_info_get()
@@ -813,11 +813,11 @@ int administration::contact_get_autocompletions(contact* buffer, int buf_size, c
 a_err administration::addressee_is_valid(delivery_info data)
 {
     a_err result = A_ERR_SUCCESS;
-    if (strlen(data.name) == 0) result |= A_ERR_MISSING_NAME;
-    if (strlen(data.address.city) == 0) result |= A_ERR_MISSING_CITY;
-    if (strlen(data.address.postal) == 0) result |= A_ERR_MISSING_POSTAL;
-    if (strlen(data.address.address1) == 0) result |= A_ERR_MISSING_ADDRESS1;
-    if (strlen(data.address.country_code) == 0) result |= A_ERR_MISSING_COUNTRYCODE;
+    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;
 
     return result;
 }
@@ -825,17 +825,17 @@ a_err administration::addressee_is_valid(delivery_info data)
 a_err administration::contact_is_valid(contact data)
 {
     a_err result = A_ERR_SUCCESS;
-    if (strlen(data.name) == 0) result |= A_ERR_MISSING_NAME;
-    if (strlen(data.email) == 0) result |= A_ERR_MISSING_EMAIL;
-    if (strlen(data.address.city) == 0) result |= A_ERR_MISSING_CITY;
-    if (strlen(data.address.postal) == 0) result |= A_ERR_MISSING_POSTAL;
-    if (strlen(data.address.address1) == 0) result |= A_ERR_MISSING_ADDRESS1;
-    if (strlen(data.address.country_code) == 0) result |= A_ERR_MISSING_COUNTRYCODE;
+    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 (data.type == contact_type::CONTACT_BUSINESS)
     {
-        if (strlen(data.taxid) == 0) result |= A_ERR_MISSING_TAXID;
-        if (strlen(data.businessid) == 0) result |= A_ERR_MISSING_BUSINESSID;
+        if (strops::empty(data.taxid)) result |= A_ERR_MISSING_TAXID;
+        if (strops::empty(data.businessid)) result |= A_ERR_MISSING_BUSINESSID;
     }
 
     return result;
@@ -851,7 +851,7 @@ contact administration::contact_create_empty()
 
 bool administration::contact_equals(contact c1, contact c2)
 {
-    return memcmp(&c1, &c2, sizeof(contact)) == 0;
+    return memops::equals(&c1, &c2, sizeof(contact));
 }
 
 // Project functions.
@@ -925,7 +925,7 @@ void administration::project_cancel(project data)
 
 a_err administration::project_is_valid(project data)
 {
-    if (strlen(data.description) == 0) return A_ERR_MISSING_DESCRIPTION;
+    if (strops::empty(data.description)) return A_ERR_MISSING_DESCRIPTION;
     return A_ERR_SUCCESS;
 }
 
@@ -1225,8 +1225,8 @@ a_err administration::cost_center_is_valid(cost_center data)
     cost_center lookup;
 
     a_err result = A_ERR_SUCCESS;
-    if (strlen(data.code) == 0) result |= A_ERR_MISSING_CODE;
-    if (strlen(data.description) == 0) result |= A_ERR_MISSING_DESCRIPTION;
+    if (strops::empty(data.code)) result |= A_ERR_MISSING_CODE;
+    if (strops::empty(data.description)) result |= A_ERR_MISSING_DESCRIPTION;
     if (get_cost_center_by_code(data.code, &lookup)) result |= A_ERR_CODE_EXISTS;
 
     return result;
@@ -1293,7 +1293,7 @@ a_err administration::cost_center_update(cost_center data)
 // =======================
 static char* get_default_currency_for_country(char* country_code)
 {
-    if (country_code == NULL || strlen(country_code) != 2)
+    if (country_code == NULL || strops::length(country_code) != 2)
         return "EUR"; // default
 
      // Non-euro EU currencies
@@ -1477,7 +1477,7 @@ a_err administration::invoice_update(invoice* inv)
 
 a_err administration::invoice_import(invoice* inv)
 {
-    inv->is_triangulation = !(memcmp(&inv->addressee.address, &inv->customer.address, sizeof(address)) == 0);
+    inv->is_triangulation = !memops::equals(&inv->addressee.address, &inv->customer.address, sizeof(address));
 
     inv->issued_at -= (inv->issued_at % 86400);
     inv->delivered_at -= (inv->delivered_at % 86400);
@@ -1833,8 +1833,8 @@ tax_subtotal administration::billing_item_convert_to_default_currency(invoice* i
 a_err administration::billing_item_is_valid(billing_item item)
 {
     a_err result = A_ERR_SUCCESS;
-    if (strlen(item.description) == 0) result |= A_ERR_MISSING_DESCRIPTION;
-    if (strlen(item.tax_internal_code) == 0) result |= A_ERR_MISSING_TAX_RATE;
+    if (strops::empty(item.description)) result |= A_ERR_MISSING_DESCRIPTION;
+    if (strops::empty(item.tax_internal_code)) result |= A_ERR_MISSING_TAX_RATE;
 
     return result;
 }