FCL/sf/mw/ipconnmgmt: comparison apengine/apsettingshandlerui/src/apsettingshandlerui.cpp

equal deleted inserted replaced

-:84c6623982f6
+:ed07dcc72692
 TSelectionMenuType aSelMenuType,
 TInt aIspFilter,
 TInt aBearerFilter,
 TInt aSortType )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType );
-CleanupStack::PushL( db );
-db->ConstructL( aIspFilter, aBearerFilter, aSortType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC")
-return db;
 }
 TInt aIspFilter,
 TInt aBearerFilter,
 TInt aSortType
 )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC2")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType );
-CleanupStack::PushL( db );
-db->ConstructL( aDb, aIspFilter, aBearerFilter, aSortType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC2")
-return db;
 }
 // ---------------------------------------------------------
 TInt aBearerFilter,
 TInt aSortType,
 TInt aReqIpvType
 )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC3")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType,
-aReqIpvType
-);
-CleanupStack::PushL( db );
-db->ConstructL( aIspFilter, aBearerFilter, aSortType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC3")
-return db;
 }
 TInt aBearerFilter,
 TInt aSortType,
 TInt aReqIpvType
 )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC4")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType,
-aReqIpvType
-);
-CleanupStack::PushL( db );
-db->ConstructL( aDb, aIspFilter, aBearerFilter, aSortType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC4")
-return db;
 }
 TInt aSortType,
 TInt aReqIpvType,
 TVpnFilterType aVpnFilterType
 )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC5")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType,
-aReqIpvType
-);
-CleanupStack::PushL( db );
-db->ConstructL( aIspFilter, aBearerFilter,
-aSortType, aVpnFilterType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC5")
-return db;
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::NewLC
 TInt aSortType,
 TInt aReqIpvType,
 TVpnFilterType aVpnFilterType
 )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC6")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType,
-aReqIpvType
-);
-CleanupStack::PushL( db );
-db->ConstructL( aDb, aIspFilter, aBearerFilter,
-aSortType, aVpnFilterType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC6")
-return db;
 }
 TInt aReqIpvType,
 TVpnFilterType aVpnFilterType,
 TBool aIncludeEasyWlan
 )
 {
-APSETUILOGGER_CREATE;
+return NULL;
-APSETUILOGGER_ENTERFN( EAPI,"Handler::NewLC7")
-CApSettingsHandler* db =
-new( ELeave ) CApSettingsHandler( aStartWithSelection,
-aListType,
-aSelMenuType,
-aReqIpvType
-);
-CleanupStack::PushL( db );
-db->ConstructL( aDb, aIspFilter, aBearerFilter,
-aSortType, aVpnFilterType, aIncludeEasyWlan );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::NewLC7")
-return db;
 }
 // Destructor
 EXPORT_C CApSettingsHandler::~CApSettingsHandler()
 {
-APSETUILOGGER_DELETE;
-APSETUILOGGER_WRITE( EAPI,"Handler:: deleting implementation");
-delete iImpl;
-APSETUILOGGER_WRITE( EAPI,"Handler::~finished");
 }
 // Constructor
 iIspFilter( KEApIspTypeAll ),
 iBearerFilter( EApBearerTypeAll ),
 iReqIpvType( EIPv4 ),
 iEventStore( KApUiEventNone )
 {
-iHelpMajor = KHelpUidApSettingsHandler;
 }
 iIspFilter( KEApIspTypeAll ),
 iBearerFilter( EApBearerTypeAll ),
 iReqIpvType( aReqIpvType ),
 iEventStore( KApUiEventNone )
 {
-iHelpMajor = KHelpUidApSettingsHandler;
 }
 // ---------------------------------------------------------
 //
 EXPORT_C void CApSettingsHandler::ConstructL(   TInt aIspFilter,
 TInt aBearerFilter,
 TInt aSortType )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ConstructL")
-DoConstructL( NULL, aIspFilter, aBearerFilter,
-aSortType, EVpnFilterBoth, EFalse );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::ConstructL")
 }
 // ---------------------------------------------------------
 EXPORT_C void CApSettingsHandler::ConstructL(   CActiveApDb& aDb,
 TInt aIspFilter,
 TInt aBearerFilter,
 TInt aSortType )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ConstructL2")
-DoConstructL( &aDb, aIspFilter, aBearerFilter,
-aSortType, EVpnFilterBoth, EFalse );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::ConstructL2")
 }
 // ---------------------------------------------------------
 TInt aBearerFilter,
 TInt aSortType,
 TVpnFilterType aVpnFilterType
 )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ConstructL3")
-DoConstructL( NULL, aIspFilter, aBearerFilter,
-aSortType, aVpnFilterType, EFalse );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::ConstructL3")
 }
 // ---------------------------------------------------------
 TInt aBearerFilter,
 TInt aSortType,
 TVpnFilterType aVpnFilterType
 )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ConstructL4")
-DoConstructL( &aDb, aIspFilter, aBearerFilter,
-aSortType, aVpnFilterType, EFalse );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::ConstructL4")
 }
 TInt aSortType,
 TVpnFilterType aVpnFilterType,
 TBool aIncludeEasyWlan
 )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ConstructL5")
-DoConstructL( &aDb, aIspFilter, aBearerFilter,
-aSortType, aVpnFilterType, aIncludeEasyWlan );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::ConstructL5")
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::SetFilter
 //
 EXPORT_C void CApSettingsHandler::SetFilterL(   TInt aIspFilter,
 TInt aBearerFilter,
 TInt aSortType )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::SetFilterL")
-iImpl->SetFilterL( aIspFilter, aBearerFilter, aSortType );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::SetFilterL")
 }
 // ---------------------------------------------------------
 //
 EXPORT_C void CApSettingsHandler::SetTextOverrideL( TTextID aText2Change,
 const TDesC& aNewText )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::SetTextOverrideL")
-__ASSERT_DEBUG( iImpl, Panic( ENullPointer ) );
-iImpl->SetTextOverrideL( aText2Change, aNewText );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::SetTextOverrideL")
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::TextOverrideL
 // ---------------------------------------------------------
 //
 EXPORT_C const TDesC& CApSettingsHandler::TextOverrideL( TTextID aTextId )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::TextOverrideL<->")
+User::Leave( KErrNotSupported );
-__ASSERT_DEBUG( iImpl, Panic( ENullPointer ) );
-return iImpl->TextOverrideL( aTextId );
 }
 // ---------------------------------------------------------
 // ---------------------------------------------------------
 //
 EXPORT_C TInt CApSettingsHandler::RunSettingsL( TUint32 aHighLight,
 TUint32& aSelected )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::RunSettingsL")
+return 0;
-iImpl->RunSettingsL( aHighLight, aSelected );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::RunSettingsL")
-return iImpl->EventStore();
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::Cvt()
 // ---------------------------------------------------------
 //
 EXPORT_C TInt CApSettingsHandler::Cvt()
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::Cvt<->")
+return KErrNotSupported;
-return KErrNone;
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::DoRunSettingsL
 // ---------------------------------------------------------
 //
 TInt CApSettingsHandler::DoRunSettingsL( TUint32 /*aHighLight*/,
 TUint32& /*aSelected*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoRunSettingsL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::RunViewerL
 // ---------------------------------------------------------
 //
 EXPORT_C TInt CApSettingsHandler::RunViewerL( TUint32 aUid )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::RunViewerL")
+return 0;
-iImpl->RunViewerL( aUid );
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::RunViewerL")
-return iImpl->EventStore();
 }
 // ---------------------------------------------------------
 // CApSettingsHandler::DoRunViewerL
 // ---------------------------------------------------------
 //
 TInt CApSettingsHandler::DoRunViewerL( TUint32 /*aUid*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoRunViewerL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 //----------------------------------------------------------
 //
 void CApSettingsHandler::HandleApDeleteCmdL( TUint32 /*aUid*/,
 TBool /*aIsLast*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::HandleApDeleteCmdL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 }
 //----------------------------------------------------------
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::HandleApBlankNewL( TInt /*aBearers*/,
 TInt /*aIsps*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::HandleApBlankNewL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 // CApSettingsHandler::HandleApUseOldNewL
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::HandleApUseOldNewL()
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::HandleApUseOldNewL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 return KErrNone;
 }
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::EditAfterCreateL( TUint32 /*aUid*/,
 CApAccessPointItem* /*aItem*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::EditAfterCreateL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 TInt aBearerFilter,
 TInt aSortType,
 TVpnFilterType aVpnFilterType,
 TBool aIncludeEasyWlan )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoConstructL")
-// must place it to a temp variable, otherwise CodeScanner reports
-// it as a bad practice putting up member to Cleanupstack, but
-// we have NO NewL so we must use this.
-CApSettingsHandlerImpl* tmp = CApSettingsHandlerImpl::NewLC(
-*aDb, iStartWithSelection,
-iListType, iSelMenuType,
-aIspFilter, aBearerFilter,
-aSortType, iReqIpvType,
-aVpnFilterType, aIncludeEasyWlan,
-ETrue );
-CleanupStack::Pop(tmp);   // will soon be a member, need to pop
-iImpl = tmp;
-APSETUILOGGER_LEAVEFN( EAPI,"Handler::DoConstructL")
 }
 //----------------------------------------------------------
 //
 void CApSettingsHandler::DoRunSetPageSettingsL( TUint32 /*aHighLight*/,
 TUint32& /*aSelected*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoRunSetPageSettingsL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 }
 //----------------------------------------------------------
 //
 void CApSettingsHandler::DoRunListSettingsL( TUint32 /*aHighLight*/,
 TUint32& /*aSelected*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoRunListSettingsL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 }
 // CApSettingsHandler::DoHandleApUseOldNewL
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::DoHandleApUseOldNewL( TUint32 /*aSelected*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoHandleApUseOldNewL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 // CApSettingsHandler::SelectApToCopyL
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::SelectApToCopyL()
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::SelectApToCopyL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 // CApSettingsHandler::DoHandleApBlankNewL
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::DoHandleApBlankNewL( TInt /*aBearers*/, TInt /*aIsps*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::DoHandleApBlankNewL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 // CApSettingsHandler::HandleNetworkDeleteCmdL
 //----------------------------------------------------------
 //
 void CApSettingsHandler::HandleNetworkDeleteCmdL( TUint32 /*aUid*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::HandleNetworkDeleteCmdL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 }
 // CApSettingsHandler::GetVariantL
 //----------------------------------------------------------
 //
 TInt CApSettingsHandler::GetVariantL()
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::GetVariantL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 // CApSettingsHandler::ConfirmDeleteL
 //----------------------------------------------------------
 //
 TInt CApSettingsHandler::ConfirmDeleteL( TUint32 /*aUid*/, TBool /*aIsLast*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ConfirmDeleteL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 //----------------------------------------------------------
 //----------------------------------------------------------
 //
 void CApSettingsHandler::HandleRunSettingsL( TUint32 /*aHighLight*/,
 TUint32& /*aSelected*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::HandleRunSettingsL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 }
 //----------------------------------------------------------
 //
 void CApSettingsHandler::ChooseBearerTypeL( TInt /*aBearers*/,
 CApAccessPointItem& /*aItem*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::ChooseBearerTypeL@Deprecated")
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
 User::Leave(KErrNotSupported);
 }
 // CApSettingsHandler::HandleDuplicateL
 //----------------------------------------------------------
 //
 TUint32 CApSettingsHandler::HandleDuplicateL( TUint32 /*aUid*/ )
 {
-APSETUILOGGER_ENTERFN( EAPI,"Handler::HandleDuplicateL@Deprecated")
+User::Leave(KErrNotSupported);
+return KErrNotSupported;
-//  Deprecated as moved to iImpl
-__ASSERT_DEBUG( EFalse, Panic( ENullPointer ) );
-User::Leave(KErrNotSupported);
-return KErrNone;
 }
 // End of File

changeset 66	ed07dcc72692
parent 0	5a93021fdf25