Subversion Repositories spk

Rev

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

Rev 175 Rev 177
Line 1160... Line 1160...
1160 
	*error = INSTALLERR_NONE;
 1160 
	*error = INSTALLERR_NONE;
1161 
 
 1161 
 
1162 
	CMultiSpkFile *package = new CMultiSpkFile;
 1162 
	CMultiSpkFile *package = new CMultiSpkFile;
1163 
 
 1163 
 
1164 
	bool ret = false;
 1164 
	bool ret = false;
1165 
	if ( package->ReadFile(file, true) )
 1165 
	if ( package->readFile(file.ToString(), true))
1166 
	{
 1166 
	{
1167 
		if ( package->ReadAllPackages(SPKREAD_NODATA) )
 1167 
		if ( package->readAllPackages(SPKREAD_NODATA) )
1168 
		{
 1168 
		{
1169 
			for ( CListNode<SMultiSpkFile> *node = package->GetFileList()->Front(); node; node = node->next() )
 1169 
			for ( CListNode<SMultiSpkFile> *node = package->GetFileList()->Front(); node; node = node->next() )
1170 
				this->ConvertOldPackage(node->Data()->pFile);
 1170 
				this->ConvertOldPackage(node->Data()->pFile);
1171 
 
 1171 
 
1172 
			ret = true;
 1172 
			ret = true;
Line 1195... Line 1195...
1195 
	*error = INSTALLERR_NONE;
 1195 
	*error = INSTALLERR_NONE;
1196 
 
 1196 
 
1197 
	CMultiSpkFile *package = new CMultiSpkFile;
 1197 
	CMultiSpkFile *package = new CMultiSpkFile;
1198 
 
 1198 
 
1199 
	bool ret = false;
 1199 
	bool ret = false;
1200 
	if ( package->ReadFile(file, true) )
 1200 
	if ( package->readFile(file.ToString(), true))
1201 
	{
 1201 
	{
1202 
		if ( package->ReadAllPackages(SPKREAD_ALL, packageList) )
 1202 
		if ( package->readAllPackages(SPKREAD_ALL, packageList) )
1203 
		{
 1203 
		{
1204 
			for ( CListNode<CBaseFile> *node = packageList->Front(); node; node = node->next() )
 1204 
			for ( CListNode<CBaseFile> *node = packageList->Front(); node; node = node->next() )
1205 
				this->ConvertOldPackage(node->Data());
 1205 
				this->ConvertOldPackage(node->Data());
1206 
 
 1206 
 
1207 
 
 1207 
 
Line 1229... Line 1229...
1229 
	*error = INSTALLERR_NONE;
 1229 
	*error = INSTALLERR_NONE;
1230 
 
 1230 
 
1231 
	CMultiSpkFile *package = new CMultiSpkFile;
 1231 
	CMultiSpkFile *package = new CMultiSpkFile;
1232 
 
 1232 
 
1233 
	int count = 0;
 1233 
	int count = 0;
1234 
	if ( package->ReadFile(file, true) )
 1234 
	if ( package->readFile(file.ToString(), true))
1235 
	{
 1235 
	{
1236 
		CLinkList<CBaseFile> packageList;
 1236 
		CLinkList<CBaseFile> packageList;
1237 
		if ( package->ReadAllPackages(SPKREAD_ALL, &packageList) )
 1237 
		if ( package->readAllPackages(SPKREAD_ALL, &packageList) )
1238 
		{
 1238 
		{
1239 
			for ( CListNode<CBaseFile> *node = packageList.Front(); node; node = node->next() )
 1239 
			for ( CListNode<CBaseFile> *node = packageList.Front(); node; node = node->next() )
1240 
			{
 1240 
			{
1241 
				CBaseFile *p = node->Data();
 1241 
				CBaseFile *p = node->Data();
1242 
				this->ConvertOldPackage(p);
 1242 
				this->ConvertOldPackage(p);