FCL/sf/app/organizer: comparison calendarui/globaldata/src/calencontextimpl.cpp

equal deleted inserted replaced

-:fd30d51f876b
+:b6db4fd4947b
 // CalenContextImpl::~CalenContextImpl
 // Destructor.
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-CalenContextImpl::~CalenContextImpl()
+EXPORT_C CalenContextImpl::~CalenContextImpl()
-{
+	{
-}
+	if(mMutlipleContextIds.count())
+		{
+		mMutlipleContextIds.clear();
+		}
+	}
 // ----------------------------------------------------------------------------
 // CalenContextImpl::DefaultTimeForViews
 // If a view knows what day they should be looking at, but doesn't know what
 // time (for example the month view only deals in days), they should set the
 // CalenContextImpl::SetFocusDateAndTimeL
 // Sets the focus time
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-void CalenContextImpl::setFocusDateAndTimeL( const QDateTime& focusDateTime,
+void CalenContextImpl::setFocusDateAndTime( const QDateTime& focusDateTime)
-const int& viewId )
+{
-{
+mFocusDate = focusDateTime;
+mFocusTime = focusDateTime.time().minute() + 1;
+if( mFocusTime < 0 )
+mFocusTime = 0;
+mInstanceId = TCalenInstanceId::nullInstanceId();
 // If this fails you're using a context that was constructed yourself.
 // Use the accessor from the global data instead, or don't try to set
 // anything on this context.
-ASSERT( mObserver );
+if(mObserver)
+mObserver->ContextChanged();
-mFocusDate = focusDateTime;
-mFocusTime = focusDateTime.time().minute() + 1;
-ASSERT( mFocusTime >= 0 );
-mInstanceId = TCalenInstanceId::nullInstanceId();
-mViewId = viewId;
-mObserver->ContextChanged();
 }
 // ----------------------------------------------------------------------------
 // CalenContextImpl::SetFocusDateL
 // Sets the focus date
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-void CalenContextImpl::setFocusDateL( const QDateTime& focusDateTime,
+void CalenContextImpl::setFocusDate( const QDateTime& focusDateTime)
-const int& viewId )
+{
-{
+mFocusDate = focusDateTime;
+mFocusTime = -1;
+mInstanceId = TCalenInstanceId::nullInstanceId();
 // If this fails you're using a context that was constructed yourself.
 // Use the accessor from the global data instead, or don't try to set
 // anything on this context.
-ASSERT( mObserver );
+if(mObserver)
+mObserver->ContextChanged();
-mFocusDate = focusDateTime;
-mFocusTime = -1;
-mInstanceId = TCalenInstanceId::nullInstanceId();
-mViewId = viewId;
-mObserver->ContextChanged();
 }
 // ----------------------------------------------------------------------------
 // CalenContextImpl::SetInstanceIdL
 // Sets the instance id
 // (other items were commented in a header).
 // ----------------------------------------------------------------------------
 //
-void CalenContextImpl::setInstanceIdL( const TCalenInstanceId& aInstanceId,
+void CalenContextImpl::setInstanceId( const TCalenInstanceId& aInstanceId )
-const int& viewId )
+{
-{
-// If this fails you're using a context that was constructed yourself.
-// Use the accessor from the global data instead, or don't try to set
-// anything on this context.
-ASSERT( mObserver );
 // Set the null date and time
 mFocusDate = QDateTime();
 mFocusTime = -1;
 mInstanceId = aInstanceId;
-mViewId = viewId;
-mObserver->ContextChanged();
-}
-// -----------------------------------------------------------------------------
-// CalenContextImpl::SetFocusDateAndTimeAndInstanceL
-// Sets the currently focused time and instance
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-void CalenContextImpl::setFocusDateAndTimeAndInstanceL( const QDateTime& focusDateTime,
-const TCalenInstanceId& instanceId,
-const int& viewId )
-{
 // If this fails you're using a context that was constructed yourself.
 // Use the accessor from the global data instead, or don't try to set
 // anything on this context.
-ASSERT( mObserver );
+if(mObserver)
+mObserver->ContextChanged();
+}
+// -----------------------------------------------------------------------------
+// CalenContextImpl::SetFocusDateAndTimeAndInstanceL
+// Sets the currently focused time and instance
+// (other items were commented in a header).
+// -----------------------------------------------------------------------------
+//
+void CalenContextImpl::setFocusDateAndTimeAndInstance( const QDateTime& focusDateTime,
+const TCalenInstanceId& instanceId )
+{
 mFocusDate = focusDateTime;
 mFocusTime = focusDateTime.time().minute() + 1;
-ASSERT( mFocusTime >= 0 );
+if( mFocusTime < 0 )
+		mFocusTime = 0;
 mInstanceId = instanceId;
-mViewId = viewId;
+// If this fails you're using a context that was constructed yourself.
-mObserver->ContextChanged();
+// Use the accessor from the global data instead, or don't try to set
+// anything on this context.
+if(mObserver)
+mObserver->ContextChanged();
 }
 // -----------------------------------------------------------------------------
 // CalenContextImpl::FocusDateAndTimeL
 // Returns the focus time
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //
-QDateTime CalenContextImpl::focusDateAndTimeL() const
+QDateTime CalenContextImpl::focusDateAndTime() const
 {
 QDateTime ret;
 if( mFocusDate.isValid() )
 {
 TRACE_EXIT_POINT;
 return mInstanceId;
 }
 // -----------------------------------------------------------------------------
-// CalenContextImpl::ViewId
-// Returns the view id
-// (other items were commented in a header).
-// -----------------------------------------------------------------------------
-//
-int CalenContextImpl::viewId() const
-{
-TRACE_ENTRY_POINT;
-TRACE_EXIT_POINT;
-return mViewId;
-}
-// -----------------------------------------------------------------------------
 // CalenContextImpl::SetMutlipleContextIds
 // Set multiple context ids
 // (other items were commented in a header).
 // -----------------------------------------------------------------------------
 //

changeset 45	b6db4fd4947b
parent 18	c198609911f9
child 83	5aadd1120515