# HG changeset patch # User Dremov Kirill (Nokia-D-MSW/Tampere) # Date 1284495285 -10800 # Node ID 8b4f687b7a95a0351c670854868ecdc58627424c # Parent 01fc9b7302d1a64918cec069c85cfadbf8dbc37f Revision: 201033 Kit: 201035 diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/binary/AknLayoutCompiler.exe Binary file aknlayoutcompiler/binary/AknLayoutCompiler.exe has changed diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/cdl/MasterLayoutPack.cdl --- a/aknlayoutcompiler/cdl/MasterLayoutPack.cdl Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/cdl/MasterLayoutPack.cdl Tue Sep 14 23:14:45 2010 +0300 @@ -6,8 +6,8 @@ %% C++ -#include -#include +#include +#include %% API diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/inc/CodeGenConsts.h --- a/aknlayoutcompiler/inc/CodeGenConsts.h Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/inc/CodeGenConsts.h Tue Sep 14 23:14:45 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2004 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 @@ using namespace std; // includes -const string KIncludeLayoutInstanceHeaderScalableDef("#include "); +const string KIncludeLayoutInstanceHeaderScalableDef("#include "); // directories const string KDirEpocSysHeader("/epoc32/include/"); const string KDirDomainSysHeader("/epoc32/include/platform/mw/"); diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/src/CppWriter.cpp --- a/aknlayoutcompiler/src/CppWriter.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/src/CppWriter.cpp Tue Sep 14 23:14:45 2010 +0300 @@ -703,7 +703,7 @@ aLag << "*/" << endl << endl; aLag << "#if !defined(__" << iShortName << "_LAG__)" << endl; aLag << "#define __" << iShortName << "_LAG__" << endl; - aLag << "#include " << endl << endl; + aLag << "#include " << endl << endl; } // End of File diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/src/Lay2Cdl.cpp --- a/aknlayoutcompiler/src/Lay2Cdl.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/src/Lay2Cdl.cpp Tue Sep 14 23:14:45 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2004 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" @@ -258,6 +258,6 @@ string ifName(InterfaceName(CdlTkUtil::StripPath(aCdlName))); aInterface.Header().SetName(ifName); aInterface.Header().SetVersion(CCdlTkInterfaceHeader::CVersion(KGeneratedInterfaceMajorVer, KGeneratedInterfaceMinorVer)); - aInterface.Cpp().push_back("#include "); + aInterface.Cpp().push_back("#include "); } diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/src/LayCdl2Inst.cpp --- a/aknlayoutcompiler/src/LayCdl2Inst.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/src/LayCdl2Inst.cpp Tue Sep 14 23:14:45 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2004 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" @@ -180,7 +180,7 @@ iInstance = new CCdlTkInstance(iInterface); iInstance->SetName(aInstName); - string extraCpp("#include \n"); + string extraCpp("#include \n"); extraCpp += string("#include \"") + CdlTkUtil::ToLower(aBase ? aBase->FwdDeclName() : FwdDeclName()) + "\"\n"; iInstance->SetExtraCpp(extraCpp); diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/src/LayCdl2InstO.cpp --- a/aknlayoutcompiler/src/LayCdl2InstO.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/src/LayCdl2InstO.cpp Tue Sep 14 23:14:45 2010 +0300 @@ -1,5 +1,5 @@ /* -* Copyright (c) 2002-2004 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" @@ -466,7 +466,7 @@ // added. extern string KExtraCpp; string KExtraCpp = "\ -#include \"aknlayout2decode.h\"\n\ +#include \"AknLayout2Decode.h\"\n\ namespace $INTERFACE_NS { extern const TUint8 KByteCodedData[]; }\n"; extern string KInitialCpp; string KInitialCpp ="\ @@ -803,7 +803,7 @@ } const string KCommonImplStart = "\ -#include \"aknlayout2decode.h\"\n\ +#include \"AknLayout2Decode.h\"\n\ namespace $NAMESPACENAME { extern TUint8 const KByteCodedData[] = {\n"; const string KCommonImplImpl = "\ diff -r 01fc9b7302d1 -r 8b4f687b7a95 aknlayoutcompiler/src/MLCompCdl2InstO.cpp --- a/aknlayoutcompiler/src/MLCompCdl2InstO.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/aknlayoutcompiler/src/MLCompCdl2InstO.cpp Tue Sep 14 23:14:45 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" @@ -1231,7 +1231,7 @@ // added. // extern string KScalableExtraCpp; string KScalableExtraCpp = "\ -#include \"aknlayout2scalabledecode.h\"\n\ +#include \"AknLayout2ScalableDecode.h\"\n\ namespace $INTERFACE_NS { extern const TUint8 KByteCodedData_$FIRSTINSTANCENAME[]; }\n"; //extern string KScalableInitialCpp; @@ -1909,7 +1909,7 @@ } const string KCommonImplStart = "\ -#include \"aknlayout2scalabledecode.h\"\n\ +#include \"AknLayout2ScalableDecode.h\"\n\ namespace $NAMESPACENAME { extern TUint8 const KByteCodedData_$FIRSTINSTANCENAME[] = {\n"; const string KCommonImplImpl = "\ diff -r 01fc9b7302d1 -r 8b4f687b7a95 cdlcompiler/binary/CdlCompiler.EXE Binary file cdlcompiler/binary/CdlCompiler.EXE has changed diff -r 01fc9b7302d1 -r 8b4f687b7a95 cdlcompilertoolkit/src/CdlTkSyntaxCheck.cpp --- a/cdlcompilertoolkit/src/CdlTkSyntaxCheck.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/cdlcompilertoolkit/src/CdlTkSyntaxCheck.cpp Tue Sep 14 23:14:45 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" @@ -87,7 +87,7 @@ CdlTkUtil::OpenOutput(out, aName); out << "#line 1 \"" << CdlTkUtil::StripPath(iCdl.FileName()) << "\"" << endl; - out << "#include " << endl; + out << "#include " << endl; const CCdlTkCpp& cpp = iCdl.Cpp(); for (CCdlTkCpp::const_iterator pCpp = cpp.begin(); pCpp != cpp.end(); ++pCpp) { diff -r 01fc9b7302d1 -r 8b4f687b7a95 cdlcompilertoolkit/src/CdlTkWriteDll.cpp --- a/cdlcompilertoolkit/src/CdlTkWriteDll.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/cdlcompilertoolkit/src/CdlTkWriteDll.cpp Tue Sep 14 23:14:45 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" @@ -54,7 +54,7 @@ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\n\ * All rights reserved.\n\ * This component and the accompanying materials are made available\n\ -* under the terms of \"Eclipse Public License v1.0\"\n\ +* under the terms of \"Eclipse Public License v1.0\"\n\ * which accompanies this distribution, and is available\n\ * at the URL \"http://www.eclipse.org/legal/epl-v10.html\".\n\ *\n\ @@ -66,8 +66,6 @@ * Description:\n\ *\n\ */\n\n\ -// This file was generated by:\n\ -// $CMDLINE\n\ // It lists the makefile for a customisation DLL.\n\ // It may be modified manually.\n\ \n\ @@ -109,8 +107,6 @@ * Description:\n\ *\n\ */\n\n\ -// This file was generated by:\n\ -// $CMDLINE\n\ // It contains the project definition for a customisation DLL.\n\ // It may be modified manually.\n\ #include \n\ @@ -190,7 +186,7 @@ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\n\ * All rights reserved.\n\ * This component and the accompanying materials are made available\n\ -* under the terms of \"Eclipse Public License v1.0\"\n\ +* under the terms of \"Eclipse Public License v1.0\"\n\ * which accompanies this distribution, and is available\n\ * at the URL \"http://www.eclipse.org/legal/epl-v10.html\".\n\ *\n\ @@ -202,8 +198,6 @@ * Description:\n\ *\n\ */\n\n\ -// This file was generated by:\n\ -// $CMDLINE\n\ // This is the main source file for a customisation DLL.\n\ // It may be modified manually.\n\ \n\ @@ -294,7 +288,7 @@ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\n\ * All rights reserved.\n\ * This component and the accompanying materials are made available\n\ -* under the terms of \"Eclipse Public License v1.0\"\n\ +* under the terms of \"Eclipse Public License v1.0\"\n\ * which accompanies this distribution, and is available\n\ * at the URL \"http://www.eclipse.org/legal/epl-v10.html\".\n\ *\n\ @@ -306,8 +300,6 @@ * Description:\n\ *\n\ */\n\n\ -// Header file for automatic instance id assignment for $DLL_NAME, generated by:\n\ -// $CMDLINE\n\ #ifndef $DLL_NAME_INST_IDS\n\ #define $DLL_NAME_INST_IDS\n\ \n\ @@ -355,7 +347,7 @@ * Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies).\n\ * All rights reserved.\n\ * This component and the accompanying materials are made available\n\ -* under the terms of \"Eclipse Public License v1.0\"\n\ +* under the terms of \"Eclipse Public License v1.0\"\n\ * which accompanies this distribution, and is available\n\ * at the URL \"http://www.eclipse.org/legal/epl-v10.html\".\n\ *\n\ diff -r 01fc9b7302d1 -r 8b4f687b7a95 cdlcompilertoolkit/src/CdlTkWriteInstance.cpp --- a/cdlcompilertoolkit/src/CdlTkWriteInstance.cpp Wed Sep 01 12:16:33 2010 +0100 +++ b/cdlcompilertoolkit/src/CdlTkWriteInstance.cpp Tue Sep 14 23:14:45 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" @@ -129,14 +129,13 @@ * Description:\n\ *\n\ */\n\n\ -// This file was generated from $CDLNAME.\n\ // It contains the customisation API.\n\ // It should not be modified manually.\n\ \n\ #ifndef $CDLGUARD\n\ #define $CDLGUARD\n\ \n\ -#include \n\ +#include \n\ #include \"$CDLINCNAME.common.h\"\n\ \n\ namespace $CDLNS\n\ @@ -216,8 +215,6 @@ * Description:\n\ *\n\ */\n\n\ -// $INSTNAME generated by\n\ -// $CMDLINE\n\ // This customisation implements the interface defined in $CDLNAME\n\ \n\ #include \"$HEADERNAME\"\n\ @@ -281,8 +278,6 @@ *\n\ */\n\n\ // This header file contains the customisation implementation identity for $INSTNAME\n\ -// It was generated by:\n\ -// $CMDLINE\n\ // This file may be manually modified.\n\ \n\ #ifndef $INSTGUARD\n\ @@ -325,8 +320,6 @@ *\n\ */\n\n\ // This header file contains the customisation implementation identity for $INSTNAME\n\ -// It was generated by:\n\ -// $CMDLINE\n\ // This file may be manually modified.\n\ \n\ #ifndef $INSTGUARDRH\n\ diff -r 01fc9b7302d1 -r 8b4f687b7a95 svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe Binary file svgtencoder/svgtenc/standalone/binary/svgtbinencode.exe has changed