Revised "traces" to match "Revision: 201033" - final fix for Bug 3676 PDK_4.0.a
authorJyri Kokkonen <jyri.kokkonen@nokia.com>
Fri, 10 Sep 2010 14:24:47 +0100
changeset 53 41b64ea195fa
parent 52 d37779bbda25
Revised "traces" to match "Revision: 201033" - final fix for Bug 3676
imagehandlingutilities/thumbnailmanager/plugins/audio/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/plugins/audio/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/plugins/audio/traces/thumbnailaudioproviderTraces.h
imagehandlingutilities/thumbnailmanager/plugins/audio/traces/thumbnailimagedecoderv3Traces.h
imagehandlingutilities/thumbnailmanager/plugins/image/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/plugins/image/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimagedecoderTraces.h
imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimagedecoderv2Traces.h
imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimageproviderTraces.h
imagehandlingutilities/thumbnailmanager/plugins/video/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/plugins/video/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/plugins/video/traces/thumbnailvideoproviderTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagaudioobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagcameraobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagdaemonTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagimageobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagprocessorTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagvideoobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmactivitymanagerTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmformatobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmshutdownobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmsrproptertyobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnaildataimplTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailmanagerimplTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailrequestactiveTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailrequestqueueTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailsessionTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnaildecodetaskTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnaildiskunmountobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailfetchedcheckerTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailgeneratetaskTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailmdsquerytaskTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailmemorycardobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailscaletaskTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailserversessionTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailstoreTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailtaskTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailtaskprocessorTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmactivitymanagerTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmformatobserverTraces.h
imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmshutdownobserverTraces.h
imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/OstTraceDefinitions.h
imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/fixed_id.definitions
imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/tmiadrestartTraces.h
--- a/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_NORMAL=0x86
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILAUDIOPROVIDER_CTHUMBNAILAUDIOPROVIDER=0x1
--- a/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/thumbnailaudioproviderTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/thumbnailaudioproviderTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Audio thumbnail provider plugin
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILAUDIOPROVIDERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/thumbnailimagedecoderv3Traces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/audio/traces/thumbnailimagedecoderv3Traces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Image thumbnail decoder
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILIMAGEDECODERV3TRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/plugins/image/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/image/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/plugins/image/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/image/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_NORMAL=0x86
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILIMAGEDECODERV2_CREATEDECODERL=0x2c
--- a/imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimagedecoderTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimagedecoderTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Image thumbnail decoder
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILIMAGEDECODERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimagedecoderv2Traces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimagedecoderv2Traces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Image thumbnail decoder
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILIMAGEDECODERV2TRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimageproviderTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/image/traces/thumbnailimageproviderTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Image thumbnail provider plugin
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILIMAGEPROVIDERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/plugins/video/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/video/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/plugins/video/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/video/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_NORMAL=0x86
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILVIDEOPROVIDER_CTHUMBNAILVIDEOPROVIDER=0xa
--- a/imagehandlingutilities/thumbnailmanager/plugins/video/traces/thumbnailvideoproviderTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/plugins/video/traces/thumbnailvideoproviderTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Video thumbnail provider
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILVIDEOPROVIDERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_FATAL=0x81
 [GROUP]TRACE_NORMAL=0x86
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagaudioobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagaudioobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail Auto Generate Daemon 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBAGAUDIOOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagcameraobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagcameraobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail Auto Generate Daemon 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBAGCAMERAOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagdaemonTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagdaemonTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail Auto Generate Daemon 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBAGDAEMONTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagimageobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagimageobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail Auto Generate Daemon 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBAGIMAGEOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagprocessorTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagprocessorTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Processor 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBAGPROCESSORTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagvideoobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/thumbagvideoobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail Auto Generate Daemon 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBAGVIDEOOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmactivitymanagerTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmactivitymanagerTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Activity Manager 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMACTIVITYMANAGERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmformatobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmformatobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File System format monitor
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMFORMATOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmshutdownobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmshutdownobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Processor 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMSHUTDOWNOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmsrproptertyobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbagdaemon/traces/tmsrproptertyobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  RPropery observer 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMSRPROPTERTYOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,27 +1,9 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_NORMAL=0x86
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILDATAIMPL_BITMAP=0x3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILDATAIMPL_CLIENTDATA=0x5
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILDATAIMPL_CTHUMBNAILDATAIMPL=0x1
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILDATAIMPL_DETACHBITMAP=0x4
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILDATAIMPL_DETACHJPEG=0x6c
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILDATAIMPL_SET=0x6
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILMANAGERIMPL_CANCELREQUEST=0x1b
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILMANAGERIMPL_CHANGEPRIORITY=0x1c
@@ -63,7 +45,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILREQUESTACTIVE_RUNL=0x37
 [TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILREQUESTACTIVE_RUNL=0x38
 [TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILREQUESTACTIVE_RUNL=0x39
-[TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILREQUESTACTIVE_RUNL=0x6d
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDATAIMPL_CTHUMBNAILDATAIMPL=0x2
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILMANAGERIMPL_CONSTRUCTL=0xd
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILMANAGERIMPL_CREATETHUMBNAILS=0x18
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnaildataimplTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnaildataimplTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail object implementation.
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILDATAIMPLTRACES_H__
@@ -28,7 +12,6 @@
 #define CTHUMBNAILDATAIMPL_DETACHBITMAP 0x860004
 #define CTHUMBNAILDATAIMPL_CLIENTDATA 0x860005
 #define CTHUMBNAILDATAIMPL_SET 0x860006
-#define CTHUMBNAILDATAIMPL_DETACHJPEG 0x86006c
 
 
 #endif
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailmanagerimplTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailmanagerimplTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation class of Thumbnail Manager.
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILMANAGERIMPLTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailrequestactiveTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailrequestactiveTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Active object for an asynchronous thumbnail request
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILREQUESTACTIVETRACES_H__
@@ -64,7 +48,6 @@
 #define CTHUMBNAILREQUESTACTIVE_TIMERCALLBACK 0x860048
 #define DUP1_CTHUMBNAILREQUESTACTIVE_TIMERCALLBACK 0x860049
 #define CTHUMBNAILREQUESTACTIVE_ISVIRTUALURI 0x86004a
-#define DUP18_CTHUMBNAILREQUESTACTIVE_RUNL 0x86006d
 
 
 #ifndef __OSTTRACEGEN2_TUINT32_TINT_TINT__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailrequestqueueTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailrequestqueueTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Processor object for running thumbnail requests
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILREQUESTQUEUETRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailsessionTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailclient/traces/thumbnailsessionTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail server client-side session
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILSESSIONTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_FATAL=0x81
 [GROUP]TRACE_NORMAL=0x86
@@ -99,7 +82,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILMEMORYCARDOBSERVER_STARTNOTIFY=0x49
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_CTHUMBNAILSCALETASK=0x4a
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_DOCANCEL=0x56
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_ENCODEL=0x1e3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_RUNL=0x53
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_STARTL=0x4c
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x57
@@ -113,7 +95,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_DELETETHUMBNAILSBYIDL=0xe7
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_DELETETHUMBNAILSL=0xe6
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_FETCHTHUMBNAILL=0xda
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_GETJPEGBUFFERL=0x1f4
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_GETMIMETYPELISTL=0xe8
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_PROCESSBITMAPL=0xdd
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_RELEASEBITMAP=0xdf
@@ -125,7 +106,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0xc8
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_RESOLVEMIMETYPEL=0xe9
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_SERVICEL=0xb1
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_SETJPEGBUFFERL=0x1f3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVERSESSION_UPDATETHUMBNAILSL=0xb5
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVER_ADDBITMAPTOPOOLL=0x70
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSERVER_ADDSESSION=0x69
@@ -194,7 +174,6 @@
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STARTAUTOFLUSH=0x158
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STARTMAINTENANCE=0x15b
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STOPAUTOFLUSH=0x15a
-[TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILSTORE_STORETHUMBNAILL=0x1f5
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILTASKPROCESSOR_ADDTASKL=0x1a3
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILTASKPROCESSOR_CONSTRUCTL=0x19e
 [TRACE]TRACE_NORMAL[0x86]_CTHUMBNAILTASKPROCESSOR_CTHUMBNAILTASKPROCESSOR=0x1a2
@@ -231,26 +210,31 @@
 [TRACE]TRACE_NORMAL[0x86]_CTMSHUTDOWNOBSERVER_CTMSHUTDOWNOBSERVER=0x1de
 [TRACE]TRACE_NORMAL[0x86]_CTMSHUTDOWNOBSERVER_DOCANCEL=0x1e1
 [TRACE]TRACE_NORMAL[0x86]_CTMSHUTDOWNOBSERVER_RUNL=0x1df
-[TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x1ec
-[TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0x1ed
 [TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14c
 [TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x168
 [TRACE]TRACE_NORMAL[0x86]_DUP10_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11a
-[TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0x1ee
 [TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14d
 [TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x169
-[TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0x1ef
+[TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11b
 [TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14e
 [TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x16a
+[TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11c
 [TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14f
 [TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x16b
+[TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11d
 [TRACE]TRACE_NORMAL[0x86]_DUP14_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x150
+[TRACE]TRACE_NORMAL[0x86]_DUP14_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11e
 [TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x151
+[TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11f
 [TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x152
+[TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILSTORE_STORETHUMBNAILL=0x120
 [TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x153
+[TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILSTORE_STORETHUMBNAILL=0x121
 [TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x154
+[TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILSTORE_STORETHUMBNAILL=0x122
 [TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x155
 [TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_PREPARESTATEMENTSL=0x108
+[TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_STORETHUMBNAILL=0x123
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDECODETASK_CTHUMBNAILDECODETASK=0x2
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDECODETASK_STARTL=0x5
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILDECODETASK_THUMBNAILPROVIDERREADY=0x9
@@ -268,7 +252,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3c
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILMEMORYCARDOBSERVER_CTHUMBNAILMEMORYCARDOBSERVER=0x47
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_CTHUMBNAILSCALETASK=0x4b
-[TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_ENCODEL=0x1e4
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_RUNL=0x54
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_STARTL=0x4d
 [TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x58
@@ -367,7 +350,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILGENERATETASK_STARTL=0x24
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILGENERATETASK_THUMBNAILPROVIDERREADY=0x28
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3d
-[TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_ENCODEL=0x1e5
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_RUNL=0x55
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_STARTL=0x4e
 [TRACE]TRACE_NORMAL[0x86]_DUP2_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x59
@@ -424,7 +406,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILGENERATETASK_DOBLACKLISTING=0x36
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILGENERATETASK_THUMBNAILPROVIDERREADY=0x29
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3e
-[TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSCALETASK_ENCODEL=0x1e6
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSCALETASK_STARTL=0x4f
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5a
 [TRACE]TRACE_NORMAL[0x86]_DUP3_CTHUMBNAILSERVERSESSION_CREATEGENERATETASKFROMBUFFERL=0xd9
@@ -461,7 +442,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x2e
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILGENERATETASK_DOBLACKLISTING=0x37
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x3f
-[TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSCALETASK_ENCODEL=0x1e7
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSCALETASK_STARTL=0x50
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5b
 [TRACE]TRACE_NORMAL[0x86]_DUP4_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc1
@@ -489,7 +469,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x2f
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILGENERATETASK_DOBLACKLISTING=0x38
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILMDSQUERYTASK_HANDLEQUERYCOMPLETED=0x40
-[TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSCALETASK_ENCODEL=0x1e8
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSCALETASK_STARTL=0x51
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5c
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc3
@@ -507,7 +486,6 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTHUMBNAILTASKPROCESSOR_RUNL=0x1b7
 [TRACE]TRACE_NORMAL[0x86]_DUP5_CTMACTIVITYMANAGER_RUNL=0x1c8
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x30
-[TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSCALETASK_ENCODEL=0x1e9
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSCALETASK_STARTL=0x52
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5d
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc4
@@ -523,10 +501,8 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTHUMBNAILSTORE_STORETHUMBNAILL=0x116
 [TRACE]TRACE_NORMAL[0x86]_DUP6_CTMACTIVITYMANAGER_RUNL=0x1ce
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILGENERATETASK_CREATESCALETASKSL=0x31
-[TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSCALETASK_ENCODEL=0x1ea
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5e
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc5
-[TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0x1f0
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSERVER_UPDATETHUMBNAILSL=0xa0
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTOREDISKSPACENOTIFIERAO_RUNL=0x18c
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTORE_CHECKMODIFIEDBYPATHL=0x173
@@ -535,17 +511,14 @@
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x165
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTHUMBNAILSTORE_STORETHUMBNAILL=0x117
 [TRACE]TRACE_NORMAL[0x86]_DUP7_CTMACTIVITYMANAGER_RUNL=0x1cf
-[TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSCALETASK_ENCODEL=0x1eb
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x5f
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc6
-[TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0x1f1
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_DELETETHUMBNAILSL=0x13c
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14a
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x166
 [TRACE]TRACE_NORMAL[0x86]_DUP8_CTHUMBNAILSTORE_STORETHUMBNAILL=0x118
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL=0x60
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL=0xc7
-[TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL=0x1f2
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSTORE_DELETETHUMBNAILSL=0x13d
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSTORE_FLUSHCACHETABLE=0x14b
 [TRACE]TRACE_NORMAL[0x86]_DUP9_CTHUMBNAILSTORE_MAINTENANCETIMERCALLBACK=0x167
@@ -554,13 +527,4 @@
 [TRACE]TRACE_NORMAL[0x86]_RTHUMBNAILTRANSACTION_ROLLBACK=0xf2
 [TRACE]TRACE_NORMAL[0x86]__E32MAIN=0xa2
 [[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_CTMACTIVITYMANAGER_NEWL=0x1bf
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP11_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11b
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP12_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11c
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP13_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11d
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP14_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11e
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP15_CTHUMBNAILSTORE_STORETHUMBNAILL=0x11f
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP16_CTHUMBNAILSTORE_STORETHUMBNAILL=0x120
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP17_CTHUMBNAILSTORE_STORETHUMBNAILL=0x121
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP18_CTHUMBNAILSTORE_STORETHUMBNAILL=0x122
-[[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP19_CTHUMBNAILSTORE_STORETHUMBNAILL=0x123
 [[OBSOLETE]][TRACE]TRACE_NORMAL[0x86]_DUP1_CTHUMBNAILSERVER_CONSTRUCTL=0x62
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnaildecodetaskTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnaildecodetaskTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Task for generating new thumbnails
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILDECODETASKTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnaildiskunmountobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnaildiskunmountobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Class to monitor when volumes are unmounted
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILDISKUNMOUNTOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailfetchedcheckerTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailfetchedcheckerTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILFETCHEDCHECKERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailgeneratetaskTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailgeneratetaskTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Task for generating new thumbnails
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILGENERATETASKTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailmdsquerytaskTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailmdsquerytaskTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Task for making MDS querys
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILMDSQUERYTASKTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailmemorycardobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailmemorycardobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Class to monitor when memory card status is changed
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILMEMORYCARDOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailscaletaskTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailscaletaskTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Task for scaling thumbnails.
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILSCALETASKTRACES_H__
@@ -45,16 +29,6 @@
 #define DUP7_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL 0x86005e
 #define DUP8_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL 0x86005f
 #define DUP9_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL 0x860060
-#define CTHUMBNAILSCALETASK_ENCODEL 0x8601e3
-#define DUP1_CTHUMBNAILSCALETASK_ENCODEL 0x8601e4
-#define DUP2_CTHUMBNAILSCALETASK_ENCODEL 0x8601e5
-#define DUP3_CTHUMBNAILSCALETASK_ENCODEL 0x8601e6
-#define DUP4_CTHUMBNAILSCALETASK_ENCODEL 0x8601e7
-#define DUP5_CTHUMBNAILSCALETASK_ENCODEL 0x8601e8
-#define DUP6_CTHUMBNAILSCALETASK_ENCODEL 0x8601e9
-#define DUP7_CTHUMBNAILSCALETASK_ENCODEL 0x8601ea
-#define DUP8_CTHUMBNAILSCALETASK_ENCODEL 0x8601eb
-#define DUP10_CTHUMBNAILSCALETASK_STOREANDCOMPLETEL 0x8601ec
 
 
 #ifndef __KERNEL_MODE__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail server
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailserversessionTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailserversessionTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Server side session for Thumbnail Manager Server
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILSERVERSESSIONTRACES_H__
@@ -85,14 +69,6 @@
 #define CTHUMBNAILSERVERSESSION_CLIENTTHREADALIVE 0x8600ec
 #define DUP1_CTHUMBNAILSERVERSESSION_CLIENTTHREADALIVE 0x8600ed
 #define DUP2_CTHUMBNAILSERVERSESSION_CLIENTTHREADALIVE 0x8600ee
-#define DUP10_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL 0x8601ed
-#define DUP11_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL 0x8601ee
-#define DUP12_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYFILEHANDLEASYNCL 0x8601ef
-#define DUP7_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL 0x8601f0
-#define DUP8_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL 0x8601f1
-#define DUP9_CTHUMBNAILSERVERSESSION_REQUESTTHUMBBYPATHASYNCL 0x8601f2
-#define CTHUMBNAILSERVERSESSION_SETJPEGBUFFERL 0x8601f3
-#define CTHUMBNAILSERVERSESSION_GETJPEGBUFFERL 0x8601f4
 
 
 #ifndef __KERNEL_MODE__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailstoreTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailstoreTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Store for thumbnails.
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILSTORETRACES_H__
@@ -187,7 +171,6 @@
 #define DUP1_CTHUMBNAILSTOREDISKSPACENOTIFIERAO_CONSTRUCTL 0x860191
 #define DUP2_CTHUMBNAILSTOREDISKSPACENOTIFIERAO_CONSTRUCTL 0x860192
 #define CTHUMBNAILSTOREDISKSPACENOTIFIERAO_STARTNOTIFIER 0x860193
-#define CTHUMBNAILSTORE_STORETHUMBNAILL 0x8601f5
 #define DUP3_CTHUMBNAILSTORE_RECREATEDATABASEL 0x810001
 #define DUP5_CTHUMBNAILSTORE_RECREATEDATABASEL 0x810002
 #define DUP6_CTHUMBNAILSTORE_RECREATEDATABASEL 0x810003
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailtaskTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailtaskTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Base class for thumbnail server tasks
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILTASKTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailtaskprocessorTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/thumbnailtaskprocessorTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Processor object for running queued tasks
- *
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __THUMBNAILTASKPROCESSORTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmactivitymanagerTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmactivitymanagerTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Activity Manager 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMACTIVITYMANAGERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmformatobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmformatobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File System format monitor
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMFORMATOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmshutdownobserverTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/thumbnailserver/traces/tmshutdownobserverTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Processor 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMSHUTDOWNOBSERVERTRACES_H__
--- a/imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/OstTraceDefinitions.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/OstTraceDefinitions.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-/*
-* This is Default Licence added by TraceCompiler
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*
-*/
 #ifndef __OSTTRACEDEFINITIONS_H__
 #define __OSTTRACEDEFINITIONS_H__
 // OST_TRACE_COMPILER_IN_USE flag has been added by Trace Compiler
--- a/imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/fixed_id.definitions	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/fixed_id.definitions	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,3 @@
-##
-# This is Default Licence added by TraceCompiler
-# Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-##
 #Fixed group and trace id definitions. If this file is removed, the identifiers are rebuilt.
 [GROUP]TRACE_NORMAL=0x86
 [TRACE]TRACE_NORMAL[0x86]_DUP10__MAINL=0xa
--- a/imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/tmiadrestartTraces.h	Fri Sep 10 13:34:28 2010 +0100
+++ b/imagehandlingutilities/thumbnailmanager/tmiadrestart/traces/tmiadrestartTraces.h	Fri Sep 10 14:24:47 2010 +0100
@@ -1,20 +1,4 @@
-/*
-* Copyright (c) 2006-2007 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Thumbnail Manager IAD Restart 
-*
-*/
-// Created by TraceCompiler 2.3.0
+// Created by TraceCompiler 2.2.3
 // DO NOT EDIT, CHANGES WILL BE LOST
 
 #ifndef __TMIADRESTARTTRACES_H__