pgrondek/polybar-dwm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

refactor(builder): Remove unused add_space parameter

Browse source 
the `node` and `node_repeat` were never called with the optional
parameter add_space. And its default value is false, so the
corresponding code was never used.

I think in general it is better to just have the user of those functions
call `builder::space` when they need to instead of adding more
complexity to the `node*` functions.
This commit is contained in:
patrick96 2019-12-11 21:38:21 +01:00 committed by Patrick Ziegler
parent fb6e874235
commit 37628f8691
2 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
include/components/builder.hpp
View file

@ -19,11 +19,11 @@ class builder {
void reset(); void reset();
string flush(); string flush();
void append(string text); void append(string text);
void node(string str, bool add_space = false); void node(string str);
void node(string str, int font_index, bool add_space = false); void node(string str, int font_index);
void node(const label_t& label, bool add_space = false); void node(const label_t& label);
void node_repeat(const string& str, size_t n, bool add_space = false); void node_repeat(const string& str, size_t n);
void node_repeat(const label_t& label, size_t n, bool add_space = false); void node_repeat(const label_t& label, size_t n);
void offset(int pixels = 0); void offset(int pixels = 0);
void space(size_t width); void space(size_t width);
void space(); void space();

22
src/components/builder.cpp
View file

@ -94,16 +94,12 @@ void builder::append(string text) {
* *
* This will also parse raw syntax tags * This will also parse raw syntax tags
*/ */
void builder::node(string str, bool add_space) { void builder::node(string str) {
if (str.empty()) { if (str.empty()) {
return; return;
} }
append(move(str)); append(move(str));
if (add_space) {
space();
}
} }
/** /**
@ -111,16 +107,16 @@ void builder::node(string str, bool add_space) {
* *
* \see builder::node * \see builder::node
*/ */
void builder::node(string str, int font_index, bool add_space) { void builder::node(string str, int font_index) {
font(font_index); font(font_index);
node(move(str), add_space); node(move(str));
font_close(); font_close();
} }
/** /**
* Insert tags for given label * Insert tags for given label
*/ */
void builder::node(const label_t& label, bool add_space) { void builder::node(const label_t& label) {
if (!label || !*label) { if (!label || !*label) {
return; return;
} }
@ -149,7 +145,7 @@ void builder::node(const label_t& label, bool add_space) {
space(label->m_padding.left); space(label->m_padding.left);
} }
node(text, label->m_font, add_space); node(text, label->m_font);
if (label->m_padding.right > 0) { if (label->m_padding.right > 0) {
space(label->m_padding.right); space(label->m_padding.right);
@ -177,19 +173,19 @@ void builder::node(const label_t& label, bool add_space) {
/** /**
* Repeat text string n times * Repeat text string n times
*/ */
void builder::node_repeat(const string& str, size_t n, bool add_space) { void builder::node_repeat(const string& str, size_t n) {
string text; string text;
text.reserve(str.size() * n); text.reserve(str.size() * n);
while (n--) { while (n--) {
text += str; text += str;
} }
node(text, add_space); node(text);
} }
/** /**
* Repeat label contents n times * Repeat label contents n times
*/ */
void builder::node_repeat(const label_t& label, size_t n, bool add_space) { void builder::node_repeat(const label_t& label, size_t n) {
string text; string text;
string label_text{label->get()}; string label_text{label->get()};
text.reserve(label_text.size() * n); text.reserve(label_text.size() * n);
@ -198,7 +194,7 @@ void builder::node_repeat(const label_t& label, size_t n, bool add_space) {
} }
label_t tmp{new label_t::element_type{text}}; label_t tmp{new label_t::element_type{text}};
tmp->replace_defined_values(label); tmp->replace_defined_values(label);
node(tmp, add_space); node(tmp);
} }
/** /**