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
71
72
73
74
75
76
77
78
79
80
81
82
83
84
|
/* ====================================================================
* Copyright (c) 2003-2006, 2008 Martin Hauner
* http://subcommander.tigris.org
*
* Subcommander is licensed as described in the file doc/COPYING, which
* you should have received as part of this distribution.
* ====================================================================
*/
#include "Line.h"
Line::Line() : _blockNumber(0), _type(ctNop)
{
}
Line::Line( const Line& src )
: _line(src._line), _blockNumber(src._blockNumber), _type(src._type)
{
}
Line::Line( const sc::String &line, int blockNumber, ConflictType type )
: _line(line), _blockNumber(blockNumber), _type(type)
{
}
const sc::String& Line::getLine() const
{
return _line;
}
const char* Line::getStr() const
{
return _line.getStr();
}
size_t Line::getChars() const
{
return _line.getCharCnt();
}
size_t Line::getBytes() const
{
return _line.getByteCnt();
}
int Line::getBlockNr() const
{
return _blockNumber;
}
ConflictType Line::getType() const
{
return _type;
}
bool Line::isEmpty() const
{
return (_type == ctNop) || (((ctFlagEmpty) & _type) == ctFlagEmpty);
}
bool Line::isCommon() const
{
return _type == ctCommon;
}
bool Line::isDifference() const
{
return (_type != ctNop) && (_type != ctCommon);
//|| (_type != ctCommon) || (((ctFlagEmpty) & _type) == ctFlagEmpty);
}
Line Line::_empty;
const Line& Line::getEmpty()
{
return _empty;
}
Line Line::_empty2(_empty.getLine(),0,ctCommon);
const Line& Line::getEmpty2()
{
return _empty2;
}
|
