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
85
86
87
88
89
90
91
92
93
94
95
96
|
/***************************************************************************
* Copyright (C) 2008 by Rajko Albrecht ral@alwins-world.de *
* http://kdesvn.alwins-world.de/ *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* *
* This program 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 General Public License for more details. *
* *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#ifndef SVNCONFLICTDESCRIPTION_H
#define SVNCONFLICTDESCRIPTION_H
struct svn_wc_conflict_description_t;
#include "svnqt/pool.hpp"
#include "svnqt/svnqt_defines.hpp"
#include <svn_types.h>
#include <qstring.h>
namespace svn {
/** Wrapper for svn_wc_conflict_description_t
* does nothing when build against subversion prior 1.5
* @since subversion 1.5
* @author Rajko Albrecht
*/
class SVNQT_EXPORT ConflictDescription
{
public:
enum ConflictType {
ConflictText,
ConflictProperty
};
enum ConflictReason {
ReasonEdited,
ReasonObstructed,
ReasonDeleted,
ReasonMissing,
ReasonUnversioned
};
enum ConflictAction {
ConflictEdit,
ConflictAdd,
ConflictDelete
};
ConflictDescription();
ConflictDescription(const svn_wc_conflict_description_t*);
~ConflictDescription();
ConflictAction action() const;
ConflictType Type() const;
ConflictReason reason() const;
svn_node_kind_t nodeKind() const;
bool binary() const;
const QString& baseFile() const;
const QString& theirFile() const;
const QString& propertyName() const;
const QString& Path() const;
const QString& myFile() const;
const QString& mimeType() const;
const QString& mergedFile() const;
protected:
//! don't use it.
ConflictDescription(const ConflictDescription&);
void init();
protected:
Pool m_pool;
bool m_binary;
ConflictAction m_action;
ConflictType m_Type;
ConflictReason m_reason;
QString m_baseFile;
QString m_mergedFile;
QString m_mimeType;
QString m_myFile;
QString m_Path;
QString m_propertyName;
QString m_theirFile;
svn_node_kind_t m_nodeKind;
};
}
#endif
|
