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

Use Qt 5's QStringList::join(QChar)

Browse Source 
Less typing and less cycles than join(QString) where appropriate

Change-Id: I6ebc0e17e4d7fd9845864dd95b7de4ba4dad6906
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
This commit is contained in:
hjk
2014-08-23 01:19:53 +02:00
committed by Eike Ziller
parent 2b5df11cb8
commit 6431ab2c79
92 changed files with 146 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/gitclient.cpp
View File

@@ -727,7 +727,7 @@ static inline void msgCannotRun(const QStringList &args, const QString &workingD
const QByteArray &error, QString *errorMessage)
{
const QString message = GitClient::tr("Cannot run \"%1 %2\" in \"%2\": %3")
.arg(QLatin1String("git ") + args.join(QLatin1String(" ")),
.arg(QLatin1String("git ") + args.join(QLatin1Char(' ')),
QDir::toNativeSeparators(workingDirectory),
commandOutputFromLocal8Bit(error));
@@ -3220,7 +3220,7 @@ void GitClient::handleMergeConflicts(const QString &workingDir, const QString &c
if (!commit.isEmpty())
message = tr("Conflicts detected with commit %1.").arg(commit);
else if (!files.isEmpty())
message = tr("Conflicts detected with files:\n%1").arg(files.join(QLatin1String("\n")));
message = tr("Conflicts detected with files:\n%1").arg(files.join(QLatin1Char('\n')));
else
message = tr("Conflicts detected.");
QMessageBox mergeOrAbort(QMessageBox::Question, tr("Conflicts Detected"), message,