forked from qt-creator/qt-creator
minor style
Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7 Reviewed-on: http://codereview.qt-project.org/5122 Reviewed-by: hjk <qthjk@ovi.com>
This commit is contained in:
@@ -462,11 +462,10 @@ ParserTreeItem::ConstPtr Parser::getCachedOrParseDocumentTree(const CPlusPlus::D
|
||||
&& d->cachedDocTreesRevision[fileName] == doc->revision()) {
|
||||
d->docLocker.unlock();
|
||||
return d->cachedDocTrees[fileName];
|
||||
} else {
|
||||
}
|
||||
d->docLocker.unlock();
|
||||
return getParseDocumentTree(doc);
|
||||
}
|
||||
}
|
||||
|
||||
void Parser::parseDocument(const CPlusPlus::Document::Ptr &doc)
|
||||
{
|
||||
|
||||
@@ -134,11 +134,8 @@ static bool getFileOffsetFromRVA(IMAGE_NT_HEADERS *ntHeaders, DWORD rva, DWORD*
|
||||
}
|
||||
|
||||
// Retrieve debug directory and number of entries
|
||||
static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders,
|
||||
void *fileMemory,
|
||||
IMAGE_DEBUG_DIRECTORY **debugDir,
|
||||
int *count,
|
||||
QString *errorMessage)
|
||||
static bool getDebugDirectory(IMAGE_NT_HEADERS *ntHeaders, void *fileMemory,
|
||||
IMAGE_DEBUG_DIRECTORY **debugDir, int *count, QString *errorMessage)
|
||||
{
|
||||
DWORD debugDirRva = 0;
|
||||
DWORD debugDirSize;
|
||||
|
||||
@@ -281,8 +281,7 @@ void S60Extensions::decode_from(BER_Decoder& from_source)
|
||||
if (OIDS::name_of(oid, CERT_CAPABILITY_FIELD_NAME))
|
||||
ext = new S60CapabilityConstraint();
|
||||
|
||||
if(!ext)
|
||||
{
|
||||
if (!ext) {
|
||||
if (!critical || !should_throw)
|
||||
continue;
|
||||
|
||||
|
||||
@@ -1298,8 +1298,7 @@ bool SubversionPlugin::vcsCheckout(const QString &directory, const QByteArray &u
|
||||
QStringList args = QStringList(QLatin1String("checkout"));
|
||||
args << QLatin1String(nonInteractiveOptionC) ;
|
||||
|
||||
if(!username.isEmpty() && !password.isEmpty())
|
||||
{
|
||||
if (!username.isEmpty() && !password.isEmpty()) {
|
||||
// If url contains username and password we have to use separate username and password
|
||||
// arguments instead of passing those in the url. Otherwise the subversion 'non-interactive'
|
||||
// authentication will always fail (if the username and password data are not stored locally),
|
||||
|
||||
Reference in New Issue
Block a user