pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-07-03 14:23:11 +02:00
Code Activity

Merge branch '2.0' into 2.1.

Browse Source
This commit is contained in:
Sadie Powell
2021-08-01 18:53:24 +01:00
parent 376053e0ac 91321bdf68
commit 561b205c4a
50 changed files with 176 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/misc.cpp
+7 -7
View File
@@ -143,22 +143,22 @@ bool ListFormatter::IsEmpty() const
void ListFormatter::Process(std::vector<Anope::string> &buffer)
{
std::vector<Anope::string> tcolumns;
std::map<Anope::string, size_t> lenghts;
std::map<Anope::string, size_t> lengths;
std::set<Anope::string> breaks;
for (unsigned i = 0; i < this->columns.size(); ++i)
{
tcolumns.push_back(Language::Translate(this->nc, this->columns[i].c_str()));
lenghts[this->columns[i]] = tcolumns[i].length();
lengths[this->columns[i]] = tcolumns[i].length();
}
for (unsigned i = 0; i < this->entries.size(); ++i)
{
ListEntry &e = this->entries[i];
for (unsigned j = 0; j < this->columns.size(); ++j)
if (e[this->columns[j]].length() > lenghts[this->columns[j]])
lenghts[this->columns[j]] = e[this->columns[j]].length();
if (e[this->columns[j]].length() > lengths[this->columns[j]])
lengths[this->columns[j]] = e[this->columns[j]].length();
}
unsigned length = 0;
for (std::map<Anope::string, size_t>::iterator it = lenghts.begin(), it_end = lenghts.end(); it != it_end; ++it)
for (std::map<Anope::string, size_t>::iterator it = lengths.begin(), it_end = lengths.end(); it != it_end; ++it)
{
/* Break lines at 80 chars */
if (length > 80)
@@ -185,7 +185,7 @@ void ListFormatter::Process(std::vector<Anope::string> &buffer)
s += " ";
s += tcolumns[i];
if (i + 1 != this->columns.size())
for (unsigned j = tcolumns[i].length(); j < lenghts[this->columns[i]]; ++j)
for (unsigned j = tcolumns[i].length(); j < lengths[this->columns[i]]; ++j)
s += " ";
}
buffer.push_back(s);
@@ -207,7 +207,7 @@ void ListFormatter::Process(std::vector<Anope::string> &buffer)
s += " ";
s += e[this->columns[j]];
if (j + 1 != this->columns.size())
for (unsigned k = e[this->columns[j]].length(); k < lenghts[this->columns[j]]; ++k)
for (unsigned k = e[this->columns[j]].length(); k < lengths[this->columns[j]]; ++k)
s += " ";
}
buffer.push_back(s);