diff options
author | Tobias Hunger <[email protected]> | 2015-03-27 16:08:52 +0100 |
---|---|---|
committer | Tobias Hunger <[email protected]> | 2015-04-13 09:08:35 +0000 |
commit | e7616f8769514b39cde4be8907adb0530a75267f (patch) | |
tree | bc30ddc7d2ac9b538f0860a14076c2037dd0d292 /src/plugins/git/gitclient.h | |
parent | 11590a8c5f3a64af8997c8b832bfc274d17fb3f1 (diff) |
Vcs: Move createVcsEditor into VcsBaseClientImpl
... and use that in Git as well.
Change-Id: I81c85fcf5a7da7e9f756f117ea6c38c15294a401
Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r-- | src/plugins/git/gitclient.h | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h index efc2127f061..8a2bb35bf91 100644 --- a/src/plugins/git/gitclient.h +++ b/src/plugins/git/gitclient.h @@ -349,8 +349,6 @@ public slots: const QString &name = QString()); private slots: - void slotBlameRevisionRequested(const QString &workingDirectory, const QString &file, - QString change, int lineNumber); void finishSubmoduleUpdate(); void fetchFinished(const QVariant &cookie); void slotChunkActionsRequested(QMenu *menu, bool isValid); @@ -359,19 +357,15 @@ private slots: void branchesForCommit(const QString &revision); private: + void annotateRevisionRequested(const QString &workingDirectory, const QString &file, + const QString &change, int lineNumber) override; + void stage(const QString &patch, bool revert); - QTextCodec *getSourceCodec(const QString &file) const; VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const; enum CodecType { CodecSource, CodecLogOutput, CodecNone }; - - VcsBase::VcsBaseEditorWidget *createVcsEditor(Core::Id kind, - QString title, - const QString &source, - CodecType codecType, - const char *registerDynamicProperty, - const QString &dynamicPropertyValue) const; + QTextCodec *codecFor(CodecType codecType, const QString &source = QString()) const; void requestReload(const QString &documentId, const QString &source, const QString &title, std::function<DiffEditor::DiffEditorController *(Core::IDocument *)> factory) const; |