Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

logging: Fix {anonymous} class name.

Browse Source 
If the __PRETTY_FUNCTION__ macro yields {anonymous} as the class name,
use the method name as the tag.
This commit is contained in:
Jim Broadus 2021-05-02 23:03:02 -07:00 committed by John Maguire
parent 708385c71f
commit 9a337a9efc
1 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ext/libclementine-common/core/logging.cpp
View File

@ -198,25 +198,30 @@ void SetLevels(const QString& levels) {
} }
} }
static QString ExtractFunctionName(const QString& pretty_function) {
// https://gcc.gnu.org/onlinedocs/gcc/Function-Names.html
// For example "void a::sub(int)", this returns "a::sub".
const int end = pretty_function.indexOf('(');
// If end is -1, then this will search from end of the string.
const int start = pretty_function.lastIndexOf(' ', end) + 1;
return pretty_function.mid(start, end == -1 ? -1 : end - start);
}
static QString ParsePrettyFunction(const char* pretty_function) { static QString ParsePrettyFunction(const char* pretty_function) {
// Get the class name out of the function name. // Get the class name out of the function name.
QString class_name = pretty_function; const QString name = ExtractFunctionName(pretty_function);
const int paren = class_name.indexOf('(');
if (paren != -1) { const int colons = name.lastIndexOf("::");
const int colons = class_name.lastIndexOf("::", paren);
if (colons != -1) { if (colons != -1) {
class_name = class_name.left(colons); if (!name.startsWith("{anonymous}")) {
return name.left(colons);
} else { } else {
class_name = class_name.left(paren); return name.mid(colons + 2);
} }
} else {
return name;
} }
const int space = class_name.lastIndexOf(' ');
if (space != -1) {
class_name = class_name.mid(space + 1);
}
return class_name;
} }
template <class T> template <class T>