diff -r c4687ff85147 -r 6757f1e2efd2 applicationmanagement/server/src/AMPreInstallApp.cpp --- a/applicationmanagement/server/src/AMPreInstallApp.cpp Thu Aug 19 09:42:30 2010 +0300 +++ b/applicationmanagement/server/src/AMPreInstallApp.cpp Tue Aug 31 15:05:55 2010 +0300 @@ -15,20 +15,22 @@ * */ -#include "AMPreInstallApp.h" + #include #include -#include "debug.h" #include //for KMaxDataTypeLength #include #include #include -#include -#include +#include +#include #include #include #include +#include "AMPreInstallApp.h" +#include "debug.h" + using namespace NApplicationManagement; CAMPreInstallApp* CAMPreInstallApp::NewL() { @@ -37,11 +39,13 @@ return self; } + + CAMPreInstallApp* CAMPreInstallApp::NewLC() { - CAMPreInstallApp *self = new ( ELeave ) CAMPreInstallApp( ); - CleanupStack::PushL( self ) ; - self->ConstructL() ; + CAMPreInstallApp *self = new (ELeave) CAMPreInstallApp(); + CleanupStack::PushL(self); + self->ConstructL(); return self; } @@ -65,7 +69,8 @@ iPreInstallPath.Append(mmcDrive); iPreInstallPath.Append(KPreInstallPath); } -void CAMPreInstallApp::GetPreInstalledAppsL(RPointerArray &aPreInstalledAppParams) +void CAMPreInstallApp::GetPreInstalledAppsL(RPointerArray< + TPreInstalledAppParams> &aPreInstalledAppParams) { MakeAllInstallPathsL(); @@ -110,7 +115,8 @@ } #ifdef RD_MULTIPLE_DRIVE - if ( TParsePtrC( installDocPath ).Path().CompareF(KPreInstallPath) == 0 ) + if (TParsePtrC(installDocPath).Path().CompareF(KPreInstallPath) + == 0) #else if (installDocPath.CompareF(iPreInstallPath) == 0) #endif @@ -155,6 +161,8 @@ { CleanupClosePushL(registryEntry); TBool isPreInstalled = registryEntry.PreInstalledL(); + // TBool isPreInstalled = ETrue; + RDEBUG_4("Clist_PreInstallAppUi: ListPreInstalledApp: UID is : '0x%X', installed:, preinstalled %d %d",appUid,installed,isPreInstalled); for (TInt i(0); isPreInstalled && i < uids.Count(); i++) @@ -225,9 +233,13 @@ if (iPreInstallDocumentPath.Length() > 0) { ListPreInstalledAppL(iPreInstallDocumentPath); + //_LIT(KInstallpath,"C:\\private\\10202dce\\"); + //ListPreInstalledAppL(KInstallpath); } #endif + } + TBool CAMPreInstallApp::RecognizeL(TDesC& aPathAndName, HBufC* aMimeType) { TBool IsOK(ETrue);