diff -r f58d6ec98e88 -r b700e12870ca aknlayoutcompiler/src/MLEqCompData.cpp --- a/aknlayoutcompiler/src/MLEqCompData.cpp Thu Dec 17 09:14:18 2009 +0200 +++ b/aknlayoutcompiler/src/MLEqCompData.cpp Mon Jan 18 21:13:05 2010 +0200 @@ -27,7 +27,7 @@ #include "CodeGenConsts.h" #include "UsefulDefinitions.h" -#include "Akndef.hrh" +#include #include #include @@ -106,7 +106,7 @@ iZoomId(aOther.iZoomId), iFormulaTree(aOther.iFormulaTree) { - int x = 0; + } const TMLEqCompDataFormula& TMLEqCompDataFormula::operator=(const TMLEqCompDataFormula& aOther) @@ -322,17 +322,18 @@ TMLEqCompDataLine::TMLEqCompDataLine() : iId(0), - iIsUnique(true), - iIsMirroredHorizontally(false), + iName(KEqCompDataUnknown), iType(EUnknownComponent), - iName(KEqCompDataUnknown), iDrawingOrder(-1), iParentTable(0), iParentInfo(0), + iIsUnique(true), + iGlobalIndex(0), + iIsMirroredHorizontally(false), // iAttributeInfo(0), iNumCols(1), - iNumRows(1), - iGlobalIndex(0) + iNumRows(1) + { } @@ -738,18 +739,18 @@ TMLEqCompDataTable::TMLEqCompDataTable(TMLEqCompData* aTables) : + iId(0), iTables(aTables), - iParentLine(NULL), - iId(0) + iParentLine(NULL) { } TMLEqCompDataTable::TMLEqCompDataTable(TMLEqCompData* aTables, const TMLEqCompDataTable& aOther) : + iId(aOther.iId), iTables(aTables), iParentLine(NULL), - iParentName(aOther.iParentName), - iId(aOther.iId) + iParentName(aOther.iParentName) { for (const_iterator pOptionSet = aOther.begin(); pOptionSet != aOther.end(); ++pOptionSet) { @@ -1021,7 +1022,6 @@ if(parentId != 0) { TMLEqCompDataTable* parentTable = FindTable(parentId); - TMLEqCompDataLine* parentLine = iComponents[parentId]; if(parentTable) { line.iParentTable = parentTable;