summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorjkobus <jaroslaw.kobus@digia.com>2014-02-11 13:00:35 +0100
committerJarek Kobus <jaroslaw.kobus@digia.com>2014-02-18 13:46:49 +0100
commit73cf43f32370d8986b4c06511b95771582cc421d (patch)
tree1506c433ca50511420c0332b2b9f432a180ccbb3 /src/plugins/git/gitclient.h
parent84e8a79c814dc6e788cad9643d0e225c7a92e76d (diff)
downloadqt-creator-73cf43f32370d8986b4c06511b95771582cc421d.tar.gz
Add DiffEditorManager, refactoring.
GitDiffSwitcher operates now on IDocument. GitDiffHandler operates now on DiffEditorController. "source" property now attached to editor's document (VcsBasePlugin). Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h14
1 files changed, 4 insertions, 10 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 4d6a575031..5ca5424225 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -56,11 +56,9 @@ namespace VcsBase {
class VcsBaseEditorParameterWidget;
}
-namespace Utils {
- struct SynchronousProcessResponse;
-}
+namespace Utils { struct SynchronousProcessResponse; }
-namespace DiffEditor { class DiffEditor; }
+namespace DiffEditor { class DiffEditorDocument; }
namespace Git {
namespace Internal {
@@ -351,8 +349,6 @@ private:
QTextCodec *getSourceCodec(const QString &file) const;
VcsBase::VcsBaseEditorWidget *findExistingVCSEditor(const char *registerDynamicProperty,
const QString &dynamicPropertyValue) const;
- DiffEditor::DiffEditor *findExistingDiffEditor(const char *registerDynamicProperty,
- const QString &dynamicPropertyValue) const;
enum CodecType { CodecSource, CodecLogOutput, CodecNone };
VcsBase::VcsBaseEditorWidget *createVcsEditor(const Core::Id &kind,
@@ -362,11 +358,9 @@ private:
const char *registerDynamicProperty,
const QString &dynamicPropertyValue,
VcsBase::VcsBaseEditorParameterWidget *configWidget) const;
- DiffEditor::DiffEditor *createDiffEditor(const char *registerDynamicProperty,
- const QString &dynamicPropertyValue,
+ DiffEditor::DiffEditorDocument *createDiffEditor(const QString documentId,
const QString &source,
- const QString &titlePattern,
- const Core::Id editorId) const;
+ const QString &title) const;
VcsBase::Command *createCommand(const QString &workingDirectory,
VcsBase::VcsBaseEditorWidget* editor = 0,