--- a/memspyui/ui/avkon/src/MemSpyViewKernelContainers.cpp Thu Jun 17 15:34:52 2010 +0300
+++ b/memspyui/ui/avkon/src/MemSpyViewKernelContainers.cpp Thu Jun 24 14:55:55 2010 +0300
@@ -56,7 +56,7 @@
{
_LIT( KTitle, "Kernel Objects" );
SetTitleL( KTitle );
- //
+ //
CMemSpyViewBase::ConstructL( aRect, aContainer, aSelectionRune );
}
@@ -107,10 +107,10 @@
{
TInt count = iKernelObjects[i]->Count();
TInt size = iKernelObjects[i]->Size();
- const TMemSpySizeText sizeText( MemSpyEngineUtils::FormatSizeText( size, 0 ) ); //TODO: is this OK to call Engine Utils?
+ const TMemSpySizeText sizeText( MemSpyUiUtils::FormatSizeText( size, 0 ) );
HBufC* tempName = HBufC::NewL( iKernelObjects[i]->Name().Length() + 32 );
- //HBufC* tempName = HBufC::NewL( KMaxFullName );
+
CleanupStack::PushL( tempName );
TPtr tempNamePtr( tempName->Des() );
tempNamePtr.Copy( iKernelObjects[i]->Name() );
@@ -118,7 +118,7 @@
_LIT(KNameFormat, "\t%S\t\t%d item");
TPtr pName( tempName->Des() );
//
- const TPtrC pType( TypeAsString( iKernelObjects[i]->Type() ) );
+ const TPtrC pType( MemSpyUiUtils::TypeAsString( iKernelObjects[i]->Type() ) );
//
pName.Format( KNameFormat, &pType, count );
//
@@ -137,19 +137,6 @@
CAknSettingStyleListBox* listbox = static_cast< CAknSettingStyleListBox* >( iListBox );
listbox->Model()->SetItemTextArray( model );
listbox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
-
- /*
- // Take ownership of new model
- CMemSpyEngineHelperKernelContainers& kernelContainerManager = iEngine.HelperKernelContainers();
- CMemSpyEngineGenericKernelObjectContainer* model = kernelContainerManager.ObjectsAllL();
- delete iModel;
- iModel = model;
-
- // Set up list box
- CAknSettingStyleListBox* listbox = static_cast< CAknSettingStyleListBox* >( iListBox );
- listbox->Model()->SetItemTextArray( model );
- listbox->Model()->SetOwnershipType( ELbmDoesNotOwnItemArray );
- */
}
@@ -174,96 +161,5 @@
void CMemSpyViewKernelContainers::OnCmdOutputAllContainerContentsL()
{
- iMemSpySession.OutputAllContainerContents();
-
- /*
- CMemSpyEngineOutputSink& sink = iEngine.Sink();
- iModel->OutputL( sink );
- */
+ iMemSpySession.OutputAllContainerContents();
}
-
-//formating methods
-TPtrC CMemSpyViewKernelContainers::TypeAsString( TMemSpyDriverContainerType aType )
- {
- _LIT( KTypeUnknown, "Unknown Type" );
- _LIT( KTypeThread, "Thread" );
- _LIT( KTypeProcess, "Process" );
- _LIT( KTypeChunk, "Chunk" );
- _LIT( KTypeLibrary, "Library" );
- _LIT( KTypeSemaphore, "Semaphore" );
- _LIT( KTypeMutex, "Mutex" );
- _LIT( KTypeTimer, "Timer" );
- _LIT( KTypeServer, "Server" );
- _LIT( KTypeSession, "Session" );
- _LIT( KTypeLogicalDevice, "Logical Device" );
- _LIT( KTypePhysicalDevice, "Physical Device" );
- _LIT( KTypeLogicalChannel, "Logical Channel" );
- _LIT( KTypeChangeNotifier, "Change Notifier" );
- _LIT( KTypeUndertaker, "Undertaker" );
- _LIT( KTypeMsgQueue, "Msg. Queue" );
- _LIT( KTypePropertyRef, "Property Ref." );
- _LIT( KTypeCondVar, "Conditional Var." );
- //
- TPtrC pType( KTypeUnknown );
- //
- switch( aType )
- {
- case EMemSpyDriverContainerTypeThread:
- pType.Set( KTypeThread );
- break;
- case EMemSpyDriverContainerTypeProcess:
- pType.Set( KTypeProcess );
- break;
- case EMemSpyDriverContainerTypeChunk:
- pType.Set( KTypeChunk );
- break;
- case EMemSpyDriverContainerTypeLibrary:
- pType.Set( KTypeLibrary );
- break;
- case EMemSpyDriverContainerTypeSemaphore:
- pType.Set( KTypeSemaphore );
- break;
- case EMemSpyDriverContainerTypeMutex:
- pType.Set( KTypeMutex );
- break;
- case EMemSpyDriverContainerTypeTimer:
- pType.Set( KTypeTimer );
- break;
- case EMemSpyDriverContainerTypeServer:
- pType.Set( KTypeServer );
- break;
- case EMemSpyDriverContainerTypeSession:
- pType.Set( KTypeSession );
- break;
- case EMemSpyDriverContainerTypeLogicalDevice:
- pType.Set( KTypeLogicalDevice );
- break;
- case EMemSpyDriverContainerTypePhysicalDevice:
- pType.Set( KTypePhysicalDevice );
- break;
- case EMemSpyDriverContainerTypeLogicalChannel:
- pType.Set( KTypeLogicalChannel );
- break;
- case EMemSpyDriverContainerTypeChangeNotifier:
- pType.Set( KTypeChangeNotifier );
- break;
- case EMemSpyDriverContainerTypeUndertaker:
- pType.Set( KTypeUndertaker );
- break;
- case EMemSpyDriverContainerTypeMsgQueue:
- pType.Set( KTypeMsgQueue );
- break;
- case EMemSpyDriverContainerTypePropertyRef:
- pType.Set( KTypePropertyRef );
- break;
- case EMemSpyDriverContainerTypeCondVar:
- pType.Set( KTypeCondVar );
- break;
-
- default:
- break;
- }
- //
- return pType;
- }
-