diff options
| author | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-10 10:36:59 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@theqtcompany.com> | 2015-06-10 12:59:53 +0000 |
| commit | ccbc7f9ec1ce205b6a0574200bc8d71c912a9881 (patch) | |
| tree | f4f00872cf9555870db6aad75b342651822cf42e /src/plugins/diffeditor/diffeditorplugin.cpp | |
| parent | 0996cf0e9ebcb4492d3cbf21e8d154512827b251 (diff) | |
| download | qt-creator-ccbc7f9ec1ce205b6a0574200bc8d71c912a9881.tar.gz | |
DiffEditor: Silence warning about unused variable.
Change-Id: I18a6dd021bb29ca5eaa7727213c80458d903ee6c
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
Diffstat (limited to 'src/plugins/diffeditor/diffeditorplugin.cpp')
| -rw-r--r-- | src/plugins/diffeditor/diffeditorplugin.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/plugins/diffeditor/diffeditorplugin.cpp b/src/plugins/diffeditor/diffeditorplugin.cpp index 2a69205e43..7915ebaad4 100644 --- a/src/plugins/diffeditor/diffeditorplugin.cpp +++ b/src/plugins/diffeditor/diffeditorplugin.cpp @@ -175,9 +175,8 @@ void DiffEditorPlugin::diff() if (!document) return; - DiffEditorController *controller = DiffEditorController::controller(document); - if (!controller) - controller = new FileDiffController(document, fileName1, fileName2); + if (!DiffEditorController::controller(document)) + new FileDiffController(document, fileName1, fileName2); Core::EditorManager::activateEditorForDocument(document); document->reload(); } |