Commit ad0d6a26 authored by Michael Reeves's avatar Michael Reeves

move << operaor definition

parent f1815beb
......@@ -475,3 +475,36 @@ void MergeFileInfos::updateAge()
}
}
}
QTextStream& operator<<(QTextStream& ts, MergeFileInfos& mfi)
{
ts << "{\n";
ValueMap vm;
vm.writeEntry("SubPath", mfi.subPath());
vm.writeEntry("ExistsInA", mfi.existsInA());
vm.writeEntry("ExistsInB", mfi.existsInB());
vm.writeEntry("ExistsInC", mfi.existsInC());
vm.writeEntry("EqualAB", mfi.isEqualAB());
vm.writeEntry("EqualAC", mfi.isEqualAC());
vm.writeEntry("EqualBC", mfi.isEqualBC());
vm.writeEntry("MergeOperation", (int)mfi.getOperation());
vm.writeEntry("DirA", mfi.isDirA());
vm.writeEntry("DirB", mfi.isDirB());
vm.writeEntry("DirC", mfi.isDirC());
vm.writeEntry("LinkA", mfi.isLinkA());
vm.writeEntry("LinkB", mfi.isLinkB());
vm.writeEntry("LinkC", mfi.isLinkC());
vm.writeEntry("OperationComplete", !mfi.isOperationRunning());
vm.writeEntry("AgeA", (int)mfi.getAgeA());
vm.writeEntry("AgeB", (int)mfi.getAgeB());
vm.writeEntry("AgeC", (int)mfi.getAgeC());
vm.writeEntry("ConflictingAges", mfi.m_bConflictingAges); // Equal age but files are not!
vm.save(ts);
ts << "}\n";
return ts;
}
......@@ -176,6 +176,8 @@ class MergeFileInfos
bool m_bConflictingAges; // Equal age but files are not!
};
QTextStream& operator<<(QTextStream& ts, MergeFileInfos& mfi);
class MfiCompare
{
Qt::SortOrder mOrder;
......
......@@ -2851,38 +2851,7 @@ void DirectoryMergeInfo::setInfo(
m_pInfoList->resizeColumnToContents(i);
}
QTextStream& operator<<(QTextStream& ts, MergeFileInfos& mfi)
{
ts << "{\n";
ValueMap vm;
vm.writeEntry("SubPath", mfi.subPath());
vm.writeEntry("ExistsInA", mfi.existsInA());
vm.writeEntry("ExistsInB", mfi.existsInB());
vm.writeEntry("ExistsInC", mfi.existsInC());
vm.writeEntry("EqualAB", mfi.isEqualAB());
vm.writeEntry("EqualAC", mfi.isEqualAC());
vm.writeEntry("EqualBC", mfi.isEqualBC());
vm.writeEntry("MergeOperation", (int)mfi.getOperation());
vm.writeEntry("DirA", mfi.isDirA());
vm.writeEntry("DirB", mfi.isDirB());
vm.writeEntry("DirC", mfi.isDirC());
vm.writeEntry("LinkA", mfi.isLinkA());
vm.writeEntry("LinkB", mfi.isLinkB());
vm.writeEntry("LinkC", mfi.isLinkC());
vm.writeEntry("OperationComplete", !mfi.isOperationRunning());
vm.writeEntry("AgeA", (int)mfi.getAgeA());
vm.writeEntry("AgeB", (int)mfi.getAgeB());
vm.writeEntry("AgeC", (int)mfi.getAgeC());
vm.writeEntry("ConflictingAges", mfi.m_bConflictingAges); // Equal age but files are not!
vm.save(ts);
ts << "}\n";
return ts;
}
void DirectoryMergeWindow::slotSaveMergeState()
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment