equal
deleted
inserted
replaced
337 { |
337 { |
338 iConfigIconType = aConfigIconType; |
338 iConfigIconType = aConfigIconType; |
339 iNGADirectory.Copy(aNGATestDirectory); |
339 iNGADirectory.Copy(aNGATestDirectory); |
340 } |
340 } |
341 |
341 |
342 TInt32 CAknIconLoader::GetDerivedIconTypeL(TInt32 aType, const TDesC & aMifFileName) |
342 TInt32 CAknIconLoader::GetDerivedIconTypeL(TInt32 aType) |
343 { |
343 { |
344 if (aType != EIconFormatBMP && |
344 if (aType != EIconFormatBMP && |
345 aType != EIconFormatNVG) |
345 aType != EIconFormatNVG) |
346 { |
346 { |
347 if (iConfigIconType != -1) |
|
348 { |
|
349 aType = iConfigIconType; |
|
350 } |
|
351 |
|
352 if (aType != EIconFormatNGA) |
|
353 { |
|
354 TInt NGADirectoryLength = iNGADirectory.Length(); |
|
355 if ( NGADirectoryLength > 0 && |
|
356 NGADirectoryLength < aMifFileName.Length() && |
|
357 aMifFileName.Left(NGADirectoryLength).CompareF(iNGADirectory) == 0 ) |
|
358 { |
|
359 aType = EIconFormatNGA; |
347 aType = EIconFormatNGA; |
360 } |
|
361 } |
|
362 } |
348 } |
363 |
349 |
364 return aType; |
350 return aType; |
365 } |
351 } |
366 #endif |
352 #endif |