diff options
author | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-04 15:21:02 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@theqtcompany.com> | 2015-06-10 15:32:55 +0000 |
commit | fef9d7ff94ec497016d7a7120f8b60fde65ce8bf (patch) | |
tree | 4e16765dfc78d9ebb101d1b745acdcd3c8d64352 /src/plugins/imageviewer/imageviewerfile.h | |
parent | be0aa40520d8a133b1f975de8750b5b8e25da2be (diff) |
Editor manager: Abort with a single message if file is not readable.
We show a dialog that offers opening a file in a different editor type
if opening a file fails, but we should not do that if opening the file
fails because it is not readable.
With this change, documents now specify if they failed to open a file
because reading failed, or because they could not handle the file
contents.
Task-number: QTCREATORBUG-14495
Change-Id: I5d4b7cfa74b87ef21b9b55bc30b3ebe2f8238dfa
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Diffstat (limited to 'src/plugins/imageviewer/imageviewerfile.h')
-rw-r--r-- | src/plugins/imageviewer/imageviewerfile.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/imageviewer/imageviewerfile.h b/src/plugins/imageviewer/imageviewerfile.h index fc0eee268ed..2e71b87173c 100644 --- a/src/plugins/imageviewer/imageviewerfile.h +++ b/src/plugins/imageviewer/imageviewerfile.h @@ -65,7 +65,7 @@ public: ImageViewerFile(); ~ImageViewerFile(); - bool open(QString *errorString, const QString &fileName, const QString &realFileName); + OpenResult open(QString *errorString, const QString &fileName, const QString &realFileName); bool save(QString *errorString, const QString &fileName, bool autoSave); bool setContents(const QByteArray &contents); @@ -93,7 +93,7 @@ signals: private: void cleanUp(); - bool openImpl(QString *errorString, const QString &fileName); + OpenResult openImpl(QString *errorString, const QString &fileName); ImageType m_type = TypeInvalid; #ifndef QT_NO_SVG |