mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-07-18 21:14:33 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update QtWebapp to 1.7.11

Browse Source
This commit is contained in:
Felix Kauselmann
2020-07-30 12:28:05 +02:00
parent 3de099491f
commit b9c48cc4b6
31 changed files with 796 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
third_party/QtWebApp/templateengine/templateloader.cpp vendored
View File

@ -10,7 +10,9 @@
#include <QDir>
#include <QSet>
TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
using namespace stefanfrings;
TemplateLoader::TemplateLoader(const QSettings *settings, QObject *parent)
: QObject(parent)
{
templatePath=settings->value("path",".").toString();
@ -64,7 +66,6 @@ QString TemplateLoader::tryFile(QString localizedName)
Template TemplateLoader::getTemplate(QString templateName, QString locales)
{
mutex.lock();
QSet<QString> tried; // used to suppress duplicate attempts
QStringList locs=locales.split(',',QString::SkipEmptyParts);
@ -78,7 +79,6 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
{
QString document=tryFile(localizedName);
if (!document.isEmpty()) {
mutex.unlock();
return Template(document,localizedName);
}
tried.insert(localizedName);
@ -95,7 +95,6 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
QString document=tryFile(localizedName);
if (!document.isEmpty())
{
mutex.unlock();
return Template(document,localizedName);
}
tried.insert(localizedName);
@ -106,11 +105,9 @@ Template TemplateLoader::getTemplate(QString templateName, QString locales)
QString document=tryFile(templateName);
if (!document.isEmpty())
{
mutex.unlock();
return Template(document,templateName);
}
qCritical("TemplateCache: cannot find template %s",qPrintable(templateName));
mutex.unlock();
return Template("",templateName);
}