diff options
author | Zhang Sheng <zhangsheng@uniontech.com> | 2020-11-16 11:19:17 +0800 |
---|---|---|
committer | Zhang Sheng <zhangsheng@uniontech.com> | 2020-11-16 12:53:37 +0000 |
commit | e13173c112b729da8f53dd2e81e8116a1ed857cf (patch) | |
tree | 49c2bce0c3349eebd0f2b62c80a1b7168ae45dc2 /src/gui | |
parent | 802e5a45baf3ac7da2cb3be06d10bdd69696fcae (diff) |
Adjust code format, add space after 'if'
Change-Id: Ice081c891ff7f4b766f49dd4bd5cf18c30237acf
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Reviewed-by: hjk <hjk@qt.io>
Diffstat (limited to 'src/gui')
25 files changed, 74 insertions, 74 deletions
diff --git a/src/gui/image/qpixmap_blitter.cpp b/src/gui/image/qpixmap_blitter.cpp index aeed1e3b34..510a46e7b1 100644 --- a/src/gui/image/qpixmap_blitter.cpp +++ b/src/gui/image/qpixmap_blitter.cpp @@ -260,7 +260,7 @@ void QBlittablePlatformPixmap::markRasterOverlayImpl(const QRectF &rect) if (!showRasterOverlay) return; QRectF transformationRect = clipAndTransformRect(rect); - if(!transformationRect.isEmpty()) { + if (!transformationRect.isEmpty()) { QPainter p(overlay()); p.setBrush(m_overlayColor); p.setCompositionMode(QPainter::CompositionMode_Source); diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 2fca322543..26cc80b5b0 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -391,7 +391,7 @@ bool QPMCache::replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int bool success = QCache<QPixmapCache::Key, QPixmapCacheEntry>::insert(cacheKey, new QPixmapCacheEntry(cacheKey, pixmap), cost); if (success) { - if(!theid) { + if (!theid) { theid = startTimer(flush_time); t = false; } diff --git a/src/gui/itemmodels/qstandarditemmodel.cpp b/src/gui/itemmodels/qstandarditemmodel.cpp index 1d3dc1303f..234296271b 100644 --- a/src/gui/itemmodels/qstandarditemmodel.cpp +++ b/src/gui/itemmodels/qstandarditemmodel.cpp @@ -3109,7 +3109,7 @@ QStringList QStandardItemModel::mimeTypes() const QMimeData *QStandardItemModel::mimeData(const QModelIndexList &indexes) const { QMimeData *data = QAbstractItemModel::mimeData(indexes); - if(!data) + if (!data) return nullptr; const QString format = qStandardItemModelDataListMimeType(); diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 0da5667c1d..d3a1c069f0 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -511,13 +511,13 @@ QAction::~QAction() void QAction::setActionGroup(QActionGroup *group) { Q_D(QAction); - if(group == d->group) + if (group == d->group) return; - if(d->group) + if (d->group) d->group->removeAction(this); d->group = group; - if(group) + if (group) group->addAction(this); d->sendDataChanged(); } @@ -652,7 +652,7 @@ QString QAction::text() const { Q_D(const QAction); QString s = d->text; - if(s.isEmpty()) { + if (s.isEmpty()) { s = d->iconText; s.replace(QLatin1Char('&'), QLatin1String("&&")); } @@ -1130,7 +1130,7 @@ void QAction::activate(ActionEvent event) } if (!guard.isNull()) emit triggered(d->checked); - } else if(event == Hover) { + } else if (event == Hover) { emit hovered(); } } diff --git a/src/gui/kernel/qcursor.cpp b/src/gui/kernel/qcursor.cpp index e70f6ac79b..715cc76cc9 100644 --- a/src/gui/kernel/qcursor.cpp +++ b/src/gui/kernel/qcursor.cpp @@ -719,7 +719,7 @@ QCursorData::~QCursorData() /*! \internal */ void QCursorData::cleanup() { - if(!QCursorData::initialized) + if (!QCursorData::initialized) return; for (int shape = 0; shape <= Qt::LastCursor; ++shape) { diff --git a/src/gui/kernel/qguiapplication.cpp b/src/gui/kernel/qguiapplication.cpp index f7e07092dd..d396f11efb 100644 --- a/src/gui/kernel/qguiapplication.cpp +++ b/src/gui/kernel/qguiapplication.cpp @@ -1948,7 +1948,7 @@ bool QGuiApplication::notify(QObject *object, QEvent *event) */ bool QGuiApplication::event(QEvent *e) { - if(e->type() == QEvent::LanguageChange) { + if (e->type() == QEvent::LanguageChange) { setLayoutDirection(qt_detectRTLLanguage()?Qt::RightToLeft:Qt::LeftToRight); for (auto *topLevelWindow : QGuiApplication::topLevelWindows()) { if (topLevelWindow->flags() != Qt::Desktop) diff --git a/src/gui/kernel/qkeysequence.cpp b/src/gui/kernel/qkeysequence.cpp index 5d52ba139d..5d2a95c33f 100644 --- a/src/gui/kernel/qkeysequence.cpp +++ b/src/gui/kernel/qkeysequence.cpp @@ -964,7 +964,7 @@ QKeySequence QKeySequence::mnemonic(const QString &text) { QKeySequence ret; - if(qt_sequence_no_mnemonics) + if (qt_sequence_no_mnemonics) return ret; bool found = false; @@ -1176,7 +1176,7 @@ int QKeySequencePrivate::decodeString(QString accel, QKeySequence::SequenceForma int p = accel.lastIndexOf(QLatin1Char('+'), accel.length() - 2); // -2 so that Ctrl++ works QStringView accelRef(accel); - if(p > 0) + if (p > 0) accelRef = accelRef.mid(p + 1); int fnum = 0; diff --git a/src/gui/kernel/qpalette.cpp b/src/gui/kernel/qpalette.cpp index f5d010aa26..963526c153 100644 --- a/src/gui/kernel/qpalette.cpp +++ b/src/gui/kernel/qpalette.cpp @@ -734,8 +734,8 @@ QPalette::operator QVariant() const const QBrush &QPalette::brush(ColorGroup gr, ColorRole cr) const { Q_ASSERT(cr < NColorRoles); - if(gr >= (int)NColorGroups) { - if(gr == Current) { + if (gr >= (int)NColorGroups) { + if (gr == Current) { gr = currentGroup; } else { qWarning("QPalette::brush: Unknown ColorGroup: %d", (int)gr); @@ -832,7 +832,7 @@ void QPalette::detach() x->br[grp][role] = d->br[grp][role]; } x->resolveMask = d->resolveMask; - if(!d->ref.deref()) + if (!d->ref.deref()) delete d; d = x; } @@ -866,7 +866,7 @@ bool QPalette::operator==(const QPalette &p) const return true; for(int grp = 0; grp < (int)NColorGroups; grp++) { for(int role = 0; role < (int)NColorRoles; role++) { - if(d->br[grp][role] != p.d->br[grp][role]) + if (d->br[grp][role] != p.d->br[grp][role]) return false; } } @@ -881,26 +881,26 @@ bool QPalette::operator==(const QPalette &p) const */ bool QPalette::isEqual(QPalette::ColorGroup group1, QPalette::ColorGroup group2) const { - if(group1 >= (int)NColorGroups) { - if(group1 == Current) { + if (group1 >= (int)NColorGroups) { + if (group1 == Current) { group1 = currentGroup; } else { qWarning("QPalette::brush: Unknown ColorGroup(1): %d", (int)group1); group1 = Active; } } - if(group2 >= (int)NColorGroups) { - if(group2 == Current) { + if (group2 >= (int)NColorGroups) { + if (group2 == Current) { group2 = currentGroup; } else { qWarning("QPalette::brush: Unknown ColorGroup(2): %d", (int)group2); group2 = Active; } } - if(group1 == group2) + if (group1 == group2) return true; for(int role = 0; role < (int)NColorRoles; role++) { - if(d->br[group1][role] != d->br[group2][role]) + if (d->br[group1][role] != d->br[group2][role]) return false; } return true; @@ -1036,7 +1036,7 @@ static void readV1ColorGroup(QDataStream &s, QPalette &pal, QPalette::ColorGroup QDataStream &operator>>(QDataStream &s, QPalette &p) { - if(s.version() == 1) { + if (s.version() == 1) { p = QPalette(); readV1ColorGroup(s, p, QPalette::Active); readV1ColorGroup(s, p, QPalette::Disabled); diff --git a/src/gui/kernel/qwindow.cpp b/src/gui/kernel/qwindow.cpp index e761fe8e4c..546a90b2e9 100644 --- a/src/gui/kernel/qwindow.cpp +++ b/src/gui/kernel/qwindow.cpp @@ -675,7 +675,7 @@ WId QWindow::winId() const { Q_D(const QWindow); - if(!d->platformWindow) + if (!d->platformWindow) const_cast<QWindow *>(this)->create(); return d->platformWindow->winId(); diff --git a/src/gui/painting/qbezier.cpp b/src/gui/painting/qbezier.cpp index 8b1097ac5b..dabf1b0d23 100644 --- a/src/gui/painting/qbezier.cpp +++ b/src/gui/painting/qbezier.cpp @@ -473,7 +473,7 @@ void QBezier::addIfClose(qreal *length, qreal error) const chord = QLineF(QPointF(x1, y1),QPointF(x4, y4)).length(); - if((len-chord) > error) { + if ((len-chord) > error) { const auto halves = split(); /* split in two */ halves.first.addIfClose(length, error); /* try left side */ halves.second.addIfClose(length, error); /* try right side */ diff --git a/src/gui/painting/qblendfunctions.cpp b/src/gui/painting/qblendfunctions.cpp index 348eceb47f..519601a11d 100644 --- a/src/gui/painting/qblendfunctions.cpp +++ b/src/gui/painting/qblendfunctions.cpp @@ -96,7 +96,7 @@ struct Blend_ARGB32_on_RGB16_SourceAlpha { const quint8 alpha = qAlpha(src); if (alpha) { quint16 s = qConvertRgb32To16(src); - if(alpha < 255) + if (alpha < 255) s += BYTE_MUL_RGB16(*dst, 255 - alpha); *dst = s; } @@ -113,9 +113,9 @@ struct Blend_ARGB32_on_RGB16_SourceAndConstAlpha { inline void write(quint16 *dst, quint32 src) { src = BYTE_MUL(src, m_alpha); const quint8 alpha = qAlpha(src); - if(alpha) { + if (alpha) { quint16 s = qConvertRgb32To16(src); - if(alpha < 255) + if (alpha < 255) s += BYTE_MUL_RGB16(*dst, 255 - alpha); *dst = s; } diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index 44d63d72b8..ca1c4f831e 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -708,7 +708,7 @@ void QRasterPaintEngine::updatePen(const QPen &pen) else d->basicStroker.setStrokeWidth(penWidth); - if(pen_style == Qt::SolidLine) { + if (pen_style == Qt::SolidLine) { s->stroker = &d->basicStroker; } else if (pen_style != Qt::NoPen) { if (!d->dashStroker) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 8326b10083..6bc440b5b3 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7269,7 +7269,7 @@ start_lengthVariant: qreal lineWidth = 0x01000000; if (wordwrap || (tf & Qt::TextJustificationForced)) lineWidth = qMax<qreal>(0, r.width()); - if(!wordwrap) + if (!wordwrap) tf |= Qt::TextIncludeTrailingSpaces; textLayout.beginLayout(); diff --git a/src/gui/painting/qpainterpath.cpp b/src/gui/painting/qpainterpath.cpp index 09021c119c..797d456ce4 100644 --- a/src/gui/painting/qpainterpath.cpp +++ b/src/gui/painting/qpainterpath.cpp @@ -3295,7 +3295,7 @@ QPainterPath QPainterPath::subtracted(const QPainterPath &p) const */ QPainterPath QPainterPath::simplified() const { - if(isEmpty()) + if (isEmpty()) return *this; QPathClipper clipper(*this, QPainterPath()); return clipper.clip(QPathClipper::Simplify); diff --git a/src/gui/painting/qpathclipper.cpp b/src/gui/painting/qpathclipper.cpp index f2a45025f6..b3521f41ac 100644 --- a/src/gui/painting/qpathclipper.cpp +++ b/src/gui/painting/qpathclipper.cpp @@ -1965,7 +1965,7 @@ void clipLine(const QPointF &a, const QPointF &b, qreal t, QPainterPath &result) if (outA) addLine(result, QLineF(intersectLine<edge>(a, b, t), b)); - else if(outB) + else if (outB) addLine(result, QLineF(a, intersectLine<edge>(a, b, t))); else addLine(result, QLineF(a, b)); diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp index 626274d856..55a1aa0242 100644 --- a/src/gui/painting/qpdf.cpp +++ b/src/gui/painting/qpdf.cpp @@ -858,12 +858,12 @@ void QPdfEngine::drawRects (const QRectF *rects, int rectCount) if (d->simplePen || !d->hasPen) { // draw strokes natively in this case for better output - if(!d->simplePen && !d->stroker.matrix.isIdentity()) + if (!d->simplePen && !d->stroker.matrix.isIdentity()) *d->currentPage << "q\n" << QPdf::generateMatrix(d->stroker.matrix); for (int i = 0; i < rectCount; ++i) *d->currentPage << rects[i].x() << rects[i].y() << rects[i].width() << rects[i].height() << "re\n"; *d->currentPage << (d->hasPen ? (d->hasBrush ? "B\n" : "S\n") : "f\n"); - if(!d->simplePen && !d->stroker.matrix.isIdentity()) + if (!d->simplePen && !d->stroker.matrix.isIdentity()) *d->currentPage << "Q\n"; } else { QPainterPath p; @@ -1056,7 +1056,7 @@ void QPdfEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) } *d->currentPage << "q\n"; - if(!d->simplePen) + if (!d->simplePen) *d->currentPage << QPdf::generateMatrix(d->stroker.matrix); bool hp = d->hasPen; @@ -2304,7 +2304,7 @@ int QPdfEnginePrivate::writeCompressed(QIODevice *dev) int QPdfEnginePrivate::writeCompressed(const char *src, int len) { #ifndef QT_NO_COMPRESS - if(do_compress) { + if (do_compress) { uLongf destLen = len + len/100 + 13; // zlib requirement Bytef* dest = new Bytef[destLen]; if (Z_OK == ::compress(dest, &destLen, (const Bytef*) src, (uLongf)len)) { @@ -2833,7 +2833,7 @@ int QPdfEnginePrivate::addImage(const QImage &img, bool *bitmap, bool lossless, return -1; int object = imageCache.value(serial_no); - if(object) + if (object) return object; QImage image = img; diff --git a/src/gui/painting/qtransform.cpp b/src/gui/painting/qtransform.cpp index 34dd425fef..8f2dc21a21 100644 --- a/src/gui/painting/qtransform.cpp +++ b/src/gui/painting/qtransform.cpp @@ -2033,7 +2033,7 @@ void QTransform::map(int x, int y, int *tx, int *ty) const */ QTransform::TransformationType QTransform::type() const { - if(m_dirty == TxNone || m_dirty < m_type) + if (m_dirty == TxNone || m_dirty < m_type) return static_cast<TransformationType>(m_type); switch (static_cast<TransformationType>(m_dirty)) { diff --git a/src/gui/text/qcssparser.cpp b/src/gui/text/qcssparser.cpp index 4dc6767cf4..9670568792 100644 --- a/src/gui/text/qcssparser.cpp +++ b/src/gui/text/qcssparser.cpp @@ -857,7 +857,7 @@ static BrushData parseBrushValue(const QCss::Value &v, const QPalette &pal) parser.next(); if (!parser.parseTerm(&color)) return BrushData(); ColorData cd = parseColorValue(color); - if(cd.type == ColorData::Role) + if (cd.type == ColorData::Role) dependsOnThePalette = true; stops.append(QGradientStop(stop.variant.toReal(), colorFromData(cd, pal))); } else { @@ -1467,7 +1467,7 @@ QColor Declaration::colorValue(const QPalette &pal) const } ColorData color = parseColorValue(d->values.at(0)); - if(color.type == ColorData::Role) { + if (color.type == ColorData::Role) { d->parsed = QVariant::fromValue<int>(color.role); return pal.color((QPalette::ColorRole)(color.role)); } else { @@ -1490,7 +1490,7 @@ QBrush Declaration::brushValue(const QPalette &pal) const BrushData data = parseBrushValue(d->values.at(0), pal); - if(data.type == BrushData::Role) { + if (data.type == BrushData::Role) { d->parsed = QVariant::fromValue<int>(data.role); return pal.color((QPalette::ColorRole)(data.role)); } else { @@ -1524,7 +1524,7 @@ void Declaration::brushValues(QBrush *c, const QPalette &pal) const if (!(needParse & (1<<i))) continue; BrushData data = parseBrushValue(d->values.at(i), pal); - if(data.type == BrushData::Role) { + if (data.type == BrushData::Role) { v += QVariant::fromValue<int>(data.role); c[i] = pal.color((QPalette::ColorRole)(data.role)); } else { @@ -1648,7 +1648,7 @@ void Declaration::colorValues(QColor *c, const QPalette &pal) const QList<QVariant> v; for (i = 0; i < qMin(d->values.count(), 4); i++) { ColorData color = parseColorValue(d->values.at(i)); - if(color.type == ColorData::Role) { + if (color.type == ColorData::Role) { v += QVariant::fromValue<int>(color.role); c[i] = pal.color((QPalette::ColorRole)(color.role)); } else { @@ -2104,7 +2104,7 @@ void StyleSelector::matchRule(NodePtr node, const StyleRule &rule, StyleSheetOri + selector.specificity() *0x100 + (uint(origin) + depth)*0x100000; StyleRule newRule = rule; - if(rule.selectors.count() > 1) { + if (rule.selectors.count() > 1) { newRule.selectors.resize(1); newRule.selectors[0] = selector; } diff --git a/src/gui/text/qfontengine.cpp b/src/gui/text/qfontengine.cpp index 6f3734e75c..470a04638e 100644 --- a/src/gui/text/qfontengine.cpp +++ b/src/gui/text/qfontengine.cpp @@ -1027,7 +1027,7 @@ static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *p while (left <= right) { int middle = left + ( ( right - left ) >> 1 ); - if(pairs[middle].left_right == left_right) + if (pairs[middle].left_right == left_right) return pairs[middle].adjust; if (pairs[middle].left_right < left_right) @@ -1041,7 +1041,7 @@ static inline QFixed kerning(int left, int right, const QFontEngine::KernPair *p void QFontEngine::doKerning(QGlyphLayout *glyphs, QFontEngine::ShaperFlags flags) const { int numPairs = kerning_pairs.size(); - if(!numPairs) + if (!numPairs) return; const KernPair *pairs = kerning_pairs.constData(); @@ -1097,7 +1097,7 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor) goto end; // qDebug("subtable: version=%d, coverage=%x",version, coverage); - if(version == 0 && coverage == 0x0001) { + if (version == 0 && coverage == 0x0001) { if (offset + length > tab.size()) { // qDebug("length ouf ot bounds"); goto end; @@ -1108,7 +1108,7 @@ void QFontEngine::loadKerningPairs(QFixed scalingFactor) if (!qSafeFromBigEndian(data, end, &nPairs)) goto end; - if(nPairs * 6 + 8 > length - 6) { + if (nPairs * 6 + 8 > length - 6) { // qDebug("corrupt table!"); // corrupt table goto end; @@ -1250,7 +1250,7 @@ const uchar *QFontEngine::getCMap(const uchar *table, uint tableSize, bool *isSy break; } } - if(tableToUse < 0) + if (tableToUse < 0) return nullptr; resolveTable: @@ -1339,7 +1339,7 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, int cmapSize, uint Since 0xffff is never a valid Unicode char anyway, we just get rid of the issue by returning 0 for 0xffff */ - if(unicode >= 0xffff) + if (unicode >= 0xffff) return 0; quint16 segCountX2; @@ -1433,7 +1433,7 @@ quint32 QFontEngine::getTrueTypeGlyphIndex(const uchar *cmap, int cmapSize, uint if (!qSafeFromBigEndian(cmap + 12 * middle, end, &startCharCode)) return 0; - if(unicode < startCharCode) + if (unicode < startCharCode) right = middle - 1; else { quint32 endCharCode; diff --git a/src/gui/text/qtextcursor.cpp b/src/gui/text/qtextcursor.cpp index c579eca1ff..a27ef81500 100644 --- a/src/gui/text/qtextcursor.cpp +++ b/src/gui/text/qtextcursor.cpp @@ -2185,7 +2185,7 @@ QTextTable *QTextCursor::insertTable(int rows, int cols) */ QTextTable *QTextCursor::insertTable(int rows, int cols, const QTextTableFormat &format) { - if(!d || !d->priv || rows == 0 || cols == 0) + if (!d || !d->priv || rows == 0 || cols == 0) return nullptr; int pos = d->position; @@ -2205,7 +2205,7 @@ QTextTable *QTextCursor::insertTable(int rows, int cols, const QTextTableFormat */ QTextTable *QTextCursor::currentTable() const { - if(!d || !d->priv) + if (!d || !d->priv) return nullptr; QTextFrame *frame = d->priv->frameAt(d->position); @@ -2242,7 +2242,7 @@ QTextFrame *QTextCursor::insertFrame(const QTextFrameFormat &format) */ QTextFrame *QTextCursor::currentFrame() const { - if(!d || !d->priv) + if (!d || !d->priv) return nullptr; return d->priv->frameAt(d->position); diff --git a/src/gui/text/qtextdocumentfragment.cpp b/src/gui/text/qtextdocumentfragment.cpp index 6e7c5f1ed9..2d1f9ec161 100644 --- a/src/gui/text/qtextdocumentfragment.cpp +++ b/src/gui/text/qtextdocumentfragment.cpp @@ -561,7 +561,7 @@ bool QTextHtmlImporter::appendNodeText() const int initialCursorPosition = cursor.position(); QTextCharFormat format = currentNode->charFormat; - if(wsm == QTextHtmlParserNode::WhiteSpacePre || wsm == QTextHtmlParserNode::WhiteSpacePreWrap) + if (wsm == QTextHtmlParserNode::WhiteSpacePre || wsm == QTextHtmlParserNode::WhiteSpacePreWrap) compressNextWhitespace = PreserveWhiteSpace; QString text = currentNode->text; @@ -581,7 +581,7 @@ bool QTextHtmlImporter::appendNodeText() if (compressNextWhitespace == CollapseWhiteSpace) compressNextWhitespace = RemoveWhiteSpace; // allow this one, and remove the ones coming next. - else if(compressNextWhitespace == RemoveWhiteSpace) + else if (compressNextWhitespace == RemoveWhiteSpace) continue; if (wsm == QTextHtmlParserNode::WhiteSpacePre diff --git a/src/gui/text/qtextdocumentlayout.cpp b/src/gui/text/qtextdocumentlayout.cpp index 8ea3a655b7..7a46ae4ce9 100644 --- a/src/gui/text/qtextdocumentlayout.cpp +++ b/src/gui/text/qtextdocumentlayout.cpp @@ -3719,7 +3719,7 @@ void QTextDocumentLayout::draw(QPainter *painter, const PaintContext &context) QTextFrame *frame = d->document->rootFrame(); QTextFrameData *fd = data(frame); - if(fd->sizeDirty) + if (fd->sizeDirty) return; if (context.clip.isValid()) { @@ -3850,7 +3850,7 @@ QRectF QTextDocumentLayout::doLayout(int from, int oldLength, int length) QRectF updateRect; QTextFrame *root = d->docPrivate->rootFrame(); - if(data(root)->sizeDirty) + if (data(root)->sizeDirty) updateRect = d->layoutFrame(root, from, from + length); data(root)->layoutDirty = false; diff --git a/src/gui/text/qtextengine.cpp b/src/gui/text/qtextengine.cpp index 21670b8d4c..d3a28d8d02 100644 --- a/src/gui/text/qtextengine.cpp +++ b/src/gui/text/qtextengine.cpp @@ -86,9 +86,9 @@ public: { if (caps == QFont::SmallCaps) generateScriptItemsSmallCaps(reinterpret_cast<const ushort *>(m_string.unicode()), start, length); - else if(caps == QFont::Capitalize) + else if (caps == QFont::Capitalize) generateScriptItemsCapitalize(start, length); - else if(caps != QFont::MixedCase) { + else if (caps != QFont::MixedCase) { generateScriptItemsAndChangeCase(start, length, caps == QFont::AllLowercase ? QScriptAnalysis::Lowercase : QScriptAnalysis::Uppercase); } @@ -1192,7 +1192,7 @@ void QTextEngine::bidiReorder(int numItems, const quint8 *levels, int *visualOrd // reverse any contiguous sequence of characters that are at that level or higher. // reversing is only done up to the lowest odd level - if(!(levelLow%2)) levelLow++; + if (!(levelLow%2)) levelLow++; BIDI_DEBUG() << "reorderLine: lineLow = " << (uint)levelLow << ", lineHigh = " << (uint)levelHigh; @@ -1208,7 +1208,7 @@ void QTextEngine::bidiReorder(int numItems, const quint8 *levels, int *visualOrd while(i <= count && levels[i] >= levelHigh) i++; int end = i-1; - if(start != end) { + if (start != end) { //qDebug() << "reversing from " << start << " to " << end; for(int j = 0; j < (end-start+1)/2; j++) { int tmp = visualOrder[start+j]; diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 1413b1ab29..e113fad8fa 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -474,7 +474,7 @@ Q_GUI_EXPORT QDataStream &operator>>(QDataStream &stream, QTextFormat &fmt) // QTextFormat's default constructor doesn't allocate the private structure, so // we have to do this, in case fmt is a default constructed value. - if(!fmt.d) + if (!fmt.d) fmt.d = new QTextFormatPrivate(); for (QMap<qint32, QVariant>::ConstIterator it = properties.constBegin(); @@ -2206,7 +2206,7 @@ void QTextBlockFormat::setTabPositions(const QList<QTextOption::Tab> &tabs) QList<QTextOption::Tab> QTextBlockFormat::tabPositions() const { QVariant variant = property(TabPositions); - if(variant.isNull()) + if (variant.isNull()) return QList<QTextOption::Tab>(); QList<QTextOption::Tab> answer; QList<QVariant> variantsList = qvariant_cast<QList<QVariant> >(variant); diff --git a/src/gui/text/windows/qwindowsfontengine.cpp b/src/gui/text/windows/qwindowsfontengine.cpp index b2855d19dd..a8dba8b1f2 100644 --- a/src/gui/text/windows/qwindowsfontengine.cpp +++ b/src/gui/text/windows/qwindowsfontengine.cpp @@ -105,7 +105,7 @@ static void resolveGetCharWidthI() QFixed QWindowsFontEngine::lineThickness() const { - if(lineWidth > 0) + if (lineWidth > 0) return lineWidth; return QFontEngine::lineThickness(); @@ -160,7 +160,7 @@ void QWindowsFontEngine::getCMap() symbol = symb; designToDevice = 1; _faceId.index = 0; - if(cmap) { + if (cmap) { OUTLINETEXTMETRIC *otm = getOutlineTextMetric(hdc); unitsPerEm = int(otm->otmEMSquare); const QFixed unitsPerEmF(unitsPerEm); @@ -186,7 +186,7 @@ int QWindowsFontEngine::getGlyphIndexes(const QChar *str, int numChars, QGlyphLa while (it.hasNext()) { const uint uc = it.next(); glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, cmapSize, uc); - if(!glyphs->glyphs[glyph_pos] && uc < 0x100) + if (!glyphs->glyphs[glyph_pos] && uc < 0x100) glyphs->glyphs[glyph_pos] = getTrueTypeGlyphIndex(cmap, cmapSize, uc + 0xf000); ++glyph_pos; } @@ -337,7 +337,7 @@ void QWindowsFontEngine::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::Shape if (ttf && (flags & DesignMetrics)) { for(int i = 0; i < glyphs->numGlyphs; i++) { unsigned int glyph = glyphs->glyphs[i]; - if(int(glyph) >= designAdvancesSize) { + if (int(glyph) >= designAdvancesSize) { const int newSize = int(glyph + 256) >> 8 << 8; designAdvances = reinterpret_cast<QFixed *>(realloc(designAdvances, size_t(newSize) * sizeof(QFixed))); Q_CHECK_PTR(designAdvances); @@ -355,7 +355,7 @@ void QWindowsFontEngine::recalcAdvances(QGlyphLayout *glyphs, QFontEngine::Shape } glyphs->advances[i] = designAdvances[glyph]; } - if(oldFont) + if (oldFont) DeleteObject(SelectObject(hdc, oldFont)); } else { for(int i = 0; i < glyphs->numGlyphs; i++) { @@ -546,7 +546,7 @@ QFixed QWindowsFontEngine::capHeight() const QFixed QWindowsFontEngine::xHeight() const { - if(x_height >= 0) + if (x_height >= 0) return x_height; return QFontEngine::xHeight(); } @@ -837,7 +837,7 @@ void QWindowsFontEngine::addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions void QWindowsFontEngine::addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) { - if(tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR)) { + if (tm.tmPitchAndFamily & (TMPF_TRUETYPE | TMPF_VECTOR)) { hasOutline = true; QFontEngine::addOutlineToPath(x, y, glyphs, path, flags); if (hasOutline) { @@ -861,9 +861,9 @@ QT_END_INCLUDE_NAMESPACE int QWindowsFontEngine::synthesized() const { - if(synthesized_flags == -1) { + if (synthesized_flags == -1) { synthesized_flags = 0; - if(ttf) { + if (ttf) { const DWORD HEAD = MAKE_LITTLE_ENDIAN_TAG('h', 'e', 'a', 'd'); HDC hdc = m_fontEngineData->hdc; SelectObject(hdc, hfont); @@ -920,7 +920,7 @@ void QWindowsFontEngine::getUnscaledGlyph(glyph_t glyph, QPainterPath *path, gly LOGFONT lf = m_logfont; lf.lfHeight = -unitsPerEm; int flags = synthesized(); - if(flags & SynthesizedItalic) + if (flags & SynthesizedItalic) lf.lfItalic = false; lf.lfWidth = 0; HFONT hf = CreateFontIndirect(&lf); |