namespace for logger, strops, locales

1 files changed, 26 insertions, 26 deletions

diff --git a/src/administration.cpp b/src/administration.cpp
index 4f996bf..f9770bd 100644
--- a/src/administration.cpp
+++ b/src/administration.cpp
@@ -22,7 +22,7 @@
 #include <time.h>
 #include <stdio.h>
 
-#include "log.hpp"
+#include "logger.hpp"
 #include "strops.hpp"
 #include "administration.hpp"
 #include "administration_writer.hpp"
@@ -295,7 +295,7 @@ static bool is_initialized = false;
 void administration_create()
 {
     STOPWATCH_START;
-    log_clear();
+    logger::clear();
     is_initialized = true;
 
     list_init(&g_administration.invoices);
@@ -303,11 +303,11 @@ void administration_create()
     list_init(&g_administration.projects);
     list_init(&g_administration.tax_rates);
     list_init(&g_administration.cost_centers);
-    strops_copy(g_administration.path, "", sizeof(g_administration.path));
+    strops::copy(g_administration.path, "", sizeof(g_administration.path));
 
     memset(&g_administration.ai_service, 0, sizeof(ai_service));
 
-    log_info("Setup took %.3fms.", STOPWATCH_TIME);
+    logger::info("Setup took %.3fms.", STOPWATCH_TIME);
 }
 
 static void administration_destroy_list(list_t *list)
@@ -336,8 +336,8 @@ void administration_create_from_file(char* save_file)
     if (is_initialized) administration_destroy();
     administration_create();
 
-    strops_copy(g_administration.path, save_file, sizeof(g_administration.path));
-    strops_copy(g_administration.program_version, config::PROGRAM_VERSION, sizeof(g_administration.program_version));
+    strops::copy(g_administration.path, save_file, sizeof(g_administration.path));
+    strops::copy(g_administration.program_version, config::PROGRAM_VERSION, sizeof(g_administration.program_version));
 }
 
 void administration_create_empty(char* save_file)
@@ -348,8 +348,8 @@ void administration_create_empty(char* save_file)
     g_administration.next_id = 2;
     g_administration.next_sequence_number = 1;
 
-    strops_copy(g_administration.path, save_file, sizeof(g_administration.path));
-    strops_copy(g_administration.program_version, config::PROGRAM_VERSION, sizeof(g_administration.program_version));
+    strops::copy(g_administration.path, save_file, sizeof(g_administration.path));
+    strops::copy(g_administration.program_version, config::PROGRAM_VERSION, sizeof(g_administration.program_version));
     administration_company_info_set(administration_contact_create_empty());   
 }
 
@@ -548,14 +548,14 @@ void administration_create_income_statement(income_statement* statement)
             report.revenue = 0.0f;
             report.taxes = 0.0f;
             report.expense_count = 0;
-            strops_copy(report.project_id, project_buffer[x].id, MAX_LEN_ID);
-            strops_copy(report.description, project_buffer[x].description, MAX_LEN_LONG_DESC);
+            strops::copy(report.project_id, project_buffer[x].id, MAX_LEN_ID);
+            strops::copy(report.description, project_buffer[x].description, MAX_LEN_LONG_DESC);
 
             for (u32 y = 0; y < costcenter_count; y++)
             {
                 project_expense expense;
-                strops_copy(expense.cost_center_id, costcenter_buffer[y].id, MAX_LEN_ID);
-                strops_copy(expense.description, costcenter_buffer[y].description, MAX_LEN_LONG_DESC);
+                strops::copy(expense.cost_center_id, costcenter_buffer[y].id, MAX_LEN_ID);
+                strops::copy(expense.description, costcenter_buffer[y].description, MAX_LEN_LONG_DESC);
                 expense.total = 0.0f;
                 expense.expense_used_in_project = true;
                 report.expenses[report.expense_count++] = expense;
@@ -668,12 +668,12 @@ void administration_create_income_statement(income_statement* statement)
 
     free(invoice_buffer);
 
-    log_info("Created income statement in %.3fms.", STOPWATCH_TIME);
+    logger::info("Created income statement in %.3fms.", STOPWATCH_TIME);
 }
 
 void administration_set_file_path(char* path)
 {
-    strops_copy(g_administration.path, path, MAX_LEN_PATH);
+    strops::copy(g_administration.path, path, MAX_LEN_PATH);
 }
 
 char* administration_get_file_path()
@@ -689,14 +689,14 @@ contact administration_company_info_get()
 void administration_company_info_import(contact data)
 {
     g_administration.company_info = data;
-    strops_copy(g_administration.default_currency, administration_get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
+    strops::copy(g_administration.default_currency, administration_get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
 }
 
 void administration_company_info_set(contact data)
 {
-    strops_copy(data.id, MY_COMPANY_ID, sizeof(data.id));
+    strops::copy(data.id, MY_COMPANY_ID, sizeof(data.id));
     g_administration.company_info = data;
-    strops_copy(g_administration.default_currency, administration_get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
+    strops::copy(g_administration.default_currency, administration_get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
 
     if (contact_changed_event_callback) contact_changed_event_callback(&data);
     if (data_changed_event_callback) data_changed_event_callback();
@@ -868,7 +868,7 @@ int administration_contact_get_autocompletions(contact* buffer, int buf_size, ch
     while (list_iterator_hasnext(&g_administration.contacts)) {
         contact c = *(contact *)list_iterator_next(&g_administration.contacts);
 
-        if (strops_stristr(c.name, name)) {
+        if (strops::contains(c.name, name)) {
             buffer[write_cursor++] = c;
             if (write_cursor >= buf_size) break;
         }
@@ -1455,7 +1455,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); // @leak
-    strops_copy(result.currency, administration_get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
+    strops::copy(result.currency, administration_get_default_currency_for_country(g_administration.company_info.address.country_code), MAX_LEN_CURRENCY);
     return result;
 }
 
@@ -1487,13 +1487,13 @@ static void administration_recalculate_invoice_totals(invoice* invoice)
 
 void administration_invoice_set_currency(invoice* invoice, char* currency)
 {
-    strops_copy(invoice->currency, currency, MAX_LEN_CURRENCY);
+    strops::copy(invoice->currency, currency, MAX_LEN_CURRENCY);
 
     list_iterator_start(&invoice->billing_items);
     while (list_iterator_hasnext(&invoice->billing_items)) {
         billing_item* c = (billing_item *)list_iterator_next(&invoice->billing_items);
 
-        strops_copy(c->currency, currency, MAX_LEN_CURRENCY);
+        strops::copy(c->currency, currency, MAX_LEN_CURRENCY);
     }
     list_iterator_stop(&invoice->billing_items);
 }
@@ -1617,10 +1617,10 @@ a_err administration_invoice_add(invoice* inv)
     inv->is_outgoing = strcmp(inv->supplier.id, MY_COMPANY_ID) == 0;
 
     inv->payment_means.payment_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));
-    strops_copy(inv->payment_means.payer_bank_account, inv->customer.bank_account,  sizeof(inv->payment_means.payer_bank_account));
+    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));
+    strops::copy(inv->payment_means.payer_bank_account, inv->customer.bank_account,  sizeof(inv->payment_means.payer_bank_account));
  
     invoice copy = administration_invoice_create_copy(inv); // Create copy to make copy of billing item list.
     invoice* new_inv = (invoice*)malloc(sizeof(invoice));
@@ -1952,7 +1952,7 @@ a_err administration_billing_item_add_to_invoice(invoice* invoice, billing_item
     
     memcpy(tb, &item, sizeof(billing_item));
     snprintf(tb->id, sizeof(tb->id), "B/%d", administration_create_id());
-    strops_copy(tb->currency, invoice->currency, MAX_LEN_CURRENCY); // Set billing item currency to invoice currency.
+    strops::copy(tb->currency, invoice->currency, MAX_LEN_CURRENCY); // Set billing item currency to invoice currency.
     
     administration_recalculate_billing_item_totals(tb);
     if (!list_append(&invoice->billing_items, tb)) {