Commit c18537da authored by Michael Reeves's avatar Michael Reeves

calcWhiteDiff3Lines -> Diff3LineList

parent b1a2c763
......@@ -1171,12 +1171,12 @@ void DiffBufferInfo::init(Diff3LineList* pD3ll, const Diff3LineVector* pD3lv,
}
}
void calcWhiteDiff3Lines(
Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC)
void Diff3LineList::calcWhiteDiff3Lines(
const LineData* pldA, const LineData* pldB, const LineData* pldC)
{
Diff3LineList::iterator i3 = d3ll.begin();
Diff3LineList::iterator i3;
for(; i3 != d3ll.end(); ++i3)
for(i3=begin(); i3 != end(); ++i3)
{
i3->bWhiteLineA = ((*i3).getLineA() == -1 || pldA == nullptr || pldA[(*i3).getLineA()].whiteLine() || pldA[(*i3).getLineA()].bContainsPureComment);
i3->bWhiteLineB = ((*i3).getLineB() == -1 || pldB == nullptr || pldB[(*i3).getLineB()].whiteLine() || pldB[(*i3).getLineB()].bContainsPureComment);
......
......@@ -199,9 +199,10 @@ class Diff3Line
class Diff3LineList : public QList<Diff3Line>
{
public:
bool fineDiff(const int selector, const LineData* v1, const LineData* v2);
void calcDiff3LineVector(Diff3LineVector& d3lv);
public:
bool fineDiff(const int selector, const LineData* v1, const LineData* v2);
void calcDiff3LineVector(Diff3LineVector& d3lv);
void calcWhiteDiff3Lines(const LineData* pldA, const LineData* pldB, const LineData* pldC);
};
class Diff3LineVector : public QVector<Diff3Line*>
......@@ -340,7 +341,7 @@ void calcDiff3LineListUsingBC(
void correctManualDiffAlignment(Diff3LineList& d3ll, ManualDiffHelpList* pManualDiffHelpList);
void calcDiff3LineListTrim(Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC, ManualDiffHelpList* pManualDiffHelpList);
void calcWhiteDiff3Lines(Diff3LineList& d3ll, const LineData* pldA, const LineData* pldB, const LineData* pldC);
// Helper class that swaps left and right for some commands.
class MyPainter : public QPainter
......
......@@ -323,7 +323,7 @@ void KDiff3App::mainInit(TotalDiffStatus* pTotalDiffStatus, bool bLoadFiles, boo
m_sd2.getLineDataForDiff(), m_sd2.getSizeLines(),
m_sd3.getLineDataForDiff(), m_sd3.getSizeLines());
calcWhiteDiff3Lines(m_diff3LineList, m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff());
m_diff3LineList.calcWhiteDiff3Lines(m_sd1.getLineDataForDiff(), m_sd2.getLineDataForDiff(), m_sd3.getLineDataForDiff());
m_diff3LineList.calcDiff3LineVector(m_diff3LineVector);
}
......
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