Commit 673b5c92 authored by Bernd Gehrmann's avatar Bernd Gehrmann
Browse files

fix

svn path=/trunk/kdesdk/cervisia/; revision=162517
parent 8ecfbf30
2002-06-22 Bernd Gehrmann <bernd@mail.berlios.de>
* Fixed diff dialog bug due to changes from 2002-06-11
2002-06-18 Roland Krause <rokrau@yahoo.com>
* View Filter is now applied after Fold/Unfold of the
......
......@@ -404,7 +404,7 @@ bool DiffDialog::parseCvsDiff(const QString &sandbox, const QString &repository,
}
QStringList::ConstIterator itA = linesA.begin();
QStringList::ConstIterator itB = linesB.begin();
for (; itA != linesA.end() || itB != linesB.end(); ++itA, ++itB)
while (itA != linesA.end() || itB != linesB.end())
{
if (itA != linesA.end())
{
......@@ -422,6 +422,11 @@ bool DiffDialog::parseCvsDiff(const QString &sandbox, const QString &repository,
diff2->addLine(*itB, DiffView::Insert,
++linenoB);
}
if (itA != linesA.end())
++itA;
if (itB != linesB.end())
++itB;
}
state = Normal;
linesA.clear();
......@@ -447,7 +452,7 @@ bool DiffDialog::parseCvsDiff(const QString &sandbox, const QString &repository,
}
QStringList::ConstIterator itA = linesA.begin();
QStringList::ConstIterator itB = linesB.begin();
for (; itA != linesA.end() || itB != linesB.end(); ++itA, ++itB)
while (itA != linesA.end() || itB != linesB.end())
{
if (itA != linesA.end())
{
......@@ -465,6 +470,11 @@ bool DiffDialog::parseCvsDiff(const QString &sandbox, const QString &repository,
diff2->addLine(*itB, DiffView::Insert,
++linenoB);
}
if (itA != linesA.end())
++itA;
if (itB != linesB.end())
++itB;
}
updateNofN();
......
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