squidy/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent.git synced 2025-12-23 00:47:21 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename literal operator

Browse Source 
Qt 6.4 introduced `QString operator""_s()` and the previous `""_qs` is
deprecated since Qt 6.8.
This commit is contained in:
Chocobo1
2023-06-18 02:02:02 +08:00
parent f6b58f36e2
commit e6d85a468b
141 changed files with 3610 additions and 3604 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/base/rss/rss_article.cpp
View File

@@ -37,14 +37,14 @@
using namespace RSS;
const QString Article::KeyId = u"id"_qs;
const QString Article::KeyDate = u"date"_qs;
const QString Article::KeyTitle = u"title"_qs;
const QString Article::KeyAuthor = u"author"_qs;
const QString Article::KeyDescription = u"description"_qs;
const QString Article::KeyTorrentURL = u"torrentURL"_qs;
const QString Article::KeyLink = u"link"_qs;
const QString Article::KeyIsRead = u"isRead"_qs;
const QString Article::KeyId = u"id"_s;
const QString Article::KeyDate = u"date"_s;
const QString Article::KeyTitle = u"title"_s;
const QString Article::KeyAuthor = u"author"_s;
const QString Article::KeyDescription = u"description"_s;
const QString Article::KeyTorrentURL = u"torrentURL"_s;
const QString Article::KeyLink = u"link"_s;
const QString Article::KeyIsRead = u"isRead"_s;
Article::Article(Feed *feed, const QVariantHash &varHash)
: QObject(feed)

26
src/base/rss/rss_autodownloader.cpp
View File

@@ -61,8 +61,8 @@ struct ProcessingJob
QVariantHash articleData;
};
const QString CONF_FOLDER_NAME = u"rss"_qs;
const QString RULES_FILE_NAME = u"download_rules.json"_qs;
const QString CONF_FOLDER_NAME = u"rss"_s;
const QString RULES_FILE_NAME = u"download_rules.json"_s;
namespace
{
@@ -97,13 +97,13 @@ QPointer<AutoDownloader> AutoDownloader::m_instance = nullptr;
QString computeSmartFilterRegex(const QStringList &filters)
{
return u"(?:_|\\b)(?:%1)(?:_|\\b)"_qs.arg(filters.join(u")|(?:"));
return u"(?:_|\\b)(?:%1)(?:_|\\b)"_s.arg(filters.join(u")|(?:"));
}
AutoDownloader::AutoDownloader()
: m_storeProcessingEnabled(u"RSS/AutoDownloader/EnableProcessing"_qs, false)
, m_storeSmartEpisodeFilter(u"RSS/AutoDownloader/SmartEpisodeFilter"_qs)
, m_storeDownloadRepacks(u"RSS/AutoDownloader/DownloadRepacks"_qs)
: m_storeProcessingEnabled(u"RSS/AutoDownloader/EnableProcessing"_s, false)
, m_storeSmartEpisodeFilter(u"RSS/AutoDownloader/SmartEpisodeFilter"_s)
, m_storeDownloadRepacks(u"RSS/AutoDownloader/DownloadRepacks"_s)
, m_processingTimer(new QTimer(this))
, m_ioThread(new QThread)
{
@@ -175,7 +175,7 @@ bool AutoDownloader::hasRule(const QString &ruleName) const
AutoDownloadRule AutoDownloader::ruleByName(const QString &ruleName) const
{
const auto index = m_rulesByName.value(ruleName, -1);
return m_rules.value(index, AutoDownloadRule(u"Unknown Rule"_qs));
return m_rules.value(index, AutoDownloadRule(u"Unknown Rule"_s));
}
QList<AutoDownloadRule> AutoDownloader::rules() const
@@ -312,10 +312,10 @@ QStringList AutoDownloader::smartEpisodeFilters() const
{
const QStringList defaultFilters =
{
u"s(\\d+)e(\\d+)"_qs, // Format 1: s01e01
u"(\\d+)x(\\d+)"_qs, // Format 2: 01x01
u"(\\d{4}[.\\-]\\d{1,2}[.\\-]\\d{1,2})"_qs, // Format 3: 2017.01.01
u"(\\d{1,2}[.\\-]\\d{1,2}[.\\-]\\d{4})"_qs // Format 4: 01.01.2017
u"s(\\d+)e(\\d+)"_s, // Format 1: s01e01
u"(\\d+)x(\\d+)"_s, // Format 2: 01x01
u"(\\d{4}[.\\-]\\d{1,2}[.\\-]\\d{1,2})"_s, // Format 3: 2017.01.01
u"(\\d{1,2}[.\\-]\\d{1,2}[.\\-]\\d{4})"_s // Format 4: 01.01.2017
};
return defaultFilters;
}
@@ -529,8 +529,8 @@ void AutoDownloader::loadRules(const QByteArray &data)
void AutoDownloader::loadRulesLegacy()
{
const std::unique_ptr<QSettings> settings = Profile::instance()->applicationSettings(u"qBittorrent-rss"_qs);
const QVariantHash rules = settings->value(u"download_rules"_qs).toHash();
const std::unique_ptr<QSettings> settings = Profile::instance()->applicationSettings(u"qBittorrent-rss"_s);
const QVariantHash rules = settings->value(u"download_rules"_s).toHash();
for (const QVariant &ruleVar : rules)
{
const auto rule = AutoDownloadRule::fromLegacyDict(ruleVar.toHash());

94
src/base/rss/rss_autodownloadrule.cpp
View File

@@ -101,25 +101,25 @@ namespace
}
}
const QString S_NAME = u"name"_qs;
const QString S_ENABLED = u"enabled"_qs;
const QString S_PRIORITY = u"priority"_qs;
const QString S_USE_REGEX = u"useRegex"_qs;
const QString S_MUST_CONTAIN = u"mustContain"_qs;
const QString S_MUST_NOT_CONTAIN = u"mustNotContain"_qs;
const QString S_EPISODE_FILTER = u"episodeFilter"_qs;
const QString S_AFFECTED_FEEDS = u"affectedFeeds"_qs;
const QString S_LAST_MATCH = u"lastMatch"_qs;
const QString S_IGNORE_DAYS = u"ignoreDays"_qs;
const QString S_SMART_FILTER = u"smartFilter"_qs;
const QString S_PREVIOUSLY_MATCHED = u"previouslyMatchedEpisodes"_qs;
const QString S_NAME = u"name"_s;
const QString S_ENABLED = u"enabled"_s;
const QString S_PRIORITY = u"priority"_s;
const QString S_USE_REGEX = u"useRegex"_s;
const QString S_MUST_CONTAIN = u"mustContain"_s;
const QString S_MUST_NOT_CONTAIN = u"mustNotContain"_s;
const QString S_EPISODE_FILTER = u"episodeFilter"_s;
const QString S_AFFECTED_FEEDS = u"affectedFeeds"_s;
const QString S_LAST_MATCH = u"lastMatch"_s;
const QString S_IGNORE_DAYS = u"ignoreDays"_s;
const QString S_SMART_FILTER = u"smartFilter"_s;
const QString S_PREVIOUSLY_MATCHED = u"previouslyMatchedEpisodes"_s;
const QString S_SAVE_PATH = u"savePath"_qs;
const QString S_ASSIGNED_CATEGORY = u"assignedCategory"_qs;
const QString S_ADD_PAUSED = u"addPaused"_qs;
const QString S_CONTENT_LAYOUT = u"torrentContentLayout"_qs;
const QString S_SAVE_PATH = u"savePath"_s;
const QString S_ASSIGNED_CATEGORY = u"assignedCategory"_s;
const QString S_ADD_PAUSED = u"addPaused"_s;
const QString S_CONTENT_LAYOUT = u"torrentContentLayout"_s;
const QString S_TORRENT_PARAMS = u"torrentParams"_qs;
const QString S_TORRENT_PARAMS = u"torrentParams"_s;
namespace RSS
{
@@ -230,7 +230,7 @@ QRegularExpression AutoDownloadRule::cachedRegex(const QString &expression, cons
bool AutoDownloadRule::matchesExpression(const QString &articleTitle, const QString &expression) const
{
const QRegularExpression whitespace {u"\\s+"_qs};
const QRegularExpression whitespace {u"\\s+"_s};
if (expression.isEmpty())
{
@@ -293,7 +293,7 @@ bool AutoDownloadRule::matchesEpisodeFilterExpression(const QString &articleTitl
if (m_dataPtr->episodeFilter.isEmpty())
return true;
const QRegularExpression filterRegex {cachedRegex(u"(^\\d{1,4})x(.*;$)"_qs)};
const QRegularExpression filterRegex {cachedRegex(u"(^\\d{1,4})x(.*;$)"_s)};
const QRegularExpressionMatch matcher {filterRegex.match(m_dataPtr->episodeFilter)};
if (!matcher.hasMatch())
return false;
@@ -313,8 +313,8 @@ bool AutoDownloadRule::matchesEpisodeFilterExpression(const QString &articleTitl
if (episode.indexOf(u'-') != -1)
{ // Range detected
const QString partialPattern1 {u"\\bs0?(\\d{1,4})[ -_\\.]?e(0?\\d{1,4})(?:\\D|\\b)"_qs};
const QString partialPattern2 {u"\\b(\\d{1,4})x(0?\\d{1,4})(?:\\D|\\b)"_qs};
const QString partialPattern1 {u"\\bs0?(\\d{1,4})[ -_\\.]?e(0?\\d{1,4})(?:\\D|\\b)"_s};
const QString partialPattern2 {u"\\b(\\d{1,4})x(0?\\d{1,4})(?:\\D|\\b)"_s};
// Extract partial match from article and compare as digits
QRegularExpressionMatch matcher = cachedRegex(partialPattern1).match(articleTitle);
@@ -353,7 +353,7 @@ bool AutoDownloadRule::matchesEpisodeFilterExpression(const QString &articleTitl
}
else
{ // Single number
const QString expStr {u"\\b(?:s0?%1[ -_\\.]?e0?%2|%1x0?%2)(?:\\D|\\b)"_qs.arg(season, episode)};
const QString expStr {u"\\b(?:s0?%1[ -_\\.]?e0?%2|%1x0?%2)(?:\\D|\\b)"_s.arg(season, episode)};
if (cachedRegex(expStr).match(articleTitle).hasMatch())
return true;
}
@@ -385,7 +385,7 @@ bool AutoDownloadRule::matchesSmartEpisodeFilter(const QString &articleTitle) co
if (!isRepack && !isProper)
return false;
const QString fullEpisodeStr = u"%1%2%3"_qs.arg(episodeStr,
const QString fullEpisodeStr = u"%1%2%3"_s.arg(episodeStr,
isRepack ? u"-REPACK" : u"",
isProper ? u"-PROPER" : u"");
const bool previouslyMatchedFull = m_dataPtr->previouslyMatchedEpisodes.contains(fullEpisodeStr);
@@ -565,39 +565,39 @@ QVariantHash AutoDownloadRule::toLegacyDict() const
{
const BitTorrent::AddTorrentParams &addTorrentParams = m_dataPtr->addTorrentParams;
return {{u"name"_qs, name()},
{u"must_contain"_qs, mustContain()},
{u"must_not_contain"_qs, mustNotContain()},
{u"save_path"_qs, addTorrentParams.savePath.toString()},
{u"affected_feeds"_qs, feedURLs()},
{u"enabled"_qs, isEnabled()},
{u"category_assigned"_qs, addTorrentParams.category},
{u"use_regex"_qs, useRegex()},
{u"add_paused"_qs, toAddPausedLegacy(addTorrentParams.addPaused)},
{u"episode_filter"_qs, episodeFilter()},
{u"last_match"_qs, lastMatch()},
{u"ignore_days"_qs, ignoreDays()}};
return {{u"name"_s, name()},
{u"must_contain"_s, mustContain()},
{u"must_not_contain"_s, mustNotContain()},
{u"save_path"_s, addTorrentParams.savePath.toString()},
{u"affected_feeds"_s, feedURLs()},
{u"enabled"_s, isEnabled()},
{u"category_assigned"_s, addTorrentParams.category},
{u"use_regex"_s, useRegex()},
{u"add_paused"_s, toAddPausedLegacy(addTorrentParams.addPaused)},
{u"episode_filter"_s, episodeFilter()},
{u"last_match"_s, lastMatch()},
{u"ignore_days"_s, ignoreDays()}};
}
AutoDownloadRule AutoDownloadRule::fromLegacyDict(const QVariantHash &dict)
{
BitTorrent::AddTorrentParams addTorrentParams;
addTorrentParams.savePath = Path(dict.value(u"save_path"_qs).toString());
addTorrentParams.category = dict.value(u"category_assigned"_qs).toString();
addTorrentParams.addPaused = addPausedLegacyToOptionalBool(dict.value(u"add_paused"_qs).toInt());
addTorrentParams.savePath = Path(dict.value(u"save_path"_s).toString());
addTorrentParams.category = dict.value(u"category_assigned"_s).toString();
addTorrentParams.addPaused = addPausedLegacyToOptionalBool(dict.value(u"add_paused"_s).toInt());
if (!addTorrentParams.savePath.isEmpty())
addTorrentParams.useAutoTMM = false;
AutoDownloadRule rule {dict.value(u"name"_qs).toString()};
AutoDownloadRule rule {dict.value(u"name"_s).toString()};
rule.setUseRegex(dict.value(u"use_regex"_qs, false).toBool());
rule.setMustContain(dict.value(u"must_contain"_qs).toString());
rule.setMustNotContain(dict.value(u"must_not_contain"_qs).toString());
rule.setEpisodeFilter(dict.value(u"episode_filter"_qs).toString());
rule.setFeedURLs(dict.value(u"affected_feeds"_qs).toStringList());
rule.setEnabled(dict.value(u"enabled"_qs, false).toBool());
rule.setLastMatch(dict.value(u"last_match"_qs).toDateTime());
rule.setIgnoreDays(dict.value(u"ignore_days"_qs).toInt());
rule.setUseRegex(dict.value(u"use_regex"_s, false).toBool());
rule.setMustContain(dict.value(u"must_contain"_s).toString());
rule.setMustNotContain(dict.value(u"must_not_contain"_s).toString());
rule.setEpisodeFilter(dict.value(u"episode_filter"_s).toString());
rule.setFeedURLs(dict.value(u"affected_feeds"_s).toStringList());
rule.setEnabled(dict.value(u"enabled"_s, false).toBool());
rule.setLastMatch(dict.value(u"last_match"_s).toDateTime());
rule.setIgnoreDays(dict.value(u"ignore_days"_s).toInt());
rule.setAddTorrentParams(addTorrentParams);
return rule;

18
src/base/rss/rss_feed.cpp
View File

@@ -53,13 +53,13 @@
#include "rss_parser.h"
#include "rss_session.h"
const QString KEY_UID = u"uid"_qs;
const QString KEY_URL = u"url"_qs;
const QString KEY_TITLE = u"title"_qs;
const QString KEY_LASTBUILDDATE = u"lastBuildDate"_qs;
const QString KEY_ISLOADING = u"isLoading"_qs;
const QString KEY_HASERROR = u"hasError"_qs;
const QString KEY_ARTICLES = u"articles"_qs;
const QString KEY_UID = u"uid"_s;
const QString KEY_URL = u"url"_s;
const QString KEY_TITLE = u"title"_s;
const QString KEY_LASTBUILDDATE = u"lastBuildDate"_s;
const QString KEY_ISLOADING = u"isLoading"_s;
const QString KEY_HASERROR = u"hasError"_s;
const QString KEY_ARTICLES = u"articles"_s;
using namespace RSS;
@@ -73,7 +73,7 @@ Feed::Feed(const QUuid &uid, const QString &url, const QString &path, Session *s
m_dataFileName = Path(uidHex + u".json");
// Move to new file naming scheme (since v4.1.2)
const QString legacyFilename = Utils::Fs::toValidFileName(m_url, u"_"_qs) + u".json";
const QString legacyFilename = Utils::Fs::toValidFileName(m_url, u"_"_s) + u".json";
const Path storageDir = m_session->dataFileStorage()->storageDir();
const Path dataFilePath = storageDir / m_dataFileName;
if (!dataFilePath.exists())
@@ -376,7 +376,7 @@ void Feed::downloadIcon()
// Download the RSS Feed icon
// XXX: This works for most sites but it is not perfect
const QUrl url(m_url);
const auto iconUrl = u"%1://%2/favicon.ico"_qs.arg(url.scheme(), url.host());
const auto iconUrl = u"%1://%2/favicon.ico"_s.arg(url.scheme(), url.host());
Net::DownloadManager::instance()->download(
Net::DownloadRequest(iconUrl).saveToFile(true).destFileName(m_iconPath)
, Preferences::instance()->useProxyForRSS(), this, &Feed::handleIconDownloadFinished);

2
src/base/rss/rss_item.cpp
View File

@@ -67,7 +67,7 @@ QString Item::name() const
bool Item::isValidPath(const QString &path)
{
const QRegularExpression re(
uR"(\A[^\%1]+(\%1[^\%1]+)*\z)"_qs.arg(Item::PathSeparator)
uR"(\A[^\%1]+(\%1[^\%1]+)*\z)"_s.arg(Item::PathSeparator)
, QRegularExpression::DontCaptureOption);
if (path.isEmpty() || !re.match(path).hasMatch())

514
src/base/rss/rss_parser.cpp
View File

@@ -56,303 +56,303 @@ namespace
// http://www.w3.org/TR/xhtml1/DTD/xhtml-special.ent
static const QHash<QString, QString> HTMLEntities
{
{u"nbsp"_qs, u"&#160;"_qs}, // no-break space = non-breaking space, U+00A0 ISOnum
{u"iexcl"_qs, u"&#161;"_qs}, // inverted exclamation mark, U+00A1 ISOnum
{u"cent"_qs, u"&#162;"_qs}, // cent sign, U+00A2 ISOnum
{u"pound"_qs, u"&#163;"_qs}, // pound sign, U+00A3 ISOnum
{u"curren"_qs, u"&#164;"_qs}, // currency sign, U+00A4 ISOnum
{u"yen"_qs, u"&#165;"_qs}, // yen sign = yuan sign, U+00A5 ISOnum
{u"brvbar"_qs, u"&#166;"_qs}, // broken bar = broken vertical bar, U+00A6 ISOnum
{u"sect"_qs, u"&#167;"_qs}, // section sign, U+00A7 ISOnum
{u"uml"_qs, u"&#168;"_qs}, // diaeresis = spacing diaeresis, U+00A8 ISOdia
{u"copy"_qs, u"&#169;"_qs}, // copyright sign, U+00A9 ISOnum
{u"ordf"_qs, u"&#170;"_qs}, // feminine ordinal indicator, U+00AA ISOnum
{u"laquo"_qs, u"&#171;"_qs}, // left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
{u"not"_qs, u"&#172;"_qs}, // not sign = angled dash, U+00AC ISOnum
{u"shy"_qs, u"&#173;"_qs}, // soft hyphen = discretionary hyphen, U+00AD ISOnum
{u"reg"_qs, u"&#174;"_qs}, // registered sign = registered trade mark sign, U+00AE ISOnum
{u"macr"_qs, u"&#175;"_qs}, // macron = spacing macron = overline = APL overbar, U+00AF ISOdia
{u"deg"_qs, u"&#176;"_qs}, // degree sign, U+00B0 ISOnum
{u"plusmn"_qs, u"&#177;"_qs}, // plus-minus sign = plus-or-minus sign, U+00B1 ISOnum
{u"sup2"_qs, u"&#178;"_qs}, // superscript two = superscript digit two = squared, U+00B2 ISOnum
{u"sup3"_qs, u"&#179;"_qs}, // superscript three = superscript digit three = cubed, U+00B3 ISOnum
{u"acute"_qs, u"&#180;"_qs}, // acute accent = spacing acute, U+00B4 ISOdia
{u"micro"_qs, u"&#181;"_qs}, // micro sign, U+00B5 ISOnum
{u"para"_qs, u"&#182;"_qs}, // pilcrow sign = paragraph sign, U+00B6 ISOnum
{u"middot"_qs, u"&#183;"_qs}, // middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum
{u"cedil"_qs, u"&#184;"_qs}, // cedilla = spacing cedilla, U+00B8 ISOdia
{u"sup1"_qs, u"&#185;"_qs}, // superscript one = superscript digit one, U+00B9 ISOnum
{u"ordm"_qs, u"&#186;"_qs}, // masculine ordinal indicator, U+00BA ISOnum
{u"raquo"_qs, u"&#187;"_qs}, // right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
{u"frac14"_qs, u"&#188;"_qs}, // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
{u"frac12"_qs, u"&#189;"_qs}, // vulgar fraction one half = fraction one half, U+00BD ISOnum
{u"frac34"_qs, u"&#190;"_qs}, // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
{u"iquest"_qs, u"&#191;"_qs}, // inverted question mark = turned question mark, U+00BF ISOnum
{u"Agrave"_qs, u"&#192;"_qs}, // latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
{u"Aacute"_qs, u"&#193;"_qs}, // latin capital letter A with acute, U+00C1 ISOlat1
{u"Acirc"_qs, u"&#194;"_qs}, // latin capital letter A with circumflex, U+00C2 ISOlat1
{u"Atilde"_qs, u"&#195;"_qs}, // latin capital letter A with tilde, U+00C3 ISOlat1
{u"Auml"_qs, u"&#196;"_qs}, // latin capital letter A with diaeresis, U+00C4 ISOlat1
{u"Aring"_qs, u"&#197;"_qs}, // latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
{u"AElig"_qs, u"&#198;"_qs}, // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
{u"Ccedil"_qs, u"&#199;"_qs}, // latin capital letter C with cedilla, U+00C7 ISOlat1
{u"Egrave"_qs, u"&#200;"_qs}, // latin capital letter E with grave, U+00C8 ISOlat1
{u"Eacute"_qs, u"&#201;"_qs}, // latin capital letter E with acute, U+00C9 ISOlat1
{u"Ecirc"_qs, u"&#202;"_qs}, // latin capital letter E with circumflex, U+00CA ISOlat1
{u"Euml"_qs, u"&#203;"_qs}, // latin capital letter E with diaeresis, U+00CB ISOlat1
{u"Igrave"_qs, u"&#204;"_qs}, // latin capital letter I with grave, U+00CC ISOlat1
{u"Iacute"_qs, u"&#205;"_qs}, // latin capital letter I with acute, U+00CD ISOlat1
{u"Icirc"_qs, u"&#206;"_qs}, // latin capital letter I with circumflex, U+00CE ISOlat1
{u"Iuml"_qs, u"&#207;"_qs}, // latin capital letter I with diaeresis, U+00CF ISOlat1
{u"ETH"_qs, u"&#208;"_qs}, // latin capital letter ETH, U+00D0 ISOlat1
{u"Ntilde"_qs, u"&#209;"_qs}, // latin capital letter N with tilde, U+00D1 ISOlat1
{u"Ograve"_qs, u"&#210;"_qs}, // latin capital letter O with grave, U+00D2 ISOlat1
{u"Oacute"_qs, u"&#211;"_qs}, // latin capital letter O with acute, U+00D3 ISOlat1
{u"Ocirc"_qs, u"&#212;"_qs}, // latin capital letter O with circumflex, U+00D4 ISOlat1
{u"Otilde"_qs, u"&#213;"_qs}, // latin capital letter O with tilde, U+00D5 ISOlat1
{u"Ouml"_qs, u"&#214;"_qs}, // latin capital letter O with diaeresis, U+00D6 ISOlat1
{u"times"_qs, u"&#215;"_qs}, // multiplication sign, U+00D7 ISOnum
{u"Oslash"_qs, u"&#216;"_qs}, // latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
{u"Ugrave"_qs, u"&#217;"_qs}, // latin capital letter U with grave, U+00D9 ISOlat1
{u"Uacute"_qs, u"&#218;"_qs}, // latin capital letter U with acute, U+00DA ISOlat1
{u"Ucirc"_qs, u"&#219;"_qs}, // latin capital letter U with circumflex, U+00DB ISOlat1
{u"Uuml"_qs, u"&#220;"_qs}, // latin capital letter U with diaeresis, U+00DC ISOlat1
{u"Yacute"_qs, u"&#221;"_qs}, // latin capital letter Y with acute, U+00DD ISOlat1
{u"THORN"_qs, u"&#222;"_qs}, // latin capital letter THORN, U+00DE ISOlat1
{u"szlig"_qs, u"&#223;"_qs}, // latin small letter sharp s = ess-zed, U+00DF ISOlat1
{u"agrave"_qs, u"&#224;"_qs}, // latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
{u"aacute"_qs, u"&#225;"_qs}, // latin small letter a with acute, U+00E1 ISOlat1
{u"acirc"_qs, u"&#226;"_qs}, // latin small letter a with circumflex, U+00E2 ISOlat1
{u"atilde"_qs, u"&#227;"_qs}, // latin small letter a with tilde, U+00E3 ISOlat1
{u"auml"_qs, u"&#228;"_qs}, // latin small letter a with diaeresis, U+00E4 ISOlat1
{u"aring"_qs, u"&#229;"_qs}, // latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
{u"aelig"_qs, u"&#230;"_qs}, // latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
{u"ccedil"_qs, u"&#231;"_qs}, // latin small letter c with cedilla, U+00E7 ISOlat1
{u"egrave"_qs, u"&#232;"_qs}, // latin small letter e with grave, U+00E8 ISOlat1
{u"eacute"_qs, u"&#233;"_qs}, // latin small letter e with acute, U+00E9 ISOlat1
{u"ecirc"_qs, u"&#234;"_qs}, // latin small letter e with circumflex, U+00EA ISOlat1
{u"euml"_qs, u"&#235;"_qs}, // latin small letter e with diaeresis, U+00EB ISOlat1
{u"igrave"_qs, u"&#236;"_qs}, // latin small letter i with grave, U+00EC ISOlat1
{u"iacute"_qs, u"&#237;"_qs}, // latin small letter i with acute, U+00ED ISOlat1
{u"icirc"_qs, u"&#238;"_qs}, // latin small letter i with circumflex, U+00EE ISOlat1
{u"iuml"_qs, u"&#239;"_qs}, // latin small letter i with diaeresis, U+00EF ISOlat1
{u"eth"_qs, u"&#240;"_qs}, // latin small letter eth, U+00F0 ISOlat1
{u"ntilde"_qs, u"&#241;"_qs}, // latin small letter n with tilde, U+00F1 ISOlat1
{u"ograve"_qs, u"&#242;"_qs}, // latin small letter o with grave, U+00F2 ISOlat1
{u"oacute"_qs, u"&#243;"_qs}, // latin small letter o with acute, U+00F3 ISOlat1
{u"ocirc"_qs, u"&#244;"_qs}, // latin small letter o with circumflex, U+00F4 ISOlat1
{u"otilde"_qs, u"&#245;"_qs}, // latin small letter o with tilde, U+00F5 ISOlat1
{u"ouml"_qs, u"&#246;"_qs}, // latin small letter o with diaeresis, U+00F6 ISOlat1
{u"divide"_qs, u"&#247;"_qs}, // division sign, U+00F7 ISOnum
{u"oslash"_qs, u"&#248;"_qs}, // latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
{u"ugrave"_qs, u"&#249;"_qs}, // latin small letter u with grave, U+00F9 ISOlat1
{u"uacute"_qs, u"&#250;"_qs}, // latin small letter u with acute, U+00FA ISOlat1
{u"ucirc"_qs, u"&#251;"_qs}, // latin small letter u with circumflex, U+00FB ISOlat1
{u"uuml"_qs, u"&#252;"_qs}, // latin small letter u with diaeresis, U+00FC ISOlat1
{u"yacute"_qs, u"&#253;"_qs}, // latin small letter y with acute, U+00FD ISOlat1
{u"thorn"_qs, u"&#254;"_qs}, // latin small letter thorn, U+00FE ISOlat1
{u"yuml"_qs, u"&#255;"_qs}, // latin small letter y with diaeresis, U+00FF ISOlat1
{u"nbsp"_s, u"&#160;"_s}, // no-break space = non-breaking space, U+00A0 ISOnum
{u"iexcl"_s, u"&#161;"_s}, // inverted exclamation mark, U+00A1 ISOnum
{u"cent"_s, u"&#162;"_s}, // cent sign, U+00A2 ISOnum
{u"pound"_s, u"&#163;"_s}, // pound sign, U+00A3 ISOnum
{u"curren"_s, u"&#164;"_s}, // currency sign, U+00A4 ISOnum
{u"yen"_s, u"&#165;"_s}, // yen sign = yuan sign, U+00A5 ISOnum
{u"brvbar"_s, u"&#166;"_s}, // broken bar = broken vertical bar, U+00A6 ISOnum
{u"sect"_s, u"&#167;"_s}, // section sign, U+00A7 ISOnum
{u"uml"_s, u"&#168;"_s}, // diaeresis = spacing diaeresis, U+00A8 ISOdia
{u"copy"_s, u"&#169;"_s}, // copyright sign, U+00A9 ISOnum
{u"ordf"_s, u"&#170;"_s}, // feminine ordinal indicator, U+00AA ISOnum
{u"laquo"_s, u"&#171;"_s}, // left-pointing double angle quotation mark = left pointing guillemet, U+00AB ISOnum
{u"not"_s, u"&#172;"_s}, // not sign = angled dash, U+00AC ISOnum
{u"shy"_s, u"&#173;"_s}, // soft hyphen = discretionary hyphen, U+00AD ISOnum
{u"reg"_s, u"&#174;"_s}, // registered sign = registered trade mark sign, U+00AE ISOnum
{u"macr"_s, u"&#175;"_s}, // macron = spacing macron = overline = APL overbar, U+00AF ISOdia
{u"deg"_s, u"&#176;"_s}, // degree sign, U+00B0 ISOnum
{u"plusmn"_s, u"&#177;"_s}, // plus-minus sign = plus-or-minus sign, U+00B1 ISOnum
{u"sup2"_s, u"&#178;"_s}, // superscript two = superscript digit two = squared, U+00B2 ISOnum
{u"sup3"_s, u"&#179;"_s}, // superscript three = superscript digit three = cubed, U+00B3 ISOnum
{u"acute"_s, u"&#180;"_s}, // acute accent = spacing acute, U+00B4 ISOdia
{u"micro"_s, u"&#181;"_s}, // micro sign, U+00B5 ISOnum
{u"para"_s, u"&#182;"_s}, // pilcrow sign = paragraph sign, U+00B6 ISOnum
{u"middot"_s, u"&#183;"_s}, // middle dot = Georgian comma = Greek middle dot, U+00B7 ISOnum
{u"cedil"_s, u"&#184;"_s}, // cedilla = spacing cedilla, U+00B8 ISOdia
{u"sup1"_s, u"&#185;"_s}, // superscript one = superscript digit one, U+00B9 ISOnum
{u"ordm"_s, u"&#186;"_s}, // masculine ordinal indicator, U+00BA ISOnum
{u"raquo"_s, u"&#187;"_s}, // right-pointing double angle quotation mark = right pointing guillemet, U+00BB ISOnum
{u"frac14"_s, u"&#188;"_s}, // vulgar fraction one quarter = fraction one quarter, U+00BC ISOnum
{u"frac12"_s, u"&#189;"_s}, // vulgar fraction one half = fraction one half, U+00BD ISOnum
{u"frac34"_s, u"&#190;"_s}, // vulgar fraction three quarters = fraction three quarters, U+00BE ISOnum
{u"iquest"_s, u"&#191;"_s}, // inverted question mark = turned question mark, U+00BF ISOnum
{u"Agrave"_s, u"&#192;"_s}, // latin capital letter A with grave = latin capital letter A grave, U+00C0 ISOlat1
{u"Aacute"_s, u"&#193;"_s}, // latin capital letter A with acute, U+00C1 ISOlat1
{u"Acirc"_s, u"&#194;"_s}, // latin capital letter A with circumflex, U+00C2 ISOlat1
{u"Atilde"_s, u"&#195;"_s}, // latin capital letter A with tilde, U+00C3 ISOlat1
{u"Auml"_s, u"&#196;"_s}, // latin capital letter A with diaeresis, U+00C4 ISOlat1
{u"Aring"_s, u"&#197;"_s}, // latin capital letter A with ring above = latin capital letter A ring, U+00C5 ISOlat1
{u"AElig"_s, u"&#198;"_s}, // latin capital letter AE = latin capital ligature AE, U+00C6 ISOlat1
{u"Ccedil"_s, u"&#199;"_s}, // latin capital letter C with cedilla, U+00C7 ISOlat1
{u"Egrave"_s, u"&#200;"_s}, // latin capital letter E with grave, U+00C8 ISOlat1
{u"Eacute"_s, u"&#201;"_s}, // latin capital letter E with acute, U+00C9 ISOlat1
{u"Ecirc"_s, u"&#202;"_s}, // latin capital letter E with circumflex, U+00CA ISOlat1
{u"Euml"_s, u"&#203;"_s}, // latin capital letter E with diaeresis, U+00CB ISOlat1
{u"Igrave"_s, u"&#204;"_s}, // latin capital letter I with grave, U+00CC ISOlat1
{u"Iacute"_s, u"&#205;"_s}, // latin capital letter I with acute, U+00CD ISOlat1
{u"Icirc"_s, u"&#206;"_s}, // latin capital letter I with circumflex, U+00CE ISOlat1
{u"Iuml"_s, u"&#207;"_s}, // latin capital letter I with diaeresis, U+00CF ISOlat1
{u"ETH"_s, u"&#208;"_s}, // latin capital letter ETH, U+00D0 ISOlat1
{u"Ntilde"_s, u"&#209;"_s}, // latin capital letter N with tilde, U+00D1 ISOlat1
{u"Ograve"_s, u"&#210;"_s}, // latin capital letter O with grave, U+00D2 ISOlat1
{u"Oacute"_s, u"&#211;"_s}, // latin capital letter O with acute, U+00D3 ISOlat1
{u"Ocirc"_s, u"&#212;"_s}, // latin capital letter O with circumflex, U+00D4 ISOlat1
{u"Otilde"_s, u"&#213;"_s}, // latin capital letter O with tilde, U+00D5 ISOlat1
{u"Ouml"_s, u"&#214;"_s}, // latin capital letter O with diaeresis, U+00D6 ISOlat1
{u"times"_s, u"&#215;"_s}, // multiplication sign, U+00D7 ISOnum
{u"Oslash"_s, u"&#216;"_s}, // latin capital letter O with stroke = latin capital letter O slash, U+00D8 ISOlat1
{u"Ugrave"_s, u"&#217;"_s}, // latin capital letter U with grave, U+00D9 ISOlat1
{u"Uacute"_s, u"&#218;"_s}, // latin capital letter U with acute, U+00DA ISOlat1
{u"Ucirc"_s, u"&#219;"_s}, // latin capital letter U with circumflex, U+00DB ISOlat1
{u"Uuml"_s, u"&#220;"_s}, // latin capital letter U with diaeresis, U+00DC ISOlat1
{u"Yacute"_s, u"&#221;"_s}, // latin capital letter Y with acute, U+00DD ISOlat1
{u"THORN"_s, u"&#222;"_s}, // latin capital letter THORN, U+00DE ISOlat1
{u"szlig"_s, u"&#223;"_s}, // latin small letter sharp s = ess-zed, U+00DF ISOlat1
{u"agrave"_s, u"&#224;"_s}, // latin small letter a with grave = latin small letter a grave, U+00E0 ISOlat1
{u"aacute"_s, u"&#225;"_s}, // latin small letter a with acute, U+00E1 ISOlat1
{u"acirc"_s, u"&#226;"_s}, // latin small letter a with circumflex, U+00E2 ISOlat1
{u"atilde"_s, u"&#227;"_s}, // latin small letter a with tilde, U+00E3 ISOlat1
{u"auml"_s, u"&#228;"_s}, // latin small letter a with diaeresis, U+00E4 ISOlat1
{u"aring"_s, u"&#229;"_s}, // latin small letter a with ring above = latin small letter a ring, U+00E5 ISOlat1
{u"aelig"_s, u"&#230;"_s}, // latin small letter ae = latin small ligature ae, U+00E6 ISOlat1
{u"ccedil"_s, u"&#231;"_s}, // latin small letter c with cedilla, U+00E7 ISOlat1
{u"egrave"_s, u"&#232;"_s}, // latin small letter e with grave, U+00E8 ISOlat1
{u"eacute"_s, u"&#233;"_s}, // latin small letter e with acute, U+00E9 ISOlat1
{u"ecirc"_s, u"&#234;"_s}, // latin small letter e with circumflex, U+00EA ISOlat1
{u"euml"_s, u"&#235;"_s}, // latin small letter e with diaeresis, U+00EB ISOlat1
{u"igrave"_s, u"&#236;"_s}, // latin small letter i with grave, U+00EC ISOlat1
{u"iacute"_s, u"&#237;"_s}, // latin small letter i with acute, U+00ED ISOlat1
{u"icirc"_s, u"&#238;"_s}, // latin small letter i with circumflex, U+00EE ISOlat1
{u"iuml"_s, u"&#239;"_s}, // latin small letter i with diaeresis, U+00EF ISOlat1
{u"eth"_s, u"&#240;"_s}, // latin small letter eth, U+00F0 ISOlat1
{u"ntilde"_s, u"&#241;"_s}, // latin small letter n with tilde, U+00F1 ISOlat1
{u"ograve"_s, u"&#242;"_s}, // latin small letter o with grave, U+00F2 ISOlat1
{u"oacute"_s, u"&#243;"_s}, // latin small letter o with acute, U+00F3 ISOlat1
{u"ocirc"_s, u"&#244;"_s}, // latin small letter o with circumflex, U+00F4 ISOlat1
{u"otilde"_s, u"&#245;"_s}, // latin small letter o with tilde, U+00F5 ISOlat1
{u"ouml"_s, u"&#246;"_s}, // latin small letter o with diaeresis, U+00F6 ISOlat1
{u"divide"_s, u"&#247;"_s}, // division sign, U+00F7 ISOnum
{u"oslash"_s, u"&#248;"_s}, // latin small letter o with stroke, = latin small letter o slash, U+00F8 ISOlat1
{u"ugrave"_s, u"&#249;"_s}, // latin small letter u with grave, U+00F9 ISOlat1
{u"uacute"_s, u"&#250;"_s}, // latin small letter u with acute, U+00FA ISOlat1
{u"ucirc"_s, u"&#251;"_s}, // latin small letter u with circumflex, U+00FB ISOlat1
{u"uuml"_s, u"&#252;"_s}, // latin small letter u with diaeresis, U+00FC ISOlat1
{u"yacute"_s, u"&#253;"_s}, // latin small letter y with acute, U+00FD ISOlat1
{u"thorn"_s, u"&#254;"_s}, // latin small letter thorn, U+00FE ISOlat1
{u"yuml"_s, u"&#255;"_s}, // latin small letter y with diaeresis, U+00FF ISOlat1
// Latin Extended-A
{u"OElig"_qs, u"&#338;"_qs}, // latin capital ligature OE, U+0152 ISOlat2
{u"oelig"_qs, u"&#339;"_qs}, // latin small ligature oe, U+0153 ISOlat2
{u"OElig"_s, u"&#338;"_s}, // latin capital ligature OE, U+0152 ISOlat2
{u"oelig"_s, u"&#339;"_s}, // latin small ligature oe, U+0153 ISOlat2
// ligature is a misnomer, this is a separate character in some languages
{u"Scaron"_qs, u"&#352;"_qs}, // latin capital letter S with caron, U+0160 ISOlat2
{u"scaron"_qs, u"&#353;"_qs}, // latin small letter s with caron, U+0161 ISOlat2
{u"Yuml"_qs, u"&#376;"_qs}, // latin capital letter Y with diaeresis, U+0178 ISOlat2
{u"Scaron"_s, u"&#352;"_s}, // latin capital letter S with caron, U+0160 ISOlat2
{u"scaron"_s, u"&#353;"_s}, // latin small letter s with caron, U+0161 ISOlat2
{u"Yuml"_s, u"&#376;"_s}, // latin capital letter Y with diaeresis, U+0178 ISOlat2
// Spacing Modifier Letters
{u"circ"_qs, u"&#710;"_qs}, // modifier letter circumflex accent, U+02C6 ISOpub
{u"tilde"_qs, u"&#732;"_qs}, // small tilde, U+02DC ISOdia
{u"circ"_s, u"&#710;"_s}, // modifier letter circumflex accent, U+02C6 ISOpub
{u"tilde"_s, u"&#732;"_s}, // small tilde, U+02DC ISOdia
// General Punctuation
{u"ensp"_qs, u"&#8194;"_qs}, // en space, U+2002 ISOpub
{u"emsp"_qs, u"&#8195;"_qs}, // em space, U+2003 ISOpub
{u"thinsp"_qs, u"&#8201;"_qs}, // thin space, U+2009 ISOpub
{u"zwnj"_qs, u"&#8204;"_qs}, // zero width non-joiner, U+200C NEW RFC 2070
{u"zwj"_qs, u"&#8205;"_qs}, // zero width joiner, U+200D NEW RFC 2070
{u"lrm"_qs, u"&#8206;"_qs}, // left-to-right mark, U+200E NEW RFC 2070
{u"rlm"_qs, u"&#8207;"_qs}, // right-to-left mark, U+200F NEW RFC 2070
{u"ndash"_qs, u"&#8211;"_qs}, // en dash, U+2013 ISOpub
{u"mdash"_qs, u"&#8212;"_qs}, // em dash, U+2014 ISOpub
{u"lsquo"_qs, u"&#8216;"_qs}, // left single quotation mark, U+2018 ISOnum
{u"rsquo"_qs, u"&#8217;"_qs}, // right single quotation mark, U+2019 ISOnum
{u"sbquo"_qs, u"&#8218;"_qs}, // single low-9 quotation mark, U+201A NEW
{u"ldquo"_qs, u"&#8220;"_qs}, // left double quotation mark, U+201C ISOnum
{u"rdquo"_qs, u"&#8221;"_qs}, // right double quotation mark, U+201D ISOnum
{u"bdquo"_qs, u"&#8222;"_qs}, // double low-9 quotation mark, U+201E NEW
{u"dagger"_qs, u"&#8224;"_qs}, // dagger, U+2020 ISOpub
{u"Dagger"_qs, u"&#8225;"_qs}, // double dagger, U+2021 ISOpub
{u"permil"_qs, u"&#8240;"_qs}, // per mille sign, U+2030 ISOtech
{u"lsaquo"_qs, u"&#8249;"_qs}, // single left-pointing angle quotation mark, U+2039 ISO proposed
{u"ensp"_s, u"&#8194;"_s}, // en space, U+2002 ISOpub
{u"emsp"_s, u"&#8195;"_s}, // em space, U+2003 ISOpub
{u"thinsp"_s, u"&#8201;"_s}, // thin space, U+2009 ISOpub
{u"zwnj"_s, u"&#8204;"_s}, // zero width non-joiner, U+200C NEW RFC 2070
{u"zwj"_s, u"&#8205;"_s}, // zero width joiner, U+200D NEW RFC 2070
{u"lrm"_s, u"&#8206;"_s}, // left-to-right mark, U+200E NEW RFC 2070
{u"rlm"_s, u"&#8207;"_s}, // right-to-left mark, U+200F NEW RFC 2070
{u"ndash"_s, u"&#8211;"_s}, // en dash, U+2013 ISOpub
{u"mdash"_s, u"&#8212;"_s}, // em dash, U+2014 ISOpub
{u"lsquo"_s, u"&#8216;"_s}, // left single quotation mark, U+2018 ISOnum
{u"rsquo"_s, u"&#8217;"_s}, // right single quotation mark, U+2019 ISOnum
{u"sbquo"_s, u"&#8218;"_s}, // single low-9 quotation mark, U+201A NEW
{u"ldquo"_s, u"&#8220;"_s}, // left double quotation mark, U+201C ISOnum
{u"rdquo"_s, u"&#8221;"_s}, // right double quotation mark, U+201D ISOnum
{u"bdquo"_s, u"&#8222;"_s}, // double low-9 quotation mark, U+201E NEW
{u"dagger"_s, u"&#8224;"_s}, // dagger, U+2020 ISOpub
{u"Dagger"_s, u"&#8225;"_s}, // double dagger, U+2021 ISOpub
{u"permil"_s, u"&#8240;"_s}, // per mille sign, U+2030 ISOtech
{u"lsaquo"_s, u"&#8249;"_s}, // single left-pointing angle quotation mark, U+2039 ISO proposed
// lsaquo is proposed but not yet ISO standardized
{u"rsaquo"_qs, u"&#8250;"_qs}, // single right-pointing angle quotation mark, U+203A ISO proposed
{u"rsaquo"_s, u"&#8250;"_s}, // single right-pointing angle quotation mark, U+203A ISO proposed
// rsaquo is proposed but not yet ISO standardized
// Currency Symbols
{u"euro"_qs, u"&#8364;"_qs}, // euro sign, U+20AC NEW
{u"euro"_s, u"&#8364;"_s}, // euro sign, U+20AC NEW
// Latin Extended-B
{u"fnof"_qs, u"&#402;"_qs}, // latin small letter f with hook = function = florin, U+0192 ISOtech
{u"fnof"_s, u"&#402;"_s}, // latin small letter f with hook = function = florin, U+0192 ISOtech
// Greek
{u"Alpha"_qs, u"&#913;"_qs}, // greek capital letter alpha, U+0391
{u"Beta"_qs, u"&#914;"_qs}, // greek capital letter beta, U+0392
{u"Gamma"_qs, u"&#915;"_qs}, // greek capital letter gamma, U+0393 ISOgrk3
{u"Delta"_qs, u"&#916;"_qs}, // greek capital letter delta, U+0394 ISOgrk3
{u"Epsilon"_qs, u"&#917;"_qs}, // greek capital letter epsilon, U+0395
{u"Zeta"_qs, u"&#918;"_qs}, // greek capital letter zeta, U+0396
{u"Eta"_qs, u"&#919;"_qs}, // greek capital letter eta, U+0397
{u"Theta"_qs, u"&#920;"_qs}, // greek capital letter theta, U+0398 ISOgrk3
{u"Iota"_qs, u"&#921;"_qs}, // greek capital letter iota, U+0399
{u"Kappa"_qs, u"&#922;"_qs}, // greek capital letter kappa, U+039A
{u"Lambda"_qs, u"&#923;"_qs}, // greek capital letter lamda, U+039B ISOgrk3
{u"Mu"_qs, u"&#924;"_qs}, // greek capital letter mu, U+039C
{u"Nu"_qs, u"&#925;"_qs}, // greek capital letter nu, U+039D
{u"Xi"_qs, u"&#926;"_qs}, // greek capital letter xi, U+039E ISOgrk3
{u"Omicron"_qs, u"&#927;"_qs}, // greek capital letter omicron, U+039F
{u"Pi"_qs, u"&#928;"_qs}, // greek capital letter pi, U+03A0 ISOgrk3
{u"Rho"_qs, u"&#929;"_qs}, // greek capital letter rho, U+03A1
{u"Sigma"_qs, u"&#931;"_qs}, // greek capital letter sigma, U+03A3 ISOgrk3
{u"Tau"_qs, u"&#932;"_qs}, // greek capital letter tau, U+03A4
{u"Upsilon"_qs, u"&#933;"_qs}, // greek capital letter upsilon, U+03A5 ISOgrk3
{u"Phi"_qs, u"&#934;"_qs}, // greek capital letter phi, U+03A6 ISOgrk3
{u"Chi"_qs, u"&#935;"_qs}, // greek capital letter chi, U+03A7
{u"Psi"_qs, u"&#936;"_qs}, // greek capital letter psi, U+03A8 ISOgrk3
{u"Omega"_qs, u"&#937;"_qs}, // greek capital letter omega, U+03A9 ISOgrk3
{u"alpha"_qs, u"&#945;"_qs}, // greek small letter alpha, U+03B1 ISOgrk3
{u"beta"_qs, u"&#946;"_qs}, // greek small letter beta, U+03B2 ISOgrk3
{u"gamma"_qs, u"&#947;"_qs}, // greek small letter gamma, U+03B3 ISOgrk3
{u"delta"_qs, u"&#948;"_qs}, // greek small letter delta, U+03B4 ISOgrk3
{u"epsilon"_qs, u"&#949;"_qs}, // greek small letter epsilon, U+03B5 ISOgrk3
{u"zeta"_qs, u"&#950;"_qs}, // greek small letter zeta, U+03B6 ISOgrk3
{u"eta"_qs, u"&#951;"_qs}, // greek small letter eta, U+03B7 ISOgrk3
{u"theta"_qs, u"&#952;"_qs}, // greek small letter theta, U+03B8 ISOgrk3
{u"iota"_qs, u"&#953;"_qs}, // greek small letter iota, U+03B9 ISOgrk3
{u"kappa"_qs, u"&#954;"_qs}, // greek small letter kappa, U+03BA ISOgrk3
{u"lambda"_qs, u"&#955;"_qs}, // greek small letter lamda, U+03BB ISOgrk3
{u"mu"_qs, u"&#956;"_qs}, // greek small letter mu, U+03BC ISOgrk3
{u"nu"_qs, u"&#957;"_qs}, // greek small letter nu, U+03BD ISOgrk3
{u"xi"_qs, u"&#958;"_qs}, // greek small letter xi, U+03BE ISOgrk3
{u"omicron"_qs, u"&#959;"_qs}, // greek small letter omicron, U+03BF NEW
{u"pi"_qs, u"&#960;"_qs}, // greek small letter pi, U+03C0 ISOgrk3
{u"rho"_qs, u"&#961;"_qs}, // greek small letter rho, U+03C1 ISOgrk3
{u"sigmaf"_qs, u"&#962;"_qs}, // greek small letter final sigma, U+03C2 ISOgrk3
{u"sigma"_qs, u"&#963;"_qs}, // greek small letter sigma, U+03C3 ISOgrk3
{u"tau"_qs, u"&#964;"_qs}, // greek small letter tau, U+03C4 ISOgrk3
{u"upsilon"_qs, u"&#965;"_qs}, // greek small letter upsilon, U+03C5 ISOgrk3
{u"phi"_qs, u"&#966;"_qs}, // greek small letter phi, U+03C6 ISOgrk3
{u"chi"_qs, u"&#967;"_qs}, // greek small letter chi, U+03C7 ISOgrk3
{u"psi"_qs, u"&#968;"_qs}, // greek small letter psi, U+03C8 ISOgrk3
{u"omega"_qs, u"&#969;"_qs}, // greek small letter omega, U+03C9 ISOgrk3
{u"thetasym"_qs, u"&#977;"_qs}, // greek theta symbol, U+03D1 NEW
{u"upsih"_qs, u"&#978;"_qs}, // greek upsilon with hook symbol, U+03D2 NEW
{u"piv"_qs, u"&#982;"_qs}, // greek pi symbol, U+03D6 ISOgrk3
{u"Alpha"_s, u"&#913;"_s}, // greek capital letter alpha, U+0391
{u"Beta"_s, u"&#914;"_s}, // greek capital letter beta, U+0392
{u"Gamma"_s, u"&#915;"_s}, // greek capital letter gamma, U+0393 ISOgrk3
{u"Delta"_s, u"&#916;"_s}, // greek capital letter delta, U+0394 ISOgrk3
{u"Epsilon"_s, u"&#917;"_s}, // greek capital letter epsilon, U+0395
{u"Zeta"_s, u"&#918;"_s}, // greek capital letter zeta, U+0396
{u"Eta"_s, u"&#919;"_s}, // greek capital letter eta, U+0397
{u"Theta"_s, u"&#920;"_s}, // greek capital letter theta, U+0398 ISOgrk3
{u"Iota"_s, u"&#921;"_s}, // greek capital letter iota, U+0399
{u"Kappa"_s, u"&#922;"_s}, // greek capital letter kappa, U+039A
{u"Lambda"_s, u"&#923;"_s}, // greek capital letter lamda, U+039B ISOgrk3
{u"Mu"_s, u"&#924;"_s}, // greek capital letter mu, U+039C
{u"Nu"_s, u"&#925;"_s}, // greek capital letter nu, U+039D
{u"Xi"_s, u"&#926;"_s}, // greek capital letter xi, U+039E ISOgrk3
{u"Omicron"_s, u"&#927;"_s}, // greek capital letter omicron, U+039F
{u"Pi"_s, u"&#928;"_s}, // greek capital letter pi, U+03A0 ISOgrk3
{u"Rho"_s, u"&#929;"_s}, // greek capital letter rho, U+03A1
{u"Sigma"_s, u"&#931;"_s}, // greek capital letter sigma, U+03A3 ISOgrk3
{u"Tau"_s, u"&#932;"_s}, // greek capital letter tau, U+03A4
{u"Upsilon"_s, u"&#933;"_s}, // greek capital letter upsilon, U+03A5 ISOgrk3
{u"Phi"_s, u"&#934;"_s}, // greek capital letter phi, U+03A6 ISOgrk3
{u"Chi"_s, u"&#935;"_s}, // greek capital letter chi, U+03A7
{u"Psi"_s, u"&#936;"_s}, // greek capital letter psi, U+03A8 ISOgrk3
{u"Omega"_s, u"&#937;"_s}, // greek capital letter omega, U+03A9 ISOgrk3
{u"alpha"_s, u"&#945;"_s}, // greek small letter alpha, U+03B1 ISOgrk3
{u"beta"_s, u"&#946;"_s}, // greek small letter beta, U+03B2 ISOgrk3
{u"gamma"_s, u"&#947;"_s}, // greek small letter gamma, U+03B3 ISOgrk3
{u"delta"_s, u"&#948;"_s}, // greek small letter delta, U+03B4 ISOgrk3
{u"epsilon"_s, u"&#949;"_s}, // greek small letter epsilon, U+03B5 ISOgrk3
{u"zeta"_s, u"&#950;"_s}, // greek small letter zeta, U+03B6 ISOgrk3
{u"eta"_s, u"&#951;"_s}, // greek small letter eta, U+03B7 ISOgrk3
{u"theta"_s, u"&#952;"_s}, // greek small letter theta, U+03B8 ISOgrk3
{u"iota"_s, u"&#953;"_s}, // greek small letter iota, U+03B9 ISOgrk3
{u"kappa"_s, u"&#954;"_s}, // greek small letter kappa, U+03BA ISOgrk3
{u"lambda"_s, u"&#955;"_s}, // greek small letter lamda, U+03BB ISOgrk3
{u"mu"_s, u"&#956;"_s}, // greek small letter mu, U+03BC ISOgrk3
{u"nu"_s, u"&#957;"_s}, // greek small letter nu, U+03BD ISOgrk3
{u"xi"_s, u"&#958;"_s}, // greek small letter xi, U+03BE ISOgrk3
{u"omicron"_s, u"&#959;"_s}, // greek small letter omicron, U+03BF NEW
{u"pi"_s, u"&#960;"_s}, // greek small letter pi, U+03C0 ISOgrk3
{u"rho"_s, u"&#961;"_s}, // greek small letter rho, U+03C1 ISOgrk3
{u"sigmaf"_s, u"&#962;"_s}, // greek small letter final sigma, U+03C2 ISOgrk3
{u"sigma"_s, u"&#963;"_s}, // greek small letter sigma, U+03C3 ISOgrk3
{u"tau"_s, u"&#964;"_s}, // greek small letter tau, U+03C4 ISOgrk3
{u"upsilon"_s, u"&#965;"_s}, // greek small letter upsilon, U+03C5 ISOgrk3
{u"phi"_s, u"&#966;"_s}, // greek small letter phi, U+03C6 ISOgrk3
{u"chi"_s, u"&#967;"_s}, // greek small letter chi, U+03C7 ISOgrk3
{u"psi"_s, u"&#968;"_s}, // greek small letter psi, U+03C8 ISOgrk3
{u"omega"_s, u"&#969;"_s}, // greek small letter omega, U+03C9 ISOgrk3
{u"thetasym"_s, u"&#977;"_s}, // greek theta symbol, U+03D1 NEW
{u"upsih"_s, u"&#978;"_s}, // greek upsilon with hook symbol, U+03D2 NEW
{u"piv"_s, u"&#982;"_s}, // greek pi symbol, U+03D6 ISOgrk3
// General Punctuation
{u"bull"_qs, u"&#8226;"_qs}, // bullet = black small circle, U+2022 ISOpub
{u"bull"_s, u"&#8226;"_s}, // bullet = black small circle, U+2022 ISOpub
// bullet is NOT the same as bullet operator, U+2219
{u"hellip"_qs, u"&#8230;"_qs}, // horizontal ellipsis = three dot leader, U+2026 ISOpub
{u"prime"_qs, u"&#8242;"_qs}, // prime = minutes = feet, U+2032 ISOtech
{u"Prime"_qs, u"&#8243;"_qs}, // double prime = seconds = inches, U+2033 ISOtech
{u"oline"_qs, u"&#8254;"_qs}, // overline = spacing overscore, U+203E NEW
{u"frasl"_qs, u"&#8260;"_qs}, // fraction slash, U+2044 NEW
{u"hellip"_s, u"&#8230;"_s}, // horizontal ellipsis = three dot leader, U+2026 ISOpub
{u"prime"_s, u"&#8242;"_s}, // prime = minutes = feet, U+2032 ISOtech
{u"Prime"_s, u"&#8243;"_s}, // double prime = seconds = inches, U+2033 ISOtech
{u"oline"_s, u"&#8254;"_s}, // overline = spacing overscore, U+203E NEW
{u"frasl"_s, u"&#8260;"_s}, // fraction slash, U+2044 NEW
// Letterlike Symbols
{u"weierp"_qs, u"&#8472;"_qs}, // script capital P = power set = Weierstrass p, U+2118 ISOamso
{u"image"_qs, u"&#8465;"_qs}, // black-letter capital I = imaginary part, U+2111 ISOamso
{u"real"_qs, u"&#8476;"_qs}, // black-letter capital R = real part symbol, U+211C ISOamso
{u"trade"_qs, u"&#8482;"_qs}, // trade mark sign, U+2122 ISOnum
{u"alefsym"_qs, u"&#8501;"_qs}, // alef symbol = first transfinite cardinal, U+2135 NEW
{u"weierp"_s, u"&#8472;"_s}, // script capital P = power set = Weierstrass p, U+2118 ISOamso
{u"image"_s, u"&#8465;"_s}, // black-letter capital I = imaginary part, U+2111 ISOamso
{u"real"_s, u"&#8476;"_s}, // black-letter capital R = real part symbol, U+211C ISOamso
{u"trade"_s, u"&#8482;"_s}, // trade mark sign, U+2122 ISOnum
{u"alefsym"_s, u"&#8501;"_s}, // alef symbol = first transfinite cardinal, U+2135 NEW
// alef symbol is NOT the same as hebrew letter alef,
// U+05D0 although the same glyph could be used to depict both characters
// Arrows
{u"larr"_qs, u"&#8592;"_qs}, // leftwards arrow, U+2190 ISOnum
{u"uarr"_qs, u"&#8593;"_qs}, // upwards arrow, U+2191 ISOnum
{u"rarr"_qs, u"&#8594;"_qs}, // rightwards arrow, U+2192 ISOnum
{u"darr"_qs, u"&#8595;"_qs}, // downwards arrow, U+2193 ISOnum
{u"harr"_qs, u"&#8596;"_qs}, // left right arrow, U+2194 ISOamsa
{u"crarr"_qs, u"&#8629;"_qs}, // downwards arrow with corner leftwards = carriage return, U+21B5 NEW
{u"lArr"_qs, u"&#8656;"_qs}, // leftwards double arrow, U+21D0 ISOtech
{u"larr"_s, u"&#8592;"_s}, // leftwards arrow, U+2190 ISOnum
{u"uarr"_s, u"&#8593;"_s}, // upwards arrow, U+2191 ISOnum
{u"rarr"_s, u"&#8594;"_s}, // rightwards arrow, U+2192 ISOnum
{u"darr"_s, u"&#8595;"_s}, // downwards arrow, U+2193 ISOnum
{u"harr"_s, u"&#8596;"_s}, // left right arrow, U+2194 ISOamsa
{u"crarr"_s, u"&#8629;"_s}, // downwards arrow with corner leftwards = carriage return, U+21B5 NEW
{u"lArr"_s, u"&#8656;"_s}, // leftwards double arrow, U+21D0 ISOtech
// Unicode does not say that lArr is the same as the 'is implied by' arrow
// but also does not have any other character for that function. So lArr can
// be used for 'is implied by' as ISOtech suggests
{u"uArr"_qs, u"&#8657;"_qs}, // upwards double arrow, U+21D1 ISOamsa
{u"rArr"_qs, u"&#8658;"_qs}, // rightwards double arrow, U+21D2 ISOtech
{u"uArr"_s, u"&#8657;"_s}, // upwards double arrow, U+21D1 ISOamsa
{u"rArr"_s, u"&#8658;"_s}, // rightwards double arrow, U+21D2 ISOtech
// Unicode does not say this is the 'implies' character but does not have
// another character with this function so rArr can be used for 'implies'
// as ISOtech suggests
{u"dArr"_qs, u"&#8659;"_qs}, // downwards double arrow, U+21D3 ISOamsa
{u"hArr"_qs, u"&#8660;"_qs}, // left right double arrow, U+21D4 ISOamsa
{u"dArr"_s, u"&#8659;"_s}, // downwards double arrow, U+21D3 ISOamsa
{u"hArr"_s, u"&#8660;"_s}, // left right double arrow, U+21D4 ISOamsa
// Mathematical Operators
{u"forall"_qs, u"&#8704;"_qs}, // for all, U+2200 ISOtech
{u"part"_qs, u"&#8706;"_qs}, // partial differential, U+2202 ISOtech
{u"exist"_qs, u"&#8707;"_qs}, // there exists, U+2203 ISOtech
{u"empty"_qs, u"&#8709;"_qs}, // empty set = null set, U+2205 ISOamso
{u"nabla"_qs, u"&#8711;"_qs}, // nabla = backward difference, U+2207 ISOtech
{u"isin"_qs, u"&#8712;"_qs}, // element of, U+2208 ISOtech
{u"notin"_qs, u"&#8713;"_qs}, // not an element of, U+2209 ISOtech
{u"ni"_qs, u"&#8715;"_qs}, // contains as member, U+220B ISOtech
{u"prod"_qs, u"&#8719;"_qs}, // n-ary product = product sign, U+220F ISOamsb
{u"forall"_s, u"&#8704;"_s}, // for all, U+2200 ISOtech
{u"part"_s, u"&#8706;"_s}, // partial differential, U+2202 ISOtech
{u"exist"_s, u"&#8707;"_s}, // there exists, U+2203 ISOtech
{u"empty"_s, u"&#8709;"_s}, // empty set = null set, U+2205 ISOamso
{u"nabla"_s, u"&#8711;"_s}, // nabla = backward difference, U+2207 ISOtech
{u"isin"_s, u"&#8712;"_s}, // element of, U+2208 ISOtech
{u"notin"_s, u"&#8713;"_s}, // not an element of, U+2209 ISOtech
{u"ni"_s, u"&#8715;"_s}, // contains as member, U+220B ISOtech
{u"prod"_s, u"&#8719;"_s}, // n-ary product = product sign, U+220F ISOamsb
// prod is NOT the same character as U+03A0 'greek capital letter pi' though
// the same glyph might be used for both
{u"sum"_qs, u"&#8721;"_qs}, // n-ary summation, U+2211 ISOamsb
{u"sum"_s, u"&#8721;"_s}, // n-ary summation, U+2211 ISOamsb
// sum is NOT the same character as U+03A3 'greek capital letter sigma'
// though the same glyph might be used for both
{u"minus"_qs, u"&#8722;"_qs}, // minus sign, U+2212 ISOtech
{u"lowast"_qs, u"&#8727;"_qs}, // asterisk operator, U+2217 ISOtech
{u"radic"_qs, u"&#8730;"_qs}, // square root = radical sign, U+221A ISOtech
{u"prop"_qs, u"&#8733;"_qs}, // proportional to, U+221D ISOtech
{u"infin"_qs, u"&#8734;"_qs}, // infinity, U+221E ISOtech
{u"ang"_qs, u"&#8736;"_qs}, // angle, U+2220 ISOamso
{u"and"_qs, u"&#8743;"_qs}, // logical and = wedge, U+2227 ISOtech
{u"or"_qs, u"&#8744;"_qs}, // logical or = vee, U+2228 ISOtech
{u"cap"_qs, u"&#8745;"_qs}, // intersection = cap, U+2229 ISOtech
{u"cup"_qs, u"&#8746;"_qs}, // union = cup, U+222A ISOtech
{u"int"_qs, u"&#8747;"_qs}, // integral, U+222B ISOtech
{u"there4"_qs, u"&#8756;"_qs}, // therefore, U+2234 ISOtech
{u"sim"_qs, u"&#8764;"_qs}, // tilde operator = varies with = similar to, U+223C ISOtech
{u"minus"_s, u"&#8722;"_s}, // minus sign, U+2212 ISOtech
{u"lowast"_s, u"&#8727;"_s}, // asterisk operator, U+2217 ISOtech
{u"radic"_s, u"&#8730;"_s}, // square root = radical sign, U+221A ISOtech
{u"prop"_s, u"&#8733;"_s}, // proportional to, U+221D ISOtech
{u"infin"_s, u"&#8734;"_s}, // infinity, U+221E ISOtech
{u"ang"_s, u"&#8736;"_s}, // angle, U+2220 ISOamso
{u"and"_s, u"&#8743;"_s}, // logical and = wedge, U+2227 ISOtech
{u"or"_s, u"&#8744;"_s}, // logical or = vee, U+2228 ISOtech
{u"cap"_s, u"&#8745;"_s}, // intersection = cap, U+2229 ISOtech
{u"cup"_s, u"&#8746;"_s}, // union = cup, U+222A ISOtech
{u"int"_s, u"&#8747;"_s}, // integral, U+222B ISOtech
{u"there4"_s, u"&#8756;"_s}, // therefore, U+2234 ISOtech
{u"sim"_s, u"&#8764;"_s}, // tilde operator = varies with = similar to, U+223C ISOtech
// tilde operator is NOT the same character as the tilde, U+007E,
// although the same glyph might be used to represent both
{u"cong"_qs, u"&#8773;"_qs}, // approximately equal to, U+2245 ISOtech
{u"asymp"_qs, u"&#8776;"_qs}, // almost equal to = asymptotic to, U+2248 ISOamsr
{u"ne"_qs, u"&#8800;"_qs}, // not equal to, U+2260 ISOtech
{u"equiv"_qs, u"&#8801;"_qs}, // identical to, U+2261 ISOtech
{u"le"_qs, u"&#8804;"_qs}, // less-than or equal to, U+2264 ISOtech
{u"ge"_qs, u"&#8805;"_qs}, // greater-than or equal to, U+2265 ISOtech
{u"sub"_qs, u"&#8834;"_qs}, // subset of, U+2282 ISOtech
{u"sup"_qs, u"&#8835;"_qs}, // superset of, U+2283 ISOtech
{u"nsub"_qs, u"&#8836;"_qs}, // not a subset of, U+2284 ISOamsn
{u"sube"_qs, u"&#8838;"_qs}, // subset of or equal to, U+2286 ISOtech
{u"supe"_qs, u"&#8839;"_qs}, // superset of or equal to, U+2287 ISOtech
{u"oplus"_qs, u"&#8853;"_qs}, // circled plus = direct sum, U+2295 ISOamsb
{u"otimes"_qs, u"&#8855;"_qs}, // circled times = vector product, U+2297 ISOamsb
{u"perp"_qs, u"&#8869;"_qs}, // up tack = orthogonal to = perpendicular, U+22A5 ISOtech
{u"sdot"_qs, u"&#8901;"_qs}, // dot operator, U+22C5 ISOamsb
{u"cong"_s, u"&#8773;"_s}, // approximately equal to, U+2245 ISOtech
{u"asymp"_s, u"&#8776;"_s}, // almost equal to = asymptotic to, U+2248 ISOamsr
{u"ne"_s, u"&#8800;"_s}, // not equal to, U+2260 ISOtech
{u"equiv"_s, u"&#8801;"_s}, // identical to, U+2261 ISOtech
{u"le"_s, u"&#8804;"_s}, // less-than or equal to, U+2264 ISOtech
{u"ge"_s, u"&#8805;"_s}, // greater-than or equal to, U+2265 ISOtech
{u"sub"_s, u"&#8834;"_s}, // subset of, U+2282 ISOtech
{u"sup"_s, u"&#8835;"_s}, // superset of, U+2283 ISOtech
{u"nsub"_s, u"&#8836;"_s}, // not a subset of, U+2284 ISOamsn
{u"sube"_s, u"&#8838;"_s}, // subset of or equal to, U+2286 ISOtech
{u"supe"_s, u"&#8839;"_s}, // superset of or equal to, U+2287 ISOtech
{u"oplus"_s, u"&#8853;"_s}, // circled plus = direct sum, U+2295 ISOamsb
{u"otimes"_s, u"&#8855;"_s}, // circled times = vector product, U+2297 ISOamsb
{u"perp"_s, u"&#8869;"_s}, // up tack = orthogonal to = perpendicular, U+22A5 ISOtech
{u"sdot"_s, u"&#8901;"_s}, // dot operator, U+22C5 ISOamsb
// dot operator is NOT the same character as U+00B7 middle dot
// Miscellaneous Technical
{u"lceil"_qs, u"&#8968;"_qs}, // left ceiling = APL upstile, U+2308 ISOamsc
{u"rceil"_qs, u"&#8969;"_qs}, // right ceiling, U+2309 ISOamsc
{u"lfloor"_qs, u"&#8970;"_qs}, // left floor = APL downstile, U+230A ISOamsc
{u"rfloor"_qs, u"&#8971;"_qs}, // right floor, U+230B ISOamsc
{u"lang"_qs, u"&#9001;"_qs}, // left-pointing angle bracket = bra, U+2329 ISOtech
{u"lceil"_s, u"&#8968;"_s}, // left ceiling = APL upstile, U+2308 ISOamsc
{u"rceil"_s, u"&#8969;"_s}, // right ceiling, U+2309 ISOamsc
{u"lfloor"_s, u"&#8970;"_s}, // left floor = APL downstile, U+230A ISOamsc
{u"rfloor"_s, u"&#8971;"_s}, // right floor, U+230B ISOamsc
{u"lang"_s, u"&#9001;"_s}, // left-pointing angle bracket = bra, U+2329 ISOtech
// lang is NOT the same character as U+003C 'less than sign'
// or U+2039 'single left-pointing angle quotation mark'
{u"rang"_qs, u"&#9002;"_qs}, // right-pointing angle bracket = ket, U+232A ISOtech
{u"rang"_s, u"&#9002;"_s}, // right-pointing angle bracket = ket, U+232A ISOtech
// rang is NOT the same character as U+003E 'greater than sign'
// or U+203A 'single right-pointing angle quotation mark'
// Geometric Shapes
{u"loz"_qs, u"&#9674;"_qs}, // lozenge, U+25CA ISOpub
{u"loz"_s, u"&#9674;"_s}, // lozenge, U+25CA ISOpub
// Miscellaneous Symbols
{u"spades"_qs, u"&#9824;"_qs}, // black spade suit, U+2660 ISOpub
{u"clubs"_qs, u"&#9827;"_qs}, // black club suit = shamrock, U+2663 ISOpub
{u"hearts"_qs, u"&#9829;"_qs}, // black heart suit = valentine, U+2665 ISOpub
{u"diams"_qs, u"&#9830;"_qs} // black diamond suit, U+2666 ISOpub
{u"spades"_s, u"&#9824;"_s}, // black spade suit, U+2660 ISOpub
{u"clubs"_s, u"&#9827;"_s}, // black club suit = shamrock, U+2663 ISOpub
{u"hearts"_s, u"&#9829;"_s}, // black heart suit = valentine, U+2665 ISOpub
{u"diams"_s, u"&#9830;"_s} // black diamond suit, U+2666 ISOpub
};
return HTMLEntities.value(name);
}
@@ -392,7 +392,7 @@ namespace
int nmin = 8;
int nsec = 9;
// Also accept obsolete form "Weekday, DD-Mon-YY HH:MM:SS ±hhmm"
QRegularExpression rx {u"^(?:([A-Z][a-z]+),\\s*)?(\\d{1,2})(\\s+|-)([^-\\s]+)(\\s+|-)(\\d{2,4})\\s+(\\d\\d):(\\d\\d)(?::(\\d\\d))?\\s+(\\S+)$"_qs};
QRegularExpression rx {u"^(?:([A-Z][a-z]+),\\s*)?(\\d{1,2})(\\s+|-)([^-\\s]+)(\\s+|-)(\\d{2,4})\\s+(\\d\\d):(\\d\\d)(?::(\\d\\d))?\\s+(\\S+)$"_s};
QRegularExpressionMatch rxMatch;
QStringList parts;
if (str.indexOf(rx, 0, &rxMatch) == 0)
@@ -407,7 +407,7 @@ namespace
else
{
// Check for the obsolete form "Wdy Mon DD HH:MM:SS YYYY"
rx = QRegularExpression {u"^([A-Z][a-z]+)\\s+(\\S+)\\s+(\\d\\d)\\s+(\\d\\d):(\\d\\d):(\\d\\d)\\s+(\\d\\d\\d\\d)$"_qs};
rx = QRegularExpression {u"^([A-Z][a-z]+)\\s+(\\S+)\\s+(\\d\\d)\\s+(\\d\\d):(\\d\\d):(\\d\\d)\\s+(\\d\\d\\d\\d)$"_s};
if (str.indexOf(rx, 0, &rxMatch) != 0)
return QDateTime::currentDateTime();
@@ -466,7 +466,7 @@ namespace
bool negOffset = false;
if (parts.count() > 10)
{
rx = QRegularExpression {u"^([+-])(\\d\\d)(\\d\\d)$"_qs};
rx = QRegularExpression {u"^([+-])(\\d\\d)(\\d\\d)$"_s};
if (parts[10].indexOf(rx, 0, &rxMatch) == 0)
{
// It's a UTC offset ±hhmm
@@ -622,10 +622,10 @@ void RSS::Private::Parser::parseRssArticle(QXmlStreamReader &xml)
}
else if (name == u"enclosure")
{
if (xml.attributes().value(u"type"_qs) == u"application/x-bittorrent")
article[Article::KeyTorrentURL] = xml.attributes().value(u"url"_qs).toString();
else if (xml.attributes().value(u"type"_qs).isEmpty())
altTorrentUrl = xml.attributes().value(u"url"_qs).toString();
if (xml.attributes().value(u"type"_s) == u"application/x-bittorrent")
article[Article::KeyTorrentURL] = xml.attributes().value(u"url"_s).toString();
else if (xml.attributes().value(u"type"_s).isEmpty())
altTorrentUrl = xml.attributes().value(u"url"_s).toString();
}
else if (name == u"link")
{
@@ -720,7 +720,7 @@ void RSS::Private::Parser::parseAtomArticle(QXmlStreamReader &xml)
{
const QString link = (xml.attributes().isEmpty()
? xml.readElementText().trimmed()
: xml.attributes().value(u"href"_qs).toString());
: xml.attributes().value(u"href"_s).toString());
if (link.startsWith(u"magnet:", Qt::CaseInsensitive))
{
@@ -783,7 +783,7 @@ void RSS::Private::Parser::parseAtomArticle(QXmlStreamReader &xml)
void RSS::Private::Parser::parseAtomChannel(QXmlStreamReader &xml)
{
m_baseUrl = xml.attributes().value(u"xml:base"_qs).toString();
m_baseUrl = xml.attributes().value(u"xml:base"_s).toString();
while (!xml.atEnd())
{

60
src/base/rss/rss_session.cpp
View File

@@ -51,18 +51,18 @@
#include "rss_folder.h"
#include "rss_item.h"
const QString CONF_FOLDER_NAME = u"rss"_qs;
const QString DATA_FOLDER_NAME = u"rss/articles"_qs;
const QString FEEDS_FILE_NAME = u"feeds.json"_qs;
const QString CONF_FOLDER_NAME = u"rss"_s;
const QString DATA_FOLDER_NAME = u"rss/articles"_s;
const QString FEEDS_FILE_NAME = u"feeds.json"_s;
using namespace RSS;
QPointer<Session> Session::m_instance = nullptr;
Session::Session()
: m_storeProcessingEnabled(u"RSS/Session/EnableProcessing"_qs)
, m_storeRefreshInterval(u"RSS/Session/RefreshInterval"_qs, 30)
, m_storeMaxArticlesPerFeed(u"RSS/Session/MaxArticlesPerFeed"_qs, 50)
: m_storeProcessingEnabled(u"RSS/Session/EnableProcessing"_s)
, m_storeRefreshInterval(u"RSS/Session/RefreshInterval"_s, 30)
, m_storeMaxArticlesPerFeed(u"RSS/Session/MaxArticlesPerFeed"_s, 50)
, m_workingThread(new QThread)
{
Q_ASSERT(!m_instance); // only one instance is allowed
@@ -86,7 +86,7 @@ Session::Session()
.arg(fileName.toString(), errorString), Log::WARNING);
});
m_itemsByPath.insert(u""_qs, new Folder); // root folder
m_itemsByPath.insert(u""_s, new Folder); // root folder
m_workingThread->start();
load();
@@ -102,22 +102,22 @@ Session::Session()
// (at least on Windows, QSettings is case-insensitive and it can get
// confused when asked about settings that differ only in their case)
auto *settingsStorage = SettingsStorage::instance();
settingsStorage->removeValue(u"Rss/streamList"_qs);
settingsStorage->removeValue(u"Rss/streamAlias"_qs);
settingsStorage->removeValue(u"Rss/open_folders"_qs);
settingsStorage->removeValue(u"Rss/qt5/splitter_h"_qs);
settingsStorage->removeValue(u"Rss/qt5/splitterMain"_qs);
settingsStorage->removeValue(u"Rss/hosts_cookies"_qs);
settingsStorage->removeValue(u"RSS/streamList"_qs);
settingsStorage->removeValue(u"RSS/streamAlias"_qs);
settingsStorage->removeValue(u"RSS/open_folders"_qs);
settingsStorage->removeValue(u"RSS/qt5/splitter_h"_qs);
settingsStorage->removeValue(u"RSS/qt5/splitterMain"_qs);
settingsStorage->removeValue(u"RSS/hosts_cookies"_qs);
settingsStorage->removeValue(u"Rss/Session/EnableProcessing"_qs);
settingsStorage->removeValue(u"Rss/Session/RefreshInterval"_qs);
settingsStorage->removeValue(u"Rss/Session/MaxArticlesPerFeed"_qs);
settingsStorage->removeValue(u"Rss/AutoDownloader/EnableProcessing"_qs);
settingsStorage->removeValue(u"Rss/streamList"_s);
settingsStorage->removeValue(u"Rss/streamAlias"_s);
settingsStorage->removeValue(u"Rss/open_folders"_s);
settingsStorage->removeValue(u"Rss/qt5/splitter_h"_s);
settingsStorage->removeValue(u"Rss/qt5/splitterMain"_s);
settingsStorage->removeValue(u"Rss/hosts_cookies"_s);
settingsStorage->removeValue(u"RSS/streamList"_s);
settingsStorage->removeValue(u"RSS/streamAlias"_s);
settingsStorage->removeValue(u"RSS/open_folders"_s);
settingsStorage->removeValue(u"RSS/qt5/splitter_h"_s);
settingsStorage->removeValue(u"RSS/qt5/splitterMain"_s);
settingsStorage->removeValue(u"RSS/hosts_cookies"_s);
settingsStorage->removeValue(u"Rss/Session/EnableProcessing"_s);
settingsStorage->removeValue(u"Rss/Session/RefreshInterval"_s);
settingsStorage->removeValue(u"Rss/Session/MaxArticlesPerFeed"_s);
settingsStorage->removeValue(u"Rss/AutoDownloader/EnableProcessing"_s);
}
Session::~Session()
@@ -125,7 +125,7 @@ Session::~Session()
qDebug() << "Deleting RSS Session...";
//store();
delete m_itemsByPath[u""_qs]; // deleting root folder
delete m_itemsByPath[u""_s]; // deleting root folder
qDebug() << "RSS Session deleted.";
}
@@ -320,7 +320,7 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
if (!valObj[u"url"].isString())
{
LogMsg(tr("Couldn't load RSS feed. Feed: \"%1\". Reason: URL is required.")
.arg(u"%1\\%2"_qs.arg(folder->path(), key)), Log::WARNING);
.arg(u"%1\\%2"_s.arg(folder->path(), key)), Log::WARNING);
continue;
}
@@ -331,7 +331,7 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
if (uid.isNull())
{
LogMsg(tr("Couldn't load RSS feed. Feed: \"%1\". Reason: UID is invalid.")
.arg(u"%1\\%2"_qs.arg(folder->path(), key)), Log::WARNING);
.arg(u"%1\\%2"_s.arg(folder->path(), key)), Log::WARNING);
continue;
}
@@ -359,7 +359,7 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
else
{
LogMsg(tr("Couldn't load RSS item. Item: \"%1\". Invalid data format.")
.arg(u"%1\\%2"_qs.arg(folder->path(), key)), Log::WARNING);
.arg(u"%1\\%2"_s.arg(folder->path(), key)), Log::WARNING);
}
}
@@ -369,8 +369,8 @@ void Session::loadFolder(const QJsonObject &jsonObj, Folder *folder)
void Session::loadLegacy()
{
const auto legacyFeedPaths = SettingsStorage::instance()->loadValue<QStringList>(u"Rss/streamList"_qs);
const auto feedAliases = SettingsStorage::instance()->loadValue<QStringList>(u"Rss/streamAlias"_qs);
const auto legacyFeedPaths = SettingsStorage::instance()->loadValue<QStringList>(u"Rss/streamList"_s);
const auto feedAliases = SettingsStorage::instance()->loadValue<QStringList>(u"Rss/streamAlias"_s);
if (legacyFeedPaths.size() != feedAliases.size())
{
LogMsg(tr("Corrupted RSS list, not loading it."), Log::WARNING);
@@ -498,7 +498,7 @@ AsyncFileStorage *Session::dataFileStorage() const
Folder *Session::rootFolder() const
{
return static_cast<Folder *>(m_itemsByPath.value(u""_qs));
return static_cast<Folder *>(m_itemsByPath.value(u""_s));
}
QList<Feed *> Session::feeds() const