lint and avoid copy

cleanup-flatpak-building
Nicolas Werner 2 years ago
parent a320fc6f7a
commit 0ab566dc4b
No known key found for this signature in database
GPG Key ID: C8D75E610773F2D9
  1. 2
      src/ChatPage.cpp
  2. 24
      src/Config.h
  3. 3
      src/notifications/ManagerLinux.cpp

@ -1652,7 +1652,7 @@ ChatPage::isRoomActive(const QString &room_id)
void void
ChatPage::removeAllNotifications() ChatPage::removeAllNotifications()
{ {
#if defined (Q_OS_LINUX) #if defined(Q_OS_LINUX)
notificationsManager->closeAllNotifications(); notificationsManager->closeAllNotifications();
#endif #endif
} }

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

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

Loading…
Cancel
Save