FCL/sf/app/organizer: comparison calendarui/controller/src/calencontroller.cpp

equal deleted inserted replaced

-:ecd7b9840282
+:0b38fc5b94c6
 #include "calendarui_debug.h"           // Debug macros
 #include "calenstatemachine.h"
 #include "calenservicesimpl.h"          // Calendar service implementation
 #include "CalenUid.h"
 #include "calencontextimpl.h"
+#include "OstTraceDefinitions.h"
+#ifdef OST_TRACE_COMPILER_IN_USE
+#include "calencontrollerTraces.h"
+#endif
 // Constants
 const TInt KCustomCommandRangeStart     = ECalenLastCommand;
 const TInt KNumberOfCommandsPerServices = 100;
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenController::CCalenController()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_CCALENCONTROLLER_ENTRY );
 	// Check the Application Startup reason, set iIsFromServiceFrmWrk if application
 	// is started by service framework, false otherwise
 /*Hb::ActivationReasonService == qobject_cast<HbApplication*>(qApp)->activateReason() ?
 iIsFromServiceFrmWrk = true:
 iIsFromServiceFrmWrk = false; */
 iNextServicesCommandBase = KCustomCommandRangeStart;
 iRefCount = 0;
 mAgendaUtil = 0;
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_CCALENCONTROLLER_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::constuctController
 // Construct the controller completely
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenController::constructController()
 {
+	OstTraceFunctionEntry0( CCALENCONTROLLER_CONSTRUCTCONTROLLER_ENTRY );
 	// Store the pointer in tls, also avoid multiple creations
 	checkMultipleCreation();
 	// Get an instance of AgendaUtil interface class
 	// This will take care of
 	notificationArray.Append(ECalenNotifySettingsClosed);
 	RegisterForNotificationsL( iViewManager, notificationArray );
 	notificationArray.Reset();
 	notificationArray.Close();
+	OstTraceFunctionExit0( CCALENCONTROLLER_CONSTRUCTCONTROLLER_EXIT );
 }
 void CCalenController::checkMultipleCreation()
 {
+	OstTraceFunctionEntry0( CCALENCONTROLLER_CHECKMULTIPLECREATION_ENTRY );
 	TAny* tlsPtr = Dll::Tls();
 	// Check Thread local storage
 	if( !tlsPtr )
 		{
 		{
 		// An instance of the controller exists already.
 		// This function should only have been called once, by CCalenAppUi
 		User::Leave( KErrAlreadyExists );
 		}
+	OstTraceFunctionExit0( CCALENCONTROLLER_CHECKMULTIPLECREATION_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::InstanceL
 // Returns a pointer to the single instance of the Calendar Controller.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenController* CCalenController::InstanceL()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_INSTANCEL_ENTRY );
 CCalenController* self = NULL;
 TAny* tlsPtr = Dll::Tls();
 // Check Thread local storage
 if( !tlsPtr )
 self = static_cast<CCalenController*>( tlsPtr );
 }
 ++self->iRefCount;
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_INSTANCEL_EXIT );
 return self;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::ReleaseCustomisations
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenController::ReleaseCustomisations()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_RELEASECUSTOMISATIONS_ENTRY );
 delete iCustomisationManager;
 iCustomisationManager = NULL;
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_RELEASECUSTOMISATIONS_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::Release
 // Decrement the reference count of this singleton.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenController::Release()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_RELEASE_ENTRY );
 --iRefCount;
 // The controller owns its own instance of the services, therefore the
 // reference count will be one, immediatley before deletion.
 if (iRefCount == 1)
 {
 delete this;
 }
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_RELEASE_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::~CCalenController
 // Private destructor, called from Release() when reference count is 0.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenController::~CCalenController()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_CCALENCONTROLLER_ENTRY );
 if(iStateMachine) {
 	delete iStateMachine;
 	iStateMachine = NULL;
 }
 mAgendaUtil = 0;
 }
 Dll::SetTls( NULL );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_CCALENCONTROLLER_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::IssueCommmandL
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 TBool CCalenController::IssueCommandL( TInt aCommand )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_ISSUECOMMANDL_ENTRY );
 TCalenCommand cmd;
 cmd.SetCommandAndContextL( aCommand ,context());
 TBool ret = iStateMachine->HandleCommandL( cmd );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_ISSUECOMMANDL_EXIT );
 return ret;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::Services
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 MCalenServices& CCalenController::Services()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_SERVICES_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_SERVICES_EXIT );
 return *iServices;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::ViewManager
 // Returns a reference to the view manager
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 CalenViewManager& CCalenController::ViewManager()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_VIEWMANAGER_ENTRY );
-TRACE_EXIT_POINT;
+	OstTraceFunctionExit0( CCALENCONTROLLER_VIEWMANAGER_EXIT );
 	return *iViewManager;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::MainWindow
 // Returns a reference to the MainWindow
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 HbMainWindow& CCalenController::MainWindow()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_MAINWINDOW_ENTRY );
+OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_MAINWINDOW_EXIT );
 return *(hbInstance->allMainWindows().first());
-	TRACE_EXIT_POINT;
 }
 // ----------------------------------------------------------------------------
 // CCCalenController::BroadcastNotification
 // Passes the notification to the Calendar Notifier.  The notification will
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenController::BroadcastNotification( TCalenNotification aNotification )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_BROADCASTNOTIFICATION_ENTRY );
 iNotifier->BroadcastNotification( aNotification );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_BROADCASTNOTIFICATION_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCCalenController::RegisterForNotificationsL
 // Registers the passed notification handler with the Calendar Notifier
 // ----------------------------------------------------------------------------
 //
 void CCalenController::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
 TCalenNotification aNotification )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY );
 iNotifier->RegisterForNotificationsL( aHandler, aNotification );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCCalenController::RegisterForNotificationsL
 // Registers the passed notification handler with the Calendar Notifier
 // ----------------------------------------------------------------------------
 //
 void CCalenController::RegisterForNotificationsL( MCalenNotificationHandler* aHandler,
 RArray<TCalenNotification>& aNotifications )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_ENTRY );
 iNotifier->RegisterForNotificationsL( aHandler, aNotifications );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_REGISTERFORNOTIFICATIONSL_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCCalenController::CancelNotifications
 // Removes the passed handler from the notifier.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenController::CancelNotifications( MCalenNotificationHandler* aHandler )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_CANCELNOTIFICATIONS_ENTRY );
 iNotifier->CancelNotifications( aHandler );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_CANCELNOTIFICATIONS_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCCalenController::GetCommandHandlerL
 // Searches for a command handler for a particular command.  Customisations
 // are searched first.  If no customisation wants to handle the command it is
 // handled by the view manager or the action uis
 // ----------------------------------------------------------------------------
 MCalenCommandHandler* CCalenController::GetCommandHandlerL( TInt aCommand )
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_GETCOMMANDHANDLERL_ENTRY );
 MCalenCommandHandler* handler( NULL );
 // Stop non-published commands from being customised
 if ( aCommand != ECalenShowSettings
 }
 }
 // No command handler is an error
+OstTraceFunctionExit0( CCALENCONTROLLER_GETCOMMANDHANDLERL_EXIT );
 // return the handler
-TRACE_EXIT_POINT;
 return handler;
 }
 // ----------------------------------------------------------------------------
 // CCCalenController::NewServicesL
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 MCalenServices* CCalenController::NewServicesL()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_NEWSERVICESL_ENTRY );
 TInt commandRangeStart = iNextServicesCommandBase;
 TInt commandRangeEnd = commandRangeStart + KNumberOfCommandsPerServices;
 iNextServicesCommandBase = commandRangeEnd + 1;
 CalenServicesImpl* svc = CalenServicesImpl::NewL( commandRangeStart,commandRangeEnd );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_NEWSERVICESL_EXIT );
 return svc;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::Notifier
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CalenNotifier& CCalenController::Notifier()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_NOTIFIER_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_NOTIFIER_EXIT );
 return *iNotifier;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::Infobar
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 HbWidget* CCalenController::Infobar()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( DUP1_CCALENCONTROLLER_INFOBAR_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( DUP1_CCALENCONTROLLER_INFOBAR_EXIT );
 return iCustomisationManager->Infobar();
 }
 // ----------------------------------------------------------------------------
 // CCalenController::InfobarTextL
 // @returns info bar text
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 QString* CCalenController::InfobarTextL()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_INFOBARTEXTL_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_INFOBARTEXTL_EXIT );
 return iCustomisationManager->InfobarTextL();
 }
 // ----------------------------------------------------------------------------
 // CCalenController::CustomisationManager
 // Returns a reference to the customisation manager
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 CCalenCustomisationManager& CCalenController::CustomisationManager()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_CUSTOMISATIONMANAGER_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_CUSTOMISATIONMANAGER_EXIT );
 return *iCustomisationManager;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::SetDefaultContext
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
 void CCalenController::SetDefaultContext()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_SETDEFAULTCONTEXT_ENTRY );
 QDateTime focusTime = mContext->defaultCalTimeForViewsL();
 mContext->setFocusDateAndTime(focusTime);
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_SETDEFAULTCONTEXT_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::OfferMenu
 // Offers the menu to plugins for customisation.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 void CCalenController::OfferMenu(HbMenu* aHbMenu)
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_OFFERMENU_ENTRY );
 iCustomisationManager->OfferMenu(aHbMenu);
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_OFFERMENU_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::agendaInterface
 // returns the interface to the agenda database
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 AgendaUtil* CCalenController::agendaInterface()
 {
-TRACE_ENTRY_POINT;
+OstTraceFunctionEntry0( CCALENCONTROLLER_AGENDAINTERFACE_ENTRY );
-TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_AGENDAINTERFACE_EXIT );
 return mAgendaUtil;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::context
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 MCalenContext& CCalenController::context()
 {
-	TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CCALENCONTROLLER_CONTEXT_ENTRY );
-	TRACE_EXIT_POINT;
+OstTraceFunctionExit0( CCALENCONTROLLER_CONTEXT_EXIT );
 return *mContext;
 }
 // ----------------------------------------------------------------------------
 // CCalenController::handleServiceManagerSlot
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 void CCalenController::handleServiceManagerSlot(int view, const QDateTime& dateTime)
 {
+	OstTraceFunctionEntry0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_ENTRY );
 	if (iIsFromServiceFrmWrk) {
 		// Set the context properly
 		mContext->setFocusDateAndTime(dateTime);
 		// launch the appropriate view
 			// Set the context properly
 			mContext->setFocusDateAndTime(dateTime);
 			IssueCommandL(view);
 		}
 	}
+	OstTraceFunctionExit0( CCALENCONTROLLER_HANDLESERVICEMANAGERSLOT_EXIT );
 }
 // ----------------------------------------------------------------------------
 // CCalenController::getFirstView
 // returns the first view with which calendar has been launched
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 int CCalenController::getFirstView()
 {
-	TRACE_ENTRY_POINT;
+	OstTraceFunctionEntry0( CCALENCONTROLLER_GETFIRSTVIEW_ENTRY );
-	TRACE_EXIT_POINT;
+	OstTraceFunctionExit0( CCALENCONTROLLER_GETFIRSTVIEW_EXIT );
 	return iViewManager->getFirstView();
 }
 // (other items were commented in a header).
 // ---------------------------------------------------------------------------
 //
 bool CCalenController::eventFilter(QObject *object, QEvent *event)
 {
+OstTraceFunctionEntry0( CCALENCONTROLLER_EVENTFILTER_ENTRY );
 switch (event->type())
 {
 case QEvent::LanguageChange:
 	//TODO: Unload the translator and install the locale specific translator
 	iNotifier->BroadcastNotification( ECalenNotifySystemLanguageChanged );
 	// TODO: handle the locale changes
 break;
 default:
 break;
 }
+OstTraceFunctionExit0( CCALENCONTROLLER_EVENTFILTER_EXIT );
 return QObject::eventFilter(object, event);
 }
 // End of file

changeset 51	0b38fc5b94c6
parent 46	ecd7b9840282
child 55	2c54b51f39c4