From c297510d93cfa49e3b6d85243c019856fc11f938 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 24 Jun 2014 09:56:49 +0300 Subject: [PATCH] Git: Remove diff editor Not used anymore Change-Id: Ie1c79583938e24c3bad8acad7acc2f0574234450 Reviewed-by: Tobias Hunger --- src/plugins/git/gitconstants.h | 3 --- src/plugins/git/giteditor.cpp | 10 ---------- src/plugins/git/gitplugin.cpp | 5 ----- 3 files changed, 18 deletions(-) diff --git a/src/plugins/git/gitconstants.h b/src/plugins/git/gitconstants.h index 057ad1a5f52..6f6b53a31f8 100644 --- a/src/plugins/git/gitconstants.h +++ b/src/plugins/git/gitconstants.h @@ -44,9 +44,6 @@ const char C_GIT_LOG_EDITOR[] = "Git File Log Editor"; const char GIT_BLAME_EDITOR_ID[] = "Git Annotation Editor"; const char GIT_BLAME_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Annotation Editor"); const char C_GIT_BLAME_EDITOR[] = "Git Annotation Editor"; -const char GIT_DIFF_EDITOR_ID[] = "Git Diff Editor"; -const char GIT_DIFF_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Diff Editor"); -const char C_GIT_DIFF_EDITOR[] = "Git Diff Editor"; const char GIT_COMMIT_TEXT_EDITOR_ID[] = "Git Commit Editor"; const char GIT_COMMIT_TEXT_EDITOR_DISPLAY_NAME[] = QT_TRANSLATE_NOOP("VCS", "Git Commit Editor"); const char C_GIT_COMMIT_TEXT_EDITOR[] = "Git Commit Editor"; diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp index d281ad9e481..468c5412381 100644 --- a/src/plugins/git/giteditor.cpp +++ b/src/plugins/git/giteditor.cpp @@ -187,16 +187,6 @@ void GitEditor::setPlainTextFiltered(const QString &text) modText = removeAnnotationDate(text); break; } - case VcsBase::DiffOutput: { - if (modText.isEmpty()) { - modText = QLatin1String("No difference to HEAD"); - } else { - const QFileInfo fi(source()); - const QString workingDirectory = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath(); - modText = plugin->gitClient()->extendedShowDescription(workingDirectory, modText); - } - break; - } default: break; } diff --git a/src/plugins/git/gitplugin.cpp b/src/plugins/git/gitplugin.cpp index 668c06d9103..d93c9ecd813 100644 --- a/src/plugins/git/gitplugin.cpp +++ b/src/plugins/git/gitplugin.cpp @@ -103,11 +103,6 @@ static const VcsBase::VcsBaseEditorParameters editorParameters[] = { Git::Constants::GIT_BLAME_EDITOR_DISPLAY_NAME, Git::Constants::C_GIT_BLAME_EDITOR, "text/vnd.qtcreator.git.annotation"}, -{ VcsBase::DiffOutput, - Git::Constants::GIT_DIFF_EDITOR_ID, - Git::Constants::GIT_DIFF_EDITOR_DISPLAY_NAME, - Git::Constants::C_GIT_DIFF_EDITOR, - "text/x-patch"}, { VcsBase::OtherContent, Git::Constants::GIT_COMMIT_TEXT_EDITOR_ID, Git::Constants::GIT_COMMIT_TEXT_EDITOR_DISPLAY_NAME,