WebSVN – spk – Diff – /libspk/src/CatFile.cpp

+{
 	m_iDataType = CATFILE_NONE;
 	m_sData = NULL;
 	m_lSize = 0;
 	m_bCreate = false;
+	_lFiles = new std::vector<SInCatFile *>;
+}
 CCatFile::~CCatFile ()
+{
 	m_fDatFile.close();
 		WriteCatFile ();
 		m_fCatFile.close();
+	}
 	_clearFiles();
+	delete _lFiles;
 	if ( m_sData ) delete []m_sData;
+}
 void CCatFile::_clearFiles()
+{
-	for ( SInCatFile *c = m_lFiles.First(); c; c = m_lFiles.Next() )
+	for(auto itr = _lFiles->begin(); itr != _lFiles->end(); itr++)
+	{
-		if ( c->sData )
+		if ((*itr)->sData )
-			delete []c->sData;
+			delete [](*itr)->sData;
-		delete c;
+		delete (*itr);
+	}
-	m_lFiles.clear();
+	_lFiles->clear();
+}
 bool CCatFile::IsAddonDir(CyString dir)
+{
 	CyString d = dir;
 		if ( !DecryptData () ) return CATERR_DECRYPT;
 		m_sData[File.fileSize()] = 0;
 		readFiles ();
+	}
-	m_sAddonDir = addon;
+	_sAddonDir = addon.ToString();
 	m_fCatFile.open ( catfile );
 	if ( readtype != CATREAD_JUSTCONTENTS ) {
 		m_fDatFile.open ( datfile );
 		long compare = 0;
 		if ( m_fDatFile.startRead() ) {
 			compare = m_fDatFile.fileSize();
 			m_fDatFile.close();
+		}
-		SInCatFile *c = m_lFiles.Back ()->Data();
+		SInCatFile *c = _lFiles->back();
-		if ( (c->lSize + c->lOffset) != compare ) {
+		if (c && (c->lSize + c->lOffset) != compare ) {
 //			return CATERR_MISMATCH;
+		}
+	}
 	if ( readtype >= CATREAD_DAT ) LoadDatFile ();
 	return CATERR_NONE;
+}
-bool CCatFile::RemoveFile ( CyString file )
+bool CCatFile::removeFile(const Utils::String &file)
+{
-	if ( !m_sAddonDir.Empty() ) {
+	if ( !_sAddonDir.empty() ) {
-		SInCatFile *f = FindData ( m_sAddonDir + ";\\" + file );
+		SInCatFile *f = findData(_sAddonDir + ";\\" + file);
 		if ( f )
-			RemoveFile(f);
+			removeFile(f);
+	}
+	{
-		SInCatFile *f = FindData ( CyString(";addon\\") + file );
+		SInCatFile *f = findData(";addon\\" + file);
 		if ( f )
-			RemoveFile(f);
+			removeFile(f);
+	}
-	SInCatFile *f = FindData ( file );
+	SInCatFile *f = findData(file);
 	if ( !f )
+	{
 		m_iError = CATERR_NOFILE;
 		return false;
+	}
-	return RemoveFile ( f );
+	return removeFile(f);
+}
 void CCatFile::LoadDatFile ()
+{
 	if ( m_fDatFile.NoFile() )
 		return;
-	if ( m_fDatFile.startRead() ) {
+	if ( m_fDatFile.startRead() )
+	{
-		for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() )
+		for(auto itr = _lFiles->cbegin(); itr != _lFiles->cend(); ++itr)
+		{
-			SInCatFile *c = node->Data();
+			SInCatFile *c = *itr;
 			if ( c->sData )	delete c->sData;
 			try {
 				c->sData = new unsigned char[c->lSize + 1];
 			}
 			catch (std::exception &e) {
 				CLog::logf(CLog::Log_IO, 2, "CCatFile::LoadDatFile() unable to malloc data storage: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
 				continue;
+			}
 			try {
 				m_fDatFile.read(c->sData, c->lSize);
 			}
 			catch(std::exception &e) {
 				CLog::logf(CLog::Log_IO, 2, "CCatFile::LoadDatFile() unable to read file data: %s, %d (%s)", c->sFile.c_str(), c->lSize, e.what());
 				continue;
+			}
 			c->bDecrypted = false;
 		m_fDatFile.close();
+	}
+}
 bool CCatFile::readFiles ()
 {
 	size_t offset = 0;
 	int max = 0;
 	Utils::String *lines = Utils::String(m_sData).tokenise("\n", &max);
 		int start = 1;
 		_sReadFilename = lines[0];
 		if ( _sReadFilename.token(" ", -1).isNumber() ) {
 			_sReadFilename.clear();
 			start = 0;
 		}
 		for(int i = start; i < max; i++) {
 			Utils::String l = lines[i];
 			SInCatFile *catfile = new SInCatFile;
 			catfile->lSize = static_cast<size_t>(l.token(" ", -1).toLong());
 			catfile->sFile = l.tokens(" ", 1, -2);
 			catfile->lOffset = offset;
 			catfile->sData = 0;
 			offset += catfile->lSize;
-			m_lFiles.push_back ( catfile );
+			_lFiles->push_back(catfile);
+		}
+	}
 	CLEANSPLIT(lines, max);
 /*
 					size = atoi((const char *)data);
 				if ( size )
+				{
 					SInCatFile *catfile = new SInCatFile;
 					catfile->lSize = size;
 					catfile->sFile = file;
 					catfile->lOffset = offset;
 					catfile->sData = 0;
 bool CCatFile::DecryptData ( unsigned char *data, size_t size )
+{
 	unsigned char cl=0xDB, dh=0xDC, dl=0xDD, ah=0xDE, ch=0xDF, al;
 	unsigned char *ptr = data, *end = data + size;
 	for ( ptr = data; ptr < end; ptr += 5)
 	{
 		al=ch;
 		ch+=5;
 		*(ptr + 4) ^= al;
 		al=ah;
 		ah+=5;
 	unsigned char *data = UnPCKData(c->sData, c->lSize, size, false);
 	if ( !data ) data = UnPCKData(c->sData, c->lSize, size, true);
 	return data;
+}
-bool CCatFile::RemoveFile ( SInCatFile *f )
+bool CCatFile::removeFile(SInCatFile *f)
+{
-	if ( (m_bCreate) || (m_lFiles.empty()) )
+	if ( (m_bCreate) || (_lFiles->empty()) )
 		return false;
 	if ( !f )
 		return false;
 	else if ( err != FILEERR_NONE )
 		return false;
 	// adjust the file positions
 	int iOffset = -1;
-	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() ) {
+	for (auto itr = _lFiles->cbegin(); itr != _lFiles->cend(); ++itr)
+	{
+		SInCatFile *c = *itr;
-		if ( node->Data() == f ) {
+		if (c == f) {
-			iOffset = node->Data()->lOffset;
+			iOffset = c->lOffset;
+		}
 		else if ( iOffset >= 0 ) {
-			node->Data()->lOffset = iOffset;
+			c->lOffset = iOffset;
-			iOffset += node->Data()->lSize;
+			iOffset += c->lSize;
+		}
+	}
 	// now just write the new cat file
+	auto findItr = std::find(_lFiles->begin(), _lFiles->end(), f);
+	if (findItr != _lFiles->end())
-	m_lFiles.remove ( f );
+		_lFiles->erase(findItr);
 	m_bCatChanged = true;
 	return true;
+}
 bool CCatFile::WriteCatFile ()
+{
-	if ( (m_bCreate) && (m_lFiles.empty()) ) return false;
+	if ( (m_bCreate) && (_lFiles->empty()) ) return false;
 	Utils::String cat = m_fDatFile.filename() + "\n";
-	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() ) {
+	for (auto itr = _lFiles->cbegin(); itr != _lFiles->cend(); ++itr)
+	{
+		SInCatFile *c = *itr;
-		if ( !node->Data() ) continue;
+		if ( !c ) continue;
-		if ( node->Data()->sFile.Empty() ) continue;
+		if ( c->sFile.empty() ) continue;
-		Utils::String str = node->Data()->sFile.ToString();
+		Utils::String str = c->sFile;
-		cat += str.findReplace("/", "\\").findReplace("\\\\", "\\") + " " + (long)node->Data()->lSize + "\n";
+		cat += str.findReplace("/", "\\").findReplace("\\\\", "\\") + " " + (long)c->lSize + "\n";
 	}
 	if ( !cat.length() ) return false;
 	// make sure the len is in multiples of 5, otherwise decryptData could cause heap problems
 	size_t len = cat.length() + ((cat.length() % 5) ? 5 - (cat.length() % 5) : 0);
+	}
 	m_fCatFile.close();
 	m_bCatChanged = false;
 	return ret;
 }
-bool CCatFile::CheckExtensionPck ( CyString filename )
+std::vector<SInCatFile *> *CCatFile::GetFiles() const
+{
-	CyString ext = filename.GetToken ( ".", filename.NumToken  ( "." ) ).lower();
+	return _lFiles;
+}
+bool CCatFile::checkExtensionPck(const Utils::String &filename) const
+{
+	Utils::String ext = CFileIO(filename).extension().lower();
 	if ( ext == "xml" )
 		return true;
 	else if ( ext == "txt" )
 		return true;
 	else if ( ext == "bob" )
 	if ( ext == "pck" )
 		return true;
 	else if ( ext == "pbb" )
 		return true;
 	else if ( ext == "pbd" )
 		return true;
 	return false;
+}
-CyString CCatFile::PckChangeExtension ( CyString f )
+Utils::String CCatFile::PckChangeExtension(const Utils::String &f)
+{
 	CFileIO fo ( f );
 	Utils::String ext = fo.extension ().lower();
 	if ( ext == "txt" )
-		return fo.ChangeFileExtension ( "pck" );
+		return fo.changeFileExtension("pck");
 	else if ( ext == "xml" )
-		return fo.ChangeFileExtension ( "pck" );
+		return fo.changeFileExtension("pck");
 	else if ( ext == "bob" )
-		return fo.ChangeFileExtension ( "pbb" );
+		return fo.changeFileExtension("pbb");
 	else if ( ext == "bod" )
-		return fo.ChangeFileExtension ( "pbd" );
+		return fo.changeFileExtension("pbd");
 	return f;
+}
 bool CCatFile::AppendFile(const Utils::String &filename, const Utils::String &sTo, bool pck, bool bXor, Utils::String *sChangeTo)
+{
 	CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() Adding file, %s, into cat file, %s::%s [PCK:%s XOR:%s]", filename.c_str(), this->m_fCatFile.filename().c_str(), sTo.c_str(), (pck) ? "Yes" : "No", (bXor) ? "Yes" : "No");
 	if ( filename.isin ( "::" ) ) return WriteFromCat ( filename.token("::", 1), filename.token("::", 2));
 	if ( (!m_bCreate) && (!m_fDatFile.exists ()) ) {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() Cat File: %s, doesn't exist, quitting...", m_fCatFile.fullFilename().c_str());
 		return false;
 	}
-	CyString to = sTo;
+	Utils::String to = sTo;
-	if ( !m_sAddonDir.Empty() && CCatFile::IsAddonDir(to) ) {
+	if ( !_sAddonDir.empty() && CCatFile::IsAddonDir(to) ) {
-		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() changing destination to included addon fir, %s => %s", to, m_sAddonDir + "/" + to);
+		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() changing destination to included addon fir, %s => %s", to, _sAddonDir + "/" + to);
-		to = m_sAddonDir + "\\" + to;
+		to = _sAddonDir + "\\" + to;
 	}
 	// change the file extension and remove the file again
-	if ( pck && CheckExtensionPck(filename) ) {
+	if ( pck && checkExtensionPck(filename) ) {
-		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() changing file extension for packed file, %s => %s", to.c_str(), PckChangeExtension(to).ToString().c_str());
+		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() changing file extension for packed file, %s => %s", to.c_str(), PckChangeExtension(to).c_str());
 		to = PckChangeExtension(to);
+	}
-	if ( sChangeTo ) *sChangeTo = to.ToString();
+	if ( sChangeTo ) *sChangeTo = to;
-	if ( !m_lFiles.empty() ) {
+	if ( !_lFiles->empty() ) {
 		SInCatFile *checkf = FindData ( to );
 		if ( checkf ) {
-			CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() removing existing filechanging file extension for packed file, %s => %s", to.c_str(), PckChangeExtension(to).ToString().c_str());
+			CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() removing existing filechanging file extension for packed file, %s => %s", to.c_str(), PckChangeExtension(to).c_str());
-			if ( !RemoveFile(checkf) ) {
+			if ( !removeFile(checkf) ) {
 				CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() unable to remove existing file, quitting...");
 				return false;
+			}
+		}
 	}
 	bool append = false;
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
 	f->lOffset = this->GetEndOffset();
 	bool dofile = true;
-	if ( !m_lFiles.size() )	{
+	if ( _lFiles->empty() )	{
 		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() no existing files found, wipeing the existing dat file");
 		m_fDatFile.WipeFile();
+	}
 	CFileIO File(filename);
 	File.close();
 	// check if we need to pack the file
 	int iFileType = this->_checkFiletype(data, 3);
 	CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() preparing to append file data, Type=%d", iFileType);
-	if ( iFileType == FILETYPE_PLAIN && CheckPackedExtension(to.ToString()) ) {
+	if ( iFileType == FILETYPE_PLAIN && CheckPackedExtension(to) ) {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() plain text file needs to packed");
 		size_t newsize = 0;
 		unsigned char *newdata = PCKData(data, File.fileSize(), &newsize, bXor);
 		CLog::logf(CLog::Log_IO, 1, "CCatFile::AppendFile() file has been packed, %d => %d", File.fileSize(), newsize);
 	if ( append ) {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() append complete, adding file into cat list");
 		m_bCreate = false;
 		f->sFile = to;
-		m_lFiles.push_back ( f );
+		_lFiles->push_back(f);
 		CLog::logf(CLog::Log_IO, 3, "CCatFile::AppendFile() writing the new cat file");
 		m_bCatChanged = true;
+	}
 	else {
 		CLog::logf(CLog::Log_IO, 2, "CCatFile::AppendFile() appending failed, cleaning up file data");
+	}
 	CLog::logf(CLog::Log_IO, 4, "CCatFile::AppendFile() function complete");
 	return append;
 }
 bool CCatFile::AddData ( CyString catfile, unsigned char *data, size_t size, CyString to, bool pck, bool create )
 {
 	int err = Open ( catfile, "", CATREAD_CATDECRYPT, create );
 	if ( (err != CATERR_NONE) && (err != CATERR_CREATED) )
 		return false;
 	return AppendData ( data, size, to, pck );
+}
 int CCatFile::GetEndOffset()
+{
-	if ( m_lFiles.empty() )
+	if ( _lFiles->empty() )
 		return 0;
 	else {
-		for(SInCatFile *f = m_lFiles.First(); f; f = m_lFiles.Next()) {
-			f->lOffset;
-		}
-		return m_lFiles.Back()->Data()->lOffset + m_lFiles.Back()->Data()->lSize;
+		return _lFiles->back()->lOffset + _lFiles->back()->lSize;
+	}
+}
+size_t CCatFile::GetNumFiles() const
+{
+	return _lFiles->size();
+}
+SInCatFile *CCatFile::GetFile(unsigned int num) const
+{
+	return (num >= 0 && num < _lFiles->size()) ? _lFiles->at(num) : NULL;
+}
-bool CCatFile::AppendData ( unsigned char *data, size_t size, CyString to, bool pck, bool bXor )
+bool CCatFile::AppendData ( unsigned char *data, size_t size, CyString sTo, bool pck, bool bXor )
+{
 	if ( (!m_bCreate) && (!m_fCatFile.exists ()) )
 		return false;
 	if ( (size <= 0) || (!data) )
 		return false;
+	Utils::String to = sTo.ToString();
 	// then check if the file already exists
-	if ( !m_lFiles.empty() )
+	if ( !_lFiles->empty() )
 	{
 		SInCatFile *f = FindData ( to );
 		if ( f )
+		{
-			if ( !RemoveFile ( f ) )
+			if (!removeFile ( f ))
 				return false;
+		}
+	}
 	bool append = false;
-	if ( !m_lFiles.size() )
+	if (_lFiles->empty())
 		m_fDatFile.WipeFile();
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
-	if ( m_lFiles.empty() )
+	if (_lFiles->empty())
 		f->lOffset = 0;
 	else
 		f->lOffset = m_fDatFile.GetFilesize();
 	// if file extension is packed but not the file, then pack it, "pck" forces it to be packed unless it already is
 	f->lSize = size;
-	if ( (((pck) && (CheckExtensionPck (to.ToString()))) || ((CheckPackedExtension ( to.ToString() )))) && (!IsDataPCK ( data, size )) )
+	if ( (((pck) && (checkExtensionPck (to))) || ((CheckPackedExtension (to)))) && (!IsDataPCK ( data, size )) )
+	{
 		to = PckChangeExtension ( to );
-		if ( !m_lFiles.empty() )
+		if (!_lFiles->empty())
+		{
 			SInCatFile *f = FindData ( to );
 			if ( f )
+			{
-				if ( !RemoveFile ( f ) )
+				if (!removeFile(f))
 					return false;
+			}
+		}
 		size_t newsize = 0;
 		unsigned char *d = PCKData ( data, size, &newsize, bXor );
 	m_fDatFile.close();
 	if ( append ) {
 		m_bCreate = false;
 		f->sFile = to;
-		m_lFiles.push_back ( f );
+		_lFiles->push_back(f);
 		m_bCatChanged = true;
+	}
 	else
 		delete f;
 	return true;
+}
-CyString CCatFile::RenameFileExtension(SInCatFile *f)
+Utils::String CCatFile::RenameFileExtension(SInCatFile *f)
+{
-	CFileIO fo ( f->sFile );
+	CFileIO fo(f->sFile);
-	CyString ext = fo.GetFileExtension ().lower();
+	Utils::String ext = fo.GetFileExtension ().lower().ToString();
 	if ( ext == "pck" )
+	{
-		CyString firstDir = f->sFile.FindReplace("/", "\\").GetToken("\\", 1, 1).lower();
+		Utils::String firstDir = f->sFile.findReplace("/", "\\").token("\\", 1).lower();
 		if ( firstDir == "t" )
-			return fo.ChangeFileExtension ( "xml" );
+			return fo.changeFileExtension ( "xml" );
 		else if ( firstDir == "director" )
-			return fo.ChangeFileExtension ( "xml" );
+			return fo.changeFileExtension ( "xml" );
-		return fo.ChangeFileExtension ( "txt" );
+		return fo.changeFileExtension ( "txt" );
+	}
 	else if ( ext == "pbb" )
-		return fo.ChangeFileExtension ( "bob" );
+		return fo.changeFileExtension ( "bob" );
 	else if ( ext == "pbd" )
-		return fo.ChangeFileExtension ( "bod" );
+		return fo.changeFileExtension ( "bod" );
 	return f->sFile;
 }
 void CCatFile::FindFiles(CyStringList *files, CyString filemask)
+{
-	if ( m_lFiles.empty() )
+	if (_lFiles->empty())
 		return;
-	for ( SInCatFile *f = m_lFiles.First(); f; f = m_lFiles.Next() )
+	for (auto itr = _lFiles->cbegin(); itr != _lFiles->cend(); ++itr)
+	{
-		if ( filemask.WildMatch(f->sFile) )
+		if ( filemask.WildMatch((*itr)->sFile) )
-			files->PushBack(f->sFile);
+			files->PushBack(CyString((*itr)->sFile));
+	}
+}
 bool CCatFile::ExtractAll(CyString dir)
 {
-	if ( m_lFiles.empty() )
+	if (_lFiles->empty())
 		return false;
-	for ( CListNode<SInCatFile> *node = m_lFiles.Front(); node; node = node->next() )
+	for (auto itr = _lFiles->cbegin(); itr != _lFiles->cend(); ++itr)
+	{
-		if ( !ExtractFile(node->Data(), dir, true) )
+		if ( !ExtractFile(*itr, dir, true) )
 			return false;
+	}
 	return true;
+}
 bool CCatFile::ExtractFile ( CyString filename, CyString to, bool preserve )
+{
-	if ( m_lFiles.empty() )
+	if (_lFiles->empty())
 		return false;
 	// check if file exists
-	if ( !m_sAddonDir.Empty() ) {
+	if ( !_sAddonDir.empty() ) {
-		SInCatFile *f = FindData ( m_sAddonDir + "\\" + filename );
+		SInCatFile *f = FindData ( CyString(_sAddonDir) + "\\" + filename );
 		if ( f )
 			return ExtractFile ( f, to, preserve );
+	}
+	{
 		SInCatFile *f = FindData ( CyString("addon\\") + filename );
+	}
 	delete data;
 	f->sData = 0;
-	if ( bWritten ) this->ClearError();
+	if ( bWritten ) this->clearError();
 	return bWritten;
+}
 const Utils::String &CCatFile::internalDatFilename() const
+{
 	return _sReadFilename;
+}
-CyString CCatFile::GetErrorString ()
+Utils::String CCatFile::getErrorString () const
+{
 	switch ( m_iError )
+	{
 		case CATERR_NONE:
-			return NullString;
+			return Utils::String::Null();
 		case CATERR_NODATFILE:
 			return "Unable to open Dat file";
 		case CATERR_NOCATFILE:
 			return "Unable to open Cat file";
 		case CATERR_FILEEMPTY:
 	zs.next_out=d;
 	zs.avail_out=(unsigned int)newsize - pos;
 	while((ret=deflate(&zs, Z_FINISH))==Z_OK)
 	{
 		newsize += 1024;
 		data = (unsigned char *)realloc ( data, sizeof(unsigned char) * newsize );
 		zs.next_out=data + zs.total_out;
 		zs.avail_out=(unsigned int)newsize - zs.total_out;
+	}
 		(*newsize)++;
 		return finalData;
+	}
 	return NULL;
 }
 bool CCatFile::WriteFromCat ( CCatFile *fcat, CyString file )
+{
 	// now find the file in the cat file
 	SInCatFile *getfile = fcat->FindData ( file );
 	if ( !getfile )
 		return false;
 	// read the dat from the cat file
 	size_t size = 0;
 	unsigned char *data = fcat->readData ( getfile, &size );
 	if ( !data )
 		return false;
 	// now check if it exists in this file
-	RemoveFile ( file );
+	removeFile(file.ToString());
-	int offset = (m_lFiles.empty()) ? 0 : (m_lFiles.Back()->Data()->lOffset + m_lFiles.Back()->Data()->lSize);
+	int offset = (_lFiles->empty()) ? 0 : (_lFiles->back()->lOffset + _lFiles->back()->lSize);
 	// now write to the new file
 	if ( getfile->bDecrypted ) this->DecryptDAT(getfile->sData, getfile->lSize);
 	getfile->bDecrypted = false;
 	if ( !m_fDatFile.AppendDataToPos((const char *)getfile->sData, getfile->lSize, offset) ) return false;
     m_fDatFile.close();
 	// finally add to the list
 	SInCatFile *f = new SInCatFile;
 	f->sData = 0;
-	if ( m_lFiles.empty() )
+	if (_lFiles->empty())
 		f->lOffset = 0;
 	else
-		f->lOffset = m_lFiles.Back()->Data()->lOffset + m_lFiles.Back()->Data()->lSize;
+		f->lOffset = _lFiles->back()->lOffset + _lFiles->back()->lSize;
-	f->sFile = file;
+	f->sFile = file.ToString();
 	f->lSize = size;
-	m_lFiles.push_back ( f );
+	_lFiles->push_back(f);
 	m_bCatChanged = true;
 	return true;
+}
 		return false;
 	return this->WriteFromCat(&fcat, file);
+}
-SInCatFile *CCatFile::FindData ( CyString filename )
+SInCatFile *CCatFile::FindData(CyString filename)
+{
+	return findData(filename.ToString());
+}
+SInCatFile *CCatFile::findData(const Utils::String &filename) const
+{
-	if ( m_lFiles.empty() )
+	if (_lFiles->empty())
 		return NULL;
-	CyString check = filename;
+	Utils::String check = filename;
-	check = check.FindReplace ( ";\\";, "/" );
+	check = check.findReplace(";\\";, "/");
-	for ( SInCatFile *c = m_lFiles.First(); c; c = m_lFiles.Next() )
+	for (auto itr = _lFiles->cbegin(); itr != _lFiles->cend(); ++itr)
+	{
-		CyString f = c->sFile;
+		Utils::String f = (*itr)->sFile;
-		f = f.FindReplace ( ";\\";, "/" );
+		f = f.findReplace(";\\";, "/");
-		if ( f.Compare(check) )
+		if (f.Compare(check))
-			return c;
+			return *itr;
+	}
 	return NULL;
+}
 bool CCatFile::MarkRemoveFile( CyString file )

Subversion Repositories spk

(root)/libspk/src/CatFile.cpp – Rev 119 → 124