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

+		}
 		fileStream.close();
+	}
 	*/
-	FILE *fid = fopen(file.c_str(), "r");
+	CFileIO F(file);
-	if ( fid )
+	if ( F.exists() && F.startRead() ) {
-	{
-		bool ret = this->AddTextFromFile(fid, textId);
+		bool ret = this->_addTextFromFile(F, textId);
-		fclose(fid);
+		F.close();
 		if ( remove ) CFileIO::Remove(file);
 		_changed();
 		return ret;
+	}
+	}
 	return false;
+}
-bool CXspFile::AddTextFromFile(FILE *id, int textId)
+bool CXspFile::_addTextFromFile(CFileIO &F, int textId)
+{
 	if ( textId == -1 && !m_sData.empty() )
 		textId = m_sData.token(";", 7);
 	if ( textId <= 0 )
 		return false;
-	Utils::String line;
-	if ( !id )
+	if ( !F.isOpened() )
 		return false;
 	bool added = false;
 	Utils::String shipName;
 	int lastAddedGameID = 0;
 	int currentGameID = 0;
 	int lang = 0;
 	bool inpage = false;
-	while ( !feof(id) )
+	while(!F.atEnd()) {
-	{
 		if ( !shipName.empty() && !shipDesc.empty() )
+		{
 			added = true;
 			break;
+		}
-		line.readToEndOfLine(id, 0, false);
+		Utils::String line = F.readEndOfLine();
 		line.removeChar(9);
 		line.removeChar('\r');
 		line.removeFirstSpace();
 		if ( inpage )
+		{
 			if ( line.left(6).Compare("</page") ) {
 				inpage = false;
 				continue;

Subversion Repositories spk