--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailtask.cpp Tue Aug 31 15:30:59 2010 +0300
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/src/thumbnailtask.cpp Wed Sep 01 12:20:35 2010 +0100
@@ -25,11 +25,6 @@
#include "thumbnailpanic.h"
#include "thumbnailserversession.h" // ConvertSqlErrToE32Err()
#include "thumbnailmanagerconstants.h"
-#include "OstTraceDefinitions.h"
-#ifdef OST_TRACE_COMPILER_IN_USE
-#include "thumbnailtaskTraces.h"
-#endif
-
// ======== MEMBER FUNCTIONS ========
@@ -90,9 +85,6 @@
void CThumbnailTask::StartL()
{
TN_DEBUG3( "CThumbnailTask(0x%08x)::StartL() iState == %d ", this, iState );
- OstTrace1( TRACE_NORMAL, CTHUMBNAILTASK_STARTL, "CThumbnailTask::StartL;this=%o", this );
- OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILTASK_STARTL, "CThumbnailTask::StartL;iState=%u", iState );
-
__ASSERT_DEBUG(( iState != ERunning ), ThumbnailPanic( EThumbnailAlreadyRunning ));
iState = ERunning;
}
@@ -116,8 +108,6 @@
{
TN_DEBUG4( "CThumbnailTask(0x%08x)::Complete(aReason=%d) iState was %d",
this, aReason, iState );
- OstTrace1( TRACE_NORMAL, CTHUMBNAILTASK_COMPLETE, "CThumbnailTask::Complete;this=%o", this );
- OstTraceExt2( TRACE_NORMAL, DUP1_CTHUMBNAILTASK_COMPLETE, "CThumbnailTask::Complete;aReason=%d;iState=%u", aReason, iState );
if ( iState != EComplete )
{
@@ -166,9 +156,6 @@
// This is called if StartL() left. Complete this task with an error and
// continue processing.
TN_DEBUG3( "CThumbnailTask(0x%08x)::StartError(aError=%d)", this, aError );
- OstTrace1( TRACE_NORMAL, CTHUMBNAILTASK_STARTERROR, "CThumbnailTask::StartError;this=%o", this );
- OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILTASK_STARTERROR, "CThumbnailTask::StartError;aError=%d", aError );
-
Complete( aError );
}
@@ -202,7 +189,6 @@
else
{
TN_DEBUG2( "CThumbnailTask(0x%08x)::ClientThreadAlive() - message null", this);
- OstTrace1( TRACE_NORMAL, CTHUMBNAILTASK_SETMESSAGEDATA, "CThumbnailTask::SetMessageData - message null;this=%o", this );
}
}
@@ -261,7 +247,6 @@
TBool CThumbnailTask::ClientThreadAlive(const TBool aGetThread)
{
TN_DEBUG1( "CThumbnailTask::ClientThreadAlive()");
- OstTrace0( TRACE_NORMAL, CTHUMBNAILTASK_CLIENTTHREADALIVE, "CThumbnailTask::ClientThreadAlive" );
if ( iMessage.Handle())
{
@@ -272,7 +257,6 @@
if (err != KErrNone)
{
TN_DEBUG2( "CThumbnailTask(0x%08x)::ClientThreadAlive() - client thread not found", this);
- OstTrace1( TRACE_NORMAL, DUP1_CTHUMBNAILTASK_CLIENTTHREADALIVE, "CThumbnailTask::ClientThreadAlive - client thread not found;this=%o", this );
ResetMessageData();
@@ -285,7 +269,6 @@
if( exitType != EExitPending )
{
TN_DEBUG2( "CThumbnailTask(0x%08x)::ClientThreadAlive() - client thread died", this);
- OstTrace1( TRACE_NORMAL, DUP2_CTHUMBNAILTASK_CLIENTTHREADALIVE, "CThumbnailTask::ClientThreadAlive - client thread died;this=%o", this );
ResetMessageData();