diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2017-10-06 11:07:53 +0200 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2017-10-06 11:40:40 +0000 |
| commit | bf3f576c4a3c75a60cb2c6b575b41d58374db260 (patch) | |
| tree | 3730eab79aba49794653672a0e3bbf86e9805ac6 /plugins/fossil/fossilclient.cpp | |
| parent | 972a2385833e4f2ce1163cfd16d316ee514ddb17 (diff) | |
Adapt to changes in VcsBase4.4
The VCS editors now directly keep a pointer to their editor config.
Changed in qt-creator/a36536813f9aa00944fd8fcab2e2689a385d5387
Change-Id: Icd1c8b0628677b3b6da305ca294b2d67810c7992
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'plugins/fossil/fossilclient.cpp')
| -rw-r--r-- | plugins/fossil/fossilclient.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/plugins/fossil/fossilclient.cpp b/plugins/fossil/fossilclient.cpp index 584fc81..8d2c5d8 100644 --- a/plugins/fossil/fossilclient.cpp +++ b/plugins/fossil/fossilclient.cpp @@ -744,7 +744,7 @@ VcsBase::VcsBaseEditorWidget *FossilClient::annotate( auto *fossilEditor = qobject_cast<FossilEditorWidget *>(editor); QTC_ASSERT(fossilEditor, return editor); - if (!fossilEditor->configurationAdded()) { + if (!fossilEditor->editorConfig()) { if (VcsBase::VcsBaseEditorConfig *editorConfig = createAnnotateEditor(fossilEditor)) { editorConfig->setBaseArguments(extraOptions); // editor has been just created, createVcsEditor() didn't set a configuration widget yet @@ -753,11 +753,11 @@ VcsBase::VcsBaseEditorWidget *FossilClient::annotate( const int line = VcsBase::VcsBaseEditor::lineNumberOfCurrentEditor(); return this->annotate(workingDir, file, revision, line, editorConfig->arguments()); } ); - fossilEditor->setConfigurationWidget(editorConfig); + fossilEditor->setEditorConfig(editorConfig); } } QStringList effectiveArgs = extraOptions; - if (VcsBase::VcsBaseEditorConfig *editorConfig = fossilEditor->configurationWidget()) + if (VcsBase::VcsBaseEditorConfig *editorConfig = fossilEditor->editorConfig()) effectiveArgs = editorConfig->arguments(); VcsBase::VcsCommand *cmd = createCommand(workingDir, fossilEditor); @@ -960,17 +960,17 @@ void FossilClient::log(const QString &workingDir, const QStringList &files, fossilEditor->setFileLogAnnotateEnabled(enableAnnotationContextMenu); - if (!fossilEditor->configurationAdded()) { + if (!fossilEditor->editorConfig()) { if (VcsBase::VcsBaseEditorConfig *editorConfig = createLogEditor(fossilEditor)) { editorConfig->setBaseArguments(extraOptions); // editor has been just created, createVcsEditor() didn't set a configuration widget yet connect(editorConfig, &VcsBase::VcsBaseEditorConfig::commandExecutionRequested, [=]() { this->log(workingDir, files, editorConfig->arguments(), enableAnnotationContextMenu); } ); - fossilEditor->setConfigurationWidget(editorConfig); + fossilEditor->setEditorConfig(editorConfig); } } QStringList effectiveArgs = extraOptions; - if (VcsBase::VcsBaseEditorConfig *editorConfig = fossilEditor->configurationWidget()) + if (VcsBase::VcsBaseEditorConfig *editorConfig = fossilEditor->editorConfig()) effectiveArgs = editorConfig->arguments(); //@TODO: move highlighter and widgets to fossil editor sources. @@ -1012,17 +1012,17 @@ void FossilClient::logCurrentFile(const QString &workingDir, const QStringList & fossilEditor->setFileLogAnnotateEnabled(enableAnnotationContextMenu); - if (!fossilEditor->configurationAdded()) { + if (!fossilEditor->editorConfig()) { if (VcsBase::VcsBaseEditorConfig *editorConfig = createLogEditor(fossilEditor)) { editorConfig->setBaseArguments(extraOptions); // editor has been just created, createVcsEditor() didn't set a configuration widget yet connect(editorConfig, &VcsBase::VcsBaseEditorConfig::commandExecutionRequested, [=]() { this->logCurrentFile(workingDir, files, editorConfig->arguments(), enableAnnotationContextMenu); } ); - fossilEditor->setConfigurationWidget(editorConfig); + fossilEditor->setEditorConfig(editorConfig); } } QStringList effectiveArgs = extraOptions; - if (VcsBase::VcsBaseEditorConfig *editorConfig = fossilEditor->configurationWidget()) + if (VcsBase::VcsBaseEditorConfig *editorConfig = fossilEditor->editorConfig()) effectiveArgs = editorConfig->arguments(); //@TODO: move highlighter and widgets to fossil editor sources. |