mirror of
https://github.com/YACReader/yacreader
synced 2026-04-12 15:49:53 -04:00
Fix all compilation issues after enabling QT_DISABLE_DEPRECATED_UP_TO
This commit is contained in:
@ -10,6 +10,7 @@
|
||||
#include <QDir>
|
||||
#include <QSet>
|
||||
#include <QTextStream>
|
||||
#include <utility>
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
#include <QRegularExpression>
|
||||
#else
|
||||
@ -81,7 +82,7 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
|
||||
#endif
|
||||
|
||||
// Search for exact match
|
||||
foreach (QString loc,locs)
|
||||
for (QString loc : std::as_const(locs))
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
loc.replace(QRegularExpression(";.*"),"");
|
||||
@ -102,7 +103,7 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
|
||||
}
|
||||
|
||||
// Search for correct language but any country
|
||||
foreach (QString loc,locs)
|
||||
for (QString loc : std::as_const(locs))
|
||||
{
|
||||
#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
|
||||
loc.replace(QRegularExpression("[;_-].*"),"");
|
||||
|
||||
Reference in New Issue
Block a user