Merge branch 'master' into coverity_scancoverity_scan

1 files changed, 13 insertions, 12 deletions

diff --git a/source/mycss/mystring.h b/source/mycss/mystring.h
index 883b080..63a5d85 100644
--- a/source/mycss/mystring.h
+++ b/source/mycss/mystring.h
@@ -1,5 +1,5 @@
 /*
- Copyright (C) 2016 Alexander Borisov
+ Copyright (C) 2016-2017 Alexander Borisov
  
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public
@@ -27,9 +27,10 @@ extern "C" {
 #endif
 
 #include "mycss/myosi.h"
-#include "myhtml/incoming.h"
-#include "myhtml/mystring.h"
-
+#include "mycore/incoming.h"
+#include "mycore/mystring.h"
+#include "myencoding/encoding.h"
+    
 enum mycss_string_process_state {
     MyCSS_STRING_PROCESS_STATE_DATA       = 0x00,
     MyCSS_STRING_PROCESS_STATE_ESCAPED    = 0x01,
@@ -46,18 +47,18 @@ struct mycss_string_res {
     mycss_string_escaped_res_t escaped;
     mycss_string_process_state_t state;
     
-    myhtml_encoding_t encoding;
-    myhtml_encoding_result_t encoding_res;
+    myencoding_t encoding;
+    myencoding_result_t encoding_res;
     bool case_insensitive;
 };
 
-size_t mycss_string_data_process(myhtml_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
-void mycss_string_data_process_end(myhtml_string_t* str, mycss_string_res_t *out_res);
+size_t mycss_string_data_process(mycore_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
+void mycss_string_data_process_end(mycore_string_t* str, mycss_string_res_t *out_res);
 
-size_t mycss_string_process_state_data(myhtml_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
-size_t mycss_string_process_state_data_utf_8(myhtml_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
-size_t mycss_string_process_state_escaped(myhtml_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
-size_t mycss_string_process_state_escaped_utf_8(myhtml_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
+size_t mycss_string_process_state_data(mycore_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
+size_t mycss_string_process_state_data_utf_8(mycore_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
+size_t mycss_string_process_state_escaped(mycore_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
+size_t mycss_string_process_state_escaped_utf_8(mycore_string_t* str, const char* data, size_t length, size_t size, mycss_string_res_t *out_res);
 
 void mycss_string_res_clean(mycss_string_res_t* res);
 void mycss_string_escaped_res_clean(mycss_string_escaped_res_t* res);