# HG changeset patch # User hgs # Date 1287367697 -28800 # Node ID 5136fef23c4b012989eb61370f810f6e41e1197c # Parent 531951b2e59a3f27f6eb23b376805aad7716c61b 201041 diff -r 531951b2e59a -r 5136fef23c4b controlpanel/conf/bld.inf --- a/controlpanel/conf/bld.inf Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/conf/bld.inf Mon Oct 18 10:08:17 2010 +0800 @@ -1,27 +1,18 @@ /* -* ============================================================================== -* Name : bld.inf -* Part of : -* Description : This is a top level bld file to generate all libraries. -* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* Copyright (c) 2008-2009 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". * -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. +* Initial Contributors: +* Nokia Corporation - initial contribution. * -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. +* Contributors: * -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Description: This file provides the information required for building +* Description: This is a top level bld file to generate all libraries. +* This file provides the information required for building. * */ diff -r 531951b2e59a -r 5136fef23c4b controlpanel/examples/groupplugin/groupplugin.pro --- a/controlpanel/examples/groupplugin/groupplugin.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/examples/groupplugin/groupplugin.pro Mon Oct 18 10:08:17 2010 +0800 @@ -26,3 +26,6 @@ } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/examples/themeplugin/themeplugin.pro --- a/controlpanel/examples/themeplugin/themeplugin.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/examples/themeplugin/themeplugin.pro Mon Oct 18 10:08:17 2010 +0800 @@ -27,3 +27,6 @@ symbian { TARGET.UID3 = 0X20025FDB } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/examples/viewplugin/viewplugin.pro --- a/controlpanel/examples/viewplugin/viewplugin.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/examples/viewplugin/viewplugin.pro Mon Oct 18 10:08:17 2010 +0800 @@ -25,3 +25,6 @@ } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/rom/bld.inf --- a/controlpanel/rom/bld.inf Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/rom/bld.inf Mon Oct 18 10:08:17 2010 +0800 @@ -1,27 +1,18 @@ /* -* ============================================================================== -* Name : bld.inf -* Part of : -* Description : This is a top level bld file to generate all libraries. -* -* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). All rights reserved. +* Copyright (c) 2008-2009 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". * -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU Lesser General Public -* License as published by the Free Software Foundation; either -* version 2 of the License, or (at your option) any later version. +* Initial Contributors: +* Nokia Corporation - initial contribution. * -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. +* Contributors: * -* You should have received a copy of the GNU Lesser General Public -* License along with this library; if not, write to the -* Free Software Foundation, Inc., 59 Temple Place - Suite 330, -* Boston, MA 02111-1307, USA. -* -* Description : This is a top level bld file to export the data and ROM files +* Description: This is a top level bld file to generate all libraries. +* This is a top level bld file to export the data and ROM files. * */ diff -r 531951b2e59a -r 5136fef23c4b controlpanel/src/cpframework/cpframework.pro --- a/controlpanel/src/cpframework/cpframework.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/src/cpframework/cpframework.pro Mon Oct 18 10:08:17 2010 +0800 @@ -32,3 +32,6 @@ LIBS += -lcplogger + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/src/logger/logger.pro --- a/controlpanel/src/logger/logger.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/src/logger/logger.pro Mon Oct 18 10:08:17 2010 +0800 @@ -26,3 +26,6 @@ DEFINES += BUILD_LOGGER_DLL + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/firstpluginfortest.pro --- a/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/firstpluginfortest.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/firstpluginfortest.pro Mon Oct 18 10:08:17 2010 +0800 @@ -55,3 +55,6 @@ src/firstpluginviewfortest.h SOURCES += src/firstpluginfortest.cpp \ src/firstpluginviewfortest.cpp + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginfortest.cpp --- a/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginfortest.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginfortest.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,4 +1,19 @@ - +/* +* Copyright (c) 2009 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: +* +*/ #include "firstpluginfortest.h" #include "firstpluginviewfortest.h" diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginfortest.h --- a/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginfortest.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginfortest.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,6 +1,19 @@ - - -//This class is used for the test case "testCpPluginInterface()". CpTestPlugin is a subclass from CpPluginInterface. +/* +* Copyright (c) 2009 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: This class is used for the test case "testCpPluginInterface()". CpTestPlugin is a subclass from CpPluginInterface. +* +*/ #ifndef FIRSTPLUGINFORTEST_H #define FIRSTPLUGINFORTEST_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginviewfortest.cpp --- a/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginviewfortest.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginviewfortest.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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: +* +*/ + #include "firstpluginviewfortest.h" #include diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginviewfortest.h --- a/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginviewfortest.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/firstpluginfortest/src/firstpluginviewfortest.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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 FIRSTPLUGINVIEWFORTEST_H #define FIRSTPLUGINVIEWFORTEST_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/secondpluginfortest.pro --- a/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/secondpluginfortest.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/secondpluginfortest.pro Mon Oct 18 10:08:17 2010 +0800 @@ -56,3 +56,6 @@ SOURCES += src/secondpluginfortest.cpp \ src/secondpluginviewfortest.cpp + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginfortest.cpp --- a/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginfortest.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginfortest.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,4 +1,19 @@ - +/* +* Copyright (c) 2009 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: +* +*/ #include "secondpluginfortest.h" #include "secondpluginviewfortest.h" diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginfortest.h --- a/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginfortest.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginfortest.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,6 +1,19 @@ - - -//This class is used for the test case "testCpPluginInterface()". CpTestPlugin is a subclass from CpPluginInterface. +/* +* Copyright (c) 2009 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: This class is used for the test case "testCpPluginInterface()". CpTestPlugin is a subclass from +* CpPluginInterface. +*/ #ifndef SECONDPLUGINFORTEST_H #define SECONDPLUGINFORTEST_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginviewfortest.cpp --- a/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginviewfortest.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginviewfortest.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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: +* +*/ + #include "secondpluginviewfortest.h" #include diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginviewfortest.h --- a/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginviewfortest.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/secondpluginfortest/src/secondpluginviewfortest.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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 SECONDPLUGINVIEWFORTEST_H #define SECONDPLUGINVIEWFORTEST_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginfortest.cpp --- a/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginfortest.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginfortest.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,4 +1,19 @@ - +/* +* Copyright (c) 2009 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: +* +*/ #include "thirdpluginfortest.h" #include "thirdpluginviewfortest.h" diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginfortest.h --- a/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginfortest.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginfortest.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,6 +1,19 @@ - - -//This class is used for the test case "testCpPluginInterface()". CpTestPlugin is a subclass from CpPluginInterface. +/* +* Copyright (c) 2009 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: This class is used for the test case "testCpPluginInterface()". CpTestPlugin is a subclass from CpPluginInterface. +* +*/ #ifndef THIRDPLUGINFORTEST_H #define THIRDPLUGINFORTEST_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginviewfortest.cpp --- a/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginviewfortest.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginviewfortest.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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: +* +*/ + #include "thirdpluginviewfortest.h" #include diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginviewfortest.h --- a/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginviewfortest.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/src/thirdpluginviewfortest.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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 THIRDPLUGINVIEWFORTEST_H #define THIRDPLUGINVIEWFORTEST_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/thirdpluginfortest.pro --- a/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/thirdpluginfortest.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/pluginfortest/thirdpluginfortest/thirdpluginfortest.pro Mon Oct 18 10:08:17 2010 +0800 @@ -56,3 +56,6 @@ SOURCES += src/thirdpluginfortest.cpp \ src/thirdpluginviewfortest.cpp + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/testplugin/testplugin.pro --- a/controlpanel/tsrc/unit/testplugin/testplugin.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/testplugin/testplugin.pro Mon Oct 18 10:08:17 2010 +0800 @@ -67,3 +67,6 @@ + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpapi/src/cptestpluginentryitem.cpp --- a/controlpanel/tsrc/unit/ut_cpapi/src/cptestpluginentryitem.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpapi/src/cptestpluginentryitem.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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: +* +*/ + #include "CpTestPluginEntryItem.h" #include diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpapi/src/cptestpluginentryitem.h --- a/controlpanel/tsrc/unit/ut_cpapi/src/cptestpluginentryitem.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpapi/src/cptestpluginentryitem.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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 CPTESTPLUGINENTRYITEM_H #define CPTESTPLUGINENTRYITEM_H #include diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpapi/src/cptestview.cpp --- a/controlpanel/tsrc/unit/ut_cpapi/src/cptestview.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpapi/src/cptestview.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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: +* +*/ + #include "CpTestView.h" #include @@ -19,4 +36,6 @@ void CpTestView::testClose() { close(); -} \ No newline at end of file +} + +//End of File diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpapi/src/cptestview.h --- a/controlpanel/tsrc/unit/ut_cpapi/src/cptestview.h Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpapi/src/cptestview.h Mon Oct 18 10:08:17 2010 +0800 @@ -1,3 +1,20 @@ +/* +* Copyright (c) 2009 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 CPTESTVIEW_H #define CPTESTVIEW_H diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro --- a/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpapi/ut_cpapi.pro Mon Oct 18 10:08:17 2010 +0800 @@ -59,4 +59,6 @@ test.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe autotest.commands = /epoc32/RELEASE/WINSCW/udeb/ut_cpapi.exe -xml -o c:/ut_cpapi.xml } -} \ No newline at end of file +} + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpbasesettingview/ut_cpbasesettingview.pro --- a/controlpanel/tsrc/unit/ut_cpbasesettingview/ut_cpbasesettingview.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpbasesettingview/ut_cpbasesettingview.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xEE3E465B } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpdataformbuttonentryviewitem/ut_cpdataformbuttonentryviewitem.pro --- a/controlpanel/tsrc/unit/ut_cpdataformbuttonentryviewitem/ut_cpdataformbuttonentryviewitem.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpdataformbuttonentryviewitem/ut_cpdataformbuttonentryviewitem.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xE43C01BC } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpdataformlistentryviewitem/ut_cpdataformlistentryviewitem.pro --- a/controlpanel/tsrc/unit/ut_cpdataformlistentryviewitem/ut_cpdataformlistentryviewitem.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpdataformlistentryviewitem/ut_cpdataformlistentryviewitem.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xE93910F0 } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpitemdatahelper/ut_cpitemdatahelper.pro --- a/controlpanel/tsrc/unit/ut_cpitemdatahelper/ut_cpitemdatahelper.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpitemdatahelper/ut_cpitemdatahelper.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xE1FF1D09 } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpplugin/ut_cpplugin.pro --- a/controlpanel/tsrc/unit/ut_cpplugin/ut_cpplugin.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpplugin/ut_cpplugin.pro Mon Oct 18 10:08:17 2010 +0800 @@ -52,4 +52,6 @@ SOURCES += ../../../src/cpframework/src/cppluginloader.cpp SOURCES += ../../../src/cpframework/src/cppluginconfigreader.cpp SOURCES += ../../../src/cpframework/src/cppluginconfig.cpp -SOURCES += ../../../src/cpframework/src/cputility.cpp \ No newline at end of file +SOURCES += ../../../src/cpframework/src/cputility.cpp + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cppluginlauncher/ut_cppluginlauncher.pro --- a/controlpanel/tsrc/unit/ut_cppluginlauncher/ut_cppluginlauncher.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cppluginlauncher/ut_cppluginlauncher.pro Mon Oct 18 10:08:17 2010 +0800 @@ -38,3 +38,6 @@ DEPLOYMENT += testplugindll testpluginconfig testpluginstub } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cppluginloader/ut_cppluginloader.pro --- a/controlpanel/tsrc/unit/ut_cppluginloader/ut_cppluginloader.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cppluginloader/ut_cppluginloader.pro Mon Oct 18 10:08:17 2010 +0800 @@ -39,3 +39,6 @@ DEPLOYMENT += testplugindll testpluginconfig testpluginstub } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cppluginutility/ut_cppluginutility.pro --- a/controlpanel/tsrc/unit/ut_cppluginutility/ut_cppluginutility.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cppluginutility/ut_cppluginutility.pro Mon Oct 18 10:08:17 2010 +0800 @@ -25,3 +25,6 @@ } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpsettingformentryitemdata/ut_cpsettingformentryitemdata.pro --- a/controlpanel/tsrc/unit/ut_cpsettingformentryitemdata/ut_cpsettingformentryitemdata.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpsettingformentryitemdata/ut_cpsettingformentryitemdata.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xEF97598F } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpsettingformitemdata/ut_cpsettingformitemdata.pro --- a/controlpanel/tsrc/unit/ut_cpsettingformitemdata/ut_cpsettingformitemdata.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpsettingformitemdata/ut_cpsettingformitemdata.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xEA4617EA } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cputility/ut_cputility.pro --- a/controlpanel/tsrc/unit/ut_cputility/ut_cputility.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cputility/ut_cputility.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xE98BA02A } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_cpviewlauncher/ut_cpviewlauncher.pro --- a/controlpanel/tsrc/unit/ut_cpviewlauncher/ut_cpviewlauncher.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_cpviewlauncher/ut_cpviewlauncher.pro Mon Oct 18 10:08:17 2010 +0800 @@ -23,3 +23,6 @@ symbian: { TARGET.UID3 = 0xEF52815A } + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b controlpanel/tsrc/unit/ut_profileengwrapper/ut_profileengwrapper.pro --- a/controlpanel/tsrc/unit/ut_profileengwrapper/ut_profileengwrapper.pro Wed Sep 29 13:58:42 2010 +0800 +++ b/controlpanel/tsrc/unit/ut_profileengwrapper/ut_profileengwrapper.pro Mon Oct 18 10:08:17 2010 +0800 @@ -40,3 +40,6 @@ # Input HEADERS += src/ut_profileengwrapper.h SOURCES += src/ut_profileengwrapper.cpp + + +symbian:MMP_RULES += SMPSAFE diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp --- a/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/profilesservices/ProfileEngine/EngSrc/CProfileEngineImpl.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -1241,22 +1241,10 @@ void CProfileEngineImpl::SetSilenceModeL( TBool aSilenceMode ) { User::LeaveIfError( iCenRep->Set( KProEngSilenceMode, aSilenceMode ? 1 : 0 ) ); - //Also set profiles' ring type to silence - TInt countOfProfiles = iProfileLocalisedNames->MdcaCount(); - for (TInt i = 0; i < countOfProfiles; ++i) - { - const MProfileName* profileName = iProfileLocalisedNames->ProfileName(i); - if (profileName) - { - MProfileExtended2* profile = Profile2LC(profileName->Id()); - TProfileToneSettings setToneSettings = profile->ProfileSetTones().SetToneSettings(); - setToneSettings.iRingingType = aSilenceMode ? EProfileRingingTypeSilent : EProfileRingingTypeRinging; - CommitChange2L(*profile); - CleanupStack::PopAndDestroy(); - } - - } + //Send event through P&S + CreatePubSubKeysIfNeededL(); + PublishChangeL( KProEngActiveProfileModified ); } // End of File diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp --- a/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/profilesservices/ProfileEngine/EngSrc/CProfileTonesImpl.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -142,6 +142,14 @@ aProfileId ), value ) ); iProfileToneSettings.iRingingType = TProfileRingingType( value ); + //Since 10.1, check if silence mode + User::LeaveIfError( + aCenRep.Get( KProEngSilenceMode , value) ); + if ( value ) + { + iProfileToneSettings.iRingingType = EProfileRingingTypeSilent; + } + User::LeaveIfError( aCenRep.Get( ProfileEngUtils::ResolveKey( KProEngKeypadVolume, aProfileId ), value ) ); diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp --- a/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/profilesservices/ProfileEngine/ProfileScheduleEventSrc/CProfileChangeEvent.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -32,10 +32,11 @@ // CONSTANTS -namespace - { - _LIT( KProfileScheduleEventResourceDriveAndDir, "Z:ProfileScheduleEvent.rsc" ); - } + +//namespace +// { +// _LIT( KProfileScheduleEventResourceDriveAndDir, "Z:ProfileScheduleEvent.rsc" ); +// } // ============================ MEMBER FUNCTIONS =============================== diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp --- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneHandler.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -33,7 +33,7 @@ // CONSTANTS _LIT( KProEngROMDriveLetter, "Z:" ); // The filename of the resource file - _LIT( KProEngResourceFileName, "Z:ProEngWrapper.RSC" ); + //_LIT( KProEngResourceFileName, "Z:ProEngWrapper.RSC" ); } // ============================ MEMBER FUNCTIONS =============================== diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp --- a/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Wed Sep 29 13:58:42 2010 +0800 +++ b/profilesservices/ProfileEngine/WrapperSrc/CProEngToneSettingsImpl.cpp Mon Oct 18 10:08:17 2010 +0800 @@ -116,10 +116,14 @@ // CProEngToneSettingsImpl:: // ----------------------------------------------------------------------------- // -TInt CProEngToneSettingsImpl::SetRingingType( TProfileRingingType /*aRingingType*/ ) +TInt CProEngToneSettingsImpl::SetRingingType( TProfileRingingType aRingingType ) { - // since 10.1, ring type can't be set by user - return KErrNotSupported; + if( iModifiableFlags & EProfileFlagRingingType ) + { + iToneSettings.iRingingType = aRingingType; + return KErrNone; + } + return KErrAccessDenied; } // ----------------------------------------------------------------------------- diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/conf/profilesengine.confml Binary file profilesservices/ProfileEngine/conf/profilesengine.confml has changed diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/conf/profilesengine_101F8798.crml Binary file profilesservices/ProfileEngine/conf/profilesengine_101F8798.crml has changed diff -r 531951b2e59a -r 5136fef23c4b profilesservices/ProfileEngine/group/ProfileEng.rss --- a/profilesservices/ProfileEngine/group/ProfileEng.rss Wed Sep 29 13:58:42 2010 +0800 +++ b/profilesservices/ProfileEngine/group/ProfileEng.rss Mon Oct 18 10:08:17 2010 +0800 @@ -62,7 +62,7 @@ naviname = qtn_navi_mode_active_general; titlename = qtn_mode_title_general; }, - PROFILE +/* PROFILE { id = EProfileSilentId; name = qtn_mode_silent; @@ -70,6 +70,7 @@ naviname = qtn_navi_mode_active_silent; titlename = qtn_mode_title_silent; }, +*/ PROFILE { id = EProfileMeetingId; @@ -77,7 +78,9 @@ shortname = qtn_navi_mode_meeting; naviname = qtn_navi_mode_active_meeting; titlename = qtn_mode_title_meeting; - }, + } +/* + , PROFILE { id = EProfileOutdoorId; @@ -115,7 +118,8 @@ naviname = qtn_navi_mode_active_drive; titlename = qtn_mode_title_drive; } -#endif +#endif +*/ }; }