diff options
author | Jarek Kobus <[email protected]> | 2025-07-03 17:59:23 +0200 |
---|---|---|
committer | Jarek Kobus <[email protected]> | 2025-07-07 08:53:12 +0000 |
commit | 50a9b75efd62a928d777d1df9adeb5754ba4ba55 (patch) | |
tree | 4d52fdad74c5178c2cf3f9b02daa861e4905cf26 | |
parent | 73b2a3eb787358a32c01b0e72cef81e40544188d (diff) |
Change-Id: I01dc735993c8ce9ac5432c44857af0292914d4d9
Reviewed-by: Orgad Shaneh <[email protected]>
Reviewed-by: André Hartmann <[email protected]>
-rw-r--r-- | src/plugins/bazaar/bazaarplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/cvs/cvsplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/fossil/fossilplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/git/gitplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 4 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseplugin.cpp | 2 | ||||
-rw-r--r-- | src/plugins/vcsbase/vcsbaseplugin.h | 4 |
8 files changed, 15 insertions, 15 deletions
diff --git a/src/plugins/bazaar/bazaarplugin.cpp b/src/plugins/bazaar/bazaarplugin.cpp index 7e17a571c86..bb66176cf6e 100644 --- a/src/plugins/bazaar/bazaarplugin.cpp +++ b/src/plugins/bazaar/bazaarplugin.cpp @@ -150,7 +150,7 @@ public: } void vcsDescribe(const Utils::FilePath &source, const QString &id) final { m_client.view(source, id); } - Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const final; + Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const final; void updateActions(VcsBase::VersionControlBase::ActionState) final; bool activateCommit() final; @@ -938,7 +938,7 @@ void BazaarPluginPrivate::vcsAnnotate(const FilePath &file, int line) m_client.annotate(file.parentDir(), file.fileName(), line); } -ExecutableItem BazaarPluginPrivate::cloneTask(const InitialCheckoutData &data) const +ExecutableItem BazaarPluginPrivate::cloneTask(const CloneTaskData &data) const { Environment env = m_client.processEnvironment(data.baseDirectory); env.set("BZR_PROGRESS_BAR", "text"); diff --git a/src/plugins/cvs/cvsplugin.cpp b/src/plugins/cvs/cvsplugin.cpp index 8f89b560d06..f8a4c304342 100644 --- a/src/plugins/cvs/cvsplugin.cpp +++ b/src/plugins/cvs/cvsplugin.cpp @@ -181,7 +181,7 @@ public: QString vcsOpenText() const final; - Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const final; + Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const final; /// CvsSubmitEditor *openCVSSubmitEditor(const QString &fileName); @@ -399,7 +399,7 @@ QString CvsPluginPrivate::vcsOpenText() const return Tr::tr("&Edit"); } -ExecutableItem CvsPluginPrivate::cloneTask(const InitialCheckoutData &data) const +ExecutableItem CvsPluginPrivate::cloneTask(const CloneTaskData &data) const { if (data.localName == data.url) return errorTask(data.baseDirectory, Tr::tr("Local name can't be the same as url.")); diff --git a/src/plugins/fossil/fossilplugin.cpp b/src/plugins/fossil/fossilplugin.cpp index 99d7558005d..e950e7e2296 100644 --- a/src/plugins/fossil/fossilplugin.cpp +++ b/src/plugins/fossil/fossilplugin.cpp @@ -102,7 +102,7 @@ public: fossilClient().log(topLevel, {relativeDirectory.path()}, options); } - Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const final; + Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const final; void updateActions(VersionControlBase::ActionState) override; bool activateCommit() override; @@ -881,7 +881,7 @@ void FossilPluginPrivate::vcsDescribe(const FilePath &source, const QString &id) fossilClient().view(source, id); } -ExecutableItem FossilPluginPrivate::cloneTask(const InitialCheckoutData &data) const +ExecutableItem FossilPluginPrivate::cloneTask(const CloneTaskData &data) const { const QMap<QString, QString> options = FossilJsExtension::parseArgOptions(data.extraArgs); diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 1c472c70b6b..abdce7679a4 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -175,7 +175,7 @@ public: void vcsDescribe(const FilePath &source, const QString &id) final { gitClient().show(source, id); } QString vcsTopic(const FilePath &directory) final; - Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const final; + Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const final; void fillLinkContextMenu(QMenu *menu, const FilePath &workingDirectory, @@ -1947,7 +1947,7 @@ QString GitPluginPrivate::vcsTopic(const FilePath &directory) return topic; } -ExecutableItem GitPluginPrivate::cloneTask(const InitialCheckoutData &data) const +ExecutableItem GitPluginPrivate::cloneTask(const CloneTaskData &data) const { const CommandLine command{gitClient().vcsBinary(data.baseDirectory), {"clone", "--progress", data.extraArgs, data.url, data.localName}}; diff --git a/src/plugins/mercurial/mercurialplugin.cpp b/src/plugins/mercurial/mercurialplugin.cpp index e25b64b13eb..cf8ca1210b7 100644 --- a/src/plugins/mercurial/mercurialplugin.cpp +++ b/src/plugins/mercurial/mercurialplugin.cpp @@ -81,7 +81,7 @@ public: mercurialClient().view(source, id); } - Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const final; + Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const final; private: void updateActions(VcsBase::VersionControlBase::ActionState) final; @@ -721,7 +721,7 @@ void MercurialPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) mercurialClient().annotate(filePath.parentDir(), filePath.fileName(), line); } -ExecutableItem MercurialPluginPrivate::cloneTask(const InitialCheckoutData &data) const +ExecutableItem MercurialPluginPrivate::cloneTask(const CloneTaskData &data) const { const CommandLine command{settings().binaryPath(), {"clone", data.extraArgs, data.url, data.localName}}; diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index e317e7cab2e..ad2c6e0c07a 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -149,7 +149,7 @@ public: } void vcsDescribe(const FilePath &source, const QString &changeNr) final; - Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const final; + Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const final; bool isVcsDirectory(const Utils::FilePath &fileName) const; @@ -1067,7 +1067,7 @@ void SubversionPluginPrivate::vcsAnnotate(const FilePath &filePath, int line) vcsAnnotateHelper(filePath.parentDir(), filePath.fileName(), QString(), line); } -ExecutableItem SubversionPluginPrivate::cloneTask(const InitialCheckoutData &data) const +ExecutableItem SubversionPluginPrivate::cloneTask(const CloneTaskData &data) const { CommandLine command{settings().binaryPath()}; command << "checkout"; diff --git a/src/plugins/vcsbase/vcsbaseplugin.cpp b/src/plugins/vcsbase/vcsbaseplugin.cpp index 44570935032..ebd807f446b 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.cpp +++ b/src/plugins/vcsbase/vcsbaseplugin.cpp @@ -564,7 +564,7 @@ const VcsBasePluginState &VersionControlBase::currentState() const return m_state; } -ExecutableItem VersionControlBase::cloneTask(const InitialCheckoutData &data) const +ExecutableItem VersionControlBase::cloneTask(const CloneTaskData &data) const { return errorTask(data.baseDirectory, Tr::tr("Initial checkout task not implemented.")); } diff --git a/src/plugins/vcsbase/vcsbaseplugin.h b/src/plugins/vcsbase/vcsbaseplugin.h index 32aa2e3fe1d..5eb50946d75 100644 --- a/src/plugins/vcsbase/vcsbaseplugin.h +++ b/src/plugins/vcsbase/vcsbaseplugin.h @@ -107,7 +107,7 @@ VCSBASE_EXPORT void setSource(Core::IDocument *document, const Utils::FilePath & // Returns the source of editor contents. VCSBASE_EXPORT Utils::FilePath source(Core::IDocument *document); -class VCSBASE_EXPORT InitialCheckoutData +class VCSBASE_EXPORT CloneTaskData { public: QString url; @@ -136,7 +136,7 @@ public: * * \a extraArgs are passed on to the command being run. */ - virtual Tasking::ExecutableItem cloneTask(const InitialCheckoutData &data) const; + virtual Tasking::ExecutableItem cloneTask(const CloneTaskData &data) const; // Display name of the commit action virtual QString commitDisplayName() const; |