diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2018-02-14 12:05:55 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2018-02-16 08:32:05 +0000 |
| commit | 3060ddbcf30ebacdafa5a6be02634485944e38a9 (patch) | |
| tree | 55e6a3bb5b5b83340cedf0fb37009fce07fc7bac /src/plugins/fakevim | |
| parent | 64233a4fae6de690a3e4ec1ffd7a85496cdea644 (diff) | |
Document model: Use optional for "indexOf" kind of methods
Change-Id: Iaffbb0b695f96b5b44c9fd0df63891c2797181b7
Reviewed-by: David Schulz <david.schulz@qt.io>
Diffstat (limited to 'src/plugins/fakevim')
| -rw-r--r-- | src/plugins/fakevim/fakevimplugin.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/plugins/fakevim/fakevimplugin.cpp b/src/plugins/fakevim/fakevimplugin.cpp index d8c92a13ebb..04c6e9e0ab0 100644 --- a/src/plugins/fakevim/fakevimplugin.cpp +++ b/src/plugins/fakevim/fakevimplugin.cpp @@ -73,6 +73,7 @@ #include <utils/hostosinfo.h> #include <utils/qtcassert.h> #include <utils/pathchooser.h> +#include <utils/qtcassert.h> #include <utils/savedaction.h> #include <utils/stylehelper.h> @@ -2209,9 +2210,12 @@ void FakeVimPluginPrivate::highlightMatches(FakeVimHandler *, const QString &nee int FakeVimPluginPrivate::currentFile() const { IEditor *editor = EditorManager::currentEditor(); - if (!editor) - return -1; - return DocumentModel::indexOfDocument(editor->document()); + if (editor) { + const Utils::optional<int> index = DocumentModel::indexOfDocument(editor->document()); + if (QTC_GUARD(index)) + return index.value(); + } + return -1; } void FakeVimPluginPrivate::switchToFile(int n) |