diff options
| author | Jarek Kobus <jaroslaw.kobus@theqtcompany.com> | 2016-10-05 17:37:00 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2016-10-21 09:20:20 +0000 |
| commit | 14148261832186e30f264a14a6d76a92bb0e2f7f (patch) | |
| tree | 303ee36f14cc98a1f5c29ac61fb601957b7743fa /src/libs/utils/reloadpromptutils.h | |
| parent | 72e19c4886066cd71cb075af0efde8f701fcfb24 (diff) | |
Implement diff on close, on revert and on external modification
Task-number: QTCREATORBUG-1531
Change-Id: I8c9a740d66eb7836b3df6850ac243260fd282b32
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src/libs/utils/reloadpromptutils.h')
| -rw-r--r-- | src/libs/utils/reloadpromptutils.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/libs/utils/reloadpromptutils.h b/src/libs/utils/reloadpromptutils.h index b01bd25b53..8991d52b59 100644 --- a/src/libs/utils/reloadpromptutils.h +++ b/src/libs/utils/reloadpromptutils.h @@ -40,15 +40,19 @@ enum ReloadPromptAnswer { ReloadAll, ReloadSkipCurrent, ReloadNone, + ReloadNoneAndDiff, CloseCurrent }; QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const FileName &fileName, bool modified, + bool enableDiffOption, QWidget *parent); QTCREATOR_UTILS_EXPORT ReloadPromptAnswer reloadPrompt(const QString &title, const QString &prompt, - const QString &details, QWidget *parent); + const QString &details, + bool enableDiffOption, + QWidget *parent); enum FileDeletedPromptAnswer { FileDeletedClose, |