diff options
| author | Al <gabriel.cortesi@outlook.com> | 2019-05-29 14:34:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-29 14:34:24 +0200 |
| commit | 41f8da011d1df7a368e3fb73f972cee1f4efd0c0 (patch) | |
| tree | 0f8ca16fd068efb54a0cb20a68ddeee43db0cb71 /src/organizercore.h | |
| parent | 1e3a10c8b22ac1362b1455de6f9d9f8ba739883b (diff) | |
| parent | ee92fa9fc89ab047a63716c48e13d3d0a76af4fb (diff) | |
Merge pull request #739 from isanae/hide-conflict-items
Share context menu between conflict lists
Diffstat (limited to 'src/organizercore.h')
| -rw-r--r-- | src/organizercore.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/organizercore.h b/src/organizercore.h index e24227b7..8ed34e24 100644 --- a/src/organizercore.h +++ b/src/organizercore.h @@ -152,7 +152,7 @@ public: QFileInfo &binaryInfo, QString &arguments, FileExecutionTypes& type);
bool executeFileVirtualized(QWidget* parent, const QFileInfo& targetInfo);
- bool previewFileWithAlternatives(QWidget* parent, QString filename);
+ bool previewFileWithAlternatives(QWidget* parent, QString filename, int selectedOrigin=-1);
bool previewFile(QWidget* parent, const QString& originName, const QString& path);
void spawnBinary(const QFileInfo &binary, const QString &arguments = "",
|