Merge remote-tracking branch 'origin/4.5'

Change-Id: I73f235d00d1f2cb0c0d8d55dc69f77c96aa0e8e9

5 files changed, 12 insertions, 34 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.
diff --git a/plugins/fossil/fossileditor.cpp b/plugins/fossil/fossileditor.cpp
index 2c36f3b..e24912b 100644
--- a/plugins/fossil/fossileditor.cpp
+++ b/plugins/fossil/fossileditor.cpp
@@ -51,8 +51,7 @@ public:
     FossilEditorWidgetPrivate() :
         m_exactChangesetId(Constants::CHANGESET_ID_EXACT),
         m_firstChangesetId(QString("\n") + Constants::CHANGESET_ID + " "),
-        m_nextChangesetId(m_firstChangesetId),
-        m_configurationWidget(nullptr)
+        m_nextChangesetId(m_firstChangesetId)
     {
         QTC_ASSERT(m_exactChangesetId.isValid(), return);
         QTC_ASSERT(m_firstChangesetId.isValid(), return);
@@ -63,8 +62,6 @@ public:
     const QRegularExpression m_exactChangesetId;
     const QRegularExpression m_firstChangesetId;
     const QRegularExpression m_nextChangesetId;
-
-    VcsBase::VcsBaseEditorConfig *m_configurationWidget;
 };
 
 FossilEditorWidget::FossilEditorWidget() :
@@ -87,21 +84,6 @@ FossilEditorWidget::~FossilEditorWidget()
     delete d;
 }
 
-bool FossilEditorWidget::setConfigurationWidget(VcsBase::VcsBaseEditorConfig *w)
-{
-    if (configurationAdded())
-        return false;
-
-    d->m_configurationWidget = w;
-    setConfigurationAdded();
-    return true;
-}
-
-VcsBase::VcsBaseEditorConfig *FossilEditorWidget::configurationWidget() const
-{
-    return d->m_configurationWidget;
-}
-
 QSet<QString> FossilEditorWidget::annotationChanges() const
 {
 
diff --git a/plugins/fossil/fossileditor.h b/plugins/fossil/fossileditor.h
index e9adc35..067b103 100644
--- a/plugins/fossil/fossileditor.h
+++ b/plugins/fossil/fossileditor.h
@@ -40,9 +40,6 @@ public:
     FossilEditorWidget();
     ~FossilEditorWidget() final;
 
-    bool setConfigurationWidget(VcsBase::VcsBaseEditorConfig *w);
-    VcsBase::VcsBaseEditorConfig *configurationWidget() const;
-
 private:
     QSet<QString> annotationChanges() const final;
     QString changeUnderCursor(const QTextCursor &cursor) const final;
diff --git a/plugins/fossil/fossilplugin.cpp b/plugins/fossil/fossilplugin.cpp
index 55034fa..e795267 100644
--- a/plugins/fossil/fossilplugin.cpp
+++ b/plugins/fossil/fossilplugin.cpp
@@ -125,8 +125,7 @@ bool FossilPlugin::initialize(const QStringList &arguments, QString *errorMessag
     Core::Context context(Constants::FOSSIL_CONTEXT);
 
     m_client = new FossilClient;
-    auto vcsCtrl = new FossilControl(m_client);
-    initializeVcs(vcsCtrl, context);
+    auto vcsCtrl = initializeVcs<FossilControl>(context, m_client);
     connect(m_client, &VcsBase::VcsBaseClient::changed, vcsCtrl, &FossilControl::changed);
 
     addAutoReleasedObject(new OptionsPage(vcsCtrl));
diff --git a/plugins/fossil/fossilplugin.h b/plugins/fossil/fossilplugin.h
index da48d24..e3bd1e0 100644
--- a/plugins/fossil/fossilplugin.h
+++ b/plugins/fossil/fossilplugin.h
@@ -59,7 +59,7 @@ class FossilPlugin : public VcsBase::VcsBasePlugin
 public:
     FossilPlugin();
     ~FossilPlugin();
-    bool initialize(const QStringList &arguments, QString *errorMessage);
+    bool initialize(const QStringList &arguments, QString *errorMessage) override;
 
     static FossilPlugin *instance();
     FossilClient *client() const;