From fabb53c7286334e5c098938729c60aa016e6dfe5 Mon Sep 17 00:00:00 2001 From: Tasuku Suzuki Date: Tue, 17 Jan 2023 00:11:43 +0900 Subject: [PATCH] VCS: Clean up code for vcs toolbar It has been hidden since 5d316a49195c02887673c06302c58d20c6b670b5 Change-Id: Id6808dc5546bb5cf500032b4b03ab3fc06c14501 Reviewed-by: Orgad Shaneh --- src/plugins/vcsbase/vcsbasesubmiteditor.cpp | 35 --------------------- src/plugins/vcsbase/vcsbasesubmiteditor.h | 2 +- 2 files changed, 1 insertion(+), 36 deletions(-) diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp index e58bebbfdb6..5a64289b1da 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.cpp +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.cpp @@ -54,7 +54,6 @@ #include enum { debug = 0 }; -enum { wantToolBar = 0 }; // Return true if word is meaningful and can be added to a completion model static bool acceptsWordForCompletion(const QString &word) @@ -115,7 +114,6 @@ public: VcsBaseSubmitEditor *q); SubmitEditorWidget *m_widget; - QToolBar *m_toolWidget = nullptr; VcsBaseSubmitEditorParameters m_parameters; QString m_displayName; FilePath m_checkScriptWorkingDirectory; @@ -224,7 +222,6 @@ void VcsBaseSubmitEditor::setParameters(const VcsBaseSubmitEditorParameters &par VcsBaseSubmitEditor::~VcsBaseSubmitEditor() { - delete d->m_toolWidget; delete d->m_widget; delete d; } @@ -338,38 +335,6 @@ void VcsBaseSubmitEditor::setCheckScriptWorkingDirectory(const FilePath &s) d->m_checkScriptWorkingDirectory = s; } -static QToolBar *createToolBar(const QWidget *someWidget, QAction *submitAction, QAction *diffAction) -{ - // Create - auto toolBar = new QToolBar; - toolBar->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); - const int size = someWidget->style()->pixelMetric(QStyle::PM_SmallIconSize); - toolBar->setIconSize(QSize(size, size)); - toolBar->addSeparator(); - - if (submitAction) - toolBar->addAction(submitAction); - if (diffAction) - toolBar->addAction(diffAction); - return toolBar; -} - -QWidget *VcsBaseSubmitEditor::toolBar() -{ - if (!wantToolBar) - return nullptr; - - if (d->m_toolWidget) - return d->m_toolWidget; - - if (!d->m_diffAction && !d->m_submitAction) - return nullptr; - - // Create - d->m_toolWidget = createToolBar(d->m_widget, d->m_submitAction, d->m_diffAction); - return d->m_toolWidget; -} - QStringList VcsBaseSubmitEditor::checkedFiles() const { return d->m_widget->checkedFiles(); diff --git a/src/plugins/vcsbase/vcsbasesubmiteditor.h b/src/plugins/vcsbase/vcsbasesubmiteditor.h index a0810aa6f18..38540386664 100644 --- a/src/plugins/vcsbase/vcsbasesubmiteditor.h +++ b/src/plugins/vcsbase/vcsbasesubmiteditor.h @@ -68,7 +68,7 @@ public: Core::IDocument *document() const override; - QWidget *toolBar() override; + QWidget *toolBar() override { return nullptr; } QStringList checkedFiles() const;