2 files changed, 34 insertions, 26 deletions
diff --git a/include/log.hpp b/include/logger.hpp
index bff3d05..b191ecb 100644
--- a/include/log.hpp
+++ b/include/logger.hpp
@@ -21,22 +21,26 @@
 #include "config.hpp"
 #include "administration.hpp"
 
-#define MAX_LEN_LOG_HISTORY 256
-#define MAX_LEN_LOG_TXT     128
-
-typedef struct {
-    u32 write_cursor;
-    u32 history_length;
-    char history[MAX_LEN_LOG_HISTORY][MAX_LEN_LOG_TXT];
-    ImVec4 colors[MAX_LEN_LOG_HISTORY];
-} program_log;
-
 #define STOPWATCH_START tick_t timestamp_start = timer_current();
 #define STOPWATCH_TIME  (timer_elapsed(timestamp_start)*1000.0f)
 
-program_log* get_log();
+namespace logger {
+
+    static const u32 MAX_LEN_LOG_HISTORY = 256;
+    static const u32 MAX_LEN_LOG_TXT     = 128;
+
+    typedef struct {
+        u32 write_cursor;
+        u32 history_length;
+        char history[MAX_LEN_LOG_HISTORY][MAX_LEN_LOG_TXT];
+        ImVec4 colors[MAX_LEN_LOG_HISTORY];
+    } program_log;
+
+    program_log* get();
+
+    void clear();
+    void aerr(a_err errors);
+    void info(const char* fmt, ...) IM_FMTARGS(2);
+    void error(const char* fmt, ...) IM_FMTARGS(2);
 
-void log_clear();
-void log_aerr(a_err errors);
-void log_info(const char* fmt, ...) IM_FMTARGS(2);
-void log_error(const char* fmt, ...) IM_FMTARGS(2);
-\ No newline at end of file
+}
+\ No newline at end of file
diff --git a/include/strops.hpp b/include/strops.hpp
index d11f0c2..ec3dcdd 100644
--- a/include/strops.hpp
+++ b/include/strops.hpp
@@ -18,14 +18,18 @@
 
 #include <stdint.h>
 
-size_t  strops_copy(char *dst, const char *src, size_t size);
-char*   strops_stristr(char* a, char* b);
-void    strops_replace(char *buf, size_t buf_size, const char *search, const char *replace);
-void    strops_replace_int32(char *buf, size_t buf_size, const char *search, int32_t number);
-void    strops_replace_int64(char *buf, size_t buf_size, const char *search, int64_t number);
-void    strops_replace_float(char *buf, size_t buf_size, const char *search, float number, int decimals);
-bool    strops_prefix(const char *pre, const char *str);
-char*   strops_get_json_value(const char *json, const char *key, char *out, size_t out_size, int nth = 0);
-char*   strops_get_filename(const char* path);
-char*   strops_prep_str_for_json(const char *input, size_t buffer_size);
-char*   strops_unprep_str_from_json(char *input);
-\ No newline at end of file
+namespace strops {
+
+    size_t  copy(char *dst, const char *src, size_t size);
+    char*   contains(char* a, char* b);
+    void    replace(char *buf, size_t buf_size, const char *search, const char *replace);
+    void    replace_int32(char *buf, size_t buf_size, const char *search, int32_t number);
+    void    replace_int64(char *buf, size_t buf_size, const char *search, int64_t number);
+    void    replace_float(char *buf, size_t buf_size, const char *search, float number, int decimals);
+    bool    prefix(const char *pre, const char *str);
+    char*   get_json_value(const char *json, const char *key, char *out, size_t out_size, int nth = 0);
+    char*   get_filename(const char* path);
+    char*   prep_str_for_json(const char *input, size_t buffer_size);
+    char*   unprep_str_from_json(char *input);
+
+}
+\ No newline at end of file