From 5667f1637e36958a4490c9e1f524d33f4d0e2493 Mon Sep 17 00:00:00 2001 From: Ruben Dahl Date: Sun, 30 Jul 2023 20:47:57 +0200 Subject: [PATCH] Reverted changes in colors.{cc,h} `static x(const std::string& input)` caused errors, so it had to be reverted. --- src/colors.cc | 70 +++++++++++++++++++++++++-------------------------- src/colors.h | 70 +++++++++++++++++++++++++-------------------------- 2 files changed, 70 insertions(+), 70 deletions(-) diff --git a/src/colors.cc b/src/colors.cc index d150dfe..216fd52 100644 --- a/src/colors.cc +++ b/src/colors.cc @@ -1,107 +1,107 @@ #include "colors.h" -static std::string black(const std::string& input) { +std::string black(std::string input) { return "\x1b[30m" + input + "\x1b[0m"; } -static std::string red(const std::string& input) { +std::string red(std::string input) { return "\x1b[31m" + input + "\x1b[0m"; } -static std::string green(const std::string& input) { +std::string green(std::string input) { return "\x1b[32m" + input + "\x1b[0m"; } -static std::string yellow(const std::string& input) { +std::string yellow(std::string input) { return "\x1b[33m" + input + "\x1b[0m"; } -static std::string blue(const std::string& input) { +std::string blue(std::string input) { return "\x1b[34m" + input + "\x1b[0m"; } -static std::string magenta(const std::string& input) { +std::string magenta(std::string input) { return "\x1b[35m" + input + "\x1b[0m"; } -static std::string cyan(const std::string& input) { +std::string cyan(std::string input) { return "\x1b[36m" + input + "\x1b[0m"; } -static std::string white(const std::string& input) { +std::string white(std::string input) { return "\x1b[37m" + input + "\x1b[0m"; } -static std::string bright_black(const std::string& input) { +std::string bright_black(std::string input) { return "\x1b[90m" + input + "\x1b[0m"; } -static std::string bright_red(const std::string& input) { +std::string bright_red(std::string input) { return "\x1b[91m" + input + "\x1b[0m"; } -static std::string bright_green(const std::string& input) { +std::string bright_green(std::string input) { return "\x1b[92m" + input + "\x1b[0m"; } -static std::string bright_yellow(const std::string& input) { +std::string bright_yellow(std::string input) { return "\x1b[93m" + input + "\x1b[0m"; } -static std::string bright_blue(const std::string& input) { +std::string bright_blue(std::string input) { return "\x1b[94m" + input + "\x1b[0m"; } -static std::string bright_magenta(const std::string& input) { +std::string bright_magenta(std::string input) { return "\x1b[95m" + input + "\x1b[0m"; } -static std::string bright_cyan(const std::string& input) { +std::string bright_cyan(std::string input) { return "\x1b[96m" + input + "\x1b[0m"; } -static std::string bright_white(const std::string& input) { +std::string bright_white(std::string input) { return "\x1b[97m" + input + "\x1b[0m"; } -static std::string bg_black(const std::string& input) { +std::string bg_black(std::string input) { return "\x1b[40m" + input + "\x1b[0m"; } -static std::string bg_red(const std::string& input) { +std::string bg_red(std::string input) { return "\x1b[41m" + input + "\x1b[0m"; } -static std::string bg_green(const std::string& input) { +std::string bg_green(std::string input) { return "\x1b[42m" + input + "\x1b[0m"; } -static std::string bg_yellow(const std::string& input) { +std::string bg_yellow(std::string input) { return "\x1b[43m" + input + "\x1b[0m"; } -static std::string bg_blue(const std::string& input) { +std::string bg_blue(std::string input) { return "\x1b[44m" + input + "\x1b[0m"; } -static std::string bg_magenta(const std::string& input) { +std::string bg_magenta(std::string input) { return "\x1b[45m" + input + "\x1b[0m"; } -static std::string bg_cyan(const std::string& input) { +std::string bg_cyan(std::string input) { return "\x1b[46m" + input + "\x1b[0m"; } -static std::string bg_white(const std::string& input) { +std::string bg_white(std::string input) { return "\x1b[47m" + input + "\x1b[0m"; } -static std::string bg_bright_black(const std::string& input) { +std::string bg_bright_black(std::string input) { return "\x1b[100m" + input + "\x1b[0m"; } -static std::string bg_bright_red(const std::string& input) { +std::string bg_bright_red(std::string input) { return "\x1b[101m" + input + "\x1b[0m"; } -static std::string bg_bright_green(const std::string& input) { +std::string bg_bright_green(std::string input) { return "\x1b[102m" + input + "\x1b[0m"; } -static std::string bg_bright_yellow(const std::string& input) { +std::string bg_bright_yellow(std::string input) { return "\x1b[103m" + input + "\x1b[0m"; } -static std::string bg_bright_blue(const std::string& input) { +std::string bg_bright_blue(std::string input) { return "\x1b[104m" + input + "\x1b[0m"; } -static std::string bg_bright_magenta(const std::string& input) { +std::string bg_bright_magenta(std::string input) { return "\x1b[105m" + input + "\x1b[0m"; } -static std::string bg_bright_cyan(const std::string& input) { +std::string bg_bright_cyan(std::string input) { return "\x1b[106m" + input + "\x1b[0m"; } -static std::string bg_bright_white(const std::string& input) { +std::string bg_bright_white(std::string input) { return "\x1b[107m" + input + "\x1b[0m"; } -static std::string bold(const std::string& input) { +std::string bold(std::string input) { return "\x1b[1m" + input + "\x1b[0m"; } -static std::string underline(const std::string& input) { +std::string underline(std::string input) { return "\x1b[4m" + input + "\x1b[0m"; } -static std::string reverse(const std::string& input) { +std::string reverse(std::string input) { return "\x1b[7m" + input + "\x1b[0m"; } diff --git a/src/colors.h b/src/colors.h index a7afa62..4a68252 100644 --- a/src/colors.h +++ b/src/colors.h @@ -2,38 +2,38 @@ #include -static std::string black(const std::string& input); -static std::string red(const std::string& input); -static std::string green(const std::string& input); -static std::string yellow(const std::string& input); -static std::string blue(const std::string& input); -static std::string magenta(const std::string& input); -static std::string cyan(const std::string& input); -static std::string white(const std::string& input); -static std::string bright_black(const std::string& input); -static std::string bright_red(const std::string& input); -static std::string bright_green(const std::string& input); -static std::string bright_yellow(const std::string& input); -static std::string bright_blue(const std::string& input); -static std::string bright_magenta(const std::string& input); -static std::string bright_cyan(const std::string& input); -static std::string bright_white(const std::string& input); -static std::string bg_black(const std::string& input); -static std::string bg_red(const std::string& input); -static std::string bg_green(const std::string& input); -static std::string bg_yellow(const std::string& input); -static std::string bg_blue(const std::string& input); -static std::string bg_magenta(const std::string& input); -static std::string bg_cyan(const std::string& input); -static std::string bg_white(const std::string& input); -static std::string bg_bright_black(const std::string& input); -static std::string bg_bright_red(const std::string& input); -static std::string bg_bright_green(const std::string& input); -static std::string bg_bright_yellow(const std::string& input); -static std::string bg_bright_blue(const std::string& input); -static std::string bg_bright_magenta(const std::string& input); -static std::string bg_bright_cyan(const std::string& input); -static std::string bg_bright_white(const std::string& input); -static std::string bold(const std::string&& input); -static std::string underline(const std::string& input); -static std::string reverse(const std::string& input); +std::string black(std::string input); +std::string red(std::string input); +std::string green(std::string input); +std::string yellow(std::string input); +std::string blue(std::string input); +std::string magenta(std::string input); +std::string cyan(std::string input); +std::string white(std::string input); +std::string bright_black(std::string input); +std::string bright_red(std::string input); +std::string bright_green(std::string input); +std::string bright_yellow(std::string input); +std::string bright_blue(std::string input); +std::string bright_magenta(std::string input); +std::string bright_cyan(std::string input); +std::string bright_white(std::string input); +std::string bg_black(std::string input); +std::string bg_red(std::string input); +std::string bg_green(std::string input); +std::string bg_yellow(std::string input); +std::string bg_blue(std::string input); +std::string bg_magenta(std::string input); +std::string bg_cyan(std::string input); +std::string bg_white(std::string input); +std::string bg_bright_black(std::string input); +std::string bg_bright_red(std::string input); +std::string bg_bright_green(std::string input); +std::string bg_bright_yellow(std::string input); +std::string bg_bright_blue(std::string input); +std::string bg_bright_magenta(std::string input); +std::string bg_bright_cyan(std::string input); +std::string bg_bright_white(std::string input); +std::string bold(std::string input); +std::string underline(std::string input); +std::string reverse(std::string input);