mirror/yacreader
1
0
Fork 0
mirror of https://github.com/YACReader/yacreader synced 2025-11-16 23:12:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed LibraryServer in Qt5

Browse Source 
moved server_log to standardPath
This commit is contained in:
Luis Ángel San Martín
2013-11-20 19:34:06 +01:00
parent 52f8a6e56a
commit 2b2c1de277
17 changed files with 184 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
YACReaderLibrary/server/lib/bfTemplateEngine/template.cpp
View File

@ -13,6 +13,7 @@ Template::Template(QString source, QString sourceName)
}
Template::Template(QFile& file, QTextCodec* textCodec) {
this->warnings=false;
sourceName=QFileInfo(file.fileName()).baseName();
if (!file.isOpen()) {
file.open(QFile::ReadOnly | QFile::Text);

9
YACReaderLibrary/server/lib/bfTemplateEngine/templateloader.cpp
View File

@ -9,6 +9,7 @@
#include <QStringList>
#include <QDir>
#include <QSet>
#include <QApplication>
TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
: QObject(parent)
@ -21,16 +22,16 @@ TemplateLoader::TemplateLoader(QSettings* settings, QObject* parent)
if (QDir::isRelativePath(templatePath))
#endif
{
QFileInfo configFile(settings->fileName());
templatePath=QFileInfo(configFile.absolutePath(),templatePath).absoluteFilePath();
QFileInfo configFile(QApplication::applicationDirPath());
templatePath=QFileInfo(QApplication::applicationDirPath(),templatePath).absoluteFilePath();
}
fileNameSuffix=settings->value("suffix",".tpl").toString();
QString encoding=settings->value("encoding","UTF-8").toString();
QString encoding=settings->value("encoding").toString();
if (encoding.isEmpty()) {
textCodec=QTextCodec::codecForLocale();
}
else {
textCodec=QTextCodec::codecForName(encoding.toLatin1());
textCodec=QTextCodec::codecForName(encoding.toLocal8Bit());
}
qDebug("TemplateLoader: path=%s, codec=%s",qPrintable(templatePath),textCodec->name().data());
}