diff options
author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2012-11-28 20:44:03 +0200 |
---|---|---|
committer | Orgad Shaneh <orgads@gmail.com> | 2012-11-28 20:20:46 +0100 |
commit | a44aa55502b1d9f548692e49ab7cea13d341c8ca (patch) | |
tree | 77f9fbfd583551839c4448c1b66de7c47dd7afc3 /src/libs | |
parent | 3747e941ad79f64e28c78c83a840783eb3edfd6f (diff) | |
download | qt-creator-a44aa55502b1d9f548692e49ab7cea13d341c8ca.tar.gz |
Add whitespace after control keywords
find -name \*.cpp -o -name \*.h | \
xargs sed -Ei 's/ (for|foreach|if|switch|while)\(/ \1 (/g'
Change-Id: I9efdff4bf0c8c01a52baaaeb75198483c77b0390
Reviewed-by: hjk <qthjk@ovi.com>
Diffstat (limited to 'src/libs')
-rw-r--r-- | src/libs/3rdparty/cplusplus/Parser.cpp | 2 | ||||
-rw-r--r-- | src/libs/cplusplus/Icons.cpp | 2 | ||||
-rw-r--r-- | src/libs/extensionsystem/optionsparser.cpp | 4 | ||||
-rw-r--r-- | src/libs/extensionsystem/pluginmanager.cpp | 2 | ||||
-rw-r--r-- | src/libs/qmleditorwidgets/contextpanewidgetimage.cpp | 2 | ||||
-rw-r--r-- | src/libs/qmljs/parser/qmlerror.cpp | 4 | ||||
-rw-r--r-- | src/libs/qmljs/qmljsdelta.cpp | 18 | ||||
-rw-r--r-- | src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp | 2 | ||||
-rw-r--r-- | src/libs/qtcomponents/styleitem/qwheelarea.cpp | 10 | ||||
-rw-r--r-- | src/libs/ssh/sshcapabilities.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/buildablehelperlibrary.cpp | 4 | ||||
-rw-r--r-- | src/libs/utils/detailsbutton.cpp | 4 | ||||
-rw-r--r-- | src/libs/utils/filesearch.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/submiteditorwidget.cpp | 2 | ||||
-rw-r--r-- | src/libs/utils/submitfieldwidget.cpp | 6 | ||||
-rw-r--r-- | src/libs/utils/uncommentselection.cpp | 2 |
16 files changed, 34 insertions, 34 deletions
diff --git a/src/libs/3rdparty/cplusplus/Parser.cpp b/src/libs/3rdparty/cplusplus/Parser.cpp index c7d00c9817..be92fcf673 100644 --- a/src/libs/3rdparty/cplusplus/Parser.cpp +++ b/src/libs/3rdparty/cplusplus/Parser.cpp @@ -1216,7 +1216,7 @@ bool Parser::parseCvQualifiers(SpecifierListAST *&node) spec->specifier_token = consumeToken(); *ast = new (_pool) SpecifierListAST(spec); ast = &(*ast)->next; - } else if(LA() == T___ATTRIBUTE__) { + } else if (LA() == T___ATTRIBUTE__) { parseAttributeSpecifier(*ast); ast = &(*ast)->next; } else { diff --git a/src/libs/cplusplus/Icons.cpp b/src/libs/cplusplus/Icons.cpp index a371da91d7..653db7f59e 100644 --- a/src/libs/cplusplus/Icons.cpp +++ b/src/libs/cplusplus/Icons.cpp @@ -137,7 +137,7 @@ Icons::IconType Icons::iconTypeForSymbol(const Symbol *symbol) QIcon Icons::iconForType(IconType type) const { - switch(type) { + switch (type) { case ClassIconType: return _classIcon; case EnumIconType: diff --git a/src/libs/extensionsystem/optionsparser.cpp b/src/libs/extensionsystem/optionsparser.cpp index fc7506e8b9..529f1ff94f 100644 --- a/src/libs/extensionsystem/optionsparser.cpp +++ b/src/libs/extensionsystem/optionsparser.cpp @@ -106,7 +106,7 @@ bool OptionsParser::checkForTestOption() return false; if (nextToken(RequiredToken)) { if (m_currentArg == QLatin1String("all")) { - foreach(PluginSpec *spec, m_pmPrivate->pluginSpecs) { + foreach (PluginSpec *spec, m_pmPrivate->pluginSpecs) { if (spec && !m_pmPrivate->testSpecs.contains(spec)) m_pmPrivate->testSpecs.append(spec); } @@ -117,7 +117,7 @@ bool OptionsParser::checkForTestOption() *m_errorString = QCoreApplication::translate("PluginManager", "The plugin '%1' does not exist.").arg(m_currentArg); m_hasError = true; - } else if(!m_pmPrivate->testSpecs.contains(spec)) { + } else if (!m_pmPrivate->testSpecs.contains(spec)) { m_pmPrivate->testSpecs.append(spec); } } diff --git a/src/libs/extensionsystem/pluginmanager.cpp b/src/libs/extensionsystem/pluginmanager.cpp index 0887d65c80..7b229211e4 100644 --- a/src/libs/extensionsystem/pluginmanager.cpp +++ b/src/libs/extensionsystem/pluginmanager.cpp @@ -840,7 +840,7 @@ void PluginManagerPrivate::writeSettings() return; QStringList tempDisabledPlugins; QStringList tempForceEnabledPlugins; - foreach(PluginSpec *spec, pluginSpecs) { + foreach (PluginSpec *spec, pluginSpecs) { if (!spec->isDisabledByDefault() && !spec->isEnabled()) tempDisabledPlugins.append(spec->name()); if (spec->isDisabledByDefault() && spec->isEnabled()) diff --git a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp index 38d3741345..24214cb407 100644 --- a/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp +++ b/src/libs/qmleditorwidgets/contextpanewidgetimage.cpp @@ -423,7 +423,7 @@ static inline bool parseSciFile(const QString &fileName, QString &pixmapFileName data.open(QIODevice::ReadOnly); QByteArray raw; - while(raw = data.readLine(), !raw.isEmpty()) { + while (raw = data.readLine(), !raw.isEmpty()) { QString line = QString::fromUtf8(raw.trimmed()); if (line.isEmpty() || line.startsWith(QLatin1Char('#'))) continue; diff --git a/src/libs/qmljs/parser/qmlerror.cpp b/src/libs/qmljs/parser/qmlerror.cpp index 82f38932f8..60d3d22b54 100644 --- a/src/libs/qmljs/parser/qmlerror.cpp +++ b/src/libs/qmljs/parser/qmlerror.cpp @@ -211,7 +211,7 @@ QString QmlError::toString() const rv = QLatin1String("<Unknown File>"); } else if (line() != -1) { rv = url().toString() + QLatin1Char(':') + QString::number(line()); - if(column() != -1) + if (column() != -1) rv += QLatin1Char(':') + QString::number(column()); } else { rv = url().toString(); @@ -251,7 +251,7 @@ QDebug operator<<(QDebug debug, const QmlError &error) const QString &line = lines.at(error.line() - 1); debug << "\n " << qPrintable(line); - if(error.column() > 0) { + if (error.column() > 0) { int column = qMax(0, error.column() - 1); column = qMin(column, line.length()); diff --git a/src/libs/qmljs/qmljsdelta.cpp b/src/libs/qmljs/qmljsdelta.cpp index 1981be8dcd..3b5f03a1c8 100644 --- a/src/libs/qmljs/qmljsdelta.cpp +++ b/src/libs/qmljs/qmljsdelta.cpp @@ -99,11 +99,11 @@ static QString label(UiObjectMember *member, Document::Ptr doc) if (UiObjectDefinition* foo = cast<UiObjectDefinition *>(member)) { str = label(foo->qualifiedTypeNameId); - } else if(UiObjectBinding *foo = cast<UiObjectBinding *>(member)) { + } else if (UiObjectBinding *foo = cast<UiObjectBinding *>(member)) { str = label(foo->qualifiedId) + QLatin1Char(' ') + label(foo->qualifiedTypeNameId); - } else if(UiArrayBinding *foo = cast<UiArrayBinding *>(member)) { + } else if (UiArrayBinding *foo = cast<UiArrayBinding *>(member)) { str = label(foo->qualifiedId) + QLatin1String("[]"); - } else if(UiScriptBinding *foo = cast<UiScriptBinding *>(member)) { + } else if (UiScriptBinding *foo = cast<UiScriptBinding *>(member)) { str = label(foo->qualifiedId) + QLatin1Char(':'); if (foo->statement) { quint32 start = foo->statement->firstSourceLocation().begin(); @@ -172,7 +172,7 @@ static QList<UiObjectMember *> children(UiObjectMember *ast) ret.append(list->member); list = list->next; } - } else if(UiArrayBinding *foo = cast<UiArrayBinding *>(ast)) { + } else if (UiArrayBinding *foo = cast<UiArrayBinding *>(ast)) { UiArrayMemberList* list = foo->members; while (list) { ret.append(list->member); @@ -189,7 +189,7 @@ static Map buildMapping_helper(UiObjectMember *x, UiObjectMember *y, const Map & return M2; if (M.way2.contains(y)) return M2; - if(label(x, doc1) != label(y, doc2)) + if (label(x, doc1) != label(y, doc2)) return M2; M2.insert(x, y); QList<UiObjectMember *> list1 = children(x); @@ -222,7 +222,7 @@ static Map buildMapping(Document::Ptr doc1, Document::Ptr doc2) Map M; QList<UiObjectMember *> todo; todo.append(doc1->qmlProgram()->members->member); - while(!todo.isEmpty()) { + while (!todo.isEmpty()) { UiObjectMember *x = todo.takeFirst(); todo += children(x); @@ -380,7 +380,7 @@ void Delta::insert(UiObjectMember *member, UiObjectMember *parentMember, const Q // Also, a relative URL is expected (no "file://" prepending!) QString filename = doc->fileName() + QLatin1Char('_') + QString::number(doc->editorRevision()) + QLatin1Char(':') + QString::number(startLine-importList.count()); - foreach(DebugId debugId, debugReferences) { + foreach (DebugId debugId, debugReferences) { if (debugId != -1) { int order = 0; // skip children which are not objects @@ -492,7 +492,7 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P QList<UiObjectMember *> todo; todo.append(doc2->qmlProgram()->members->member); //UiObjectMemberList *list = 0; - while(!todo.isEmpty()) { + while (!todo.isEmpty()) { UiObjectMember *y = todo.takeFirst(); todo += children(y); @@ -539,7 +539,7 @@ Delta::DebugIdMap Delta::operator()(const Document::Ptr &doc1, const Document::P } todo.append(doc1->qmlProgram()->members->member); - while(!todo.isEmpty()) { + while (!todo.isEmpty()) { UiObjectMember *x = todo.takeFirst(); todo += children(x); if (!cast<UiObjectDefinition *>(x)) diff --git a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp index aab42990ac..7a5a7910e8 100644 --- a/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp +++ b/src/libs/qtcomponents/styleitem/qdeclarativefolderlistmodel.cpp @@ -47,7 +47,7 @@ public: void updateSorting() { QDir::SortFlags flags = 0; - switch(sortField) { + switch (sortField) { case QDeclarativeFolderListModel::Unsorted: flags |= QDir::Unsorted; break; diff --git a/src/libs/qtcomponents/styleitem/qwheelarea.cpp b/src/libs/qtcomponents/styleitem/qwheelarea.cpp index 104ace7847..7d3189e5a9 100644 --- a/src/libs/qtcomponents/styleitem/qwheelarea.cpp +++ b/src/libs/qtcomponents/styleitem/qwheelarea.cpp @@ -56,11 +56,11 @@ QWheelArea::QWheelArea(QDeclarativeItem *parent) QWheelArea::~QWheelArea() {} bool QWheelArea::event (QEvent * e) { - switch(e->type()) { + switch (e->type()) { case QEvent::GraphicsSceneWheel: { QGraphicsSceneWheelEvent *we = static_cast<QGraphicsSceneWheelEvent*>(e); - if(we) { - switch(we->orientation()) { + if (we) { + switch (we->orientation()) { case Qt::Horizontal: setHorizontalDelta(we->delta()); break; @@ -72,8 +72,8 @@ bool QWheelArea::event (QEvent * e) { } case QEvent::Wheel: { QWheelEvent *we = static_cast<QWheelEvent*>(e); - if(we) { - switch(we->orientation()) { + if (we) { + switch (we->orientation()) { case Qt::Horizontal: setHorizontalDelta(we->delta()); diff --git a/src/libs/ssh/sshcapabilities.cpp b/src/libs/ssh/sshcapabilities.cpp index f0ccd24644..a2eba0433d 100644 --- a/src/libs/ssh/sshcapabilities.cpp +++ b/src/libs/ssh/sshcapabilities.cpp @@ -41,7 +41,7 @@ namespace { QByteArray listAsByteArray(const QList<QByteArray> &list) { QByteArray array; - foreach(const QByteArray &elem, list) + foreach (const QByteArray &elem, list) array += elem + ','; if (!array.isEmpty()) array.remove(array.count() - 1, 1); diff --git a/src/libs/utils/buildablehelperlibrary.cpp b/src/libs/utils/buildablehelperlibrary.cpp index 873fe67921..8d8e708ac3 100644 --- a/src/libs/utils/buildablehelperlibrary.cpp +++ b/src/libs/utils/buildablehelperlibrary.cpp @@ -299,7 +299,7 @@ bool BuildableHelperLibrary::getHelperFileInfoFor(const QStringList &validBinary if (!info) return false; - foreach(const QString &binaryFilename, validBinaryFilenames) { + foreach (const QString &binaryFilename, validBinaryFilenames) { info->setFile(directory + binaryFilename); if (info->exists()) return true; @@ -335,7 +335,7 @@ QString BuildableHelperLibrary::byInstallDataHelper(const QString &sourcePath, QString newestHelper; QDateTime newestHelperModified = sourcesModified; // prevent using one that's older than the sources QFileInfo fileInfo; - foreach(const QString &installDirectory, installDirectories) { + foreach (const QString &installDirectory, installDirectories) { if (getHelperFileInfoFor(validBinaryFilenames, installDirectory, &fileInfo)) { if (!newestHelperModified.isValid() || (fileInfo.lastModified() > newestHelperModified)) { diff --git a/src/libs/utils/detailsbutton.cpp b/src/libs/utils/detailsbutton.cpp index 35f8f232b7..cf09d2c9db 100644 --- a/src/libs/utils/detailsbutton.cpp +++ b/src/libs/utils/detailsbutton.cpp @@ -90,7 +90,7 @@ QSize DetailsButton::sizeHint() const bool DetailsButton::event(QEvent *e) { - switch(e->type()) { + switch (e->type()) { case QEvent::Enter: { QPropertyAnimation *animation = new QPropertyAnimation(this, "fader"); @@ -164,7 +164,7 @@ QPixmap DetailsButton::cacheRendering(const QSize &size, bool checked) p.drawRoundedRect(1, 1, size.width()-3, size.height()-3, 1, 1); p.setPen(QPen(QColor(0, 0, 0, 40))); p.drawLine(0, 1, 0, size.height() - 2); - if(checked) + if (checked) p.drawLine(1, size.height() - 1, size.width() - 1, size.height() - 1); p.setPen(palette().color(QPalette::Text)); diff --git a/src/libs/utils/filesearch.cpp b/src/libs/utils/filesearch.cpp index 1982673604..8af9484cf7 100644 --- a/src/libs/utils/filesearch.cpp +++ b/src/libs/utils/filesearch.cpp @@ -427,7 +427,7 @@ bool SubDirFileIterator::hasNext() const { if (!m_currentFiles.isEmpty()) return true; - while(!m_dirs.isEmpty() && m_currentFiles.isEmpty()) { + while (!m_dirs.isEmpty() && m_currentFiles.isEmpty()) { QDir dir = m_dirs.pop(); const qreal dirProgressMax = m_progressValues.pop(); const bool processed = m_processedValues.pop(); diff --git a/src/libs/utils/submiteditorwidget.cpp b/src/libs/utils/submiteditorwidget.cpp index 9381a8e3cc..13714e8a5f 100644 --- a/src/libs/utils/submiteditorwidget.cpp +++ b/src/libs/utils/submiteditorwidget.cpp @@ -332,7 +332,7 @@ QString SubmitEditorWidget::descriptionText() const QString rc = trimMessageText(lineWrap() ? wrappedText(d->m_ui.description) : d->m_ui.description->toPlainText()); // append field entries - foreach(const SubmitFieldWidget *fw, d->m_fieldWidgets) + foreach (const SubmitFieldWidget *fw, d->m_fieldWidgets) rc += fw->fieldValues(); return cleanupDescription(rc); } diff --git a/src/libs/utils/submitfieldwidget.cpp b/src/libs/utils/submitfieldwidget.cpp index 383952fb1e..7a9002f8d1 100644 --- a/src/libs/utils/submitfieldwidget.cpp +++ b/src/libs/utils/submitfieldwidget.cpp @@ -227,7 +227,7 @@ void SubmitFieldWidget::setHasBrowseButton(bool on) if (d->hasBrowseButton == on) return; d->hasBrowseButton = on; - foreach(const FieldEntry &fe, d->fieldEntries) + foreach (const FieldEntry &fe, d->fieldEntries) fe.browseButton->setVisible(on); } @@ -251,7 +251,7 @@ void SubmitFieldWidget::setCompleter(QCompleter *c) if (c == d->completer) return; d->completer = c; - foreach(const FieldEntry &fe, d->fieldEntries) + foreach (const FieldEntry &fe, d->fieldEntries) fe.lineEdit->setCompleter(c); } @@ -271,7 +271,7 @@ QString SubmitFieldWidget::fieldValues() const const QChar newLine = QLatin1Char('\n'); // Format as "RevBy: value\nSigned-Off: value\n" QString rc; - foreach(const FieldEntry &fe, d->fieldEntries) { + foreach (const FieldEntry &fe, d->fieldEntries) { const QString value = fe.lineEdit->text().trimmed(); if (!value.isEmpty()) { rc += fe.combo->currentText(); diff --git a/src/libs/utils/uncommentselection.cpp b/src/libs/utils/uncommentselection.cpp index 269978acda..864199dbd9 100644 --- a/src/libs/utils/uncommentselection.cpp +++ b/src/libs/utils/uncommentselection.cpp @@ -258,7 +258,7 @@ void Utils::unCommentSelection(QPlainTextEdit *edit, const CommentDefinition &de } } else { QString text = block.text(); - foreach(QChar c, text) { + foreach (QChar c, text) { if (!c.isSpace()) { if (definition.isAfterWhiteSpaces()) cursor.setPosition(block.position() + text.indexOf(c)); |