--- a/photosgallery/slideshow/engine/controlsrc/shweffectcontrol.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/engine/controlsrc/shweffectcontrol.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -595,7 +595,7 @@
// need to start timer to send the transition ready
iTransitionTimer->Start(
duration, duration,
- TShwCallBack< CShwEffectControl, SendTransitionReadyL >( this ) );
+ TShwCallBack< CShwEffectControl, &CShwEffectControl::SendTransitionReadyL >( this ) );
}
// -----------------------------------------------------------------------------
--- a/photosgallery/slideshow/engine/controlsrc/shwtimercontrol.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/engine/controlsrc/shwtimercontrol.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -105,7 +105,7 @@
// Start the timer with the appropriate values for the event
iTimer->Start( interval, interval,
- TShwCallBack< CShwTimerControl, SendTimerBeatL >( this ) );
+ TShwCallBack< CShwTimerControl, &CShwTimerControl::SendTimerBeatL >( this ) );
}
// was it start pause
else if ( dynamic_cast<TShwEventPause*>( aEvent ) )
--- a/photosgallery/slideshow/engine/coresrc/shwthumbnailloader.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/engine/coresrc/shwthumbnailloader.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -323,19 +323,19 @@
iCompletedCallBack = new( ELeave ) CAsyncCallBack( CActive::EPriorityHigh );
// set the callback
iCompletedCallBack->Set(
- TShwCallBack< CShwThumbnailLoaderImpl, CompletedNotifyL >( this ) );
+ TShwCallBack< CShwThumbnailLoaderImpl, &CShwThumbnailLoaderImpl::CompletedNotifyL >( this ) );
// create async callback to give error callbacks once scheduler runs
iErrorCallBack = new( ELeave ) CAsyncCallBack( CActive::EPriorityHigh );
// set the callback
iErrorCallBack->Set(
- TShwCallBack< CShwThumbnailLoaderImpl, ErrorNotifyL >( this ) );
+ TShwCallBack< CShwThumbnailLoaderImpl, &CShwThumbnailLoaderImpl::ErrorNotifyL >( this ) );
// create async callback to give callback once we run onto errors
iErrorHandlerCallBack = new( ELeave ) CAsyncCallBack( CActive::EPriorityHigh );
// set the callback
iErrorHandlerCallBack->Set(
- TShwCallBack< CShwThumbnailLoaderImpl, AsyncErrorHandleL >( this ) );
+ TShwCallBack< CShwThumbnailLoaderImpl, &CShwThumbnailLoaderImpl::AsyncErrorHandleL >( this ) );
}
// -----------------------------------------------------------------------------
--- a/photosgallery/slideshow/engine/effectsrc/shwzoomandpaneffect.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/engine/effectsrc/shwzoomandpaneffect.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -350,7 +350,7 @@
zoom_and_pan_dur,
TShwCallBack<
TShwZoomAndPanLayout,
- TShwZoomAndPanLayout::InvertZoom >(
+ &TShwZoomAndPanLayout::InvertZoom >(
&iImpl->iZoomAndPanLayout ) );
}
else
--- a/photosgallery/slideshow/engine/tsrc/t_cshwtimercontrol/t_cshwtimercontrol.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/engine/tsrc/t_cshwtimercontrol/t_cshwtimercontrol.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -178,7 +178,7 @@
timer->Start(
1 * 1000000,
1 * 1000000,
- TShwCallBack< T_CShwTimerControl, TimerCallBack >( this ) );
+ TShwCallBack< T_CShwTimerControl, &T_CShwTimerControl::TimerCallBack >( this ) );
// Need to let the scheduler loop
iWait.Start();
@@ -197,7 +197,7 @@
timer->Start(
1 * 1000000,
1 * 1000000,
- TShwCallBack< T_CShwTimerControl, TimerCallBack >( this ) );
+ TShwCallBack< T_CShwTimerControl, &T_CShwTimerControl::TimerCallBack >( this ) );
// Need to let the scheduler loop
iWait.Start();
@@ -218,7 +218,7 @@
timer->Start(
1 * 1000000,
1 * 1000000,
- TShwCallBack< T_CShwTimerControl, TimerCallBack >( this ) );
+ TShwCallBack< T_CShwTimerControl, &T_CShwTimerControl::TimerCallBack >( this ) );
// Need to let the scheduler loop
iWait.Start();
timer->Cancel();
--- a/photosgallery/slideshow/engine/tsrc/t_cshwzoomandpaneffect/t_cshwzoomandpaneffect.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/engine/tsrc/t_cshwzoomandpaneffect/t_cshwzoomandpaneffect.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -598,7 +598,7 @@
timer->Start(
1.5 * 1000000,
1.5 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
@@ -626,7 +626,7 @@
timer->Start(
1.5 * 1000000,
1.5 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
@@ -688,7 +688,7 @@
timer->Start(
1.5 * 1000000,
1.5 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
// cancel the timer
@@ -722,7 +722,7 @@
timer->Start(
1.5 * 1000000,
1.5 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
// cancel the timer
@@ -761,7 +761,7 @@
timer->Start(
0.1 * 1000000,
0.1 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
// cancel the timer
@@ -789,7 +789,7 @@
timer->Start(
1.0 * 1000000,
1.0 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
// cancel the timer
@@ -819,7 +819,7 @@
timer->Start(
1.0 * 1000000,
1.0 * 1000000,
- TShwCallBack< T_CShwZoomAndPanEffect, CancelAsyncL >( this ) );
+ TShwCallBack< T_CShwZoomAndPanEffect, &T_CShwZoomAndPanEffect::CancelAsyncL >( this ) );
// start async wait
iAsyncWait.Start();
// cancel the timer
--- a/photosgallery/slideshow/utils/shwcallback.h Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/utils/shwcallback.h Tue Apr 06 17:25:48 2010 +0100
@@ -26,10 +26,10 @@
* Helper class to construct a TCallBack from any
* public non static TInt (*method)() of a class
* Usage:
- * TShwCallBack< %ClassName%, %MethodName% >(
+ * TShwCallBack< %ClassName%, %&ClassName::MethodName% >(
* %ClassPointer% )
* Example:
- * TShwCallBack< CShwEngineImpl, DoStartL >(
+ * TShwCallBack< CShwEngineImpl, &CShwEngineImpl::DoStartL >(
* this );
*/
template< class Object, TInt (Object::*Method)() >
--- a/photosgallery/slideshow/utils/shwcleanupwrapper.h Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/utils/shwcleanupwrapper.h Tue Apr 06 17:25:48 2010 +0100
@@ -76,7 +76,7 @@
void ShwCleanupResetAndDestroyPushL( T& aObject )
{
CleanupStack::PushL(
- TShwCleanupWrapper< T, T::ResetAndDestroy >( aObject ) );
+ TShwCleanupWrapper< T, &T::ResetAndDestroy >( aObject ) );
}
#endif // __TSHWCLEANUPWRAPPER_H__
--- a/photosgallery/slideshow/view/src/shwslideshowbacklighttimer.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/view/src/shwslideshowbacklighttimer.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -139,7 +139,7 @@
User::ResetInactivityTime();
iPeriodic->Cancel(); // in case it actually was running
iPeriodic->Start( iSettingsDelay, iSettingsDelay,
- TShwCallBack< CShwSlideshowBackLightTimer, Tick >( this ) );
+ TShwCallBack< CShwSlideshowBackLightTimer, &CShwSlideshowBackLightTimer::Tick >( this ) );
}
// -----------------------------------------------------------------------------
--- a/photosgallery/slideshow/view/src/shwslideshowview.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/view/src/shwslideshowview.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -199,7 +199,7 @@
iWaitDialog->RunLD();
// set the callback to be engine start
iAsyncCallBack->Set(
- TShwCallBack< CShwSlideshowView, StartEngineL >( this ) );
+ TShwCallBack< CShwSlideshowView, &CShwSlideshowView::StartEngineL >( this ) );
// if both lists are ready
if( iInputListReady && iPlayListReady )
{
@@ -350,7 +350,7 @@
CAsyncCallBack( CActive::EPriorityStandard );
// set the callback for the media list population
iPopulateListCallBack->Set(
- TShwCallBack< CShwSlideshowView, PopulateListL >( this ) );
+ TShwCallBack< CShwSlideshowView, &CShwSlideshowView::PopulateListL >( this ) );
iMSKPressed = EFalse;
iLSKPressed = EFalse;
@@ -454,7 +454,7 @@
// Request asynch callback that will end up in ShowProgressDialogL
// once the active scheduler runs
iAsyncCallBack->Set(
- TShwCallBack< CShwSlideshowView, ShowProgressDialogL >( this ) );
+ TShwCallBack< CShwSlideshowView, &CShwSlideshowView::ShowProgressDialogL >( this ) );
iAsyncCallBack->CallBack();
iDisplay->Roster().ShowL( *iGestureControlGroup,KAlfRosterShowAtTop );
--- a/photosgallery/slideshow/view/src/shwslideshowvolumecontrol.cpp Sun Mar 28 16:36:22 2010 +0100
+++ b/photosgallery/slideshow/view/src/shwslideshowvolumecontrol.cpp Tue Apr 06 17:25:48 2010 +0100
@@ -232,7 +232,7 @@
// Restart the timer
iTimer->Cancel();
iTimer->Start( iInterval, iInterval,
- TShwCallBack< CShwSlideshowVolumeControl, TimerCallback>
+ TShwCallBack< CShwSlideshowVolumeControl, &CShwSlideshowVolumeControl::TimerCallback>
( this ) );
}
}