--- a/appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDialogs.cpp Thu Aug 19 10:02:49 2010 +0300
+++ b/appinstaller/AppinstUi/Plugin/CommonUI/Src/CUIDialogs.cpp Tue Aug 31 15:21:33 2010 +0300
@@ -21,21 +21,21 @@
#include <bautils.h>
#include <eikenv.h>
#include <StringLoader.h>
-#include <AknQueryDialog.h>
+//#include <AknQueryDialog.h>
#include <eikprogi.h>
-#include <aknnotewrappers.h>
+//#include <aknnotewrappers.h>
#include <data_caging_path_literals.hrh>
#include <SWInstCommonUI.rsg>
-#include <aknmessagequerydialog.h>
+//#include <aknmessagequerydialog.h>
#include <hlplch.h>
-#include <csxhelp/am.hlp.hrh>
+//#include <csxhelp/am.hlp.hrh>
#include <coehelp.h>
#include <featmgr.h>
#include <sysutil.h>
#ifdef RD_MULTIPLE_DRIVE
#include <driveinfo.h>
#endif //RD_MULTIPLE_DRIVE
-#include <akninputblock.h>
+//#include <akninputblock.h>
#include "CUIDialogs.h"
#include "CUIDriveUtils.h"
@@ -80,8 +80,8 @@
fileName.Append( KCUIResourceFileName );
iResourceFileOffset = CUIUtils::LoadResourceFileL( fileName, iCoeEnv );
- iAbsorber = CAknInputBlock::NewLC();
- CleanupStack::Pop( iAbsorber );
+// iAbsorber = CAknInputBlock::NewLC();
+// CleanupStack::Pop( iAbsorber );
FeatureManager::InitializeLibL();
}
@@ -112,7 +112,7 @@
iCoeEnv->DeleteResourceFile( iResourceFileOffset );
}
- delete iAbsorber;
+// delete iAbsorber;
FeatureManager::UnInitializeLib();
}
@@ -285,7 +285,7 @@
TInt aSoftkeyResourceId ) const
{
TBool response( EFalse );
-
+/*
CAknQueryDialog* note =
CAknQueryDialog::NewL( CAknQueryDialog::EConfirmationTone );
@@ -297,7 +297,7 @@
{
response = ETrue;
}
-
+*/
return response;
}
@@ -312,9 +312,10 @@
const RArray<TDriveUnit>& aDriveUnits,
const RArray<TInt64>& aDriveSpaces,
TInt& aSelectionResult )
- {
+ {
+
TInt result( KErrNone );
-
+/*
// Sanity check
if ( aSize <= 0 )
{
@@ -439,7 +440,7 @@
}
CleanupStack::PopAndDestroy( driveUtils );
-
+*/
return result;
}
@@ -450,9 +451,10 @@
// -----------------------------------------------------------------------------
//
EXPORT_C TBool CCUIDialogs::ShowSecurityWarningDialogL()
- {
+ {
+
TBool result( EFalse );
-
+ /*
// Load resources
HBufC* text = StringLoader::LoadLC( R_SWCOMMON_SECURITY_WARNING );
HBufC* linkText = NULL;
@@ -490,7 +492,7 @@
}
CleanupStack::PopAndDestroy( 3, text ); // message, linkText, text
-
+ */
return result;
}
@@ -515,8 +517,10 @@
//
EXPORT_C void CCUIDialogs::ShowErrorNoteL( const TDesC& aErrorText ) const
{
+ /*
CAknErrorNote* note = new (ELeave) CAknErrorNote( ETrue );
note->ExecuteLD( aErrorText );
+ */
}
// -----------------------------------------------------------------------------
@@ -597,6 +601,7 @@
TInt& aIndexOfAppToBeStarted ) const
{
+ /*
aIndexOfAppToBeStarted = KErrNotFound;
// Prepare for showing the installation complete query
@@ -675,7 +680,9 @@
aIndexOfAppToBeStarted = KErrNotFound;
}
- return appIsStarted;
+ return appIsStarted;
+ */
+ return EFalse;
}
// -----------------------------------------------------------------------------
@@ -689,6 +696,7 @@
const MDesCArray& aApplicationArray,
TInt aSoftkeyResourceId ) const
{
+ /*
HBufC* appList = HBufC::NewLC( 0 );
TInt count = aApplicationArray.MdcaCount();
for ( TInt i = 0; i < count; i++ )
@@ -731,6 +739,8 @@
}
CleanupStack::PopAndDestroy( message );
return response;
+ */
+ return EFalse;
}
@@ -772,7 +782,7 @@
//
TInt CCUIDialogs::ShowSecurityWarningHelp( TAny* aPtr )
{
- TRAP_IGNORE( reinterpret_cast<CCUIDialogs*>(aPtr)->LaunchHelpL( KAM_HLP_INSTALL_UNTRUSTED ) );
+ //TRAP_IGNORE( reinterpret_cast<CCUIDialogs*>(aPtr)->LaunchHelpL( KAM_HLP_INSTALL_UNTRUSTED ) );
return KErrNone;
}