mirror of
https://github.com/nextcloud/desktop.git
synced 2024-12-19 12:22:16 +03:00
565a5f0999
ran run-clang-tidy-14.py -header-filter='.*' -checks='-*,modernize-use-nodiscard' -fix under linux with most part of our code covered Signed-off-by: Matthieu Gallien <matthieu.gallien@nextcloud.com>
63 lines
1.8 KiB
C++
63 lines
1.8 KiB
C++
/*
|
|
* 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);
|
|
|
|
[[nodiscard]] QString localVersionFilename() const;
|
|
[[nodiscard]] 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
|