diff -r 1951b3078691 -r c6286dcf6040 skins/AknSkins/sdcsrc/SDCBinOutput.cpp --- a/skins/AknSkins/sdcsrc/SDCBinOutput.cpp Fri Apr 16 16:01:57 2010 +0300 +++ b/skins/AknSkins/sdcsrc/SDCBinOutput.cpp Mon May 03 13:28:06 2010 +0300 @@ -15,12 +15,17 @@ * */ -#include +#include +#include +#include +#include +#include #include "SDCGlobals.h" #include "SDCBinOutput.h" #include "AknsConstants.hrh" #include "SDCException.h" +#include "SDCCompat.h" // Make std namespace available for compatibility namespace std {} @@ -81,11 +86,11 @@ PrepareSkinDescriptor( aStubOnly ); - if( iOutputPos != iOutputVector.size() ) throw CSDCException( ESDCUnknownError, "Internal binary output size does not match" ); + if( iOutputPos != static_cast( iOutputVector.size() ) ) throw CSDCException( ESDCUnknownError, "Internal binary output size does not match" ); FILE* file = fopen( aBinFilename, "wb" ); if( !file ) throw CSDCException( ESDCFileOpenError, "Can not open target binary file for writing" ); - int i; + unsigned int i; for( i=0; iiTargetDeviceVector.size(); i++ ) { @@ -234,7 +239,7 @@ PrepareEncapsulatedNormalClass( 0x00020000 ); chunksN++; - for (int count = 0;count < iData->iLanguageVector.size(); count++) + for (unsigned int count = 0;count < iData->iLanguageVector.size(); count++) { // Language PrepareEncapsulatedNormalClass( iData->iLanguageVector[count] ); @@ -266,7 +271,7 @@ AppendBytes( 1*2 ); WriteUint16( wcslen( aDeviceName ) ); - for( int i=0; i((currentTime >> 32) ); + unsigned int lowPart = static_cast( currentTime ); + + WriteInt( highPart ); + WriteInt( lowPart ); AppendBytes( 2*4 ); WriteInt( (gVersionMajor<<16) | gVersionMinor ); @@ -404,7 +416,7 @@ WriteByte( aWpType ); WriteUint16( strlen( buf ) ); - for( int i=0; iiBitmapDefVector.size(); i++ ) { if( iData->iBitmapDefVector[i]->iRestriction != aRestriction ) continue; @@ -650,7 +662,7 @@ TPos chunksNPos( this ); WriteInt( 0 ); // ChunksN - int i; + unsigned int i; for( i=0; iiBitmapDefVector.size(); i++ ) { if( iData->iBitmapDefVector[i]->iAppIconBitmap == true ) @@ -736,7 +748,7 @@ WriteInt( aColorTableDef->iIID.iMinor ); WriteByte( aColorTableDef->iColors.size() ); - for( int i=0; iiColors.size(); i++ ) + for( unsigned int i=0; iiColors.size(); i++ ) { AppendBytes( 1*2 + 1*4 ); WriteInt16( (short int)aColorTableDef->iColors[i].iIndex ); @@ -780,7 +792,7 @@ WriteByte( (unsigned char)aBmpAnimDef->iFlash ); WriteByte( (unsigned char)aBmpAnimDef->iFrames.size() ); - for( int i=0; iiFrames.size(); i++ ) + for( unsigned int i=0; iiFrames.size(); i++ ) { AppendBytes( 2*4 + 3*2 ); WriteInt( aBmpAnimDef->iFrames[i].iIID.iMajor ); @@ -814,7 +826,7 @@ WriteInt( aStringDef->iIID.iMinor ); WriteUint16( wcslen( aStringDef->iString ) ); - for( int i=0; iiString ); i++ ) + for( unsigned int i=0; iiString ); i++ ) { AppendBytes( 2 ); WriteUint16( aStringDef->iString[i] ); @@ -859,7 +871,7 @@ AppendBytes( 1*2 ); WriteUint16( aItemDef->iCommands.size() ); - for( int i=0; iiCommands.size(); i++ ) + for( unsigned int i=0; iiCommands.size(); i++ ) { PrepareEffectCommand( aItemDef->iCommands[i] ); } @@ -911,7 +923,7 @@ AppendBytes( 1*2 ); WriteUint16( aItemDef->iPreprocessCommands.size() ); - int i; + unsigned int i; for( i=0; iiPreprocessCommands.size(); i++ ) { PrepareEffectCommand( aItemDef->iPreprocessCommands[i] ); @@ -967,7 +979,7 @@ WriteInt( aIID.iMinor ); WriteByte( (unsigned char)aImages.size() ); - for( int i=0; i& aParameters ) { - for( int i=0; i