Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 04:37:48 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Another variable renaming

Browse source
This commit is contained in:
Dale Glass 2020-06-03 21:41:40 +02:00
parent 45f1640b5a
commit 172ae45420
1 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
domain-server/src/DomainServerExporter.cpp
View file

@ -294,35 +294,35 @@ bool DomainServerExporter::handleHTTPRequest(HTTPConnection* connection, const Q
QString DomainServerExporter::escapeName(const QString& name) { QString DomainServerExporter::escapeName(const QString& name) {
QRegularExpression invalidCharacters("[^A-Za-z0-9_]"); QRegularExpression invalidCharacters("[^A-Za-z0-9_]");
QString ret = name; QString result = name;
// If a key is named something like: "6. threads", turn it into just "threads" // If a key is named something like: "6. threads", turn it into just "threads"
ret.replace(QRegularExpression("^\\d+\\. "), ""); result.replace(QRegularExpression("^\\d+\\. "), "");
ret.replace(QRegularExpression("^\\d+_"), ""); result.replace(QRegularExpression("^\\d+_"), "");
// If a key is named something like "z_listeners", turn it into just "listeners" // If a key is named something like "z_listeners", turn it into just "listeners"
ret.replace(QRegularExpression("^z_"), ""); result.replace(QRegularExpression("^z_"), "");
// If a key is named something like "lost%", change it to "lost_percent_". // If a key is named something like "lost%", change it to "lost_percent_".
// redundant underscores will be removed below. // redundant underscores will be removed below.
ret.replace(QRegularExpression("%"), "_percent_"); result.replace(QRegularExpression("%"), "_percent_");
// change mixedCaseNames to mixed_case_names // change mixedCaseNames to mixed_case_names
ret.replace(QRegularExpression("([a-z])([A-Z])"), "\\1_\\2"); result.replace(QRegularExpression("([a-z])([A-Z])"), "\\1_\\2");
// Replace all invalid characters with a _ // Replace all invalid characters with a _
ret.replace(invalidCharacters, "_"); result.replace(invalidCharacters, "_");
// Remove any "_" characters at the beginning or end // Remove any "_" characters at the beginning or end
ret.replace(QRegularExpression("^_+"), ""); result.replace(QRegularExpression("^_+"), "");
ret.replace(QRegularExpression("_+$"), ""); result.replace(QRegularExpression("_+$"), "");
// Replace any duplicated _ characters with a single one // Replace any duplicated _ characters with a single one
ret.replace(QRegularExpression("_+"), "_"); result.replace(QRegularExpression("_+"), "_");
ret = ret.toLower(); result = result.toLower();
return ret; return result;
} }
void DomainServerExporter::generateMetricsForNode(QTextStream& stream, const SharedNodePointer& node) { void DomainServerExporter::generateMetricsForNode(QTextStream& stream, const SharedNodePointer& node) {