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

12
src/plugins/vcsbase/vcsbaseplugin.h
View File

@@ -154,20 +154,17 @@ VCSBASE_EXPORT Utils::SynchronousProcessResponse runVcs(const QString &workingDi
QTextCodec *outputCodec = nullptr,
const QProcessEnvironment &env = {});
class VCSBASE_EXPORT VcsBasePluginPrivate : public QObject
class VCSBASE_EXPORT VcsBasePluginPrivate : public Core::IVersionControl
{
Q_OBJECT
protected:
explicit VcsBasePluginPrivate();
explicit VcsBasePluginPrivate(const Core::Context &context);
public:
~VcsBasePluginPrivate() override;
void extensionsInitialized();
const VcsBasePluginState &currentState() const;
Core::IVersionControl *versionControl() const;
// Display name of the commit action
virtual QString commitDisplayName() const;
@@ -209,16 +206,13 @@ protected:
// Returns whether actions should be set up further.
bool enableMenuAction(ActionState as, QAction *in) const;
void initializeVcs(Core::IVersionControl *vc, const Core::Context &context);
private:
void slotSubmitEditorAboutToClose(VcsBaseSubmitEditor *submitEditor, bool *result);
void slotStateChanged(const VcsBase::Internal::State &s, Core::IVersionControl *vc);
void slotStateChanged(const Internal::State &s, Core::IVersionControl *vc);
bool supportsRepositoryCreation() const;
QPointer<VcsBaseSubmitEditor> m_submitEditor;
QPointer<Core::IVersionControl> m_versionControl;
Core::Context m_context;
VcsBasePluginState m_state;
int m_actionState = -1;