diff -r ccb4f6b3db21 -r 8cb079868133 psmservices/psmserver/src/engine/psmmanager.cpp --- a/psmservices/psmserver/src/engine/psmmanager.cpp Tue Aug 31 16:29:05 2010 +0300 +++ b/psmservices/psmserver/src/engine/psmmanager.cpp Wed Sep 01 12:34:26 2010 +0100 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2007-2010 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). * All rights reserved. * This component and the accompanying materials are made available * under the terms of "Eclipse Public License v1.0" @@ -113,8 +113,8 @@ if ( iPluginLoader ) { delete iPluginLoader; - } - + } + // Close mode observers array iModeObservers.Close(); @@ -286,14 +286,14 @@ } // ----------------------------------------------------------------------------- -// CPsmManager::RegisterObserverL +// CPsmManager::RegisterObserver // ----------------------------------------------------------------------------- // -void CPsmManager::RegisterObserverL( MPsmModeChangeObserver* aObserver ) +void CPsmManager::RegisterObserver( MPsmModeChangeObserver* aObserver ) { - COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserverL()" ) ) ); - iModeObservers.AppendL( aObserver ); - COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserverL() return" ) ) ); + COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserver()" ) ) ); + iModeObservers.Append( aObserver ); + COMPONENT_TRACE( ( _L( "PSM Server - CPsmManager::RegisterObserver - return" ) ) ); } // ----------------------------------------------------------------------------- @@ -326,27 +326,4 @@ return *iSettingsHandler; } -#ifdef _DEBUG -// ----------------------------------------------------------------------------- -// CPsmManager::ClosePluginLoader -// For testing purpose -// ----------------------------------------------------------------------------- -void CPsmManager::ClosePluginLoader() - { - if(iPluginLoader) - { - delete iPluginLoader; - iPluginLoader=NULL; - } - } - -// ----------------------------------------------------------------------------- -// CPsmManager::CompressModeObserversArray -// For testing purpose -// ----------------------------------------------------------------------------- -void CPsmManager::CompressModeObserversArray() - { - iModeObservers.Compress(); - } -#endif // _DEBUG // End of file