/usr/include/svnqt/conflictresult.h is in libsvnqt-dev 1.6.0-2.
This file is owned by root:root, with mode 0o644.
The actual contents of the file can be viewed below.
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 | /***************************************************************************
* Copyright (C) 2007-2009 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 Lesser General Public *
* License as published by the Free Software Foundation; either *
* version 2.1 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 *
* Lesser General Public License for more details. *
* *
* You should have received a copy of the GNU Lesser General Public *
* License along with this program (in the file LGPL.txt); if not, *
* write to the Free Software Foundation, Inc., 51 Franklin St, *
* Fifth Floor, Boston, MA 02110-1301 USA *
* *
* This software consists of voluntary contributions made by many *
* individuals. For exact contribution history, see the revision *
* history and logs, available at http://kdesvn.alwins-world.de. *
***************************************************************************/
#ifndef SVNQT_CONFLICT_RESULT_H
#define SVNQT_CONFLICT_RESULT_H
struct svn_wc_conflict_result_t;
#include "svnqt/pool.h"
#include "svnqt/svnqt_defines.h"
#include <svn_types.h>
#include <qstring.h>
namespace svn {
class SVNQT_EXPORT ConflictResult
{
public:
enum ConflictChoice {
//! let user make a call to resolve
ChoosePostpone,
ChooseBase,
ChooseTheirsFull,
ChooseMineFull,
ChooseTheirsConflict,
ChooseMineConflict,
ChooseMerged
};
ConflictResult();
//! Copy constructor
/*! only useful wenn build with subversion 1.5 or newer
*/
ConflictResult(const svn_wc_conflict_result_t*);
const QString& mergedFile()const
{
return m_MergedFile;
}
void setMergedFile(const QString&aMergedfile);
ConflictChoice choice()const
{
return m_choice;
}
void setChoice(ConflictChoice aValue);
const svn_wc_conflict_result_t*result(const Pool&pool)const;
void assignResult(svn_wc_conflict_result_t**aResult,const Pool&pool)const;
protected:
ConflictChoice m_choice;
//! Merged file
/*! will only used if m_choice is ChooseMerged
*/
QString m_MergedFile;
};
}
#endif
|