blob: 75e083895ad6a0a844454b061a044c944b8564b5 (
plain)
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
|
/*
This file is part of KitchenSync.
Copyright (c) 2005 Tobias Koenig <tokoe@kde.org>
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 SINGLECONFLICTDIALOG_H
#define SINGLECONFLICTDIALOG_H
#include "conflictdialog.h"
#include <libkdepim/diffalgo.h>
using namespace KPIM;
namespace KSync {
class HTMLDiffAlgoDisplay;
}
class SingleConflictDialog : public ConflictDialog
{
Q_OBJECT
public:
SingleConflictDialog( QSync::SyncMapping &mapping, QWidget *parent );
~SingleConflictDialog();
private slots:
void useFirstChange();
void useSecondChange();
void duplicateChange();
void ignoreChange();
private:
void initGUI();
DiffAlgo *mDiffAlgo;
KSync::HTMLDiffAlgoDisplay *mDiffAlgoDisplay;
};
#endif
|
