diff options
| author | David Schulz <david.schulz@theqtcompany.com> | 2015-06-22 09:10:13 +0200 |
|---|---|---|
| committer | David Schulz <david.schulz@theqtcompany.com> | 2015-07-02 11:26:14 +0000 |
| commit | 952e97c3442d5cf4d9189d7b817fa0baf25fe0a0 (patch) | |
| tree | f0ca17c352dde4304efe941616b4ec9410c07c1d /src/plugins/texteditor/textdocument.h | |
| parent | 33c236539267130446aded631fec7cdd6897bab7 (diff) | |
| download | qt-creator-952e97c3442d5cf4d9189d7b817fa0baf25fe0a0.tar.gz | |
TextEditor: Adding an undo step when a file gets reloaded.
Adds the opportunity to recover unsaved changes of a file
that was externally modified and reloaded inside Qt Creator.
Task-number: QTCREATORBUG-10281
Change-Id: Ifa7f61daa8a8d336508b0d9c1c300b0f77c207ea
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
Diffstat (limited to 'src/plugins/texteditor/textdocument.h')
| -rw-r--r-- | src/plugins/texteditor/textdocument.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/texteditor/textdocument.h b/src/plugins/texteditor/textdocument.h index 8bb462c035..56715d2c9f 100644 --- a/src/plugins/texteditor/textdocument.h +++ b/src/plugins/texteditor/textdocument.h @@ -149,7 +149,8 @@ protected slots: virtual void applyFontSettings(); private: - OpenResult openImpl(QString *errorString, const QString &fileName, const QString &realFileName); + OpenResult openImpl(QString *errorString, const QString &fileName, const QString &realFileName, + bool reload); void cleanWhitespace(QTextCursor &cursor, bool cleanIndentation, bool inEntireDocument); void ensureFinalNewLine(QTextCursor &cursor); |