--- a/calendarui/inc/calendarui_debug.h Mon Jul 12 02:32:28 2010 +0530
+++ b/calendarui/inc/calendarui_debug.h Mon Jul 26 13:54:38 2010 +0530
@@ -25,75 +25,17 @@
#ifndef PIM_TRACE_H
#define PIM_TRACE_H
-#if defined (_DEBUG) || defined (_PIM_FILE_LOG) || defined (_DISPLAY_WARNINGS)
+#if defined (_DEBUG) || defined (_PIM_FILE_LOG)
//Includes
#include <e32base.h>
#include <e32std.h>
#include <flogger.h>
#include <e32svr.h>
#include <f32file.h>
- //#include <AknGlobalConfirmationQuery.h>
+
const TInt KMaxLogLineLength = 512;
#endif
-
-/**
-* Define our own trap and assert macros to prevent compiler warnings.
-*/
-#if defined (_DISPLAY_WARNINGS)
- _LIT( KWarningFormat, " error %d trapped %S line %d");
- inline void DisplayWarningNote( TInt aError, const TDesC8& aFile, TInt aWarningNote )
- {
- /*if ( aError )
- {
- TRAP_IGNORE(
- CAknGlobalConfirmationQuery* cq = CAknGlobalConfirmationQuery::NewL();
- CleanupStack::PushL( cq );
-
- TBuf<KMaxLogLineLength> text;
- TBuf<128> fileName;
- fileName.Copy( aFile );
- text.Format( KWarningFormat, aError, &fileName, aWarningNote );
-
- TRequestStatus stat = KRequestPending;
- cq->ShowConfirmationQueryL( stat, text, R_AVKON_SOFTKEYS_YES_NO );
- User::WaitForRequest( stat );
-
- CleanupStack::PopAndDestroy( cq );
- );
- } */
- }
-
- inline void DisplayWarningNote( const TDesC& aNote )
- {
- /*TRAP_IGNORE(
- CAknGlobalConfirmationQuery* cq = CAknGlobalConfirmationQuery::NewL();
- CleanupStack::PushL( cq );
-
-
- TRequestStatus stat = KRequestPending;
- cq->ShowConfirmationQueryL( stat, aNote, R_AVKON_SOFTKEYS_YES_NO );
- User::WaitForRequest( stat );
-
- CleanupStack::PopAndDestroy( cq );
- );*/
- }
-
- #undef TRAP_INSTRUMENTATION_LEAVE
- #define TRAP_INSTRUMENTATION_LEAVE(aResult) DisplayWarningNote( aResult,TPtrC8( ( TText8* )__FILE__), __LINE__);
-
- #define PIM_TRAP_HANDLE( _err, _s ) \
- { \
- TRAP( _err, _s; ); \
- DisplayWarningNote( _err,TPtrC8( ( TText8* )__FILE__),__LINE__ ); \
- }
- #define PIM_TRAPD_HANDLE( _s ) \
- { \
- TRAPD( _err, _s; ); \
- DisplayWarningNote( _err, TPtrC8( ( TText8* )__FILE__), __LINE__ ); \
- }
- #define WARNING_NOTE( _s ) DisplayWarningNote( _s );
-
-#elif defined( _DEBUG )
+#if defined( _DEBUG )
#define PIM_TRAP_HANDLE( _err, _s ) \
{ \
TRAP( _err, _s; ); \