blob: caf4f2286742ce93fae408932add8fcc138b531e (
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
55
56
57
58
59
60
61
62
63
|
/*
* Copyright (C) by Kevin Ottens <kevin.ottens@nextcloud.com>
*
* 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.
*/
#ifndef CONFLICTSOLVER_H
#define CONFLICTSOLVER_H
#include <QObject>
class QWidget;
namespace OCC {
class ConflictSolver : public QObject
{
Q_OBJECT
Q_PROPERTY(QString localVersionFilename READ localVersionFilename WRITE setLocalVersionFilename NOTIFY localVersionFilenameChanged)
Q_PROPERTY(QString remoteVersionFilename READ remoteVersionFilename WRITE setRemoteVersionFilename NOTIFY remoteVersionFilenameChanged)
public:
enum Solution {
KeepLocalVersion,
KeepRemoteVersion,
KeepBothVersions
};
explicit ConflictSolver(QWidget *parent = nullptr);
QString localVersionFilename() const;
QString remoteVersionFilename() const;
bool exec(Solution solution);
public slots:
void setLocalVersionFilename(const QString &localVersionFilename);
void setRemoteVersionFilename(const QString &remoteVersionFilename);
signals:
void localVersionFilenameChanged();
void remoteVersionFilenameChanged();
private:
bool deleteLocalVersion();
bool renameLocalVersion();
bool overwriteRemoteVersion();
QWidget *_parentWidget;
QString _localVersionFilename;
QString _remoteVersionFilename;
};
} // namespace OCC
#endif // CONFLICTSOLVER_H
|
