Browse Source

fixed: Item::Item(const Item & i) should clear the item table

git-svn-id: svn://ttmath.org/publicrep/ezc/trunk@330 e52654a7-88a9-db11-a3e9-0013d4bc506e
master
Tomasz Sowa 11 years ago
parent
commit
c4f5f79218
  1. 4
      src/item.cpp
  2. 4
      src/pattern.cpp

4
src/item.cpp

@ -122,7 +122,7 @@ Item::Item()
Item::Item(const Item & i) : type(i.type), text(i.text), functions(i.functions)
Item::Item(const Item & i) : type(i.type), text(i.text), file_name(i.file_name), functions(i.functions)
{
CopyItemTable(i);
}
@ -133,8 +133,10 @@ Item & Item::operator=(const Item & i)
{
type = i.type;
text = i.text;
file_name = i.file_name;
functions = i.functions;
ClearItems();
CopyItemTable(i);
return *this;

4
src/pattern.cpp

@ -374,7 +374,7 @@ void Pattern::ReadFile(const wchar_t * name, std::wstring & result)
{
if( !IsFileCorrect(name) )
{
CreateMsg(result, L"incorrect file name:", name);
CreateMsg(result, L"incorrect file name: ", name);
}
else
{
@ -388,7 +388,6 @@ void Pattern::ReadFile(const wchar_t * name, std::wstring & result)
bool Pattern::ReadFileFromDir(const std::wstring & dir, const wchar_t * name, std::wstring & result)
{
if( dir.empty() )
@ -397,7 +396,6 @@ bool Pattern::ReadFileFromDir(const std::wstring & dir, const wchar_t * name, st
file_name = dir;
file_name += '/';
file_name += name;
WideToUTF8(file_name, afile_name);
std::ifstream file(afile_name.c_str());

Loading…
Cancel
Save