14 files changed, 28 insertions, 28 deletions
diff --git a/include/mycss/selectors/function.h b/include/mycss/selectors/function.h
index 7f73f05..7b2d4d3 100644
--- a/include/mycss/selectors/function.h
+++ b/include/mycss/selectors/function.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
diff --git a/include/mycss/selectors/function_parser.h b/include/mycss/selectors/function_parser.h
index f619dd3..2a7e690 100644
--- a/include/mycss/selectors/function_parser.h
+++ b/include/mycss/selectors/function_parser.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
diff --git a/include/mycss/selectors/function_resource.h b/include/mycss/selectors/function_resource.h
index a3a369e..67c48ac 100644
--- a/include/mycss/selectors/function_resource.h
+++ b/include/mycss/selectors/function_resource.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
diff --git a/include/mycss/selectors/init.h b/include/mycss/selectors/init.h
index 0004125..a2f6f21 100644
--- a/include/mycss/selectors/init.h
+++ b/include/mycss/selectors/init.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
@@ -31,9 +31,9 @@ extern "C" {
 #include <mycss/selectors/list.h>
 
 mycss_selectors_t * mycss_selectors_create(void);
-mycss_status_t mycss_selectors_init(mycss_entry_t* entry, mycss_selectors_t* selectors);
+mystatus_t mycss_selectors_init(mycss_entry_t* entry, mycss_selectors_t* selectors);
 void mycss_selectors_clean(mycss_selectors_t* selectors);
-mycss_status_t mycss_selectors_clean_all(mycss_selectors_t* selectors);
+mystatus_t mycss_selectors_clean_all(mycss_selectors_t* selectors);
 mycss_selectors_t * mycss_selectors_destroy(mycss_selectors_t* selectors, bool self_destroy);
 
 void mycss_selectors_entry_clean(mycss_selectors_entry_t* sel_entry);
@@ -41,8 +41,8 @@ mycss_selectors_entry_t * mycss_selectors_entry_destroy(mycss_selectors_t* selec
 
 void * mycss_selectors_entry_value_destroy(mycss_entry_t* entry, mycss_selectors_entry_t* selector_entry, bool destroy_self);
 
-mycss_selectors_list_t * mycss_selectors_parse(mycss_selectors_t* selectors, myhtml_encoding_t encoding, const char* data, size_t data_size, mycss_status_t* out_status);
-mycss_selectors_list_t * mycss_selectors_parse_by_function(mycss_selectors_t* selectors, mycss_parser_token_f func, myhtml_encoding_t encoding, const char* data, size_t data_size, mycss_status_t* out_status);
+mycss_selectors_list_t * mycss_selectors_parse(mycss_selectors_t* selectors, myencoding_t encoding, const char* data, size_t data_size, mystatus_t* out_status);
+mycss_selectors_list_t * mycss_selectors_parse_by_function(mycss_selectors_t* selectors, mycss_parser_token_f func, myencoding_t encoding, const char* data, size_t data_size, mystatus_t* out_status);
 
 mycss_selectors_entry_t * mycss_selectors_entry_find_first(mycss_selectors_entry_t* selector);
 
diff --git a/include/mycss/selectors/list.h b/include/mycss/selectors/list.h
index 1320494..a46d519 100644
--- a/include/mycss/selectors/list.h
+++ b/include/mycss/selectors/list.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
diff --git a/include/mycss/selectors/myosi.h b/include/mycss/selectors/myosi.h
index a255e75..525bf00 100644
--- a/include/mycss/selectors/myosi.h
+++ b/include/mycss/selectors/myosi.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
@@ -36,7 +36,7 @@ typedef struct mycss_selectors_specificity mycss_selectors_specificity_t;
 #include <mycss/mystring.h>
 #include <mycss/namespace/myosi.h>
 #include <mycss/declaration/myosi.h>
-#include <myhtml/utils/mcobject.h>
+#include <mycore/utils/mcobject.h>
 
 typedef bool (*mycss_selectors_state_f)(mycss_entry_t* entry, mycss_selectors_t* selectors, mycss_selectors_entry_t* selector, mycss_token_t* token);
 typedef void (*mycss_callback_selector_done_f)(mycss_selectors_t* selectors, mycss_selectors_entry_t* selector);
@@ -218,7 +218,7 @@ struct mycss_selectors_entry {
     
     mycss_namespace_entry_t* ns_entry;
     
-    myhtml_string_t* key;
+    mycore_string_t* key;
     void* value;
     
     mycss_selectors_combinator_t combinator;
diff --git a/include/mycss/selectors/myosi_resource.h b/include/mycss/selectors/myosi_resource.h
index 70a0b6a..21baa67 100644
--- a/include/mycss/selectors/myosi_resource.h
+++ b/include/mycss/selectors/myosi_resource.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
diff --git a/include/mycss/selectors/parser.h b/include/mycss/selectors/parser.h
index f8be137..6eab0e9 100644
--- a/include/mycss/selectors/parser.h
+++ b/include/mycss/selectors/parser.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
diff --git a/include/mycss/selectors/pseudo.h b/include/mycss/selectors/pseudo.h
index 470ba8d..c16fb0d 100644
--- a/include/mycss/selectors/pseudo.h
+++ b/include/mycss/selectors/pseudo.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
diff --git a/include/mycss/selectors/pseudo_resource.h b/include/mycss/selectors/pseudo_resource.h
index 4bb9994..9a8ce37 100644
--- a/include/mycss/selectors/pseudo_resource.h
+++ b/include/mycss/selectors/pseudo_resource.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
diff --git a/include/mycss/selectors/serialization.h b/include/mycss/selectors/serialization.h
index e2038d5..c0bd64e 100644
--- a/include/mycss/selectors/serialization.h
+++ b/include/mycss/selectors/serialization.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
@@ -30,9 +30,9 @@ extern "C" {
 #include <mycss/namespace/serialization.h>
 #include <mycss/declaration/serialization.h>
 
-void mycss_selectors_serialization_chain(mycss_selectors_t* selectors, mycss_selectors_entry_t* selector, mycss_callback_serialization_f callback, void* context);
-bool mycss_selectors_serialization_list(mycss_selectors_t* selectors, mycss_selectors_list_t* selectors_list, mycss_callback_serialization_f callback, void* context);
-bool mycss_selectors_serialization_selector(mycss_selectors_t* selectors, mycss_selectors_entry_t* selector, mycss_callback_serialization_f callback, void* context);
+void mycss_selectors_serialization_chain(mycss_selectors_t* selectors, mycss_selectors_entry_t* selector, mycore_callback_serialize_f callback, void* context);
+bool mycss_selectors_serialization_list(mycss_selectors_t* selectors, mycss_selectors_list_t* selectors_list, mycore_callback_serialize_f callback, void* context);
+bool mycss_selectors_serialization_selector(mycss_selectors_t* selectors, mycss_selectors_entry_t* selector, mycore_callback_serialize_f callback, void* context);
 
 #ifdef __cplusplus
 } /* extern "C" */
diff --git a/include/mycss/selectors/state.h b/include/mycss/selectors/state.h
index 5753e7a..62f7fc8 100644
--- a/include/mycss/selectors/state.h
+++ b/include/mycss/selectors/state.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
@@ -29,7 +29,7 @@ extern "C" {
 #include <mycss/entry.h>
 #include <mycss/selectors/myosi.h>
 #include <mycss/selectors/parser.h>
-#include <myhtml/utils.h>
+#include <mycore/utils.h>
 
 void mycss_selectors_state_end(mycss_entry_t* entry);
 bool mycss_selectors_state_function_skip_all(mycss_entry_t* entry, mycss_token_t* token, bool last_response);
diff --git a/include/mycss/selectors/value.h b/include/mycss/selectors/value.h
index 35c93cc..f7db204 100644
--- a/include/mycss/selectors/value.h
+++ b/include/mycss/selectors/value.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
@@ -23,7 +23,7 @@
 #pragma once
 
 #define mycss_selector_value_attribute(obj) ((mycss_selectors_object_attribute_t*)(obj))
-#define mycss_selector_value_string(obj) ((myhtml_string_t*)(obj))
+#define mycss_selector_value_string(obj) ((mycore_string_t*)(obj))
 #define mycss_selector_value_an_plus_b(obj) ((mycss_an_plus_b_entry_t*)(obj))
 #define mycss_selector_value_drop(obj) ((mycss_selectors_function_drop_type_t)(obj))
 #define mycss_selector_value_lang(obj) ((mycss_selectors_value_lang_t*)(obj))
@@ -36,13 +36,13 @@ extern "C" {
 
 #include <mycss/entry.h>
 #include <mycss/selectors/myosi.h>
-#include <myhtml/utils/mchar_async.h>
+#include <mycore/utils/mchar_async.h>
 
 typedef void * (*mycss_selectors_value_destroy_f)(mycss_entry_t* entry, mycss_selectors_type_t type, int sub_type, void* value, bool self_destroy);
 typedef void * (*mycss_selectors_value_function_destroy_f)(mycss_entry_t* entry, void* value, bool self_destroy);
 
 struct mycss_selectors_value_attribute {
-    myhtml_string_t* value;
+    mycore_string_t* value;
     
     mycss_selectors_match_t match;
     mycss_selectors_mod_t mod;
@@ -50,7 +50,7 @@ struct mycss_selectors_value_attribute {
 typedef mycss_selectors_object_attribute_t;
 
 struct mycss_selectors_value_lang {
-    myhtml_string_t str;
+    mycore_string_t str;
     struct mycss_selectors_value_lang* next;
 }
 typedef mycss_selectors_value_lang_t;
diff --git a/include/mycss/selectors/value_resource.h b/include/mycss/selectors/value_resource.h
index f40fdb0..7bbc06d 100644
--- a/include/mycss/selectors/value_resource.h
+++ b/include/mycss/selectors/value_resource.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