1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
|
/*
This file is part of libkdepim.
Copyright (c) 2004 Tobias Koenig <tokoe@kde.org>
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License as published by the Free Software Foundation; either
version 2 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public License
along with this library; see the file COPYING.LIB. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA.
*/
#include <qstringlist.h>
#include <klocale.h>
#include "genericdiffalgo.h"
using namespace KSync;
#define MAX( a, b ) ( a > b ? a : b )
#ifndef KDE_USE_FINAL
// With --enable-final, we get the (identical) compareString from
// addresseediffalgo.cpp
static bool compareString( const QString &left, const QString &right )
{
if ( left.isEmpty() && right.isEmpty() )
return true;
else
return left == right;
}
#endif
GenericDiffAlgo::GenericDiffAlgo( const QString &leftData, const QString &rightData )
: mLeftData( leftData ), mRightData( rightData )
{
}
void GenericDiffAlgo::run()
{
begin();
QStringList leftList = QStringList::split( '\n', mLeftData, true );
QStringList rightList = QStringList::split( '\n', mRightData, true );
uint lines = MAX( leftList.count(), rightList.count() );
for ( uint i = 0; i < lines; ++i ) {
if ( i < leftList.count() && i < rightList.count() ) {
if ( !compareString( leftList[ i ], rightList[ i ] ) )
conflictField( i18n( "Line %1" ).arg( i ), leftList[ i ], rightList[ i ] );
} else if ( i < leftList.count() && i >= rightList.count() ) {
additionalLeftField( i18n( "Line %1" ).arg( i ), leftList[ i ] );
} else if ( i >= leftList.count() && i < rightList.count() ) {
additionalRightField( i18n( "Line %1" ).arg( i ), rightList[ i ] );
}
}
end();
}
|
