Murmele/Gittyup
1
1
Fork 0
mirror of https://github.com/Murmele/Gittyup.git synced 2024-09-19 06:29:10 +03:00
Code Issues Projects Releases Wiki Activity

format

Browse Source
This commit is contained in:
Martin Marmsoler 2023-01-04 07:40:42 +01:00
parent 2ed66dc966
commit 5472f79196
8 changed files with 30 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/git/Patch.cpp
View File

@ -351,8 +351,7 @@ QByteArray Patch::generateResult(QList<QList<QByteArray>> &image,
return filtered;
}
QByteArray Patch::apply(const QBitArray &hunks,
const FilterList &filters) {
QByteArray Patch::apply(const QBitArray &hunks, const FilterList &filters) {
QList<QList<QByteArray>> image;
populatePreimage(image);

4
src/ui/DiffView/EditButton.cpp
View File

@ -3,8 +3,8 @@
#include "ui/RepoView.h"
#include <QPainterPath>
EditButton::EditButton(git::Patch &patch, int index, bool binary,
bool lfs, QWidget *parent)
EditButton::EditButton(git::Patch &patch, int index, bool binary, bool lfs,
QWidget *parent)
: Button(parent) {
setObjectName("EditButton");

8
src/ui/DiffView/FileWidget.cpp
View File

@ -333,10 +333,10 @@ void _FileWidget::Header::updateCheckState() {
//############### FileWidget ###########################################
//###############################################################################
FileWidget::FileWidget(DiffView *view, const git::Diff &diff,
git::Patch &patch, const git::Patch &staged,
const QModelIndex modelIndex, const QString &name,
const QString &path, bool submodule, QWidget *parent)
FileWidget::FileWidget(DiffView *view, const git::Diff &diff, git::Patch &patch,
const git::Patch &staged, const QModelIndex modelIndex,
const QString &name, const QString &path, bool submodule,
QWidget *parent)
: QWidget(parent), mView(view), mDiff(diff), mPatch(patch),
mModelIndex(modelIndex) {
auto stageState = static_cast<git::Index::StagedState>(

11
src/ui/DiffView/HunkWidget.cpp
View File

@ -34,9 +34,8 @@ const QString noNewLineAtEndOfFile =
HunkWidget::tr("No newline at end of file");
} // namespace
_HunkWidget::Header::Header(const git::Diff &diff, git::Patch &patch,
int index, bool lfs, bool submodule,
QWidget *parent)
_HunkWidget::Header::Header(const git::Diff &diff, git::Patch &patch, int index,
bool lfs, bool submodule, QWidget *parent)
: QFrame(parent) {
setObjectName("HunkHeader");
mCheck = new QCheckBox(this);
@ -178,9 +177,9 @@ void _HunkWidget::Header::mouseDoubleClickEvent(QMouseEvent *event) {
//########## HunkWidget ###############################################
//#############################################################################
HunkWidget::HunkWidget(DiffView *view, const git::Diff &diff,
git::Patch &patch, const git::Patch &staged,
int index, bool lfs, bool submodule, QWidget *parent)
HunkWidget::HunkWidget(DiffView *view, const git::Diff &diff, git::Patch &patch,
const git::Patch &staged, int index, bool lfs,
bool submodule, QWidget *parent)
: QFrame(parent), mView(view), mPatch(patch), mStaged(staged),
mIndex(index), mLfs(lfs) {
setObjectName("HunkWidget");