Subversion Repositories spk

Rev

Rev 223 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 223 Rev 224
Line 18... Line 18...
18 
	m_sCurrentDir = dir;
 18 
	m_sCurrentDir = dir;
19 
	m_fileSystem.setAddon(m_sAddon);
 19 
	m_fileSystem.setAddon(m_sAddon);
20 
	return m_fileSystem.LoadFilesystem(dir, m_iMaxPatch);
 20 
	return m_fileSystem.LoadFilesystem(dir, m_iMaxPatch);
21 
}
 21 
}
22 
 
 22 
 
23 
bool CModDiff::startDiff(const Utils::String &sModFile)
 23 
bool CModDiff::startDiff(const Utils::WString &sModFile)
24 
{
 24 
{
25 
	ClearError();
 25 
	ClearError();
26 
	if ( !CFileIO::Exists(sModFile) ) { m_iError = MDERR_FILENOTFOUND; return false; }
 26 
	if ( !CFileIO::Exists(sModFile) ) { m_iError = MDERR_FILENOTFOUND; return false; }
27 
 
 27 
 
28 
	delete m_pCatFile;
 28 
	delete m_pCatFile;
Line 350... Line 350...
350 
		node->DeleteData();
 350 
		node->DeleteData();
351 
	}
 351 
	}
352 
	m_lFiles.clear();
 352 
	m_lFiles.clear();
353 
}
 353 
}
354 
 
 354 
 
355 
bool CModDiff::WriteDiff(const Utils::String &file)
 355 
bool CModDiff::WriteDiff(const Utils::WString &file)
356 
{
 356 
{
357 
	if ( m_lFiles.empty() ) return false;
 357 
	if ( m_lFiles.empty() ) return false;
358 
 
 358 
 
359 
	Utils::WStringList lines;
 359 
	Utils::WStringList lines;
360
360
Line 381... Line 381...
381 
 
 381 
 
382 
	CFileIO File(file);
 382 
	CFileIO File(file);
383 
	return File.writeFile(&lines);
 383 
	return File.writeFile(&lines);
384 
}
 384 
}
385 
 
 385 
 
386 
bool CModDiff::ReadDiff(const Utils::String &file)
 386 
bool CModDiff::ReadDiff(const Utils::WString &file)
387 
{
 387 
{
388 
	Clean();
 388 
	Clean();
389 
 
 389 
 
390 
	CFileIO File(file);
 390 
	CFileIO File(file);
391 
	if ( !File.exists() ) return false;
 391 
	if ( !File.exists() ) return false;
Line 432... Line 432...
432 
	}
 432 
	}
433 
 
 433 
 
434 
	return false;
 434 
	return false;
435 
}
 435 
}
436 
 
 436 
 
437 
bool CModDiff::ApplyMod(const Utils::String &mod)
 437 
bool CModDiff::ApplyMod(const Utils::WString &mod)
438 
{
 438 
{
439 
	return m_fileSystem.addMod(mod);
 439 
	return m_fileSystem.addMod(mod);
440 
}
 440 
}
441 
 
 441 
 
442 
bool CModDiff::ApplyDiff(const Utils::String &mod)
 442 
bool CModDiff::ApplyDiff(const Utils::WString &mod)
443 
{
 443 
{
444 
	if ( m_lFiles.empty() ) return false;
 444 
	if ( m_lFiles.empty() ) return false;
445 
 
 445 
 
446 
	this->ApplyMod(mod);
 446 
	this->ApplyMod(mod);
447 
 
 447