the first part of reimplementing has been done
now we have app object and singletons are only: log logn plugin and app git-svn-id: svn://ttmath.org/publicrep/winix/trunk@628 e52654a7-88a9-db11-a3e9-0013d4bc506e
This commit is contained in:
@@ -8,11 +8,15 @@
|
||||
*/
|
||||
|
||||
#include "indexpatterns.h"
|
||||
#include "../core/log.h"
|
||||
#include "../core/data.h"
|
||||
#include "core/log.h"
|
||||
|
||||
|
||||
|
||||
void IndexPatterns::SetConfig(Config * pconfig)
|
||||
{
|
||||
config = pconfig;
|
||||
}
|
||||
|
||||
|
||||
Ezc::Pattern * IndexPatterns::GetPattern(const std::string & file, Locale::Lang lang)
|
||||
{
|
||||
@@ -75,7 +79,7 @@ void IndexPatterns::ReadPattern(Tab::iterator & iter, Locale & locale, LocaleFil
|
||||
for(i=0 ; i<len ; ++i)
|
||||
{
|
||||
templ.patterns[i].DeleteWhiteTextItems(delete_white);
|
||||
templ.patterns[i].Directory(data.templates_dir, data.templates_dir_default);
|
||||
templ.patterns[i].Directory(config->templates_dir, config->templates_dir_default);
|
||||
templ.patterns[i].ParseFile(iter->first);
|
||||
|
||||
locale_filter.Filter(templ.patterns[i], locale, static_cast<Locale::Lang>(i));
|
||||
|
Reference in New Issue
Block a user