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

Version control: Compile with QT_NO_CAST_FROM_ASCII.

Browse Source 
Change-Id: I85c007045efdb207f397b42fbce7a554ac9c9819
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
This commit is contained in:
Friedemann Kleint
2012-01-31 10:57:10 +01:00
committed by Tobias Hunger
parent cdae5f2102
commit e2ace515e2
28 changed files with 63 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/bazaar/bazaarclient.cpp
View File

@@ -62,9 +62,8 @@ bool BazaarClient::synchronousSetUserId()
{
QStringList args;
args << QLatin1String("whoami")
<< QString("%1 <%2>")
.arg(settings()->stringValue(BazaarSettings::userNameKey))
.arg(settings()->stringValue(BazaarSettings::userEmailKey));
<< (settings()->stringValue(BazaarSettings::userNameKey) + QLatin1String(" <")
+ settings()->stringValue(BazaarSettings::userEmailKey) + QLatin1Char('>'));
QByteArray stdOut;
return vcsFullySynchronousExec(QDir::currentPath(), args, &stdOut);
}
@@ -80,8 +79,8 @@ BranchInfo BazaarClient::synchronousBranchQuery(const QString &repositoryRoot) c
QTextStream ts(&branchConfFile);
QString branchLocation;
QString isBranchBound;
const QRegExp branchLocationRx("bound_location\\s*=\\s*(.+)$");
const QRegExp isBranchBoundRx("bound\\s*=\\s*(.+)$");
const QRegExp branchLocationRx(QLatin1String("bound_location\\s*=\\s*(.+)$"));
const QRegExp isBranchBoundRx(QLatin1String("bound\\s*=\\s*(.+)$"));
while (!ts.atEnd() && (branchLocation.isEmpty() || isBranchBound.isEmpty())) {
const QString line = ts.readLine();
if (branchLocationRx.indexIn(line) != -1)