diff -r a569148841ff -r efbd59642577 dav/tags.h
--- a/dav/tags.h	Sun Apr 16 14:12:24 2023 +0200
+++ b/dav/tags.h	Fri Apr 21 21:25:32 2023 +0200
@@ -29,9 +29,9 @@
 #ifndef TAGS_H
 #define TAGS_H
 
-#include <ucx/string.h>
-#include <ucx/buffer.h>
-#include <ucx/list.h>
+#include <cx/string.h>
+#include <cx/buffer.h>
+#include <cx/list.h>
 
 #include <libidav/webdav.h>
 
@@ -65,44 +65,48 @@
 struct SyncTagFilter {
     int scope;
     int mode;
-    UcxList* tags;
+    CxList* tags;
     size_t subfilter_count;
     SyncTagFilter** subfilters;
 };
 
 void free_dav_tag(DavTag* tag);
 
-void free_taglist(UcxList *list);
+void free_taglist(CxList *list);
 
 int compare_tagname(DavTag* left, DavTag* right, void* ignorecase);
 
-UcxList* parse_text_taglist(const char *buf, size_t length);
-UcxBuffer* create_text_taglist(UcxList *tags);
+CxMap* taglist2map(CxList *tags);
 
-UcxList* parse_csv_taglist(const char *buf, size_t length);
-UcxBuffer* create_csv_taglist(UcxList *tags);
+CxList* parse_text_taglist(const char *buf, size_t length);
+CxBuffer* create_text_taglist(CxList *tags);
+
+CxList* parse_csv_taglist(const char *buf, size_t length);
+CxBuffer* create_csv_taglist(CxList *tags);
 
-UcxList* parse_dav_xml_taglist(DavXmlNode *taglistnode);
-DavXmlNode* create_xml_taglist(UcxList *tags);
+CxList* parse_dav_xml_taglist(DavXmlNode *taglistnode);
+DavXmlNode* create_xml_taglist(CxList *tags);
+
+CxList* parse_macos_taglist(const char *buf, size_t length);
+CxBuffer* create_macos_taglist(CxList *tags);
 
-UcxList* parse_macos_taglist(const char *buf, size_t length);
-UcxBuffer* create_macos_taglist(UcxList *tags);
+int compare_taglists(CxList *tags1, CxList *tags2);
 
-char* create_tags_hash(UcxList *tags);
+char* create_tags_hash(CxList *tags);
 
-UcxList* merge_tags(UcxList *tags1, UcxList *tags2);
+CxList* merge_tags(CxList *tags1, CxList *tags2);
 
 /*
  * Adds tag colors from the colored list to taglist if tags have the same name
  */
-void add_tag_colors(UcxList *taglist, UcxList *colored);
+void add_tag_colors(CxList *taglist, CxList *colored);
 
 /* ----------- ----------- tag filter  ---------------------- */
 
 SyncTagFilter* parse_tagfilter_string(const char* filterstring, int scope);
 void free_tagfilter(SyncTagFilter* filter);
 
-int matches_tagfilter(UcxList *dav_tags, SyncTagFilter *tagfilter);
+int matches_tagfilter(CxList *dav_tags, SyncTagFilter *tagfilter);
 
 #ifdef __cplusplus
 }