Commit 26710be6 authored by Michael Reeves's avatar Michael Reeves

Cleanup

Move missplaced comment, remove unneed &'s
parent 47344051
Pipeline #5994 failed with stage
in 3 minutes and 47 seconds
......@@ -431,13 +431,13 @@ QStringList SourceData::readAndPreprocess(QTextCodec* pEncoding, bool bAutoDetec
bool bSuccess = errorReason.isEmpty() && m_normalData.readFile(fileNameOut1);
if(fileInSize > 0 && (!bSuccess || m_normalData.m_size == 0))
{
//Don't fail the preprocessor command if the file cann't be read.
if(!m_normalData.readFile(faIn))
{
errors.append(faIn.getStatusText());
errors.append(i18n(" Temp file is: %1", fileNameIn1));
return errors;
}
//Don't fail the preprocessor command if the file cann't be read.
errors.append(
i18n("Preprocessing possibly failed. Check this command:\n\n %1"
"\n\nThe preprocessing command will be disabled now.", ppCmd) +
......
......@@ -111,7 +111,7 @@ void calcDiff3LineListUsingAB(
Diff d(0, 0, 0);
qCInfo(kdiffMain) << "Enter: calcDiff3LineListUsingAB" ;
for(;;)
for(;;)
{
if(d.nofEquals == 0 && d.diff1 == 0 && d.diff2 == 0)
{
......@@ -1190,19 +1190,19 @@ void calcDiff(const QString& line1, const QString& line2, DiffList& diffList, in
for(i1 = 0;; ++i1)
{
if(&p1[i1] == line1.end() || (bBestValid && i1 >= bestI1 + bestI2))
if(p1[i1] == line1.end() || (bBestValid && i1 >= bestI1 + bestI2))
{
break;
}
for(i2 = 0; i2 < maxSearchRange; ++i2)
{
if(&p2[i2] == line2.end() || (bBestValid && i1 + i2 >= bestI1 + bestI2))
if(p2[i2] == line2.end() || (bBestValid && i1 + i2 >= bestI1 + bestI2))
{
break;
}
else if(p2[i2] == p1[i1] &&
(match == 1 || abs(i1 - i2) < 3 || (&p2[i2 + 1] == line2.end() && &p1[i1 + 1] == line1.end()) ||
(&p2[i2 + 1] != line2.end() && &p1[i1 + 1] != line1.end() && p2[i2 + 1] == p1[i1 + 1])))
(match == 1 || abs(i1 - i2) < 3 || (p2[i2 + 1] == line2.end() && p1[i1 + 1] == line1.end()) ||
(p2[i2 + 1] != line2.end() && p1[i1 + 1] != line1.end() && p2[i2 + 1] == p1[i1 + 1])))
{
if(i1 + i2 < bestI1 + bestI2 || !bBestValid)
{
......
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