MCL/sf/mw/uitools: comparison aknlayoutcompiler/src/Layout.cpp

equal deleted inserted replaced

-:f58d6ec98e88
+:b700e12870ca
 //  TLayoutLine
 TLayoutLine::TLayoutLine( TLayoutTable* aTable, int aId )
-:	iTable(aTable),
+:	iId(aId),
-	iId(aId),
+	iTable(aTable),
 	iIsUnique(true),
 	iIsMirroredHorizontally(false),
 	iIsMergedIdentical(false)
 	{}
 //
 TLayoutTable::TLayoutTable(TLayout* aTables)
-: iTables(aTables), iType(EUnknownTable), iParent(0), iFirstLineGlobalIndex(-1), iAppend(false), iNoSubTables(false)
+: iType(EUnknownTable), iTables(aTables), iParent(0), iFirstLineGlobalIndex(-1), iAppend(false), iNoSubTables(false)
 	{
 	}
 TLayoutTable::TLayoutTable(TLayout* aTables, const TLayoutTable& aOther)
-: iTables(aTables), iType(aOther.iType), iParent(0),
+: iColumnNames(aOther.iColumnNames), iType(aOther.iType),
-iFirstLineGlobalIndex(aOther.iFirstLineGlobalIndex),
+iTables(aTables), iName(aOther.iName), iParent(0),
-iAppend(aOther.iAppend), iColumnNames(aOther.iColumnNames), iName(aOther.iName),
+iParentName(aOther.iParentName), iFirstLineGlobalIndex(aOther.iFirstLineGlobalIndex),
-iParentName(aOther.iParentName), iNoSubTables(aOther.iNoSubTables)
+iAppend(aOther.iAppend), iNoSubTables(aOther.iNoSubTables)
 	{
 	for (const_iterator it = aOther.begin(); it != aOther.end(); ++it)
 		push_back(new TLayoutLine(this, **it));
 	}
 					(*pLine)->iTable = this;
 				break;
 				}
 			case TLayout::KMergeModeUnion:
 				{
-				int index = 0;
+				unsigned int index = 0;
 				for (; pNew != aTable.end(); ++pNew)
 					{
 					bool found = false;
 					for (iterator pLine = begin()+index; pLine != end(); ++pLine)
 						{
 							{
 							throw GeneralErr(Name() + " can't union merge unnamed line");
 							}
 						push_back(*pNew);
 						(*pNew)->iTable = this;
-						if ((*pNew)->iId != size())
+						if ( static_cast<unsigned int>( (*pNew)->iId ) != size())
 							iNoSubTables = true;
 						(*pNew)->iId = size();
 						}
 					if (index+1 < size())
 						index++;

changeset 1	b700e12870ca
parent 0	f58d6ec98e88