| 41 | } |
| 42 | |
| 43 | void printDiff3List(const Diff3LineList &diff3LineList, |
| 44 | const SourceData &sd1, |
| 45 | const SourceData &sd2, |
| 46 | const SourceData &sd3, |
| 47 | bool forceVerbosity=false) |
| 48 | { |
| 49 | const int columnsize = 30; |
| 50 | const int linenumsize = 6; |
| 51 | Diff3LineList::const_iterator i; |
| 52 | for ( i=diff3LineList.begin(); i!=diff3LineList.end(); ++i ) |
| 53 | { |
| 54 | QTextStream out(stdout); |
| 55 | QString lineAText; |
| 56 | QString lineBText; |
| 57 | QString lineCText; |
| 58 | |
| 59 | const Diff3Line& d3l = *i; |
| 60 | |
| 61 | if(d3l.getLineA().isValid()) |
| 62 | { |
| 63 | const LineData *pLineData = &sd1.getLineDataForDiff()->at(d3l.getLineA()); |
| 64 | lineAText = pLineData->getLine(); |
| 65 | lineAText.replace(QString("\r"), QString("\\r")); |
| 66 | lineAText.replace(QString("\n"), QString("\\n")); |
| 67 | lineAText = QString("%1 %2").arg(d3l.getLineA(), linenumsize).arg(lineAText.left(columnsize - linenumsize - 1)); |
| 68 | } |
| 69 | |
| 70 | if(d3l.getLineB().isValid()) |
| 71 | { |
| 72 | const LineData *pLineData = &sd2.getLineDataForDiff()->at(d3l.getLineB()); |
| 73 | lineBText = pLineData->getLine(); |
| 74 | lineBText.replace(QString("\r"), QString("\\r")); |
| 75 | lineBText.replace(QString("\n"), QString("\\n")); |
| 76 | lineBText = QString("%1 %2").arg(d3l.getLineB(), linenumsize).arg(lineBText.left(columnsize - linenumsize - 1)); |
| 77 | } |
| 78 | |
| 79 | if(d3l.getLineC().isValid()) |
| 80 | { |
| 81 | const LineData *pLineData = &sd3.getLineDataForDiff()->at(d3l.getLineC()); |
| 82 | lineCText = pLineData->getLine(); |
| 83 | lineCText.replace(QString("\r"), QString("\\r")); |
| 84 | lineCText.replace(QString("\n"), QString("\\n")); |
| 85 | lineCText = QString("%1 %2").arg(d3l.getLineC(), linenumsize).arg(lineCText.left(columnsize - linenumsize - 1)); |
| 86 | } |
| 87 | |
| 88 | out << QString("%1 %2 %3").arg(lineAText, -columnsize) |
| 89 | .arg(lineBText, -columnsize) |
| 90 | .arg(lineCText, -columnsize); |
| 91 | if(verbose || forceVerbosity) |
| 92 | { |
| 93 | out << " " << d3l.isEqualAB() << " " << d3l.isEqualBC() << " " << d3l.isEqualAC(); |
| 94 | } |
| 95 | |
| 96 | out << endl; |
| 97 | } |
| 98 | } |
| 99 | |
| 100 | void printDiff3List(QString caption, |