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

VCS: Un-data functions that accept QString

Browse Source 
Change-Id: Iffa82f4ab06162ab57e77301e77fb37ed7230bd5
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-07-30 20:16:56 +03:00
committed by Orgad Shaneh
parent 706d0a821e
commit 6b8c93637b
9 changed files with 32 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -170,9 +170,9 @@ static QString removeAnnotationDate(const QString &b)
return result;
}
void GitEditor::setPlainTextDataFiltered(const QString &a)
void GitEditor::setPlainTextFiltered(const QString &text)
{
QString array = a;
QString modText = text;
GitPlugin *plugin = GitPlugin::instance();
// If desired, filter out the date from annotation
switch (contentType())
@@ -180,22 +180,22 @@ void GitEditor::setPlainTextDataFiltered(const QString &a)
case VcsBase::AnnotateOutput: {
const bool omitAnnotationDate = plugin->settings().boolValue(GitSettings::omitAnnotationDateKey);
if (omitAnnotationDate)
array = removeAnnotationDate(a);
modText = removeAnnotationDate(text);
break;
}
case VcsBase::DiffOutput: {
if (array.isEmpty())
array = QLatin1String("No difference to HEAD");
if (modText.isEmpty())
modText = QLatin1String("No difference to HEAD");
const QFileInfo fi(source());
const QString workingDirectory = fi.isDir() ? fi.absoluteFilePath() : fi.absolutePath();
QString precedes, follows;
if (array.startsWith(QLatin1String("commit "))) { // show
int lastHeaderLine = array.indexOf(QLatin1String("\n\n")) + 1;
plugin->gitClient()->synchronousTagsForCommit(workingDirectory, array.mid(7, 8), precedes, follows);
if (modText.startsWith(QLatin1String("commit "))) { // show
int lastHeaderLine = modText.indexOf(QLatin1String("\n\n")) + 1;
plugin->gitClient()->synchronousTagsForCommit(workingDirectory, modText.mid(7, 8), precedes, follows);
if (!precedes.isEmpty())
array.insert(lastHeaderLine, QLatin1String("Precedes: ") + precedes + QLatin1Char('\n'));
modText.insert(lastHeaderLine, QLatin1String("Precedes: ") + precedes + QLatin1Char('\n'));
if (!follows.isEmpty())
array.insert(lastHeaderLine, QLatin1String("Follows: ") + follows + QLatin1Char('\n'));
modText.insert(lastHeaderLine, QLatin1String("Follows: ") + follows + QLatin1Char('\n'));
}
break;
}
@@ -203,7 +203,7 @@ void GitEditor::setPlainTextDataFiltered(const QString &a)
break;
}
setPlainText(array);
setPlainText(modText);
}
void GitEditor::commandFinishedGotoLine(bool ok, int exitCode, const QVariant &v)