From 5295e05310ec7eb1e0f1fb1b0aaaf0a51ca3ea91 Mon Sep 17 00:00:00 2001 From: hjk Date: Mon, 19 Sep 2011 10:02:45 +0200 Subject: minor style Change-Id: Id21e8a3962550a1c66d761e718b48a8fcf4053e7 Reviewed-on: http://codereview.qt-project.org/5122 Reviewed-by: hjk --- src/libs/3rdparty/cplusplus/Symbols.cpp | 2 +- src/libs/extensionsystem/pluginmanager.cpp | 2 +- src/libs/qmljs/qmljsdelta.cpp | 2 +- src/libs/utils/detailsbutton.cpp | 4 ++-- src/plugins/classview/classviewparser.cpp | 11 +++++------ src/plugins/classview/classviewparsertreeitem.cpp | 2 +- src/plugins/cmakeprojectmanager/cmaketarget.cpp | 2 +- src/plugins/debugger/gdb/codagdbadapter.cpp | 2 +- src/plugins/debugger/shared/peutils.cpp | 13 +++++-------- src/plugins/git/gitcommand.cpp | 2 +- src/plugins/help/searchwidget.cpp | 10 +++++----- src/plugins/qt4projectmanager/makestep.cpp | 2 +- .../qt4projectmanager/qt-desktop/qt4runconfiguration.cpp | 2 +- .../qt-s60/s60deployconfigurationwidget.cpp | 2 +- .../qt-s60/s60publishingsissettingspageovi.cpp | 4 ++-- .../qt4projectmanager/qt-s60/s60symbiancertificate.cpp | 5 ++--- src/plugins/subversion/subversionplugin.cpp | 3 +-- src/shared/help/bookmarkmanager.cpp | 2 +- 18 files changed, 33 insertions(+), 39 deletions(-) (limited to 'src') diff --git a/src/libs/3rdparty/cplusplus/Symbols.cpp b/src/libs/3rdparty/cplusplus/Symbols.cpp index 3c07f1e769..7cbacd9971 100644 --- a/src/libs/3rdparty/cplusplus/Symbols.cpp +++ b/src/libs/3rdparty/cplusplus/Symbols.cpp @@ -247,7 +247,7 @@ bool Function::isEqualTo(const Type *other) const #ifdef ICHECK_BUILD bool Function::isEqualTo(const Function* fct, bool ignoreName/* = false*/) const { - if(!ignoreName) + if (!ignoreName) return isEqualTo((Type*)fct); if (! fct) diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index e5edf5caa6..57afc087e0 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -656,7 +656,7 @@ void PluginManager::startTests() } QTest::qExec(pluginSpec->plugin(), methods); } - if(!d->testSpecs.isEmpty()) + if (!d->testSpecs.isEmpty()) QTimer::singleShot(1, QCoreApplication::instance(), SLOT(quit())); #endif } diff --git a/src/libs/qmljs/qmljsdelta.cpp b/src/libs/qmljs/qmljsdelta.cpp index c1ed4c2d40..076d8ab252 100644 --- a/src/libs/qmljs/qmljsdelta.cpp +++ b/src/libs/qmljs/qmljsdelta.cpp @@ -96,7 +96,7 @@ static QString label(UiQualifiedId *id) static QString label(UiObjectMember *member, Document::Ptr doc) { QString str; - if(!member) + if (!member) return str; if (UiObjectDefinition* foo = cast(member)) { diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp index 5aa4ef91fc..320cca0603 100644 --- a/src/libs/utils/detailsbutton.cpp +++ b/src/libs/utils/detailsbutton.cpp @@ -120,7 +120,7 @@ void DetailsButton::paintEvent(QPaintEvent *e) QPainter p(this); #ifndef Q_WS_MAC // draw hover animation - if(!isDown() && m_fader>0) + if (!isDown() && m_fader > 0) p.fillRect(rect().adjusted(1, 1, -2, -2), QColor(255, 255, 255, int(m_fader*180))); #endif @@ -152,7 +152,7 @@ QPixmap DetailsButton::cacheRendering(const QSize &size, bool checked) p.setRenderHint(QPainter::Antialiasing, true); p.translate(0.5, 0.5); p.setPen(Qt::NoPen); - if(!checked) { + if (!checked) { lg.setColorAt(0, QColor(0, 0, 0, 10)); lg.setColorAt(1, QColor(0, 0, 0, 16)); } else { diff --git a/src/plugins/classview/classviewparser.cpp b/src/plugins/classview/classviewparser.cpp index 8aa1978c5f..ff4ad3e3a3 100644 --- a/src/plugins/classview/classviewparser.cpp +++ b/src/plugins/classview/classviewparser.cpp @@ -462,10 +462,9 @@ 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); } + d->docLocker.unlock(); + return getParseDocumentTree(doc); } void Parser::parseDocument(const CPlusPlus::Document::Ptr &doc) @@ -527,7 +526,7 @@ void Parser::removeFiles(const QStringList &fileList) QWriteLocker lockerPrj(&d->prjLocker); QWriteLocker lockerDoc(&d->docLocker); - foreach(const QString &name, fileList) { + foreach (const QString &name, fileList) { d->fileList.remove(name); d->cachedDocTrees.remove(name); d->cachedDocTreesRevision.remove(name); @@ -549,7 +548,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot) // copy snapshot's documents CPlusPlus::Snapshot::const_iterator cur = snapshot.begin(); CPlusPlus::Snapshot::const_iterator end = snapshot.end(); - for(; cur != end; cur++) + for (; cur != end; cur++) d->documentList[cur.key()] = cur.value(); d->docLocker.unlock(); @@ -559,7 +558,7 @@ void Parser::resetData(const CPlusPlus::Snapshot &snapshot) // check all projects QList projects = getProjectList(); - foreach(const ProjectExplorer::Project *prj, projects) { + foreach (const ProjectExplorer::Project *prj, projects) { if (prj) fileList += prj->files(ProjectExplorer::Project::ExcludeGeneratedFiles); } diff --git a/src/plugins/classview/classviewparsertreeitem.cpp b/src/plugins/classview/classviewparsertreeitem.cpp index c8474ecf28..19ded18f57 100644 --- a/src/plugins/classview/classviewparsertreeitem.cpp +++ b/src/plugins/classview/classviewparsertreeitem.cpp @@ -119,7 +119,7 @@ void ParserTreeItem::copyTree(const ParserTreeItem::ConstPtr &target) QHash::const_iterator end = target->d->symbolInformations.constEnd(); - for(; cur != end; cur++) { + for (; cur != end; cur++) { ParserTreeItem::Ptr item(new ParserTreeItem()); item->copyTree(cur.value()); appendChild(item, cur.key()); diff --git a/src/plugins/cmakeprojectmanager/cmaketarget.cpp b/src/plugins/cmakeprojectmanager/cmaketarget.cpp index 8739ec4cbb..947103aef2 100644 --- a/src/plugins/cmakeprojectmanager/cmaketarget.cpp +++ b/src/plugins/cmakeprojectmanager/cmaketarget.cpp @@ -147,7 +147,7 @@ void CMakeTarget::updateRunConfigurations() } QMultiMap::const_iterator it = existingRunConfigurations.constBegin(); - for( ; it != existingRunConfigurations.constEnd(); ++it) { + for ( ; it != existingRunConfigurations.constEnd(); ++it) { CMakeRunConfiguration *rc = it.value(); // The executables for those runconfigurations aren't build by the current buildconfiguration // We just set a disable flag and show that in the display name diff --git a/src/plugins/debugger/gdb/codagdbadapter.cpp b/src/plugins/debugger/gdb/codagdbadapter.cpp index cedf750cf5..d66150ed66 100644 --- a/src/plugins/debugger/gdb/codagdbadapter.cpp +++ b/src/plugins/debugger/gdb/codagdbadapter.cpp @@ -203,7 +203,7 @@ static QPair splitIpAddressSpec(const QString &addressS const QString address = addressSpec.left(pos); bool ok; const unsigned short port = addressSpec.mid(pos + 1).toUShort(&ok); - if(!ok) { + if (!ok) { qWarning("Invalid IP address specification: '%s', defaulting to port %hu.", qPrintable(addressSpec), defaultPort); return QPair(addressSpec, defaultPort); } diff --git a/src/plugins/debugger/shared/peutils.cpp b/src/plugins/debugger/shared/peutils.cpp index 738871aade..a710144458 100644 --- a/src/plugins/debugger/shared/peutils.cpp +++ b/src/plugins/debugger/shared/peutils.cpp @@ -121,7 +121,7 @@ static IMAGE_NT_HEADERS *getNtHeader(void *fileMemory, QString *errorMessage) static bool getFileOffsetFromRVA(IMAGE_NT_HEADERS *ntHeaders, DWORD rva, DWORD* fileOffset) { IMAGE_SECTION_HEADER *sectionHeader = IMAGE_FIRST_SECTION(ntHeaders); - for( int i = 0; i < ntHeaders->FileHeader.NumberOfSections; i++, sectionHeader++ ) { + for (int i = 0; i < ntHeaders->FileHeader.NumberOfSections; i++, sectionHeader++) { const DWORD sectionSize = sectionHeader->Misc.VirtualSize ? sectionHeader->Misc.VirtualSize : sectionHeader->SizeOfRawData; if ((rva >= sectionHeader->VirtualAddress) && (rva < sectionHeader->VirtualAddress + sectionSize)) { @@ -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; @@ -249,7 +246,7 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString * } fileMemory = MapViewOfFile(hFileMap, FILE_MAP_READ, 0, 0, 0); - if(!fileMemory) { + if (!fileMemory) { *errorMessage = QString::fromLatin1("Cannot map '%1': %2").arg(peExecutableFileName, winErrorMessage(GetLastError())); break; } @@ -265,7 +262,7 @@ bool getPDBFiles(const QString &peExecutableFileName, QStringList *rc, QString * if (debugSectionCount) collectPDBfiles(fileMemory, debugDir, debugSectionCount, rc); success = true; - } while(false); + } while(false); if (fileMemory) UnmapViewOfFile(fileMemory); diff --git a/src/plugins/git/gitcommand.cpp b/src/plugins/git/gitcommand.cpp index 369fcfcd41..3a07abda0c 100644 --- a/src/plugins/git/gitcommand.cpp +++ b/src/plugins/git/gitcommand.cpp @@ -158,7 +158,7 @@ void GitCommand::run() qDebug() << "GitCommand::run" << j << '/' << count << m_jobs.at(j).arguments; process->start(m_binaryPath, m_jobs.at(j).arguments); - if(!process->waitForStarted()) { + if (!process->waitForStarted()) { ok = false; error += QString::fromLatin1("Error: \"%1\" could not be started: %2").arg(m_binaryPath, process->errorString()); break; diff --git a/src/plugins/help/searchwidget.cpp b/src/plugins/help/searchwidget.cpp index 05107146d4..24cc58f2b7 100644 --- a/src/plugins/help/searchwidget.cpp +++ b/src/plugins/help/searchwidget.cpp @@ -190,16 +190,16 @@ void SearchWidget::indexingFinished() m_progress = NULL; } -bool SearchWidget::eventFilter(QObject* o, QEvent *e) +bool SearchWidget::eventFilter(QObject *o, QEvent *e) { - QTextBrowser* browser = qFindChild(resultWidget); + QTextBrowser *browser = qFindChild(resultWidget); if (browser && o == browser->viewport() && e->type() == QEvent::MouseButtonRelease){ - QMouseEvent *me = static_cast(e); + QMouseEvent *me = static_cast(e); QUrl link = resultWidget->linkAt(me->pos()); if (!link.isEmpty() || link.isValid()) { bool controlPressed = me->modifiers() & Qt::ControlModifier; - if((me->button() == Qt::LeftButton && controlPressed) + if ((me->button() == Qt::LeftButton && controlPressed) || (me->button() == Qt::MidButton)) { OpenPagesManager::instance().createPageFromSearch(link); } @@ -210,7 +210,7 @@ bool SearchWidget::eventFilter(QObject* o, QEvent *e) void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent) { - QTextBrowser* browser = qFindChild(resultWidget); + QTextBrowser *browser = qFindChild(resultWidget); if (!browser) return; diff --git a/src/plugins/qt4projectmanager/makestep.cpp b/src/plugins/qt4projectmanager/makestep.cpp index 35712408c2..5045d40cef 100644 --- a/src/plugins/qt4projectmanager/makestep.cpp +++ b/src/plugins/qt4projectmanager/makestep.cpp @@ -168,7 +168,7 @@ bool MakeStep::init() if (bc->subNodeBuild()) { QString makefile = bc->subNodeBuild()->makefile(); - if(!makefile.isEmpty()) { + if (!makefile.isEmpty()) { Utils::QtcProcess::addArg(&args, QLatin1String("-f")); Utils::QtcProcess::addArg(&args, makefile); m_makeFileToCheck = QDir(workingDirectory).filePath(makefile); diff --git a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp index 1ecf0f73ab..81b1458531 100644 --- a/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp +++ b/src/plugins/qt4projectmanager/qt-desktop/qt4runconfiguration.cpp @@ -566,7 +566,7 @@ QString Qt4RunConfiguration::baseWorkingDirectory() const // else what the pro file reader tells us Qt4Project *pro = qt4Target()->qt4Project(); TargetInformation ti = pro->rootQt4ProjectNode()->targetInformation(m_proFilePath); - if(!ti.valid) + if (!ti.valid) return QString(); return ti.workingDir; } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp index 363357d6a7..2ebc1768e3 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60deployconfigurationwidget.cpp @@ -249,7 +249,7 @@ QWidget *S60DeployConfigurationWidget::createCommunicationChannel() m_ipAddress->setMinimumWidth(30); m_ipAddress->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Ignored); - if(!m_deployConfiguration->deviceAddress().isEmpty()) + if( !m_deployConfiguration->deviceAddress().isEmpty()) m_ipAddress->setText(QString("%1:%2") .arg(m_deployConfiguration->deviceAddress()) .arg(m_deployConfiguration->devicePort())); diff --git a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp index d7bc5c5dee..8231e37d85 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60publishingsissettingspageovi.cpp @@ -266,7 +266,7 @@ void S60PublishingSisSettingsPageOvi::capabilitiesChanged() //Check for certified Signed capabilities QStringList capabilitesNeedingCertifiedSigned; foreach (const QString &capability, capabilities) { - if( m_publisher->isCapabilityOneOf(capability, S60PublisherOvi::CertifiedSigned)) { + if (m_publisher->isCapabilityOneOf(capability, S60PublisherOvi::CertifiedSigned)) { capabilitesNeedingCertifiedSigned.append(capability); capabilities.removeOne(capability); } @@ -281,7 +281,7 @@ void S60PublishingSisSettingsPageOvi::capabilitiesChanged() QStringList capabilitiesNeedingManufacturerApproved; foreach (const QString &capability, capabilities) { - if( m_publisher->isCapabilityOneOf(capability, S60PublisherOvi::ManufacturerApproved)) + if (m_publisher->isCapabilityOneOf(capability, S60PublisherOvi::ManufacturerApproved)) capabilitiesNeedingManufacturerApproved.append(capability); } diff --git a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp index 20ce0d049e..abfaa0ab82 100644 --- a/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp +++ b/src/plugins/qt4projectmanager/qt-s60/s60symbiancertificate.cpp @@ -281,9 +281,8 @@ void S60Extensions::decode_from(BER_Decoder& from_source) if (OIDS::name_of(oid, CERT_CAPABILITY_FIELD_NAME)) ext = new S60CapabilityConstraint(); - if(!ext) - { - if(!critical || !should_throw) + if (!ext) { + if (!critical || !should_throw) continue; throw Decoding_Error("Encountered unknown X.509 extension marked " diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index 55a94253d5..14b82f9470 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -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), diff --git a/src/shared/help/bookmarkmanager.cpp b/src/shared/help/bookmarkmanager.cpp index 564a45ee59..b956d5a6d6 100644 --- a/src/shared/help/bookmarkmanager.cpp +++ b/src/shared/help/bookmarkmanager.cpp @@ -565,7 +565,7 @@ bool BookmarkWidget::eventFilter(QObject *object, QEvent *e) if (index.isValid()) { QMouseEvent *me = static_cast(e); bool controlPressed = me->modifiers() & Qt::ControlModifier; - if(((me->button() == Qt::LeftButton) && controlPressed) + if (((me->button() == Qt::LeftButton) && controlPressed) || (me->button() == Qt::MidButton)) { QString data = index.data(Qt::UserRole + 10).toString(); if (!data.isEmpty() && data != QLatin1String("Folder")) -- cgit v1.2.3