feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Vcs: Merge IVersionControl and VcsBasePlugin hierarchies

Browse Source 
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>
This commit is contained in:
hjk
2020-01-30 12:31:47 +01:00
parent a35a2d6bf3
commit b8fe25db25
58 changed files with 1091 additions and 1902 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/mergetool.cpp
View File

@@ -26,7 +26,6 @@
#include "mergetool.h"
#include "gitclient.h"
#include "gitplugin.h"
#include "gitversioncontrol.h"
#include <coreplugin/documentmanager.h>
#include <coreplugin/icore.h>
@@ -265,7 +264,7 @@ void MergeTool::done()
.arg(exitCode));
}
GitPluginPrivate::client()->continueCommandIfNeeded(workingDirectory, exitCode == 0);
GitPluginPrivate::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
GitPluginPrivate::instance()->emitRepositoryChanged(workingDirectory);
deleteLater();
}