diff options
Diffstat (limited to 'src/backend/managers/cdisplaytemplatemgr.cpp')
| -rw-r--r-- | src/backend/managers/cdisplaytemplatemgr.cpp | 31 |
1 files changed, 16 insertions, 15 deletions
diff --git a/src/backend/managers/cdisplaytemplatemgr.cpp b/src/backend/managers/cdisplaytemplatemgr.cpp index 4722734..11d2a59 100644 --- a/src/backend/managers/cdisplaytemplatemgr.cpp +++ b/src/backend/managers/cdisplaytemplatemgr.cpp @@ -7,20 +7,19 @@ * **********/ -#include "cdisplaytemplatemgr.h" +#include "backend/managers/cdisplaytemplatemgr.h" +#include <QDebug> +#include <QFile> +#include <QFileInfo> +#include <QStringList> +#include <QTextStream> +#include "backend/config/cbtconfig.h" #include "backend/drivers/cswordmoduleinfo.h" #include "backend/managers/clanguagemgr.h" -#include "backend/config/cbtconfig.h" #include "util/cpointers.h" -#include "util/directoryutil.h" +#include "util/directory.h" -//Qt -#include <QStringList> -#include <QFile> -#include <QFileInfo> -#include <QTextStream> -#include <QDebug> CDisplayTemplateMgr::CDisplayTemplateMgr() { loadTemplates(); @@ -68,7 +67,7 @@ const QString CDisplayTemplateMgr::fillTemplate( const QString& name, const QStr if (moduleCount >= 2) { //create header for the modules - qDebug("There were more than 1 module, create headers"); + qDebug() << "There were more than 1 module, create headers"; QString header; QList<CSwordModuleInfo*>::iterator end_it = settings.modules.end(); @@ -92,7 +91,7 @@ const QString CDisplayTemplateMgr::fillTemplate( const QString& name, const QStr CLanguageMgr::LangMap langMap = CPointers::languageMgr()->availableLanguages(); qDebug() << "langMap length:" << langMap.count(); - qDebug("loop through langMap"); + qDebug() << "loop through langMap"; foreach(const CLanguageMgr::Language* lang, langMap) { //const CLanguageMgr::Language* lang = *it; //qDebug() << "foreach, lang: "; @@ -146,12 +145,14 @@ const QString CDisplayTemplateMgr::fillTemplate( const QString& name, const QStr } void CDisplayTemplateMgr::loadTemplates() { + namespace DU = util::directory; + QStringList files; - foreach (QString file, util::filesystem::DirectoryUtil::getDisplayTemplatesDir().entryList(QStringList("*.tmpl"))) { - files += util::filesystem::DirectoryUtil::getDisplayTemplatesDir().canonicalPath() + "/" + file; + foreach (QString file, DU::getDisplayTemplatesDir().entryList(QStringList("*.tmpl"))) { + files += DU::getDisplayTemplatesDir().canonicalPath() + "/" + file; } - foreach (QString file, util::filesystem::DirectoryUtil::getUserDisplayTemplatesDir().entryList(QStringList("*.tmpl"))) { - files += util::filesystem::DirectoryUtil::getUserDisplayTemplatesDir().canonicalPath() + "/" + file; + foreach (QString file, DU::getUserDisplayTemplatesDir().entryList(QStringList("*.tmpl"))) { + files += DU::getUserDisplayTemplatesDir().canonicalPath() + "/" + file; } foreach (QString file, files) { |