chatterino2
Code Issues

chore: remove old Qt 5.12 code, update docs and FreeBSD runner (#5396)

Browse Source 
Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
nerix
2024-06-23 14:26:59 +02:00
committed by GitHub
parent 4421b6c90a
commit 189be8c68f
30 changed files with 35 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/util/Helpers.cpp
+4 -8
View File
@@ -11,7 +11,7 @@ namespace chatterino {
namespace _helpers_internal {
SizeType skipSpace(StringView view, SizeType startPos)
SizeType skipSpace(QStringView view, SizeType startPos)
{
while (startPos < view.length() && view.at(startPos).isSpace())
{
@@ -20,7 +20,7 @@ namespace _helpers_internal {
return startPos - 1;
}
bool matchesIgnorePlural(StringView word, const QString &expected)
bool matchesIgnorePlural(QStringView word, const QString &expected)
{
if (!word.startsWith(expected))
{
@@ -34,7 +34,7 @@ namespace _helpers_internal {
word.at(word.length() - 1).toLatin1() == 's';
}
std::pair<uint64_t, bool> findUnitMultiplierToSec(StringView view,
std::pair<uint64_t, bool> findUnitMultiplierToSec(QStringView view,
SizeType &pos)
{
// Step 1. find end of unit
@@ -207,11 +207,7 @@ int64_t parseDurationToSeconds(const QString &inputString,
return -1;
}
#if QT_VERSION >= QT_VERSION_CHECK(5, 15, 2)
StringView input(inputString);
#else
StringView input(&inputString);
#endif
QStringView input(inputString);
input = input.trimmed();
uint64_t currentValue = 0;