From b754790642a49d9379d08e9e03ee22e417e12eda Mon Sep 17 00:00:00 2001 From: dvermd <315743+dvermd@users.noreply.github.com> Date: Thu, 6 Jul 2023 09:46:33 +0200 Subject: [PATCH] Cleanup base::tags (#2991) --- include/modules/meta/base.hpp | 1 - src/modules/meta/base.cpp | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/include/modules/meta/base.hpp b/include/modules/meta/base.hpp index 91dacc97..80e41a2f 100644 --- a/include/modules/meta/base.hpp +++ b/include/modules/meta/base.hpp @@ -59,7 +59,6 @@ namespace modules { struct module_format { string value{}; - vector tags{}; label_t prefix{}; label_t suffix{}; rgba fg{}; diff --git a/src/modules/meta/base.cpp b/src/modules/meta/base.cpp index db5d8447..80c07e33 100644 --- a/src/modules/meta/base.cpp +++ b/src/modules/meta/base.cpp @@ -104,7 +104,6 @@ namespace modules { format->margin = m_conf.get(m_modname, name + "-margin", formatdef("margin", format->margin)); format->offset = m_conf.get(m_modname, name + "-offset", formatdef("offset", format->offset)); format->font = m_conf.get(m_modname, name + "-font", formatdef("font", format->font)); - format->tags.swap(tags); try { format->prefix = load_label(m_conf, m_modname, name + "-prefix"); @@ -119,8 +118,8 @@ namespace modules { } vector tag_collection; - tag_collection.reserve(format->tags.size() + whitelist.size()); - tag_collection.insert(tag_collection.end(), format->tags.begin(), format->tags.end()); + tag_collection.reserve(tags.size() + whitelist.size()); + tag_collection.insert(tag_collection.end(), tags.begin(), tags.end()); tag_collection.insert(tag_collection.end(), whitelist.begin(), whitelist.end()); size_t start, end;