# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1276070662 -10800 # Node ID b2f9f823b5fb415c7a94c06edd0c6b3110a58058 # Parent 4a5c47a50617d9bf9b0b44062e9aa8614961ec49 Revision: 201021 Kit: 2010123 diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_api/inc/AccessoryConnection.h --- a/devicesrv_plat/accessory_api/inc/AccessoryConnection.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_api/inc/AccessoryConnection.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,7 +21,7 @@ #define RACCESSORYCONNECTION_H // INCLUDES -#include "accessoryconnectionbase.h" +#include "AccessoryConnectionBase.h" // FORWARD DECLARATIONS class TAccPolGenericIDArray; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_api/inc/AccessoryConnectionBase.h --- a/devicesrv_plat/accessory_api/inc/AccessoryConnectionBase.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_api/inc/AccessoryConnectionBase.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,9 +21,9 @@ #define RACCESSORYCONNECTIONBASE_H // INCLUDES -#include -#include -#include +#include +#include +#include // FORWARD DECLARATIONS class CAccPolSubblockNameArray; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_api/inc/AccessoryMode.h --- a/devicesrv_plat/accessory_api/inc/AccessoryMode.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_api/inc/AccessoryMode.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,9 +21,9 @@ #define RACCESSORYMODE_H // INCLUDES -#include -#include -#include +#include +#include +#include // FORWARD DECLARATIONS class RAccessoryServer; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_api/inc/AccessorySingleConnection.h --- a/devicesrv_plat/accessory_api/inc/AccessorySingleConnection.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_api/inc/AccessorySingleConnection.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,7 +21,7 @@ #define RACCESSORYSINGLECONNECTION_H // INCLUDES -#include "accessoryconnectionbase.h" +#include "AccessoryConnectionBase.h" // FORWARD DECLARATIONS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_api/inc/AccessoryTypes.h --- a/devicesrv_plat/accessory_api/inc/AccessoryTypes.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_api/inc/AccessoryTypes.h Wed Jun 09 11:04:22 2010 +0300 @@ -20,10 +20,10 @@ #define ACCESSORYTYPES_H // INCLUDES -#include -#include -#include -#include +#include +#include +#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_audio_control_api/inc/AccessoryAudioControl.h --- a/devicesrv_plat/accessory_audio_control_api/inc/AccessoryAudioControl.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_audio_control_api/inc/AccessoryAudioControl.h Wed Jun 09 11:04:22 2010 +0300 @@ -20,7 +20,7 @@ #define RACCESSORYAUDIOCONTROL_H // INCLUDES -#include +#include // CLASS DECLARATION diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_bluetooth_control_api/inc/AccessoryBTControl.h --- a/devicesrv_plat/accessory_bluetooth_control_api/inc/AccessoryBTControl.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_bluetooth_control_api/inc/AccessoryBTControl.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,7 +21,7 @@ #define RACCESSORYBTCONTROL_H // INCLUDES -#include +#include #include //TBTDevAddr // DATA TYPES diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_control_api/inc/AccModeSettingArray.h --- a/devicesrv_plat/accessory_control_api/inc/AccModeSettingArray.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_control_api/inc/AccModeSettingArray.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,7 +21,7 @@ #define ACCMODESETTINGARRAY_H // INCLUDES -#include +#include // CONSTANTS // Maximum number of settings TAccModeSettingArray can store. diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_control_api/inc/AccessoryControl.h --- a/devicesrv_plat/accessory_control_api/inc/AccessoryControl.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_control_api/inc/AccessoryControl.h Wed Jun 09 11:04:22 2010 +0300 @@ -20,7 +20,7 @@ #define RACCESSORYCONTROL_H // INCLUDES -#include +#include // FORWARD DECLARATIONS class TAccPolGenericID; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_control_api/inc/AccessorySettings.h --- a/devicesrv_plat/accessory_control_api/inc/AccessorySettings.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_control_api/inc/AccessorySettings.h Wed Jun 09 11:04:22 2010 +0300 @@ -22,11 +22,11 @@ // INCLUDES #include -#include -#include -#include -#include "accessorysubsessionbase.h" -#include "accessoryserver.h" +#include +#include +#include +#include "AccessorySubsessionBase.h" +#include "AccessoryServer.h" // FORWARD DECLARATIONS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_plugin_api/inc/AsyCmdTypes.h --- a/devicesrv_plat/accessory_plugin_api/inc/AsyCmdTypes.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_plugin_api/inc/AsyCmdTypes.h Wed Jun 09 11:04:22 2010 +0300 @@ -20,8 +20,8 @@ #define ASYCMDTYPES_H // INCLUDES -#include -#include +#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_policy_definitions_api/inc/AccPolGenericIdDefinitions.h --- a/devicesrv_plat/accessory_policy_definitions_api/inc/AccPolGenericIdDefinitions.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_policy_definitions_api/inc/AccPolGenericIdDefinitions.h Wed Jun 09 11:04:22 2010 +0300 @@ -23,7 +23,7 @@ // INCLUDES #include #include -#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_policy_utility_api/inc/AccConGenericID.h --- a/devicesrv_plat/accessory_policy_utility_api/inc/AccConGenericID.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccConGenericID.h Wed Jun 09 11:04:22 2010 +0300 @@ -23,7 +23,7 @@ #define CACCCONGENERICID_H // INCLUDES -#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameRecord.h --- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameRecord.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameRecord.h Wed Jun 09 11:04:22 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameValueRecord.h --- a/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameValueRecord.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/accessory_policy_utility_api/inc/AccPolNameValueRecord.h Wed Jun 09 11:04:22 2010 +0300 @@ -26,8 +26,8 @@ // INCLUDES #include -#include -#include +#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/common_dsy_plugin_api/inc/CDSYMessageStructures.h --- a/devicesrv_plat/common_dsy_plugin_api/inc/CDSYMessageStructures.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/common_dsy_plugin_api/inc/CDSYMessageStructures.h Wed Jun 09 11:04:22 2010 +0300 @@ -21,8 +21,8 @@ // INCLUDES -#include -#include +#include +#include diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h --- a/devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/configuration_file_parser_api/inc/AccConfigFileParser.h Wed Jun 09 11:04:22 2010 +0300 @@ -22,8 +22,8 @@ // INCLUDES #include -#include -#include +#include +#include // CONSTANTS diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/dos_extension_plugin_api/inc/dosdsy.h --- a/devicesrv_plat/dos_extension_plugin_api/inc/dosdsy.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/dos_extension_plugin_api/inc/dosdsy.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -21,7 +21,7 @@ #include #include // THCIConnHandle, TBDAddress -#include "dossvrservices.h" // TBTDeviceType +#include // TBTDeviceType class CDosExtensionBase; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/dos_extension_plugin_api/inc/doseventmanager.h --- a/devicesrv_plat/dos_extension_plugin_api/inc/doseventmanager.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/dos_extension_plugin_api/inc/doseventmanager.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -20,7 +20,7 @@ #ifndef __DOSEVENTMANAGER_H__ #define __DOSEVENTMANAGER_H__ -#include "dossvrservices.h" +#include #include "doseventmanagerbase.h" /** diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/mediator_command_responder_api/inc/MediatorCommandResponder.h --- a/devicesrv_plat/mediator_command_responder_api/inc/MediatorCommandResponder.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/mediator_command_responder_api/inc/MediatorCommandResponder.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATION class CMediatorCommandResponderBody; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/mediator_event_consumer_api/inc/MediatorEventConsumer.h --- a/devicesrv_plat/mediator_event_consumer_api/inc/MediatorEventConsumer.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/mediator_event_consumer_api/inc/MediatorEventConsumer.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -20,7 +20,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CMediatorEventConsumerBody; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/mediator_event_provider_api/inc/MediatorEventProvider.h --- a/devicesrv_plat/mediator_event_provider_api/inc/MediatorEventProvider.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/mediator_event_provider_api/inc/MediatorEventProvider.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATION class CMediatorEventProviderBody; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/mediator_notification_api/inc/MediatorNotifications.h --- a/devicesrv_plat/mediator_notification_api/inc/MediatorNotifications.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/mediator_notification_api/inc/MediatorNotifications.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2005-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" @@ -21,7 +21,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CMediatorNotificationsBody; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/remote_control_extension_api/inc/RemConCallHandlingTarget.h --- a/devicesrv_plat/remote_control_extension_api/inc/RemConCallHandlingTarget.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/remote_control_extension_api/inc/RemConCallHandlingTarget.h Wed Jun 09 11:04:22 2010 +0300 @@ -23,7 +23,7 @@ #define CREMCONCALLHANDLINGTARGET_H // INCLUDES -#include +#include #include #include #include diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/remote_control_extension_api/inc/RemConPocTarget.h --- a/devicesrv_plat/remote_control_extension_api/inc/RemConPocTarget.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/remote_control_extension_api/inc/RemConPocTarget.h Wed Jun 09 11:04:22 2010 +0300 @@ -23,7 +23,7 @@ #define CREMCONPOCTARGET_H // INCLUDES -#include +#include #include #include #include diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_plat/remote_control_extension_api/inc/RemConSynchronizationTarget.h --- a/devicesrv_plat/remote_control_extension_api/inc/RemConSynchronizationTarget.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_plat/remote_control_extension_api/inc/RemConSynchronizationTarget.h Wed Jun 09 11:04:22 2010 +0300 @@ -23,7 +23,7 @@ #define CREMCONSYNCHRONIZATIONTARGET_H // INCLUDES -#include +#include #include #include #include diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_pub/accessory_monitoring_api/inc/AccMonitor.h --- a/devicesrv_pub/accessory_monitoring_api/inc/AccMonitor.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_pub/accessory_monitoring_api/inc/AccMonitor.h Wed Jun 09 11:04:22 2010 +0300 @@ -24,7 +24,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class MAccMonitorObserver; diff -r 4a5c47a50617 -r b2f9f823b5fb devicesrv_pub/accessory_monitoring_api/inc/AccMonitorInfo.h --- a/devicesrv_pub/accessory_monitoring_api/inc/AccMonitorInfo.h Tue May 25 14:04:18 2010 +0300 +++ b/devicesrv_pub/accessory_monitoring_api/inc/AccMonitorInfo.h Wed Jun 09 11:04:22 2010 +0300 @@ -22,7 +22,7 @@ // INCLUDES #include -#include +#include // FORWARD DECLARATIONS class CAccMonitorInfo; @@ -212,7 +212,7 @@ TInt iReserved2; }; -#include +#include #endif // ACCMONITORINFO_H diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/inc/dosclishareddata.h --- a/dosservices/dosserver/inc/dosclishareddata.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/inc/dosclishareddata.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -23,7 +23,7 @@ // INCLUDES #include -#include "DosSvrServices.h" +#include /** * Subsession that provides functionality to make a DOS side self test. diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/inc/doseventrcvservice.h --- a/dosservices/dosserver/inc/doseventrcvservice.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/inc/doseventrcvservice.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -20,7 +20,7 @@ #ifndef __DOSEVENTRCVSERVICE_H__ #define __DOSEVENTRCVSERVICE_H__ -#include "DosSvrServices.h" +#include #include "dosservice.h" class CDosWaitingEvent; diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/inc/doseventsender.h --- a/dosservices/dosserver/inc/doseventsender.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/inc/doseventsender.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -22,7 +22,7 @@ #ifndef __DOSEVENTSENDER_H__ #define __DOSEVENTSENDER_H__ -#include "DosSvrServices.h" +#include /** * Raises DosServer events from a different thread/proccess. diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/src/dosclieventlistener.cpp --- a/dosservices/dosserver/src/dosclieventlistener.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/src/dosclieventlistener.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -17,7 +17,7 @@ */ -#include "DosSvrServices.h" +#include #include "dos_debug.h" #include diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/src/dosclieventnotifier.cpp --- a/dosservices/dosserver/src/dosclieventnotifier.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/src/dosclieventnotifier.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -17,7 +17,7 @@ */ -#include "DosSvrServices.h" +#include // // --------------------------------------------------------- diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/src/dosclieventrcv.cpp --- a/dosservices/dosserver/src/dosclieventrcv.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/src/dosclieventrcv.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -17,7 +17,7 @@ */ -#include "DosSvrServices.h" +#include #include "dosclientserver.h" // --------------------------------------------------------- diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/src/doscliextension.cpp --- a/dosservices/dosserver/src/doscliextension.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/src/doscliextension.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2008 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -17,7 +17,7 @@ */ -#include "DosSvrServices.h" +#include #include "dosclientserver.h" #include "dos_debug.h" diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/src/doscliserver.cpp --- a/dosservices/dosserver/src/doscliserver.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/src/doscliserver.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -18,7 +18,7 @@ #include -#include "DosSvrServices.h" +#include #include "dosclientserver.h" #include "dosserver.h" #include "dos_debug.h" diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/dosserver/src/dosclisubsession.cpp --- a/dosservices/dosserver/src/dosclisubsession.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/dosserver/src/dosclisubsession.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2002-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" @@ -17,7 +17,7 @@ */ -#include "DosSvrServices.h" +#include #include "dosclientserver.h" #include "dos_debug.h" diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdoseventlistener.h --- a/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdoseventlistener.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdoseventlistener.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -19,7 +19,7 @@ #ifndef __CTFDOSEVENTLISTENER_H__ #define __CTFDOSEVENTLISTENER_H__ -#include +#include class CTFDosServerControl; diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdosservercontrol.h --- a/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdosservercontrol.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/tsrc/dsytesttool/dosservercontrol/inc/ctfdosservercontrol.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -19,7 +19,7 @@ #ifndef __CTFDOSSERVERCONTROL_H__ #define __CTFDOSSERVERCONTROL_H__ -#include +#include #include "ctfstub.h" #include "mtfdosservercontrol.h" #include "tfdosservertypes.h" diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/tsrc/dsytesttool/dosservercontrol/src/tfdoseventlistener.cpp --- a/dosservices/tsrc/dsytesttool/dosservercontrol/src/tfdoseventlistener.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/tsrc/dsytesttool/dosservercontrol/src/tfdoseventlistener.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -16,7 +16,7 @@ */ -#include +#include #include "dsytesttooltrace.h" #include "tfdosservertypes.h" #include "ctfdoseventlistener.h" diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfdoscontrol.h --- a/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfdoscontrol.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfdoscontrol.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-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" @@ -20,7 +20,7 @@ #ifndef __CTFDOSCONTROL_H__ #define __CTFDOSCONTROL_H__ -#include +#include #include "dosclishareddata.h" #include #include "mtfdoscontrol.h" diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfeventlistener.h --- a/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfeventlistener.h Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/tsrc/public/basic/dosservertestplugin/inc/Ctfeventlistener.h Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2004-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" @@ -20,7 +20,7 @@ #ifndef __CTFEVENTLISTENER_H__ #define __CTFEVENTLISTENER_H__ -#include +#include diff -r 4a5c47a50617 -r b2f9f823b5fb dosservices/tsrc/public/basic/dosservertestplugin/src/Tfeventlistener.cpp --- a/dosservices/tsrc/public/basic/dosservertestplugin/src/Tfeventlistener.cpp Tue May 25 14:04:18 2010 +0300 +++ b/dosservices/tsrc/public/basic/dosservertestplugin/src/Tfeventlistener.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). +* Copyright (c) 2009-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" @@ -16,7 +16,7 @@ */ -#include +#include #include "siftrace.h" #include "tfdostypes.h" #include "ctfeventlistener.h" diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envrecall.cmd --- a/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envrecall.cmd Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envrecall.cmd Wed Jun 09 11:04:22 2010 +0300 @@ -19,15 +19,13 @@ echo Cleaning up sensor data compensator stub... pushd ..\sensordatacompensatorpluginstub\group -call bldmake bldfiles -call abld test reallyclean +call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test popd @echo Cleaning up sensor data compensator... Finished @echo Cleaning sensor data compensator stub part2... pushd ..\..\..\..\..\..\..\mw\appsupport\coreapplicationuis\sensordatacompensatorplugin\group -call bldmake bldfiles -call abld reallyclean -call abld build +call sbs REALLYCLEAN -c winscw -c armv5.generic +call sbs -b bld.inf -c winscw -c armv5.generic popd @echo Cleaning for sensor data compensator part2... Finished diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envsetup.cmd --- a/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envsetup.cmd Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/sensordatacompensator/tsrc/sensordatacompensatortest/group/envsetup.cmd Wed Jun 09 11:04:22 2010 +0300 @@ -19,15 +19,13 @@ echo Preparing for sensor data compensator stub... pushd ..\..\..\..\..\..\..\mw\appsupport\coreapplicationuis\sensordatacompensatorplugin\group -call bldmake bldfiles -call abld reallyclean +call sbs REALLYCLEAN -c winscw -c armv5.generic popd @echo Preparing for sensor data compensator... Finished @echo Setting up sensor data compensator stub... pushd ..\sensordatacompensatorpluginstub\group -call bldmake bldfiles -call abld test reallyclean -call abld test build +call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test +call sbs -b bld.inf -c winscw.test -c armv5.generic.test popd @echo Setting up sensor data compensator... Finished diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/src/SensrvTestBlocks.cpp --- a/sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/src/SensrvTestBlocks.cpp Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/SensorTestModule/src/SensrvTestBlocks.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -233,6 +233,7 @@ User::After(7000000); } + tempChannelInfoList.Reset(); delete tempChannelFinder; delete tempSensorChannel1; delete tempSensorChannel2; @@ -313,6 +314,7 @@ tempChannelFinder19->FindChannelsL( tempChannelInfoList, tempChannelInfo ); tempChannelFinder20->FindChannelsL( tempChannelInfoList, tempChannelInfo ); + tempChannelInfoList.Reset(); delete tempChannelFinder1; delete tempChannelFinder2; delete tempChannelFinder3; @@ -398,6 +400,7 @@ } } + tempChannelInfoList.Reset(); delete tempChannelFinder; delete tempSensorChannel; @@ -467,7 +470,7 @@ } } - + tempChannelInfoList.Reset(); //Checking for Magnetometer tempChannelInfo.iChannelType = KSensrvChannelTypeIdMagnetometerXYZAxisData; @@ -499,6 +502,7 @@ } } + tempChannelInfoList.Reset(); tempChannelInfo.iChannelType = KSensrvChannelTypeIdAmbientLightData; @@ -530,7 +534,7 @@ } } - + tempChannelInfoList.Reset(); delete tempChannelFinder; delete tempSensorChannel1; delete tempSensorChannel2; @@ -599,6 +603,7 @@ } } + tempChannelInfoList.Reset(); //Checking for Magnetometer tempChannelInfo.iChannelType = KSensrvChannelTypeIdMagnetometerXYZAxisData; @@ -631,6 +636,7 @@ } } + tempChannelInfoList.Reset(); tempChannelInfo.iChannelType = KSensrvChannelTypeIdAmbientLightData; @@ -673,6 +679,7 @@ { returnValue = KErrNone; } + tempChannelInfoList.Reset(); delete tempSensorChannel1; delete tempSensorChannel2; delete tempSensorChannel3; @@ -729,7 +736,8 @@ //Close the channel tempSensorChannel1->CloseChannel(); - } + } + tempChannelInfoList.Reset(); tempChannelInfo.iChannelType = KSensrvChannelTypeIdOrientationData; @@ -763,6 +771,7 @@ } delete tempChannelFinder; + tempChannelInfoList.Reset(); //Wait for sensorserver to shutdown gracefully, it will take some time.. User::After(30000000); @@ -799,7 +808,7 @@ } } - + tempChannelInfoList.Reset(); //Checking for Magnetometer tempChannelInfo.iChannelType = KSensrvChannelTypeIdMagneticNorthData; @@ -830,7 +839,7 @@ ssyProcess.Close(); } } - + tempChannelInfoList.Reset(); delete tempChannelFinder; //Wait for the sensorserver to shutdown @@ -868,6 +877,7 @@ ssyProcess.Close(); } } + tempChannelInfoList.Reset(); tempChannelInfo.iChannelType = KSensrvChannelTypeIdAmbientLightData; @@ -899,7 +909,7 @@ } } - + tempChannelInfoList.Reset(); delete tempChannelFinder; User::After(3000000); diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/sensorserver/tsrc/sensorsrvtest/group/envrecall.cmd --- a/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envrecall.cmd Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envrecall.cmd Wed Jun 09 11:04:22 2010 +0300 @@ -19,7 +19,6 @@ @echo Cleaning SensorTestModuleStubs pushd ..\SensorTestModule\group\ -call bldmake bldfiles -call abld test reallyclean +call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test popd @echo Cleaning SensorTestModuleStubs Finished \ No newline at end of file diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/sensorserver/tsrc/sensorsrvtest/group/envsetup.cmd --- a/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envsetup.cmd Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/sensorserver/tsrc/sensorsrvtest/group/envsetup.cmd Wed Jun 09 11:04:22 2010 +0300 @@ -19,8 +19,7 @@ @echo Setting up SensorTestModuleStubs pushd ..\SensorTestModule\group\ -call bldmake bldfiles -call abld test reallyclean -call abld test build +call sbs REALLYCLEAN -c winscw.test -c armv5.generic.test +call sbs -b bld.inf -c winscw.test -c armv5.generic.test popd @echo Setting up SensorTestModuleStubs Finished diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp --- a/sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tcchanneltilt.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -687,8 +687,11 @@ // Complete transaction iStatus = KRequestPending; - SetActive(); - CompleteTransaction( err ); + if( !IsActive() ) + { + SetActive(); + } + CompleteTransaction( err ); break; } case ETCTransactionIdCloseChannel: @@ -698,7 +701,10 @@ // Complete transaction iStatus = KRequestPending; - SetActive(); + if( !IsActive() ) + { + SetActive(); + } CompleteTransaction( KErrNone ); break; } @@ -709,7 +715,10 @@ // Complete transaction iStatus = KRequestPending; - SetActive(); + if( !IsActive() ) + { + SetActive(); + } CompleteTransaction( KErrNone ); break; } @@ -720,7 +729,10 @@ // Complete transaction iStatus = KRequestPending; - SetActive(); + if( !IsActive() ) + { + SetActive(); + } CompleteTransaction( KErrNone ); break; } @@ -741,7 +753,10 @@ // Complete transaction iStatus = KRequestPending; - SetActive(); + if( !IsActive() ) + { + SetActive(); + } CompleteTransaction( KErrNone ); break; } diff -r 4a5c47a50617 -r b2f9f823b5fb sensorservices/tiltcompensationssy/src/tcstate.cpp --- a/sensorservices/tiltcompensationssy/src/tcstate.cpp Tue May 25 14:04:18 2010 +0300 +++ b/sensorservices/tiltcompensationssy/src/tcstate.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -82,11 +82,14 @@ // CTCState::IsSet // ---------------------------------------------------------------------------------- // -TBool CTCState::IsSet( TUint32 /*aFlag*/ ) +TBool CTCState::IsSet( TUint32 aFlag ) { FUNC_LOG; - return ETrue; + if(iFlags & aFlag) + return ETrue; + else + return EFalse; } // ---------------------------------------------------------------------------------- diff -r 4a5c47a50617 -r b2f9f823b5fb sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss --- a/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Tue May 25 14:04:18 2010 +0300 +++ b/sysstatemgmt/ssmcmdlists/data/noncriticalswpcmdlists.rss Wed Jun 09 11:04:22 2010 +0300 @@ -99,19 +99,15 @@ // prio 0x7EEF r_cmd_activitymonitor8, // prio 0x7EEE - r_cmd_autosync, - // prio 0x7EED - r_cmd_activitymonitor9, - // prio 0x7EEC - r_cmd_mylocationsengine + r_cmd_autosync #ifdef FF_ATT_ADDRESS_BK //prio 0x7EEA - ,r_cmd_activitymonitor10, + ,r_cmd_activitymonitor9, //prio 0x7EE9 r_cmd_aab #endif // prio 0x7EE8 - ,r_cmd_activitymonitor11, + ,r_cmd_activitymonitor10, // prio 0x7EE7 r_cmd_calendar //CR:MMUN-82ZHAD }; @@ -256,24 +252,9 @@ // r_cmd_activitymonitor9 // --------------------------------------------------------------------------- // +#ifdef FF_ATT_ADDRESS_BK RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor9 { - priority = 0x7EED; - severity = ECmdCriticalSeverity; - execution_behaviour = ESsmWaitForSignal; - dllname = "ssmactivitycmd.dll"; - ordinal = 1; // SsmActivityCmdNewL - retries = 2; - dll_data = r_dlldata_activitymonitor_timeout; - } - -// --------------------------------------------------------------------------- -// r_cmd_activitymonitor10 -// --------------------------------------------------------------------------- -// -#ifdef FF_ATT_ADDRESS_BK -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10 - { priority = 0x7EEA; severity = ECmdCriticalSeverity; execution_behaviour = ESsmWaitForSignal; @@ -285,10 +266,10 @@ #endif // --------------------------------------------------------------------------- -// r_cmd_activitymonitor11 +// r_cmd_activitymonitor10 // --------------------------------------------------------------------------- // -RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor11 +RESOURCE SSM_START_CUSTOM_COMMAND r_cmd_activitymonitor10 { priority = 0x7EE8; severity = ECmdCriticalSeverity; @@ -364,17 +345,6 @@ } // --------------------------------------------------------------------------- -// r_cmd_mylocationsengine -// --------------------------------------------------------------------------- -// -RESOURCE SSM_START_PROCESS_INFO r_cmd_mylocationsengine - { - priority = 0x7EEC; - name = "z:\\sys\\bin\\mylocationsengine.exe"; - execution_behaviour = ESsmFireAndForget; - } - -// --------------------------------------------------------------------------- // r_cmd_pbk2 // --------------------------------------------------------------------------- // diff -r 4a5c47a50617 -r b2f9f823b5fb sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp --- a/sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp Tue May 25 14:04:18 2010 +0300 +++ b/sysstatemgmt/systemstatereferenceplugins/custcmd/src/ssmsecuritychecknotifier.cpp Wed Jun 09 11:04:22 2010 +0300 @@ -26,6 +26,7 @@ #include "ssmsecuritychecknotifier.h" #include "ssmdebug.h" #include "ssmuiproviderdll.h" +#include "ssmrefcustomcmdcommon.h" #include #include #include @@ -200,21 +201,27 @@ //Get the current state of the system TSsmState currentState = ssmStateAwareSession.State(); + //Close the state aware session + ssmStateAwareSession.Close(); + TBool isDlgCancellable; //Is system in start up state if ( currentState.MainState() == ESsmStartup ) { + TInt securityPhaseVal = EStarterSecurityPhaseUninitialized; + TInt errorCode = RProperty::Get(CSsmUiSpecific::StarterPSUid(), KStarterSecurityPhase, securityPhaseVal); + DEBUGPRINT3A("Getting the KStarterSecurityPhase completed with errorcode %d and its value is %d", errorCode, securityPhaseVal); + User::LeaveIfError(errorCode); + //TSsmStartupSubStateExt::ESsmStateNonCritical - iAfterStartup = ( 0x34 == currentState.SubState() ) ? ETrue : EFalse; + iAfterStartup = ( 0x34 == currentState.SubState() && securityPhaseVal > EStarterSecurityPhaseSimNok ) ? ETrue : EFalse; } else { iAfterStartup = ETrue; } - - //Close the state aware session - ssmStateAwareSession.Close(); + DEBUGPRINT2A("iAfterStartup is %d", iAfterStartup); //Notifier dialogue is not cancellable if system is in startup state and //requested for PUK1 or PUK2 or UPUK code