lint and avoid copy

This commit is contained in:
Nicolas Werner 2023-02-02 01:26:42 +01:00
parent a320fc6f7a
commit 0ab566dc4b
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 44 additions and 43 deletions

View file

@ -25,8 +25,7 @@ constexpr auto LABEL_MEDIUM_SIZE_RATIO = 1.3;
namespace strings {
const QString url_html = QStringLiteral("<a href=\"\\1\">\\1</a>");
const QRegularExpression
url_regex(
const QRegularExpression url_regex(
// match an unquoted URL
[]() {
const auto general_unicode = QStringLiteral(
@ -34,8 +33,8 @@ const QRegularExpression
const auto protocol = QStringLiteral(R"((?:[Hh][Tt][Tt][Pp][Ss]?))");
const auto unreserved_subdelims_colon = QStringLiteral(R"([a-zA-Z0-9\-._~!$&'()*+,;=:])");
const auto pct_enc = QStringLiteral(R"((?:%[[:xdigit:]]{2}))");
const auto userinfo = "(?:" + unreserved_subdelims_colon + "*(?:" + pct_enc +
unreserved_subdelims_colon + "*)*)";
const auto userinfo =
"(?:" + unreserved_subdelims_colon + "*(?:" + pct_enc + unreserved_subdelims_colon + "*)*)";
const auto dec_octet =
QStringLiteral(R"((?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9]))");
const auto ipv4_addr = "(?:" + dec_octet + R"((?:\.)" + dec_octet + "){3})";
@ -65,14 +64,15 @@ const QRegularExpression
const auto query = R"(((?:[a-zA-Z0-9\-._~!$&'*+,;=:@/?\\{}]|)" + pct_enc +
R"(|\((?-1)\)|\[(?-1)\]|)" + general_unicode + ")*)";
const auto &fragment = query;
return
R"((?<!["'\w])(?>()"
+ protocol + "://"
+ "(?:" + userinfo + "@)?"
+ host + "(?::[0-9]+)?"
+ path + "?"
R"((?:\?)" + query + ")?"
R"((?:#)" + fragment + ")?"
return R"((?<!["'\w])(?>()" + protocol + "://" + "(?:" + userinfo + "@)?" + host +
"(?::[0-9]+)?" + path +
"?"
R"((?:\?)" +
query +
")?"
R"((?:#)" +
fragment +
")?"
"(?<![.!?,;:'])"
R"())(?!["']))";
}(),

View file

@ -275,7 +275,8 @@ NotificationsManager::notificationClosed(uint id, uint reason)
void
NotificationsManager::closeAllNotifications()
{
for (auto id : notificationIds.keys()) {
const auto ids = notificationIds.keys();
for (const auto &id : ids) {
closeNotification(id);
notificationIds.remove(id);
}