diff options
| author | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-08-01 10:49:13 +0200 |
|---|---|---|
| committer | Jarek Kobus <jaroslaw.kobus@qt.io> | 2022-08-01 14:33:06 +0000 |
| commit | 60302debd7f571d63c52bf75a1279dca14575869 (patch) | |
| tree | 42053e0ead614d5ca395e29358fa633763650efe /src/plugins/vcsbase/vcsbaseeditor.cpp | |
| parent | 61adea0cfdd68e95970c976aebbd39f773300300 (diff) | |
| download | qt-creator-60302debd7f571d63c52bf75a1279dca14575869.tar.gz | |
Move ShellCommand into VcsBase plugin
Rename it to VcsCommand. Move also ShellCommandPage into
VcsBase plugin.
Change-Id: I335ac47e3090f2be497643ebcda0eaad2987ac81
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseeditor.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseeditor.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index ab8abed121..d22b7a274e 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -30,6 +30,7 @@ #include "diffandloghighlighter.h" #include "vcsbaseeditorconfig.h" #include "vcsbaseplugin.h" +#include "vcscommand.h" #include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/ieditorfactory.h> @@ -52,7 +53,6 @@ #include <utils/algorithm.h> #include <utils/progressindicator.h> #include <utils/qtcassert.h> -#include <utils/shellcommand.h> #include <utils/stringutils.h> #include <QAction> @@ -561,7 +561,7 @@ public: QString m_annotatePreviousRevisionTextFormat; VcsBaseEditorConfig *m_config = nullptr; QList<AbstractTextCursorHandler *> m_textCursorHandlers; - QPointer<ShellCommand> m_command; + QPointer<VcsCommand> m_command; VcsBaseEditorWidget::DescribeFunc m_describeFunc = nullptr; ProgressIndicator *m_progressIndicator = nullptr; bool m_fileLogAnnotateEnabled = false; @@ -1408,7 +1408,7 @@ VcsBaseEditorConfig *VcsBaseEditorWidget::editorConfig() const return d->m_config; } -void VcsBaseEditorWidget::setCommand(ShellCommand *command) +void VcsBaseEditorWidget::setCommand(VcsCommand *command) { if (d->m_command) { d->m_command->abort(); @@ -1418,7 +1418,7 @@ void VcsBaseEditorWidget::setCommand(ShellCommand *command) if (command) { d->m_progressIndicator = new ProgressIndicator(ProgressIndicatorSize::Large); d->m_progressIndicator->attachToWidget(this); - connect(command, &ShellCommand::finished, this, &VcsBaseEditorWidget::reportCommandFinished); + connect(command, &VcsCommand::finished, this, &VcsBaseEditorWidget::reportCommandFinished); QTimer::singleShot(100, this, &VcsBaseEditorWidget::showProgressIndicator); } } |