noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-13 19:49:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

First set of code updates

Browse source 
Reference:
- https://doc.qt.io/qt-6/qtextstream.html#setEncoding
- https://doc.qt.io/qt-6/qtcore-changes-qt6.html#the-qstringref-class
- https://doc.qt.io/qt-6/qstringview.html
This commit is contained in:
zneix 2021-07-30 17:10:00 +02:00
parent e14050d40c
commit 1330076d5d
No known key found for this signature in database
GPG key ID: 911916E0523B22F6
1 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/common/LinkParser.cpp
View file

@ -5,7 +5,7 @@
#include <QRegularExpression> #include <QRegularExpression>
#include <QSet> #include <QSet>
#include <QString> #include <QString>
#include <QStringRef> #include <QStringView>
#include <QTextStream> #include <QTextStream>
namespace chatterino { namespace chatterino {
@ -16,7 +16,7 @@ namespace {
QFile file(":/tlds.txt"); QFile file(":/tlds.txt");
file.open(QFile::ReadOnly); file.open(QFile::ReadOnly);
QTextStream stream(&file); QTextStream stream(&file);
stream.setCodec("UTF-8"); // stream.setEncoding(QStringConverter::Encoding::Utf8);
int safetyMax = 20000; int safetyMax = 20000;
QSet<QString> set; QSet<QString> set;
@ -35,7 +35,7 @@ namespace {
return tlds; return tlds;
} }
bool isValidHostname(QStringRef &host) bool isValidHostname(QStringView &host)
{ {
int index = host.lastIndexOf('.'); int index = host.lastIndexOf('.');
@ -43,7 +43,7 @@ namespace {
tlds().contains(host.mid(index + 1).toString().toLower()); tlds().contains(host.mid(index + 1).toString().toLower());
} }
bool isValidIpv4(QStringRef &host) bool isValidIpv4(QStringView &host)
{ {
static auto exp = QRegularExpression("^\\d{1,3}(?:\\.\\d{1,3}){3}$"); static auto exp = QRegularExpression("^\\d{1,3}(?:\\.\\d{1,3}){3}$");
@ -51,7 +51,7 @@ namespace {
} }
#ifdef C_MATCH_IPV6_LINK #ifdef C_MATCH_IPV6_LINK
bool isValidIpv6(QStringRef &host) bool isValidIpv6(QStringView &host)
{ {
static auto exp = QRegularExpression("^\\[[a-fA-F0-9:%]+\\]$"); static auto exp = QRegularExpression("^\\[[a-fA-F0-9:%]+\\]$");
@ -66,17 +66,17 @@ LinkParser::LinkParser(const QString &unparsedString)
// This is not implemented with a regex to increase performance. // This is not implemented with a regex to increase performance.
// We keep removing parts of the url until there's either nothing left or we fail. // We keep removing parts of the url until there's either nothing left or we fail.
QStringRef l(&unparsedString); QStringView l(unparsedString);
bool hasHttp = false; bool hasHttp = false;
// Protocol `https?://` // Protocol `https?://`
if (l.startsWith("https://", Qt::CaseInsensitive)) if (l.startsWith(*"https://", Qt::CaseInsensitive))
{ {
hasHttp = true; hasHttp = true;
l = l.mid(8); l = l.mid(8);
} }
else if (l.startsWith("http://", Qt::CaseInsensitive)) else if (l.startsWith(*"http://", Qt::CaseInsensitive))
{ {
hasHttp = true; hasHttp = true;
l = l.mid(7); l = l.mid(7);
@ -86,7 +86,7 @@ LinkParser::LinkParser(const QString &unparsedString)
// Not supported for security reasons (misleading links) // Not supported for security reasons (misleading links)
// Host `a.b.c.com` // Host `a.b.c.com`
QStringRef host = l; QStringView host = l;
bool lastWasDot = true; bool lastWasDot = true;
bool inIpv6 = false; bool inIpv6 = false;