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

Git: Remove diff editor

Browse Source 
Not used anymore

Change-Id: Ie1c79583938e24c3bad8acad7acc2f0574234450
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2014-06-24 09:56:49 +03:00
committed by Orgad Shaneh
parent d6583f0f47
commit c297510d93
3 changed files with 0 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/git/gitconstants.h
View File

@@ -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";

10
src/plugins/git/giteditor.cpp
View File

@@ -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;
}

5
src/plugins/git/gitplugin.cpp
View File

@@ -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,