diff options
| author | hjk <hjk@qt.io> | 2020-01-30 12:31:47 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-01-31 12:36:23 +0000 |
| commit | b8fe25db258da13a2f7a4e44fcf8845a512af6bf (patch) | |
| tree | b5692e17963cc05ca437198b969889d3d78a7b4a /src/plugins/git/gerrit/gerritplugin.cpp | |
| parent | a35a2d6bf3f9525c6ba3cead820c13046c0e70b5 (diff) | |
| download | qt-creator-b8fe25db258da13a2f7a4e44fcf8845a512af6bf.tar.gz | |
Vcs: Merge IVersionControl and VcsBasePlugin hierarchies
They were 1:1 in parallel, with quite a bit of function call
ping-pong inbetween, for code-sharing-by-inheritance. Merge
them by making VcsBasePlugin inherit IVersionControl and
merge the derived classes below.
Size of this patch is hard to avoid as all seven systems have to
move simultaneously. Non-necessary potential follow-up cleanup
have been left out on purpose.
Change-Id: Icb71e4182af3db21069cc637e7ae87ffa3829791
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/git/gerrit/gerritplugin.cpp')
| -rw-r--r-- | src/plugins/git/gerrit/gerritplugin.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index d3fe5e0d4b..598a6fb75d 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -32,7 +32,6 @@ #include "../gitplugin.h" #include "../gitclient.h" -#include "../gitversioncontrol.h" #include "../gitconstants.h" #include <vcsbase/vcsbaseconstants.h> #include <vcsbase/vcsbaseeditor.h> @@ -473,7 +472,7 @@ void GerritPlugin::fetch(const QSharedPointer<GerritChange> &change, int mode) // Try to find a matching repository for a project by asking the VcsManager. QString GerritPlugin::findLocalRepository(QString project, const QString &branch) const { - const QStringList gitRepositories = VcsManager::repositories(GitPluginPrivate::instance()->gitVersionControl()); + const QStringList gitRepositories = VcsManager::repositories(GitPluginPrivate::instance()); // Determine key (file name) to look for (qt/qtbase->'qtbase'). const int slashPos = project.lastIndexOf('/'); if (slashPos != -1) |