diff options
Diffstat (limited to 'src')
235 files changed, 4676 insertions, 8714 deletions
diff --git a/src/3rdparty/webkit/ChangeLog b/src/3rdparty/webkit/ChangeLog index ec8242d..76cfc80 100644 --- a/src/3rdparty/webkit/ChangeLog +++ b/src/3rdparty/webkit/ChangeLog @@ -1,3 +1,11 @@ +2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Ariya Hidayat. + + Added support for generating API docs in the Qt build using "make docs" + + * WebKit.pro: Include docs.pri for "make docs" target. + 2008-12-19 Marco Barisione <marco.barisione@collabora.co.uk> Reviewed by Holger Freyther. diff --git a/src/3rdparty/webkit/JavaScriptCore/ChangeLog b/src/3rdparty/webkit/JavaScriptCore/ChangeLog index fe85bb9..3321570 100644 --- a/src/3rdparty/webkit/JavaScriptCore/ChangeLog +++ b/src/3rdparty/webkit/JavaScriptCore/ChangeLog @@ -1,3 +1,60 @@ +2009-01-22 Oliver Hunt <oliver@apple.com> + + Reviewed by Geoff Garen. + + <rdar://problem/6516853> (r39682-r39736) JSFunFuzz: crash on "(function(){({ x2: x }), })()" + <https://bugs.webkit.org/show_bug.cgi?id=23479> + + Automatic semicolon insertion was resulting in this being accepted in the initial + nodeless parsing, but subsequent reparsing for code generation would fail, leading + to a crash. The solution is to ensure that reparsing a function performs parsing + in the same state as the initial parse. We do this by modifying the saved source + ranges to include rather than exclude the opening and closing braces. + + * bytecode/CodeBlock.cpp: + (JSC::CodeBlock::reparseForExceptionInfoIfNecessary): add an assertion for successful recompile + * parser/Lexer.h: + (JSC::Lexer::sourceCode): include rather than exclude braces. + * parser/Nodes.h: + (JSC::FunctionBodyNode::toSourceString): No need to append braces anymore. + +2009-01-21 Alexey Proskuryakov <ap@webkit.org> + + Suggested by Oliver Hunt. Reviewed by Oliver Hunt. + + https://bugs.webkit.org/show_bug.cgi?id=23456 + Function argument names leak + + * parser/Nodes.cpp: (JSC::FunctionBodyNode::~FunctionBodyNode): Destruct parameter names. + +2009-01-22 Beth Dakin <bdakin@apple.com> + + Reviewed by Sam Weinig. + + Fix for https://bugs.webkit.org/show_bug.cgi?id=23461 LayoutTests/ + fast/js/numeric-conversion.html is broken, and corresponding + <rdar://problem/6514842> + + The basic problem here is that parseInt(Infinity) should be NaN, + but we were returning 0. NaN matches Safari 3.2.1 and Firefox. + + * runtime/JSGlobalObjectFunctions.cpp: + (JSC::globalFuncParseInt): + +2009-01-13 Beth Dakin <bdakin@apple.com> + + Reviewed by Darin Adler and Oliver Hunt. + + <rdar://problem/6489314> REGRESSION: Business widget's front side + fails to render correctly when flipping widget + + The problem here is that parseInt was parsing NaN as 0. This patch + corrects that by parsing NaN as NaN. This matches our old behavior + and Firefox. + + * runtime/JSGlobalObjectFunctions.cpp: + (JSC::globalFuncParseInt): + 2009-02-13 Adam Treat <adam.treat@torchmobile.com> Reviewed by George Staikos. diff --git a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp index 91fb1c0..9207c8a 100644 --- a/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/bytecode/CodeBlock.cpp @@ -1397,6 +1397,7 @@ void CodeBlock::reparseForExceptionInfoIfNecessary(CallFrame* callFrame) case FunctionCode: { FunctionBodyNode* ownerFunctionBodyNode = static_cast<FunctionBodyNode*>(m_ownerNode); RefPtr<FunctionBodyNode> newFunctionBody = m_globalData->parser->reparse<FunctionBodyNode>(m_globalData, ownerFunctionBodyNode); + ASSERT(newFunctionBody); newFunctionBody->finishParsing(ownerFunctionBodyNode->copyParameters(), ownerFunctionBodyNode->parameterCount()); CodeBlock& newCodeBlock = newFunctionBody->bytecodeForExceptionInfoReparse(scopeChain); ASSERT(newCodeBlock.m_exceptionInfo); diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h index cb553af..afcf09f 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Lexer.h @@ -88,7 +88,7 @@ namespace JSC { bool sawError() const { return m_error; } void clear(); - SourceCode sourceCode(int openBrace, int closeBrace, int firstLine) { return SourceCode(m_source->provider(), openBrace + 1, closeBrace, firstLine); } + SourceCode sourceCode(int openBrace, int closeBrace, int firstLine) { return SourceCode(m_source->provider(), openBrace, closeBrace + 1, firstLine); } private: friend class JSGlobalData; diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp index bdc5d2f..201af28 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.cpp @@ -2552,6 +2552,8 @@ FunctionBodyNode::FunctionBodyNode(JSGlobalData* globalData, SourceElements* chi FunctionBodyNode::~FunctionBodyNode() { ASSERT(!m_refCount); + for (size_t i = 0; i < m_parameterCount; ++i) + m_parameters[i].~Identifier(); fastFree(m_parameters); } diff --git a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h index f8512f7..20885c3 100644 --- a/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h +++ b/src/3rdparty/webkit/JavaScriptCore/parser/Nodes.h @@ -2205,7 +2205,7 @@ namespace JSC { void finishParsing(const SourceCode&, ParameterNode*); void finishParsing(Identifier* parameters, size_t parameterCount); - UString toSourceString() const JSC_FAST_CALL { return UString("{") + source().toString() + UString("}"); } + UString toSourceString() const JSC_FAST_CALL { return source().toString(); } // These objects are ref/deref'd a lot in the scope chain, so this is a faster ref/deref. // If the virtual machine changes so this doesn't happen as much we can change back. diff --git a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp index f12d2f3..ecdddcf 100644 --- a/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp +++ b/src/3rdparty/webkit/JavaScriptCore/runtime/JSGlobalObjectFunctions.cpp @@ -302,9 +302,11 @@ JSValuePtr globalFuncParseInt(ExecState* exec, JSObject*, JSValuePtr, const ArgL if (JSImmediate::isImmediate(value)) return value; double d = value->uncheckedGetNumber(); - if (!isfinite(d)) - return JSImmediate::zeroImmediate(); - return jsNumber(exec, floor(d)); + if (isfinite(d)) + return jsNumber(exec, floor(d)); + if (isnan(d) || isinf(d)) + return jsNaN(&exec->globalData()); + return JSImmediate::zeroImmediate(); } return jsNumber(exec, parseInt(value->toString(exec), radix)); diff --git a/src/3rdparty/webkit/VERSION b/src/3rdparty/webkit/VERSION index bfaefa2..26ce489 100644 --- a/src/3rdparty/webkit/VERSION +++ b/src/3rdparty/webkit/VERSION @@ -8,4 +8,4 @@ The commit imported was from the and has the sha1 checksum - 450331808bfe11b1472c213a8cb311190355c2de + a6ebe3865025e2bb4d767a79435af4daf5a9b4db diff --git a/src/3rdparty/webkit/WebCore/ChangeLog b/src/3rdparty/webkit/WebCore/ChangeLog index 9be6e72..00bd427 100644 --- a/src/3rdparty/webkit/WebCore/ChangeLog +++ b/src/3rdparty/webkit/WebCore/ChangeLog @@ -1,3 +1,111 @@ +2009-03-13 Adam Bergkvist <adam.bergkvist@ericsson.com> + + Reviewed by Alexey Proskuryakov. + + https://bugs.webkit.org/show_bug.cgi?id=24349 + [QT] HTTP status text is never set + + Set HTTP status text to the reason phrase attribute of QNetworkReply. + + * platform/network/qt/QNetworkReplyHandler.cpp: + (WebCore::QNetworkReplyHandler::sendResponseIfNeeded): + +2009-03-02 Dirk Schulze <krit@webkit.org> + + Reviewed by Holger Freyther. + + Added putImageData to Qt. Discussed with Ariya Hidayat. + + [Qt] lacks putImageData support in Canvas + https://bugs.webkit.org/show_bug.cgi?id=22186 + + * platform/graphics/qt/ImageBufferQt.cpp: + (WebCore::ImageBuffer::putImageData): + +2009-03-01 Larry Ewing <lewing@novell.com> + + Reviewed by Alexey Proskuryakov. + + https://bugs.webkit.org/show_bug.cgi?id=24080 + NPN_GetValue casting to the wrong type and writing outside bounds + + Make sure to cast the value to the correct type so that only + memory owned by the value is written to. + + * plugins/gtk/PluginViewGtk.cpp (PluginView::getValueStatic): + * plugins/qt/PluginViewQt.cpp (PluginView::getValueStatic): + * plugins/mac/PluginViewMac.cpp (PluginView::getValueStatic): + (PluginView::getValue): + +2009-02-27 Adam Treat <adam.treat@torchmobile.com> + + Reviewed by Eric Seidel. + + https://bugs.webkit.org/show_bug.cgi?id=24229 + If an image has no alpha channel there is no reason to use SourceOver. + + * platform/graphics/qt/ImageQt.cpp: + (WebCore::Image::drawPattern): + (WebCore::BitmapImage::draw): + +2009-02-27 Zack Rusin <zack@kde.org> + + Reviewed by Nikolas Zimmermann. + + Qt: be more reasonable about scrolled lines + + cMouseWheelPixelsPerLineStep is currently a constant set to 13.3. it doesn't + match our metrics meaning that Qt scrolls by ~2 lines by default which is quite + irritating. so lets scroll vertically by the Qt set number of lines * Qt default + single step scroll + + * platform/qt/WheelEventQt.cpp: + +2009-02-25 Dirk Schulze <krit@webkit.org> + + Reviewed by Oliver Hunt. + + Ported arcTo to Qt. Qt has no native support for arcTo. This changes + calculate the behavior of arcTo and draws it with lineTo and arc. + + [QT] implement Canvas arcTo + https://bugs.webkit.org/show_bug.cgi?id=23873 + + * platform/graphics/qt/PathQt.cpp: + (WebCore::Path::addArcTo): + +2009-03-12 Adam Treat <adam.treat@torchmobile.com> + + Reviewed by Oliver Hunt. + + https://bugs.webkit.org/show_bug.cgi?id=24498 + Fix the Qt port to use the same algorithm for drawing dashed and dotted + borders as the other ports. This makes the Qt port pixel-for-pixel perfect + compared to border drawing with Apple's canonical mac port and much closer + to konqueror and firefox behavior. + + * platform/graphics/qt/GraphicsContextQt.cpp: + (WebCore::GraphicsContext::drawLine): + +2009-03-09 Adam Treat <adam.treat@torchmobile.com> + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=24463 + WebCore::qstring is detaching and copying twice for every single + WebCore::TextRun that is processed and drawn. This elevates this method + to one of the top-ten most expensive methods in all of QtWebKit according + to profiling. This changes the method so that QString only detaches + when absolutely necessary. + + * platform/graphics/qt/FontQt.cpp: + (WebCore::qstring): + (WebCore::fixSpacing): + (WebCore::Font::drawComplexText): + (WebCore::Font::floatWidthForComplexText): + (WebCore::Font::offsetForPositionForComplexText): + (WebCore::Font::selectionRectForComplexText): + 2009-02-04 Simon Hausmann <simon.hausmann@nokia.com> Unreviewed Qt build fix. diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp index deeea99..4e78083 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/FontQt.cpp @@ -37,20 +37,27 @@ #if QT_VERSION >= 0x040400 namespace WebCore { -static QString qstring(const TextRun& run) +static const QString qstring(const TextRun& run) { - QString string((QChar *)run.characters(), run.length()); - QChar *uc = string.data(); + //We don't detach + return QString::fromRawData((const QChar *)run.characters(), run.length()); +} + +static const QString fixSpacing(const QString &string) +{ + //Only detach if we're actually changing something + QString possiblyDetached = string; for (int i = 0; i < string.length(); ++i) { - if (Font::treatAsSpace(uc[i].unicode())) - uc[i] = 0x20; - else if (Font::treatAsZeroWidthSpace(uc[i].unicode())) - uc[i] = 0x200c; + const QChar c = string.at(i); + if (c.unicode() != 0x20 && Font::treatAsSpace(c.unicode())) { + possiblyDetached[i] = 0x20; //detach + } else if (c.unicode() != 0x200c && Font::treatAsZeroWidthSpace(c.unicode())) { + possiblyDetached[i] = 0x200c; //detach + } } - return string; + return possiblyDetached; } - static QTextLine setupLayout(QTextLayout* layout, const TextRun& style) { int flags = style.rtl() ? Qt::TextForceRightToLeft : Qt::TextForceLeftToRight; @@ -75,7 +82,7 @@ void Font::drawComplexText(GraphicsContext* ctx, const TextRun& run, const Float Color color = ctx->fillColor(); p->setPen(QColor(color)); - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); // text shadow IntSize shadowSize; @@ -144,7 +151,7 @@ float Font::floatWidthForComplexText(const TextRun& run) const { if (!run.length()) return 0; - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); QTextLayout layout(string, font()); QTextLine line = setupLayout(&layout, run); int w = int(line.naturalTextWidth()); @@ -157,7 +164,7 @@ float Font::floatWidthForComplexText(const TextRun& run) const int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool includePartialGlyphs) const { - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); QTextLayout layout(string, font()); QTextLine line = setupLayout(&layout, run); return line.xToCursor(position); @@ -165,7 +172,7 @@ int Font::offsetForPositionForComplexText(const TextRun& run, int position, bool FloatRect Font::selectionRectForComplexText(const TextRun& run, const IntPoint& pt, int h, int from, int to) const { - QString string = qstring(run); + const QString string = fixSpacing(qstring(run)); QTextLayout layout(string, font()); QTextLine line = setupLayout(&layout, run); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp index 936c1ea..6c90ea3 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/GraphicsContextQt.cpp @@ -470,13 +470,21 @@ void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2) if (paintingDisabled()) return; + StrokeStyle style = strokeStyle(); + Color color = strokeColor(); + if (style == NoStroke || !color.alpha()) + return; + + float width = strokeThickness(); + FloatPoint p1 = point1; FloatPoint p2 = point2; + bool isVerticalLine = (p1.x() == p2.x()); QPainter *p = m_data->p(); const bool antiAlias = p->testRenderHint(QPainter::Antialiasing); p->setRenderHint(QPainter::Antialiasing, m_data->antiAliasingForRectsAndLines); - adjustLineToPixelBoundaries(p1, p2, strokeThickness(), strokeStyle()); + adjustLineToPixelBoundaries(p1, p2, width, style); IntSize shadowSize; int shadowBlur; @@ -489,8 +497,76 @@ void GraphicsContext::drawLine(const IntPoint& point1, const IntPoint& point2) p->restore(); } + int patWidth = 0; + switch (style) { + case NoStroke: + case SolidStroke: + break; + case DottedStroke: + patWidth = (int)width; + break; + case DashedStroke: + patWidth = 3 * (int)width; + break; + } + + if (patWidth) { + p->save(); + + // Do a rect fill of our endpoints. This ensures we always have the + // appearance of being a border. We then draw the actual dotted/dashed line. + if (isVerticalLine) { + p->fillRect(FloatRect(p1.x() - width / 2, p1.y() - width, width, width), color); + p->fillRect(FloatRect(p2.x() - width / 2, p2.y(), width, width), color); + } else { + p->fillRect(FloatRect(p1.x() - width, p1.y() - width / 2, width, width), color); + p->fillRect(FloatRect(p2.x(), p2.y() - width / 2, width, width), color); + } + + // Example: 80 pixels with a width of 30 pixels. + // Remainder is 20. The maximum pixels of line we could paint + // will be 50 pixels. + int distance = (isVerticalLine ? (point2.y() - point1.y()) : (point2.x() - point1.x())) - 2*(int)width; + int remainder = distance % patWidth; + int coverage = distance - remainder; + int numSegments = coverage / patWidth; + + float patternOffset = 0.0f; + // Special case 1px dotted borders for speed. + if (patWidth == 1) + patternOffset = 1.0f; + else { + bool evenNumberOfSegments = numSegments % 2 == 0; + if (remainder) + evenNumberOfSegments = !evenNumberOfSegments; + if (evenNumberOfSegments) { + if (remainder) { + patternOffset += patWidth - remainder; + patternOffset += remainder / 2; + } else + patternOffset = patWidth / 2; + } else { + if (remainder) + patternOffset = (patWidth - remainder)/2; + } + } + + QVector<qreal> dashes; + dashes << qreal(patWidth) / width << qreal(patWidth) / width; + + QPen pen = p->pen(); + pen.setWidthF(width); + pen.setCapStyle(Qt::FlatCap); + pen.setDashPattern(dashes); + pen.setDashOffset(patternOffset / width); + p->setPen(pen); + } + p->drawLine(p1, p2); + if (patWidth) + p->restore(); + p->setRenderHint(QPainter::Antialiasing, antiAlias); } diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp index d1009b5..29a02d4 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageBufferQt.cpp @@ -1,6 +1,7 @@ /* * Copyright (C) 2006 Nikolas Zimmermann <zimmermann@kde.org> * Copyright (C) 2008 Holger Hans Peter Freyther + * Copyright (C) 2009 Dirk Schulze <krit@webkit.org> * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -31,7 +32,6 @@ #include "GraphicsContext.h" #include "ImageData.h" #include "MIMETypeRegistry.h" -#include "NotImplemented.h" #include "StillImageQt.h" #include <QBuffer> @@ -111,9 +111,7 @@ PassRefPtr<ImageData> ImageBuffer::getImageData(const IntRect& rect) const endy = m_size.height(); int numRows = endy - originy; - QImage image = m_data.m_pixmap.toImage(); - if (image.format() != QImage::Format_ARGB32) - image = image.convertToFormat(QImage::Format_ARGB32); + QImage image = m_data.m_pixmap.toImage().convertToFormat(QImage::Format_ARGB32); ASSERT(!image.isNull()); unsigned destBytesPerRow = 4 * rect.width(); @@ -134,9 +132,58 @@ PassRefPtr<ImageData> ImageBuffer::getImageData(const IntRect& rect) const return result; } -void ImageBuffer::putImageData(ImageData*, const IntRect&, const IntPoint&) +void ImageBuffer::putImageData(ImageData* source, const IntRect& sourceRect, const IntPoint& destPoint) { - notImplemented(); + ASSERT(sourceRect.width() > 0); + ASSERT(sourceRect.height() > 0); + + int originx = sourceRect.x(); + int destx = destPoint.x() + sourceRect.x(); + ASSERT(destx >= 0); + ASSERT(destx < m_size.width()); + ASSERT(originx >= 0); + ASSERT(originx <= sourceRect.right()); + + int endx = destPoint.x() + sourceRect.right(); + ASSERT(endx <= m_size.width()); + + int numColumns = endx - destx; + + int originy = sourceRect.y(); + int desty = destPoint.y() + sourceRect.y(); + ASSERT(desty >= 0); + ASSERT(desty < m_size.height()); + ASSERT(originy >= 0); + ASSERT(originy <= sourceRect.bottom()); + + int endy = destPoint.y() + sourceRect.bottom(); + ASSERT(endy <= m_size.height()); + int numRows = endy - desty; + + unsigned srcBytesPerRow = 4 * source->width(); + + bool isPainting = m_data.m_painter->isActive(); + if (isPainting) + m_data.m_painter->end(); + + QImage image = m_data.m_pixmap.toImage().convertToFormat(QImage::Format_ARGB32); + ASSERT(!image.isNull()); + + unsigned char* srcRows = source->data()->data() + originy * srcBytesPerRow + originx * 4; + for (int y = 0; y < numRows; ++y) { + quint32* scanLine = reinterpret_cast<quint32*>(image.scanLine(y + desty)); + for (int x = 0; x < numColumns; x++) { + int basex = x * 4; + scanLine[x + destx] = reinterpret_cast<quint32*>(srcRows + basex)[0]; + } + + srcRows += srcBytesPerRow; + } + + m_data.m_pixmap = QPixmap::fromImage(image); + + if (isPainting) + m_data.m_painter->begin(&m_data.m_pixmap); } // We get a mimeType here but QImageWriter does not support mimetypes but diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp index be7d1e0..e266c07 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/ImageQt.cpp @@ -109,6 +109,8 @@ void Image::drawPattern(GraphicsContext* ctxt, const FloatRect& tileRect, const ctxt->save(); ctxt->setCompositeOperation(op); QPainter* p = ctxt->platformContext(); + if (!pixmap.hasAlpha() && p->compositionMode() == QPainter::CompositionMode_SourceOver) + p->setCompositionMode(QPainter::CompositionMode_Source); p->setBrushOrigin(phase); p->fillRect(destRect, b); ctxt->restore(); @@ -146,6 +148,9 @@ void BitmapImage::draw(GraphicsContext* ctxt, const FloatRect& dst, QPainter* painter(ctxt->platformContext()); + if (!image->hasAlpha() && painter->compositionMode() == QPainter::CompositionMode_SourceOver) + painter->setCompositionMode(QPainter::CompositionMode_Source); + // Test using example site at // http://www.meyerweb.com/eric/css/edge/complexspiral/demo.html painter->drawPixmap(dst, *image, src); diff --git a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp index 90b342e..e68be2b 100644 --- a/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/graphics/qt/PathQt.cpp @@ -1,6 +1,7 @@ /* - * Copyright (C) 2006 Zack Rusin <zack@kde.org> - * 2006 Rob Buis <buis@kde.org> + * Copyright (C) 2006 Zack Rusin <zack@kde.org> + * 2006 Rob Buis <buis@kde.org> + * 2009 Dirk Schulze <krit@webkit.org> * * All rights reserved. * @@ -139,9 +140,72 @@ void Path::addBezierCurveTo(const FloatPoint& cp1, const FloatPoint& cp2, const void Path::addArcTo(const FloatPoint& p1, const FloatPoint& p2, float radius) { - //FIXME: busted - qWarning("arcTo is busted"); - m_path->arcTo(p1.x(), p1.y(), p2.x(), p2.y(), radius, 90); + FloatPoint p0(m_path->currentPosition()); + + if ((p1.x() == p0.x() && p1.y() == p0.y()) || (p1.x() == p2.x() && p1.y() == p2.y()) || radius == 0.f) { + m_path->lineTo(p1); + return; + } + + FloatPoint p1p0((p0.x() - p1.x()),(p0.y() - p1.y())); + FloatPoint p1p2((p2.x() - p1.x()),(p2.y() - p1.y())); + float p1p0_length = sqrtf(p1p0.x() * p1p0.x() + p1p0.y() * p1p0.y()); + float p1p2_length = sqrtf(p1p2.x() * p1p2.x() + p1p2.y() * p1p2.y()); + + double cos_phi = (p1p0.x() * p1p2.x() + p1p0.y() * p1p2.y()) / (p1p0_length * p1p2_length); + // all points on a line logic + if (cos_phi == -1) { + m_path->lineTo(p1); + return; + } + if (cos_phi == 1) { + // add infinite far away point + unsigned int max_length = 65535; + double factor_max = max_length / p1p0_length; + FloatPoint ep((p0.x() + factor_max * p1p0.x()), (p0.y() + factor_max * p1p0.y())); + m_path->lineTo(ep); + return; + } + + float tangent = radius / tan(acos(cos_phi) / 2); + float factor_p1p0 = tangent / p1p0_length; + FloatPoint t_p1p0((p1.x() + factor_p1p0 * p1p0.x()), (p1.y() + factor_p1p0 * p1p0.y())); + + FloatPoint orth_p1p0(p1p0.y(), -p1p0.x()); + float orth_p1p0_length = sqrt(orth_p1p0.x() * orth_p1p0.x() + orth_p1p0.y() * orth_p1p0.y()); + float factor_ra = radius / orth_p1p0_length; + + // angle between orth_p1p0 and p1p2 to get the right vector orthographic to p1p0 + double cos_alpha = (orth_p1p0.x() * p1p2.x() + orth_p1p0.y() * p1p2.y()) / (orth_p1p0_length * p1p2_length); + if (cos_alpha < 0.f) + orth_p1p0 = FloatPoint(-orth_p1p0.x(), -orth_p1p0.y()); + + FloatPoint p((t_p1p0.x() + factor_ra * orth_p1p0.x()), (t_p1p0.y() + factor_ra * orth_p1p0.y())); + + // calculate angles for addArc + orth_p1p0 = FloatPoint(-orth_p1p0.x(), -orth_p1p0.y()); + float sa = acos(orth_p1p0.x() / orth_p1p0_length); + if (orth_p1p0.y() < 0.f) + sa = 2 * piDouble - sa; + + // anticlockwise logic + bool anticlockwise = false; + + float factor_p1p2 = tangent / p1p2_length; + FloatPoint t_p1p2((p1.x() + factor_p1p2 * p1p2.x()), (p1.y() + factor_p1p2 * p1p2.y())); + FloatPoint orth_p1p2((t_p1p2.x() - p.x()),(t_p1p2.y() - p.y())); + float orth_p1p2_length = sqrtf(orth_p1p2.x() * orth_p1p2.x() + orth_p1p2.y() * orth_p1p2.y()); + float ea = acos(orth_p1p2.x() / orth_p1p2_length); + if (orth_p1p2.y() < 0) + ea = 2 * piDouble - ea; + if ((sa > ea) && ((sa - ea) < piDouble)) + anticlockwise = true; + if ((sa < ea) && ((ea - sa) > piDouble)) + anticlockwise = true; + + m_path->lineTo(t_p1p0); + + addArc(p, radius, sa, ea, anticlockwise); } void Path::closeSubpath() diff --git a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp index 2de2125..2c730a6 100644 --- a/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp +++ b/src/3rdparty/webkit/WebCore/platform/network/qt/QNetworkReplyHandler.cpp @@ -269,8 +269,10 @@ void QNetworkReplyHandler::sendResponseIfNeeded() const bool isLocalFileReply = (m_reply->url().scheme() == QLatin1String("file")); int statusCode = m_reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt(); - if (!isLocalFileReply) + if (!isLocalFileReply) { response.setHTTPStatusCode(statusCode); + response.setHTTPStatusText(m_reply->attribute(QNetworkRequest::HttpReasonPhraseAttribute).toByteArray().constData()); + } else if (m_reply->error() == QNetworkReply::ContentNotFoundError) response.setHTTPStatusCode(404); diff --git a/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp b/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp index cc8acd2..b25ae7a 100644 --- a/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp +++ b/src/3rdparty/webkit/WebCore/platform/qt/WheelEventQt.cpp @@ -21,7 +21,9 @@ #include "PlatformWheelEvent.h" #include "PlatformMouseEvent.h" +#include "Scrollbar.h" +#include <qapplication.h> #include <QWheelEvent> namespace WebCore { @@ -54,9 +56,14 @@ PlatformWheelEvent::PlatformWheelEvent(QWheelEvent* e) m_deltaY = (e->delta() / 120); } - // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event - m_deltaX *= horizontalLineMultiplier(); - m_deltaY *= verticalLineMultiplier(); + m_deltaX *= QApplication::wheelScrollLines(); + // use the same single scroll step as QTextEdit (in + // QTextEditPrivate::init [h,v]bar->setSingleStep ) + // and divide by the default WebKit scroll step to + // get the Qt mouse wheel scroll behavior + static const float cDefaultQtScrollStep = 20.f; + m_deltaY *= QApplication::wheelScrollLines() * + (cDefaultQtScrollStep / cMouseWheelPixelsPerLineStep); } #endif // QT_NO_WHEELEVENT diff --git a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp index 1d7d570..3229922 100644 --- a/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/mac/PluginViewMac.cpp @@ -220,11 +220,11 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) switch (variable) { case NPNVToolkit: - *((uint32 *)value) = 0; + *static_cast<uint32*>(value) = 0; return NPERR_NO_ERROR; case NPNVjavascriptEnabledBool: - *((uint32 *)value) = true; + *static_cast<NPBool*>(value) = true; return NPERR_NO_ERROR; default: @@ -275,7 +275,7 @@ NPError PluginView::getValue(NPNVariable variable, void* value) } case NPNVsupportsCoreGraphicsBool: - *((uint32 *)value) = true; + *static_cast<NPBool*>(value) = true; return NPERR_NO_ERROR; default: diff --git a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp index 5aa8933..c8dd0e5 100644 --- a/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp +++ b/src/3rdparty/webkit/WebCore/plugins/qt/PluginViewQt.cpp @@ -301,15 +301,15 @@ NPError PluginView::getValueStatic(NPNVariable variable, void* value) { switch (variable) { case NPNVToolkit: - *((uint32 *)value) = 0; + *static_cast<uint32*>(value) = 0; return NPERR_NO_ERROR; case NPNVSupportsXEmbedBool: - *((uint32 *)value) = true; + *static_cast<NPBool*>(value) = true; return NPERR_NO_ERROR; case NPNVjavascriptEnabledBool: - *((uint32 *)value) = true; + *static_cast<NPBool*>(value) = true; return NPERR_NO_ERROR; default: diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp index e17306d..01b68eb 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebpage.cpp @@ -1095,7 +1095,7 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const This enum describes the types of action which can be performed on the web page. Actions only have an effect when they are applicable. The availability of - actions can be be determined by checking \l{QAction::}{enabled()} on the + actions can be be determined by checking \l{QAction::}{isEnabled()} on the action returned by \l{QWebPage::}{action()}. One method of enabling the text editing, cursor movement, and text selection actions @@ -1198,18 +1198,18 @@ QVariant QWebPage::inputMethodQuery(Qt::InputMethodQuery property) const Suppose we have a \c Thumbnail class as follows: - \snippet doc/src/snippets/webkit/webpage/main.cpp 0 + \snippet webkitsnippets/webpage/main.cpp 0 The \c Thumbnail's constructor takes in a \a url. We connect our QWebPage object's \l{QWebPage::}{loadFinished()} signal to our private slot, \c render(). - \snippet doc/src/snippets/webkit/webpage/main.cpp 1 + \snippet webkitsnippets/webpage/main.cpp 1 The \c render() function shows how we can paint a thumbnail using a QWebPage object. - \snippet doc/src/snippets/webkit/webpage/main.cpp 2 + \snippet webkitsnippets/webpage/main.cpp 2 We begin by setting the \l{QWebPage::viewportSize()}{viewportSize} and then we instantiate a QImage object, \c image, with the same size as our @@ -1450,9 +1450,16 @@ void QWebPage::triggerAction(WebAction action, bool checked) openNewWindow(url, frame); break; } - case CopyLinkToClipboard: + case CopyLinkToClipboard: { +#if defined(Q_WS_X11) + bool oldSelectionMode = Pasteboard::generalPasteboard()->isSelectionMode(); + Pasteboard::generalPasteboard()->setSelectionMode(true); + editor->copyURL(d->hitTestResult.linkUrl(), d->hitTestResult.linkText()); + Pasteboard::generalPasteboard()->setSelectionMode(oldSelectionMode); +#endif editor->copyURL(d->hitTestResult.linkUrl(), d->hitTestResult.linkText()); break; + } case OpenImageInNewWindow: openNewWindow(d->hitTestResult.imageUrl(), frame); break; diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp index a843eba..9753f4f 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebview.cpp @@ -86,7 +86,7 @@ public: Qt Widgets, the show() function must be invoked in order to display QWebView. The snippet below illustrates this: - \snippet doc/src/snippets/webkit/simple/main.cpp Using QWebView + \snippet webkitsnippets/simple/main.cpp Using QWebView Alternatively, setUrl() can also be used to load a web site. If you have the HTML content readily available, you can use setHtml() instead. @@ -325,7 +325,7 @@ void QWebView::setContent(const QByteArray &data, const QString &mimeType, const It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 0 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 0 */ QWebHistory *QWebView::history() const { @@ -337,7 +337,7 @@ QWebHistory *QWebView::history() const It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 1 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 1 \sa QWebSettings::globalSettings() */ @@ -429,7 +429,7 @@ QAction *QWebView::pageAction(QWebPage::WebAction action) const The following example triggers the copy action and therefore copies any selected text to the clipboard. - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 2 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 2 \sa pageAction() */ @@ -606,7 +606,7 @@ void QWebView::print(QPrinter *printer) const It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 3 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 3 \sa reload(), pageAction(), loadFinished() */ @@ -622,7 +622,7 @@ void QWebView::stop() It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 4 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 4 \sa forward(), pageAction() */ @@ -638,7 +638,7 @@ void QWebView::back() It is equivalent to - \snippet doc/src/snippets/code/src_3rdparty_webkit_WebKit_qt_Api_qwebview.cpp 5 + \snippet webkitsnippets/qtwebkit_qwebview_snippet.cpp 5 \sa back(), pageAction() */ diff --git a/src/3rdparty/webkit/WebKit/qt/ChangeLog b/src/3rdparty/webkit/WebKit/qt/ChangeLog index 5a23200..c3bd633 100644 --- a/src/3rdparty/webkit/WebKit/qt/ChangeLog +++ b/src/3rdparty/webkit/WebKit/qt/ChangeLog @@ -1,3 +1,42 @@ +2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> + + Rubber-stamped by Ariya Hidayat. + + Fix qdoc warning about link to QAction::isEnabled. + + * Api/qwebpage.cpp: + +2009-04-24 Simon Hausmann <simon.hausmann@nokia.com> + + Reviewed by Ariya Hidayat. + + Added support for generating API docs in the Qt build using "make docs" + + Added code snippets and overview from the Qt sources references in the API docs. + + * Api/qwebpage.cpp: Adjust paths to snippets. + * Api/qwebview.cpp: Ditto. + * docs/docs.pri: Added. + * docs/qtwebkit.qdoc: Added. + * docs/qtwebkit.qdocconf: Added. + * docs/webkitsnippets/qtwebkit_build_snippet.qdoc: Added. + * docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp: Added. + * docs/webkitsnippets/simple/main.cpp: Added. + * docs/webkitsnippets/simple/simple.pro: Added. + * docs/webkitsnippets/webpage/main.cpp: Added. + * docs/webkitsnippets/webpage/webpage.pro: Added. + +2009-03-02 Benjamin C Meyer <benjamin.meyer@torchmobile.com> + + Reviewed by George Staikos. + + https://bugs.webkit.org/show_bug.cgi?id=21230 + On X11 match the behavior of Firefox and also copy the url to the + clipboard selection when the action Copy Link Location is executed. + + * Api/qwebpage.cpp: + (QWebPage::triggerAction): + 2009-03-07 Adam Treat <adam.treat@torchmobile.com> Reviewed by Cameron Zwarich. diff --git a/src/3rdparty/webkit/WebKit/qt/docs/docs.pri b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri new file mode 100644 index 0000000..4a8c165 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/docs.pri @@ -0,0 +1,15 @@ +include(../../../WebKit.pri) + +unix { + QDOC = SRCDIR=$$PWD/../../.. OUTPUT_DIR=$$OUTPUT_DIR $$(QTDIR)/tools/qdoc3/qdoc3 +} else { + QDOC = $$(QTDIR)\tools\qdoc3\release\qdoc3.exe +} + +unix { +docs.commands = $$QDOC $$PWD/qtwebkit.qdocconf +} else { +docs.commands = \"$$QDOC $$PWD/qtwebkit.qdocconf\" +} + +QMAKE_EXTRA_TARGETS += docs diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc new file mode 100644 index 0000000..06305e0 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdoc @@ -0,0 +1,189 @@ +/*! + \module QtWebKit + \title QtWebKit Module + \contentspage Qt's Modules + \previouspage QtSvg + \nextpage QtXml + \ingroup architecture + \ingroup modules + \brief An introduction to the QtWebKit module. + + \keyword Browser + \keyword Web Browser + + \since 4.4 + + QtWebKit provides a Web browser engine that makes it easy to embed content + from the World Wide Web into your Qt application. At the same time Web + content can be enhanced with native controls. + + QtWebKit provides facilities for rendering of HyperText Markup Language + (HTML), Extensible HyperText Markup Language (XHTML) and Scalable Vector + Graphics (SVG) documents, styled using Cascading Style Sheets (CSS) and + scripted with JavaScript. + + A bridge between the JavaScript execution environment and the Qt object + model makes it possible for custom QObjects to be scripted. Integration + with the Qt networking module enables Web pages to be transparently loaded + from Web servers, the local file system or even the Qt resource system. + + In addition to providing pure rendering features, HTML documents can be + made fully editable to the user through the use of the \c{contenteditable} + attribute on HTML elements. + + QtWebKit is based on the Open Source WebKit engine. More information about + WebKit itself can be found on the \l{WebKit Open Source Project} Web site. + + The QtWebKit module is part of the \l{Qt Full Framework Edition}, and the + \l{Open Source Versions of Qt}. + + \note Building the QtWebKit module with debugging symbols is problematic + on many platforms due to the size of the WebKit engine. We recommend + building the module in release mode only for embedded platforms. + + \note Web site icons, also known as "FavIcons", are currently not supported + on Windows. We plan to address this in a future release. + + \note WebKit has certain minimum requirements that must be met on + Embedded Linux systems. See the \l{Qt for Embedded Linux Requirements} + document for more information. + + Topics: + + \tableofcontents + + \section1 Configuring the Build Process + + Applications that use QtWebKit's classes need to be configured to be built + against the QtWebKit module. The following declaration in a \c qmake + project file ensures that an application is compiled and linked + appropriately: + + \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 0 + + This line is necessary because only the QtCore and QtGui modules are used + in the default build process. + + To include the definitions of the module's classes, use the following + directive: + + \snippet webkitsnippets/qtwebkit_build_snippet.qdoc 1 + + \section1 Architecture + + The easiest way to render content is through the QWebView class. As a + widget it can be embedded into your forms or a graphics view, and it + provides convenience functions for downloading and rendering web sites. + + \snippet webkitsnippets/simple/main.cpp Using QWebView + + QWebView acts as a view onto Web pages, each of which is represented by an + instance of the QWebPage class. QWebPage provides access to the document + structure in a page, describing features such as frames, the navigation + history, and the undo/redo stack for editable content. + + HTML documents can be nested using frames in a frameset. An individual + frame in HTML is represented using the QWebFrame class. It includes the + bridge to the JavaScript window object and can be painted using QPainter. + Each QWebPage has one QWebFrame object as its main frame. + + Individual browser features, defaults and other settings can be configured + through the QWebSettings class. It is possible to provide defaults for all + QWebPage instances through the default settings. Individual attributes + can be overidden by the page specific settings object. + + \section1 Netscape Plugin Support + + Since WebKit supports the Netscape Plugin API, Qt applications can display + Web pages that embed common plugins, as long as the user has the appropriate + binary files for those plugins installed. + + The following locations are searched for plugins: + + \table + \header \o Linux/Unix \o Windows + \row \o{1,3} + \list + \o \c{.mozilla/plugins} in the user's home directory + \o \c{.netscape/plugins} in the user's home directory + \o System locations, such as + \list + \o \c{/usr/lib/browser/plugins} + \o \c{/usr/local/lib/mozilla/plugins} + \o \c{/usr/lib/firefox/plugins} + \o \c{/usr/lib64/browser-plugins} + \o \c{/usr/lib/browser-plugins} + \o \c{/usr/lib/mozilla/plugins} + \o \c{/usr/local/netscape/plugins} + \o \c{/opt/mozilla/plugins} + \o \c{/opt/mozilla/lib/plugins} + \o \c{/opt/netscape/plugins} + \o \c{/opt/netscape/communicator/plugins} + \o \c{/usr/lib/netscape/plugins} + \o \c{/usr/lib/netscape/plugins-libc5} + \o \c{/usr/lib/netscape/plugins-libc6} + \o \c{/usr/lib64/netscape/plugins} + \o \c{/usr/lib64/mozilla/plugins} + \endlist + \o Locations specified by environment variables: + \list + \o \c{$MOZILLA_HOME/plugins} + \o \c{$MOZ_PLUGIN_PATH} + \o \c{$QTWEBKIT_PLUGIN_PATH} + \endlist + \endlist + + \o + \list + \o The user's \c{Application Data\Mozilla\plugins} directory + \o Standard system locations of plugins for Quicktime, Flash, etc. + \endlist + + \row + \raw HTML + <th class="qt-style">Mac OS X</th> + \endraw + \row + \o + \list + \o \c{Library/Internet Plug-Ins} in the user's home directory + \o The system \c{/Library/Internet Plug-Ins} directory + \endlist + \endtable + + \section1 License Information + + This is a snapshot of the Qt port of WebKit. The exact version information + can be found in the \c{src/3rdparty/webkit/VERSION} file supplied with Qt. + + Qt Commercial Edition licensees that wish to distribute applications that + use the QtWebKit module need to be aware of their obligations under the + GNU Lesser General Public License (LGPL). + + Developers using the Open Source Edition can choose to redistribute + the module under the appropriate version of the GNU LGPL; version 2.1 + for applications and libraries licensed under the GNU GPL version 2, + or version 3 for applications and libraries licensed under the GNU + GPL version 2. + + \legalese + WebKit is licensed under the GNU Library General Public License. + Individual contributor names and copyright dates can be found + inline in the code. + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. + \endlegalese +*/ diff --git a/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf new file mode 100644 index 0000000..e60e586 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/qtwebkit.qdocconf @@ -0,0 +1,195 @@ +# Run qdoc from the directory that contains this file. + +project = qtwebkit +description = "Qt WebKit API Documentation" + +headerdirs = $SRCDIR/WebKit/qt/Api +sourcedirs = $SRCDIR/WebKit/qt/Api $SRCDIR/WebKit/qt/docs +outputdir = $OUTPUT_DIR/doc/html +outputformats = HTML +sources.fileextensions = "*.cpp *.doc *.qdoc *.h" +exampledirs = $SRCDIR/WebKit/qt/docs + +indexes = $QTDIR/doc/html/qt.index + +# macros.qdocconf + +macro.aring.HTML = "å" +macro.Auml.HTML = "Ä" +macro.author = "\\bold{Author:}" +macro.br.HTML = "<br />" +macro.BR.HTML = "<br />" +macro.aacute.HTML = "á" +macro.eacute.HTML = "é" +macro.iacute.HTML = "í" +macro.gui = "\\bold" +macro.hr.HTML = "<hr />" +macro.key = "\\bold" +macro.menu = "\\bold" +macro.note = "\\bold{Note:}" +macro.oslash.HTML = "ø" +macro.ouml.HTML = "ö" +macro.QA = "\\e{Qt Assistant}" +macro.QD = "\\e{Qt Designer}" +macro.QL = "\\e{Qt Linguist}" +macro.param = "\\e" +macro.raisedaster.HTML = "<sup>*</sup>" +macro.reg.HTML = "<sup>®</sup>" +macro.return = "Returns" +macro.starslash = "\\c{*/}" +macro.uuml.HTML = "ü" +macro.mdash.HTML = "—" + +# compat.qdocconf + +alias.i = e +alias.include = input + +macro.0 = "\\\\0" +macro.b = "\\\\b" +macro.n = "\\\\n" +macro.r = "\\\\r" +macro.i = "\\o" +macro.i11 = "\\o{1,1}" +macro.i12 = "\\o{1,2}" +macro.i13 = "\\o{1,3}" +macro.i14 = "\\o{1,4}" +macro.i15 = "\\o{1,5}" +macro.i16 = "\\o{1,6}" +macro.i17 = "\\o{1,7}" +macro.i18 = "\\o{1,8}" +macro.i19 = "\\o{1,9}" +macro.i21 = "\\o{2,1}" +macro.i31 = "\\o{3,1}" +macro.i41 = "\\o{4,1}" +macro.i51 = "\\o{5,1}" +macro.i61 = "\\o{6,1}" +macro.i71 = "\\o{7,1}" +macro.i81 = "\\o{8,1}" +macro.i91 = "\\o{9,1}" +macro.img = "\\image" +macro.endquote = "\\endquotation" + +spurious = "Missing comma in .*" \ + "Missing pattern .*" + +# Doxygen compatibility commands + +macro.see = "\\sa" +macro.function = "\\fn" + +# qt-cpp-ignore.qdocconf + +Cpp.ignoretokens = QAXFACTORY_EXPORT \ + QDESIGNER_COMPONENTS_LIBRARY \ + QDESIGNER_EXTENSION_LIBRARY \ + QDESIGNER_SDK_LIBRARY \ + QDESIGNER_SHARED_LIBRARY \ + QDESIGNER_UILIB_LIBRARY \ + QM_EXPORT_CANVAS \ + QM_EXPORT_DNS \ + QM_EXPORT_DOM \ + QM_EXPORT_FTP \ + QM_EXPORT_HTTP \ + QM_EXPORT_ICONVIEW \ + QM_EXPORT_NETWORK \ + QM_EXPORT_OPENGL \ + QM_EXPORT_SQL \ + QM_EXPORT_TABLE \ + QM_EXPORT_WORKSPACE \ + QM_EXPORT_XML \ + QT_ASCII_CAST_WARN \ + QT_ASCII_CAST_WARN_CONSTRUCTOR \ + QT_BEGIN_HEADER \ + QT_DESIGNER_STATIC \ + QT_END_HEADER \ + QT_FASTCALL \ + QT_WIDGET_PLUGIN_EXPORT \ + Q_COMPAT_EXPORT \ + Q_CORE_EXPORT \ + Q_EXPLICIT \ + Q_EXPORT \ + Q_EXPORT_CODECS_CN \ + Q_EXPORT_CODECS_JP \ + Q_EXPORT_CODECS_KR \ + Q_EXPORT_PLUGIN \ + Q_GFX_INLINE \ + Q_GUI_EXPORT \ + Q_GUI_EXPORT_INLINE \ + Q_GUI_EXPORT_STYLE_CDE \ + Q_GUI_EXPORT_STYLE_COMPACT \ + Q_GUI_EXPORT_STYLE_MAC \ + Q_GUI_EXPORT_STYLE_MOTIF \ + Q_GUI_EXPORT_STYLE_MOTIFPLUS \ + Q_GUI_EXPORT_STYLE_PLATINUM \ + Q_GUI_EXPORT_STYLE_POCKETPC \ + Q_GUI_EXPORT_STYLE_SGI \ + Q_GUI_EXPORT_STYLE_WINDOWS \ + Q_GUI_EXPORT_STYLE_WINDOWSXP \ + QHELP_EXPORT \ + Q_INLINE_TEMPLATE \ + Q_INTERNAL_WIN_NO_THROW \ + Q_NETWORK_EXPORT \ + Q_OPENGL_EXPORT \ + Q_OUTOFLINE_TEMPLATE \ + Q_SQL_EXPORT \ + Q_SVG_EXPORT \ + Q_SCRIPT_EXPORT \ + Q_TESTLIB_EXPORT \ + Q_TYPENAME \ + Q_XML_EXPORT \ + Q_XMLSTREAM_EXPORT \ + Q_XMLPATTERNS_EXPORT \ + QDBUS_EXPORT \ + QT_BEGIN_NAMESPACE \ + QT_BEGIN_INCLUDE_NAMESPACE \ + QT_END_NAMESPACE \ + QT_END_INCLUDE_NAMESPACE \ + PHONON_EXPORT \ + EXTENSIONSYSTEM_EXPORT +Cpp.ignoredirectives = Q_DECLARE_HANDLE \ + Q_DECLARE_INTERFACE \ + Q_DECLARE_METATYPE \ + Q_DECLARE_OPERATORS_FOR_FLAGS \ + Q_DECLARE_PRIVATE \ + Q_DECLARE_PUBLIC \ + Q_DECLARE_SHARED \ + Q_DECLARE_TR_FUNCTIONS \ + Q_DECLARE_TYPEINFO \ + Q_DISABLE_COPY \ + QT_FORWARD_DECLARE_CLASS \ + Q_DUMMY_COMPARISON_OPERATOR \ + Q_ENUMS \ + Q_FLAGS \ + Q_INTERFACES \ + __attribute__ \ + K_DECLARE_PRIVATE \ + PHONON_OBJECT \ + PHONON_HEIR + + + +HTML.style = "" \ + "h3.fn,span.fn { margin-left: 1cm; text-indent: -1cm; }"\ + "a:link { color: #004faf; text-decoration: none }"\ + "a:visited { color: #672967; text-decoration: none }"\ + "td.postheader { font-family: sans-serif }"\ + "tr.address { font-family: sans-serif }"\ + "body { background: #ffffff; color: black }"\ + "table tr.odd { background: #f0f0f0; color: black; }"\ + "table tr.even { background: #e4e4e4; color: black; }"\ + "table.annotated th { padding: 3px; text-align: left }"\ + "table.annotated td { padding: 3px; } "\ + "table tr pre { padding-top: none; padding-bottom: none; padding-left: none; padding-right: none; border: none; background: none }"\ + "tr.qt-style { background: #a2c511; color: black }"\ + "body pre { padding: 0.2em; border: #e7e7e7 1px solid; background: #f1f1f1; color: black }"\ + "span.preprocessor, span.preprocessor a { color: darkblue; }"\ + "span.comment { color: darkred; font-style: italic }"\ + "span.string,span.char { color: darkgreen; }"\ + ".title { text-align: center }"\ + ".subtitle { font-size: 0.8em }"\ + ".small-subtitle { font-size: 0.65em }" + +HTML.postheader = "" + +HTML.footer = "" diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc new file mode 100644 index 0000000..d4fc2bd --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_build_snippet.qdoc @@ -0,0 +1,8 @@ +//! [0] +QT += webkit +//! [0] + + +//! [1] +#include <QtWebKit> +//! [1] diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp new file mode 100644 index 0000000..f04cd29 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/qtwebkit_qwebview_snippet.cpp @@ -0,0 +1,35 @@ + +void wrapInFunction() +{ + +//! [0] + view->page()->history(); +//! [0] + + +//! [1] + view->page()->settings(); +//! [1] + + +//! [2] + view->triggerAction(QWebPage::Copy); +//! [2] + + +//! [3] + view->page()->triggerPageAction(QWebPage::Stop); +//! [3] + + +//! [4] + view->page()->triggerPageAction(QWebPage::GoBack); +//! [4] + + +//! [5] + view->page()->triggerPageAction(QWebPage::GoForward); +//! [5] + +} + diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp new file mode 100644 index 0000000..82f5b6c --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/main.cpp @@ -0,0 +1,34 @@ +/* + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include <QApplication> +#include <QUrl> +#include <QWebView> + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + QWidget *parent = 0; +//! [Using QWebView] + QWebView *view = new QWebView(parent); + view->load(QUrl("http://qtsoftware.com/")); + view->show(); +//! [Using QWebView] + return app.exec(); +} diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro new file mode 100644 index 0000000..61cd3bf --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/simple/simple.pro @@ -0,0 +1,2 @@ +QT += webkit +SOURCES = main.cpp diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp new file mode 100644 index 0000000..b91bc30 --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/main.cpp @@ -0,0 +1,81 @@ +/* + Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies) + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Library General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Library General Public License for more details. + + You should have received a copy of the GNU Library General Public License + along with this library; see the file COPYING.LIB. If not, write to + the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA. +*/ + +#include <QtGui> +#include <QWebPage> +#include <QWebFrame> + +//! [0] +class Thumbnailer : public QObject +{ + Q_OBJECT + +public: + Thumbnailer(const QUrl &url); + +signals: + void finished(); + +private slots: + void render(); + +private: + QWebPage page; + +}; +//! [0] + +int main(int argc, char *argv[]) +{ + QApplication app(argc, argv); + + Thumbnailer thumbnail(QUrl("http://qtsoftware.com")); + + QObject::connect(&thumbnail, SIGNAL(finished()), + &app, SLOT(quit())); + + return app.exec(); +} + +//! [1] +Thumbnailer::Thumbnailer(const QUrl &url) +{ + page.mainFrame()->load(url); + connect(&page, SIGNAL(loadFinished(bool)), + this, SLOT(render())); +} +//! [1] + +//! [2] +void Thumbnailer::render() +{ + page.setViewportSize(page.mainFrame()->contentsSize()); + QImage image(page.viewportSize(), QImage::Format_ARGB32); + QPainter painter(&image); + + page.mainFrame()->render(&painter); + painter.end(); + + QImage thumbnail = image.scaled(400, 400); + thumbnail.save("thumbnail.png"); + + emit finished(); +} +//! [2] +#include "main.moc" diff --git a/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro new file mode 100644 index 0000000..fcad03b --- /dev/null +++ b/src/3rdparty/webkit/WebKit/qt/docs/webkitsnippets/webpage/webpage.pro @@ -0,0 +1,3 @@ +CONFIG += console +QT += webkit +SOURCES = main.cpp
\ No newline at end of file diff --git a/src/corelib/codecs/qtsciicodec.cpp b/src/corelib/codecs/qtsciicodec.cpp index 14d2c9c..0ec0567 100644 --- a/src/corelib/codecs/qtsciicodec.cpp +++ b/src/corelib/codecs/qtsciicodec.cpp @@ -180,8 +180,7 @@ QByteArray QTsciiCodec::name() const */ int QTsciiCodec::mibEnum() const { - /* There is no MIBEnum for TSCII now */ - return -3197; + return 2107; } static const int UnToTsLast = 124; // 125 items -- so the last will be 124 diff --git a/src/corelib/codecs/qutfcodec.cpp b/src/corelib/codecs/qutfcodec.cpp index 281bf75..1ac592e 100644 --- a/src/corelib/codecs/qutfcodec.cpp +++ b/src/corelib/codecs/qutfcodec.cpp @@ -413,9 +413,7 @@ QByteArray QUtf16Codec::name() const QList<QByteArray> QUtf16Codec::aliases() const { - QList<QByteArray> list; - list << "ISO-10646-UCS-2"; - return list; + return QList<QByteArray>(); } int QUtf16BECodec::mibEnum() const diff --git a/src/corelib/global/qfeatures.h b/src/corelib/global/qfeatures.h index c172f5f..f11c9df 100644 --- a/src/corelib/global/qfeatures.h +++ b/src/corelib/global/qfeatures.h @@ -386,11 +386,6 @@ #define QT_NO_PHONON_VOLUMESLIDER #endif -// QPrinter -#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM)) -#define QT_NO_PRINTER -#endif - // QProcess #if !defined(QT_NO_PROCESS) && (defined(QT_NO_THREAD)) #define QT_NO_PROCESS @@ -516,6 +511,11 @@ #define QT_NO_LIBRARY #endif +// QPrinter +#if !defined(QT_NO_PRINTER) && (defined(QT_NO_TEXTSTREAM) || defined(QT_NO_PICTURE)) +#define QT_NO_PRINTER +#endif + // QScrollArea #if !defined(QT_NO_SCROLLAREA) && (defined(QT_NO_SCROLLBAR)) #define QT_NO_SCROLLAREA @@ -646,11 +646,6 @@ #define QT_NO_WHATSTHIS #endif -// Common UNIX Printing System -#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY)) -#define QT_NO_CUPS -#endif - // QDirModel #if !defined(QT_NO_DIRMODEL) && (defined(QT_NO_ITEMVIEWS)) #define QT_NO_DIRMODEL @@ -731,6 +726,11 @@ #define QT_NO_COMPLETER #endif +// Common UNIX Printing System +#if !defined(QT_NO_CUPS) && (defined(QT_NO_PRINTER) || defined(QT_NO_LIBRARY)) +#define QT_NO_CUPS +#endif + // QDataWidgetMapper #if !defined(QT_NO_DATAWIDGETMAPPER) && (defined(QT_NO_ITEMVIEWS) || defined(QT_NO_PROPERTIES)) #define QT_NO_DATAWIDGETMAPPER @@ -762,7 +762,7 @@ #endif // QPrintPreviewWidget -#if !defined(QT_NO_PRINTPREVIEWWIDGET) && (defined(QT_NO_GRAPHICSVIEW) || defined(QT_NO_PRINTER) || defined(QT_NO_PICTURE)) +#if !defined(QT_NO_PRINTPREVIEWWIDGET) && (defined(QT_NO_GRAPHICSVIEW) || defined(QT_NO_PRINTER)) #define QT_NO_PRINTPREVIEWWIDGET #endif diff --git a/src/corelib/kernel/qcoreapplication.cpp b/src/corelib/kernel/qcoreapplication.cpp index a23b2dd..e4bd664 100644 --- a/src/corelib/kernel/qcoreapplication.cpp +++ b/src/corelib/kernel/qcoreapplication.cpp @@ -377,12 +377,12 @@ QString qAppName() QLibrary) can be retrieved with libraryPaths() and manipulated by setLibraryPaths(), addLibraryPath(), and removeLibraryPath(). - On Unix/Linux Qt is configured to use the system local settings by - default. This can cause a conflict when using POSIX functions, for - instance, when converting between data types such as floats and - strings, since the notation may differ between locales. To get - around this problem call the POSIX function setlocale(LC_NUMERIC,"C") - right after initializing QApplication or QCoreApplication to reset + On Unix/Linux Qt is configured to use the system local settings by + default. This can cause a conflict when using POSIX functions, for + instance, when converting between data types such as floats and + strings, since the notation may differ between locales. To get + around this problem call the POSIX function setlocale(LC_NUMERIC,"C") + right after initializing QApplication or QCoreApplication to reset the locale that is used for number formatting to "C"-locale. \sa QApplication, QAbstractEventDispatcher, QEventLoop, @@ -1908,8 +1908,7 @@ QStringList QCoreApplication::arguments() l1arg == "-qdebug" || l1arg == "-reverse" || l1arg == "-stylesheet" || - l1arg == "-widgetcount" || - l1arg == "-direct3d") + l1arg == "-widgetcount") ; else if (l1arg.startsWith("-style=")) ; diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index fc1cefb..4b4dfe5 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -260,6 +260,7 @@ QT_BEGIN_NAMESPACE \omitvalue ApplicationActivated \omitvalue ApplicationDeactivated \omitvalue MacGLWindowChange + \omitvalue MacGLClearDrawable \omitvalue NetworkReplyUpdated \omitvalue FutureCallOut \omitvalue CocoaRequestModal diff --git a/src/corelib/kernel/qeventdispatcher_glib.cpp b/src/corelib/kernel/qeventdispatcher_glib.cpp index 3fd768a..3c5b277 100644 --- a/src/corelib/kernel/qeventdispatcher_glib.cpp +++ b/src/corelib/kernel/qeventdispatcher_glib.cpp @@ -42,6 +42,7 @@ #include "qeventdispatcher_glib_p.h" #include "qeventdispatcher_unix_p.h" +#include <private/qmutexpool_p.h> #include <private/qthread_p.h> #include "qcoreapplication.h" @@ -224,6 +225,8 @@ QEventDispatcherGlibPrivate::QEventDispatcherGlibPrivate(GMainContext *context) : mainContext(context) { if (qgetenv("QT_NO_THREADED_GLIB").isEmpty()) { + static int dummyValue = 0; // only used for its address + QMutexLocker locker(QMutexPool::instance()->get(&dummyValue)); if (!g_thread_supported()) g_thread_init(NULL); } diff --git a/src/corelib/kernel/qeventloop.cpp b/src/corelib/kernel/qeventloop.cpp index 92bdf73..600f787 100644 --- a/src/corelib/kernel/qeventloop.cpp +++ b/src/corelib/kernel/qeventloop.cpp @@ -188,8 +188,9 @@ int QEventLoop::exec(ProcessEventsFlags flags) d->threadData->eventLoops.push(this); // remove posted quit events when entering a new event loop - if (qApp->thread() == thread()) - QCoreApplication::removePostedEvents(qApp, QEvent::Quit); + QCoreApplication *app = QCoreApplication::instance(); + if (app && app->thread() == thread()) + QCoreApplication::removePostedEvents(app, QEvent::Quit); #if defined(QT_NO_EXCEPTIONS) while (!d->exit) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index b4427c0..b53e91f 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -71,27 +71,6 @@ QT_BEGIN_NAMESPACE # define FLT_DIG 6 #endif - -static const void *constDataHelper(const QVariant::Private &d) -{ - switch (d.type) { - case QVariant::Int: - return &d.data.i; - case QVariant::UInt: - return &d.data.u; - case QVariant::Bool: - return &d.data.b; - case QVariant::LongLong: - return &d.data.ll; - case QVariant::ULongLong: - return &d.data.ull; - case QVariant::Double: - return &d.data.d; - default: - return d.is_shared ? d.data.shared->ptr : reinterpret_cast<const void *>(&d.data.ptr); - } -} - static void construct(QVariant::Private *x, const void *copy) { x->is_shared = false; @@ -179,6 +158,9 @@ static void construct(QVariant::Private *x, const void *copy) case QVariant::Double: x->data.d = copy ? *static_cast<const double*>(copy) : 0.0; break; + case QMetaType::Float: + x->data.f = copy ? *static_cast<const float*>(copy) : 0.0f; + break; case QVariant::LongLong: x->data.ll = copy ? *static_cast<const qlonglong *>(copy) : Q_INT64_C(0); break; @@ -274,6 +256,7 @@ static void clear(QVariant::Private *d) case QVariant::LongLong: case QVariant::ULongLong: case QVariant::Double: + case QMetaType::Float: break; case QVariant::Invalid: case QVariant::UserType: @@ -342,6 +325,7 @@ static bool isNull(const QVariant::Private *d) case QVariant::ULongLong: case QVariant::Bool: case QVariant::Double: + case QMetaType::Float: break; } return d->is_null; @@ -433,6 +417,8 @@ static bool compare(const QVariant::Private *a, const QVariant::Private *b) return a->data.b == b->data.b; case QVariant::Double: return a->data.d == b->data.d; + case QMetaType::Float: + return a->data.f == b->data.f; case QVariant::Date: return *v_cast<QDate>(a) == *v_cast<QDate>(b); case QVariant::Time: @@ -491,7 +477,7 @@ static qlonglong qMetaTypeNumber(const QVariant::Private *d) case QMetaType::Long: return qlonglong(*static_cast<long *>(d->data.shared->ptr)); case QMetaType::Float: - return qRound64(*static_cast<float *>(d->data.shared->ptr)); + return qRound64(d->data.f); case QVariant::Double: return qRound64(d->data.d); } @@ -628,7 +614,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, *str = QString::number(qMetaTypeUNumber(d)); break; case QMetaType::Float: - *str = QString::number(*static_cast<float *>(d->data.shared->ptr), 'g', FLT_DIG); + *str = QString::number(d->data.f, 'g', FLT_DIG); break; case QVariant::Double: *str = QString::number(d->data.d, 'g', DBL_DIG); @@ -799,7 +785,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, *ba = QByteArray::number(d->data.d, 'g', DBL_DIG); break; case QMetaType::Float: - *ba = QByteArray::number(*static_cast<float *>(d->data.shared->ptr), 'g', FLT_DIG); + *ba = QByteArray::number(d->data.f, 'g', FLT_DIG); break; case QMetaType::Char: case QMetaType::UChar: @@ -901,7 +887,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, *f = double(d->data.b); break; case QMetaType::Float: - *f = *static_cast<float *>(d->data.shared->ptr); + *f = double(d->data.f); break; case QVariant::LongLong: case QVariant::Int: @@ -1355,7 +1341,7 @@ void QVariant::create(int type, const void *copy) QVariant::~QVariant() { - if (d.type > Char && (!d.is_shared || !d.data.shared->ref.deref())) + if (d.type > Char && d.type != QMetaType::Float && (!d.is_shared || !d.data.shared->ref.deref())) handler->clear(&d); } @@ -1371,7 +1357,7 @@ QVariant::QVariant(const QVariant &p) { if (d.is_shared) { d.data.shared->ref.ref(); - } else if (p.d.type > Char) { + } else if (p.d.type > Char && p.d.type != QMetaType::Float) { handler->construct(&d, p.constData()); d.is_null = p.d.is_null; } @@ -1565,6 +1551,12 @@ QVariant::QVariant(const char *val) */ /*! + \fn QVariant::QVariant(float val) + + Constructs a new variant with a floating point value, \a val. +*/ + +/*! \fn QVariant::QVariant(const QList<QVariant> &val) Constructs a new variant with a list value, \a val. @@ -1619,44 +1611,44 @@ QVariant::QVariant(double val) { d.is_null = false; d.type = Double; d.data.d = val; } QVariant::QVariant(const QByteArray &val) -{ create(ByteArray, &val); } +{ d.is_null = false; d.type = ByteArray; v_construct<QByteArray>(&d, val); } QVariant::QVariant(const QBitArray &val) -{ create(BitArray, &val); } +{ d.is_null = false; d.type = BitArray; v_construct<QBitArray>(&d, val); } QVariant::QVariant(const QString &val) -{ create(String, &val); } +{ d.is_null = false; d.type = String; v_construct<QString>(&d, val); } QVariant::QVariant(const QChar &val) -{ create (Char, &val); } +{ d.is_null = false; d.type = Char; v_construct<QChar>(&d, val); } QVariant::QVariant(const QLatin1String &val) -{ QString str(val); create(String, &str); } +{ QString str(val); d.is_null = false; d.type = String; v_construct<QString>(&d, str); } QVariant::QVariant(const QStringList &val) -{ create(StringList, &val); } +{ d.is_null = false; d.type = StringList; v_construct<QStringList>(&d, val); } QVariant::QVariant(const QDate &val) -{ create(Date, &val); } +{ d.is_null = false; d.type = Date; v_construct<QDate>(&d, val); } QVariant::QVariant(const QTime &val) -{ create(Time, &val); } +{ d.is_null = false; d.type = Time; v_construct<QTime>(&d, val); } QVariant::QVariant(const QDateTime &val) -{ create(DateTime, &val); } +{ d.is_null = false; d.type = DateTime; v_construct<QDateTime>(&d, val); } QVariant::QVariant(const QList<QVariant> &list) -{ create(List, &list); } +{ d.is_null = false; d.type = List; v_construct<QVariantList>(&d, list); } QVariant::QVariant(const QMap<QString, QVariant> &map) -{ create(Map, &map); } +{ d.is_null = false; d.type = Map; v_construct<QVariantMap>(&d, map); } QVariant::QVariant(const QHash<QString, QVariant> &hash) -{ create(Hash, &hash); } +{ d.is_null = false; d.type = Hash; v_construct<QVariantHash>(&d, hash); } #ifndef QT_NO_GEOM_VARIANT -QVariant::QVariant(const QPoint &pt) { create(Point, &pt); } -QVariant::QVariant(const QPointF &pt) { create (PointF, &pt); } -QVariant::QVariant(const QRectF &r) { create (RectF, &r); } -QVariant::QVariant(const QLineF &l) { create (LineF, &l); } -QVariant::QVariant(const QLine &l) { create (Line, &l); } -QVariant::QVariant(const QRect &r) { create(Rect, &r); } -QVariant::QVariant(const QSize &s) { create(Size, &s); } -QVariant::QVariant(const QSizeF &s) { create(SizeF, &s); } +QVariant::QVariant(const QPoint &pt) { d.is_null = false; d.type = Point; v_construct<QPoint>(&d, pt); } +QVariant::QVariant(const QPointF &pt) { d.is_null = false; d.type = PointF; v_construct<QPointF>(&d, pt); } +QVariant::QVariant(const QRectF &r) { d.is_null = false; d.type = RectF; v_construct<QRectF>(&d, r); } +QVariant::QVariant(const QLineF &l) { d.is_null = false; d.type = LineF; v_construct<QLineF>(&d, l); } +QVariant::QVariant(const QLine &l) { d.is_null = false; d.type = Line; v_construct<QLine>(&d, l); } +QVariant::QVariant(const QRect &r) { d.is_null = false; d.type = Rect; v_construct<QRect>(&d, r); } +QVariant::QVariant(const QSize &s) { d.is_null = false; d.type = Size; v_construct<QSize>(&d, s); } +QVariant::QVariant(const QSizeF &s) { d.is_null = false; d.type = SizeF; v_construct<QSizeF>(&d, s); } #endif -QVariant::QVariant(const QUrl &u) { create(Url, &u); } -QVariant::QVariant(const QLocale &l) { create(Locale, &l); } +QVariant::QVariant(const QUrl &u) { d.is_null = false; d.type = Url; v_construct<QUrl>(&d, u); } +QVariant::QVariant(const QLocale &l) { d.is_null = false; d.type = Locale; v_construct<QLocale>(&d, l); } #ifndef QT_NO_REGEXP -QVariant::QVariant(const QRegExp ®Exp) { create(RegExp, ®Exp); } +QVariant::QVariant(const QRegExp ®Exp) { d.is_null = false; d.type = RegExp; v_construct<QRegExp>(&d, regExp); } #endif QVariant::QVariant(Qt::GlobalColor color) { create(62, &color); } @@ -1721,7 +1713,7 @@ QVariant& QVariant::operator=(const QVariant &variant) if (variant.d.is_shared) { variant.d.data.shared->ref.ref(); d = variant.d; - } else if (variant.d.type > Char) { + } else if (variant.d.type > Char && variant.d.type != QMetaType::Float) { d.type = variant.d.type; handler->construct(&d, variant.constData()); d.is_null = variant.d.is_null; @@ -1907,7 +1899,7 @@ void QVariant::load(QDataStream &s) } // const cast is safe since we operate on a newly constructed variant - if (!QMetaType::load(s, d.type, const_cast<void *>(constDataHelper(d)))) { + if (!QMetaType::load(s, d.type, const_cast<void *>(constData()))) { s.setStatus(QDataStream::ReadCorruptData); qWarning("QVariant::load: unable to load type %d.", d.type); } @@ -1947,7 +1939,7 @@ void QVariant::save(QDataStream &s) const return; } - if (!QMetaType::save(s, d.type, constDataHelper(d))) { + if (!QMetaType::save(s, d.type, constData())) { Q_ASSERT_X(false, "QVariant::save", "Invalid type to save"); qWarning("QVariant::save: unable to save type %d.", d.type); } @@ -2565,57 +2557,63 @@ static const quint32 qCanConvertMatrix[QVariant::LastCoreType + 1] = */ bool QVariant::canConvert(Type t) const { - if (d.type == uint(t)) + //we can treat floats as double + //the reason for not doing it the "proper" way is that QMetaType::Float's value is 135, + //which can't be handled by qCanConvertMatrix + //In addition QVariant::Type doesn't have a Float value, so we're using QMetaType::Float + const uint currentType = ((d.type == QMetaType::Float) ? QVariant::Double : d.type); + if (uint(t) == uint(QMetaType::Float)) t = QVariant::Double; + + if (currentType == uint(t)) return true; - if (d.type > QVariant::LastCoreType || t > QVariant::LastCoreType) { + if (currentType > QVariant::LastCoreType || t > QVariant::LastCoreType) { switch (uint(t)) { case QVariant::Int: - return d.type == QVariant::KeySequence - || d.type == QMetaType::ULong - || d.type == QMetaType::Long - || d.type == QMetaType::UShort - || d.type == QMetaType::UChar - || d.type == QMetaType::Char - || d.type == QMetaType::Short; + return currentType == QVariant::KeySequence + || currentType == QMetaType::ULong + || currentType == QMetaType::Long + || currentType == QMetaType::UShort + || currentType == QMetaType::UChar + || currentType == QMetaType::Char + || currentType == QMetaType::Short; case QVariant::Image: - return d.type == QVariant::Pixmap || d.type == QVariant::Bitmap; + return currentType == QVariant::Pixmap || currentType == QVariant::Bitmap; case QVariant::Pixmap: - return d.type == QVariant::Image || d.type == QVariant::Bitmap - || d.type == QVariant::Brush; + return currentType == QVariant::Image || currentType == QVariant::Bitmap + || currentType == QVariant::Brush; case QVariant::Bitmap: - return d.type == QVariant::Pixmap || d.type == QVariant::Image; + return currentType == QVariant::Pixmap || currentType == QVariant::Image; case QVariant::ByteArray: - return d.type == QVariant::Color; + return currentType == QVariant::Color; case QVariant::String: - return d.type == QVariant::KeySequence || d.type == QVariant::Font - || d.type == QVariant::Color; + return currentType == QVariant::KeySequence || currentType == QVariant::Font + || currentType == QVariant::Color; case QVariant::KeySequence: - return d.type == QVariant::String || d.type == QVariant::Int; + return currentType == QVariant::String || currentType == QVariant::Int; case QVariant::Font: - return d.type == QVariant::String; + return currentType == QVariant::String; case QVariant::Color: - return d.type == QVariant::String || d.type == QVariant::ByteArray - || d.type == QVariant::Brush; + return currentType == QVariant::String || currentType == QVariant::ByteArray + || currentType == QVariant::Brush; case QVariant::Brush: - return d.type == QVariant::Color || d.type == QVariant::Pixmap; + return currentType == QVariant::Color || currentType == QVariant::Pixmap; case QMetaType::Long: case QMetaType::Char: case QMetaType::UChar: case QMetaType::ULong: case QMetaType::Short: case QMetaType::UShort: - case QMetaType::Float: - return qCanConvertMatrix[QVariant::Int] & (1 << d.type) || d.type == QVariant::Int; + return qCanConvertMatrix[QVariant::Int] & (1 << currentType) || currentType == QVariant::Int; default: return false; } } - if(t == String && d.type == StringList) + if(t == String && currentType == StringList) return v_cast<QStringList>(&d)->count() == 1; else - return qCanConvertMatrix[t] & (1 << d.type); + return qCanConvertMatrix[t] & (1 << currentType); } /*! @@ -2726,7 +2724,7 @@ bool QVariant::cmp(const QVariant &v) const const void *QVariant::constData() const { - return constDataHelper(d); + return d.is_shared ? d.data.shared->ptr : reinterpret_cast<const void *>(&d.data.ptr); } /*! @@ -2739,7 +2737,7 @@ const void *QVariant::constData() const void* QVariant::data() { detach(); - return const_cast<void *>(constDataHelper(d)); + return const_cast<void *>(constData()); } diff --git a/src/corelib/kernel/qvariant.h b/src/corelib/kernel/qvariant.h index 580b101..d73fcbc 100644 --- a/src/corelib/kernel/qvariant.h +++ b/src/corelib/kernel/qvariant.h @@ -128,7 +128,7 @@ class Q_CORE_EXPORT QVariant LineF = 24, Point = 25, PointF = 26, - RegExp = 27, + RegExp = 27, Hash = 28, LastCoreType = Hash, @@ -181,6 +181,7 @@ class Q_CORE_EXPORT QVariant QVariant(qulonglong ull); QVariant(bool b); QVariant(double d); + QVariant(float f) { d.is_null = false; d.type = QMetaType::Float; d.data.f = f; } #ifndef QT_NO_CAST_FROM_ASCII QT_ASCII_CAST_WARN_CONSTRUCTOR QVariant(const char *str); #endif @@ -349,6 +350,7 @@ class Q_CORE_EXPORT QVariant uint u; bool b; double d; + float f; qlonglong ll; qulonglong ull; void *ptr; @@ -443,7 +445,18 @@ inline QVariant qVariantFromValue(const QVariant &t) { return t; } template <typename T> inline void qVariantSetValue(QVariant &v, const T &t) { - v = QVariant(qMetaTypeId<T>(reinterpret_cast<T *>(0)), &t); + //if possible we reuse the current QVariant private + const int type = qMetaTypeId<T>(reinterpret_cast<T *>(0)); + QVariant::Private &d = v.data_ptr(); + if (type <= int(QVariant::Char) || (type == d.type && v.isDetached())) { + d.type = type; + T *old = reinterpret_cast<T*>(d.is_shared ? d.data.shared->ptr : &d.data.ptr); + if (QTypeInfo<T>::isComplex) + old->~T(); + new (old) T(t); //call the copy constructor + } else { + v = QVariant(type, &t); + } } inline QVariant::QVariant() {} diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h index 0764fe3..074575b 100644 --- a/src/corelib/kernel/qvariant_p.h +++ b/src/corelib/kernel/qvariant_p.h @@ -60,8 +60,6 @@ QT_BEGIN_NAMESPACE -extern Q_CORE_EXPORT const QVariant::Handler *qExtendedVariantHandler; - #ifdef Q_CC_SUN // Sun CC picks the wrong overload, so introduce awful hack template <typename T> @@ -70,7 +68,7 @@ inline T *v_cast(const QVariant::Private *nd, T * = 0) QVariant::Private *d = const_cast<QVariant::Private *>(nd); return ((sizeof(T) > sizeof(QVariant::Private::Data)) ? static_cast<T *>(d->data.shared->ptr) - : reinterpret_cast<T*>(&d->data.c)); + : static_cast<T *>(static_cast<void *>(&d->data.c))); } #else // every other compiler in this world @@ -80,7 +78,7 @@ inline const T *v_cast(const QVariant::Private *d, T * = 0) { return ((sizeof(T) > sizeof(QVariant::Private::Data)) ? static_cast<const T *>(d->data.shared->ptr) - : reinterpret_cast<const T *>(&d->data.c)); + : static_cast<const T *>(static_cast<const void *>(&d->data.c))); } template <typename T> @@ -88,15 +86,17 @@ inline T *v_cast(QVariant::Private *d, T * = 0) { return ((sizeof(T) > sizeof(QVariant::Private::Data)) ? static_cast<T *>(d->data.shared->ptr) - : reinterpret_cast<T *>(&d->data.c)); + : static_cast<T *>(static_cast<void *>(&d->data.c))); } #endif -//a simple template that avoids to allocate 2 buffers when creating a QVariant + +//a simple template that avoids to allocate 2 memory chunks when creating a QVariant template <class T> class QVariantPrivateSharedEx : public QVariant::PrivateShared { public: + QVariantPrivateSharedEx() : QVariant::PrivateShared(&m_t) { } QVariantPrivateSharedEx(const T&t) : QVariant::PrivateShared(&m_t), m_t(t) { } private: @@ -105,14 +105,12 @@ private: // constructs a new variant if copy is 0, otherwise copy-constructs template <class T> -inline void v_construct(QVariant::Private *x, const T& t) +inline void v_construct(QVariant::Private *x, const T &t) { - x->type = qMetaTypeId<T>(reinterpret_cast<T *>(0)); if (sizeof(T) > sizeof(QVariant::Private::Data)) { x->data.shared = new QVariantPrivateSharedEx<T>(t); x->is_shared = true; } else { - x->is_shared = false; new (&x->data.ptr) T(t); } } @@ -120,24 +118,31 @@ inline void v_construct(QVariant::Private *x, const T& t) template <class T> inline void v_construct(QVariant::Private *x, const void *copy, T * = 0) { - if (copy) { - v_construct<T>(x, *reinterpret_cast<const T*>(copy)); + if (sizeof(T) > sizeof(QVariant::Private::Data)) { + x->data.shared = copy ? new QVariantPrivateSharedEx<T>(*static_cast<const T *>(copy)) + : new QVariantPrivateSharedEx<T>; + x->is_shared = true; } else { - T t; - v_construct<T>(x, t); + if (copy) + new (&x->data.ptr) T(*static_cast<const T *>(copy)); + else + new (&x->data.ptr) T; } } - // deletes the internal structures template <class T> inline void v_clear(QVariant::Private *d, T* = 0) { - //now we need to call the destructor in any case - //because QVariant::PrivateShared doesn't have a virtual destructor - v_cast<T>(d)->~T(); - if (sizeof(T) > sizeof(QVariant::Private::Data)) - delete d->data.shared; + + if (sizeof(T) > sizeof(QVariant::Private::Data)) { + //now we need to cast + //because QVariant::PrivateShared doesn't have a virtual destructor + delete static_cast<QVariantPrivateSharedEx<T>*>(d->data.shared); + } else { + v_cast<T>(d)->~T(); + } + } QT_END_NAMESPACE diff --git a/src/corelib/thread/qthread_unix.cpp b/src/corelib/thread/qthread_unix.cpp index f602821..8f1c698 100644 --- a/src/corelib/thread/qthread_unix.cpp +++ b/src/corelib/thread/qthread_unix.cpp @@ -180,8 +180,7 @@ void *QThreadPrivate::start(void *arg) data->quitNow = false; // ### TODO: allow the user to create a custom event dispatcher - if (QCoreApplication::instance()) - createEventDispatcher(data); + createEventDispatcher(data); emit thr->started(); pthread_setcancelstate(PTHREAD_CANCEL_ENABLE, NULL); diff --git a/src/corelib/thread/qthread_win.cpp b/src/corelib/thread/qthread_win.cpp index 27193c6..7094e3d 100644 --- a/src/corelib/thread/qthread_win.cpp +++ b/src/corelib/thread/qthread_win.cpp @@ -292,8 +292,7 @@ unsigned int __stdcall QThreadPrivate::start(void *arg) data->quitNow = false; // ### TODO: allow the user to create a custom event dispatcher - if (QCoreApplication::instance()) - createEventDispatcher(data); + createEventDispatcher(data); #if !defined(QT_NO_DEBUG) && defined(Q_CC_MSVC) && !defined(Q_OS_WINCE) // sets the name of the current thread. diff --git a/src/corelib/tools/qbytearraymatcher.cpp b/src/corelib/tools/qbytearraymatcher.cpp index cd4cf90..211d190 100644 --- a/src/corelib/tools/qbytearraymatcher.cpp +++ b/src/corelib/tools/qbytearraymatcher.cpp @@ -120,6 +120,7 @@ QByteArrayMatcher::QByteArrayMatcher() : d(0) { p.p = 0; + p.l = 0; qMemSet(p.q_skiptable, 0, sizeof(p.q_skiptable)); } @@ -170,7 +171,7 @@ QByteArrayMatcher::~QByteArrayMatcher() QByteArrayMatcher &QByteArrayMatcher::operator=(const QByteArrayMatcher &other) { q_pattern = other.q_pattern; - qMemCopy(p.q_skiptable, other.p.q_skiptable, sizeof(p.q_skiptable)); + qMemCopy(&p, &other.p, sizeof(p)); return *this; } diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h index d7f2366..633e92c 100644 --- a/src/corelib/tools/qbytearraymatcher.h +++ b/src/corelib/tools/qbytearraymatcher.h @@ -67,7 +67,12 @@ public: int indexIn(const QByteArray &ba, int from = 0) const; int indexIn(const char *str, int len, int from = 0) const; - inline QByteArray pattern() const { return q_pattern; } + inline QByteArray pattern() const + { + if (q_pattern.isNull()) + return QByteArray((const char*)p.p, p.l); + return q_pattern; + } private: QByteArrayMatcherPrivate *d; diff --git a/src/declarative/canvas/qsimplecanvas.cpp b/src/declarative/canvas/qsimplecanvas.cpp index 572bc43..1911b35 100644 --- a/src/declarative/canvas/qsimplecanvas.cpp +++ b/src/declarative/canvas/qsimplecanvas.cpp @@ -73,7 +73,7 @@ public: { int entry = (_first + _size) % s; _array[entry] = t; - if(_size == s) + if (_size == s) _first = (_first + 1) % s; else _size++; @@ -127,14 +127,14 @@ void QSimpleCanvasRootLayer::remDirty(QSimpleCanvasItem *i) void QSimpleCanvasPrivate::clearFocusPanel(QSimpleCanvasItem *panel) { - if(q->activeFocusPanel() == panel) { + if (q->activeFocusPanel() == panel) { focusPanels.pop(); switchToFocusPanel(q->activeFocusPanel(), panel, Qt::OtherFocusReason); panel->activePanelOutEvent(); } else { - for(int ii = 0; ii < focusPanels.count(); ++ii) - if(focusPanels.at(ii) == panel) { + for (int ii = 0; ii < focusPanels.count(); ++ii) + if (focusPanels.at(ii) == panel) { focusPanels.remove(ii); break; } @@ -143,35 +143,35 @@ void QSimpleCanvasPrivate::clearFocusPanel(QSimpleCanvasItem *panel) void QSimpleCanvasPrivate::switchToFocusPanel(QSimpleCanvasItem *panel, QSimpleCanvasItem *wasPanel, Qt::FocusReason focusReason) { - if(panel) + if (panel) panel->activePanelInEvent(); QSimpleCanvasItem *wasFocusRoot = focusPanelData.value(wasPanel); - if(wasFocusRoot) + if (wasFocusRoot) clearActiveFocusItem(wasFocusRoot, focusReason); QSimpleCanvasItem *newFocusRoot = focusPanelData.value(panel); - if(newFocusRoot) + if (newFocusRoot) setFocusItem(newFocusRoot, focusReason); } void QSimpleCanvasPrivate::setActiveFocusPanel(QSimpleCanvasItem *panel, Qt::FocusReason focusReason) { - if(q->activeFocusPanel() == panel) + if (q->activeFocusPanel() == panel) return; - if(panel) { - for(int ii = 0; ii < focusPanels.count(); ++ii) - if(focusPanels.at(ii) == panel) { + if (panel) { + for (int ii = 0; ii < focusPanels.count(); ++ii) + if (focusPanels.at(ii) == panel) { focusPanels.remove(ii); break; } } QSimpleCanvasItem *old = q->activeFocusPanel(); - if(panel) + if (panel) focusPanels << panel; switchToFocusPanel(panel, old, focusReason); - if(old) + if (old) old->activePanelOutEvent(); } @@ -181,13 +181,13 @@ void QSimpleCanvasPrivate::clearActiveFocusItem(QSimpleCanvasItem *item, if (!item || !item->d_func()) return; - if(!item->d_func()->hasActiveFocus) + if (!item->d_func()->hasActiveFocus) return; item->d_func()->hasActiveFocus = false; - if(item->options() & QSimpleCanvasItem::IsFocusRealm) { + if (item->options() & QSimpleCanvasItem::IsFocusRealm) { QSimpleCanvasItem *newItem = focusPanelData.value(item); - if(newItem) { + if (newItem) { clearActiveFocusItem(newItem, focusReason); } else { focusItem = 0; @@ -200,8 +200,8 @@ void QSimpleCanvasPrivate::clearActiveFocusItem(QSimpleCanvasItem *item, item->focusOutEvent(&event); } - if(item->options() & QSimpleCanvasItem::AcceptsInputMethods){ - if(q->testAttribute(Qt::WA_InputMethodEnabled)) + if (item->options() & QSimpleCanvasItem::AcceptsInputMethods){ + if (q->testAttribute(Qt::WA_InputMethodEnabled)) q->setAttribute(Qt::WA_InputMethodEnabled,false); } item->activeFocusChanged(true); @@ -213,9 +213,9 @@ void QSimpleCanvasPrivate::setActiveFocusItem(QSimpleCanvasItem *item, while(true) { item->d_func()->setActiveFocus(true); item->activeFocusChanged(true); - if(item->options() & QSimpleCanvasItem::IsFocusRealm) { + if (item->options() & QSimpleCanvasItem::IsFocusRealm) { QSimpleCanvasItem *newItem = focusPanelData.value(item); - if(newItem) + if (newItem) item = newItem; else break; @@ -224,8 +224,8 @@ void QSimpleCanvasPrivate::setActiveFocusItem(QSimpleCanvasItem *item, } } - if(item->options() & QSimpleCanvasItem::AcceptsInputMethods){ - if(!q->testAttribute(Qt::WA_InputMethodEnabled)) + if (item->options() & QSimpleCanvasItem::AcceptsInputMethods){ + if (!q->testAttribute(Qt::WA_InputMethodEnabled)) q->setAttribute(Qt::WA_InputMethodEnabled,true); } focusItem = item; @@ -244,9 +244,9 @@ void QSimpleCanvasPrivate::clearFocusItem(QSimpleCanvasItem *item) QSimpleCanvasItem *scope = 0; QSimpleCanvasItem *citem = item; while(citem && !scope) { - if(citem->options() & QSimpleCanvasItem::IsFocusPanel) + if (citem->options() & QSimpleCanvasItem::IsFocusPanel) scope = citem; - else if(citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm) + else if (citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm) scope = citem; citem = citem->parent(); } @@ -254,23 +254,23 @@ void QSimpleCanvasPrivate::clearFocusItem(QSimpleCanvasItem *item) bool isActive = false; - if(scope->options() & QSimpleCanvasItem::IsFocusPanel) + if (scope->options() & QSimpleCanvasItem::IsFocusPanel) isActive = (scope == q->activeFocusPanel()); - else if(scope->options() & QSimpleCanvasItem::IsFocusRealm) + else if (scope->options() & QSimpleCanvasItem::IsFocusRealm) isActive = scope->hasActiveFocus(); - if(isActive) clearActiveFocusItem(item, Qt::OtherFocusReason); + if (isActive) clearActiveFocusItem(item, Qt::OtherFocusReason); item->d_func()->setFocus(false); item->focusChanged(false); focusPanelData.insert(scope, 0); - if(lastFocusItem == item) + if (lastFocusItem == item) lastFocusItem = 0; - if(focusItem == item) + if (focusItem == item) focusItem = 0; - if(scope->options() & QSimpleCanvasItem::IsFocusRealm && scope->hasActiveFocus()) { + if (scope->options() & QSimpleCanvasItem::IsFocusRealm && scope->hasActiveFocus()) { setActiveFocusItem(scope, Qt::OtherFocusReason); } else { QSimpleCanvasItem *item = QSimpleCanvasItem::findNextFocus(scope); @@ -291,21 +291,21 @@ void QSimpleCanvasPrivate::setFocusItem(QSimpleCanvasItem *item, item = item->focusProxy(); #endif - if(item == focusItem) + if (item == focusItem) return; QSimpleCanvasItem *scope = 0; QSimpleCanvasItem *citem = item; while(citem && !scope) { - if(citem->options() & QSimpleCanvasItem::IsFocusPanel) + if (citem->options() & QSimpleCanvasItem::IsFocusPanel) scope = citem; - else if(citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm) + else if (citem != item && citem->options() & QSimpleCanvasItem::IsFocusRealm) scope = citem; citem = citem->parent(); } Q_ASSERT(scope); // At the very least we'll find the canvas root - if(!overwrite && focusPanelData.contains(scope)) { + if (!overwrite && focusPanelData.contains(scope)) { item->d_func()->setFocus(false); item->focusChanged(false); return; @@ -314,26 +314,26 @@ void QSimpleCanvasPrivate::setFocusItem(QSimpleCanvasItem *item, QSimpleCanvasItem *oldFocus = focusPanelData.value(scope); bool isActive = false; - if(scope->options() & QSimpleCanvasItem::IsFocusPanel) + if (scope->options() & QSimpleCanvasItem::IsFocusPanel) isActive = (scope == q->activeFocusPanel()); - else if(scope->options() & QSimpleCanvasItem::IsFocusRealm) + else if (scope->options() & QSimpleCanvasItem::IsFocusRealm) isActive = scope->hasActiveFocus(); - if(oldFocus) { - if(isActive) clearActiveFocusItem(oldFocus, focusReason); + if (oldFocus) { + if (isActive) clearActiveFocusItem(oldFocus, focusReason); oldFocus->d_func()->setFocus(false); oldFocus->focusChanged(false); } focusPanelData.insert(scope, item); - if(isActive) + if (isActive) lastFocusItem = item; if (item) { item->d_func()->setFocus(true); item->focusChanged(true); - if(isActive) + if (isActive) setActiveFocusItem(item, focusReason); } } @@ -351,8 +351,8 @@ bool QSimpleCanvas::eventFilter(QObject *obj, QEvent *event) case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: { //same logic as filter() function - for(int ii = 0; ii < d->mouseFilters.count(); ++ii) { - if(d->mouseFilters.at(ii)->mouseFilter((QGraphicsSceneMouseEvent*)event)) + for (int ii = 0; ii < d->mouseFilters.count(); ++ii) { + if (d->mouseFilters.at(ii)->mouseFilter((QGraphicsSceneMouseEvent*)event)) return true; } break; @@ -375,12 +375,12 @@ void QSimpleCanvasPrivate::removeMouseFilter(QSimpleCanvasItem *item) bool QSimpleCanvasPrivate::filter(QMouseEvent *e) { - if(mouseFilters.isEmpty()) + if (mouseFilters.isEmpty()) return false; QGraphicsSceneMouseEvent *me = mouseEventToSceneMouseEvent(e, e->pos()); - for(int ii = 0; ii < mouseFilters.count(); ++ii) { - if(mouseFilters.at(ii)->mouseFilter(me)) { + for (int ii = 0; ii < mouseFilters.count(); ++ii) { + if (mouseFilters.at(ii)->mouseFilter(me)) { delete me; return true; } @@ -420,36 +420,36 @@ QGraphicsSceneMouseEvent *QSimpleCanvasPrivate::mouseEventToSceneMouseEvent(QMou bool QSimpleCanvasPrivate::deliverMousePress(QSimpleCanvasItem *base, QMouseEvent *e, bool seenChildFilter) { - if(base->clipType()) { + if (base->clipType()) { QRectF br = base->boundingRect(); QPointF pos = base->mapFromScene(e->pos()); - if(!br.contains(pos.toPoint())) + if (!br.contains(pos.toPoint())) return false; } const QList<QSimpleCanvasItem *> &children = base->d_func()->children; - if(base->options() & QSimpleCanvasItem::ChildMouseFilter) + if (base->options() & QSimpleCanvasItem::ChildMouseFilter) seenChildFilter = true; - for(int ii = children.count() - 1; ii >= 0; --ii) { - if(children.at(ii)->visible() != 0.) - if(deliverMousePress(children.at(ii), e, seenChildFilter)) + for (int ii = children.count() - 1; ii >= 0; --ii) { + if (children.at(ii)->visible() != 0.) + if (deliverMousePress(children.at(ii), e, seenChildFilter)) return true; } - if(base->acceptedMouseButtons() & e->button() || base->options() & QSimpleCanvasItem::ChildMouseFilter) { + if (base->acceptedMouseButtons() & e->button() || base->options() & QSimpleCanvasItem::ChildMouseFilter) { QRectF br = base->boundingRect(); QPoint pos = base->mapFromScene(e->pos()).toPoint(); - if(br.contains(pos)) { + if (br.contains(pos)) { QGraphicsSceneMouseEvent *me = mouseEventToSceneMouseEvent(e, pos); sendMouseEvent(base, me); bool isAccepted = me->isAccepted(); delete me; - if(isAccepted) { + if (isAccepted) { lastMouseItem = base; return true; } @@ -463,8 +463,8 @@ void QSimpleCanvasPrivate::sendMouseEvent(QSimpleCanvasItem *item, QGraphicsScen { QSimpleCanvasItem *p = item->parent(); while(p) { - if(p->options() & QSimpleCanvasItem::ChildMouseFilter) { - if(p->mouseFilter(e)) + if (p->options() & QSimpleCanvasItem::ChildMouseFilter) { + if (p->mouseFilter(e)) return; } p = p->parent(); @@ -533,7 +533,7 @@ void QSimpleCanvasGraphicsView::paintEvent(QPaintEvent *pe) int frametimer = canvas->frameTimer.elapsed(); gfxCanvasTiming.append(QSimpleCanvasTiming(r, frametimer, canvas->lrpTime, tbf)); canvas->lrpTime = 0; - if(canvas->canvasServer) + if (canvas->canvasServer) canvas->canvasServer->addTiming(canvas->lrpTime, frametimer, tbf); } @@ -563,20 +563,20 @@ void QSimpleCanvasPrivate::init(QSimpleCanvas::CanvasMode mode) { this->mode = mode; - if(mode == QSimpleCanvas::SimpleCanvas) + if (mode == QSimpleCanvas::SimpleCanvas) qWarning("QSimpleCanvas: Using simple canvas"); else qWarning("QSimpleCanvas: Using GraphicsView canvas"); - if(fullUpdate()) + if (fullUpdate()) qWarning("QSimpleCanvas: Full update enabled"); - if(continuousUpdate()) + if (continuousUpdate()) qWarning("QSimpleCanvas: Continuous update enabled"); QByteArray env = qgetenv("GFX_CANVAS_SERVER_PORT"); - if(!env.isEmpty()){ + if (!env.isEmpty()){ int port = env.toInt(); - if(port >= 1024) + if (port >= 1024) canvasServer = new QSimpleCanvasServer(port, q); } @@ -584,7 +584,7 @@ void QSimpleCanvasPrivate::init(QSimpleCanvas::CanvasMode mode) root->setActiveFocusPanel(true); q->setFocusPolicy(Qt::StrongFocus); - if(mode == QSimpleCanvas::GraphicsView) { + if (mode == QSimpleCanvas::GraphicsView) { view = new QSimpleCanvasGraphicsView(this); QHBoxLayout *layout = new QHBoxLayout(q); layout->setSpacing(0); @@ -621,7 +621,7 @@ QSimpleCanvas::~QSimpleCanvas() void QSimpleCanvasPrivate::paint(QPainter &p) { #if defined(QFX_RENDER_QPAINTER) - if(!isSetup) + if (!isSetup) root->d_func()->setupPainting(0, q->rect()); lrpTimer.start(); @@ -660,7 +660,7 @@ void QSimpleCanvas::keyReleaseEvent(QKeyEvent *event) void QSimpleCanvas::inputMethodEvent(QInputMethodEvent *event) { - if(d->focusItem) + if (d->focusItem) d->focusItem->inputMethodEvent(event); else QWidget::inputMethodEvent(event); @@ -668,14 +668,14 @@ void QSimpleCanvas::inputMethodEvent(QInputMethodEvent *event) QVariant QSimpleCanvas::inputMethodQuery(Qt::InputMethodQuery query) const { - if(d->focusItem) + if (d->focusItem) return d->focusItem->inputMethodQuery(query); return QWidget::inputMethodQuery(query); } void QSimpleCanvas::mousePressEvent(QMouseEvent *e) { - if(d->isSimpleCanvas() && + if (d->isSimpleCanvas() && (d->filter(e) || d->deliverMousePress(d->root, e))) { e->accept(); } else { @@ -685,7 +685,7 @@ void QSimpleCanvas::mousePressEvent(QMouseEvent *e) void QSimpleCanvas::mouseDoubleClickEvent(QMouseEvent *e) { - if(d->isSimpleCanvas() && + if (d->isSimpleCanvas() && (d->filter(e) || d->deliverMousePress(d->root, e))) { e->accept(); } else { @@ -695,9 +695,9 @@ void QSimpleCanvas::mouseDoubleClickEvent(QMouseEvent *e) void QSimpleCanvas::mouseMoveEvent(QMouseEvent *e) { - if(d->isSimpleCanvas() && d->filter(e)) { + if (d->isSimpleCanvas() && d->filter(e)) { e->accept(); - } else if(d->isSimpleCanvas() && d->lastMouseItem) { + } else if (d->isSimpleCanvas() && d->lastMouseItem) { QPoint p = d->lastMouseItem->mapFromScene(e->pos()).toPoint(); QGraphicsSceneMouseEvent *me = d->mouseEventToSceneMouseEvent(e, p); d->sendMouseEvent(d->lastMouseItem, me); @@ -710,9 +710,9 @@ void QSimpleCanvas::mouseMoveEvent(QMouseEvent *e) void QSimpleCanvas::mouseReleaseEvent(QMouseEvent *e) { - if(d->isSimpleCanvas() && d->filter(e)) { + if (d->isSimpleCanvas() && d->filter(e)) { e->accept(); - } else if(d->isSimpleCanvas() && d->lastMouseItem) { + } else if (d->isSimpleCanvas() && d->lastMouseItem) { QPoint p = d->lastMouseItem->mapFromScene(e->pos()).toPoint(); QGraphicsSceneMouseEvent *me = d->mouseEventToSceneMouseEvent(e, p); d->sendMouseEvent(d->lastMouseItem, me); @@ -734,7 +734,7 @@ void QSimpleCanvas::focusInEvent(QFocusEvent *event) } else { QSimpleCanvasItem *panel = activeFocusPanel(); QSimpleCanvasItem *focusItem = 0; - if(panel->isFocusable()) + if (panel->isFocusable()) focusItem = panel; else focusItem = QSimpleCanvasItem::findNextFocus(panel); @@ -775,7 +775,7 @@ bool QSimpleCanvas::focusNextPrevChild(bool) QSimpleCanvasItem *panel = activeFocusPanel(); QSimpleCanvasItem *item = 0; - if(panel->isFocusable()) + if (panel->isFocusable()) item = panel; else item = next ? QSimpleCanvasItem::findNextFocus(panel) : QSimpleCanvasItem::findPrevFocus(panel); @@ -798,7 +798,7 @@ void QSimpleCanvas::showEvent(QShowEvent *e) #if defined(QFX_RENDER_OPENGL) d->egl.resize(width(), height()); #endif - if(d->isGraphicsView()) + if (d->isGraphicsView()) d->view->setSceneRect(rect()); QWidget::showEvent(e); @@ -809,7 +809,7 @@ void QSimpleCanvas::resizeEvent(QResizeEvent *e) #if defined(QFX_RENDER_OPENGL) d->egl.resize(width(), height()); #endif - if(d->isGraphicsView()) + if (d->isGraphicsView()) d->view->setSceneRect(rect()); QWidget::resizeEvent(e); } @@ -822,7 +822,7 @@ void QSimpleCanvas::remDirty(QSimpleCanvasItem *c) void QSimpleCanvas::queueUpdate() { - if(!d->timer) { + if (!d->timer) { QCoreApplication::postEvent(this, new QEvent(QEvent::User)); d->timer = 1; } @@ -831,15 +831,15 @@ void QSimpleCanvas::queueUpdate() void QSimpleCanvas::addDirty(QSimpleCanvasItem *c) { queueUpdate(); - if(d->isSimpleCanvas()) { + if (d->isSimpleCanvas()) { d->oldDirty |= c->d_func()->data()->lastPaintRect; #if defined(QFX_RENDER_OPENGL) // Check for filters QSimpleCanvasItem *fi = c->parent(); while(fi) { - if(fi->d_func()->data()->dirty) { + if (fi->d_func()->data()->dirty) { break; - } else if(fi->filter()) { + } else if (fi->filter()) { fi->update(); break; } @@ -853,14 +853,14 @@ void QSimpleCanvas::addDirty(QSimpleCanvasItem *c) QRect QSimpleCanvasPrivate::dirtyItemClip() const { QRect rv; - if(isSimpleCanvas()) { + if (isSimpleCanvas()) { #if defined(QFX_RENDER_OPENGL) QRectF r; - for(int ii = 0; ii < dirtyItems.count(); ++ii) + for (int ii = 0; ii < dirtyItems.count(); ++ii) r |= dirtyItems.at(ii)->d_func()->data()->lastPaintRect; rv = egl.map(r); #else - for(int ii = 0; ii < dirtyItems.count(); ++ii) + for (int ii = 0; ii < dirtyItems.count(); ++ii) rv |= dirtyItems.at(ii)->d_func()->data()->lastPaintRect; #endif } @@ -869,7 +869,7 @@ QRect QSimpleCanvasPrivate::dirtyItemClip() const QRegion QSimpleCanvasPrivate::resetDirty() { - if(isSimpleCanvas()) { + if (isSimpleCanvas()) { #if defined(QFX_RENDER_OPENGL) QRect r = egl.map(oldDirty) | dirtyItemClip(); #else @@ -877,12 +877,12 @@ QRegion QSimpleCanvasPrivate::resetDirty() #endif if (!r.isEmpty()) r.adjust(-1,-1,2,2); //make sure we get everything (since we rounded from floats to ints) - for(int ii = 0; ii < dirtyItems.count(); ++ii) + for (int ii = 0; ii < dirtyItems.count(); ++ii) static_cast<QSimpleCanvasItemPrivate*>(dirtyItems.at(ii)->d_ptr)->data()->dirty = false; dirtyItems.clear(); oldDirty = QRect(); - if(fullUpdate()) + if (fullUpdate()) return QRegion(); else return QRegion(r); @@ -898,7 +898,7 @@ QSimpleCanvasItem *QSimpleCanvas::focusItem() const QSimpleCanvasItem *QSimpleCanvas::activeFocusPanel() const { - if(d->focusPanels.isEmpty()) + if (d->focusPanels.isEmpty()) return 0; else return d->focusPanels.top(); @@ -906,7 +906,7 @@ QSimpleCanvasItem *QSimpleCanvas::activeFocusPanel() const bool QSimpleCanvas::event(QEvent *e) { - if(e->type() == QEvent::User && d->isSimpleCanvas()) { + if (e->type() == QEvent::User && d->isSimpleCanvas()) { d->timer = 0; d->isSetup = true; #if defined(QFX_RENDER_OPENGL1) @@ -921,7 +921,7 @@ bool QSimpleCanvas::event(QEvent *e) int tbf = d->frameTimer.restart(); #if defined(QFX_RENDER_QPAINTER) - if(r.isEmpty() || fullUpdate()) + if (r.isEmpty() || fullUpdate()) repaint(); else repaint(r); @@ -930,7 +930,7 @@ bool QSimpleCanvas::event(QEvent *e) QRect br = r.boundingRect(); QRect nr(br.x(), height() - br.y() - br.height(), br.width(), br.height()); - if(r.isEmpty() || fullUpdate()) + if (r.isEmpty() || fullUpdate()) d->egl.updateGL(); else d->egl.updateGL(nr); @@ -940,10 +940,10 @@ bool QSimpleCanvas::event(QEvent *e) int frametimer = d->frameTimer.elapsed(); gfxCanvasTiming.append(QSimpleCanvasTiming(r, frametimer, d->lrpTime, tbf)); - if(d->canvasServer) + if (d->canvasServer) d->canvasServer->addTiming(d->lrpTime, frametimer, tbf); d->lrpTime = 0; - if(continuousUpdate()) + if (continuousUpdate()) queueUpdate(); return true; @@ -955,7 +955,7 @@ bool QSimpleCanvas::event(QEvent *e) void QSimpleCanvas::paintEvent(QPaintEvent *) { #if defined(QFX_RENDER_QPAINTER) - if(d->mode == SimpleCanvas) { + if (d->mode == SimpleCanvas) { QPainter p(this); d->paint(p); } @@ -964,7 +964,7 @@ void QSimpleCanvas::paintEvent(QPaintEvent *) void QSimpleCanvas::dumpTiming() { - for(int ii = 0; ii < gfxCanvasTiming.size(); ++ii) { + for (int ii = 0; ii < gfxCanvasTiming.size(); ++ii) { const QSimpleCanvasTiming &t = gfxCanvasTiming[ii]; qreal repaintFps = 1000. / qreal(t.time); @@ -985,9 +985,9 @@ void QSimpleCanvas::dumpItems() void QSimpleCanvas::checkState() { - if(d->isSimpleCanvas()) { + if (d->isSimpleCanvas()) { QSimpleCanvasItemPrivate::FocusStateCheckRDatas r; - if(d->root->d_func()->checkFocusState(0, &r)) + if (d->root->d_func()->checkFocusState(0, &r)) qWarning() << "State OK"; } } @@ -997,7 +997,7 @@ void QSimpleCanvas::checkState() */ QImage QSimpleCanvas::asImage() const { - if(d->isSimpleCanvas()) { + if (d->isSimpleCanvas()) { #if defined(QFX_RENDER_QPAINTER) QImage img(width(),height(),QImage::Format_RGB32); QPainter p(&img); diff --git a/src/declarative/canvas/qsimplecanvas.h b/src/declarative/canvas/qsimplecanvas.h index 3da7251..a35cbf5 100644 --- a/src/declarative/canvas/qsimplecanvas.h +++ b/src/declarative/canvas/qsimplecanvas.h @@ -100,7 +100,7 @@ namespace QSimpleCanvasConfig (type == Translucent && f == QImage::Format_ARGB32_Premultiplied)); } inline Image convert(ImageType type, const Image &img) { - if(type == Opaque) + if (type == Opaque) return img.convertToFormat(QImage::Format_RGB16); else return img.convertToFormat(QImage::Format_ARGB32_Premultiplied); diff --git a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp index e3cdf19..dd4012b 100644 --- a/src/declarative/canvas/qsimplecanvas_graphicsview.cpp +++ b/src/declarative/canvas/qsimplecanvas_graphicsview.cpp @@ -90,8 +90,8 @@ void QSimpleGraphicsItem::mousePressEvent(QGraphicsSceneMouseEvent *event) { QSimpleCanvasItem *p = owner->parent(); while(p) { - if(p->options() & QSimpleCanvasItem::ChildMouseFilter) { - if(p->mouseFilter(event)) + if (p->options() & QSimpleCanvasItem::ChildMouseFilter) { + if (p->mouseFilter(event)) return; } p = p->parent(); @@ -103,8 +103,8 @@ void QSimpleGraphicsItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { QSimpleCanvasItem *p = owner->parent(); while(p) { - if(p->options() & QSimpleCanvasItem::ChildMouseFilter) { - if(p->mouseFilter(event)) + if (p->options() & QSimpleCanvasItem::ChildMouseFilter) { + if (p->mouseFilter(event)) return; } p = p->parent(); @@ -117,8 +117,8 @@ void QSimpleGraphicsItem::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { QSimpleCanvasItem *p = owner->parent(); while(p) { - if(p->options() & QSimpleCanvasItem::ChildMouseFilter) { - if(p->mouseFilter(event)) + if (p->options() & QSimpleCanvasItem::ChildMouseFilter) { + if (p->mouseFilter(event)) return; } p = p->parent(); @@ -130,8 +130,8 @@ void QSimpleGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { QSimpleCanvasItem *p = owner->parent(); while(p) { - if(p->options() & QSimpleCanvasItem::ChildMouseFilter) { - if(p->mouseFilter(event)) + if (p->options() & QSimpleCanvasItem::ChildMouseFilter) { + if (p->mouseFilter(event)) return; } p = p->parent(); @@ -142,14 +142,14 @@ void QSimpleGraphicsItem::mouseMoveEvent(QGraphicsSceneMouseEvent *event) bool QSimpleGraphicsItem::sceneEvent(QEvent *event) { bool rv = QGraphicsItem::sceneEvent(event); - if(event->type() == QEvent::UngrabMouse) + if (event->type() == QEvent::UngrabMouse) owner->mouseUngrabEvent(); return rv; } QVariant QSimpleGraphicsItem::itemChange(GraphicsItemChange change, const QVariant &value) { - if(change == ItemSceneHasChanged) { + if (change == ItemSceneHasChanged) { QSimpleCanvasItemPrivate *owner_d = static_cast<QSimpleCanvasItemPrivate*>(owner->d_ptr); QSimpleCanvas *oldCanvas = owner_d->canvas; owner_d->canvas = sceneMap[scene()]; @@ -164,13 +164,13 @@ QVariant QSimpleGraphicsItem::itemChange(GraphicsItemChange change, const QVaria } } } - if(owner->options() & QSimpleCanvasItem::MouseFilter) + if (owner->options() & QSimpleCanvasItem::MouseFilter) owner_d->gvRemoveMouseFilter(); if (oldCanvas != owner_d->canvas) owner->canvasChanged(); - if(owner->options() & QSimpleCanvasItem::MouseFilter) + if (owner->options() & QSimpleCanvasItem::MouseFilter) owner_d->gvAddMouseFilter(); } @@ -198,7 +198,7 @@ void QSimpleGraphicsItem::focusInEvent(QFocusEvent *) void QSimpleCanvasItemPrivate::gvRemoveMouseFilter() { QGraphicsScene *scene = graphicsItem->scene(); - if(!scene) return; + if (!scene) return; scene->removeEventFilter(q_ptr); } @@ -206,7 +206,7 @@ void QSimpleCanvasItemPrivate::gvRemoveMouseFilter() void QSimpleCanvasItemPrivate::gvAddMouseFilter() { QGraphicsScene *scene = graphicsItem->scene(); - if(!scene) return; + if (!scene) return; scene->installEventFilter(q_ptr); } diff --git a/src/declarative/canvas/qsimplecanvas_opengl.cpp b/src/declarative/canvas/qsimplecanvas_opengl.cpp index f508aea..98f92d7 100644 --- a/src/declarative/canvas/qsimplecanvas_opengl.cpp +++ b/src/declarative/canvas/qsimplecanvas_opengl.cpp @@ -66,7 +66,7 @@ void CanvasEGLWidget::updateGL() void CanvasEGLWidget::updateGL(const QRect &r) { - if(r.isEmpty()) + if (r.isEmpty()) return; _clip = r; @@ -117,7 +117,7 @@ void QSimpleCanvasPrivate::paintGL() p.stencilValue = 0; p.opacity = 1; p.forceParamRefresh = false; - if(!isSetup) + if (!isSetup) root->d_func()->setupPainting(0, QRect()); root->d_func()->paint(p); @@ -126,12 +126,12 @@ void QSimpleCanvasPrivate::paintGL() QGLFramebufferObject *QSimpleCanvasPrivate::acquire(int w, int h) { - if(w <= 0 || h <= 0) + if (w <= 0 || h <= 0) return 0; int size = qMax(w, h); - for(int ii = 0; ii < frameBuffers.count(); ++ii) { - if(frameBuffers.at(ii)->width() >= size) { + for (int ii = 0; ii < frameBuffers.count(); ++ii) { + if (frameBuffers.at(ii)->width() >= size) { QGLFramebufferObject *rv = frameBuffers.at(ii); frameBuffers.removeAt(ii); return rv; @@ -154,8 +154,8 @@ QGLFramebufferObject *QSimpleCanvasPrivate::acquire(int w, int h) void QSimpleCanvasPrivate::release(QGLFramebufferObject *buf) { int size = qMax(buf->width(), buf->height()); - for(int ii = 0; ii < frameBuffers.count(); ++ii) { - if(frameBuffers.at(ii)->width() >= size) { + for (int ii = 0; ii < frameBuffers.count(); ++ii) { + if (frameBuffers.at(ii)->width() >= size) { frameBuffers.insert(ii, buf); return; } @@ -178,7 +178,7 @@ QSimpleCanvas::Matrix QSimpleCanvasItemPrivate::localTransform() const trans.translate(to.x(), to.y()); trans.scale(q->scale(), q->scale()); trans.translate(-to.x(), -to.y()); - if(data()->transformUser) + if (data()->transformUser) trans *= *data()->transformUser; return trans; } @@ -188,13 +188,13 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters ¶ms, Q_Q(QSimpleCanvasItem); GLPaintParameters childParams = params; - if(clip) + if (clip) ++childParams.stencilValue; - if(child->d_func()->data()->activeOpacity != 0) { + if (child->d_func()->data()->activeOpacity != 0) { childParams.boundingRect = child->boundingRect(); - if(child->filter() && child->filter()->enabled()) { + if (child->filter() && child->filter()->enabled()) { QSimpleCanvasItem::GLPainter painter(q); painter.activeTransform = child->d_func()->data()->transformActive; painter.activeOpacity = child->d_func()->data()->activeOpacity; @@ -209,7 +209,7 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters ¶ms, void QSimpleCanvasItemPrivate::paintChild(const GLPaintParameters ¶ms, QSimpleCanvasItem *child) { - if(params.forceParamRefresh) { + if (params.forceParamRefresh) { QSimpleCanvas::Matrix t = child->d_func()->data()->transformActive; qreal o = child->d_func()->data()->activeOpacity; setupChildState(child); @@ -226,10 +226,10 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child) { qreal visible = child->visible(); child->d_func()->data()->activeOpacity = data()->activeOpacity; - if(visible != 1) + if (visible != 1) child->d_func()->data()->activeOpacity *= visible; - if(child->d_func()->data()->activeOpacity != 0) { + if (child->d_func()->data()->activeOpacity != 0) { // Calculate child's transform qreal x = child->x(); qreal y = child->y(); @@ -238,19 +238,19 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child) QSimpleCanvas::Matrix &am = child->d_func()->data()->transformActive; am = data()->transformActive; - if(x != 0 || y != 0) + if (x != 0 || y != 0) am.translate(x, y); - if(scale != 1) { + if (scale != 1) { QPointF to = child->d_func()->transformOrigin(); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) am.translate(to.x(), to.y()); am.scale(scale, scale); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) am.translate(-to.x(), -to.y()); } - if(child->d_func()->data()->transformUser) + if (child->d_func()->data()->transformUser) am *= *child->d_func()->data()->transformUser; - if(flip) { + if (flip) { QRectF br = child->boundingRect(); am.translate(br.width() / 2., br.height() / 2); am.rotate(180, (flip & QSimpleCanvasItem::VerticalFlip)?1:0, (flip & QSimpleCanvasItem::HorizontalFlip)?1:0, 0); @@ -265,15 +265,15 @@ QRectF QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &boundin Q_Q(QSimpleCanvasItem); QRectF filteredBoundRect = q->boundingRect(); - if(filter) + if (filter) filteredBoundRect = filter->itemBoundingRect(filteredBoundRect); QRectF rv = data()->transformActive.mapRect(filteredBoundRect); - for(int ii = 0; ii < children.count(); ++ii) { + for (int ii = 0; ii < children.count(); ++ii) { QSimpleCanvasItem *child = children.at(ii); setupChildState(child); - if(child->d_func()->data()->activeOpacity != 0) + if (child->d_func()->data()->activeOpacity != 0) rv |= child->d_func()->setupPainting(version, bounding); } @@ -283,7 +283,7 @@ QRectF QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &boundin void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvasFilter::Layer layer) { - if(!layer) + if (!layer) return; Q_Q(QSimpleCanvasItem); @@ -299,8 +299,8 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas width, 0 }; // XXX Handle separate cliping modes - if(clip) { - if(params.stencilValue == 255) + if (clip) { + if (params.stencilValue == 255) qWarning() << "OpenGL: Clip recursion greater than 255 not permitted."; glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); @@ -341,17 +341,17 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas zOrderChildren(); int upto = 0; - for(upto = 0; upto < children.count(); ++upto) { + for (upto = 0; upto < children.count(); ++upto) { QSimpleCanvasItem *c = children.at(upto); - if(c->z() < 0) { - if(layer & QSimpleCanvasFilter::ChildrenUnderItem) + if (c->z() < 0) { + if (layer & QSimpleCanvasFilter::ChildrenUnderItem) paintChild(params, c); } else { break; } } - if(layer & QSimpleCanvasFilter::Item && + if (layer & QSimpleCanvasFilter::Item && q->options() & QSimpleCanvasItem::HasContents) { QSimpleCanvasItem::GLPainter painter(q); painter.activeTransform = data()->transformActive; @@ -361,14 +361,14 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas q->paintGLContents(painter); } - if(layer & QSimpleCanvasFilter::ChildrenAboveItem) { - for(; upto < children.count(); ++upto) { + if (layer & QSimpleCanvasFilter::ChildrenAboveItem) { + for (; upto < children.count(); ++upto) { QSimpleCanvasItem *c = children.at(upto); paintChild(params, c); } } - if(clip) { + if (clip) { glColorMask(GL_FALSE, GL_FALSE, GL_FALSE, GL_FALSE); glStencilFunc(GL_EQUAL, params.stencilValue + 1, 0xFFFFFFFF); glStencilOp(GL_KEEP, GL_KEEP, GL_DECR); @@ -389,7 +389,7 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters &oldParams, QSimpleCanvas QGLShaderProgram *QSimpleCanvasItem::GLPainter::useTextureShader() { - if(activeOpacity == 1.) { + if (activeOpacity == 1.) { item->basicShaders()->singleTexture()->enable(); item->basicShaders()->singleTexture()->setTransform(activeTransform); return item->basicShaders()->singleTexture(); @@ -406,7 +406,7 @@ QGLShaderProgram *QSimpleCanvasItem::GLPainter::useColorShader(const QColor &col { QColor c = color; item->basicShaders()->constantColor()->enable(); - if(activeOpacity != 1.) { + if (activeOpacity != 1.) { c.setAlpha(int(c.alpha() * activeOpacity)); } diff --git a/src/declarative/canvas/qsimplecanvas_opengl1.cpp b/src/declarative/canvas/qsimplecanvas_opengl1.cpp index ad21c77..3fd8490 100644 --- a/src/declarative/canvas/qsimplecanvas_opengl1.cpp +++ b/src/declarative/canvas/qsimplecanvas_opengl1.cpp @@ -57,7 +57,7 @@ void CanvasEGLWidget::updateGL() void CanvasEGLWidget::updateGL(const QRect &r) { - if(r.isEmpty()) + if (r.isEmpty()) return; _clip = r; @@ -66,7 +66,7 @@ void CanvasEGLWidget::updateGL(const QRect &r) void CanvasEGLWidget::paintGL() { - if(!_clip.isEmpty()) { + if (!_clip.isEmpty()) { glEnable(GL_SCISSOR_TEST); glScissor(_clip.x(), _clip.y(), _clip.width(), _clip.height()); } else { @@ -124,7 +124,7 @@ void QSimpleCanvasPrivate::paintGL() p.clipRect = p.sceneRect; p.opacity = 1; p.forceParamRefresh = false; - if(!isSetup) { + if (!isSetup) { unsigned int zero = 0; root->d_func()->setupPainting(0, QRect(), &zero); } @@ -151,7 +151,7 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters ¶ms, { GLPaintParameters childParams = params; - if(child->d_func()->activeOpacity != 0) { + if (child->d_func()->activeOpacity != 0) { childParams.boundingRect = child->boundingRect(); child->d_func()->paint(childParams); } @@ -160,7 +160,7 @@ void QSimpleCanvasItemPrivate::simplePaintChild(const GLPaintParameters ¶ms, void QSimpleCanvasItemPrivate::paintChild(const GLPaintParameters ¶ms, QSimpleCanvasItem *child) { - if(params.forceParamRefresh) { + if (params.forceParamRefresh) { QSimpleCanvas::Matrix t = child->d_func()->transformActive; qreal o = child->d_func()->activeOpacity; setupChildState(child); @@ -177,10 +177,10 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child) { qreal visible = child->visible().value(); child->d_func()->activeOpacity = activeOpacity; - if(visible != 1) + if (visible != 1) child->d_func()->activeOpacity *= visible; - if(child->d_func()->activeOpacity != 0) { + if (child->d_func()->activeOpacity != 0) { // Calculate child's transform qreal x = child->x(); qreal y = child->y(); @@ -189,19 +189,19 @@ void QSimpleCanvasItemPrivate::setupChildState(QSimpleCanvasItem *child) QSimpleCanvas::Matrix &am = child->d_func()->transformActive; am = transformActive; - if(x != 0 || y != 0) + if (x != 0 || y != 0) am.translate(x, y); - if(scale != 1) { + if (scale != 1) { QPointF to = child->d_func()->transformOrigin(); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) am.translate(to.x(), to.y()); am.scale(scale, scale); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) am.translate(-to.x(), -to.y()); } - if(child->d_func()->transformUserSet) + if (child->d_func()->transformUserSet) am *= child->d_func()->transformUser; - if(flip) { + if (flip) { QRectF br = child->boundingRect(); am.translate(br.width() / 2., br.height() / 2); am.rotate(180, (flip & QSimpleCanvasItem::VerticalFlip)?1:0, (flip & QSimpleCanvasItem::HorizontalFlip)?1:0, 0); @@ -218,15 +218,15 @@ QRectF QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &boundin unsigned int oldZero = *zero; - for(int ii = 0; ii < children.count(); ++ii) { + for (int ii = 0; ii < children.count(); ++ii) { QSimpleCanvasItem *child = children.at(ii); setupChildState(child); - if(child->d_func()->activeOpacity != 0) + if (child->d_func()->activeOpacity != 0) rv |= child->d_func()->setupPainting(version, bounding, zero); } - if(clip || oldZero != *zero) + if (clip || oldZero != *zero) (*zero)++; transformActive.translate(0, 0, *zero); @@ -241,17 +241,17 @@ void QSimpleCanvasItemPrivate::paintNoClip(GLPaintParameters ¶ms, QSimpleCan zOrderChildren(); int upto = 0; - for(upto = 0; upto < children.count(); ++upto) { + for (upto = 0; upto < children.count(); ++upto) { QSimpleCanvasItem *c = children.at(upto); - if(c->zValue().value() < 0) { - if(layer & QSimpleCanvasFilter::ChildrenUnderItem) + if (c->zValue().value() < 0) { + if (layer & QSimpleCanvasFilter::ChildrenUnderItem) paintChild(params, c); } else { break; } } - if(layer & QSimpleCanvasFilter::Item && + if (layer & QSimpleCanvasFilter::Item && q->options() & QSimpleCanvasItem::HasContents) { QSimpleCanvasItem::GLPainter painter(q); painter.activeTransform = transformActive; @@ -261,8 +261,8 @@ void QSimpleCanvasItemPrivate::paintNoClip(GLPaintParameters ¶ms, QSimpleCan q->paintGLContents(painter); } - if(layer & QSimpleCanvasFilter::ChildrenAboveItem) { - for(; upto < children.count(); ++upto) { + if (layer & QSimpleCanvasFilter::ChildrenAboveItem) { + for (; upto < children.count(); ++upto) { QSimpleCanvasItem *c = children.at(upto); paintChild(params, c); } @@ -271,11 +271,11 @@ void QSimpleCanvasItemPrivate::paintNoClip(GLPaintParameters ¶ms, QSimpleCan void QSimpleCanvasItemPrivate::paint(GLPaintParameters ¶ms, QSimpleCanvasFilter::Layer layer) { - if(!layer) + if (!layer) return; // XXX Handle separate cliping modes - if(clip) { + if (clip) { GLSaveScissor ss; qreal width = params.boundingRect.width(); @@ -331,7 +331,7 @@ void QSimpleCanvasItemPrivate::paint(GLPaintParameters ¶ms, QSimpleCanvasFil int sr_height = ::ceilf(r.bottom()) - sr_y; QRect sr(sr_x, sr_y, sr_width, sr_height); - if(ss.wasEnabled()) + if (ss.wasEnabled()) sr &= ss.rect(); glScissor(sr.x(), sr.y(), sr.width(), sr.height()); diff --git a/src/declarative/canvas/qsimplecanvas_p.h b/src/declarative/canvas/qsimplecanvas_p.h index 44e5a7e..7bc7330 100644 --- a/src/declarative/canvas/qsimplecanvas_p.h +++ b/src/declarative/canvas/qsimplecanvas_p.h @@ -176,7 +176,7 @@ public: GLBasicShaders *basicShaders() const { #if defined(QFX_RENDER_OPENGL2) - if(!basicShadersInstance) + if (!basicShadersInstance) basicShadersInstance = new GLBasicShaders; return basicShadersInstance; #else diff --git a/src/declarative/canvas/qsimplecanvas_software.cpp b/src/declarative/canvas/qsimplecanvas_software.cpp index 06e221e..c130a62 100644 --- a/src/declarative/canvas/qsimplecanvas_software.cpp +++ b/src/declarative/canvas/qsimplecanvas_software.cpp @@ -52,18 +52,18 @@ QRect QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &bounding QRect rv = data()->transformActive.mapRect(boundingRectActive).toAlignedRect() & bounding; QRect myBounding = bounding; - if(q->clip()) + if (q->clip()) myBounding &= rv; - for(int ii = 0; ii < children.count(); ++ii) { + for (int ii = 0; ii < children.count(); ++ii) { QSimpleCanvasItem *child = children.at(ii); qreal visible = child->visible(); child->d_func()->data()->activeOpacity = data()->activeOpacity; - if(visible != 1) + if (visible != 1) child->d_func()->data()->activeOpacity *= visible; - if(child->d_func()->data()->activeOpacity != 0) { + if (child->d_func()->data()->activeOpacity != 0) { // Calculate child's transform qreal x = child->x(); qreal y = child->y(); @@ -72,21 +72,21 @@ QRect QSimpleCanvasItemPrivate::setupPainting(int version, const QRect &bounding QSimpleCanvas::Matrix &am = child->d_func()->data()->transformActive; am = data()->transformActive; - if(x != 0 || y != 0) + if (x != 0 || y != 0) am.translate(x, y); - if(scale != 1) { + if (scale != 1) { QPointF to = child->d_func()->transformOrigin(); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) am.translate(to.x(), to.y()); am.scale(scale, scale); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) am.translate(-to.x(), -to.y()); } - if(child->d_func()->data()->transformUser) + if (child->d_func()->data()->transformUser) am = *child->d_func()->data()->transformUser * am; - if(flip) { + if (flip) { QRectF br = child->boundingRect(); am.translate(br.width() / 2., br.height() / 2); am.scale((flip & QSimpleCanvasItem::HorizontalFlip)?-1:1, @@ -107,7 +107,7 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p) Q_Q(QSimpleCanvasItem); QRect oldUcr; - if(clip) { + if (clip) { p.save(); QRectF boundingRectActive = q->boundingRect(); @@ -138,13 +138,13 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p) } p.setWorldTransform(data()->transformActive); - if(p.clipRegion().isEmpty()) { + if (p.clipRegion().isEmpty()) { p.setClipRect(cr); } else { p.setClipRect(cr, Qt::IntersectClip); } - if(p.clipRegion().isEmpty()) { + if (p.clipRegion().isEmpty()) { p.restore(); return; } @@ -153,9 +153,9 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p) zOrderChildren(); int upto = 0; - for(upto = 0; upto < children.count(); ++upto) { + for (upto = 0; upto < children.count(); ++upto) { QSimpleCanvasItem *c = children.at(upto); - if(c->z() < 0) { + if (c->z() < 0) { paintChild(p, c); } else { break; @@ -165,18 +165,18 @@ void QSimpleCanvasItemPrivate::paint(QPainter &p) p.setWorldTransform(data()->transformActive); q->paintContents(p); - for(; upto < children.count(); ++upto) { + for (; upto < children.count(); ++upto) { QSimpleCanvasItem *c = children.at(upto); paintChild(p, c); } - if(clip) + if (clip) p.restore(); } void QSimpleCanvasItemPrivate::paintChild(QPainter &p, QSimpleCanvasItem *c) { - if(c->d_func()->data()->activeOpacity != 0) { + if (c->d_func()->data()->activeOpacity != 0) { qreal op = p.opacity(); p.setOpacity(c->d_func()->data()->activeOpacity); diff --git a/src/declarative/canvas/qsimplecanvasfilter.cpp b/src/declarative/canvas/qsimplecanvasfilter.cpp index 00c88c5..5bc6b35 100644 --- a/src/declarative/canvas/qsimplecanvasfilter.cpp +++ b/src/declarative/canvas/qsimplecanvasfilter.cpp @@ -64,7 +64,7 @@ QSimpleCanvasFilter::QSimpleCanvasFilter(QObject *parent) QSimpleCanvasFilter::~QSimpleCanvasFilter() { - if(d->item) d->item->setFilter(0); + if (d->item) d->item->setFilter(0); delete d; d = 0; } @@ -80,7 +80,7 @@ bool QSimpleCanvasFilter::enabled() const void QSimpleCanvasFilter::setEnabled(bool e) { - if(e == d->enabled) + if (e == d->enabled) return; d->enabled = e; emit enabledChanged(); @@ -96,7 +96,7 @@ QGLFramebufferObject *QSimpleCanvasFilter::renderToFBO(float scale, const QRectF QSimpleCanvasItem *item = d->item; QRect br = item->itemBoundingRect(); - if(br.isEmpty()) + if (br.isEmpty()) return 0; QGLFramebufferObject *fbo = item->canvas()->d->acquire(int(br.width() * scale), int(br.height() * scale)); @@ -141,7 +141,7 @@ QGLFramebufferObject *QSimpleCanvasFilter::renderToFBO(const QRectF &src, const QSimpleCanvasItem *item = d->item; QRect br = item->itemBoundingRect(); - if(br.isEmpty()) + if (br.isEmpty()) return 0; QGLFramebufferObject *fbo = item->canvas()->d->acquire(br.width(), br.height()); @@ -181,7 +181,7 @@ QGLFramebufferObject *QSimpleCanvasFilter::acquireFBO(const QSize &s) #if defined(QFX_RENDER_OPENGL2) QSize size; QSimpleCanvasItem *item = d->item; - if(size.isNull()) { + if (size.isNull()) { QRect br = item->itemBoundingRect(); size = br.size(); } else { @@ -245,14 +245,14 @@ QSimpleCanvasItem *QSimpleCanvasFilter::item() const void QSimpleCanvasFilter::setItem(QSimpleCanvasItem *i) { - if(d->item == i) + if (d->item == i) return; - if(d->item) { + if (d->item) { d->item->setFilter(0); d->item = 0; } - if(i->filter() != this) { + if (i->filter() != this) { i->setFilter(this); } else { d->item = i; @@ -283,23 +283,23 @@ void QSimpleCanvasFilter::filter(QPainter &) void QSimpleCanvasFilter::update() { - if(d->item) + if (d->item) d->item->update(); } #if defined(QFX_RENDER_OPENGL2) bool QSimpleCanvasFilterPrivate::isSimpleItem(QSimpleCanvasItem *item, QSimpleCanvasItem **out, QSimpleCanvas::Matrix *mout) { - if(item->options() & QSimpleCanvasItem::SimpleItem && !item->hasChildren()) { + if (item->options() & QSimpleCanvasItem::SimpleItem && !item->hasChildren()) { *out = item; return true; - } else if(!(item->options() & QSimpleCanvasItem::HasContents) && + } else if (!(item->options() & QSimpleCanvasItem::HasContents) && item->children().count() == 1) { QSimpleCanvasItem *child = item->children().first(); - if(child->filter() && child->filter()->enabled()) + if (child->filter() && child->filter()->enabled()) return false; bool rv = isSimpleItem(child, out, mout); - if(rv) + if (rv) *mout *= child->d_func()->localTransform(); return rv; } else { diff --git a/src/declarative/canvas/qsimplecanvasitem.cpp b/src/declarative/canvas/qsimplecanvasitem.cpp index 446e331..62a44e4 100644 --- a/src/declarative/canvas/qsimplecanvasitem.cpp +++ b/src/declarative/canvas/qsimplecanvasitem.cpp @@ -57,7 +57,7 @@ QSimpleCanvasItemData::QSimpleCanvasItemData() QSimpleCanvasItemData::~QSimpleCanvasItemData() { - if(transformUser) + if (transformUser) delete transformUser; } @@ -265,7 +265,7 @@ QSimpleCanvasItem::TransformOrigin QSimpleCanvasItem::transformOrigin() const void QSimpleCanvasItem::setTransformOrigin(TransformOrigin origin) { Q_D(QSimpleCanvasItem); - if(origin != d->origin) { + if (origin != d->origin) { d->origin = origin; update(); } @@ -297,7 +297,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::parent() const void QSimpleCanvasItemPrivate::zOrderChildren() { - if(!needsZOrder || children.count() <= 1) + if (!needsZOrder || children.count() <= 1) return; needsZOrder = false; @@ -310,10 +310,10 @@ void QSimpleCanvasItemPrivate::zOrderChildren() swap = false; QSimpleCanvasItem *item = children.first(); qreal z = item->z(); - for(int ii = 1; ii < children.count(); ++ii) { + for (int ii = 1; ii < children.count(); ++ii) { QSimpleCanvasItem *i2 = children.at(ii); qreal z2 = i2->z(); - if(z2 < z) { + if (z2 < z) { swap = true; children[ii] = item; children[ii - 1] = i2; @@ -329,21 +329,21 @@ void QSimpleCanvasItemPrivate::canvasChanged(QSimpleCanvas *newCanvas, QSimpleCa { Q_Q(QSimpleCanvasItem); canvas = newCanvas; - if(options & QSimpleCanvasItem::MouseFilter) { - if(oldCanvas) oldCanvas->d->removeMouseFilter(q); - if(newCanvas) newCanvas->d->installMouseFilter(q); + if (options & QSimpleCanvasItem::MouseFilter) { + if (oldCanvas) oldCanvas->d->removeMouseFilter(q); + if (newCanvas) newCanvas->d->installMouseFilter(q); } - if(newCanvas) { - if(!oldCanvas && hasFocus) + if (newCanvas) { + if (!oldCanvas && hasFocus) newCanvas->d->setFocusItem(q, Qt::OtherFocusReason, false); - if(wantsActiveFocusPanelPendingCanvas) { + if (wantsActiveFocusPanelPendingCanvas) { hasBeenActiveFocusPanel = true; newCanvas->d->setActiveFocusPanel(q); wantsActiveFocusPanelPendingCanvas = false; } } - for(int ii = 0; ii < children.count(); ++ii) + for (int ii = 0; ii < children.count(); ++ii) children.at(ii)->d_func()->canvasChanged(newCanvas, oldCanvas); q->canvasChanged(); } @@ -351,12 +351,12 @@ void QSimpleCanvasItemPrivate::canvasChanged(QSimpleCanvas *newCanvas, QSimpleCa void QSimpleCanvasItem::setFocus(bool focus) { Q_D(QSimpleCanvasItem); - if(d->hasFocus == focus) + if (d->hasFocus == focus) return; QSimpleCanvas *c = canvas(); - if(c) { - if(focus) + if (c) { + if (focus) c->d->setFocusItem(this, Qt::OtherFocusReason); else c->d->clearFocusItem(this); @@ -369,9 +369,9 @@ void QSimpleCanvasItem::setFocus(bool focus) qreal QSimpleCanvasItem::x() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return d->graphicsItem->x(); - else if(d->data_ptr) + else if (d->data_ptr) return d->data()->x; else return 0; @@ -380,9 +380,9 @@ qreal QSimpleCanvasItem::x() const qreal QSimpleCanvasItem::y() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return d->graphicsItem->y(); - else if(d->data_ptr) + else if (d->data_ptr) return d->data()->y; else return 0; @@ -391,9 +391,9 @@ qreal QSimpleCanvasItem::y() const qreal QSimpleCanvasItem::z() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return d->graphicsItem->zValue(); - else if(d->data_ptr) + else if (d->data_ptr) return d->data()->z; else return 0; @@ -402,12 +402,12 @@ qreal QSimpleCanvasItem::z() const void QSimpleCanvasItem::setX(qreal x) { Q_D(QSimpleCanvasItem); - if(x == this->x()) + if (x == this->x()) return; qreal oldX = this->x(); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->setPos(x, y()); } else { d->data()->x = x; @@ -421,12 +421,12 @@ void QSimpleCanvasItem::setX(qreal x) void QSimpleCanvasItem::setY(qreal y) { Q_D(QSimpleCanvasItem); - if(y == this->y()) + if (y == this->y()) return; qreal oldY = this->y(); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->setPos(x(), y); } else { d->data()->y = y; @@ -440,12 +440,12 @@ void QSimpleCanvasItem::setY(qreal y) void QSimpleCanvasItem::setZ(qreal z) { Q_D(QSimpleCanvasItem); - if(z == this->z()) + if (z == this->z()) return; - if(d->graphicsItem) { + if (d->graphicsItem) { - if(z < 0) + if (z < 0) d->graphicsItem->setFlag(QGraphicsItem::ItemStacksBehindParent, true); else @@ -455,11 +455,11 @@ void QSimpleCanvasItem::setZ(qreal z) d->graphicsItem->setZValue(z); } else { - if(d->data()->z == z) + if (d->data()->z == z) return; d->data()->z = z; - if(parent()) + if (parent()) static_cast<QSimpleCanvasItemPrivate*>(parent()->d_ptr)->needsZOrder = true; update(); } @@ -475,7 +475,7 @@ void QSimpleCanvasItem::setWidth(qreal w) { Q_D(QSimpleCanvasItem); d->widthValid = true; - if(d->width == w) + if (d->width == w) return; qreal oldWidth = d->width; @@ -490,7 +490,7 @@ void QSimpleCanvasItem::setWidth(qreal w) void QSimpleCanvasItem::setImplicitWidth(qreal w) { Q_D(QSimpleCanvasItem); - if(d->width == w || widthValid()) + if (d->width == w || widthValid()) return; qreal oldWidth = d->width; @@ -518,7 +518,7 @@ void QSimpleCanvasItem::setHeight(qreal h) { Q_D(QSimpleCanvasItem); d->heightValid = true; - if(d->height == h) + if (d->height == h) return; qreal oldHeight = d->height; @@ -533,7 +533,7 @@ void QSimpleCanvasItem::setHeight(qreal h) void QSimpleCanvasItem::setImplicitHeight(qreal h) { Q_D(QSimpleCanvasItem); - if(d->height == h || heightValid()) + if (d->height == h || heightValid()) return; qreal oldHeight = d->height; @@ -557,7 +557,7 @@ void QSimpleCanvasItem::setPos(const QPointF &point) qreal oldX = x(); qreal oldY = y(); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->setPos(point); } else { d->data()->x = point.x(); @@ -579,13 +579,13 @@ void QSimpleCanvasItem::setScale(qreal s) { Q_D(QSimpleCanvasItem); d->scale = s; - if(d->graphicsItem) { + if (d->graphicsItem) { QTransform t; QPointF to = transformOriginPoint(); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) t.translate(to.x(), to.y()); t.scale(s, s); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) t.translate(-to.x(), -to.y()); d->graphicsItem->setTransform(t * d->graphicsItem->transform); } else { @@ -595,9 +595,9 @@ void QSimpleCanvasItem::setScale(qreal s) bool QSimpleCanvasItem::isVisible() const { - if(visible() <= 0) + if (visible() <= 0) return false; - else if(!parent()) + else if (!parent()) return true; else return parent()->isVisible(); @@ -606,9 +606,9 @@ bool QSimpleCanvasItem::isVisible() const qreal QSimpleCanvasItem::visible() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return d->graphicsItem->opacity(); - else if(d->data_ptr) + else if (d->data_ptr) return d->data()->visible; else return 1; @@ -617,17 +617,17 @@ qreal QSimpleCanvasItem::visible() const void QSimpleCanvasItem::setVisible(qreal v) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->setOpacity(v); } else { - if(v == visible()) + if (v == visible()) return; - if(v == 0) + if (v == 0) update(); d->data()->visible = v; - if(v != 0) + if (v != 0) update(); } } @@ -636,7 +636,7 @@ void QSimpleCanvasItem::addChild(QSimpleCanvasItem *c) { Q_D(QSimpleCanvasItem); d->children.append(c); - if(!d->graphicsItem) + if (!d->graphicsItem) d->needsZOrder = true; childrenChanged(); } @@ -660,11 +660,11 @@ QSimpleCanvasItem takes ownership of filter. void QSimpleCanvasItem::setFilter(QSimpleCanvasFilter *f) { Q_D(QSimpleCanvasItem); - if(!d || f == d->filter) + if (!d || f == d->filter) return; d->filter = f; - if(d->filter) + if (d->filter) d->filter->setItem(this); update(); } @@ -683,7 +683,7 @@ bool QSimpleCanvasItem::hasChildren() const QSimpleCanvasLayer *QSimpleCanvasItem::layer() { - if(parent()) + if (parent()) return parent()->layer(); else return 0; @@ -692,18 +692,18 @@ QSimpleCanvasLayer *QSimpleCanvasItem::layer() void QSimpleCanvasItem::update() { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->update(); } else { - if(!parent()) + if (!parent()) return; - if(d->data()->dirty || 0. == d->data()->visible) return; + if (d->data()->dirty || 0. == d->data()->visible) return; QSimpleCanvasLayer *l = layer(); - if(l == this && parent()) + if (l == this && parent()) l = parent()->layer(); - if(l) { + if (l) { l->addDirty(this); d->data()->dirty = true; d->data()->transformValid = false; @@ -720,10 +720,10 @@ bool QSimpleCanvasItem::clip() const void QSimpleCanvasItem::setClip(bool c) { Q_D(const QSimpleCanvasItem); - if(bool(d->clip) == c) + if (bool(d->clip) == c) return; - if(c) + if (c) setClipType(ClipToRect); else setClipType(NoClip); @@ -741,7 +741,7 @@ void QSimpleCanvasItem::setClipType(ClipType c) { Q_D(QSimpleCanvasItem); d->clip = c; - if(d->graphicsItem) + if (d->graphicsItem) d->graphicsItem->setFlag(QGraphicsItem::ItemClipsChildrenToShape, bool(c)); else update(); @@ -750,9 +750,9 @@ void QSimpleCanvasItem::setClipType(ClipType c) Qt::MouseButtons QSimpleCanvasItem::acceptedMouseButtons() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return d->graphicsItem->acceptedMouseButtons(); - else if(d->data_ptr) + else if (d->data_ptr) return (Qt::MouseButtons)d->data()->buttons; else return Qt::NoButton; @@ -761,7 +761,7 @@ Qt::MouseButtons QSimpleCanvasItem::acceptedMouseButtons() const void QSimpleCanvasItem::setAcceptedMouseButtons(Qt::MouseButtons buttons) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) d->graphicsItem->setAcceptedMouseButtons(buttons); else d->data()->buttons = buttons; @@ -776,7 +776,7 @@ QRect QSimpleCanvasItem::itemBoundingRect() QPointF QSimpleCanvasItemPrivate::adjustFrom(const QPointF &p) const { #if defined(QFX_RENDER_OPENGL) - if(!canvas) + if (!canvas) return p; QPointF rv(-1. + 2. * p.x() / qreal(canvas->width()), @@ -791,7 +791,7 @@ QPointF QSimpleCanvasItemPrivate::adjustFrom(const QPointF &p) const QRectF QSimpleCanvasItemPrivate::adjustFrom(const QRectF &r) const { #if defined(QFX_RENDER_OPENGL) - if(!canvas) + if (!canvas) return r; qreal width = r.width() * 2. / qreal(canvas->width()); @@ -808,7 +808,7 @@ QRectF QSimpleCanvasItemPrivate::adjustFrom(const QRectF &r) const QPointF QSimpleCanvasItemPrivate::adjustTo(const QPointF &p) const { #if defined(QFX_RENDER_OPENGL) - if(!canvas) + if (!canvas) return p; QPointF rv(0.5 * (p.x() + 1.) * qreal(canvas->width()), @@ -823,7 +823,7 @@ QPointF QSimpleCanvasItemPrivate::adjustTo(const QPointF &p) const QRectF QSimpleCanvasItemPrivate::adjustTo(const QRectF &r) const { #if defined(QFX_RENDER_OPENGL) - if(!canvas) + if (!canvas) return r; qreal width = 0.5 * r.width() * qreal(canvas->width()); @@ -840,7 +840,7 @@ QRectF QSimpleCanvasItemPrivate::adjustTo(const QRectF &r) const QPointF QSimpleCanvasItem::mapFromScene(const QPointF &p) const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { return d->graphicsItem->mapFromScene(p); } else { QPointF mp = d->adjustFrom(p); @@ -865,7 +865,7 @@ QPointF QSimpleCanvasItem::mapFromScene(const QPointF &p) const QRectF QSimpleCanvasItem::mapFromScene(const QRectF &r) const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { return d->graphicsItem->mapFromScene(r).boundingRect(); } else { QRectF mr = d->adjustFrom(r); @@ -902,7 +902,7 @@ QRectF QSimpleCanvasItem::mapFromScene(const QRectF &r) const QPointF QSimpleCanvasItem::mapToScene(const QPointF &p) const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { return d->graphicsItem->mapToScene(p); } else { d->freshenTransforms(); @@ -914,7 +914,7 @@ QPointF QSimpleCanvasItem::mapToScene(const QPointF &p) const QRectF QSimpleCanvasItem::mapToScene(const QRectF &r) const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { return d->graphicsItem->mapToScene(r).boundingRect(); } else { d->freshenTransforms(); @@ -927,7 +927,7 @@ int QSimpleCanvasItemPrivate::nextTransformVersion = 1; void QSimpleCanvasItemPrivate::freshenTransforms() const { - if(freshenNeeded()) + if (freshenNeeded()) doFreshenTransforms(); } @@ -941,9 +941,9 @@ bool QSimpleCanvasItemPrivate::freshenNeeded() const #else const QSimpleCanvasItemPrivate *me = this; while(me) { - if(me->data_ptr && !me->data_ptr->transformValid) + if (me->data_ptr && !me->data_ptr->transformValid) return true; - if(me->parent) + if (me->parent) me = me->parent->d_func(); else me = 0; @@ -955,31 +955,31 @@ bool QSimpleCanvasItemPrivate::freshenNeeded() const void QSimpleCanvasItemPrivate::doFreshenTransforms() const { Q_Q(const QSimpleCanvasItem); - if(parent) + if (parent) parent->d_func()->doFreshenTransforms(); - if(freshenNeeded()) { - if(parent) + if (freshenNeeded()) { + if (parent) data()->transformActive = parent->d_func()->data()->transformActive; else data()->transformActive = QSimpleCanvas::Matrix(); data()->transformActive.translate(q->x(), q->y()); - if(scale != 1.) { + if (scale != 1.) { QPointF to = transformOrigin(); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) data()->transformActive.translate(to.x(), to.y()); data()->transformActive.scale(scale, scale); - if(to.x() != 0. || to.y() != 0.) + if (to.x() != 0. || to.y() != 0.) data()->transformActive.translate(-to.x(), -to.y()); } Q_Q(const QSimpleCanvasItem); #if defined(QFX_RENDER_OPENGL) - if(q->d_func()->data()->transformUser) + if (q->d_func()->data()->transformUser) data()->transformActive *= *q->d_func()->data()->transformUser; #endif - if(data()->flip) { + if (data()->flip) { QRectF br = q->boundingRect(); data()->transformActive.translate(br.width() / 2., br.height() / 2); #if defined(QFX_RENDER_OPENGL) @@ -996,9 +996,9 @@ void QSimpleCanvasItemPrivate::doFreshenTransforms() const QSimpleCanvas::Matrix QSimpleCanvasItem::transform() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return QSimpleCanvasConfig::transformToMatrix(d->graphicsItem->transform); - else if(d->data()->transformUser) + else if (d->data()->transformUser) return *d->data()->transformUser; else return QSimpleCanvas::Matrix(); @@ -1007,11 +1007,11 @@ QSimpleCanvas::Matrix QSimpleCanvasItem::transform() const void QSimpleCanvasItem::setTransform(const QSimpleCanvas::Matrix &m) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->transform = QSimpleCanvasConfig::matrixToTransform(m); d->graphicsItem->setTransform(QTransform::fromScale(d->scale, d->scale) * d->graphicsItem->transform); } else { - if(!d->data()->transformUser) + if (!d->data()->transformUser) d->data()->transformUser = new QSimpleCanvas::Matrix; *d->data()->transformUser = m; update(); @@ -1021,16 +1021,16 @@ void QSimpleCanvasItem::setTransform(const QSimpleCanvas::Matrix &m) QSimpleCanvasItem *QSimpleCanvasItem::mouseGrabberItem() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { QGraphicsScene *s = d->graphicsItem->scene(); - if(s) { + if (s) { QGraphicsItem *item = s->mouseGrabberItem(); QSimpleGraphicsItem *dgi = static_cast<QSimpleGraphicsItem *>(item); return dgi?static_cast<QSimpleCanvasItem*>(dgi->owner):0; } } else { QSimpleCanvas *c = canvas(); - if(c) + if (c) return c->d->lastMouseItem; } return 0; @@ -1039,11 +1039,11 @@ QSimpleCanvasItem *QSimpleCanvasItem::mouseGrabberItem() const void QSimpleCanvasItem::ungrabMouse() { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->ungrabMouse(); } else { QSimpleCanvas *c = canvas(); - if(c && c->d->lastMouseItem == this) { + if (c && c->d->lastMouseItem == this) { c->d->lastMouseItem->mouseUngrabEvent(); c->d->lastMouseItem = 0; } @@ -1053,13 +1053,13 @@ void QSimpleCanvasItem::ungrabMouse() void QSimpleCanvasItem::grabMouse() { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { d->graphicsItem->grabMouse(); } else { QSimpleCanvas *c = canvas(); - if(c) { - if(c->d->lastMouseItem != this) { - if(c->d->lastMouseItem) + if (c) { + if (c->d->lastMouseItem != this) { + if (c->d->lastMouseItem) c->d->lastMouseItem->mouseUngrabEvent(); c->d->lastMouseItem = this; } @@ -1094,7 +1094,7 @@ void QSimpleCanvasItemPrivate::setActiveFocus(bool f) { hasActiveFocus = f; - if(graphicsItem) { + if (graphicsItem) { if (f) { if (!(graphicsItem->flags() & QGraphicsItem::ItemIsFocusable)) graphicsItem->setFlag(QGraphicsItem::ItemIsFocusable); @@ -1111,9 +1111,9 @@ void QSimpleCanvasItemPrivate::setActiveFocus(bool f) QSimpleCanvasItem::Flip QSimpleCanvasItem::flip() const { Q_D(const QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return NoFlip; - else if(d->data_ptr) + else if (d->data_ptr) return d->data()->flip; else return NoFlip; @@ -1122,10 +1122,10 @@ QSimpleCanvasItem::Flip QSimpleCanvasItem::flip() const void QSimpleCanvasItem::setFlip(Flip f) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return; - if(d->data()->flip == f) + if (d->data()->flip == f) return; d->data()->flip = f; @@ -1142,15 +1142,15 @@ void QSimpleCanvasItem::setFlip(Flip f) void QSimpleCanvasItem::stackUnder(QSimpleCanvasItem *item) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return; // XXX QSimpleCanvasItem *p = parent(); - if(!p || !item || item == this) return; + if (!p || !item || item == this) return; QSimpleCanvasItemPrivate *parent_d_ptr = static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr); int idx = parent_d_ptr->children.indexOf(item); - if(idx == -1) return; + if (idx == -1) return; parent_d_ptr->children.removeAll(this); idx = parent_d_ptr->children.indexOf(item); @@ -1170,15 +1170,15 @@ void QSimpleCanvasItem::stackUnder(QSimpleCanvasItem *item) void QSimpleCanvasItem::stackOver(QSimpleCanvasItem *item) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return; // XXX QSimpleCanvasItem *p = parent(); - if(!p || !item || item == this) return; + if (!p || !item || item == this) return; QSimpleCanvasItemPrivate *parent_d_ptr = static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr); int idx = parent_d_ptr->children.indexOf(item); - if(idx == -1) return; + if (idx == -1) return; parent_d_ptr->children.removeAll(this); idx = parent_d_ptr->children.indexOf(item); @@ -1200,17 +1200,17 @@ void QSimpleCanvasItem::stackOver(QSimpleCanvasItem *item) void QSimpleCanvasItem::stackAt(int index) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) + if (d->graphicsItem) return; // XXX QSimpleCanvasItem *p = parent(); - if(!p) return; + if (!p) return; QSimpleCanvasItemPrivate *parent_d_ptr = static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr); parent_d_ptr->children.removeAll(this); - if(index < 0) index = 0; - if(index > parent_d_ptr->children.size()) index = parent_d_ptr->children.size(); + if (index < 0) index = 0; + if (index > parent_d_ptr->children.size()) index = parent_d_ptr->children.size(); parent_d_ptr->children.insert(index, this); parent_d_ptr->needsZOrder = true; @@ -1233,13 +1233,13 @@ int QSimpleCanvasItem::indexForChild(QSimpleCanvasItem *item) bool QSimpleCanvasItem::eventFilter(QObject *o, QEvent *e) { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { switch(e->type()) { case QEvent::GraphicsSceneMouseDoubleClick: case QEvent::GraphicsSceneMouseMove: case QEvent::GraphicsSceneMousePress: case QEvent::GraphicsSceneMouseRelease: - if(mouseFilter(static_cast<QGraphicsSceneMouseEvent *>(e))) + if (mouseFilter(static_cast<QGraphicsSceneMouseEvent *>(e))) return true; break; default: @@ -1255,44 +1255,44 @@ void QSimpleCanvasItem::setOptions(Options options, bool set) Q_D(QSimpleCanvasItem); Options old = (Options)d->options; - if(options & IsFocusPanel) { - if(!set) { + if (options & IsFocusPanel) { + if (!set) { qWarning("QSimpleCanvasItem::setOptions: Cannot unset IsFocusPanel"); return; - } else if(hasChildren()) { + } else if (hasChildren()) { qWarning("QSimpleCanvasItem::setOptions: Cannot set IsFocusPanel once item has children"); return; } } - if(options & IsFocusRealm) { - if(!set) { + if (options & IsFocusRealm) { + if (!set) { qWarning("QSimpleCanvasItem::setOptions: Cannot unset IsFocusRealm"); return; } } - if(set) + if (set) d->options |= options; else d->options &= ~options; - if((d->options & IsFocusPanel) && (d->options & IsFocusRealm)) { + if ((d->options & IsFocusPanel) && (d->options & IsFocusRealm)) { qWarning("QSimpleCanvasItem::setOptions: Cannot set both IsFocusPanel and IsFocusRealm. IsFocusRealm will be unset."); d->options &= ~IsFocusRealm; } - if((old & MouseFilter) != (d->options & MouseFilter)) { - if(d->graphicsItem) { - if(d->options & MouseFilter) + if ((old & MouseFilter) != (d->options & MouseFilter)) { + if (d->graphicsItem) { + if (d->options & MouseFilter) d->gvAddMouseFilter(); else d->gvRemoveMouseFilter(); } else { QSimpleCanvas *c = canvas(); - if(c) { - if(d->options & MouseFilter) + if (c) { + if (d->options & MouseFilter) c->d->installMouseFilter(this); else c->d->removeMouseFilter(this); @@ -1314,7 +1314,7 @@ QSimpleCanvasItem::QSimpleCanvasItem(QSimpleCanvasItem *p) QSimpleCanvasItem::~QSimpleCanvasItem() { Q_D(QSimpleCanvasItem); - if(d->graphicsItem) { + if (d->graphicsItem) { if ((d->options & (IsFocusPanel|IsFocusRealm)) && d->canvas) d->canvas->d->focusPanelData.remove(this); if (d->hasFocus && d->canvas) { @@ -1324,24 +1324,24 @@ QSimpleCanvasItem::~QSimpleCanvasItem() if (prnt && d->canvas->d->focusPanelData.value(prnt) == this) d->canvas->d->focusPanelData.remove(prnt); } - if(d->filter) + if (d->filter) delete d->filter; qDeleteAll(children()); - if(parent()) + if (parent()) parent()->remChild(this); delete d->graphicsItem; } else { setOptions(MouseFilter, false); - if(d->canvas){ - if(d->canvas->focusItem() == this) + if (d->canvas){ + if (d->canvas->focusItem() == this) d->canvas->d->focusItem = 0; - if(d->canvas->d->lastFocusItem == this) + if (d->canvas->d->lastFocusItem == this) d->canvas->d->lastFocusItem = 0; - if(d->hasBeenActiveFocusPanel) + if (d->hasBeenActiveFocusPanel) d->canvas->d->clearFocusPanel(this); - if(d->hasFocus) + if (d->hasFocus) d->canvas->d->clearFocusItem(this); } @@ -1354,7 +1354,7 @@ QSimpleCanvasItem::~QSimpleCanvasItem() if (parent() && d->data_ptr && d->data()->dirty) { QSimpleCanvasLayer *l = parent()->layer(); - if(l) { + if (l) { l->remDirty(this); } } @@ -1362,7 +1362,7 @@ QSimpleCanvasItem::~QSimpleCanvasItem() d->parent->remChild(this); - if(d->data_ptr) + if (d->data_ptr) delete d->data_ptr; } } @@ -1370,8 +1370,8 @@ QSimpleCanvasItem::~QSimpleCanvasItem() QSimpleCanvasItem::operator QGraphicsItem *() { Q_D(QSimpleCanvasItem); - if(!d->graphicsItem) { - if(parent()) { + if (!d->graphicsItem) { + if (parent()) { qWarning("QSimpleCanvasItem: Only the root item can be converted into a QGraphicsItem"); return 0; } @@ -1413,42 +1413,42 @@ void QSimpleCanvasItemPrivate::setParentInternal(QSimpleCanvasItem *p) { Q_Q(QSimpleCanvasItem); QSimpleCanvasItem *oldParent = parent; - if(graphicsItem) { - if(oldParent) + if (graphicsItem) { + if (oldParent) oldParent->remChild(q); parent = p; graphicsItem->setParentItem(p->d_func()->graphicsItem); - if(parent) + if (parent) p->addChild(q); } else { bool canvasChange = false; - if(p) + if (p) canvasChange = (p->d_func()->canvas != canvas); QSimpleCanvas *old = canvas; QSimpleCanvasLayer *o = q->layer(); - if(q->parent()) { + if (q->parent()) { q->update(); q->parent()->remChild(q); } parent = p; QSimpleCanvasLayer *n = 0; - if(q->parent()) { + if (q->parent()) { q->parent()->addChild(q); n = q->layer(); } - if(o != n) { + if (o != n) { data()->dirty = false; data()->transformValid = false; - if(o) o->remDirty(q); - if(n) n->addDirty(q); + if (o) o->remDirty(q); + if (n) n->addDirty(q); } - if(canvasChange) + if (canvasChange) canvasChanged(p->d_func()->canvas, old); q->update(); @@ -1460,25 +1460,25 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent) Q_Q(QSimpleCanvasItem); Q_ASSERT(!graphicsItem); graphicsItem = new QSimpleGraphicsItem(q); - if(parent) + if (parent) graphicsItem->setParentItem(parent); QSimpleCanvasItemData *old = data_ptr; data_ptr = 0; - if(old) { + if (old) { q->QSimpleCanvasItem::setX(old->x); q->QSimpleCanvasItem::setY(old->y); q->QSimpleCanvasItem::setZ(old->z); q->QSimpleCanvasItem::setVisible(old->visible); - if(old->transformUser) + if (old->transformUser) q->QSimpleCanvasItem::setTransform(*old->transformUser); q->QSimpleCanvasItem::setFlip(old->flip); q->QSimpleCanvasItem::setAcceptedMouseButtons((Qt::MouseButtons)old->buttons); delete old; } - if(scale != 1) { + if (scale != 1) { qreal s = scale; scale = 1; q->QSimpleCanvasItem::setScale(s); @@ -1486,9 +1486,9 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent) q->setClipType(clip); - for(int ii = 0; ii < children.count(); ++ii) { + for (int ii = 0; ii < children.count(); ++ii) { static_cast<QSimpleCanvasItemPrivate*>(children.at(ii)->d_ptr)->convertToGraphicsItem(graphicsItem); - if(children.at(ii)->z() == 0) + if (children.at(ii)->z() == 0) children.at(ii)->setZ(ii); } } @@ -1501,14 +1501,14 @@ void QSimpleCanvasItemPrivate::convertToGraphicsItem(QGraphicsItem *parent) void QSimpleCanvasItem::setParent(QSimpleCanvasItem *p) { Q_D(QSimpleCanvasItem); - if(p == parent() || !p) return; + if (p == parent() || !p) return; QObject::setParent(p); - if(d->graphicsItem && !static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem) + if (d->graphicsItem && !static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem) qWarning("QSimpleCanvasItem: Cannot reparent a QGraphicsView item to a QSimpleCanvas item"); - if(static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem && !d->graphicsItem) { + if (static_cast<QSimpleCanvasItemPrivate*>(p->d_ptr)->graphicsItem && !d->graphicsItem) { d->setParentInternal(0); d->convertToGraphicsItem(); } @@ -1524,45 +1524,45 @@ int QSimpleCanvasItemPrivate::dump(int indent) QByteArray ba(indent * 2, ' '); QByteArray state; - if(options & QSimpleCanvasItem::MouseFilter) + if (options & QSimpleCanvasItem::MouseFilter) state.append("i"); else state.append("-"); - if(options & QSimpleCanvasItem::HoverEvents) + if (options & QSimpleCanvasItem::HoverEvents) state.append("h"); else state.append("-"); - if(options & QSimpleCanvasItem::MouseEvents) + if (options & QSimpleCanvasItem::MouseEvents) state.append("m"); else state.append("-"); - if(options & QSimpleCanvasItem::HasContents) + if (options & QSimpleCanvasItem::HasContents) state.append("c"); else state.append("-"); - if(options & QSimpleCanvasItem::SimpleItem) + if (options & QSimpleCanvasItem::SimpleItem) state.append("s"); else state.append("-"); - if(options & QSimpleCanvasItem::IsFocusPanel) { - if(q->activeFocusPanel()) + if (options & QSimpleCanvasItem::IsFocusPanel) { + if (q->activeFocusPanel()) state.append("P"); else state.append("p"); } else { state.append("-"); } - if(options & QSimpleCanvasItem::IsFocusRealm) + if (options & QSimpleCanvasItem::IsFocusRealm) state.append("r"); else state.append("-"); - if(q->hasFocus()) { - if(q->hasActiveFocus()) + if (q->hasFocus()) { + if (q->hasActiveFocus()) state.append("F"); else state.append("f"); } else { - if(q->hasActiveFocus()) + if (q->hasActiveFocus()) state.append("X"); else state.append("-"); @@ -1570,13 +1570,13 @@ int QSimpleCanvasItemPrivate::dump(int indent) QByteArray name; QFxItem *i = qobject_cast<QFxItem *>(q); - if(i) + if (i) name = i->id().toLatin1(); qWarning().nospace() << ba.constData() << state.constData() << " " << children.count() << " " << q << " " << name.constData(); int rv = 0; - for(int ii = 0; ii < children.count(); ++ii) + for (int ii = 0; ii < children.count(); ++ii) rv += children.at(ii)->d_func()->dump(indent + 1); return rv + 1; @@ -1591,10 +1591,10 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d, bool isRealm = (options & QSimpleCanvasItem::IsFocusPanel || options & QSimpleCanvasItem::IsFocusRealm); - if(options & QSimpleCanvasItem::IsFocusPanel) { + if (options & QSimpleCanvasItem::IsFocusPanel) { - if(q->activeFocusPanel()) { - if(d & InActivePanel) { + if (q->activeFocusPanel()) { + if (d & InActivePanel) { qWarning() << "State ERROR: Nested active focus panels"; rv = false; } @@ -1606,23 +1606,23 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d, } - if(q->hasActiveFocus()) { - if(!(d & InActivePanel)) { + if (q->hasActiveFocus()) { + if (!(d & InActivePanel)) { qWarning() << "State ERROR: Active focus in non-active panel"; rv = false; } - if(d & InRealm && !(d & InActiveFocusedRealm)) { + if (d & InRealm && !(d & InActiveFocusedRealm)) { qWarning() << "State ERROR: Active focus in non-active-focused realm"; rv = false; } - if(!q->hasFocus()) { + if (!q->hasFocus()) { qWarning() << "State ERROR: Active focus on element that does not have focus"; rv = false; } - if(*r & SeenActiveFocus) { + if (*r & SeenActiveFocus) { qWarning() << "State ERROR: Two active focused elements in same realm"; rv = false; } @@ -1630,8 +1630,8 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d, *r |= SeenActiveFocus; } - if(q->hasFocus()) { - if(*r & SeenFocus) { + if (q->hasFocus()) { + if (*r & SeenFocus) { qWarning() << "State ERROR: Two focused elements in same realm"; rv = false; } @@ -1639,20 +1639,20 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d, *r |= SeenFocus; } - if(options & QSimpleCanvasItem::IsFocusRealm) { + if (options & QSimpleCanvasItem::IsFocusRealm) { d |= InRealm; - if(q->hasActiveFocus()) + if (q->hasActiveFocus()) d |= InActiveFocusedRealm; else d &= ~InActiveFocusedRealm; } FocusStateCheckRDatas newR = NoCheckRData; - if(isRealm) + if (isRealm) r = &newR; - for(int ii = 0; ii < children.count(); ++ii) + for (int ii = 0; ii < children.count(); ++ii) rv &= children.at(ii)->d_func()->checkFocusState(d, r); return rv; @@ -1661,7 +1661,7 @@ bool QSimpleCanvasItemPrivate::checkFocusState(FocusStateCheckDatas d, bool QSimpleCanvasItem::activeFocusPanel() const { QSimpleCanvas *c = canvas(); - if(!c) { + if (!c) { Q_D(const QSimpleCanvasItem); return d->wantsActiveFocusPanelPendingCanvas; } else { @@ -1671,18 +1671,18 @@ bool QSimpleCanvasItem::activeFocusPanel() const void QSimpleCanvasItem::setActiveFocusPanel(bool b) { - if(!(options() & IsFocusPanel)) { + if (!(options() & IsFocusPanel)) { qWarning("QSimpleCanvasItem::setActiveFocusPanel: Item is not a focus panel"); return; } QSimpleCanvas *c = canvas(); Q_D(QSimpleCanvasItem); - if(c) { - if(b) { + if (c) { + if (b) { d->hasBeenActiveFocusPanel = true; c->d->setActiveFocusPanel(this); - } else if(d->hasBeenActiveFocusPanel) { + } else if (d->hasBeenActiveFocusPanel) { d->hasBeenActiveFocusPanel = false; c->d->clearFocusPanel(this); } @@ -1705,7 +1705,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findFirstFocusChild() const for (int i = 0; i < children.count(); ++i) { QSimpleCanvasItem *child = children.at(i); - if(child->options() & IsFocusPanel) + if (child->options() & IsFocusPanel) continue; if (child->isFocusable()) @@ -1727,7 +1727,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findLastFocusChild() const for (int i = children.count()-1; i >= 0; --i) { QSimpleCanvasItem *child = children.at(i); - if(child->options() & IsFocusPanel) + if (child->options() & IsFocusPanel) continue; if (child->isFocusable()) @@ -1746,8 +1746,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findPrevFocus(QSimpleCanvasItem *item) if (focusChild) return focusChild; - if(item->options() & IsFocusPanel) { - if(item->isFocusable()) + if (item->options() & IsFocusPanel) { + if (item->isFocusable()) return item; else return 0; @@ -1762,7 +1762,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findPrevFocus(QSimpleCanvasItem *item) if (idx > 0) { while (--idx >= 0) { testFocus = children.at(idx); - if(testFocus->options() & IsFocusPanel) + if (testFocus->options() & IsFocusPanel) continue; if (testFocus->isFocusable()) return testFocus; @@ -1771,8 +1771,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findPrevFocus(QSimpleCanvasItem *item) return testFocus; } } - if(parent->options() & IsFocusPanel) { - if(parent->isFocusable()) + if (parent->options() & IsFocusPanel) { + if (parent->isFocusable()) return parent; else return 0; @@ -1790,8 +1790,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findNextFocus(QSimpleCanvasItem *item) if (focusChild) return focusChild; - if(item->options() & IsFocusPanel) { - if(item->isFocusable()) + if (item->options() & IsFocusPanel) { + if (item->isFocusable()) return item; else return 0; @@ -1806,7 +1806,7 @@ QSimpleCanvasItem *QSimpleCanvasItem::findNextFocus(QSimpleCanvasItem *item) if (idx >= 0) { while (++idx < children.count()) { testFocus = children.at(idx); - if(testFocus->options() & IsFocusPanel) + if (testFocus->options() & IsFocusPanel) continue; if (testFocus->isFocusable()) return testFocus; @@ -1815,8 +1815,8 @@ QSimpleCanvasItem *QSimpleCanvasItem::findNextFocus(QSimpleCanvasItem *item) return testFocus; } } - if(parent->options() & IsFocusPanel) { - if(parent->isFocusable()) + if (parent->options() & IsFocusPanel) { + if (parent->isFocusable()) return parent; else return 0; diff --git a/src/declarative/canvas/qsimplecanvasitem_p.h b/src/declarative/canvas/qsimplecanvasitem_p.h index 7a90c24..27a75bd 100644 --- a/src/declarative/canvas/qsimplecanvasitem_p.h +++ b/src/declarative/canvas/qsimplecanvasitem_p.h @@ -156,7 +156,7 @@ public: QSimpleGraphicsItem *graphicsItem; inline QSimpleCanvasItemData *data() const { - if(!data_ptr) data_ptr = new QSimpleCanvasItemData; + if (!data_ptr) data_ptr = new QSimpleCanvasItemData; return data_ptr; } mutable QSimpleCanvasItemData *data_ptr; diff --git a/src/declarative/canvas/qsimplecanvasserver.cpp b/src/declarative/canvas/qsimplecanvasserver.cpp index 7eebe65..4d4adda 100644 --- a/src/declarative/canvas/qsimplecanvasserver.cpp +++ b/src/declarative/canvas/qsimplecanvasserver.cpp @@ -55,7 +55,7 @@ QSimpleCanvasServer::QSimpleCanvasServer(int port, QObject *parent) _time.start(); - if(!_tcpServer->listen(QHostAddress::Any, port)) { + if (!_tcpServer->listen(QHostAddress::Any, port)) { qWarning() << "QSimpleCanvasServer: Cannot listen on port" << port; return; } @@ -85,7 +85,7 @@ void QSimpleCanvasServer::addTiming(quint32 paint, QByteArray ba = d.toLatin1(); // XXX - for(int ii = 0; ii < _tcpClients.count(); ++ii) + for (int ii = 0; ii < _tcpClients.count(); ++ii) // _tcpClients.at(ii)->write((const char *)data, 12); _tcpClients.at(ii)->write(ba.constData(), ba.length()); } @@ -94,8 +94,8 @@ void QSimpleCanvasServer::disconnected() { QTcpSocket *socket = static_cast<QTcpSocket *>(sender()); - for(int ii = 0; ii < _tcpClients.count(); ++ii) { - if(_tcpClients.at(ii) == socket) { + for (int ii = 0; ii < _tcpClients.count(); ++ii) { + if (_tcpClients.at(ii) == socket) { socket->disconnect(); socket->deleteLater(); _tcpClients.removeAt(ii); diff --git a/src/declarative/extra/qmlxmllistmodel.cpp b/src/declarative/extra/qmlxmllistmodel.cpp index 44787b5..91c8139 100644 --- a/src/declarative/extra/qmlxmllistmodel.cpp +++ b/src/declarative/extra/qmlxmllistmodel.cpp @@ -192,13 +192,13 @@ QString QmlXmlListModel::toString(int role) const return d->roleNames.at(index); } -QString QmlXmlListModel::src() const +QString QmlXmlListModel::source() const { Q_D(const QmlXmlListModel); return d->src; } -void QmlXmlListModel::setSrc(const QString &src) +void QmlXmlListModel::setSource(const QString &src) { Q_D(QmlXmlListModel); d->src = src; @@ -255,7 +255,7 @@ void QmlXmlListModel::fetch() void QmlXmlListModel::requestFinished() { Q_D(QmlXmlListModel); - if(d->reply->error() != QNetworkReply::NoError) { + if (d->reply->error() != QNetworkReply::NoError) { d->reply->deleteLater(); d->reply = 0; } else { diff --git a/src/declarative/extra/qmlxmllistmodel.h b/src/declarative/extra/qmlxmllistmodel.h index a8f3087..d06cabf 100644 --- a/src/declarative/extra/qmlxmllistmodel.h +++ b/src/declarative/extra/qmlxmllistmodel.h @@ -90,7 +90,7 @@ class Q_DECLARATIVE_EXPORT QmlXmlListModel : public QListModelInterface, public Q_OBJECT Q_INTERFACES(QmlParserStatus) - Q_PROPERTY(QString src READ src WRITE setSrc) + Q_PROPERTY(QString source READ source WRITE setSource) Q_PROPERTY(QString query READ query WRITE setQuery) Q_PROPERTY(QString namespaceDeclarations READ namespaceDeclarations WRITE setNamespaceDeclarations) Q_PROPERTY(QmlList<XmlListModelRole *> *roles READ roleObjects) @@ -106,8 +106,8 @@ public: QmlList<XmlListModelRole *> *roleObjects(); - QString src() const; - void setSrc(const QString&); + QString source() const; + void setSource(const QString&); QString query() const; void setQuery(const QString&); diff --git a/src/declarative/fx/qfxanchors.cpp b/src/declarative/fx/qfxanchors.cpp index 7372866..f537da9 100644 --- a/src/declarative/fx/qfxanchors.cpp +++ b/src/declarative/fx/qfxanchors.cpp @@ -165,7 +165,7 @@ QFxItem *QFxAnchors::fill() const void QFxAnchors::setFill(QFxItem *f) { Q_D(QFxAnchors); - if(d->fill) { + if (d->fill) { QObject::disconnect(d->fill, SIGNAL(leftChanged()), this, SLOT(fillChanged())); QObject::disconnect(d->fill, SIGNAL(topChanged()), this, SLOT(fillChanged())); QObject::disconnect(d->fill, SIGNAL(widthChanged()), this, SLOT(fillChanged())); @@ -214,11 +214,11 @@ QFxItem *QFxAnchors::centeredIn() const void QFxAnchors::setCenteredIn(QFxItem* c) { Q_D(QFxAnchors); - if(!c){ + if (!c){ qmlInfo(d->item) << "Cannot center in null item."; return; } - if(c != d->item->itemParent() && c->itemParent() != d->item->itemParent()){ + if (c != d->item->itemParent() && c->itemParent() != d->item->itemParent()){ qmlInfo(d->item) << "Can't anchor to an item that isn't a parent or sibling."; return; } @@ -822,7 +822,7 @@ bool QFxAnchorsPrivate::checkHAnchorValid(QFxAnchorLine anchor) const if (anchor.anchorLine & QFxAnchorLine::Vertical_Mask) { qmlInfo(item) << "Can't anchor a horizontal edge to a vertical edge."; return false; - }else if(anchor.item == item){ + }else if (anchor.item == item){ qmlInfo(item) << "Can't anchor item to self."; return false; } @@ -847,7 +847,7 @@ bool QFxAnchorsPrivate::checkVAnchorValid(QFxAnchorLine anchor) const if (anchor.anchorLine & QFxAnchorLine::Horizontal_Mask) { qmlInfo(item) << "Can't anchor a vertical edge to a horizontal edge."; return false; - }else if(anchor.item == item){ + }else if (anchor.item == item){ qmlInfo(item) << "Can't anchor item to self."; return false; } diff --git a/src/declarative/fx/qfxanimatedimageitem.cpp b/src/declarative/fx/qfxanimatedimageitem.cpp index b5f0cc4..8f930d5 100644 --- a/src/declarative/fx/qfxanimatedimageitem.cpp +++ b/src/declarative/fx/qfxanimatedimageitem.cpp @@ -102,7 +102,7 @@ QFxAnimatedImageItem::~QFxAnimatedImageItem() bool QFxAnimatedImageItem::isPlaying() const { Q_D(const QFxAnimatedImageItem); - if(!d->_movie) + if (!d->_movie) return false; return d->_movie->state()==QMovie::Running; } @@ -110,9 +110,9 @@ bool QFxAnimatedImageItem::isPlaying() const void QFxAnimatedImageItem::setPlaying(bool play) { Q_D(QFxAnimatedImageItem); - if(!d->_movie) + if (!d->_movie) return; - if(play) + if (play) d->_movie->start(); else d->_movie->stop(); @@ -129,7 +129,7 @@ void QFxAnimatedImageItem::setPlaying(bool play) int QFxAnimatedImageItem::currentFrame() const { Q_D(const QFxAnimatedImageItem); - if(!d->_movie) + if (!d->_movie) return -1; return d->_movie->currentFrameNumber(); } @@ -137,7 +137,7 @@ int QFxAnimatedImageItem::currentFrame() const void QFxAnimatedImageItem::setCurrentFrame(int frame) { Q_D(QFxAnimatedImageItem); - if(!d->_movie) + if (!d->_movie) return; d->_movie->jumpToFrame(frame); } @@ -145,7 +145,7 @@ void QFxAnimatedImageItem::setCurrentFrame(int frame) int QFxAnimatedImageItem::frameCount() const { Q_D(const QFxAnimatedImageItem); - if(!d->_movie) + if (!d->_movie) return 0; return d->_movie->frameCount(); } @@ -153,13 +153,13 @@ int QFxAnimatedImageItem::frameCount() const void QFxAnimatedImageItem::setSource(const QString &url) { Q_D(QFxAnimatedImageItem); - if(url == d->source) + if (url == d->source) return; delete d->_movie; d->_movie = 0; - if(d->reply) { + if (d->reply) { d->reply->deleteLater(); d->reply = 0; } @@ -167,7 +167,7 @@ void QFxAnimatedImageItem::setSource(const QString &url) d->source = url; d->url = qmlContext(this)->resolvedUrl(url); - if(url.isEmpty()) { + if (url.isEmpty()) { delete d->_movie; d->status = Idle; } else { @@ -186,7 +186,7 @@ void QFxAnimatedImageItem::movieRequestFinished() { Q_D(QFxAnimatedImageItem); d->_movie = new QMovie(d->reply); - if(!d->_movie->isValid()){ + if (!d->_movie->isValid()){ qWarning() << "Error Reading File " << d->url; delete d->_movie; d->_movie = 0; diff --git a/src/declarative/fx/qfxblendedimage.cpp b/src/declarative/fx/qfxblendedimage.cpp index ec2b9cc..3326ea8 100644 --- a/src/declarative/fx/qfxblendedimage.cpp +++ b/src/declarative/fx/qfxblendedimage.cpp @@ -173,7 +173,7 @@ bool QFxBlendedImage::smoothTransform() const void QFxBlendedImage::setSmoothTransform(bool s) { - if(_smooth == s) + if (_smooth == s) return; _smooth = s; update(); @@ -186,7 +186,7 @@ void QFxBlendedImage::paintContents(QPainter &p) if (primSrc.isNull() && secSrc.isNull()) return; - if(_smooth) { + if (_smooth) { p.save(); p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, _smooth); } @@ -196,7 +196,7 @@ void QFxBlendedImage::paintContents(QPainter &p) else p.drawImage(0, 0, secPix); - if(_smooth) { + if (_smooth) { p.restore(); } } @@ -206,10 +206,10 @@ void QFxBlendedImage::paintContents(QPainter &p) void QFxBlendedImage::paintGLContents(GLPainter &p) { static DualTextureBlendShader *shader = 0; - if(!shader) + if (!shader) shader = new DualTextureBlendShader(); - if(dirty) { + if (dirty) { prim.clear(); sec.clear(); prim.setImage(primPix); @@ -218,7 +218,7 @@ void QFxBlendedImage::paintGLContents(GLPainter &p) dirty = false; } - if(prim.isNull() || sec.isNull()) { + if (prim.isNull() || sec.isNull()) { return; } @@ -228,9 +228,9 @@ void QFxBlendedImage::paintGLContents(GLPainter &p) float widthV = width(); float heightV = height(); - if(!widthV) + if (!widthV) widthV = qMax(primPix.width(), secPix.width()); - if(!heightV) + if (!heightV) heightV = qMax(primPix.height(), secPix.height()); vertices[0] = 0; vertices[1] = heightV; @@ -243,12 +243,12 @@ void QFxBlendedImage::paintGLContents(GLPainter &p) texVertices[4] = 0; texVertices[5] = 1; texVertices[6] = 1; texVertices[7] = 1; - if(_blend == 0 || _blend == 1) { + if (_blend == 0 || _blend == 1) { QGLShaderProgram *tshader = p.useTextureShader(); GLTexture *tex = 0; - if(_blend == 0) + if (_blend == 0) tex = &prim; else tex = &sec; @@ -271,8 +271,8 @@ void QFxBlendedImage::paintGLContents(GLPainter &p) shader->enable(); shader->setOpacity(1); qreal b = _blend; - if(b > 1) b = 1; - else if(b < 0) b = 0; + if (b > 1) b = 1; + else if (b < 0) b = 0; shader->setBlend(b); shader->setTransform(p.activeTransform); diff --git a/src/declarative/fx/qfxblurfilter.cpp b/src/declarative/fx/qfxblurfilter.cpp index 748fd8b..ad3eebc 100644 --- a/src/declarative/fx/qfxblurfilter.cpp +++ b/src/declarative/fx/qfxblurfilter.cpp @@ -124,7 +124,7 @@ qreal QFxBlurFilter::radius() const void QFxBlurFilter::setRadius(qreal radius) { - if(d->radius == radius) return; + if (d->radius == radius) return; d->radius = radius; emit radiusChanged(radius); update(); @@ -133,7 +133,7 @@ void QFxBlurFilter::setRadius(qreal radius) QRectF QFxBlurFilter::itemBoundingRect(const QRectF &r) const { QRectF rv = r; - if(d->radius > 0) + if (d->radius > 0) rv.adjust(-d->radius, -d->radius, d->radius, d->radius); return rv; } @@ -143,7 +143,7 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) { #if defined(QFX_RENDER_OPENGL2) #if 1 - if(d->radius <= 0) { + if (d->radius <= 0) { renderToScreen(); return; } @@ -156,7 +156,7 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) radius *= blurScale; QGLFramebufferObject *fbo = renderToFBO(blurScale); - if(!fbo) + if (!fbo) return; float height = r.height(); @@ -201,7 +201,7 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) BlurTextureShader *shader = item->basicShaders()->blurTexture(); shader->enable(); shader->setTransform(trans); - if(steps > 1) { + if (steps > 1) { shader->setStep(xstep * 2); shader->setSteps(steps / 2); } else { @@ -252,7 +252,7 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) BlurTextureShader *shader = item->basicShaders()->blurTexture(); shader->enable(); shader->setTransform(trans); - if(steps > 1) { + if (steps > 1) { shader->setStep(ystep * 2); shader->setSteps(steps / 2); } else { @@ -303,7 +303,7 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) releaseFBO(fbo); #else #if 0 - if(d->radius <= 0) { + if (d->radius <= 0) { renderToScreen(); return; } @@ -314,7 +314,7 @@ void QFxBlurFilter::filterGL(QSimpleCanvasItem::GLPainter &p) float scale = 0.5; float scalePercent = scale / d->radius; QGLFramebufferObject *fbo = renderToFBO(scalePercent); - if(!fbo) + if (!fbo) return; QGLFramebufferObject *xfbo = acquireFBO(QSize(scale * r.width(), fbo->height())); diff --git a/src/declarative/fx/qfxcomponentinstance.cpp b/src/declarative/fx/qfxcomponentinstance.cpp index 02a6c86..951c25d 100644 --- a/src/declarative/fx/qfxcomponentinstance.cpp +++ b/src/declarative/fx/qfxcomponentinstance.cpp @@ -97,7 +97,7 @@ QmlComponent *QFxComponentInstance::component() const void QFxComponentInstance::setComponent(QmlComponent *c) { Q_D(QFxComponentInstance); - if(d->component) { + if (d->component) { qmlInfo(this) << "component is a write-once property."; return; } @@ -108,11 +108,11 @@ void QFxComponentInstance::setComponent(QmlComponent *c) void QFxComponentInstance::create() { Q_D(QFxComponentInstance); - if(d->component) { + if (d->component) { QObject *obj= d->component->create(qmlContext(this)); - if(obj) { + if (obj) { QFxItem *objitem = qobject_cast<QFxItem *>(obj); - if(objitem) { + if (objitem) { d->instance = objitem; objitem->setItemParent(this); objitem->setFocus(true); @@ -130,10 +130,10 @@ void QFxComponentInstance::create() void QFxComponentInstance::updateSize() { QFxItem *i = instance(); - if(i) { - if(!widthValid()) + if (i) { + if (!widthValid()) setImplicitWidth(i->width()); - if(!heightValid()) + if (!heightValid()) setImplicitHeight(i->height()); } } diff --git a/src/declarative/fx/qfxcontentwrapper.cpp b/src/declarative/fx/qfxcontentwrapper.cpp index 5ce5430..a155d2b 100644 --- a/src/declarative/fx/qfxcontentwrapper.cpp +++ b/src/declarative/fx/qfxcontentwrapper.cpp @@ -76,7 +76,7 @@ void QFxContentWrapper::componentComplete() target = target->itemParent(); QList<QFxItem*> myContent(*content()); - for(int ii = 0; ii < myContent.count(); ++ii) + for (int ii = 0; ii < myContent.count(); ++ii) myContent.at(ii)->setParent(target); } diff --git a/src/declarative/fx/qfxflickable.cpp b/src/declarative/fx/qfxflickable.cpp index b6eaa8e..671d65d 100644 --- a/src/declarative/fx/qfxflickable.cpp +++ b/src/declarative/fx/qfxflickable.cpp @@ -121,16 +121,16 @@ void QFxFlickablePrivate::init() void QFxFlickablePrivate::fixupX() { Q_Q(QFxFlickable); - if(!q->xflick() || _moveX.timeLine()) + if (!q->xflick() || _moveX.timeLine()) return; vTime = _tl.time(); - if(_moveX.value() > q->minXExtent() || q->maxXExtent() > 0) { + if (_moveX.value() > q->minXExtent() || q->maxXExtent() > 0) { _tl.move(_moveX, q->minXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); flicked = false; //emit flickingChanged(); - } else if(_moveX.value() < q->maxXExtent()) { + } else if (_moveX.value() < q->maxXExtent()) { _tl.move(_moveX, q->maxXExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); flicked = false; //emit flickingChanged(); @@ -140,15 +140,15 @@ void QFxFlickablePrivate::fixupX() void QFxFlickablePrivate::fixupY() { Q_Q(QFxFlickable); - if(!q->yflick() || _moveY.timeLine()) + if (!q->yflick() || _moveY.timeLine()) return; vTime = _tl.time(); - if(_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) { + if (_moveY.value() > q->minYExtent() || (q->maxYExtent() > q->minYExtent())) { _tl.move(_moveY, q->minYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); //emit flickingChanged(); - } else if(_moveY.value() < q->maxYExtent()) { + } else if (_moveY.value() < q->maxYExtent()) { _tl.move(_moveY, q->maxYExtent(), QEasingCurve(QEasingCurve::InOutQuad), 200); //emit flickingChanged(); } else { @@ -560,17 +560,17 @@ void QFxFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event) bool rejectX = false; bool moved = false; - if(q->yflick()) { + if (q->yflick()) { int dy = int(event->pos().y() - pressPos.y()); if (qAbs(dy) > FlickThreshold || pressTime.elapsed() > 200) { qreal newY = dy + pressY; const qreal minY = q->minYExtent(); const qreal maxY = q->maxYExtent(); - if(newY > minY) + if (newY > minY) newY = minY + (newY - minY) / 2; - if(newY < maxY && maxY - minY < 0) + if (newY < maxY && maxY - minY < 0) newY = maxY + (newY - maxY) / 2; - if(q->overShoot() || (newY <= minY && newY >= maxY)) { + if (q->overShoot() || (newY <= minY && newY >= maxY)) { if (dragMode == QFxFlickable::Hard) _moveY.setValue(newY); else @@ -583,11 +583,11 @@ void QFxFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event) } } - if(q->xflick()) { + if (q->xflick()) { int dx = int(event->pos().x() - pressPos.x()); if (qAbs(dx) > FlickThreshold || pressTime.elapsed() > 200) { qreal newX = dx + pressX; - if(q->overShoot() || (newX <= q->minXExtent() && newX >= q->maxXExtent())) { + if (q->overShoot() || (newX <= q->minXExtent() && newX >= q->maxXExtent())) { if (dragMode == QFxFlickable::Hard) _moveX.setValue(newX); else @@ -600,23 +600,23 @@ void QFxFlickablePrivate::handleMouseMoveEvent(QGraphicsSceneMouseEvent *event) } } - if(!lastPos.isNull()) { + if (!lastPos.isNull()) { qreal elapsed = qreal(lastPosTime.restart()) / 1000.; - if(elapsed <= 0) + if (elapsed <= 0) elapsed = 1; - if(q->yflick()) { + if (q->yflick()) { qreal diff = event->pos().y() - lastPos.y(); velocityY = diff / elapsed; } - if(q->xflick()) { + if (q->xflick()) { qreal diff = event->pos().x() - lastPos.x(); velocityX = diff / elapsed; } } - if(rejectY) velocityY = 0; - if(rejectX) velocityX = 0; + if (rejectY) velocityY = 0; + if (rejectX) velocityX = 0; if (moved) { q->viewportMoved(); @@ -640,20 +640,20 @@ void QFxFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *) } vTime = _tl.time(); - if(qAbs(velocityY) > 10) { + if (qAbs(velocityY) > 10) { qreal maxDistance = -1; // -ve velocity means list is moving up - if(velocityY > 0) { - if(_moveY.value() < q->minYExtent()) + if (velocityY > 0) { + if (_moveY.value() < q->minYExtent()) maxDistance = qAbs(q->minYExtent() -_moveY.value() + (overShoot?30:0)); } else { - if(_moveY.value() > q->maxYExtent()) + if (_moveY.value() > q->maxYExtent()) maxDistance = qAbs(q->maxYExtent() - _moveY.value()) + (overShoot?30:0); } - if(maxDistance > 0) { + if (maxDistance > 0) { qreal v = velocityY; - if(maxVelocity != -1 && maxVelocity < qAbs(v)) { - if(v < 0) + if (maxVelocity != -1 && maxVelocity < qAbs(v)) { + if (v < 0) v = -maxVelocity; else v = maxVelocity; @@ -669,20 +669,20 @@ void QFxFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *) } else { fixupY(); } - if(qAbs(velocityX) > 10) { + if (qAbs(velocityX) > 10) { qreal maxDistance = -1; // -ve velocity means list is moving up - if(velocityX > 0) { - if(_moveX.value() < q->minXExtent()) + if (velocityX > 0) { + if (_moveX.value() < q->minXExtent()) maxDistance = qAbs(q->minXExtent()) -_moveX.value() + (overShoot?30:0); } else { - if(_moveX.value() > q->maxXExtent()) + if (_moveX.value() > q->maxXExtent()) maxDistance = qAbs(q->maxXExtent() - _moveX.value()) + (overShoot?30:0); } - if(maxDistance > 0) { + if (maxDistance > 0) { qreal v = velocityX; - if(maxVelocity != -1 && maxVelocity < qAbs(v)) { - if(v < 0) + if (maxVelocity != -1 && maxVelocity < qAbs(v)) { + if (v < 0) v = -maxVelocity; else v = maxVelocity; @@ -701,7 +701,7 @@ void QFxFlickablePrivate::handleMouseReleaseEvent(QGraphicsSceneMouseEvent *) stealMouse = false; lastPosTime = QTime(); - if(!_tl.isActive()) + if (!_tl.isActive()) q->movementEnding(); } @@ -766,7 +766,7 @@ void QFxFlickable::viewportMoved() qreal prevY = d->lastFlickablePosition.x(); qreal prevX = d->lastFlickablePosition.y(); d->velocityTimeline.clear(); - if(d->pressed) { + if (d->pressed) { qreal xVelocity = (prevX - d->_moveX.value()) * 1000 / elapsed; qreal yVelocity = (prevY - d->_moveY.value()) * 1000 / elapsed; d->velocityTimeline.move(d->xVelocity, xVelocity, d->velocityDecay); @@ -804,7 +804,7 @@ void QFxFlickablePrivate::data_append(QObject *o) { Q_Q(QFxFlickable); QFxItem *i = qobject_cast<QFxItem *>(o); - if(i) + if (i) _flick->children()->append(i); else o->setParent(q); @@ -901,7 +901,7 @@ void QFxFlickable::setViewportWidth(int w) if (d->vWidth == w) return; d->vWidth = w; - if(w < 0) + if (w < 0) d->_flick->setWidth(width()); else d->_flick->setWidth(w); @@ -913,7 +913,7 @@ void QFxFlickable::setWidth(int w) { Q_D(QFxFlickable); QFxItem::setWidth(w); - if(d->vWidth < 0) { + if (d->vWidth < 0) { d->_flick->setWidth(w); emit viewportWidthChanged(); d->updateBeginningEnd(); @@ -924,7 +924,7 @@ void QFxFlickable::setHeight(int h) { Q_D(QFxFlickable); QFxItem::setHeight(h); - if(d->vHeight < 0) { + if (d->vHeight < 0) { d->_flick->setHeight(h); emit viewportHeightChanged(); d->updateBeginningEnd(); @@ -947,7 +947,7 @@ void QFxFlickable::setViewportHeight(int h) if (d->vHeight == h) return; d->vHeight = h; - if(h < 0) + if (h < 0) d->_flick->setHeight(height()); else d->_flick->setHeight(h); @@ -958,7 +958,7 @@ void QFxFlickable::setViewportHeight(int h) int QFxFlickable::vWidth() const { Q_D(const QFxFlickable); - if(d->vWidth < 0) + if (d->vWidth < 0) return width(); else return d->vWidth; @@ -967,7 +967,7 @@ int QFxFlickable::vWidth() const int QFxFlickable::vHeight() const { Q_D(const QFxFlickable); - if(d->vHeight < 0) + if (d->vHeight < 0) return height(); else return d->vHeight; @@ -1028,7 +1028,7 @@ bool QFxFlickable::sendMouseEvent(QGraphicsSceneMouseEvent *event) bool QFxFlickable::mouseFilter(QGraphicsSceneMouseEvent *e) { - if(!isVisible()) + if (!isVisible()) return false; switch (e->type()) { case QEvent::GraphicsSceneMousePress: @@ -1060,7 +1060,7 @@ int QFxFlickable::maximumFlickVelocity() const void QFxFlickable::setMaximumFlickVelocity(int v) { Q_D(QFxFlickable); - if(v == d->maxVelocity) + if (v == d->maxVelocity) return; d->maxVelocity = v; } @@ -1081,7 +1081,7 @@ void QFxFlickable::setVelocityDecay(int decay) { Q_D(QFxFlickable); Q_ASSERT(decay >= 0); - if(decay == d->velocityDecay) + if (decay == d->velocityDecay) return; d->velocityDecay = decay; emit velocityDecayChanged(decay); @@ -1096,7 +1096,7 @@ bool QFxFlickable::isMoving() const void QFxFlickable::movementStarting() { Q_D(QFxFlickable); - if(!d->moving) { + if (!d->moving) { d->moving = true; emit movingChanged(); emit movementStarted(); @@ -1106,7 +1106,7 @@ void QFxFlickable::movementStarting() void QFxFlickable::movementEnding() { Q_D(QFxFlickable); - if(d->moving) { + if (d->moving) { d->moving = false; emit movingChanged(); emit movementEnded(); diff --git a/src/declarative/fx/qfxflipable.cpp b/src/declarative/fx/qfxflipable.cpp index ee14348..1d15827 100644 --- a/src/declarative/fx/qfxflipable.cpp +++ b/src/declarative/fx/qfxflipable.cpp @@ -49,11 +49,17 @@ QML_DEFINE_TYPE(QFxFlipable,Flipable); class QFxFlipablePrivate : public QFxItemPrivate { public: - QFxFlipablePrivate() : current(QFxFlipable::Front), front(0), back(0) {} + QFxFlipablePrivate() : current(QFxFlipable::Front), front(0), back(0), axis(0), rotation(0) {} + + void setBackTransform(); + void _q_updateAxis(); QFxFlipable::Side current; QFxItem *front; QFxItem *back; + QFxAxis *axis; + QFxRotation axisRotation; + qreal rotation; }; /*! @@ -65,18 +71,18 @@ public: \code <Flipable id="flipable" width="40" height="40"> - <transform> - <Axis id="axis" xStart="20" xEnd="20" yStart="20" yEnd="0" /> - </transform> + <axis> + <Axis startX="20" startY="0" endX="20" endY="40" /> + </axis> <front> - <Image file="front.png"/> + <Image src="front.png"/> </front> <back> - <Image file="back.png"/> + <Image src="back.png"/> </back> <states> <State name="back"> - <SetProperty target="{axis}" property="rotation" value="180" /> + <SetProperty target="{flipable}" property="rotation" value="180" /> </State> </states> <transitions> @@ -126,13 +132,13 @@ QFxItem *QFxFlipable::front() void QFxFlipable::setFront(QFxItem *front) { Q_D(QFxFlipable); - if(d->front) { + if (d->front) { qmlInfo(this) << "front is a write-once property"; return; } d->front = front; children()->append(d->front); - if(Back == d->current) + if (Back == d->current) d->front->setOpacity(0.); } @@ -145,14 +151,122 @@ QFxItem *QFxFlipable::back() void QFxFlipable::setBack(QFxItem *back) { Q_D(QFxFlipable); - if(d->back) { + if (d->back) { qmlInfo(this) << "back is a write-once property"; return; } d->back = back; children()->append(d->back); - if(Front == d->current) + if (Front == d->current) d->back->setOpacity(0.); + d->setBackTransform(); +} + +/*! + \qmlproperty Axis Flipable::axis + + The axis to flip around. See the \l Axis documentation for more + information on specifying an axis. +*/ + +QFxAxis *QFxFlipable::axis() +{ + Q_D(QFxFlipable); + return d->axis; +} + +void QFxFlipable::setAxis(QFxAxis *axis) +{ + Q_D(QFxFlipable); + //### disconnect if we are already connected? + if (d->axis) + disconnect(d->axis, SIGNAL(updated()), this, SLOT(_q_updateAxis())); + d->axis = axis; + connect(d->axis, SIGNAL(updated()), this, SLOT(_q_updateAxis())); + d->_q_updateAxis(); +} + +void QFxFlipablePrivate::_q_updateAxis() +{ + axisRotation.axis()->setStartX(axis->startX()); + axisRotation.axis()->setStartY(axis->startY()); + axisRotation.axis()->setEndX(axis->endX()); + axisRotation.axis()->setEndY(axis->endY()); + axisRotation.axis()->setEndZ(axis->endZ()); + + setBackTransform(); +} + +void QFxFlipablePrivate::setBackTransform() +{ + if (!back) + return; + + QPointF p1(0, 0); + QPointF p2(1, 0); + QPointF p3(1, 1); + + axisRotation.setAngle(180); + p1 = axisRotation.transform().map(p1); + p2 = axisRotation.transform().map(p2); + p3 = axisRotation.transform().map(p3); + axisRotation.setAngle(rotation); + + QSimpleCanvas::Matrix mat; +#ifdef QFX_RENDER_OPENGL + mat.translate(back->width()/2,back->height()/2, 0); + if (back->width() && p1.x() >= p2.x()) + mat.rotate(180, 0, 1, 0); + if (back->height() && p2.y() >= p3.y()) + mat.rotate(180, 1, 0, 0); + mat.translate(-back->width()/2,-back->height()/2, 0); +#else + mat.translate(back->width()/2,back->height()/2); + if (back->width() && p1.x() >= p2.x()) + mat.rotate(180, Qt::YAxis); + if (back->height() && p2.y() >= p3.y()) + mat.rotate(180, Qt::XAxis); + mat.translate(-back->width()/2,-back->height()/2); +#endif + back->setTransform(mat); +} + +/*! + \qmlproperty real Flipable::rotation + The angle to rotate the flipable. For example, to show the back side of the flipable + you can set the rotation to 180. +*/ +qreal QFxFlipable::rotation() const +{ + Q_D(const QFxFlipable); + return d->rotation; +} + +void QFxFlipable::setRotation(qreal angle) +{ + Q_D(QFxFlipable); + d->rotation = angle; + d->axisRotation.setAngle(angle); + setTransform(d->axisRotation.transform()); + + + int simpleAngle = int(angle) % 360; + + Side newSide; + if (simpleAngle < 91 || simpleAngle > 270) { + newSide = Front; + } else { + newSide = Back; + } + + if (newSide != d->current) { + d->current = newSide; + if (d->front) + d->front->setOpacity((d->current==Front)?1.:0.); + if (d->back) + d->back->setOpacity((d->current==Back)?1.:0.); + emit sideChanged(); + } } /*! @@ -167,6 +281,9 @@ QFxFlipable::Side QFxFlipable::side() const return d->current; } +//in some cases the user may want to specify a more complex transformation. +//in that case, we still allow the generic use of transform. +//(the logic here should be kept in sync with setBackTransform and setRotation) void QFxFlipable::transformChanged(const QSimpleCanvas::Matrix &trans) { Q_D(QFxFlipable); @@ -182,39 +299,41 @@ void QFxFlipable::transformChanged(const QSimpleCanvas::Matrix &trans) (p1.y() - p2.y()) * (p3.x() - p2.x()); Side newSide; - if(cross > 0) { + if (cross > 0) { newSide = Back; } else { newSide = Front; } - if(newSide != d->current) { + if (newSide != d->current) { d->current = newSide; if (d->current==Back) { QSimpleCanvas::Matrix mat; #ifdef QFX_RENDER_OPENGL mat.translate(d->back->width()/2,d->back->height()/2, 0); - if(d->back->width() && p1.x() >= p2.x()) + if (d->back->width() && p1.x() >= p2.x()) mat.rotate(180, 0, 1, 0); - if(d->back->height() && p2.y() >= p3.y()) + if (d->back->height() && p2.y() >= p3.y()) mat.rotate(180, 1, 0, 0); mat.translate(-d->back->width()/2,-d->back->height()/2, 0); #else mat.translate(d->back->width()/2,d->back->height()/2); - if(d->back->width() && p1.x() >= p2.x()) + if (d->back->width() && p1.x() >= p2.x()) mat.rotate(180, Qt::YAxis); - if(d->back->height() && p2.y() >= p3.y()) + if (d->back->height() && p2.y() >= p3.y()) mat.rotate(180, Qt::XAxis); mat.translate(-d->back->width()/2,-d->back->height()/2); #endif d->back->setTransform(mat); } - if(d->front) + if (d->front) d->front->setOpacity((d->current==Front)?1.:0.); - if(d->back) + if (d->back) d->back->setOpacity((d->current==Back)?1.:0.); emit sideChanged(); } } QT_END_NAMESPACE + +#include "moc_qfxflipable.cpp" diff --git a/src/declarative/fx/qfxflipable.h b/src/declarative/fx/qfxflipable.h index 2c6c849..ef1832e 100644 --- a/src/declarative/fx/qfxflipable.h +++ b/src/declarative/fx/qfxflipable.h @@ -55,6 +55,7 @@ QT_BEGIN_NAMESPACE QT_MODULE(Declarative) +class QFxAxis; class QFxFlipablePrivate; class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem { @@ -63,6 +64,8 @@ class Q_DECLARATIVE_EXPORT QFxFlipable : public QFxItem Q_ENUMS(Side); Q_PROPERTY(QFxItem *front READ front WRITE setFront) Q_PROPERTY(QFxItem *back READ back WRITE setBack) + Q_PROPERTY(QFxAxis *axis READ axis WRITE setAxis) + Q_PROPERTY(qreal rotation READ rotation WRITE setRotation) Q_PROPERTY(Side side READ side NOTIFY sideChanged) public: QFxFlipable(QFxItem *parent=0); @@ -74,6 +77,12 @@ public: QFxItem *back(); void setBack(QFxItem *); + QFxAxis *axis(); + void setAxis(QFxAxis *axis); + + qreal rotation() const; + void setRotation(qreal angle); + enum Side { Front, Back }; Side side() const; @@ -84,6 +93,7 @@ Q_SIGNALS: void sideChanged(); private: + Q_PRIVATE_SLOT(d_func(), void _q_updateAxis()) Q_DISABLE_COPY(QFxFlipable) Q_DECLARE_PRIVATE(QFxFlipable) }; diff --git a/src/declarative/fx/qfxfocuspanel.cpp b/src/declarative/fx/qfxfocuspanel.cpp index 1bca424..67c456e 100644 --- a/src/declarative/fx/qfxfocuspanel.cpp +++ b/src/declarative/fx/qfxfocuspanel.cpp @@ -79,7 +79,7 @@ QFxFocusPanel::~QFxFocusPanel() bool QFxFocusPanel::isActive() const { QSimpleCanvas *canvas = QSimpleCanvasItem::canvas(); - if(canvas) + if (canvas) return canvas->activeFocusPanel() == this; else return false; diff --git a/src/declarative/fx/qfxgridview.cpp b/src/declarative/fx/qfxgridview.cpp index b2fb1a1..c8b8d27 100644 --- a/src/declarative/fx/qfxgridview.cpp +++ b/src/declarative/fx/qfxgridview.cpp @@ -80,7 +80,7 @@ public: static QFxGridViewAttached *properties(QObject *obj) { QFxGridViewAttached *rv = attachedProperties.value(obj); - if(!rv) { + if (!rv) { rv = new QFxGridViewAttached(obj); attachedProperties.insert(obj, rv); } @@ -998,7 +998,7 @@ int QFxGridView::cacheBuffer() const void QFxGridView::setCacheBuffer(int buffer) { Q_D(QFxGridView); - if(d->buffer != buffer) { + if (d->buffer != buffer) { d->buffer = buffer; if (isComponentComplete()) refill(); @@ -1330,8 +1330,8 @@ void QFxGridView::itemsInserted(int modelIndex, int count) } } // everything is in order now - emit add() signal - foreach(FxGridItem *item, added) - item->attached->emitAdd(); + for (int j = 0; j < added.count(); ++j) + added.at(j)->attached->emitAdd(); d->layout(); emit countChanged(); } diff --git a/src/declarative/fx/qfxhighlightfilter.cpp b/src/declarative/fx/qfxhighlightfilter.cpp index d99b9e5..ab0512c 100644 --- a/src/declarative/fx/qfxhighlightfilter.cpp +++ b/src/declarative/fx/qfxhighlightfilter.cpp @@ -131,7 +131,7 @@ void QFxHighlightFilter::imageLoaded() { QImage img = QFxPixmap(d->url); #if defined(QFX_RENDER_OPENGL2) - if(!img.isNull()) + if (!img.isNull()) d->tex.setImage(img); #endif emit sourceChanged(d->source); @@ -142,14 +142,14 @@ void QFxHighlightFilter::setSource(const QString &f) { if (d->source == f) return; - if(!d->source.isEmpty()) + if (!d->source.isEmpty()) QFxPixmap::cancelGet(d->url, this, SLOT(imageLoaded())); d->source = f; d->url = qmlContext(this)->resolvedUrl(f); #if defined(QFX_RENDER_OPENGL2) d->tex.clear(); #endif - if(!f.isEmpty()) + if (!f.isEmpty()) QFxPixmap::get(qmlEngine(this), d->url, this, SLOT(imageLoaded())); else emit sourceChanged(d->source); @@ -171,13 +171,13 @@ bool QFxHighlightFilter::tiled() const void QFxHighlightFilter::setTiled(bool t) { - if(t == d->tiled) + if (t == d->tiled) return; d->tiled = t; #if defined(QFX_RENDER_OPENGL2) - if(d->tiled) { + if (d->tiled) { d->tex.setHorizontalWrap(GLTexture::ClampToEdge); d->tex.setVerticalWrap(GLTexture::ClampToEdge); } else { @@ -206,7 +206,7 @@ int QFxHighlightFilter::xOffset() const void QFxHighlightFilter::setXOffset(int x) { - if(x == d->xOffset) + if (x == d->xOffset) return; d->xOffset = x; @@ -227,7 +227,7 @@ int QFxHighlightFilter::yOffset() const void QFxHighlightFilter::setYOffset(int y) { - if(y == d->yOffset) + if (y == d->yOffset) return; d->yOffset = y; @@ -240,7 +240,7 @@ void QFxHighlightFilter::setYOffset(int y) void QFxHighlightFilter::filterGL(QSimpleCanvasItem::GLPainter &p) { #if defined(QFX_RENDER_OPENGL2) - if(d->tex.isNull()) { + if (d->tex.isNull()) { renderToScreen(); } else { QSimpleCanvasItem *item = this->item(); @@ -266,9 +266,9 @@ void QFxHighlightFilter::filterGL(QSimpleCanvasItem::GLPainter &p) float texXOffset = 0; float texYOffset = 0; - if(xOffset()) + if (xOffset()) texXOffset = float(xOffset()) / float(d->tex.width()); - if(yOffset()) + if (yOffset()) texYOffset = float(yOffset()) / float(d->tex.height()); GLfloat addTexVert[] = { texXOffset, texYOffset, diff --git a/src/declarative/fx/qfxhighlightfilter.h b/src/declarative/fx/qfxhighlightfilter.h index 6204242..218f4e1 100644 --- a/src/declarative/fx/qfxhighlightfilter.h +++ b/src/declarative/fx/qfxhighlightfilter.h @@ -56,7 +56,7 @@ class Q_DECLARATIVE_EXPORT QFxHighlightFilter : public QSimpleCanvasFilter { Q_OBJECT - Q_PROPERTY(QString src READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(bool tiled READ tiled WRITE setTiled NOTIFY tiledChanged) Q_PROPERTY(int xOffset READ xOffset WRITE setXOffset NOTIFY offsetChanged) Q_PROPERTY(int yOffset READ yOffset WRITE setYOffset NOTIFY offsetChanged) diff --git a/src/declarative/fx/qfximage.cpp b/src/declarative/fx/qfximage.cpp index dfe9b43..a34cd12 100644 --- a/src/declarative/fx/qfximage.cpp +++ b/src/declarative/fx/qfximage.cpp @@ -124,7 +124,7 @@ QFxImage::QFxImage(QFxImagePrivate &dd, QFxItem *parent) QFxImage::~QFxImage() { Q_D(const QFxImage); - if(d->reply) + if (d->reply) d->reply->deleteLater(); } @@ -251,7 +251,7 @@ bool QFxImage::isOpaque() const void QFxImage::setOpaque(bool o) { Q_D(QFxImage); - if(o == d->_opaque) + if (o == d->_opaque) return; d->_opaque = o; d->_pix.setOpaque(o); @@ -300,7 +300,7 @@ bool QFxImage::smoothTransform() const void QFxImage::setSmoothTransform(bool s) { Q_D(QFxImage); - if(d->_smooth == s) + if (d->_smooth == s) return; d->_smooth = s; update(); @@ -318,10 +318,10 @@ void QFxImage::dump(int depth) void QFxImage::paintContents(QPainter &p) { Q_D(QFxImage); - if(d->_pix.isNull()) + if (d->_pix.isNull()) return; - if(d->_smooth) { + if (d->_smooth) { p.save(); p.setRenderHints(QPainter::Antialiasing | QPainter::SmoothPixmapTransform, d->_smooth); } @@ -348,7 +348,7 @@ void QFxImage::paintContents(QPainter &p) p.restore(); } else if (!d->_scaleGrid || d->_scaleGrid->isNull()) { - if(width() != pix.width() || height() != pix.height()) { + if (width() != pix.width() || height() != pix.height()) { QTransform scale; scale.scale(width() / qreal(pix.width()), height() / qreal(pix.height())); @@ -368,45 +368,45 @@ void QFxImage::paintContents(QPainter &p) const int ySide = sgt + sgb; // Upper left - if(sgt && sgl) + if (sgt && sgl) p.drawImage(QRect(0, 0, sgl, sgt), pix, QRect(0, 0, sgl, sgt)); // Upper middle - if(pix.width() - xSide && sgt) + if (pix.width() - xSide && sgt) p.drawImage(QRect(sgl, 0, width() - xSide, sgt), pix, QRect(sgl, 0, pix.width() - xSide, sgt)); // Upper right - if(sgt && pix.width() - sgr) + if (sgt && pix.width() - sgr) p.drawImage(QPoint(width()-sgr, 0), pix, QRect(pix.width()-sgr, 0, sgr, sgt)); // Middle left - if(sgl && pix.height() - ySide) + if (sgl && pix.height() - ySide) p.drawImage(QRect(0, sgt, sgl, height() - ySide), pix, QRect(0, sgt, sgl, pix.height() - ySide)); // Middle - if(pix.width() - xSide && pix.height() - ySide) + if (pix.width() - xSide && pix.height() - ySide) p.drawImage(QRect(sgl, sgt, width() - xSide, height() - ySide), pix, QRect(sgl, sgt, pix.width() - xSide, pix.height() - ySide)); // Middle right - if(sgr && pix.height() - ySide) + if (sgr && pix.height() - ySide) p.drawImage(QRect(width()-sgr, sgt, sgr, height() - ySide), pix, QRect(pix.width()-sgr, sgt, sgr, pix.height() - ySide)); // Lower left - if(sgl && sgr) + if (sgl && sgr) p.drawImage(QPoint(0, height() - sgb), pix, QRect(0, pix.height() - sgb, sgl, sgb)); // Lower Middle - if(pix.width() - xSide && sgb) + if (pix.width() - xSide && sgb) p.drawImage(QRect(sgl, height() - sgb, width() - xSide, sgb), pix, QRect(sgl, pix.height() - sgb, pix.width() - xSide, sgb)); // Lower Right - if(sgr && sgb) + if (sgr && sgb) p.drawImage(QPoint(width()-sgr, height() - sgb), pix, QRect(pix.width()-sgr, pix.height() - sgb, sgr, sgb)); } - if(d->_smooth) { + if (d->_smooth) { p.restore(); } } @@ -416,10 +416,10 @@ uint QFxImage::glSimpleItemData(float *vertices, float *texVertices, { Q_D(QFxImage); - if(d->_pix.isNull() || (d->_scaleGrid && !d->_scaleGrid->isNull())) + if (d->_pix.isNull() || (d->_scaleGrid && !d->_scaleGrid->isNull())) return 0; - if(count < 8) + if (count < 8) return 8; d->checkDirty(); @@ -434,7 +434,7 @@ uint QFxImage::glSimpleItemData(float *vertices, float *texVertices, *texture = &d->_tex; - if(d->_tiled) { + if (d->_tiled) { float tileWidth = widthV / d->_pix.width(); float tileHeight = heightV / d->_pix.height(); texVertices[0] = 0; texVertices[1] = 0; @@ -453,7 +453,7 @@ uint QFxImage::glSimpleItemData(float *vertices, float *texVertices, void QFxImagePrivate::checkDirty() { - if(_texDirty && !_pix.isNull()) { + if (_texDirty && !_pix.isNull()) { _tex.setImage(_pix); _tex.setHorizontalWrap(GLTexture::Repeat); _tex.setVerticalWrap(GLTexture::Repeat); @@ -465,18 +465,18 @@ void QFxImagePrivate::checkDirty() void QFxImage::paintGLContents(GLPainter &p) { Q_D(QFxImage); - if(d->_pix.isNull()) + if (d->_pix.isNull()) return; QGLShaderProgram *shader = p.useTextureShader(); bool restoreBlend = false; - if(isOpaque() && p.activeOpacity == 1) { + if (isOpaque() && p.activeOpacity == 1) { glDisable(GL_BLEND); restoreBlend = true; } - if(d->_tiled || (!d->_scaleGrid || d->_scaleGrid->isNull())) { + if (d->_tiled || (!d->_scaleGrid || d->_scaleGrid->isNull())) { GLfloat vertices[8]; GLfloat texVertices[8]; @@ -498,7 +498,7 @@ void QFxImage::paintGLContents(GLPainter &p) float imgWidth = d->_pix.width(); float imgHeight = d->_pix.height(); - if(!imgWidth || !imgHeight) { + if (!imgWidth || !imgHeight) { if (restoreBlend) glEnable(GL_BLEND); return; @@ -521,19 +521,19 @@ void QFxImage::paintGLContents(GLPainter &p) const int sgt = d->_scaleGrid->top(); const int sgb = d->_scaleGrid->bottom(); - if(sgl) { + if (sgl) { texleft = float(sgl) / imgWidth; imgleft = sgl; } - if(sgr) { + if (sgr) { texright = 1. - float(sgr) / imgWidth; imgright = widthV - sgr; } - if(sgt) { + if (sgt) { textop = 1. - float(sgb) / imgHeight; imgtop = sgt; } - if(sgb) { + if (sgb) { texbottom = float(sgt) / imgHeight; imgbottom = heightV - sgb; } @@ -610,20 +610,20 @@ void QFxImage::paintGLContents(GLPainter &p) void QFxImage::paintGLContents(GLPainter &p) { Q_D(QFxImage); - if(d->_pix.isNull()) + if (d->_pix.isNull()) return; glMatrixMode(GL_MODELVIEW); glLoadMatrixf(p.activeTransform.data()); bool restoreBlend = false; - if(isOpaque() && p.activeOpacity == 1) { + if (isOpaque() && p.activeOpacity == 1) { glDisable(GL_BLEND); restoreBlend = true; } glEnable(GL_TEXTURE_2D); - if(p.activeOpacity == 1.) { + if (p.activeOpacity == 1.) { GLint i = GL_REPLACE; glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &i); } else { @@ -632,7 +632,7 @@ void QFxImage::paintGLContents(GLPainter &p) glColor4f(1, 1, 1, p.activeOpacity); } - if(d->_tiled || !d->_scaleGrid || d->_scaleGrid->isNull()) { + if (d->_tiled || !d->_scaleGrid || d->_scaleGrid->isNull()) { GLfloat vertices[8]; GLfloat texVertices[8]; @@ -660,7 +660,7 @@ void QFxImage::paintGLContents(GLPainter &p) float imgWidth = d->_pix.width(); float imgHeight = d->_pix.height(); - if(!imgWidth || !imgHeight) { + if (!imgWidth || !imgHeight) { if (restoreBlend) glEnable(GL_BLEND); return; @@ -683,19 +683,19 @@ void QFxImage::paintGLContents(GLPainter &p) const int sgt = d->_scaleGrid->top(); const int sgb = d->_scaleGrid->bottom(); - if(sgl) { + if (sgl) { texleft = float(sgl) / imgWidth; imgleft = sgl; } - if(sgr) { + if (sgr) { texright = 1. - float(sgr) / imgWidth; imgright = widthV - sgr; } - if(sgt) { + if (sgt) { textop = 1. - float(sgb) / imgHeight; imgtop = sgt; } - if(sgb) { + if (sgb) { texbottom = float(sgt) / imgHeight; imgbottom = heightV - sgb; } @@ -827,10 +827,10 @@ QString QFxImage::source() const void QFxImage::setSource(const QString &url) { Q_D(QFxImage); - if(url == d->source) + if (url == d->source) return; - if(d->reply) { + if (d->reply) { d->reply->deleteLater(); d->reply = 0; } @@ -844,7 +844,7 @@ void QFxImage::setSource(const QString &url) d->url = qmlContext(this)->resolvedUrl(url); d->sciurl = QUrl(); - if(url.isEmpty()) { + if (url.isEmpty()) { setPixmap(QPixmap()); d->status = Idle; } else { @@ -898,7 +898,7 @@ void QFxImage::requestFinished() void QFxImage::sciRequestFinished() { Q_D(QFxImage); - if(d->reply->error() != QNetworkReply::NoError) { + if (d->reply->error() != QNetworkReply::NoError) { d->status = Error; d->reply->deleteLater(); d->reply = 0; @@ -915,7 +915,7 @@ void QFxImage::sciRequestFinished() void QFxImage::setGridScaledImage(const QFxGridScaledImage& sci) { Q_D(QFxImage); - if(!sci.isValid()) { + if (!sci.isValid()) { d->status = Error; emit statusChanged(d->status); } else { diff --git a/src/declarative/fx/qfximage.h b/src/declarative/fx/qfximage.h index 4eed0ef..37fe5be 100644 --- a/src/declarative/fx/qfximage.h +++ b/src/declarative/fx/qfximage.h @@ -57,7 +57,7 @@ class Q_DECLARATIVE_EXPORT QFxImage : public QFxItem Q_ENUMS(Status) Q_PROPERTY(Status status READ status NOTIFY statusChanged) - Q_PROPERTY(QString src READ source WRITE setSource NOTIFY sourceChanged) + Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged) Q_PROPERTY(QFxScaleGrid *scaleGrid READ scaleGrid) Q_PROPERTY(bool tile READ isTiled WRITE setTiled) diff --git a/src/declarative/fx/qfximage_p.h b/src/declarative/fx/qfximage_p.h index 46aea49..fbb4c44 100644 --- a/src/declarative/fx/qfximage_p.h +++ b/src/declarative/fx/qfximage_p.h @@ -89,7 +89,7 @@ public: QFxScaleGrid *scaleGrid() { - if(!_scaleGrid) + if (!_scaleGrid) _scaleGrid = new QFxScaleGrid; return _scaleGrid; } diff --git a/src/declarative/fx/qfximageitem.cpp b/src/declarative/fx/qfximageitem.cpp index a6f6d8f..52ab009 100644 --- a/src/declarative/fx/qfximageitem.cpp +++ b/src/declarative/fx/qfximageitem.cpp @@ -119,8 +119,7 @@ void QFxImageItem::dirtyCache(const QRect& rect) void QFxImageItem::clearCache() { Q_D(QFxImageItem); - foreach (QFxImageItemPrivate::ImageCacheItem* i, d->imagecache) - delete i; + qDeleteAll(d->imagecache); d->imagecache.clear(); } @@ -155,7 +154,7 @@ QSize QFxImageItem::contentsSize() const void QFxImageItem::setSmooth(bool smooth) { Q_D(QFxImageItem); - if(d->smooth == smooth) return; + if (d->smooth == smooth) return; d->smooth = smooth; clearCache(); update(); @@ -169,7 +168,7 @@ void QFxImageItem::setSmooth(bool smooth) void QFxImageItem::setContentsSize(const QSize &size) { Q_D(QFxImageItem); - if(d->contentsSize == size) return; + if (d->contentsSize == size) return; d->contentsSize = size; clearCache(); update(); @@ -232,8 +231,9 @@ void QFxImageItem::paintGLContents(GLPainter &p) return; #if defined(QFX_RENDER_QPAINTER) - if(d->smooth) { - p.save(); + bool oldAntiAliasing = p.testRenderHint(QPainter::Antialiasing); + bool oldSmoothPixmap = p.testRenderHint(QPainter::SmoothPixmapTransform); + if (d->smooth) { p.setRenderHints(QPainter::Antialiasing, true); p.setRenderHints(QPainter::SmoothPixmapTransform, true); } @@ -303,7 +303,8 @@ void QFxImageItem::paintGLContents(GLPainter &p) } const QRegion bigger = QRegion(biggerrect) & uncached; const QVector<QRect> rects = bigger.rects(); - foreach (QRect r, rects) { + for (int i = 0; i < rects.count(); ++i) { + const QRect &r = rects.at(i); #if defined(QFX_RENDER_QPAINTER) QImage img(r.size(),QImage::Format_ARGB32_Premultiplied); #else @@ -335,8 +336,10 @@ void QFxImageItem::paintGLContents(GLPainter &p) glDisableClientState(GL_TEXTURE_COORD_ARRAY); #endif #if defined(QFX_RENDER_QPAINTER) - if(d->smooth) - p.restore(); + if (d->smooth) { + p.setRenderHints(QPainter::Antialiasing, oldAntiAliasing); + p.setRenderHints(QPainter::SmoothPixmapTransform, oldSmoothPixmap); + } #endif } diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp index 2f8ce92..11b7dd3 100644 --- a/src/declarative/fx/qfxitem.cpp +++ b/src/declarative/fx/qfxitem.cpp @@ -151,12 +151,15 @@ void QFxContents::calcHeight() int top = INT_MAX; int bottom = 0; - foreach(const QSimpleCanvasItem *child, - _item->QSimpleCanvasItem::children()) { - if (child->y() + child->height() > bottom) - bottom = (int)child->y() + child->height(); - if (child->y() < top) - top = (int)child->y(); + + const QList<QSimpleCanvasItem *> &children = _item->QSimpleCanvasItem::children(); + for (int i = 0; i < children.count(); ++i) { + const QSimpleCanvasItem *child = children.at(i); + int y = int(child->y()); + if (y + child->height() > bottom) + bottom = y + child->height(); + if (y < top) + top = y; } _height = bottom - top; @@ -171,12 +174,14 @@ void QFxContents::calcWidth() int left = INT_MAX; int right = 0; - foreach(const QSimpleCanvasItem *child, - _item->QSimpleCanvasItem::children()) { - if (child->x() + child->width() > right) - right = (int)child->x() + child->width(); - if (child->x() < left) - left = (int)child->x(); + const QList<QSimpleCanvasItem *> &children = _item->QSimpleCanvasItem::children(); + for (int i = 0; i < children.count(); ++i) { + const QSimpleCanvasItem *child = children.at(i); + int x = int(child->x()); + if (x + child->width() > right) + right = x + child->width(); + if (x < left) + left = x; } _width = right - left; @@ -188,8 +193,9 @@ void QFxContents::setItem(QFxItem *item) { _item = item; - foreach(const QSimpleCanvasItem *child, - _item->QSimpleCanvasItem::children()) { + const QList<QSimpleCanvasItem *> &children = _item->QSimpleCanvasItem::children(); + for (int i = 0; i < children.count(); ++i) { + const QSimpleCanvasItem *child = children.at(i); connect(child, SIGNAL(bottomChanged()), this, SLOT(calcHeight())); connect(child, SIGNAL(rightChanged()), this, SLOT(calcWidth())); } @@ -451,7 +457,7 @@ void QFxItem::setItemParent(QFxItem *parent) */ void QFxItem::moveToParent(QFxItem *parent) { - if(parent && itemParent()) { + if (parent && itemParent()) { QPointF me = itemParent()->mapToScene(QPointF(0,0)); QPointF them = parent->mapToScene(QPointF(0,0)); @@ -476,25 +482,25 @@ void QFxItem::moveToParent(QFxItem *parent) qreal yDiff = them.y() - me.y(); - if(themx.x() == 0.) { + if (themx.x() == 0.) { ry = xDiff / themy.x(); rx = (yDiff - ry * themy.y()) / themx.y(); - } else if(themy.x() == 0.) { + } else if (themy.x() == 0.) { rx = xDiff / themx.x(); ry = (yDiff - rx * themx.y()) / themy.y(); - } else if(themx.y() == 0.) { + } else if (themx.y() == 0.) { ry = yDiff / themy.y(); rx = (xDiff - ry * themy.x()) / themx.x(); - } else if(themy.y() == 0.) { + } else if (themy.y() == 0.) { rx = yDiff / themx.y(); ry = (xDiff - rx * themx.x()) / themy.x(); } else { qreal div = (themy.x() * themx.y() - themy.y() * themx.x()); - if(div != 0.) + if (div != 0.) rx = (themx.y() * xDiff - themx.x() * yDiff) / div; - if(themy.y() != 0.) ry = (yDiff - rx * themx.y()) / themy.y(); + if (themy.y() != 0.) ry = (yDiff - rx * themx.y()) / themy.y(); } setX(x() - rx); @@ -603,7 +609,7 @@ void QFxItemPrivate::data_append(QObject *o) { Q_Q(QFxItem); QFxItem *i = qobject_cast<QFxItem *>(o); - if(i) + if (i) q->children()->append(i); else resources_append(o); @@ -800,9 +806,9 @@ void QFxItem::setQml(const QString &qml) if (d->_qml == qml) return; - if(!d->_qml.isEmpty()) { + if (!d->_qml.isEmpty()) { QmlChildren::Iterator iter = d->_qmlChildren.find(d->_qml); - if(iter != d->_qmlChildren.end()) + if (iter != d->_qmlChildren.end()) (*iter)->setOpacity(0.); } @@ -810,20 +816,20 @@ void QFxItem::setQml(const QString &qml) d->_qmlurl = qmlContext(this)->resolvedUri(qml); d->qmlItem = 0; - if(d->_qml.isEmpty()) { + if (d->_qml.isEmpty()) { emit qmlChanged(); return; } QmlChildren::Iterator iter = d->_qmlChildren.find(d->_qml); - if(iter != d->_qmlChildren.end()) { + if (iter != d->_qmlChildren.end()) { (*iter)->setOpacity(1.); d->qmlItem = (*iter); emit qmlChanged(); } else { d->_qmlcomp = new QmlComponent(qmlEngine(this), d->_qmlurl, this); - if(!d->_qmlcomp->isLoading()) + if (!d->_qmlcomp->isLoading()) qmlLoaded(); else QObject::connect(d->_qmlcomp, SIGNAL(statusChanged(QmlComponent::Status)), @@ -840,7 +846,7 @@ void QFxItem::qmlLoaded() // ### for (int i=0; i<d->_qmlnewloading.length(); ++i) { QmlComponent *c = d->_qmlnewcomp.at(i); - if(c->isLoading()) + if (c->isLoading()) continue; QmlContext *ctxt = new QmlContext(qmlContext(this)); @@ -866,7 +872,7 @@ void QFxItem::qmlLoaded() QObject *obj = d->_qmlcomp->create(ctxt); QFxItem *qmlChild = qobject_cast<QFxItem *>(obj); - if(qmlChild) { + if (qmlChild) { qmlChild->setItemParent(this); d->_qmlChildren.insert(d->_qml, qmlChild); d->qmlItem = qmlChild; @@ -984,23 +990,23 @@ void QFxItem::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QFxItem); - if(newGeometry.width() != oldGeometry.width()) { + if (newGeometry.width() != oldGeometry.width()) { int xoffset = oldGeometry.width() - newGeometry.width(); d->handleWidthChange(xoffset); } - if(newGeometry.height() != oldGeometry.height()) { + if (newGeometry.height() != oldGeometry.height()) { int yoffset = oldGeometry.height() - newGeometry.height(); d->handleHeightChange(yoffset); } - if(newGeometry.x() != oldGeometry.x()) { + if (newGeometry.x() != oldGeometry.x()) { emit leftChanged(); emit hcenterChanged(); emit rightChanged(); } - if(newGeometry.y() != oldGeometry.y()) { + if (newGeometry.y() != oldGeometry.y()) { emit topChanged(); emit vcenterChanged(); emit bottomChanged(); @@ -1010,7 +1016,7 @@ void QFxItem::geometryChanged(const QRectF &newGeometry, void QFxItemPrivate::handleWidthChange(int xoffset) { Q_Q(QFxItem); - if(!_anchors) { + if (!_anchors) { emit q->hcenterChanged(); emit q->rightChanged(); } else { @@ -1026,9 +1032,9 @@ void QFxItemPrivate::handleWidthChange(int xoffset) emit q->rightChanged(); } } - if(q->rotation() && q->transformOrigin() != QFxItem::TopLeft) + if (q->rotation() && q->transformOrigin() != QFxItem::TopLeft) q->setRotation(q->rotation()); - if(q->scale() && q->transformOrigin() != QFxItem::TopLeft) + if (q->scale() && q->transformOrigin() != QFxItem::TopLeft) q->setScale(q->scale()); emit q->widthChanged(); } @@ -1036,7 +1042,7 @@ void QFxItemPrivate::handleWidthChange(int xoffset) void QFxItemPrivate::handleHeightChange(int yoffset) { Q_Q(QFxItem); - if(!_anchors) { + if (!_anchors) { emit q->vcenterChanged(); emit q->bottomChanged(); emit q->baselineChanged(); @@ -1058,9 +1064,9 @@ void QFxItemPrivate::handleHeightChange(int yoffset) emit q->baselineChanged(); } } - if(q->rotation() && q->transformOrigin() != QFxItem::TopLeft) + if (q->rotation() && q->transformOrigin() != QFxItem::TopLeft) q->setRotation(q->rotation()); - if(q->scale() && q->transformOrigin() != QFxItem::TopLeft) + if (q->scale() && q->transformOrigin() != QFxItem::TopLeft) q->setScale(q->scale()); emit q->heightChanged(); } @@ -1086,7 +1092,7 @@ bool QFxItem::flipVertically() const void QFxItem::setFlipVertically(bool v) { - if(v) + if (v) setFlip((QSimpleCanvasItem::Flip)(flip() | VerticalFlip)); else setFlip((QSimpleCanvasItem::Flip)(flip() & ~VerticalFlip)); @@ -1105,7 +1111,7 @@ bool QFxItem::flipHorizontally() const void QFxItem::setFlipHorizontally(bool v) { - if(v) + if (v) setFlip((QSimpleCanvasItem::Flip)(flip() | HorizontalFlip)); else setFlip((QSimpleCanvasItem::Flip)(flip() & ~HorizontalFlip)); @@ -1555,11 +1561,11 @@ qreal QFxItem::opacity() const void QFxItem::setOpacity(qreal v) { - if(v == QSimpleCanvasItem::visible()) + if (v == QSimpleCanvasItem::visible()) return; - if(v < 0) v = 0; - else if(v > 1) v = 1; + if (v < 0) v = 0; + else if (v > 1) v = 1; QSimpleCanvasItem::setVisible(v); emit opacityChanged(); @@ -1709,7 +1715,7 @@ QmlList<QmlTransition *>* QFxItem::transitions() QmlState *QFxItem::findState(const QString &name) const { Q_D(const QFxItem); - if(!d->_stateGroup) + if (!d->_stateGroup) return 0; else return d->_stateGroup->findState(name); @@ -1769,7 +1775,7 @@ QmlState *QFxItem::findState(const QString &name) const QString QFxItem::state() const { Q_D(const QFxItem); - if(!d->_stateGroup) + if (!d->_stateGroup) return QString(); else return d->_stateGroup->state(); @@ -1834,11 +1840,11 @@ bool QFxItem::isVisible() const void QFxItem::setVisible(bool visible) { Q_D(QFxItem); - if(visible == d->visible) + if (visible == d->visible) return; d->visible = visible; - if(visible) + if (visible) setOpacity(d->visibleOp); else { d->visibleOp = opacity(); @@ -1881,7 +1887,7 @@ void QFxItem::newChild(const QString &type) d->_qmlnewloading.append(url); d->_qmlnewcomp.append(new QmlComponent(qmlEngine(this), url, this)); - if(!d->_qmlnewcomp.last()->isLoading()) + if (!d->_qmlnewcomp.last()->isLoading()) qmlLoaded(); else connect(d->_qmlnewcomp.last(), SIGNAL(statusChanged(QmlComponent::Status)), @@ -1899,7 +1905,7 @@ void QFxItem::classBegin() Q_D(QFxItem); d->_classComplete = false; d->_componentComplete = false; - if(d->_stateGroup) + if (d->_stateGroup) d->_stateGroup->classBegin(); } @@ -1915,7 +1921,7 @@ void QFxItem::classComplete() #endif Q_D(QFxItem); d->_classComplete = true; - if(d->_stateGroup) + if (d->_stateGroup) d->_stateGroup->classComplete(); } @@ -1929,13 +1935,13 @@ void QFxItem::componentComplete() { Q_D(QFxItem); d->_componentComplete = true; - if(d->_stateGroup) + if (d->_stateGroup) d->_stateGroup->componentComplete(); - if(d->_anchors) { + if (d->_anchors) { d->anchors()->connectHAnchors(); d->anchors()->connectVAnchors(); } - if(!d->_transform.isEmpty()) + if (!d->_transform.isEmpty()) updateTransform(); } @@ -1960,9 +1966,9 @@ void QFxItem::updateTransform() { Q_D(QFxItem); QSimpleCanvas::Matrix trans; - for(int ii = d->_transform.count() - 1; ii >= 0; --ii) { + for (int ii = d->_transform.count() - 1; ii >= 0; --ii) { QFxTransform *a = d->_transform.at(ii); - if(!a->isIdentity()) + if (!a->isIdentity()) trans = a->transform() * trans; } @@ -1980,9 +1986,9 @@ void QFxItem::transformChanged(const QSimpleCanvas::Matrix &) QmlStateGroup *QFxItemPrivate::states() { Q_Q(QFxItem); - if(!_stateGroup) { + if (!_stateGroup) { _stateGroup = new QmlStateGroup(q); - if(!_classComplete) + if (!_classComplete) _stateGroup->classBegin(); QObject::connect(_stateGroup, SIGNAL(stateChanged(QString)), q, SIGNAL(stateChanged(QString))); diff --git a/src/declarative/fx/qfxitem_p.h b/src/declarative/fx/qfxitem_p.h index 71fc912..f2da3ba 100644 --- a/src/declarative/fx/qfxitem_p.h +++ b/src/declarative/fx/qfxitem_p.h @@ -85,7 +85,7 @@ public: { Q_Q(QFxItem); - if(parent) + if (parent) q->setItemParent(parent); _baselineOffset.invalidate(); q->setAcceptedMouseButtons(Qt::NoButton); @@ -122,7 +122,7 @@ public: QList<QFxTransform *> _transform; QFxAnchors *anchors() { - if(!_anchors) { + if (!_anchors) { Q_Q(QFxItem); _anchors = new QFxAnchors; _anchors->setItem(q); @@ -160,7 +160,7 @@ public: mutable AnchorLines *_anchorLines; AnchorLines *anchorLines() const { Q_Q(const QFxItem); - if(!_anchorLines) _anchorLines = + if (!_anchorLines) _anchorLines = new AnchorLines(const_cast<QFxItem *>(q)); return _anchorLines; } diff --git a/src/declarative/fx/qfxkeyactions.cpp b/src/declarative/fx/qfxkeyactions.cpp index 3bd7d00..69d4679 100644 --- a/src/declarative/fx/qfxkeyactions.cpp +++ b/src/declarative/fx/qfxkeyactions.cpp @@ -78,15 +78,15 @@ QFxKeyActionsPrivate::QFxKeyActionsPrivate() int QFxKeyActionsPrivate::keyToBit(Qt::Key k) const { - if(k >= Qt::Key_A && k <= Qt::Key_Z ) { + if (k >= Qt::Key_A && k <= Qt::Key_Z ) { return k - Qt::Key_A; - } else if(k >= Qt::Key_Left && k <= Qt::Key_Down) { + } else if (k >= Qt::Key_Left && k <= Qt::Key_Down) { return 26 + k - Qt::Key_Left; - } else if(k >= Qt::Key_0 && k <= Qt::Key_9) { + } else if (k >= Qt::Key_0 && k <= Qt::Key_9) { return 30 + k - Qt::Key_0; - } else if(k >= Qt::Key_Context1 && k <= Qt::Key_Flip) { + } else if (k >= Qt::Key_Context1 && k <= Qt::Key_Flip) { return 40 + k - Qt::Key_Context1; - } else if(k >= Qt::Key_Select && k <= Qt::Key_No) { + } else if (k >= Qt::Key_Select && k <= Qt::Key_No) { return 47 + k - Qt::Key_Select; } else { const int start = 50; @@ -117,7 +117,7 @@ bool QFxKeyActionsPrivate::key(Qt::Key k) const { int b = keyToBit(k); bool rv = testBit(b); - if(!rv && k != Qt::Key_Shift) + if (!rv && k != Qt::Key_Shift) rv = testBit(keyToBit(Qt::Key_unknown)); return rv; } @@ -125,7 +125,7 @@ bool QFxKeyActionsPrivate::key(Qt::Key k) const QString QFxKeyActionsPrivate::action(Qt::Key k) const { int b = keyToBit(k); - if(b != -1 && testBit(b)) + if (b != -1 && testBit(b)) return actions.value(k); else return actions.value(Qt::Key_unknown); @@ -134,7 +134,7 @@ QString QFxKeyActionsPrivate::action(Qt::Key k) const void QFxKeyActionsPrivate::setKey(Qt::Key k, bool v) { int b = keyToBit(k); - if(b == -1) + if (b == -1) return; setBit(b, v); @@ -142,10 +142,10 @@ void QFxKeyActionsPrivate::setKey(Qt::Key k, bool v) bool QFxKeyActionsPrivate::testBit(int b) const { - if(b < 0) + if (b < 0) return false; - if(b < 32) + if (b < 32) return keys1 & (1 << b); else return keys2 & (1 << (b - 32)); @@ -153,13 +153,13 @@ bool QFxKeyActionsPrivate::testBit(int b) const void QFxKeyActionsPrivate::setBit(int b, bool v) { - if(v) { - if(b < 32) + if (v) { + if (b < 32) keys1 |= (1 << b); else keys2 |= (1 << (b - 32)); } else { - if(b < 32) + if (b < 32) keys1 &= ~(1 << b); else keys2 &= ~(1 << (b - 32)); @@ -198,7 +198,7 @@ QFxKeyActions::~QFxKeyActions() QString QFxKeyActionsPrivate::keyExpr(Qt::Key k) const { - if(key(k)) + if (key(k)) return actions.value(k); else return QString(); @@ -206,8 +206,8 @@ QString QFxKeyActionsPrivate::keyExpr(Qt::Key k) const void QFxKeyActionsPrivate::setKeyExpr(Qt::Key k, const QString &expr) { - if(expr.isEmpty()) { - if(key(k)) { + if (expr.isEmpty()) { + if (key(k)) { actions.remove(k); setKey(k, false); } @@ -231,7 +231,7 @@ bool QFxKeyActions::enabled() const void QFxKeyActions::setEnabled(bool e) { - if(d->enabled == e) + if (d->enabled == e) return; d->enabled = e; @@ -898,7 +898,7 @@ void QFxKeyActions::setKey_Any(const QString &s) void QFxKeyActions::keyPressEvent(QKeyEvent *event) { Qt::Key key = (Qt::Key)event->key(); - if(d->enabled && d->key(key)) { + if (d->enabled && d->key(key)) { QmlExpression b(qmlContext(this), d->action(key), this, false); b.value(); event->accept(); @@ -910,7 +910,7 @@ void QFxKeyActions::keyPressEvent(QKeyEvent *event) void QFxKeyActions::keyReleaseEvent(QKeyEvent *event) { Qt::Key key = (Qt::Key)event->key(); - if(d->enabled && d->key(key)) { + if (d->enabled && d->key(key)) { event->accept(); } else { QFxItem::keyReleaseEvent(event); diff --git a/src/declarative/fx/qfxkeyproxy.cpp b/src/declarative/fx/qfxkeyproxy.cpp index 7d5726f..6d92441 100644 --- a/src/declarative/fx/qfxkeyproxy.cpp +++ b/src/declarative/fx/qfxkeyproxy.cpp @@ -93,22 +93,22 @@ QList<QFxItem *> *QFxKeyProxy::targets() const void QFxKeyProxy::keyPressEvent(QKeyEvent *e) { - for(int ii = 0; ii < d->targets.count(); ++ii) { + for (int ii = 0; ii < d->targets.count(); ++ii) { QSimpleCanvasItem *i = d->targets.at(ii); - if(i) + if (i) i->keyPressEvent(e); - if(e->isAccepted()) + if (e->isAccepted()) return; } } void QFxKeyProxy::keyReleaseEvent(QKeyEvent *e) { - for(int ii = 0; ii < d->targets.count(); ++ii) { + for (int ii = 0; ii < d->targets.count(); ++ii) { QSimpleCanvasItem *i = d->targets.at(ii); - if(i) + if (i) i->keyReleaseEvent(e); - if(e->isAccepted()) + if (e->isAccepted()) return; } } diff --git a/src/declarative/fx/qfxlayouts.cpp b/src/declarative/fx/qfxlayouts.cpp index b89e795..76afeb0 100644 --- a/src/declarative/fx/qfxlayouts.cpp +++ b/src/declarative/fx/qfxlayouts.cpp @@ -96,7 +96,7 @@ int QFxBaseLayout::spacing() const void QFxBaseLayout::setSpacing(int s) { Q_D(QFxBaseLayout); - if(s==d->_spacing) + if (s==d->_spacing) return; d->_spacing = s; preLayout(); @@ -116,7 +116,7 @@ int QFxBaseLayout::margin() const void QFxBaseLayout::setMargin(int s) { Q_D(QFxBaseLayout); - if(s==d->_margin) + if (s==d->_margin) return; d->_margin = s; preLayout(); @@ -223,7 +223,7 @@ QFxItem *QFxBaseLayout::layoutItem() const void QFxBaseLayout::setLayoutItem(QFxItem *li) { Q_D(QFxBaseLayout); - if(li == d->_layoutItem) + if (li == d->_layoutItem) return; d->_layoutItem = li; emit layoutItemChanged(); @@ -246,7 +246,7 @@ void QFxBaseLayout::childrenChanged() bool QFxBaseLayout::event(QEvent *e) { Q_D(QFxBaseLayout); - if(e->type() == QEvent::User) { + if (e->type() == QEvent::User) { d->_ep = false; d->_stableItems += d->_newItems; d->_leavingItems.clear(); @@ -288,22 +288,22 @@ QSet<QFxItem *>* QFxBaseLayout::leavingItems() void QFxBaseLayout::preLayout() { Q_D(QFxBaseLayout); - if(!isComponentComplete() || d->_movingItem) + if (!isComponentComplete() || d->_movingItem) return; - if(!d->_ep) { + if (!d->_ep) { d->_ep = true; QCoreApplication::postEvent(this, new QEvent(QEvent::User)); } - if(d->stateGroup) { + if (d->stateGroup) { delete d->stateGroup; d->stateGroup = 0; } QSet<QFxItem *> allItems; - for(int ii = 0; ii < this->QSimpleCanvasItem::children().count(); ++ii) { + for (int ii = 0; ii < this->QSimpleCanvasItem::children().count(); ++ii) { QFxItem *child = qobject_cast<QFxItem *>(this->QSimpleCanvasItem::children().at(ii)); - if(!child) + if (!child) continue; - if(!d->_items.contains(child)){ + if (!d->_items.contains(child)){ QObject::connect(child, SIGNAL(visibleChanged()), this, SLOT(preLayout())); QObject::connect(child, SIGNAL(heightChanged()), @@ -312,20 +312,20 @@ void QFxBaseLayout::preLayout() this, SLOT(preLayout())); d->_items += child; } - if(!child->isVisible()){ - if(d->_stableItems.contains(child)){ + if (!child->isVisible()){ + if (d->_stableItems.contains(child)){ d->_leavingItems += child; d->_stableItems -= child; } - }else if(!d->_stableItems.contains(child)){ + }else if (!d->_stableItems.contains(child)){ d->_newItems+=child; } allItems += child; } QSet<QFxItem *> deletedItems = d->_items - allItems; foreach(QFxItem *child, d->_items){ - if(!allItems.contains(child)){ - if(!deletedItems.contains(child)) { + if (!allItems.contains(child)){ + if (!deletedItems.contains(child)) { QObject::disconnect(child, SIGNAL(visibleChanged()), this, SLOT(preLayout())); QObject::disconnect(child, SIGNAL(heightChanged()), @@ -343,8 +343,8 @@ void QFxBaseLayout::preLayout() qreal width=0; qreal height=0; foreach(QFxItem *item, d->_items){ - if(item->isVisible()){ - if(!d->_animated.contains(item)){ + if (item->isVisible()){ + if (!d->_animated.contains(item)){ setMovingItem(item); item->setPos(QPointF(item->x()+d->_margin, item->y()+d->_margin)); setMovingItem(0); @@ -356,11 +356,11 @@ void QFxBaseLayout::preLayout() width += d->_margin; height+= d->_margin; - if(d->aut & Horizontal) + if (d->aut & Horizontal) setWidth(int(width)); else setImplicitWidth(itemParent()->width()); - if(d->aut & Vertical) + if (d->aut & Vertical) setHeight(int(height)); else setImplicitHeight(itemParent()->height()); @@ -372,20 +372,20 @@ void QFxBaseLayout::applyTransition(const QList<QPair<QString, QVariant> >& chan QFxItem* target, QmlTransition* trans) { Q_D(QFxBaseLayout); - if(!trans||!target)//TODO: if !trans, just apply changes + if (!trans||!target)//TODO: if !trans, just apply changes return; setLayoutItem(target); - if(d->stateGroup) + if (d->stateGroup) delete d->stateGroup; d->stateGroup = new QmlStateGroup(this); QmlState *state = new QmlState; *(d->stateGroup->statesProperty()) << state; - for(int ii=0; ii<changes.size(); ++ii){ + for (int ii=0; ii<changes.size(); ++ii){ QmlSetProperty *sp = new QmlSetProperty(state); sp->setObject(target); QVariant val = changes[ii].second; - if(d->_margin && + if (d->_margin && (changes[ii].first == QLatin1String("x") || changes[ii].first == QLatin1String("y"))){ val = QVariant(val.toInt() + d->_margin); } @@ -589,14 +589,14 @@ void QFxVerticalLayout::doLayout() int voffset = 0; foreach(QFxItem* item, *leavingItems()){ - if(remove()){ + if (remove()){ QList<QPair<QString,QVariant> > changes; applyRemove(changes, item); } } - for(int ii = 0; ii < this->QSimpleCanvasItem::children().count(); ++ii) { + for (int ii = 0; ii < this->QSimpleCanvasItem::children().count(); ++ii) { QFxItem *child = qobject_cast<QFxItem *>(this->QSimpleCanvasItem::children().at(ii)); - if(!child || !child->isVisible()) + if (!child || !child->isVisible()) continue; bool needMove = (child->y() != voffset || child->x()); @@ -604,11 +604,11 @@ void QFxVerticalLayout::doLayout() QList<QPair<QString, QVariant> > changes; changes << qMakePair(QString(QLatin1String("y")),QVariant(voffset)); changes << qMakePair(QString(QLatin1String("x")),QVariant(0)); - if(needMove && items()->contains(child) && move()) { + if (needMove && items()->contains(child) && move()) { applyMove(changes,child); - } else if(!items()->contains(child) && add()) { + } else if (!items()->contains(child) && add()) { applyAdd(changes,child); - } else if(needMove) { + } else if (needMove) { setMovingItem(child); child->setY(voffset); setMovingItem(0); @@ -742,14 +742,14 @@ void QFxHorizontalLayout::doLayout() int hoffset = 0; foreach(QFxItem* item, *leavingItems()){ - if(remove()){ + if (remove()){ QList<QPair<QString,QVariant> > changes; applyRemove(changes, item); } } - for(int ii = 0; ii < this->QSimpleCanvasItem::children().count(); ++ii) { + for (int ii = 0; ii < this->QSimpleCanvasItem::children().count(); ++ii) { QFxItem *child = qobject_cast<QFxItem *>(this->QSimpleCanvasItem::children().at(ii)); - if(!child || !child->isVisible()) + if (!child || !child->isVisible()) continue; bool needMove = (child->x() != hoffset || child->y()); @@ -757,11 +757,11 @@ void QFxHorizontalLayout::doLayout() QList<QPair<QString, QVariant> > changes; changes << qMakePair(QString(QLatin1String("x")),QVariant(hoffset)); changes << qMakePair(QString(QLatin1String("y")),QVariant(0)); - if(needMove && items()->contains(child) && move()) { + if (needMove && items()->contains(child) && move()) { applyMove(changes,child); - } else if(!items()->contains(child) && add()) { + } else if (!items()->contains(child) && add()) { applyAdd(changes,child); - } else if(needMove) { + } else if (needMove) { setMovingItem(child); child->setX(hoffset); setMovingItem(0); @@ -950,32 +950,32 @@ void QFxGridLayout::doLayout() { int c=_columns,r=_rows;//Actual number of rows/columns int numVisible = items()->size() + newItems()->size(); - if(_columns==-1 && _rows==-1){ + if (_columns==-1 && _rows==-1){ c = 4; r = (numVisible+2)/3; - }else if(_rows==-1){ + }else if (_rows==-1){ r = (numVisible+(_columns-1))/_columns; - }else if(_columns==-1){ + }else if (_columns==-1){ c = (numVisible+(_rows-1))/_rows; } QList<int> maxColWidth; QList<int> maxRowHeight; int childIndex =0; - for(int i=0; i<r; i++){ - for(int j=0; j<c; j++){ - if(j==0) + for (int i=0; i<r; i++){ + for (int j=0; j<c; j++){ + if (j==0) maxRowHeight << 0; - if(i==0) + if (i==0) maxColWidth << 0; - if(childIndex == this->QSimpleCanvasItem::children().count()) + if (childIndex == this->QSimpleCanvasItem::children().count()) continue; QFxItem *child = qobject_cast<QFxItem *>(this->QSimpleCanvasItem::children().at(childIndex++)); - if(!child || !child->isVisible()) + if (!child || !child->isVisible()) continue; - if(child->width() > maxColWidth[j]) + if (child->width() > maxColWidth[j]) maxColWidth[j] = child->width(); - if(child->height() > maxRowHeight[i]) + if (child->height() > maxRowHeight[i]) maxRowHeight[i] = child->height(); } } @@ -985,23 +985,23 @@ void QFxGridLayout::doLayout() int curRow =0; int curCol =0; foreach(QFxItem* item, *leavingItems()){ - if(remove()){ + if (remove()){ QList<QPair<QString,QVariant> > changes; applyRemove(changes, item); } } foreach(QSimpleCanvasItem* schild, this->QSimpleCanvasItem::children()){ QFxItem *child = qobject_cast<QFxItem *>(schild); - if(!child || !child->isVisible()) + if (!child || !child->isVisible()) continue; bool needMove = (child->x()!=xoffset)||(child->y()!=yoffset); QList<QPair<QString, QVariant> > changes; changes << qMakePair(QString(QLatin1String("x")),QVariant(xoffset)); changes << qMakePair(QString(QLatin1String("y")),QVariant(yoffset)); - if(newItems()->contains(child) && add()) { + if (newItems()->contains(child) && add()) { applyAdd(changes,child); - } else if(needMove) { - if(move()){ + } else if (needMove) { + if (move()){ applyMove(changes,child); }else{ setMovingItem(child); @@ -1012,11 +1012,11 @@ void QFxGridLayout::doLayout() xoffset+=maxColWidth[curCol]+spacing(); curCol++; curCol%=c; - if(!curCol){ + if (!curCol){ yoffset+=maxRowHeight[curRow]+spacing(); xoffset=0; curRow++; - if(curRow>=r) + if (curRow>=r) return; } } diff --git a/src/declarative/fx/qfxlistview.cpp b/src/declarative/fx/qfxlistview.cpp index 76f7e11..0724e3a 100644 --- a/src/declarative/fx/qfxlistview.cpp +++ b/src/declarative/fx/qfxlistview.cpp @@ -585,7 +585,7 @@ void QFxListViewPrivate::createHighlight() if (nobj) { highlightContext->setParent(nobj); item = qobject_cast<QFxItem *>(nobj); - if(!item) { + if (!item) { delete nobj; } else { item->setParent(q->viewport()); @@ -1194,7 +1194,7 @@ int QFxListView::cacheBuffer() const void QFxListView::setCacheBuffer(int b) { Q_D(QFxListView); - if(d->buffer != b) { + if (d->buffer != b) { d->buffer = b; if (isComponentComplete()) refill(); @@ -1233,7 +1233,7 @@ QString QFxListView::sectionExpression() const void QFxListView::setSectionExpression(const QString &expression) { Q_D(QFxListView); - if(d->sectionExpression != expression) { + if (d->sectionExpression != expression) { d->sectionExpression = expression; emit sectionExpressionChanged(); } @@ -1546,9 +1546,8 @@ void QFxListView::itemsInserted(int modelIndex, int count) } } // everything is in order now - emit add() signal - foreach(FxListItem *item, added) - item->attached->emitAdd(); - + for (int j = 0; j < added.count(); ++j) + added.at(j)->attached->emitAdd(); emit countChanged(); } diff --git a/src/declarative/fx/qfxmouseregion.cpp b/src/declarative/fx/qfxmouseregion.cpp index f7b6c57..d197c9a 100644 --- a/src/declarative/fx/qfxmouseregion.cpp +++ b/src/declarative/fx/qfxmouseregion.cpp @@ -163,7 +163,7 @@ void QFxDrag::setYmax(int m) example extended so as to give a different color when you right click. \code <Rect width="100" height="100"> - <MouseRegion anchors.fill="{parent}" onClick="if(mouse.button==Qt.RightButton) { parent.color='blue';} else { parent.color = 'red';}"/> + <MouseRegion anchors.fill="{parent}" onClick="if (mouse.button==Qt.RightButton) { parent.color='blue';} else { parent.color = 'red';}"/> </Rect> \endcode @@ -324,7 +324,7 @@ void QFxMouseRegion::mousePressEvent(QGraphicsSceneMouseEvent *event) { Q_D(QFxMouseRegion); d->moved = false; - if(!d->absorb) + if (!d->absorb) QFxItem::mousePressEvent(event); else { if (!d->inside) { @@ -349,7 +349,7 @@ void QFxMouseRegion::mousePressEvent(QGraphicsSceneMouseEvent *event) void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event) { Q_D(QFxMouseRegion); - if(!d->absorb) { + if (!d->absorb) { QFxItem::mouseMoveEvent(event); return; } @@ -369,10 +369,10 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event) emit reenteredWhilePressed(); } - if(drag()->target()) { - if(!d->moved) { - if(d->dragX) d->startX = int(drag()->target()->x()); //### change startX and startY to qreal? - if(d->dragY) d->startY = int(drag()->target()->y()); + if (drag()->target()) { + if (!d->moved) { + if (d->dragX) d->startX = int(drag()->target()->x()); //### change startX and startY to qreal? + if (d->dragY) d->startY = int(drag()->target()->y()); } QPointF startLocalPos; @@ -397,7 +397,7 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event) } } - if(d->dragX) { + if (d->dragX) { qreal x = (curLocalPos.x() - startLocalPos.x()) + d->startX; if (x < drag()->xmin()) x = drag()->xmin(); @@ -405,7 +405,7 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event) x = drag()->xmax(); drag()->target()->setX(x); } - if(d->dragY) { + if (d->dragY) { qreal y = (curLocalPos.y() - startLocalPos.y()) + d->startY; if (y < drag()->ymin()) y = drag()->ymin(); @@ -424,7 +424,7 @@ void QFxMouseRegion::mouseMoveEvent(QGraphicsSceneMouseEvent *event) void QFxMouseRegion::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) { Q_D(QFxMouseRegion); - if(!d->absorb) + if (!d->absorb) QFxItem::mouseReleaseEvent(event); else { d->saveEvent(event); @@ -438,7 +438,7 @@ void QFxMouseRegion::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) void QFxMouseRegion::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) { Q_D(QFxMouseRegion); - if(!d->absorb) + if (!d->absorb) QFxItem::mouseDoubleClickEvent(event); else { //d->inside = true; @@ -454,7 +454,7 @@ void QFxMouseRegion::mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) void QFxMouseRegion::hoverEnterEvent(QGraphicsSceneHoverEvent *event) { Q_D(QFxMouseRegion); - if(!d->absorb) + if (!d->absorb) QFxItem::hoverEnterEvent(event); else { setHovered(true); @@ -465,7 +465,7 @@ void QFxMouseRegion::hoverEnterEvent(QGraphicsSceneHoverEvent *event) void QFxMouseRegion::hoverLeaveEvent(QGraphicsSceneHoverEvent *event) { Q_D(QFxMouseRegion); - if(!d->absorb) + if (!d->absorb) QFxItem::hoverLeaveEvent(event); else { setHovered(false); @@ -525,7 +525,7 @@ bool QFxMouseRegion::pressed() void QFxMouseRegion::setHovered(bool h) { Q_D(QFxMouseRegion); - if(d->hovered != h) { + if (d->hovered != h) { d->hovered = h; emit hoveredChanged(); } @@ -536,10 +536,10 @@ void QFxMouseRegion::setPressed(bool p) Q_D(QFxMouseRegion); bool isclick = d->pressed == true && p == false && d->dragged == false && d->inside == true; - if(d->pressed != p) { + if (d->pressed != p) { d->pressed = p; QFxMouseEvent me(d->lastPos.x(), d->lastPos.y(), d->lastButton, d->lastButtons, d->lastModifiers, isclick, d->longPress); - if(d->pressed) { + if (d->pressed) { emit positionChanged(&me); emit pressed(&me); } else { diff --git a/src/declarative/fx/qfxparticles.cpp b/src/declarative/fx/qfxparticles.cpp index 03bd1e0..b6b4c85 100644 --- a/src/declarative/fx/qfxparticles.cpp +++ b/src/declarative/fx/qfxparticles.cpp @@ -413,17 +413,17 @@ void QFxParticlesPrivate::tick(int time) if (!addParticleTime) addParticleTime = time; - if(particles.count() < count && emitting) { + if (particles.count() < count && emitting) { qreal perc = (lifeSpanDev <= 0)?(1.):(qreal(time - addParticleTime) / qreal(lifeSpanDev)); int percCount = addParticleCount + (int)perc * (count - addParticleCount); int streamWidth = -1; - if(stream){ - if(streamDelay > time){ + if (stream){ + if (streamDelay > time){ streamWidth = 0; }else{ int missed = time - streamDelay; qreal streamWidthReal = qreal(count)/qreal(lifeSpan); - if(streamWidthReal < 1){ + if (streamWidthReal < 1){ streamDelay = time + (int)(1.0/streamWidthReal); streamWidth = 1; streamWidth += missed/streamDelay; @@ -576,7 +576,7 @@ QFxParticles::~QFxParticles() \property QFxParticles::src \brief the URL of the particle image. */ -QString QFxParticles::url() const +QString QFxParticles::source() const { Q_D(const QFxParticles); return d->source; @@ -593,7 +593,7 @@ void QFxParticles::imageLoaded() update(); } -void QFxParticles::setUrl(const QString &name) +void QFxParticles::setSource(const QString &name) { Q_D(QFxParticles); diff --git a/src/declarative/fx/qfxparticles.h b/src/declarative/fx/qfxparticles.h index d9c810d..0696e60 100644 --- a/src/declarative/fx/qfxparticles.h +++ b/src/declarative/fx/qfxparticles.h @@ -153,7 +153,7 @@ class Q_DECLARATIVE_EXPORT QFxParticles : public QFxItem { Q_OBJECT - Q_PROPERTY(QString src READ url WRITE setUrl); + Q_PROPERTY(QString source READ source WRITE setSource); Q_PROPERTY(int count READ count WRITE setCount); Q_PROPERTY(int lifeSpan READ lifeSpan WRITE setLifeSpan); Q_PROPERTY(int lifeSpanDeviation READ lifeSpanDeviation WRITE setLifeSpanDeviation); @@ -172,8 +172,8 @@ public: QFxParticles(QFxItem *parent=0); ~QFxParticles(); - QString url() const; - void setUrl(const QString &); + QString source() const; + void setSource(const QString &); int count() const; void setCount(int cnt); diff --git a/src/declarative/fx/qfxpath.cpp b/src/declarative/fx/qfxpath.cpp index 2009237..f08671d 100644 --- a/src/declarative/fx/qfxpath.cpp +++ b/src/declarative/fx/qfxpath.cpp @@ -185,7 +185,7 @@ QList<QFxPathElement *>* QFxPath::pathElements() void QFxPath::interpolate(int idx, const QString &name, qreal value) { Q_D(QFxPath); - if(!idx) + if (!idx) return; qreal lastValue = 0; @@ -193,7 +193,7 @@ void QFxPath::interpolate(int idx, const QString &name, qreal value) int search = idx - 1; while(search >= 0) { const AttributePoint &point = d->_attributePoints.at(search); - if(point.values.contains(name)) { + if (point.values.contains(name)) { lastValue = point.values.value(name); lastPercent = point.origpercent; break; @@ -205,7 +205,7 @@ void QFxPath::interpolate(int idx, const QString &name, qreal value) const AttributePoint &curPoint = d->_attributePoints.at(idx); - for(int ii = search; ii < idx; ++ii) { + for (int ii = search; ii < idx; ++ii) { AttributePoint &point = d->_attributePoints[ii]; qreal val = lastValue + (value - lastValue) * (point.origpercent - lastPercent) / (curPoint.origpercent - lastPercent); @@ -218,10 +218,10 @@ void QFxPath::endpoint(const QString &name) Q_D(QFxPath); const AttributePoint &first = d->_attributePoints.first(); qreal val = first.values.value(name); - for(int ii = d->_attributePoints.count() - 1; ii >= 0; ii--) { + for (int ii = d->_attributePoints.count() - 1; ii >= 0; ii--) { const AttributePoint &point = d->_attributePoints.at(ii); - if(point.values.contains(name)) { - for(int jj = ii + 1; jj < d->_attributePoints.count(); ++jj) { + if (point.values.contains(name)) { + for (int jj = ii + 1; jj < d->_attributePoints.count(); ++jj) { AttributePoint &setPoint = d->_attributePoints[jj]; setPoint.values.insert(name, val); } @@ -239,23 +239,23 @@ void QFxPath::processPath() d->_path = QPainterPath(); AttributePoint first; - for(int ii = 0; ii < d->_attributes.count(); ++ii) + for (int ii = 0; ii < d->_attributes.count(); ++ii) first.values[d->_attributes.at(ii)] = 0; d->_attributePoints << first; d->_path.moveTo(d->startX, d->startY); foreach (QFxPathElement *pathElement, d->_pathElements) { - if(QFxCurve *curve = qobject_cast<QFxCurve *>(pathElement)) { + if (QFxCurve *curve = qobject_cast<QFxCurve *>(pathElement)) { curve->addToPath(d->_path); AttributePoint p; p.origpercent = d->_path.length(); d->_attributePoints << p; - } else if(QFxPathAttribute *attribute = qobject_cast<QFxPathAttribute *>(pathElement)) { + } else if (QFxPathAttribute *attribute = qobject_cast<QFxPathAttribute *>(pathElement)) { AttributePoint &point = d->_attributePoints.last(); point.values[attribute->name()] = attribute->value(); interpolate(d->_attributePoints.count() - 1, attribute->name(), attribute->value()); - } else if(QFxPathPercent *percent = qobject_cast<QFxPathPercent *>(pathElement)) { + } else if (QFxPathPercent *percent = qobject_cast<QFxPathPercent *>(pathElement)) { AttributePoint &point = d->_attributePoints.last(); point.values[QLatin1String("_qfx_percent")] = percent->value(); interpolate(d->_attributePoints.count() - 1, QLatin1String("_qfx_percent"), percent->value()); @@ -264,8 +264,8 @@ void QFxPath::processPath() // Fixup end points const AttributePoint &last = d->_attributePoints.last(); - for(int ii = 0; ii < d->_attributes.count(); ++ii) { - if(!last.values.contains(d->_attributes.at(ii))) + for (int ii = 0; ii < d->_attributes.count(); ++ii) { + if (!last.values.contains(d->_attributes.at(ii))) endpoint(d->_attributes.at(ii)); } @@ -273,9 +273,9 @@ void QFxPath::processPath() qreal length = d->_path.length(); qreal prevpercent = 0; qreal prevorigpercent = 0; - for(int ii = 0; ii < d->_attributePoints.count(); ++ii) { + for (int ii = 0; ii < d->_attributePoints.count(); ++ii) { const AttributePoint &point = d->_attributePoints.at(ii); - if(point.values.contains(QLatin1String("_qfx_percent"))) { //special string for QFxPathPercent + if (point.values.contains(QLatin1String("_qfx_percent"))) { //special string for QFxPathPercent if ( ii > 0) { qreal scale = (d->_attributePoints[ii].origpercent/length - prevorigpercent) / (point.values.value(QLatin1String("_qfx_percent"))-prevpercent); @@ -300,7 +300,7 @@ void QFxPath::componentComplete() QSet<QString> attrs; // First gather up all the attributes foreach (QFxPathElement *pathElement, d->_pathElements) { - if(QFxPathAttribute *attribute = + if (QFxPathAttribute *attribute = qobject_cast<QFxPathAttribute *>(pathElement)) attrs.insert(attribute->name()); } @@ -383,10 +383,10 @@ void QFxPath::createPointCache() const //find which set we are in qreal prevPercent = 0; qreal prevOrigPercent = 0; - for(int ii = 0; ii < d->_attributePoints.count(); ++ii) { + for (int ii = 0; ii < d->_attributePoints.count(); ++ii) { qreal percent = qreal(i)/points; const AttributePoint &point = d->_attributePoints.at(ii); - if(percent < point.percent || ii == d->_attributePoints.count() - 1) { //### || is special case for very last item + if (percent < point.percent || ii == d->_attributePoints.count() - 1) { //### || is special case for very last item qreal elementPercent = (percent - prevPercent); qreal spc = prevOrigPercent + elementPercent * point.scale; @@ -430,15 +430,15 @@ QPointF QFxPath::pointAt(qreal p) const qreal QFxPath::attributeAt(const QString &name, qreal percent) const { Q_D(const QFxPath); - if(percent < 0 || percent > 1) + if (percent < 0 || percent > 1) return 0; - for(int ii = 0; ii < d->_attributePoints.count(); ++ii) { + for (int ii = 0; ii < d->_attributePoints.count(); ++ii) { const AttributePoint &point = d->_attributePoints.at(ii); - if(point.percent == percent) { + if (point.percent == percent) { return point.values.value(name); - } else if(point.percent > percent) { + } else if (point.percent > percent) { qreal lastValue = ii?(d->_attributePoints.at(ii - 1).values.value(name)):0; qreal lastPercent = diff --git a/src/declarative/fx/qfxpathview.cpp b/src/declarative/fx/qfxpathview.cpp index 59c7cd1..c0d3ab2 100644 --- a/src/declarative/fx/qfxpathview.cpp +++ b/src/declarative/fx/qfxpathview.cpp @@ -246,7 +246,7 @@ void QFxPathView::setCurrentIndex(int idx) d->currentIndex = idx; d->snapToCurrent(); int itemIndex = (idx - d->firstIndex + d->model->count()) % d->model->count(); - if(itemIndex < d->items.count()) + if (itemIndex < d->items.count()) d->items.at(itemIndex)->setFocus(true); emit currentIndexChanged(); } @@ -392,7 +392,7 @@ int QFxPathView::pathItemCount() const void QFxPathView::setPathItemCount(int i) { Q_D(QFxPathView); - if(i == d->pathItems) + if (i == d->pathItems) return; d->pathItems = i; d->regenerate(); @@ -553,7 +553,7 @@ bool QFxPathView::sendMouseEvent(QGraphicsSceneMouseEvent *event) bool QFxPathView::mouseFilter(QGraphicsSceneMouseEvent *e) { - if(!isVisible()) + if (!isVisible()) return false; switch (e->type()) { @@ -579,7 +579,7 @@ void QFxPathViewPrivate::regenerate() if (!model || model->count() <= 0 || !model->delegate() || !path) return; - for(int i=0; i<items.count(); i++){ + for (int i=0; i<items.count(); i++){ QFxItem *p = items[i]; q->attachedProperties.remove(p); model->release(p); @@ -592,7 +592,7 @@ void QFxPathViewPrivate::regenerate() int numItems = (pathItems>=0 ? pathItems : model->count()); qreal minDiff = 1e9; int minI = -1; - for(int i=0; i<numItems; i++){ + for (int i=0; i<numItems; i++){ QFxItem *item = model->item(i); if (!item) return; @@ -603,7 +603,7 @@ void QFxPathViewPrivate::regenerate() percent /= 100.0; updateItem(items.last(), percent); qreal diff = qAbs(percent - snapPos); - if(diff < minDiff){ + if (diff < minDiff){ minDiff = diff; minI = i; } @@ -615,8 +615,8 @@ void QFxPathViewPrivate::regenerate() void QFxPathViewPrivate::updateItem(QFxItem *item, qreal percent) { - if(QObject *obj = QFxPathView::attachedProperties.value(item)) { - foreach(QString attr, path->attributes()) + if (QObject *obj = QFxPathView::attachedProperties.value(item)) { + foreach(const QString &attr, path->attributes()) static_cast<QFxPathViewAttached *>(obj)->setValue(attr.toLatin1(), path->attributeAt(attr, percent)); } @@ -632,36 +632,36 @@ void QFxPathView::refill() return; QList<qreal> positions; - for(int i=0; i<d->items.count(); i++){ + for (int i=0; i<d->items.count(); i++){ qreal percent = i * (100. / d->items.count()); percent = percent + d->_offset; percent = fmod(percent,100.); positions << qAbs(percent/100.0); } - if(d->pathItems==-1){ - for(int i=0; i<positions.count(); i++){ + if (d->pathItems==-1){ + for (int i=0; i<positions.count(); i++){ d->updateItem(d->items.at(i), positions[i]); } return; } QList<qreal> rotatedPositions; - for(int i=0; i<d->items.count(); i++) + for (int i=0; i<d->items.count(); i++) rotatedPositions << positions[(i + d->pathOffset + d->items.count()) % d->items.count()]; int firstFind = -1; int i; - for(i=0; i<d->items.count()-1; i++) + for (i=0; i<d->items.count()-1; i++) { - if(rotatedPositions[i] > rotatedPositions[i+1]){ + if (rotatedPositions[i] > rotatedPositions[i+1]){ firstFind = i; break; } } - if(firstFind!=-1 ){ + if (firstFind!=-1 ){ //A wraparound has occured - if(firstFind<(d->items.count()/2)){ + if (firstFind<(d->items.count()/2)){ while(firstFind-- >= 0){ QFxItem* p = d->items.takeFirst(); attachedProperties.remove(p); @@ -681,21 +681,21 @@ void QFxPathView::refill() attachedProperties.remove(p); d->model->release(p); d->firstIndex--; - if(d->firstIndex<0) + if (d->firstIndex<0) d->firstIndex = d->model->count() - 1; d->items.prepend(d->model->item(d->firstIndex)); d->items.first()->setZ(d->firstIndex); d->items.first()->setParent(this); d->pathOffset--; - if(d->pathOffset<0) + if (d->pathOffset<0) d->pathOffset = d->items.count() - 1; } } - for(int i=0; i<d->items.count(); i++) + for (int i=0; i<d->items.count(); i++) rotatedPositions[i] = positions[(i + d->pathOffset + d->items.count()) % d->items.count()]; } - for(int i=0; i<d->items.count(); i++){ + for (int i=0; i<d->items.count(); i++){ d->updateItem(d->items.at(i), rotatedPositions[i]); } } @@ -712,26 +712,26 @@ int QFxPathViewPrivate::calcCurrentIndex() int current = -1; if (model && items.count()) { _offset = fmod(_offset, 100.0); - if(_offset < 0) + if (_offset < 0) _offset += 100.0; - if(pathItems == -1){ + if (pathItems == -1){ qreal delta = fmod(_offset - snapPos, 100.0); if (delta < 0) delta = 100.0 + delta; int ii = model->count() - qRound(delta * model->count() / 100); - if(ii < 0) + if (ii < 0) ii = 0; current = ii; }else{ qreal bestDiff=1e9; int bestI=-1; - for(int i=0; i<items.count(); i++){ + for (int i=0; i<items.count(); i++){ qreal percent = i * (100. / items.count()); percent = percent + _offset; percent = fmod(percent,100.); qreal diff = qAbs(snapPos - (percent/100.0)); - if(diff < bestDiff){ + if (diff < bestDiff){ bestDiff = diff; bestI = i; } @@ -755,7 +755,7 @@ void QFxPathViewPrivate::updateCurrent() if (model && idx != currentIndex) { currentIndex = idx; int itemIndex = (idx - firstIndex + model->count()) % model->count(); - if(itemIndex < items.count()) + if (itemIndex < items.count()) items.at(itemIndex)->setFocus(true); emit q->currentIndexChanged(); } @@ -783,7 +783,7 @@ void QFxPathViewPrivate::snapToCurrent() //Rounds is the number of times round to make the current item visible int rounds = itemIndex / items.count(); int otherWayRounds = (model->count() - (itemIndex))/items.count() + 1; - if(otherWayRounds < rounds) + if (otherWayRounds < rounds) rounds = -otherWayRounds; itemIndex += pathOffset; @@ -799,12 +799,12 @@ void QFxPathViewPrivate::snapToCurrent() tl.clear(); moveOffset.setValue(_offset); - if(rounds!=0){ + if (rounds!=0){ //Compensate if the targetOffset would bring the target it from off the screen qreal distance = targetOffset - _offset; - if(distance <= -50) + if (distance <= -50) rounds--; - if(distance > 50) + if (distance > 50) rounds++; tl.move(moveOffset, targetOffset + 100.0*(-rounds), QEasingCurve(QEasingCurve::InOutQuad), int(100*items.count()*qMax((qreal)(2.0/items.count()),(qreal)qAbs(rounds)))); diff --git a/src/declarative/fx/qfxpixmap.cpp b/src/declarative/fx/qfxpixmap.cpp index 5a08679..0d456c6 100644 --- a/src/declarative/fx/qfxpixmap.cpp +++ b/src/declarative/fx/qfxpixmap.cpp @@ -67,7 +67,7 @@ public: int refCount; void addRef() { ++refCount; } - void release() { Q_ASSERT(refCount > 0); --refCount; if(refCount == 0) { qfxPixmapCache.remove(key); delete this; } } + void release() { Q_ASSERT(refCount > 0); --refCount; if (refCount == 0) { qfxPixmapCache.remove(key); delete this; } } }; static QFxPixmapCacheItem qfxPixmapCacheDummyItem; @@ -104,7 +104,7 @@ QFxPixmap::QFxPixmap(const QUrl &url) #endif QString key = url.toString(); QFxPixmapCache::Iterator iter = qfxPixmapCache.find(key); - if(iter == qfxPixmapCache.end()) { + if (iter == qfxPixmapCache.end()) { qWarning() << "QFxPixmap: URL not loaded" << url; } else { QNetworkReply *reply = (*iter)->reply; @@ -180,10 +180,10 @@ QPixmap QFxPixmap::pixmap() const void QFxPixmap::setPixmap(const QPixmap &pix) { QFxPixmapCache::Iterator iter = qfxPixmapCache.find(QString::number(pix.cacheKey())); - if(iter == qfxPixmapCache.end()) { + if (iter == qfxPixmapCache.end()) { QFxPixmapCacheItem *item = new QFxPixmapCacheItem; item->key = QString::number(pix.cacheKey()); - if(d->pixmap) + if (d->pixmap) d->pixmap->release(); d->pixmap = item; d->pixmap->image = pix.toImage(); @@ -195,7 +195,7 @@ void QFxPixmap::setPixmap(const QPixmap &pix) #if 0 int size = 0; - for(QFxPixmapCache::Iterator iter = qfxPixmapCache.begin(); iter != qfxPixmapCache.end(); ++iter) { + for (QFxPixmapCache::Iterator iter = qfxPixmapCache.begin(); iter != qfxPixmapCache.end(); ++iter) { size += (*iter)->image.width() * (*iter)->image.height(); } qWarning() << qfxPixmapCache.count() << size; @@ -207,8 +207,8 @@ QFxPixmap::operator const QSimpleCanvasConfig::Image &() const #if defined(QFX_RENDER_OPENGL) return d->pixmap->image; #else - if(d->opaque) { - if(!d->pixmap->image.isNull() && d->pixmap->opaqueImage.isNull()) { + if (d->opaque) { + if (!d->pixmap->image.isNull() && d->pixmap->opaqueImage.isNull()) { #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::PixmapLoad> perf; #endif @@ -218,7 +218,7 @@ QFxPixmap::operator const QSimpleCanvasConfig::Image &() const } return d->pixmap->opaqueImage; } else { - if(!d->pixmap->image.isNull() && d->pixmap->image.format() != QImage::Format_ARGB32_Premultiplied) { + if (!d->pixmap->image.isNull() && d->pixmap->image.format() != QImage::Format_ARGB32_Premultiplied) { #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::PixmapLoad> perf; #endif @@ -238,7 +238,7 @@ void QFxPixmap::get(QmlEngine *engine, const QUrl& url, QObject* obj, const char { QString key = url.toString(); QFxPixmapCache::Iterator iter = qfxPixmapCache.find(key); - if(iter == qfxPixmapCache.end()) { + if (iter == qfxPixmapCache.end()) { QFxPixmapCacheItem *item = new QFxPixmapCacheItem; item->addRef(); // XXX - will never get deleted. Need to revisit caching item->key = key; @@ -274,7 +274,7 @@ void QFxPixmap::cancelGet(const QUrl& url, QObject* obj, const char* slot) { QString key = url.toString(); QFxPixmapCache::Iterator iter = qfxPixmapCache.find(key); - if(iter == qfxPixmapCache.end()) + if (iter == qfxPixmapCache.end()) return; if ((*iter)->reply) QObject::disconnect((*iter)->reply, SIGNAL(finished()), obj, slot); diff --git a/src/declarative/fx/qfxrect.cpp b/src/declarative/fx/qfxrect.cpp index a761ec5..2bfc149 100644 --- a/src/declarative/fx/qfxrect.cpp +++ b/src/declarative/fx/qfxrect.cpp @@ -238,7 +238,7 @@ QColor QFxRect::color() const void QFxRect::setColor(const QColor &c) { Q_D(QFxRect); - if(d->_color == c) + if (d->_color == c) return; d->_color = c; @@ -281,7 +281,7 @@ QColor QFxRect::tintColor() const void QFxRect::setTintColor(const QColor &c) { Q_D(QFxRect); - if(d->_tintColor == c) + if (d->_tintColor == c) return; d->_tintColor = c; @@ -290,11 +290,11 @@ void QFxRect::setTintColor(const QColor &c) QColor QFxRectPrivate::getColor() { - if(_tintColor.isValid()) { + if (_tintColor.isValid()) { int a = _tintColor.alpha(); - if(a == 0xFF) + if (a == 0xFF) return _tintColor; - else if(a == 0x00) + else if (a == 0x00) return _color; else { uint src = _tintColor.rgba(); @@ -304,7 +304,7 @@ QColor QFxRectPrivate::getColor() ((0xFF - a) * (dest & 0xFF00FF))) >> 8) & 0xFF00FF; res |= (((a * ((src >> 8) & 0xFF00FF)) + ((0xFF - a) * ((dest >> 8) & 0xFF00FF)))) & 0xFF00FF00; - if((src & 0xFF000000) == 0xFF000000) + if ((src & 0xFF000000) == 0xFF000000) res |= 0xFF000000; return QColor::fromRgba(res); @@ -344,7 +344,7 @@ QColor QFxRect::gradientColor() const void QFxRect::setGradientColor(const QColor &c) { Q_D(QFxRect); - if(d->_gradcolor == c) + if (d->_gradcolor == c) return; d->_gradcolor = c; @@ -438,14 +438,14 @@ void QFxRect::paintContents(QPainter &p) void QFxRect::drawRect(QPainter &p) { Q_D(QFxRect); - if(d->_gradcolor.isValid() /*|| p.usingQt() */) { + if (d->_gradcolor.isValid() /*|| p.usingQt() */) { // XXX This path is still slower than the image path // Image path won't work for gradients though p.save(); QPen pn(QColor(pen()->color()), pen()->width()); p.setRenderHint(QPainter::Antialiasing); p.setPen(pn); - if(d->_gradcolor.isValid()){ + if (d->_gradcolor.isValid()){ QLinearGradient grad(0, 0, 0, height()); grad.setColorAt(0, d->_color); grad.setColorAt(1, d->_gradcolor); @@ -453,7 +453,7 @@ void QFxRect::drawRect(QPainter &p) }else{ p.setBrush(d->_color); } - if(d->_radius) + if (d->_radius) p.drawRoundedRect(0, 0, width(), height(), d->_radius, d->_radius); else p.drawRect(0, 0, width(), height()); @@ -477,36 +477,36 @@ void QFxRect::drawRect(QPainter &p) p.drawImage(QRect(0, 0, offset, offset), d->_rectImage, QRect(0, 0, offset, offset)); // Upper middle - if(d->_rectImage.width() - xSide) + if (d->_rectImage.width() - xSide) p.drawImage(QRect(offset, 0, width() - xSide, offset), d->_rectImage, QRect(offset, 0, d->_rectImage.width() - xSide, offset)); // Upper right - if(d->_rectImage.width() - offset) { + if (d->_rectImage.width() - offset) { p.drawImage(QPoint(width()-offset, 0), d->_rectImage, QRect(d->_rectImage.width()-offset, 0, offset, offset)); } // Middle left - if(d->_rectImage.height() - ySide) + if (d->_rectImage.height() - ySide) p.drawImage(QRect(0, offset, offset, height() - ySide), d->_rectImage, QRect(0, offset, offset, d->_rectImage.height() - ySide)); // Middle - if(d->_rectImage.width() - xSide && d->_rectImage.height() - ySide) + if (d->_rectImage.width() - xSide && d->_rectImage.height() - ySide) p.drawImage(QRect(offset, offset, width() - xSide, height() - ySide), d->_rectImage, QRect(offset, offset, d->_rectImage.width() - xSide, d->_rectImage.height() - ySide)); // Midlle right - if(d->_rectImage.height() - ySide) + if (d->_rectImage.height() - ySide) p.drawImage(QRect(width()-offset, offset, offset, height() - ySide), d->_rectImage, QRect(d->_rectImage.width()-offset, offset, offset, d->_rectImage.height() - ySide)); // Lower left p.drawImage(QPoint(0, height() - offset), d->_rectImage, QRect(0, d->_rectImage.height() - offset, offset, offset)); // Lower Middle - if(d->_rectImage.width() - xSide) + if (d->_rectImage.width() - xSide) p.drawImage(QRect(offset, height() - offset, width() - xSide, offset), d->_rectImage, QRect(offset, d->_rectImage.height() - offset, d->_rectImage.width() - xSide, offset)); // Lower Right - if(d->_rectImage.width() - offset) + if (d->_rectImage.width() - offset) p.drawImage(QPoint(width()-offset, height() - offset), d->_rectImage, QRect(d->_rectImage.width()-offset, d->_rectImage.height() - offset, offset, offset)); } @@ -519,8 +519,8 @@ void QFxRect::drawRect(QPainter &p) void QFxRect::paintGLContents(GLPainter &p) { Q_D(QFxRect); - if(d->_radius == 0 && (!d->_pen || !d->_pen->isValid())) { - if(d->_gradcolor.isValid()) { + if (d->_radius == 0 && (!d->_pen || !d->_pen->isValid())) { + if (d->_gradcolor.isValid()) { float widthV = width(); float heightV = height(); @@ -582,7 +582,7 @@ void QFxRect::paintGLContents(GLPainter &p) float imgWidth = d->_rectTexture.width(); float imgHeight = d->_rectTexture.height(); - if(!imgWidth || !imgHeight) + if (!imgWidth || !imgHeight) return; float widthV = width(); @@ -607,7 +607,7 @@ void QFxRect::paintGLContents(GLPainter &p) imgbottom = heightV - offset; //Bug 231768: Inappropriate interpolation was occuring on 3x3 textures - if(offset==1) + if (offset==1) texleft=texright=textop=texbottom=0.5; float vert1[] = { 0, 0, @@ -686,7 +686,7 @@ void QFxRect::paintGLContents(GLPainter &p) glMatrixMode(GL_MODELVIEW); glLoadMatrixf(p.activeTransform.data()); - if(d->_radius == 0 && (!d->_pen || !d->_pen->isValid())) { + if (d->_radius == 0 && (!d->_pen || !d->_pen->isValid())) { GLfloat vertices[] = { 0, heightV, widthV, heightV, 0, 0, @@ -696,7 +696,7 @@ void QFxRect::paintGLContents(GLPainter &p) glVertexPointer(2,GL_FLOAT,0,vertices); QColor c; - if(d->_gradcolor.isValid()) + if (d->_gradcolor.isValid()) c = d->_color; else c = d->getColor(); @@ -707,7 +707,7 @@ void QFxRect::paintGLContents(GLPainter &p) float r2 = r; float g2 = g; float b2 = b; float a2 = a; - if(d->_gradcolor.isValid()) { + if (d->_gradcolor.isValid()) { r2 = d->_gradcolor.redF(); g2 = d->_gradcolor.greenF(); b2 = d->_gradcolor.blueF(); @@ -736,7 +736,7 @@ void QFxRect::paintGLContents(GLPainter &p) offset = d->pen()->width(); } - if(p.activeOpacity == 1.) { + if (p.activeOpacity == 1.) { GLint i = GL_REPLACE; glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &i); } else { @@ -747,7 +747,7 @@ void QFxRect::paintGLContents(GLPainter &p) float imgWidth = d->_rectTexture.width(); float imgHeight = d->_rectTexture.height(); - if(!imgWidth || !imgHeight) + if (!imgWidth || !imgHeight) return; float widthV = width(); diff --git a/src/declarative/fx/qfxrect_p.h b/src/declarative/fx/qfxrect_p.h index 3cb46fa..2fd555f 100644 --- a/src/declarative/fx/qfxrect_p.h +++ b/src/declarative/fx/qfxrect_p.h @@ -88,7 +88,7 @@ public: QColor _gradcolor; QColor _tintColor; QFxPen *pen() { - if(!_pen) { + if (!_pen) { Q_Q(QFxRect); _pen = new QFxPen; QObject::connect(_pen, SIGNAL(updated()), q, SLOT(doUpdate())); diff --git a/src/declarative/fx/qfxreflectionfilter.cpp b/src/declarative/fx/qfxreflectionfilter.cpp index 39342d7..e02bc16 100644 --- a/src/declarative/fx/qfxreflectionfilter.cpp +++ b/src/declarative/fx/qfxreflectionfilter.cpp @@ -135,7 +135,7 @@ qreal QFxReflectionFilter::alpha() const void QFxReflectionFilter::setAlpha(qreal a) { - if(d->alpha == a) return; + if (d->alpha == a) return; d->alpha = a; emit alphaChanged(a); update(); @@ -202,7 +202,7 @@ int QFxReflectionFilter::height() const void QFxReflectionFilter::setHeight(int h) { - if(d->height == h) return; + if (d->height == h) return; d->height = h; emit heightChanged(h); update(); @@ -219,7 +219,7 @@ int QFxReflectionFilter::offset() void QFxReflectionFilter::setOffset(int o) { - if(d->offset == o) return; + if (d->offset == o) return; d->offset = o; emit offsetChanged(o); update(); @@ -236,7 +236,7 @@ qreal QFxReflectionFilter::scale() const void QFxReflectionFilter::setScale(qreal s) { - if(d->scale == s) return; + if (d->scale == s) return; d->scale = s; emit scaleChanged(s); update(); @@ -259,12 +259,12 @@ void QFxReflectionFilter::filterGL(QSimpleCanvasItem::GLPainter &p) float height = r.height(); float refHeight = height; - if(d->height > 0) + if (d->height > 0) refHeight = min(height, d->height); QSimpleCanvas::Matrix simpMat; QSimpleCanvasItem *simpItem = 0; - if(isSimpleItem(&simpItem, &simpMat) && + if (isSimpleItem(&simpItem, &simpMat) && simpItem->glSimpleItemData(0, 0, 0, 0)) { GLfloat vertices[8]; @@ -276,7 +276,7 @@ void QFxReflectionFilter::filterGL(QSimpleCanvasItem::GLPainter &p) GLfloat opacity[4]; float invRefHeight = 1. / refHeight; - for(int ii = 0; ii < 4; ++ii) { + for (int ii = 0; ii < 4; ++ii) { float vertex = vertices[ii * 2 + 1]; float o = (1. - (height - vertex) * invRefHeight); opacity[ii] = o * d->alpha * p.activeOpacity; @@ -285,7 +285,7 @@ void QFxReflectionFilter::filterGL(QSimpleCanvasItem::GLPainter &p) QSimpleCanvas::Matrix trans = p.activeTransform; trans.rotate(180, 1, 0, 0); trans.translate(0, -r.height() - d->offset); - if(d->scale != 1) + if (d->scale != 1) trans.scale(1, d->scale, 1); trans.translate(0, -r.height()); trans *= simpMat; diff --git a/src/declarative/fx/qfxrepeater.cpp b/src/declarative/fx/qfxrepeater.cpp index 78e9f51..7ee949d 100644 --- a/src/declarative/fx/qfxrepeater.cpp +++ b/src/declarative/fx/qfxrepeater.cpp @@ -259,15 +259,15 @@ void QFxRepeater::regenerate() qDeleteAll(d->deletables); d->deletables.clear(); - if(!d->component || !itemParent() || !isComponentComplete()) + if (!d->component || !itemParent() || !isComponentComplete()) return; QFxItem *lastItem = this; - if(d->dataSource.type() == QVariant::StringList) { + if (d->dataSource.type() == QVariant::StringList) { QStringList sl = qvariant_cast<QStringList>(d->dataSource); - for(int ii = 0; ii < sl.size(); ++ii) { + for (int ii = 0; ii < sl.size(); ++ii) { QmlContext *ctxt = new QmlContext(qmlContext(this), this); d->deletables << ctxt; @@ -277,12 +277,12 @@ void QFxRepeater::regenerate() if (QFxItem *item = d->addItem(ctxt, lastItem)) lastItem = item; } - } else if(QmlMetaType::isList(d->dataSource)) { + } else if (QmlMetaType::isList(d->dataSource)) { int cnt = QmlMetaType::listCount(d->dataSource); - if(cnt <= 0) + if (cnt <= 0) return; - for(int ii = 0; ii < cnt; ++ii) { + for (int ii = 0; ii < cnt; ++ii) { QVariant v = QmlMetaType::listAt(d->dataSource, ii); QObject *o = QmlMetaType::toQObject(v); @@ -297,10 +297,10 @@ void QFxRepeater::regenerate() } } else if (QListModelInterface *model = qobject_cast<QListModelInterface*>(d->dataSource.value<QObject*>())) { int cnt = model->count(); - if(cnt <= 0) + if (cnt <= 0) return; - for(int ii = 0; ii < cnt; ++ii) { + for (int ii = 0; ii < cnt; ++ii) { QmlContext *ctxt = new QmlContext(qmlContext(this), this); d->deletables << ctxt; @@ -339,11 +339,11 @@ void QFxRepeater::regenerate() d->addItem(ctxt, lastItem); - } else if(d->dataSource.canConvert(QVariant::Int)){ + } else if (d->dataSource.canConvert(QVariant::Int)){ int count = qvariant_cast<int>(d->dataSource); - for(int ii = 0; ii < count; ++ii) { + for (int ii = 0; ii < count; ++ii) { QmlContext *ctxt = new QmlContext(qmlContext(this), this); d->deletables << ctxt; diff --git a/src/declarative/fx/qfxscalegrid.cpp b/src/declarative/fx/qfxscalegrid.cpp index d84f5e8..325f7d9 100644 --- a/src/declarative/fx/qfxscalegrid.cpp +++ b/src/declarative/fx/qfxscalegrid.cpp @@ -153,29 +153,29 @@ QFxGridScaledImage::QFxGridScaledImage(QIODevice *data) while(!data->atEnd()) { QString line = QString::fromUtf8(data->readLine().trimmed()); - if(line.isEmpty() || line.startsWith(QLatin1String("#"))) + if (line.isEmpty() || line.startsWith(QLatin1String("#"))) continue; QStringList list = line.split(QLatin1Char(':')); - if(list.count() != 2) + if (list.count() != 2) return; list[0] = list[0].trimmed(); list[1] = list[1].trimmed(); - if(list[0] == QLatin1String("gridLeft")) + if (list[0] == QLatin1String("gridLeft")) l = list[1].toInt(); - else if(list[0] == QLatin1String("gridRight")) + else if (list[0] == QLatin1String("gridRight")) r = list[1].toInt(); - else if(list[0] == QLatin1String("gridTop")) + else if (list[0] == QLatin1String("gridTop")) t = list[1].toInt(); - else if(list[0] == QLatin1String("gridBottom")) + else if (list[0] == QLatin1String("gridBottom")) b = list[1].toInt(); - else if(list[0] == QLatin1String("imageFile")) + else if (list[0] == QLatin1String("imageFile")) imgFile = list[1]; } - if(l < 0 || r < 0 || t < 0 || b < 0 || imgFile.isEmpty()) + if (l < 0 || r < 0 || t < 0 || b < 0 || imgFile.isEmpty()) return; _l = l; _r = r; _t = t; _b = b; diff --git a/src/declarative/fx/qfxshadowfilter.cpp b/src/declarative/fx/qfxshadowfilter.cpp index 3760a4d..38d1c31 100644 --- a/src/declarative/fx/qfxshadowfilter.cpp +++ b/src/declarative/fx/qfxshadowfilter.cpp @@ -122,7 +122,7 @@ int QFxShadowFilter::xOffset() const */ void QFxShadowFilter::setXOffset(int offset) { - if(d->x == offset) return; + if (d->x == offset) return; d->x = offset; emit offsetChanged(d->x, d->y); } @@ -138,7 +138,7 @@ int QFxShadowFilter::yOffset() const void QFxShadowFilter::setYOffset(int offset) { - if(d->y == offset) return; + if (d->y == offset) return; d->y = offset; emit offsetChanged(d->x, d->y); } diff --git a/src/declarative/fx/qfxtext.cpp b/src/declarative/fx/qfxtext.cpp index e7085d8..5cb31e1 100644 --- a/src/declarative/fx/qfxtext.cpp +++ b/src/declarative/fx/qfxtext.cpp @@ -165,7 +165,7 @@ void QFxText::setText(const QString &n) QFxPerfTimer<QFxPerf::QFxText_setText> st; #endif Q_D(QFxText); - if(d->text == n) + if (d->text == n) return; d->richText = Qt::mightBeRichText(n); // ### what's the cost? @@ -205,7 +205,7 @@ QString QFxText::text() const void QFxText::setColor(const QColor &color) { Q_D(QFxText); - if(d->color == color) + if (d->color == color) return; d->imgDirty = true; @@ -270,7 +270,7 @@ QFxText::TextStyle QFxText::style() const void QFxText::setStyle(QFxText::TextStyle style) { Q_D(QFxText); - if(d->style == style) + if (d->style == style) return; d->imgDirty = true; @@ -281,7 +281,7 @@ void QFxText::setStyle(QFxText::TextStyle style) void QFxText::setStyleColor(const QColor &color) { Q_D(QFxText); - if(d->styleColor == color) + if (d->styleColor == color) return; d->imgDirty = true; @@ -424,7 +424,7 @@ void QFxText::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QFxText); - if(newGeometry.width() != oldGeometry.width()) { + if (newGeometry.width() != oldGeometry.width()) { if (d->wrap || d->elideMode != Qt::ElideNone) { d->imgDirty = true; d->updateSize(); @@ -446,10 +446,10 @@ void QFxTextPrivate::updateSize() { Q_Q(QFxText); if (q->isComponentComplete()) { - if(text.isEmpty()) { + if (text.isEmpty()) { return; } - QFont f; if(_font) f = _font->font(); + QFont f; if (_font) f = _font->font(); QFontMetrics fm(f); int dy = q->height(); @@ -573,7 +573,7 @@ QSize QFxTextPrivate::setupTextLayout(QTextLayout *layout) Q_Q(QFxText); layout->setCacheEnabled(true); - QFont f; if(_font) f = _font->font(); + QFont f; if (_font) f = _font->font(); QFontMetrics fm = QFontMetrics(f); int leading = fm.leading(); @@ -613,7 +613,7 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle) { //do layout Q_Q(const QFxText); - QFont f; if(_font) f = _font->font(); + QFont f; if (_font) f = _font->font(); QString tmp = text; if (singleline && elideMode != Qt::ElideNone && q->widthValid()) { QFontMetrics fm(f); @@ -626,11 +626,11 @@ QImage QFxTextPrivate::wrappedTextImage(bool drawStyle) int x = 0; for (int i = 0; i < textLayout.lineCount(); ++i) { QTextLine line = textLayout.lineAt(i); - if(hAlign == QFxText::AlignLeft) { + if (hAlign == QFxText::AlignLeft) { x = 0; - } else if(hAlign == QFxText::AlignRight) { + } else if (hAlign == QFxText::AlignRight) { x = size.width() - (int)line.naturalTextWidth(); - } else if(hAlign == QFxText::AlignHCenter) { + } else if (hAlign == QFxText::AlignHCenter) { x = (size.width() - (int)line.naturalTextWidth()) / 2; } line.setPosition(QPoint(x, (int)line.y())); @@ -679,7 +679,7 @@ QImage QFxTextPrivate::richTextImage(bool drawStyle) void QFxTextPrivate::checkImgCache() { - if(!imgDirty) + if (!imgDirty) return; bool empty = text.isEmpty(); @@ -722,7 +722,7 @@ void QFxText::paintContents(QPainter &p) { Q_D(QFxText); d->checkImgCache(); - if(d->imgCache.isNull()) + if (d->imgCache.isNull()) return; int w = width(); @@ -763,7 +763,7 @@ void QFxText::paintGLContents(GLPainter &p) { Q_D(QFxText); d->checkImgCache(); - if(d->imgCache.isNull()) + if (d->imgCache.isNull()) return; int w = width(); @@ -826,7 +826,7 @@ void QFxText::paintGLContents(GLPainter &p) { Q_D(QFxText); d->checkImgCache(); - if(d->imgCache.isNull()) + if (d->imgCache.isNull()) return; int w = width(); @@ -875,7 +875,7 @@ void QFxText::paintGLContents(GLPainter &p) glMatrixMode(GL_MODELVIEW); glLoadMatrixf(p.activeTransform.data()); glEnable(GL_TEXTURE_2D); - if(p.activeOpacity == 1.) { + if (p.activeOpacity == 1.) { GLint i = GL_REPLACE; glTexEnviv(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, &i); } else { diff --git a/src/declarative/fx/qfxtext_p.h b/src/declarative/fx/qfxtext_p.h index 7be4309..4296891 100644 --- a/src/declarative/fx/qfxtext_p.h +++ b/src/declarative/fx/qfxtext_p.h @@ -98,7 +98,7 @@ public: QString text; QmlFont *font() { - if(!_font) { + if (!_font) { Q_Q(QFxText); _font = new QmlFont; QObject::connect(_font, SIGNAL(updated()), q, SLOT(fontChanged())); diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp index 7efb826..68aea01 100644 --- a/src/declarative/fx/qfxtextedit.cpp +++ b/src/declarative/fx/qfxtextedit.cpp @@ -270,7 +270,7 @@ QColor QFxTextEdit::color() const void QFxTextEdit::setColor(const QColor &color) { Q_D(QFxTextEdit); - if(d->color == color) + if (d->color == color) return; clearCache(); @@ -370,7 +370,7 @@ void QFxTextEdit::setWrap(bool w) void QFxTextEdit::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - if(newGeometry.width() != oldGeometry.width()) + if (newGeometry.width() != oldGeometry.width()) updateSize(); QFxImageItem::geometryChanged(newGeometry, oldGeometry); } diff --git a/src/declarative/fx/qfxtransform.cpp b/src/declarative/fx/qfxtransform.cpp index 3f54949..c355158 100644 --- a/src/declarative/fx/qfxtransform.cpp +++ b/src/declarative/fx/qfxtransform.cpp @@ -79,13 +79,22 @@ QSimpleCanvas::Matrix QFxTransform::transform() const void QFxTransform::update() { QFxItem *item = qobject_cast<QFxItem *>(parent()); - if(item) + if (item) item->updateTransform(); } /*! \qmlclass Axis - \brief An axis that can be used for rotation or translation. + \brief The Axis element defines an axis that can be used for rotation or translation. + + An axis is specified by 2 points in 3D space: a start point and + an end point. While technically the axis is the line running through these two points + (and thus many different sets of two points could define the same axis), the distance + between the points does matter for translation along an axis. + + \code + <Axis startX="0" startY="0" endX="20" endY="30"/> + \endcode */ QML_DEFINE_TYPE(QFxAxis, Axis); @@ -99,6 +108,13 @@ QFxAxis::~QFxAxis() { } +/*! + \qmlproperty real Axis::startX + \qmlproperty real Axis::startY + + The start point of the axis. The z-position of the start point is assumed to be 0, and cannot + be changed. +*/ qreal QFxAxis::startX() const { return _startX; @@ -121,6 +137,13 @@ void QFxAxis::setStartY(qreal y) emit updated(); } +/*! + \qmlproperty real Axis::endX + \qmlproperty real Axis::endY + \qmlproperty real Axis::endZ + + The end point of the axis. +*/ qreal QFxAxis::endX() const { return _endX; @@ -241,11 +264,11 @@ bool QFxRotation::isIdentity() const const qreal inv_dist_to_plane = 1. / 1024.; QTransform QFxRotation::transform() const { - if(_dirty) { + if (_dirty) { _transform = QTransform(); - if(!isIdentity()) { - if(angle() != 0.) { + if (!isIdentity()) { + if (angle() != 0.) { QTransform rotTrans; rotTrans.translate(-_axis.startX(), -_axis.startY()); QTransform rotTrans2; @@ -260,11 +283,11 @@ QTransform QFxRotation::transform() const qreal z = _axis.endZ(); qreal idtp = inv_dist_to_plane; - if(distanceToPlane() != 1024.) + if (distanceToPlane() != 1024.) idtp = 1. / distanceToPlane(); qreal len = x * x + y * y + z * z; - if(len != 1.) { + if (len != 1.) { len = ::sqrt(len); x /= len; y /= len; @@ -289,12 +312,12 @@ QTransform QFxRotation::transform() const #elif defined(QFX_RENDER_OPENGL) QMatrix4x4 QFxRotation::transform() const { - if(_dirty) { + if (_dirty) { _dirty = false; _transform = QMatrix4x4(); - if(!isIdentity()) { - if(angle() != 0.) { + if (!isIdentity()) { + if (angle() != 0.) { qreal x = _axis.endX() - _axis.startX(); qreal y = _axis.endY() - _axis.startY(); qreal z = _axis.endZ(); @@ -328,7 +351,7 @@ void QFxRotation::update() { _dirty = true; QFxItem *item = qobject_cast<QFxItem *>(parent()); - if(item) + if (item) item->updateTransform(); } @@ -405,11 +428,11 @@ bool QFxTranslation::isIdentity() const #if defined(QFX_RENDER_QPAINTER) QTransform QFxTranslation::transform() const { - if(_dirty) { + if (_dirty) { _transform = QTransform(); - if(!isIdentity()) { - if(distance() != 0.) { + if (!isIdentity()) { + if (distance() != 0.) { QTransform trans; trans.translate((_axis.endX() - _axis.startX()) * distance(), (_axis.endY() - _axis.startY()) * distance()); @@ -425,12 +448,12 @@ QTransform QFxTranslation::transform() const #elif defined(QFX_RENDER_OPENGL) QMatrix4x4 QFxRotation::transform() const { - if(_dirty) { + if (_dirty) { _dirty = false; _transform = QMatrix4x4(); - if(!isIdentity()) { - if(distance() != 0.) + if (!isIdentity()) { + if (distance() != 0.) _transform.translate((_axis.endX() - _axis.startX()) * distance(), (_axis.endY() - _axis.startY()) * distance(), (_axis.endZ()) * distance()); @@ -447,13 +470,13 @@ void QFxTranslation::update() _dirty = true; #if !defined(QFX_RENDER_OPENGL) - if(_axis.endZ() != 0. && distance() != 0.) { + if (_axis.endZ() != 0. && distance() != 0.) { qmlInfo(this) << "QTransform cannot translate along Z-axis."; } #endif QFxItem *item = qobject_cast<QFxItem *>(parent()); - if(item) + if (item) item->updateTransform(); } @@ -695,7 +718,7 @@ void QFxSquish::setbottomRight_y(qreal v) void QFxSquish::update() { QFxItem *item = qobject_cast<QFxItem *>(parent()); - if(item) + if (item) item->updateTransform(); } @@ -714,7 +737,7 @@ QMatrix4x4 QFxSquish::transform() const QTransform t; QMatrix4x4 rv; - if(QTransform::quadToQuad(poly, poly2, t)) + if (QTransform::quadToQuad(poly, poly2, t)) rv = QMatrix4x4(t); return rv; diff --git a/src/declarative/fx/qfxvisualitemmodel.cpp b/src/declarative/fx/qfxvisualitemmodel.cpp index e851bad..7d0d7a5 100644 --- a/src/declarative/fx/qfxvisualitemmodel.cpp +++ b/src/declarative/fx/qfxvisualitemmodel.cpp @@ -85,13 +85,13 @@ public: QmlListAccessor *m_modelList; int modelCount() const { - if(m_visualItemModel) + if (m_visualItemModel) return m_visualItemModel->count(); - if(m_listModelInterface) + if (m_listModelInterface) return m_listModelInterface->count(); - if(m_abstractItemModel) + if (m_abstractItemModel) return m_abstractItemModel->rowCount(); - if(m_modelList) + if (m_modelList) return m_modelList->count(); return 0; } @@ -162,10 +162,10 @@ int QFxVisualItemModelDataMetaObject::createProperty(const char *name, const cha return QmlOpenMetaObject::createProperty(name, type); } else { const QLatin1String sname(name); - for(QHash<int, QString>::ConstIterator iter = data->m_model->m_roleNames.begin(); + for (QHash<int, QString>::ConstIterator iter = data->m_model->m_roleNames.begin(); iter != data->m_model->m_roleNames.end(); ++iter) { - if(*iter == sname) + if (*iter == sname) return QmlOpenMetaObject::createProperty(name, type); } } @@ -184,10 +184,10 @@ QFxVisualItemModelDataMetaObject::propertyCreated(int, QMetaPropertyBuilder &pro && data->m_model->m_modelList) { return data->m_model->m_modelList->at(data->m_index); } else if (data->m_model->m_listModelInterface) { - for(QHash<int, QString>::ConstIterator iter = data->m_model->m_roleNames.begin(); + for (QHash<int, QString>::ConstIterator iter = data->m_model->m_roleNames.begin(); iter != data->m_model->m_roleNames.end(); ++iter) { - if(*iter == name) { + if (*iter == name) { roles.append(iter.key()); QHash<int,QVariant> values = data->m_model->m_listModelInterface->data(data->m_index, QList<int>() << iter.key()); if (values.isEmpty()) @@ -197,10 +197,10 @@ QFxVisualItemModelDataMetaObject::propertyCreated(int, QMetaPropertyBuilder &pro } } } else if (data->m_model->m_abstractItemModel) { - for(QHash<int, QString>::ConstIterator iter = data->m_model->m_roleNames.begin(); + for (QHash<int, QString>::ConstIterator iter = data->m_model->m_roleNames.begin(); iter != data->m_model->m_roleNames.end(); ++iter) { - if(*iter == name) { + if (*iter == name) { roles.append(iter.key()); QModelIndex index = data->m_model->m_abstractItemModel->index(data->m_index, 0); return data->m_model->m_abstractItemModel->data(index, iter.key()); @@ -297,7 +297,7 @@ QFxVisualItemModel::QFxVisualItemModel(QmlContext *ctxt) QFxVisualItemModel::~QFxVisualItemModel() { Q_D(QFxVisualItemModel); - if(d->m_modelList) + if (d->m_modelList) delete d->m_modelList; } @@ -311,7 +311,7 @@ void QFxVisualItemModel::setModel(const QVariant &model) { Q_D(QFxVisualItemModel); d->m_modelVariant = model; - if(d->m_listModelInterface) { + if (d->m_listModelInterface) { // Assume caller has released all items. QObject::disconnect(d->m_listModelInterface, SIGNAL(itemsChanged(int,int,QList<int>)), this, SLOT(_q_itemsChanged(int,int,QList<int>))); @@ -329,7 +329,7 @@ void QFxVisualItemModel::setModel(const QVariant &model) this, SLOT(_q_rowsRemoved(const QModelIndex &,int,int))); QObject::disconnect(d->m_abstractItemModel, SIGNAL(dataChanged(const QModelIndex&,const QModelIndex&)), this, SLOT(_q_dataChanged(const QModelIndex&,const QModelIndex&))); - } else if(d->m_visualItemModel) { + } else if (d->m_visualItemModel) { QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsInserted(int,int)), this, SIGNAL(itemsInserted(int,int))); QObject::disconnect(d->m_visualItemModel, SIGNAL(itemsRemoved(int,int)), @@ -343,9 +343,9 @@ void QFxVisualItemModel::setModel(const QVariant &model) if (object && (d->m_listModelInterface = qobject_cast<QListModelInterface *>(object))) { d->m_roles.clear(); d->m_roleNames.clear(); - if(d->m_listModelInterface) { + if (d->m_listModelInterface) { d->m_roles = d->m_listModelInterface->roles(); - for(int ii = 0; ii < d->m_roles.count(); ++ii) + for (int ii = 0; ii < d->m_roles.count(); ++ii) d->m_roleNames.insert(d->m_roles.at(ii), d->m_listModelInterface->toString(d->m_roles.at(ii))); } @@ -359,7 +359,7 @@ void QFxVisualItemModel::setModel(const QVariant &model) QObject::connect(d->m_listModelInterface, SIGNAL(itemsMoved(int,int,int)), this, SLOT(_q_itemsMoved(int,int,int))); - if(d->m_delegate && d->m_listModelInterface->count()) + if (d->m_delegate && d->m_listModelInterface->count()) emit itemsInserted(0, d->m_listModelInterface->count()); return; } else if (object && (d->m_abstractItemModel = qobject_cast<QAbstractItemModel *>(object))) { @@ -390,7 +390,7 @@ void QFxVisualItemModel::setModel(const QVariant &model) if (!d->m_modelList) d->m_modelList = new QmlListAccessor; d->m_modelList->setList(model); - if(d->m_delegate && d->modelCount()) + if (d->m_delegate && d->modelCount()) emit itemsInserted(0, d->modelCount()); } @@ -405,7 +405,7 @@ void QFxVisualItemModel::setDelegate(QmlComponent *delegate) Q_D(QFxVisualItemModel); d->m_delegate = delegate; - if(d->modelCount()) + if (d->modelCount()) emit itemsInserted(0, d->modelCount()); } @@ -430,7 +430,7 @@ int QFxVisualItemModel::count() const QFxItem *QFxVisualItemModel::item(int index, bool complete) { Q_D(QFxVisualItemModel); - if(d->m_visualItemModel) + if (d->m_visualItemModel) return d->m_visualItemModel->item(index, d->m_part.toLatin1(), complete); return item(index, QByteArray(), complete); } @@ -471,7 +471,7 @@ void QFxVisualItemModel::release(QFxItem *item) QObject *QFxVisualItemModel::parts() { Q_D(QFxVisualItemModel); - if(!d->m_parts) + if (!d->m_parts) d->m_parts = new QFxVisualItemModelParts(this); return d->m_parts; } @@ -479,18 +479,18 @@ QObject *QFxVisualItemModel::parts() QFxItem *QFxVisualItemModel::item(int index, const QByteArray &viewId, bool complete) { Q_D(QFxVisualItemModel); - if(d->m_visualItemModel) + if (d->m_visualItemModel) return d->m_visualItemModel->item(index, viewId, complete); - if(d->modelCount() <= 0 || !d->m_delegate) + if (d->modelCount() <= 0 || !d->m_delegate) return 0; QObject *nobj = 0; - if(d->m_cache.contains(index)) { + if (d->m_cache.contains(index)) { nobj = d->m_cache[index]; } else { QmlContext *ccontext = d->m_context; - if(!ccontext) ccontext = qmlContext(this); + if (!ccontext) ccontext = qmlContext(this); QmlContext *ctxt = new QmlContext(ccontext); QFxVisualItemModelData *data = new QFxVisualItemModelData(index, d); ctxt->setContextProperty(QLatin1String("model"), data); @@ -507,7 +507,7 @@ QFxItem *QFxVisualItemModel::item(int index, const QByteArray &viewId, bool comp QFxItem *item = qobject_cast<QFxItem *>(nobj); if (!item) { QmlPackage *package = qobject_cast<QmlPackage *>(nobj); - if(package) { + if (package) { QObject *o = package->part(QLatin1String(viewId)); item = qobject_cast<QFxItem *>(o); d->m_packaged[o] = package; @@ -520,7 +520,7 @@ QFxItem *QFxVisualItemModel::item(int index, const QByteArray &viewId, bool comp void QFxVisualItemModel::completeItem() { Q_D(QFxVisualItemModel); - if(d->m_visualItemModel) { + if (d->m_visualItemModel) { d->m_visualItemModel->completeItem(); return; } @@ -534,11 +534,11 @@ QVariant QFxVisualItemModel::evaluate(int index, const QString &expression, QObj if (d->m_visualItemModel) return d->m_visualItemModel->evaluate(index, expression, objectContext); - if((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate) + if ((!d->m_listModelInterface && !d->m_abstractItemModel) || !d->m_delegate) return QVariant(); QVariant value; - if(d->m_cache.contains(index)) { + if (d->m_cache.contains(index)) { QObject *nobj = d->m_cache[index]; QFxItem *item = qobject_cast<QFxItem *>(nobj); if (item) { @@ -548,7 +548,7 @@ QVariant QFxVisualItemModel::evaluate(int index, const QString &expression, QObj } } else { QmlContext *ccontext = d->m_context; - if(!ccontext) ccontext = qmlContext(this); + if (!ccontext) ccontext = qmlContext(this); QmlContext *ctxt = new QmlContext(ccontext); QFxVisualItemModelData *data = new QFxVisualItemModelData(index, d); ctxt->addDefaultObject(data); @@ -567,17 +567,17 @@ void QFxVisualItemModel::_q_itemsChanged(int index, int count, { Q_D(QFxVisualItemModel); // XXX - highly inefficient - for(int ii = index; ii < index + count; ++ii) { + for (int ii = index; ii < index + count; ++ii) { - if(d->m_cache.contains(ii)) { + if (d->m_cache.contains(ii)) { QObject *item = d->m_cache[ii]; QFxVisualItemModelData *data = d->data(item); - for(int prop = 0; prop < data->count(); ++prop) { + for (int prop = 0; prop < data->count(); ++prop) { int role = data->role(prop); - if(roles.contains(role)) { + if (roles.contains(role)) { if (d->m_listModelInterface) { data->setValue(prop, *d->m_listModelInterface->data(ii, QList<int>() << role).begin()); } else if (d->m_abstractItemModel) { @@ -596,10 +596,10 @@ void QFxVisualItemModel::_q_itemsInserted(int index, int count) Q_D(QFxVisualItemModel); // XXX - highly inefficient QHash<int, QObject *> items; - for(QHash<int, QObject *>::Iterator iter = d->m_cache.begin(); + for (QHash<int, QObject *>::Iterator iter = d->m_cache.begin(); iter != d->m_cache.end(); ) { - if(iter.key() >= index) { + if (iter.key() >= index) { QObject *item = *iter; int index = iter.key() + count; iter = d->m_cache.erase(iter); @@ -622,15 +622,15 @@ void QFxVisualItemModel::_q_itemsRemoved(int index, int count) Q_D(QFxVisualItemModel); // XXX - highly inefficient QHash<int, QObject *> items; - for(QHash<int, QObject *>::Iterator iter = d->m_cache.begin(); + for (QHash<int, QObject *>::Iterator iter = d->m_cache.begin(); iter != d->m_cache.end(); ) { - if(iter.key() >= index && iter.key() < index + count) { + if (iter.key() >= index && iter.key() < index + count) { QObject *item = *iter; iter = d->m_cache.erase(iter); items.insertMulti(-1, item); //XXX perhaps better to maintain separately QFxVisualItemModelData *data = d->data(item); data->setIndex(-1); - } else if(iter.key() >= index + count) { + } else if (iter.key() >= index + count) { QObject *item = *iter; int index = iter.key() - count; iter = d->m_cache.erase(iter); @@ -651,10 +651,10 @@ void QFxVisualItemModel::_q_itemsMoved(int from, int to, int count) Q_D(QFxVisualItemModel); // XXX - highly inefficient QHash<int, QObject *> items; - for(QHash<int, QObject *>::Iterator iter = d->m_cache.begin(); + for (QHash<int, QObject *>::Iterator iter = d->m_cache.begin(); iter != d->m_cache.end(); ) { - if(iter.key() >= from && iter.key() < from + count) { + if (iter.key() >= from && iter.key() < from + count) { QObject *item = *iter; int index = iter.key() - from + to; iter = d->m_cache.erase(iter); diff --git a/src/declarative/fx/qfxwebview.cpp b/src/declarative/fx/qfxwebview.cpp index 293c72b..b2ad06c 100644 --- a/src/declarative/fx/qfxwebview.cpp +++ b/src/declarative/fx/qfxwebview.cpp @@ -75,6 +75,73 @@ QML_DEFINE_TYPE(QFxWebView,WebView); static const int MAX_DOUBLECLICK_TIME=500; // XXX need better gesture system +class QFxWebSettings : public QObject { + Q_OBJECT + /* + StandardFont, + FixedFont, + SerifFont, + SansSerifFont, + CursiveFont, + FantasyFont + + MinimumFontSize, + MinimumLogicalFontSize, + DefaultFontSize, + DefaultFixedFontSize + */ + + Q_PROPERTY(bool autoLoadImages READ autoLoadImages WRITE setAutoLoadImages) + Q_PROPERTY(bool javascriptEnabled READ javascriptEnabled WRITE setJavascriptEnabled) + Q_PROPERTY(bool javaEnabled READ javaEnabled WRITE setJavaEnabled) + Q_PROPERTY(bool pluginsEnabled READ pluginsEnabled WRITE setPluginsEnabled) + Q_PROPERTY(bool privateBrowsingEnabled READ privateBrowsingEnabled WRITE setPrivateBrowsingEnabled) + Q_PROPERTY(bool javascriptCanOpenWindows READ javascriptCanOpenWindows WRITE setJavascriptCanOpenWindows) + Q_PROPERTY(bool javascriptCanAccessClipboard READ javascriptCanAccessClipboard WRITE setJavascriptCanAccessClipboard) + Q_PROPERTY(bool developerExtrasEnabled READ developerExtrasEnabled WRITE setDeveloperExtrasEnabled) + Q_PROPERTY(bool linksIncludedInFocusChain READ linksIncludedInFocusChain WRITE setLinksIncludedInFocusChain) + Q_PROPERTY(bool zoomTextOnly READ zoomTextOnly WRITE setZoomTextOnly) + Q_PROPERTY(bool printElementBackgrounds READ printElementBackgrounds WRITE setPrintElementBackgrounds) + Q_PROPERTY(bool offlineStorageDatabaseEnabled READ offlineStorageDatabaseEnabled WRITE setOfflineStorageDatabaseEnabled) + Q_PROPERTY(bool offlineWebApplicationCacheEnabled READ offlineWebApplicationCacheEnabled WRITE setOfflineWebApplicationCacheEnabled) + Q_PROPERTY(bool localStorageDatabaseEnabled READ localStorageDatabaseEnabled WRITE setLocalStorageDatabaseEnabled) + +public: + QFxWebSettings() {} + + bool autoLoadImages() const { return s->testAttribute(QWebSettings::AutoLoadImages); } + void setAutoLoadImages(bool on) { s->setAttribute(QWebSettings::AutoLoadImages, on); } + bool javascriptEnabled() const { return s->testAttribute(QWebSettings::JavascriptEnabled); } + void setJavascriptEnabled(bool on) { s->setAttribute(QWebSettings::JavascriptEnabled, on); } + bool javaEnabled() const { return s->testAttribute(QWebSettings::JavaEnabled); } + void setJavaEnabled(bool on) { s->setAttribute(QWebSettings::JavaEnabled, on); } + bool pluginsEnabled() const { return s->testAttribute(QWebSettings::PluginsEnabled); } + void setPluginsEnabled(bool on) { s->setAttribute(QWebSettings::PluginsEnabled, on); } + bool privateBrowsingEnabled() const { return s->testAttribute(QWebSettings::PrivateBrowsingEnabled); } + void setPrivateBrowsingEnabled(bool on) { s->setAttribute(QWebSettings::PrivateBrowsingEnabled, on); } + bool javascriptCanOpenWindows() const { return s->testAttribute(QWebSettings::JavascriptCanOpenWindows); } + void setJavascriptCanOpenWindows(bool on) { s->setAttribute(QWebSettings::JavascriptCanOpenWindows, on); } + bool javascriptCanAccessClipboard() const { return s->testAttribute(QWebSettings::JavascriptCanAccessClipboard); } + void setJavascriptCanAccessClipboard(bool on) { s->setAttribute(QWebSettings::JavascriptCanAccessClipboard, on); } + bool developerExtrasEnabled() const { return s->testAttribute(QWebSettings::DeveloperExtrasEnabled); } + void setDeveloperExtrasEnabled(bool on) { s->setAttribute(QWebSettings::DeveloperExtrasEnabled, on); } + bool linksIncludedInFocusChain() const { return s->testAttribute(QWebSettings::LinksIncludedInFocusChain); } + void setLinksIncludedInFocusChain(bool on) { s->setAttribute(QWebSettings::LinksIncludedInFocusChain, on); } + bool zoomTextOnly() const { return s->testAttribute(QWebSettings::ZoomTextOnly); } + void setZoomTextOnly(bool on) { s->setAttribute(QWebSettings::ZoomTextOnly, on); } + bool printElementBackgrounds() const { return s->testAttribute(QWebSettings::PrintElementBackgrounds); } + void setPrintElementBackgrounds(bool on) { s->setAttribute(QWebSettings::PrintElementBackgrounds, on); } + bool offlineStorageDatabaseEnabled() const { return s->testAttribute(QWebSettings::OfflineStorageDatabaseEnabled); } + void setOfflineStorageDatabaseEnabled(bool on) { s->setAttribute(QWebSettings::OfflineStorageDatabaseEnabled, on); } + bool offlineWebApplicationCacheEnabled() const { return s->testAttribute(QWebSettings::OfflineWebApplicationCacheEnabled); } + void setOfflineWebApplicationCacheEnabled(bool on) { s->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, on); } + bool localStorageDatabaseEnabled() const { return s->testAttribute(QWebSettings::LocalStorageDatabaseEnabled); } + void setLocalStorageDatabaseEnabled(bool on) { s->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, on); } + + QWebSettings *s; +}; + + class QFxWebViewPrivate : public QFxItemPrivate { Q_DECLARE_PUBLIC(QFxWebView) @@ -131,6 +198,7 @@ public: QUrl pending_url; QString pending_string; QByteArray pending_data; + mutable QFxWebSettings settings; }; @@ -293,7 +361,7 @@ QString QFxWebView::url() const void QFxWebView::setUrl(const QString &n) { Q_D(QFxWebView); - if(n == page()->mainFrame()->url().toString()) + if (n == page()->mainFrame()->url().toString()) return; page()->setViewportSize(QSize( @@ -331,7 +399,7 @@ int QFxWebView::idealWidth() const void QFxWebView::setIdealWidth(int iw) { Q_D(QFxWebView); - if(d->idealwidth == iw) return; + if (d->idealwidth == iw) return; d->idealwidth = iw; expandToWebPage(); emit idealWidthChanged(); @@ -354,7 +422,7 @@ int QFxWebView::idealHeight() const void QFxWebView::setIdealHeight(int ih) { Q_D(QFxWebView); - if(d->idealheight == ih) return; + if (d->idealheight == ih) return; d->idealheight = ih; expandToWebPage(); emit idealHeightChanged(); @@ -381,7 +449,7 @@ bool QFxWebView::interactive() const void QFxWebView::setInteractive(bool i) { Q_D(QFxWebView); - if(d->interactive == i) return; + if (d->interactive == i) return; d->interactive = i; emit interactiveChanged(); } @@ -403,7 +471,7 @@ bool QFxWebView::smooth() const void QFxWebView::setSmooth(bool i) { Q_D(QFxWebView); - if(d->smooth == i) return; + if (d->smooth == i) return; d->smooth = i; update(); } @@ -438,7 +506,7 @@ void QFxWebView::expandToWebPage() void QFxWebView::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { - if(newGeometry.size() != oldGeometry.size()) + if (newGeometry.size() != oldGeometry.size()) expandToWebPage(); QFxItem::geometryChanged(newGeometry, oldGeometry); } @@ -866,9 +934,6 @@ QWebPage *QFxWebView::page() const wp->setNetworkAccessManager(qmlEngine(this)->networkAccessManager()); - // XXX settable from QML? - wp->settings()->setAttribute(QWebSettings::PluginsEnabled, true); - self->setPage(wp); return wp; @@ -877,6 +942,13 @@ QWebPage *QFxWebView::page() const return d->page; } +// The QObject interface to settings(). +QObject *QFxWebView::settingsObject() const +{ + Q_D(const QFxWebView); + d->settings.s = page()->settings(); + return &d->settings; +} void QFxWebView::setPage(QWebPage *page) { @@ -1031,7 +1103,10 @@ public: QmlEngine *engine = qmlEngine(webview); component = new QmlComponent(engine, url, this); item = 0; - connect(engine, SIGNAL(statusChanged(Status)), this, SLOT(qmlLoaded())); + if (component->isReady()) + qmlLoaded(); + else + connect(component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(qmlLoaded())); } public Q_SLOTS: diff --git a/src/declarative/fx/qfxwebview.h b/src/declarative/fx/qfxwebview.h index 1eede52..6ba4601 100644 --- a/src/declarative/fx/qfxwebview.h +++ b/src/declarative/fx/qfxwebview.h @@ -103,6 +103,8 @@ class Q_DECLARATIVE_EXPORT QFxWebView : public QFxItem Q_PROPERTY(QObject* forward READ forwardAction) Q_PROPERTY(QObject* stop READ stopAction) + Q_PROPERTY(QObject* settings READ settingsObject) + public: QFxWebView(QFxItem *parent=0); ~QFxWebView(); @@ -164,6 +166,7 @@ public: QWebHistory *history() const; QWebSettings *settings() const; + QObject *settingsObject() const; QString status() const; diff --git a/src/declarative/fx/qfxwidgetcontainer.cpp b/src/declarative/fx/qfxwidgetcontainer.cpp index f86c8dc..fccdad1 100644 --- a/src/declarative/fx/qfxwidgetcontainer.cpp +++ b/src/declarative/fx/qfxwidgetcontainer.cpp @@ -78,16 +78,16 @@ QGraphicsWidget *QFxWidgetContainer::graphicsWidget() const */ void QFxWidgetContainer::setGraphicsWidget(QGraphicsWidget *widget) { - if(widget == _graphicsWidget) + if (widget == _graphicsWidget) return; _graphicsWidget = widget; QSimpleCanvas *c = canvas(); - if(!c) + if (!c) return; - if(c->canvasMode() != QSimpleCanvas::GraphicsView) { + if (c->canvasMode() != QSimpleCanvas::GraphicsView) { qWarning("QFxWidgetContainer: Cannot add a widget to a non-graphicsview canvas. You might need to set QFX_USE_GRAPHICSVIEW=1"); return; } @@ -98,7 +98,7 @@ void QFxWidgetContainer::setGraphicsWidget(QGraphicsWidget *widget) void QFxWidgetContainer::canvasChanged() { - if(_graphicsWidget) { + if (_graphicsWidget) { QGraphicsWidget *w = _graphicsWidget; _graphicsWidget = 0; setGraphicsWidget(w); diff --git a/src/declarative/opengl/glbasicshaders.cpp b/src/declarative/opengl/glbasicshaders.cpp index e95e53f..f546c0b 100644 --- a/src/declarative/opengl/glbasicshaders.cpp +++ b/src/declarative/opengl/glbasicshaders.cpp @@ -127,7 +127,7 @@ BlurTextureShader::BlurTextureShader() {\ mediump vec4 accum = vec4(0, 0, 0, 0); \ mediump vec2 offset; \ - if(horizontal) \ + if (horizontal) \ offset = vec2(blurStep, 0); \ else \ offset = vec2(0, blurStep); \ @@ -150,22 +150,22 @@ BlurTextureShader::BlurTextureShader() {\ mediump vec4 accum = vec4(0, 0, 0, 0); \ mediump vec2 offset; \ - if(horizontal) \ + if (horizontal) \ offset = vec2(blurStep, 0); \ else \ offset = vec2(0, blurStep); \ mediump float sum = 0.0; \ - for(int ii = 0; ii < blurSteps; ++ii) { \ + for (int ii = 0; ii < blurSteps; ++ii) { \ mediump float frac = float(blurSteps - ii) / float(blurSteps); \ mediump vec2 coord = myTexCoord + -float(ii) * offset; \ - if(coord.x >= 0.0 && coord.y >= 0.0 && coord.y <= 1.0 && coord.x <=1.0) \ + if (coord.x >= 0.0 && coord.y >= 0.0 && coord.y <= 1.0 && coord.x <=1.0) \ accum += texture2D(sampler2d, coord) * frac; \ sum += frac; \ } \ - for(int ii = 1; ii < blurSteps; ++ii) { \ + for (int ii = 1; ii < blurSteps; ++ii) { \ mediump float frac = float(blurSteps - ii) / float(blurSteps); \ mediump vec2 coord = myTexCoord + float(ii) * offset; \ - if(coord.x <= 1.0 && coord.y <= 1.0 && coord.x >= 0.0 && coord.y >= 0.0) \ + if (coord.x <= 1.0 && coord.y <= 1.0 && coord.x >= 0.0 && coord.y >= 0.0) \ accum += texture2D(sampler2d, coord) * frac; \ sum += frac; \ } \ @@ -207,7 +207,7 @@ void BlurTextureShader::setSteps(int s) void BlurTextureShader::setMode(Mode m) { - if(m == Horizontal) + if (m == Horizontal) setUniformValue(mode, 1); else setUniformValue(mode, 0); @@ -545,49 +545,49 @@ GLBasicShaders::~GLBasicShaders() BlurTextureShader *GLBasicShaders::blurTexture() { - if(!d->blurTexture) d->blurTexture = new BlurTextureShader(); + if (!d->blurTexture) d->blurTexture = new BlurTextureShader(); return d->blurTexture; } SingleTextureShader *GLBasicShaders::singleTexture() { - if(!d->singleTexture) d->singleTexture = new SingleTextureShader(); + if (!d->singleTexture) d->singleTexture = new SingleTextureShader(); return d->singleTexture; } SingleTextureOpacityShader *GLBasicShaders::singleTextureOpacity() { - if(!d->singleTextureOpacity) d->singleTextureOpacity = new SingleTextureOpacityShader(); + if (!d->singleTextureOpacity) d->singleTextureOpacity = new SingleTextureOpacityShader(); return d->singleTextureOpacity; } DualTextureAddShader *GLBasicShaders::dualTextureAdd() { - if(!d->dualTextureAdd) d->dualTextureAdd = new DualTextureAddShader(); + if (!d->dualTextureAdd) d->dualTextureAdd = new DualTextureAddShader(); return d->dualTextureAdd; } SingleTextureVertexOpacityShader *GLBasicShaders::singleTextureVertexOpacity() { - if(!d->singleTextureVertexOpacity) d->singleTextureVertexOpacity = new SingleTextureVertexOpacityShader(); + if (!d->singleTextureVertexOpacity) d->singleTextureVertexOpacity = new SingleTextureVertexOpacityShader(); return d->singleTextureVertexOpacity; } SingleTextureShadowShader *GLBasicShaders::singleTextureShadow() { - if(!d->singleTextureShadow) d->singleTextureShadow = new SingleTextureShadowShader(); + if (!d->singleTextureShadow) d->singleTextureShadow = new SingleTextureShadowShader(); return d->singleTextureShadow; } ConstantColorShader *GLBasicShaders::constantColor() { - if(!d->constantColor) d->constantColor = new ConstantColorShader(); + if (!d->constantColor) d->constantColor = new ConstantColorShader(); return d->constantColor; } ColorShader *GLBasicShaders::color() { - if(!d->color) d->color = new ColorShader(); + if (!d->color) d->color = new ColorShader(); return d->color; } diff --git a/src/declarative/opengl/glsave.h b/src/declarative/opengl/glsave.h index 3a67fb0..cca3d3c 100644 --- a/src/declarative/opengl/glsave.h +++ b/src/declarative/opengl/glsave.h @@ -82,7 +82,7 @@ public: ~GLSaveScissor() { - if(enabled) + if (enabled) glEnable(GL_SCISSOR_TEST); else glDisable(GL_SCISSOR_TEST); diff --git a/src/declarative/opengl/gltexture.cpp b/src/declarative/opengl/gltexture.cpp index 73deece..6d737ad 100644 --- a/src/declarative/opengl/gltexture.cpp +++ b/src/declarative/opengl/gltexture.cpp @@ -96,7 +96,7 @@ public: void GLTexturePrivate::genTexture() { - if(texture) + if (texture) return; glGenTextures(1, &texture); @@ -116,7 +116,7 @@ GLTexture::GLTexture(const QString &file) : d(new GLTexturePrivate(this)) { QImage img(file); - if(!img.isNull()) + if (!img.isNull()) setImage(img); } @@ -128,7 +128,7 @@ GLTexture::GLTexture(const QImage &img) GLTexture::~GLTexture() { - if(d->texture) + if (d->texture) glDeleteTextures(1, &d->texture); delete d; d = 0; @@ -141,7 +141,7 @@ bool GLTexture::isNull() const void GLTexture::clear() { - if(d->texture) { + if (d->texture) { glDeleteTextures(1, &d->texture); d->texture = 0; d->width = 0; @@ -168,7 +168,7 @@ static inline int npot(int size) */ void GLTexture::setImage(const QImage &img) { - if(img.isNull()) + if (img.isNull()) return; d->genTexture(); @@ -187,9 +187,9 @@ void GLTexture::setImage(const QImage &img) #if 0 glGenerateMipmap(GL_TEXTURE_2D); int e = glGetError(); - if(d->magFilter == Linear) + if (d->magFilter == Linear) setMagFilter(MipmapLinear); - if(d->minFilter == Linear) + if (d->minFilter == Linear) setMinFilter((GLTexture::FilterMode)GL_LINEAR_MIPMAP_LINEAR); #endif } @@ -228,7 +228,7 @@ int GLTexture::height() const */ void GLTexture::setSize(const QSize &size) { - if(size.width() <= 0 || size.height() <= 0) { + if (size.width() <= 0 || size.height() <= 0) { clear(); return; } @@ -253,13 +253,13 @@ GLTexture::WrapMode GLTexture::verticalWrap() const void GLTexture::setHorizontalWrap(WrapMode mode) { d->horizWrap = mode; - if(d->texture) { + if (d->texture) { GLint last; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last); - if(GLuint(last) != d->texture) + if (GLuint(last) != d->texture) glBindTexture(GL_TEXTURE_2D, d->texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, mode); - if(GLuint(last) != d->texture) + if (GLuint(last) != d->texture) glBindTexture(GL_TEXTURE_2D, last); } } @@ -270,13 +270,13 @@ void GLTexture::setHorizontalWrap(WrapMode mode) void GLTexture::setVerticalWrap(WrapMode mode) { d->vertWrap = mode; - if(d->texture) { + if (d->texture) { GLint last; glGetIntegerv(GL_TEXTURE_BINDING_2D, &last); - if(GLuint(last) != d->texture) + if (GLuint(last) != d->texture) glBindTexture(GL_TEXTURE_2D, d->texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, mode); - if(GLuint(last) != d->texture) + if (GLuint(last) != d->texture) glBindTexture(GL_TEXTURE_2D, last); } } @@ -293,10 +293,10 @@ GLTexture::FilterMode GLTexture::magFilter() const void GLTexture::setMinFilter(FilterMode f) { - if(d->minFilter == f) + if (d->minFilter == f) return; d->minFilter = f; - if(d->texture) { + if (d->texture) { glBindTexture(GL_TEXTURE_2D, d->texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, d->minFilter); } @@ -304,10 +304,10 @@ void GLTexture::setMinFilter(FilterMode f) void GLTexture::setMagFilter(FilterMode f) { - if(d->magFilter == f) + if (d->magFilter == f) return; d->magFilter = f; - if(d->texture) { + if (d->texture) { glBindTexture(GL_TEXTURE_2D, d->texture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, d->magFilter); } diff --git a/src/declarative/qml/parser/javascriptlexer.cpp b/src/declarative/qml/parser/javascriptlexer.cpp index 1cfb3b5..80a558d 100644 --- a/src/declarative/qml/parser/javascriptlexer.cpp +++ b/src/declarative/qml/parser/javascriptlexer.cpp @@ -789,7 +789,7 @@ int JavaScript::Lexer::lex() case Eof: return 0; case Other: - if(token == JavaScriptGrammar::T_RBRACE || token == JavaScriptGrammar::T_SEMICOLON) + if (token == JavaScriptGrammar::T_RBRACE || token == JavaScriptGrammar::T_SEMICOLON) delimited = true; return token; case Identifier: diff --git a/src/declarative/qml/qml.h b/src/declarative/qml/qml.h index 2d8d83e..1c662a7 100644 --- a/src/declarative/qml/qml.h +++ b/src/declarative/qml/qml.h @@ -100,10 +100,10 @@ QObject *qmlAttachedPropertiesObject(const QObject *obj) // ### is this threadsafe? static int idx = -1; - if(idx == -1) + if (idx == -1) idx = QmlMetaType::attachedPropertiesFuncId(&T::staticMetaObject); - if(idx == -1 || !obj) + if (idx == -1 || !obj) return 0; return qmlAttachedPropertiesObjectById(obj, idx); diff --git a/src/declarative/qml/qmlbindablevalue.cpp b/src/declarative/qml/qmlbindablevalue.cpp index c2632da..b312b40 100644 --- a/src/declarative/qml/qmlbindablevalue.cpp +++ b/src/declarative/qml/qmlbindablevalue.cpp @@ -80,7 +80,7 @@ void QmlBindableValue::setTarget(const QmlMetaProperty &prop) void QmlBindableValue::init() { - if(_inited) + if (_inited) return; _inited = true; update(); @@ -98,30 +98,30 @@ void QmlBindableValue::update() #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::BindableValueUpdate> bu; #endif - if(!_inited) + if (!_inited) return; - if(_property.propertyCategory() == QmlMetaProperty::List) { + if (_property.propertyCategory() == QmlMetaProperty::List) { QVariant value = this->value(); int listType = QmlMetaType::listType(_property.propertyType()); - if(value.userType() == qMetaTypeId<QList<QObject *> >()) { + if (value.userType() == qMetaTypeId<QList<QObject *> >()) { const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value); QVariant listVar = _property.read(); QmlMetaType::clear(listVar); - for(int ii = 0; ii < list.count(); ++ii) { + for (int ii = 0; ii < list.count(); ++ii) { QVariant v = QmlMetaType::fromObject(list.at(ii), listType); QmlMetaType::append(listVar, v); } - } else if(value.type() == uint(listType) || + } else if (value.type() == uint(listType) || value.userType() == listType) { QVariant listVar = _property.read(); QmlMetaType::clear(listVar); QmlMetaType::append(listVar, value); } - } else if(_property.propertyCategory() == QmlMetaProperty::QmlList) { + } else if (_property.propertyCategory() == QmlMetaProperty::QmlList) { // XXX - optimize! QVariant value = this->value(); QVariant list = _property.read(); @@ -137,13 +137,13 @@ void QmlBindableValue::update() const QMetaObject *objMo = obj->metaObject(); bool found = false; while(!found && objMo) { - if(objMo == mo) + if (objMo == mo) found = true; else objMo = objMo->superClass(); } - if(!found) { + if (!found) { qWarning() << "Unable to assign object to list"; return; } @@ -153,7 +153,7 @@ void QmlBindableValue::update() void *d = (void *)&obj; li->append(d); } - } else if(_property.propertyCategory() == QmlMetaProperty::Bindable) { + } else if (_property.propertyCategory() == QmlMetaProperty::Bindable) { // NOTE: We assume that only core properties can have // propertyType == Bindable @@ -166,12 +166,12 @@ void QmlBindableValue::update() _property.object()->qt_metacall(QMetaObject::WriteProperty, idx, a); - } else if(_property.propertyCategory() == QmlMetaProperty::Object) { + } else if (_property.propertyCategory() == QmlMetaProperty::Object) { QVariant value = this->value(); - if((int)value.type() != qMetaTypeId<QObject *>()) { - if(scriptWarnings()) { - if(!value.isValid()) { + if ((int)value.type() != qMetaTypeId<QObject *>()) { + if (scriptWarnings()) { + if (!value.isValid()) { qWarning() << "QmlBindableValue: Unable to assign invalid value to object property"; } else { qWarning() << "QmlBindableValue: Unable to assign non-object to object property"; @@ -194,7 +194,7 @@ void QmlBindableValue::update() _property.object()->qt_metacall(QMetaObject::WriteProperty, idx, a); - } else if(_property.propertyCategory() == QmlMetaProperty::Normal) { + } else if (_property.propertyCategory() == QmlMetaProperty::Normal) { QVariant value = this->value(); _property.write(value); } diff --git a/src/declarative/qml/qmlboundsignal.cpp b/src/declarative/qml/qmlboundsignal.cpp index 5359753..67e3dcf 100644 --- a/src/declarative/qml/qmlboundsignal.cpp +++ b/src/declarative/qml/qmlboundsignal.cpp @@ -59,7 +59,7 @@ QmlBoundSignal::QmlBoundSignal(QmlContext *ctxt, const QString &val, QObject *me // This is thread safe. Although it may be updated by two threads, they // will both set it to the same value - so the worst thing that can happen // is that they both do the work to figure it out. Boo hoo. - if(evaluateIdx == -1) evaluateIdx = QmlExpressionObject::staticMetaObject.indexOfMethod("value()"); + if (evaluateIdx == -1) evaluateIdx = QmlExpressionObject::staticMetaObject.indexOfMethod("value()"); setTrackChange(false); QFx_setParent_noEvent(this, parent); @@ -78,7 +78,7 @@ QmlBoundSignalProxy::QmlBoundSignalProxy(QmlContext *ctxt, const QString &val, Q int QmlBoundSignalProxy::qt_metacall(QMetaObject::Call c, int id, void **a) { - if(c == QMetaObject::InvokeMetaMethod && id == evaluateIdx) { + if (c == QMetaObject::InvokeMetaMethod && id == evaluateIdx) { params->setValues(a); value(); params->clearValues(); @@ -103,17 +103,17 @@ QmlBoundSignalParameters::QmlBoundSignalParameters(const QMetaMethod &method, QList<QByteArray> paramTypes = method.parameterTypes(); QList<QByteArray> paramNames = method.parameterNames(); types = new int[paramTypes.count()]; - for(int ii = 0; ii < paramTypes.count(); ++ii) { + for (int ii = 0; ii < paramTypes.count(); ++ii) { const QByteArray &type = paramTypes.at(ii); const QByteArray &name = paramNames.at(ii); - if(name.isEmpty() || type.isEmpty()) { + if (name.isEmpty() || type.isEmpty()) { types[ii] = 0; continue; } QVariant::Type t = (QVariant::Type)QMetaType::type(type.constData()); - if(QmlMetaType::isObject(t)) { + if (QmlMetaType::isObject(t)) { types[ii] = QMetaType::QObjectStar; QMetaPropertyBuilder prop = mob.addProperty(name, "QObject*"); prop.setWritable(false); @@ -147,7 +147,7 @@ void QmlBoundSignalParameters::clearValues() int QmlBoundSignalParameters::metaCall(QMetaObject::Call c, int id, void **a) { - if(c == QMetaObject::ReadProperty && id >= 1) { + if (c == QMetaObject::ReadProperty && id >= 1) { QmlMetaType::copy(types[id - 1], a[0], values[id]); return -1; } else { diff --git a/src/declarative/qml/qmlcompiledcomponent.cpp b/src/declarative/qml/qmlcompiledcomponent.cpp index a8b2be0..2c76f0c 100644 --- a/src/declarative/qml/qmlcompiledcomponent.cpp +++ b/src/declarative/qml/qmlcompiledcomponent.cpp @@ -56,21 +56,21 @@ QmlCompiledComponent::QmlCompiledComponent() QmlCompiledComponent::~QmlCompiledComponent() { - for(int ii = 0; ii < mos.count(); ++ii) + for (int ii = 0; ii < mos.count(); ++ii) qFree(mos.at(ii)); } void QmlCompiledComponent::dumpInstructions() { - if(!compilerDump()) + if (!compilerDump()) return; - if(!name.isEmpty()) + if (!name.isEmpty()) qWarning() << name; qWarning() << "Index\tLine\tOperation\t\tData1\tData2\t\tComments"; qWarning() << "-------------------------------------------------------------------------------"; - for(int ii = 0; ii < bytecode.count(); ++ii) { + for (int ii = 0; ii < bytecode.count(); ++ii) { dump(&bytecode[ii], ii); } qWarning() << "-------------------------------------------------------------------------------"; @@ -79,29 +79,29 @@ void QmlCompiledComponent::dumpInstructions() void QmlCompiledComponent::dump(int indent, Property *p) { QByteArray ba(indent * 4, ' '); - for(int ii = 0; ii < p->values.count(); ++ii) + for (int ii = 0; ii < p->values.count(); ++ii) dump(indent, p->values.at(ii)); - if(p->value) + if (p->value) dump(indent, p->value); } void QmlCompiledComponent::dump(int indent, Object *o) { QByteArray ba(indent * 4, ' '); - if(o->type != -1) { + if (o->type != -1) { qWarning() << ba.constData() << "Object:" << types.at(o->type).className; } else { qWarning() << ba.constData() << "Object: fetched"; } - for(QHash<QByteArray, Property *>::ConstIterator iter = o->properties.begin(); + for (QHash<QByteArray, Property *>::ConstIterator iter = o->properties.begin(); iter != o->properties.end(); ++iter) { qWarning() << ba.constData() << " Property" << iter.key(); dump(indent + 1, *iter); } - if(o->defaultProperty) { + if (o->defaultProperty) { qWarning() << ba.constData() << " Default property"; dump(indent + 1, o->defaultProperty); } @@ -142,7 +142,7 @@ void QmlCompiledComponent::dump(int indent, Value *v) }; QByteArray ba(indent * 4, ' '); - if(v->object) { + if (v->object) { qWarning() << ba.constData() << "Value (" << type << "):"; dump(indent + 1, v->object); } else { @@ -152,7 +152,7 @@ void QmlCompiledComponent::dump(int indent, Value *v) void QmlCompiledComponent::dumpPre() { - if(!(dumpStatus & DumpPre)) { + if (!(dumpStatus & DumpPre)) { dumpInstructions(); dumpStatus = (DumpStatus)(dumpStatus | DumpPre); } @@ -160,7 +160,7 @@ void QmlCompiledComponent::dumpPre() void QmlCompiledComponent::dumpPost() { - if(!(dumpStatus & DumpPost)) { + if (!(dumpStatus & DumpPost)) { dumpInstructions(); dumpStatus = (DumpStatus)(dumpStatus | DumpPost); } diff --git a/src/declarative/qml/qmlcompiler.cpp b/src/declarative/qml/qmlcompiler.cpp index d55647c..fae0f43 100644 --- a/src/declarative/qml/qmlcompiler.cpp +++ b/src/declarative/qml/qmlcompiler.cpp @@ -80,7 +80,7 @@ using namespace QmlParser; int QmlCompiledData::indexForString(const QString &data) { int idx = primitives.indexOf(data); - if(idx == -1) { + if (idx == -1) { idx = primitives.count(); primitives << data; } @@ -90,7 +90,7 @@ int QmlCompiledData::indexForString(const QString &data) int QmlCompiledData::indexForByteArray(const QByteArray &data) { int idx = datas.indexOf(data); - if(idx == -1) { + if (idx == -1) { idx = datas.count(); datas << data; } @@ -101,21 +101,21 @@ int QmlCompiledData::indexForFloat(float *data, int count) { Q_ASSERT(count > 0); - for(int ii = 0; ii < floatData.count() - count; ++ii) { + for (int ii = 0; ii < floatData.count() - count; ++ii) { bool found = true; - for(int jj = 0; jj < count; ++jj) { - if(floatData.at(ii + jj) != data[jj]) { + for (int jj = 0; jj < count; ++jj) { + if (floatData.at(ii + jj) != data[jj]) { found = false; break; } } - if(found) + if (found) return ii; } int idx = floatData.count(); - for(int ii = 0; ii < count; ++ii) + for (int ii = 0; ii < count; ++ii) floatData << data[ii]; return idx; @@ -125,21 +125,21 @@ int QmlCompiledData::indexForInt(int *data, int count) { Q_ASSERT(count > 0); - for(int ii = 0; ii < floatData.count() - count; ++ii) { + for (int ii = 0; ii < floatData.count() - count; ++ii) { bool found = true; - for(int jj = 0; jj < count; ++jj) { - if(intData.at(ii + jj) != data[jj]) { + for (int jj = 0; jj < count; ++jj) { + if (intData.at(ii + jj) != data[jj]) { found = false; break; } } - if(found) + if (found) return ii; } int idx = intData.count(); - for(int ii = 0; ii < count; ++ii) + for (int ii = 0; ii < count; ++ii) intData << data[ii]; return idx; @@ -167,12 +167,12 @@ QString QmlCompiler::errorDescription() const bool QmlCompiler::isValidId(const QString &val) { - if(val.isEmpty()) + if (val.isEmpty()) return false; QChar u(QLatin1Char('_')); - for(int ii = 0; ii < val.count(); ++ii) - if(val.at(ii) != u && + for (int ii = 0; ii < val.count(); ++ii) + if (val.at(ii) != u && ((ii == 0 && !val.at(ii).isLetter()) || (ii != 0 && !val.at(ii).isLetterOrNumber())) ) return false; @@ -208,15 +208,15 @@ QmlCompiler::generateStoreInstruction(QmlCompiledData &cdata, int coreIdx, int primitive, const QString *string) { - if(!prop.isWritable()) + if (!prop.isWritable()) return ReadOnly; - if(prop.isEnumType()) { + if (prop.isEnumType()) { int value; if (prop.isFlagType()) { value = prop.enumerator().keysToValue(string->toLatin1().constData()); } else value = prop.enumerator().keyToValue(string->toLatin1().constData()); - if(value == -1) + if (value == -1) return InvalidData; instr.type = QmlInstruction::StoreInteger; instr.storeInteger.propertyIndex = coreIdx; @@ -228,7 +228,7 @@ QmlCompiler::generateStoreInstruction(QmlCompiledData &cdata, case -1: instr.type = QmlInstruction::StoreVariant; instr.storeString.propertyIndex = coreIdx; - if(primitive == -1) + if (primitive == -1) primitive = cdata.indexForString(*string); instr.storeString.value = primitive; break; @@ -237,11 +237,11 @@ QmlCompiler::generateStoreInstruction(QmlCompiledData &cdata, { instr.type = QmlInstruction::StoreString; instr.storeString.propertyIndex = coreIdx; - if(string->startsWith(QLatin1Char('\'')) && string->endsWith(QLatin1Char('\''))) { + if (string->startsWith(QLatin1Char('\'')) && string->endsWith(QLatin1Char('\''))) { QString unquotedString = string->mid(1, string->length() - 2); primitive = cdata.indexForString(unquotedString); } else { - if(primitive == -1) + if (primitive == -1) primitive = cdata.indexForString(*string); } instr.storeString.value = primitive; @@ -395,7 +395,7 @@ QmlCompiler::generateStoreInstruction(QmlCompiledData &cdata, default: { int t = prop.type(); - if(t == QVariant::UserType) + if (t == QVariant::UserType) t = prop.userType(); QmlMetaType::StringConverter converter = QmlMetaType::customStringConverter(t); @@ -406,7 +406,7 @@ QmlCompiler::generateStoreInstruction(QmlCompiledData &cdata, instr.assignCustomType.valueIndex = index; QmlCompiledData::CustomTypeData data; - if(primitive == -1) + if (primitive == -1) primitive = cdata.indexForString(*string); data.index = primitive; data.type = t; @@ -428,8 +428,8 @@ void QmlCompiler::reset(QmlCompiledComponent *cc, bool deleteMemory) cc->intData.clear(); cc->customTypeData.clear(); cc->datas.clear(); - if(deleteMemory) { - for(int ii = 0; ii < cc->mos.count(); ++ii) + if (deleteMemory) { + for (int ii = 0; ii < cc->mos.count(); ++ii) qFree(cc->mos.at(ii)); } cc->mos.clear(); @@ -464,23 +464,23 @@ bool QmlCompiler::compile(QmlEngine *engine, output = out; // Compile types - for(int ii = 0; ii < unit->types.count(); ++ii) { + for (int ii = 0; ii < unit->types.count(); ++ii) { QmlCompositeTypeData::TypeReference &tref = unit->types[ii]; QmlCompiledComponent::TypeReference ref; - if(tref.type) + if (tref.type) ref.type = tref.type; - else if(tref.unit) { + else if (tref.unit) { ref.component = tref.unit->toComponent(engine); ref.ref = tref.unit; ref.ref->addref(); - } else if(tref.parser) + } else if (tref.parser) ref.parser = tref.parser; ref.className = unit->data.types().at(ii).toLatin1(); out->types << ref; } Object *root = unit->data.tree(); - if(!root) { + if (!root) { exceptionDescription = QLatin1String("Can't compile because of earlier errors"); output = 0; return false; @@ -488,7 +488,7 @@ bool QmlCompiler::compile(QmlEngine *engine, compileTree(root); - if(!isError()) { + if (!isError()) { out->dumpPre(); } else { reset(out, true); @@ -506,7 +506,7 @@ void QmlCompiler::compileTree(Object *tree) init.init.dataSize = 0; output->bytecode << init; - if(!compileObject(tree, 0)) // Compile failed + if (!compileObject(tree, 0)) // Compile failed return; QmlInstruction def; @@ -519,12 +519,12 @@ void QmlCompiler::compileTree(Object *tree) bool QmlCompiler::compileObject(Object *obj, int ctxt) { - if(obj->type != -1) { + if (obj->type != -1) { obj->metatype = QmlMetaType::metaObjectForType(output->types.at(obj->type).className); } - if(output->types.at(obj->type).className == "Component") { + if (output->types.at(obj->type).className == "Component") { COMPILE_CHECK(compileComponent(obj, ctxt)); return true; } @@ -535,24 +535,24 @@ bool QmlCompiler::compileObject(Object *obj, int ctxt) // doesn't have already have them bool ignoreProperties = false; bool ignoreSignals = false; - if(obj->metatype && obj->metatype->indexOfProperty(PROPERTIES_NAME) != -1) + if (obj->metatype && obj->metatype->indexOfProperty(PROPERTIES_NAME) != -1) ignoreProperties = true; - if(obj->metatype && obj->metatype->indexOfProperty(SIGNALS_NAME) != -1) + if (obj->metatype && obj->metatype->indexOfProperty(SIGNALS_NAME) != -1) ignoreSignals = true; Property *propertiesProperty = ignoreProperties?0:obj->getProperty(PROPERTIES_NAME, false); Property *signalsProperty = ignoreSignals?0:obj->getProperty(SIGNALS_NAME, false); - if(propertiesProperty) { + if (propertiesProperty) { obj->dynamicPropertiesProperty = propertiesProperty; obj->properties.remove(PROPERTIES_NAME); } - if(signalsProperty) { + if (signalsProperty) { obj->dynamicSignalsProperty = signalsProperty; obj->properties.remove(SIGNALS_NAME); } - if(obj->type != -1 && output->types.at(obj->type).parser) { + if (obj->type != -1 && output->types.at(obj->type).parser) { QByteArray data = obj->custom; int ref = output->indexForByteArray(data); @@ -573,15 +573,15 @@ bool QmlCompiler::compileObject(Object *obj, int ctxt) COMPILE_CHECK(compileDynamicPropertiesAndSignals(obj)); - if(obj->type != -1) { - if(output->types.at(obj->type).component) { + if (obj->type != -1) { + if (output->types.at(obj->type).component) { QmlInstruction begin; begin.type = QmlInstruction::TryBeginObject; begin.line = obj->line; output->bytecode << begin; } else { int cast = QmlMetaType::qmlParserStatusCast(QmlMetaType::type(output->types.at(obj->type).className)); - if(cast != -1) { + if (cast != -1) { QmlInstruction begin; begin.type = QmlInstruction::BeginObject; begin.begin.castValue = cast; @@ -592,9 +592,9 @@ bool QmlCompiler::compileObject(Object *obj, int ctxt) } foreach(Property *prop, obj->properties) { - if(!ignoreProperties && prop->name == PROPERTIES_NAME) { - } else if(!ignoreSignals && prop->name == SIGNALS_NAME) { - } else if(prop->name.length() >= 3 && prop->name.startsWith("on") && + if (!ignoreProperties && prop->name == PROPERTIES_NAME) { + } else if (!ignoreSignals && prop->name == SIGNALS_NAME) { + } else if (prop->name.length() >= 3 && prop->name.startsWith("on") && ('A' <= prop->name.at(2) && 'Z' >= prop->name.at(2))) { COMPILE_CHECK(compileSignal(prop, obj)); } else { @@ -602,18 +602,18 @@ bool QmlCompiler::compileObject(Object *obj, int ctxt) } } - if(obj->defaultProperty) + if (obj->defaultProperty) COMPILE_CHECK(compileProperty(obj->defaultProperty, obj, ctxt)); - if(obj->type != -1) { - if(output->types.at(obj->type).component) { + if (obj->type != -1) { + if (output->types.at(obj->type).component) { QmlInstruction complete; complete.type = QmlInstruction::TryCompleteObject; complete.line = obj->line; output->bytecode << complete; } else { int cast = QmlMetaType::qmlParserStatusCast(QmlMetaType::type(output->types.at(obj->type).className)); - if(cast != -1) { + if (cast != -1) { QmlInstruction complete; complete.type = QmlInstruction::CompleteObject; complete.complete.castValue = cast; @@ -629,30 +629,30 @@ bool QmlCompiler::compileObject(Object *obj, int ctxt) bool QmlCompiler::compileComponent(Object *obj, int ctxt) { Property *idProp = 0; - if(obj->properties.count() > 1 || + if (obj->properties.count() > 1 || (obj->properties.count() == 1 && obj->properties.begin().key() != "id")) COMPILE_EXCEPTION("Invalid component specification"); - if(obj->defaultProperty && + if (obj->defaultProperty && (obj->defaultProperty->value || obj->defaultProperty->values.count() > 1 || (obj->defaultProperty->values.count() == 1 && !obj->defaultProperty->values.first()->object))) COMPILE_EXCEPTION("Invalid component body specification"); - if(obj->properties.count()) + if (obj->properties.count()) idProp = *obj->properties.begin(); - if(idProp && (idProp->value || idProp->values.count() > 1)) + if (idProp && (idProp->value || idProp->values.count() > 1)) COMPILE_EXCEPTION("Invalid component id specification"); Object *root = 0; - if(obj->defaultProperty && obj->defaultProperty->values.count()) + if (obj->defaultProperty && obj->defaultProperty->values.count()) root = obj->defaultProperty->values.first()->object; COMPILE_CHECK(compileComponentFromRoot(root, ctxt)); - if(idProp && idProp->values.count()) { + if (idProp && idProp->values.count()) { QString val = idProp->values.at(0)->primitive; - if(!isValidId(val)) + if (!isValidId(val)) COMPILE_EXCEPTION("Invalid id property value"); - if(ids.contains(val)) + if (ids.contains(val)) COMPILE_EXCEPTION("id is not unique"); ids.insert(val); @@ -684,7 +684,7 @@ bool QmlCompiler::compileComponentFromRoot(Object *obj, int ctxt) QSet<QString> oldIds = ids; ids.clear(); - if(obj) + if (obj) COMPILE_CHECK(compileObject(obj, ctxt)); ids = oldIds; @@ -698,11 +698,11 @@ bool QmlCompiler::compileComponentFromRoot(Object *obj, int ctxt) bool QmlCompiler::compileFetchedObject(Object *obj, int ctxt) { - if(obj->defaultProperty) + if (obj->defaultProperty) COMPILE_CHECK(compileProperty(obj->defaultProperty, obj, ctxt)); foreach(Property *prop, obj->properties) { - if(prop->name.length() >= 3 && prop->name.startsWith("on") && + if (prop->name.length() >= 3 && prop->name.startsWith("on") && ('A' <= prop->name.at(2) && 'Z' >= prop->name.at(2))) { COMPILE_CHECK(compileSignal(prop, obj)); } else { @@ -715,18 +715,18 @@ bool QmlCompiler::compileFetchedObject(Object *obj, int ctxt) bool QmlCompiler::compileSignal(Property *prop, Object *obj) { - if(prop->values.isEmpty() && !prop->value) + if (prop->values.isEmpty() && !prop->value) return true; - if(prop->value || prop->values.count() > 1) + if (prop->value || prop->values.count() > 1) COMPILE_EXCEPTION("Incorrectly specified signal"); - if(prop->values.at(0)->object) { + if (prop->values.at(0)->object) { int pr = output->indexForByteArray(prop->name); bool rv = compileObject(prop->values.at(0)->object, 0); - if(rv) { + if (rv) { QmlInstruction assign; assign.type = QmlInstruction::AssignSignalObject; assign.line = prop->values.at(0)->line; @@ -741,10 +741,10 @@ bool QmlCompiler::compileSignal(Property *prop, Object *obj) } else { QString script = prop->values.at(0)->primitive.trimmed(); - if(script.isEmpty()) + if (script.isEmpty()) return true; - if(isBinding(script)) + if (isBinding(script)) COMPILE_EXCEPTION("Cannot assign binding to signal property"); int idx = output->indexForString(script); @@ -766,25 +766,25 @@ bool QmlCompiler::compileSignal(Property *prop, Object *obj) bool QmlCompiler::compileProperty(Property *prop, Object *obj, int ctxt) { - if(prop->values.isEmpty() && !prop->value) + if (prop->values.isEmpty() && !prop->value) return true; // First we're going to need a reference to this property - if(obj->type != -1) { + if (obj->type != -1) { const QMetaObject *mo = obj->metaObject(); - if(mo) { - if(prop->isDefault) { + if (mo) { + if (prop->isDefault) { QMetaProperty p = QmlMetaType::defaultProperty(mo); // XXX // Currently we don't handle enums in the static analysis // so we let them drop through to generateStoreInstruction() - if(p.name() && !p.isEnumType()) { + if (p.name() && !p.isEnumType()) { prop->index = mo->indexOfProperty(p.name()); prop->name = p.name(); int t = p.type(); - if(t == QVariant::UserType) + if (t == QVariant::UserType) t = p.userType(); prop->type = t; @@ -795,9 +795,9 @@ bool QmlCompiler::compileProperty(Property *prop, Object *obj, int ctxt) // XXX // Currently we don't handle enums in the static analysis // so we let them drop through to generateStoreInstruction() - if(p.name() && !p.isEnumType()) { + if (p.name() && !p.isEnumType()) { int t = p.type(); - if(t == QVariant::UserType) + if (t == QVariant::UserType) t = p.userType(); prop->type = t; @@ -806,41 +806,41 @@ bool QmlCompiler::compileProperty(Property *prop, Object *obj, int ctxt) } } else { const QMetaObject *mo = obj->metaObject(); - if(mo) { - if(prop->isDefault) { + if (mo) { + if (prop->isDefault) { QMetaProperty p = QmlMetaType::defaultProperty(mo); - if(p.name()) { + if (p.name()) { prop->index = mo->indexOfProperty(p.name()); prop->name = p.name(); } int t = p.type(); - if(t == QVariant::UserType) + if (t == QVariant::UserType) t = p.userType(); prop->type = t; } else { prop->index = mo->indexOfProperty(prop->name.constData()); QMetaProperty p = mo->property(prop->index); int t = p.type(); - if(t == QVariant::UserType) + if (t == QVariant::UserType) t = p.userType(); prop->type = t; } } } - if(prop->name == "id") { + if (prop->name == "id") { COMPILE_CHECK(compileIdProperty(prop, obj)); - } else if(isAttachedProperty(prop->name)) { + } else if (isAttachedProperty(prop->name)) { COMPILE_CHECK(compileAttachedProperty(prop, obj, ctxt)); - } else if(prop->value) { + } else if (prop->value) { COMPILE_CHECK(compileNestedProperty(prop, ctxt)); - } else if(QmlMetaType::isQmlList(prop->type) || + } else if (QmlMetaType::isQmlList(prop->type) || QmlMetaType::isList(prop->type)) { COMPILE_CHECK(compileListProperty(prop, obj, ctxt)); @@ -857,24 +857,24 @@ bool QmlCompiler::compileProperty(Property *prop, Object *obj, int ctxt) bool QmlCompiler::compileIdProperty(QmlParser::Property *prop, QmlParser::Object *obj) { - if(prop->value) + if (prop->value) COMPILE_EXCEPTION("The 'id' property cannot be fetched"); - if(prop->values.count() > 1) + if (prop->values.count() > 1) COMPILE_EXCEPTION("The 'id' property cannot be multiset"); - if(prop->values.count() == 1) { - if(prop->values.at(0)->object) + if (prop->values.count() == 1) { + if (prop->values.at(0)->object) COMPILE_EXCEPTION("Cannot assign an object as an id"); QString val = prop->values.at(0)->primitive; - if(!isValidId(val)) + if (!isValidId(val)) COMPILE_EXCEPTION(val << "is not a valid id"); - if(ids.contains(val)) + if (ids.contains(val)) COMPILE_EXCEPTION("id is not unique"); ids.insert(val); int pref = output->indexForString(val); - if(prop->type == QVariant::String) { + if (prop->type == QVariant::String) { QmlInstruction assign; assign.type = QmlInstruction::StoreString; assign.storeString.propertyIndex = prop->index; @@ -905,14 +905,14 @@ bool QmlCompiler::compileAttachedProperty(QmlParser::Property *prop, QmlParser::Object *obj, int ctxt) { - if(!prop->value) + if (!prop->value) COMPILE_EXCEPTION("Incorrect usage of an attached property"); QmlInstruction fetch; fetch.type = QmlInstruction::FetchAttached; fetch.line = prop->line; int id = QmlMetaType::attachedPropertiesFuncId(prop->name); - if(id == -1) + if (id == -1) COMPILE_EXCEPTION("Non-existant attached property object" << prop->name); fetch.fetchAttached.id = id; output->bytecode << fetch; @@ -930,11 +930,11 @@ bool QmlCompiler::compileAttachedProperty(QmlParser::Property *prop, bool QmlCompiler::compileNestedProperty(QmlParser::Property *prop, int ctxt) { - if(prop->type != 0) + if (prop->type != 0) prop->value->metatype = QmlMetaType::metaObjectForType(prop->type); QmlInstruction fetch; - if(prop->index != -1 && + if (prop->index != -1 && QmlMetaType::isObject(prop->value->metatype)) { fetch.type = QmlInstruction::FetchObject; fetch.fetch.property = prop->index; @@ -961,7 +961,7 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop, int ctxt) { int t = prop->type; - if(QmlMetaType::isQmlList(t)) { + if (QmlMetaType::isQmlList(t)) { QmlInstruction fetch; fetch.line = prop->line; fetch.type = QmlInstruction::FetchQmlList; @@ -969,9 +969,9 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop, fetch.fetchQmlList.type = QmlMetaType::qmlListType(t); output->bytecode << fetch; - for(int ii = 0; ii < prop->values.count(); ++ii) { + for (int ii = 0; ii < prop->values.count(); ++ii) { Value *v = prop->values.at(ii); - if(v->object) { + if (v->object) { v->type = Value::CreatedObject; COMPILE_CHECK(compileObject(v->object, ctxt)); QmlInstruction assign; @@ -999,9 +999,9 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop, output->bytecode << fetch; bool assignedBinding = false; - for(int ii = 0; ii < prop->values.count(); ++ii) { + for (int ii = 0; ii < prop->values.count(); ++ii) { Value *v = prop->values.at(ii); - if(v->object) { + if (v->object) { v->type = Value::CreatedObject; COMPILE_CHECK(compileObject(v->object, ctxt)); QmlInstruction assign; @@ -1010,8 +1010,8 @@ bool QmlCompiler::compileListProperty(QmlParser::Property *prop, assign.assignObject.property = output->indexForByteArray(prop->name); assign.assignObject.castValue = 0; output->bytecode << assign; - } else if(isBinding(v->primitive)) { - if(assignedBinding) + } else if (isBinding(v->primitive)) { + if (assignedBinding) COMPILE_EXCEPTION("Can only assign one binding to lists"); compileBinding(v->primitive, prop, ctxt, obj->metaObject(), v->line); @@ -1033,9 +1033,9 @@ bool QmlCompiler::compilePropertyAssignment(QmlParser::Property *prop, QmlParser::Object *obj, int ctxt) { - for(int ii = 0; ii < prop->values.count(); ++ii) { + for (int ii = 0; ii < prop->values.count(); ++ii) { Value *v = prop->values.at(ii); - if(v->object) { + if (v->object) { COMPILE_CHECK(compilePropertyObjectAssignment(prop, obj, v, ctxt)); @@ -1054,10 +1054,10 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop, QmlParser::Value *v, int ctxt) { - if(v->object->type != -1) + if (v->object->type != -1) v->object->metatype = QmlMetaType::metaObjectForType(output->types.at(v->object->type).className); - if(v->object->metaObject()) { + if (v->object->metaObject()) { const QMetaObject *propmo = QmlMetaType::rawMetaObjectForType(prop->type); @@ -1065,7 +1065,7 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop, bool isPropertyValue = false; bool isAssignable = false; - if(propmo) { + if (propmo) { // We want to raw metaObject here as the raw metaobject is the // actual property type before we applied any extensions const QMetaObject *c = v->object->metatype; @@ -1082,14 +1082,14 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop, } } - if(!propmo && !isPropertyValue) { + if (!propmo && !isPropertyValue) { COMPILE_CHECK(compileObject(v->object, ctxt)); QmlInstruction assign; assign.type = QmlInstruction::AssignObject; assign.line = v->object->line; assign.assignObject.castValue = 0; - if(prop->isDefault) + if (prop->isDefault) assign.assignObject.property = -1; else assign.assignObject.property = @@ -1097,7 +1097,7 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop, output->bytecode << assign; v->type = Value::CreatedObject; - } else if(isAssignable) { + } else if (isAssignable) { COMPILE_CHECK(compileObject(v->object, ctxt)); QmlInstruction assign; @@ -1109,7 +1109,7 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop, output->bytecode << assign; v->type = Value::CreatedObject; - } else if(propmo == &QmlComponent::staticMetaObject) { + } else if (propmo == &QmlComponent::staticMetaObject) { COMPILE_CHECK(compileComponentFromRoot(v->object, ctxt)); @@ -1122,7 +1122,7 @@ bool QmlCompiler::compilePropertyObjectAssignment(QmlParser::Property *prop, output->bytecode << assign; v->type = Value::Component; - } else if(isPropertyValue) { + } else if (isPropertyValue) { COMPILE_CHECK(compileObject(v->object, ctxt)); if (prop->index != -1) { @@ -1165,7 +1165,7 @@ bool QmlCompiler::compilePropertyLiteralAssignment(QmlParser::Property *prop, QmlParser::Value *v, int ctxt) { - if(isBinding(v->primitive)) { + if (isBinding(v->primitive)) { compileBinding(v->primitive, prop, ctxt, obj->metaObject(), v->line); @@ -1177,28 +1177,28 @@ bool QmlCompiler::compilePropertyLiteralAssignment(QmlParser::Property *prop, assign.line = v->line; bool doassign = true; - if(prop->index != -1) { + if (prop->index != -1) { StoreInstructionResult r = generateStoreInstruction(*output, assign, obj->metaObject()->property(prop->index), prop->index, -1, &v->primitive); - if(r == Ok) { + if (r == Ok) { doassign = false; - } else if(r == InvalidData) { + } else if (r == InvalidData) { //### we are restricted to a rather generic message here. If we can find a way to move // the exception into generateStoreInstruction we could potentially have better messages. // (the problem is that both compile and run exceptions can be generated, though) COMPILE_EXCEPTION("Cannot assign value" << v->primitive << "to property" << obj->metaObject()->property(prop->index).name()); doassign = false; - } else if(r == ReadOnly) { + } else if (r == ReadOnly) { COMPILE_EXCEPTION("Cannot assign value" << v->primitive << "to the read-only property" << obj->metaObject()->property(prop->index).name()); } else { doassign = true; } } - if(doassign) { + if (doassign) { assign.type = QmlInstruction::AssignConstant; - if(prop->isDefault) { + if (prop->isDefault) { assign.assignConstant.property = -1; } else { assign.assignConstant.property = @@ -1238,17 +1238,17 @@ bool QmlCompiler::findDynamicProperties(QmlParser::Property *prop, sizeof(propTypeNameToTypes[0]); - if(prop->value) + if (prop->value) COMPILE_EXCEPTION("Invalid property specification"); bool seenDefault = false; - for(int ii = 0; ii < prop->values.count(); ++ii) { + for (int ii = 0; ii < prop->values.count(); ++ii) { QmlParser::Value *val = prop->values.at(ii); - if(!val->object) + if (!val->object) COMPILE_EXCEPTION("Invalid property specification"); QmlParser::Object *obj = val->object; - if(obj->type == -1 || output->types.at(obj->type).className != "Property") + if (obj->type == -1 || output->types.at(obj->type).className != "Property") COMPILE_EXCEPTION("Use Property tag to specify properties"); @@ -1259,75 +1259,75 @@ bool QmlCompiler::findDynamicProperties(QmlParser::Property *prop, Object::DynamicProperty propDef; - for(QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = + for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = obj->properties.begin(); iter != obj->properties.end(); ++iter) { QmlParser::Property *property = *iter; - if(property->name == "name") { + if (property->name == "name") { if (seen & Name) COMPILE_EXCEPTION("May only specify Property name once"); seen = (Seen)(seen | Name); - if(property->value || property->values.count() != 1 || + if (property->value || property->values.count() != 1 || property->values.at(0)->object) COMPILE_EXCEPTION("Invalid Property name"); propDef.name = property->values.at(0)->primitive.toLatin1(); - } else if(property->name == "type") { + } else if (property->name == "type") { if (seen & Type) COMPILE_EXCEPTION("May only specify Property type once"); seen = (Seen)(seen | Type); - if(property->value || property->values.count() != 1 || + if (property->value || property->values.count() != 1 || property->values.at(0)->object) COMPILE_EXCEPTION("Invalid Property type"); QString type = property->values.at(0)->primitive.toLower(); bool found = false; - for(int ii = 0; !found && ii < propTypeNameToTypesCount; ++ii) { - if(type == QLatin1String(propTypeNameToTypes[ii].name)){ + for (int ii = 0; !found && ii < propTypeNameToTypesCount; ++ii) { + if (type == QLatin1String(propTypeNameToTypes[ii].name)){ found = true; propDef.type = propTypeNameToTypes[ii].type; } } - if(!found) + if (!found) COMPILE_EXCEPTION("Invalid Property type"); - } else if(property->name == "value") { + } else if (property->name == "value") { if (seen & Value) COMPILE_EXCEPTION("May only specify Property value once"); seen = (Seen)(seen | Value); propDef.defaultValue = property; - } else if(property->name == "onValueChanged") { + } else if (property->name == "onValueChanged") { if (seen & ValueChanged) COMPILE_EXCEPTION("May only specify Property onValueChanged once"); seen = (Seen)(seen | ValueChanged); - if(property->value || property->values.count() != 1 || + if (property->value || property->values.count() != 1 || property->values.at(0)->object) COMPILE_EXCEPTION("Invalid Property onValueChanged"); propDef.onValueChanged = property->values.at(0)->primitive; - } else if(property->name == "default") { - if(seen & Default) + } else if (property->name == "default") { + if (seen & Default) COMPILE_EXCEPTION("May only specify Property default once"); seen = (Seen)(seen | Default); - if(property->value || property->values.count() != 1 || + if (property->value || property->values.count() != 1 || property->values.at(0)->object) COMPILE_EXCEPTION("Invalid Property default"); bool defaultValue = QmlStringConverters::boolFromString(property->values.at(0)->primitive); propDef.isDefaultProperty = defaultValue; - if(defaultValue) { - if(seenDefault) + if (defaultValue) { + if (seenDefault) COMPILE_EXCEPTION("Only one property may be the default"); seenDefault = true; } @@ -1337,15 +1337,15 @@ bool QmlCompiler::findDynamicProperties(QmlParser::Property *prop, } } - if(obj->defaultProperty) { - if(seen & Value) + if (obj->defaultProperty) { + if (seen & Value) COMPILE_EXCEPTION("May only specify Property value once"); seen = (Seen)(seen | Value); propDef.defaultValue = obj->defaultProperty; } - if(!(seen & Name)) + if (!(seen & Name)) COMPILE_EXCEPTION("Must specify Property name"); definedProperties << propDef; @@ -1360,33 +1360,33 @@ bool QmlCompiler::findDynamicSignals(QmlParser::Property *sigs, { QList<Object::DynamicSignal> definedSignals; - if(sigs->value) + if (sigs->value) COMPILE_EXCEPTION("Invalid signal specification"); - for(int ii = 0; ii < sigs->values.count(); ++ii) { + for (int ii = 0; ii < sigs->values.count(); ++ii) { QmlParser::Value *val = sigs->values.at(ii); - if(!val->object) + if (!val->object) COMPILE_EXCEPTION("Invalid signal specification"); QmlParser::Object *obj = val->object; - if(obj->type == -1 || output->types.at(obj->type).className != "Signal") + if (obj->type == -1 || output->types.at(obj->type).className != "Signal") COMPILE_EXCEPTION("Use Signal tag to specify signals"); enum Seen { None = 0, Name = 0x01 } seen = None; Object::DynamicSignal sigDef; - for(QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = + for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = obj->properties.begin(); iter != obj->properties.end(); ++iter) { QmlParser::Property *property = *iter; - if(property->name == "name") { + if (property->name == "name") { if (seen & Name) COMPILE_EXCEPTION("May only specify Signal name once"); seen = (Seen)(seen | Name); - if(property->value || property->values.count() != 1 || + if (property->value || property->values.count() != 1 || property->values.at(0)->object) COMPILE_EXCEPTION("Invalid Signal name"); @@ -1398,10 +1398,10 @@ bool QmlCompiler::findDynamicSignals(QmlParser::Property *sigs, } - if(obj->defaultProperty) + if (obj->defaultProperty) COMPILE_EXCEPTION("Invalid Signal property"); - if(!(seen & Name)) + if (!(seen & Name)) COMPILE_EXCEPTION("Must specify Signal name"); definedSignals << sigDef; @@ -1413,23 +1413,23 @@ bool QmlCompiler::findDynamicSignals(QmlParser::Property *sigs, bool QmlCompiler::compileDynamicPropertiesAndSignals(QmlParser::Object *obj) { - if(obj->dynamicPropertiesProperty) + if (obj->dynamicPropertiesProperty) findDynamicProperties(obj->dynamicPropertiesProperty, obj); - if(obj->dynamicSignalsProperty) + if (obj->dynamicSignalsProperty) findDynamicSignals(obj->dynamicSignalsProperty, obj); - if(obj->dynamicProperties.isEmpty() && obj->dynamicSignals.isEmpty()) + if (obj->dynamicProperties.isEmpty() && obj->dynamicSignals.isEmpty()) return true; QMetaObjectBuilder builder; - if(obj->metatype) + if (obj->metatype) builder.setClassName(QByteArray(obj->metatype->className()) + "QML"); builder.setFlags(QMetaObjectBuilder::DynamicMetaObject); - for(int ii = 0; ii < obj->dynamicProperties.count(); ++ii) { + for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) { const Object::DynamicProperty &p = obj->dynamicProperties.at(ii); - if(p.isDefaultProperty) + if (p.isDefaultProperty) builder.addClassInfo("DefaultProperty", p.name); QByteArray type; @@ -1461,12 +1461,12 @@ bool QmlCompiler::compileDynamicPropertiesAndSignals(QmlParser::Object *obj) builder.addProperty(p.name, type, ii); } - for(int ii = 0; ii < obj->dynamicSignals.count(); ++ii) { + for (int ii = 0; ii < obj->dynamicSignals.count(); ++ii) { const Object::DynamicSignal &s = obj->dynamicSignals.at(ii); builder.addSignal(s.name + "()"); } - if(obj->metatype) + if (obj->metatype) builder.setSuperClass(obj->metatype); obj->extObject = builder.toMetaObject(); @@ -1478,16 +1478,16 @@ bool QmlCompiler::compileDynamicPropertiesAndSignals(QmlParser::Object *obj) store.line = obj->line; output->bytecode << store; - for(int ii = 0; ii < obj->dynamicProperties.count(); ++ii) { + for (int ii = 0; ii < obj->dynamicProperties.count(); ++ii) { const Object::DynamicProperty &p = obj->dynamicProperties.at(ii); - if(p.defaultValue) { + if (p.defaultValue) { p.defaultValue->name = p.name; p.defaultValue->isDefault = false; COMPILE_CHECK(compileProperty(p.defaultValue, obj, 0)); } - if(!p.onValueChanged.isEmpty()) { + if (!p.onValueChanged.isEmpty()) { QmlInstruction assign; assign.type = QmlInstruction::AssignSignal; assign.line = obj->line; @@ -1512,7 +1512,7 @@ void QmlCompiler::compileBinding(const QString &str, QmlParser::Property *prop, bs.compile(bind.toLatin1()); int bref; - if(bs.isValid()) { + if (bs.isValid()) { bref = output->indexForByteArray(QByteArray(bs.compileData(), bs.compileDataSize())); } else { bref = output->indexForString(bind); @@ -1521,8 +1521,8 @@ void QmlCompiler::compileBinding(const QString &str, QmlParser::Property *prop, QmlInstruction assign; assign.assignBinding.context = ctxt; assign.line = line; - if(prop->index != -1) { - if(bs.isValid()) + if (prop->index != -1) { + if (bs.isValid()) assign.type = QmlInstruction::StoreCompiledBinding; else assign.type = QmlInstruction::StoreBinding; @@ -1530,13 +1530,13 @@ void QmlCompiler::compileBinding(const QString &str, QmlParser::Property *prop, assign.assignBinding.property = prop->index; assign.assignBinding.value = bref; assign.assignBinding.category = QmlMetaProperty::Unknown; - if(mo) { + if (mo) { //XXX we should generate an exception if the property is read-only QMetaProperty mp = mo->property(assign.assignBinding.property); assign.assignBinding.category = QmlMetaProperty::propertyCategory(mp); } } else { - if(bs.isValid()) + if (bs.isValid()) assign.type = QmlInstruction::AssignCompiledBinding; else assign.type = QmlInstruction::AssignBinding; @@ -1553,42 +1553,42 @@ int QmlCompiler::optimizeExpressions(int start, int end, int patch) int saveCount = 0; int newInstrs = 0; - for(int ii = start; ii <= end; ++ii) { + for (int ii = start; ii <= end; ++ii) { const QmlInstruction &instr = output->bytecode.at(ii); - if(instr.type == QmlInstruction::CreateComponent) { + if (instr.type == QmlInstruction::CreateComponent) { ii += instr.createComponent.count - 1; continue; } - if(instr.type == QmlInstruction::SetId) { + if (instr.type == QmlInstruction::SetId) { QString id = output->primitives.at(instr.setId.value); ids.insert(id, ii); } } - for(int ii = start; ii <= end; ++ii) { + for (int ii = start; ii <= end; ++ii) { const QmlInstruction &instr = output->bytecode.at(ii); - if(instr.type == QmlInstruction::CreateComponent) { + if (instr.type == QmlInstruction::CreateComponent) { ii += instr.createComponent.count - 1; continue; } - if(instr.type == QmlInstruction::StoreCompiledBinding) { + if (instr.type == QmlInstruction::StoreCompiledBinding) { QmlBasicScript s(output->datas.at(instr.assignBinding.value).constData()); - if(s.isSingleLoad()) { + if (s.isSingleLoad()) { QString slt = QLatin1String(s.singleLoadTarget()); - if(!slt.at(0).isUpper()) + if (!slt.at(0).isUpper()) continue; - if(ids.contains(slt) && + if (ids.contains(slt) && instr.assignBinding.category == QmlMetaProperty::Object) { int id = ids[slt]; int saveId = -1; - if(output->bytecode.at(id).setId.save != -1) { + if (output->bytecode.at(id).setId.save != -1) { saveId = output->bytecode.at(id).setId.save; } else { output->bytecode[id].setId.save = saveCount; @@ -1615,7 +1615,7 @@ int QmlCompiler::optimizeExpressions(int start, int end, int patch) } - if(saveCount) + if (saveCount) output->bytecode[patch].init.dataSize = saveCount; return newInstrs; @@ -1632,8 +1632,8 @@ QmlCompiledData::QmlCompiledData(const QmlCompiledData &other) QmlCompiledData::~QmlCompiledData() { - for(int ii = 0; ii < types.count(); ++ii) { - if(types.at(ii).ref) + for (int ii = 0; ii < types.count(); ++ii) { + if (types.at(ii).ref) types.at(ii).ref->release(); } } @@ -1653,12 +1653,12 @@ QmlCompiledData &QmlCompiledData::operator=(const QmlCompiledData &other) QObject *QmlCompiledData::TypeReference::createInstance(QmlContext *ctxt) const { - if(type) { + if (type) { QObject *rv = type->create(); - if(rv) + if (rv) QmlEngine::setContextForObject(rv, ctxt); return rv; - } else if(component) { + } else if (component) { return component->create(ctxt); } else { return 0; diff --git a/src/declarative/qml/qmlcomponent.cpp b/src/declarative/qml/qmlcomponent.cpp index 92f6b28..2c3ebd6 100644 --- a/src/declarative/qml/qmlcomponent.cpp +++ b/src/declarative/qml/qmlcomponent.cpp @@ -130,7 +130,7 @@ void QmlComponentPrivate::fromTypeData(QmlCompositeTypeData *data) url = QUrl(data->url); QmlCompiledComponent *c = data->toCompiledComponent(engine); - if(!c) { + if (!c) { Q_ASSERT(data->status == QmlCompositeTypeData::Error); errorDescription = data->errorDescription; @@ -148,13 +148,13 @@ void QmlComponentPrivate::fromTypeData(QmlCompositeTypeData *data) void QmlComponentPrivate::clear() { - if(typeData) { + if (typeData) { typeData->remWaiter(this); typeData->release(); typeData = 0; } - if(cc) { + if (cc) { cc->release(); cc = 0; } @@ -186,11 +186,11 @@ QmlComponent::Status QmlComponent::status() const { Q_D(const QmlComponent); - if(d->typeData) + if (d->typeData) return Loading; - else if(d->engine && d->cc) + else if (d->engine && d->cc) return Ready; - else if(!d->errorDescription.isEmpty()) + else if (!d->errorDescription.isEmpty()) return Error; else return Null; @@ -307,7 +307,7 @@ void QmlComponent::setData(const QByteArray &data, const QUrl &url) QmlCompositeTypeData *typeData = d->engine->d_func()->typeManager.getImmediate(data, url); - if(typeData->status == QmlCompositeTypeData::Waiting) { + if (typeData->status == QmlCompositeTypeData::Waiting) { d->typeData = typeData; d->typeData->addWaiter(d); @@ -335,7 +335,7 @@ void QmlComponent::loadUrl(const QUrl &url) QmlCompositeTypeData *data = d->engine->d_func()->typeManager.get(url); - if(data->status == QmlCompositeTypeData::Waiting) { + if (data->status == QmlCompositeTypeData::Waiting) { d->typeData = data; d->typeData->addWaiter(d); @@ -352,7 +352,7 @@ void QmlComponent::loadUrl(const QUrl &url) QString QmlComponent::errorDescription() const { Q_D(const QmlComponent); - if(isError()) + if (isError()) return d->errorDescription; else return QString(); @@ -388,10 +388,10 @@ QObject *QmlComponent::create(QmlContext *context) { Q_D(QmlComponent); - if(!context) + if (!context) context = d->engine->rootContext(); - if(context->engine() != d->engine) { + if (context->engine() != d->engine) { qWarning("QmlComponent::create(): Must create component in context from the same QmlEngine"); return 0; } @@ -428,12 +428,12 @@ QObject *QmlComponent::beginCreate(QmlContext *context) { Q_D(QmlComponent); - if(!context) { + if (!context) { qWarning("QmlComponent::beginCreate(): Cannot create a component in a null context"); return 0; } - if(context->engine() != d->engine) { + if (context->engine() != d->engine) { qWarning("QmlComponent::beginCreate(): Must create component in context from the same QmlEngine"); return 0; } @@ -443,7 +443,7 @@ QObject *QmlComponent::beginCreate(QmlContext *context) return 0; } - if(!isReady()) { + if (!isReady()) { qWarning("QmlComponent: Cannot create un-ready component"); return 0; } @@ -451,7 +451,7 @@ QObject *QmlComponent::beginCreate(QmlContext *context) #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::CreateComponent> perf; #endif - if(!d->engine->d_func()->rootComponent) + if (!d->engine->d_func()->rootComponent) d->engine->d_func()->rootComponent = this; QmlContext *ctxt = @@ -462,7 +462,7 @@ QObject *QmlComponent::beginCreate(QmlContext *context) QmlVME vme; QObject *rv = vme.run(ctxt, d->cc, d->start, d->count); - if(vme.isError()) { + if (vme.isError()) { qWarning().nospace() #ifdef QML_VERBOSEERRORS_ENABLED << "QmlComponent: " @@ -474,10 +474,10 @@ QObject *QmlComponent::beginCreate(QmlContext *context) ctxt->deactivate(); - if(rv) { + if (rv) { QFx_setParent_noEvent(ctxt, rv); QmlEnginePrivate *ep = d->engine->d_func(); - if(ep->rootComponent == this) { + if (ep->rootComponent == this) { ep->rootComponent = 0; d->bindValues = ep->currentBindValues; @@ -508,13 +508,13 @@ void QmlComponent::completeCreate() #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::BindInit> bi; #endif - for(int ii = 0; ii < d->bindValues.count(); ++ii) + for (int ii = 0; ii < d->bindValues.count(); ++ii) d->bindValues.at(ii)->init(); } QSet<QmlParserStatus *> done; - for(int ii = 0; ii < d->parserStatus.count(); ++ii) { + for (int ii = 0; ii < d->parserStatus.count(); ++ii) { QmlParserStatus *ps = d->parserStatus.at(ii); - if(!done.contains(ps)) { + if (!done.contains(ps)) { done.insert(ps); ps->componentComplete(); } diff --git a/src/declarative/qml/qmlcompositetypemanager.cpp b/src/declarative/qml/qmlcompositetypemanager.cpp index b05a6fa..7f2cc58 100644 --- a/src/declarative/qml/qmlcompositetypemanager.cpp +++ b/src/declarative/qml/qmlcompositetypemanager.cpp @@ -57,13 +57,13 @@ QmlCompositeTypeData::QmlCompositeTypeData() QmlCompositeTypeData::~QmlCompositeTypeData() { - for(int ii = 0; ii < dependants.count(); ++ii) + for (int ii = 0; ii < dependants.count(); ++ii) dependants.at(ii)->release(); - if(compiledComponent) + if (compiledComponent) compiledComponent->release(); - if(component) + if (component) delete component; } @@ -79,10 +79,10 @@ void QmlCompositeTypeData::remWaiter(QmlComponentPrivate *p) QmlComponent *QmlCompositeTypeData::toComponent(QmlEngine *engine) { - if(!component) { + if (!component) { QmlCompiledComponent *cc = toCompiledComponent(engine); - if(cc) { + if (cc) { component = new QmlComponent(engine, cc, -1, -1, 0); } else { component = new QmlComponent(engine, 0); @@ -96,14 +96,14 @@ QmlComponent *QmlCompositeTypeData::toComponent(QmlEngine *engine) QmlCompiledComponent * QmlCompositeTypeData::toCompiledComponent(QmlEngine *engine) { - if(status == Complete && !compiledComponent) { + if (status == Complete && !compiledComponent) { compiledComponent = new QmlCompiledComponent; compiledComponent->url = QUrl(url); compiledComponent->name = url.toLatin1(); // ### QmlCompiler compiler; - if(!compiler.compile(engine, this, compiledComponent)) { + if (!compiler.compile(engine, this, compiledComponent)) { status = Error; errorDescription = compiler.errorDescription() + QLatin1String("@") + @@ -117,7 +117,7 @@ QmlCompositeTypeData::toCompiledComponent(QmlEngine *engine) data.clear(); } - if(compiledComponent) + if (compiledComponent) compiledComponent->addref(); return compiledComponent; @@ -137,7 +137,7 @@ QmlCompositeTypeData *QmlCompositeTypeManager::get(const QUrl &url) { QmlCompositeTypeData *unit = components.value(url.toString()); - if(!unit) { + if (!unit) { unit = new QmlCompositeTypeData; unit->status = QmlCompositeTypeData::Waiting; unit->url = url.toString(); @@ -162,8 +162,8 @@ QmlCompositeTypeManager::getImmediate(const QByteArray &data, const QUrl &url) void QmlCompositeTypeManager::clearCache() { - for(Components::Iterator iter = components.begin(); iter != components.end();) { - if((*iter)->status != QmlCompositeTypeData::Waiting) { + for (Components::Iterator iter = components.begin(); iter != components.end();) { + if ((*iter)->status != QmlCompositeTypeData::Waiting) { (*iter)->release(); iter = components.erase(iter); } else { @@ -180,7 +180,7 @@ void QmlCompositeTypeManager::replyFinished() QmlCompositeTypeData *unit = components.value(reply->url().toString()); Q_ASSERT(unit); - if(reply->error() != QNetworkReply::NoError) { + if (reply->error() != QNetworkReply::NoError) { QString errorDescription; // ### - Fill in error @@ -204,10 +204,10 @@ void QmlCompositeTypeManager::loadSource(QmlCompositeTypeData *unit) { QUrl url(unit->url); - if(url.scheme() == QLatin1String("file")) { + if (url.scheme() == QLatin1String("file")) { QFile file(url.toLocalFile()); - if(file.open(QFile::ReadOnly)) { + if (file.open(QFile::ReadOnly)) { QByteArray data = file.readAll(); setData(unit, data, url); } else { @@ -231,7 +231,7 @@ void QmlCompositeTypeManager::setData(QmlCompositeTypeData *unit, const QByteArray &data, const QUrl &url) { - if(!unit->data.parse(data, url)) { + if (!unit->data.parse(data, url)) { unit->status = QmlCompositeTypeData::Error; unit->errorDescription = unit->data.errorDescription(); @@ -247,7 +247,7 @@ void QmlCompositeTypeManager::setData(QmlCompositeTypeData *unit, void QmlCompositeTypeManager::doComplete(QmlCompositeTypeData *unit) { - for(int ii = 0; ii < unit->dependants.count(); ++ii) { + for (int ii = 0; ii < unit->dependants.count(); ++ii) { checkComplete(unit->dependants.at(ii)); unit->dependants.at(ii)->release(); } @@ -261,26 +261,26 @@ void QmlCompositeTypeManager::doComplete(QmlCompositeTypeData *unit) void QmlCompositeTypeManager::checkComplete(QmlCompositeTypeData *unit) { - if(unit->status != QmlCompositeTypeData::Waiting) + if (unit->status != QmlCompositeTypeData::Waiting) return; int waiting = 0; - for(int ii = 0; ii < unit->types.count(); ++ii) { + for (int ii = 0; ii < unit->types.count(); ++ii) { QmlCompositeTypeData *u = unit->types.at(ii).unit; - if(!u) + if (!u) continue; - if(u->status == QmlCompositeTypeData::Error) { + if (u->status == QmlCompositeTypeData::Error) { unit->status = QmlCompositeTypeData::Error; unit->errorDescription = u->errorDescription; doComplete(unit); return; - } else if(u->status == QmlCompositeTypeData::Waiting) { + } else if (u->status == QmlCompositeTypeData::Waiting) { waiting++; } } - if(!waiting) { + if (!waiting) { unit->status = QmlCompositeTypeData::Complete; doComplete(unit); } @@ -291,7 +291,7 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit) QStringList typeNames = unit->data.types(); int waiting = 0; - for(int ii = 0; ii < typeNames.count(); ++ii) { + for (int ii = 0; ii < typeNames.count(); ++ii) { QByteArray type = typeNames.at(ii).toLatin1(); QmlCompositeTypeData::TypeReference ref; @@ -304,14 +304,14 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit) QmlCustomParser *parser = QmlMetaType::customParser(type); - if(parser) { + if (parser) { ref.parser = parser; unit->types << ref; continue; } ref.type = QmlMetaType::qmlType(type); - if(ref.type) { + if (ref.type) { ref.parser = parser; unit->types << ref; continue; @@ -320,7 +320,7 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit) QUrl url = engine->componentUrl(QUrl(type + ".qml"), QUrl(unit->url)); QmlCompositeTypeData *urlUnit = components.value(url.toString()); - if(!urlUnit) { + if (!urlUnit) { urlUnit = new QmlCompositeTypeData; urlUnit->status = QmlCompositeTypeData::Waiting; urlUnit->url = url.toString(); @@ -351,7 +351,7 @@ void QmlCompositeTypeManager::compile(QmlCompositeTypeData *unit) unit->types << ref; } - if(waiting) { + if (waiting) { unit->status = QmlCompositeTypeData::Waiting; } else { unit->status = QmlCompositeTypeData::Complete; diff --git a/src/declarative/qml/qmlcontext.cpp b/src/declarative/qml/qmlcontext.cpp index 40e33c2..c1acdc7 100644 --- a/src/declarative/qml/qmlcontext.cpp +++ b/src/declarative/qml/qmlcontext.cpp @@ -68,16 +68,16 @@ void QmlContextPrivate::dump(int depth) QByteArray ba(depth * 4, ' '); qWarning() << ba << properties.keys(); qWarning() << ba << variantProperties.keys(); - if(parent) + if (parent) parent->d_func()->dump(depth + 1); } void QmlContextPrivate::destroyed(QObject *obj) { defaultObjects.removeAll(obj); - for(QHash<QString, QObject *>::Iterator iter = properties.begin(); + for (QHash<QString, QObject *>::Iterator iter = properties.begin(); iter != properties.end(); ) { - if(*iter == obj) + if (*iter == obj) iter = properties.erase(iter); else ++iter; @@ -102,13 +102,13 @@ void QmlContextPrivate::init() void QmlContextPrivate::addDefaultObject(QObject *object, Priority priority) { - if(defaultObjects.count() >= (MAXIMUM_DEFAULT_OBJECTS - 1)) { + if (defaultObjects.count() >= (MAXIMUM_DEFAULT_OBJECTS - 1)) { qWarning("QmlContext: Cannot have more than %d default objects on " "one bind context.", MAXIMUM_DEFAULT_OBJECTS - 1); return; } - if(priority == HighPriority) { + if (priority == HighPriority) { defaultObjects.insert(highPriorityCount++, object); } else { defaultObjects.append(object); @@ -233,7 +233,7 @@ QmlContext::QmlContext(QmlContext *parentContext, QObject *parent) QmlContext::~QmlContext() { Q_D(QmlContext); - if(d->component) d->component->release(); + if (d->component) d->component->release(); } @@ -313,7 +313,7 @@ void QmlContext::deactivate() QmlEnginePrivate *ep = engine()->d_func(); Q_ASSERT(ep->activeContexts.top() == this); ep->activeContexts.pop(); - if(ep->activeContexts.isEmpty()) + if (ep->activeContexts.isEmpty()) ep->setCurrentBindContext(0); else ep->setCurrentBindContext(ep->activeContexts.top()); @@ -332,7 +332,7 @@ void QmlContext::deactivate() QmlContext *QmlContext::activeContext() { QmlEngine *engine = QmlEngine::activeEngine(); - if(engine) + if (engine) return engine->activeContext(); else return 0; @@ -351,16 +351,16 @@ QmlContext *QmlContext::activeContext() QUrl QmlContext::resolvedUrl(const QUrl &src) { QmlContext *ctxt = this; - if(src.isRelative()) { - if(ctxt) { + if (src.isRelative()) { + if (ctxt) { while(ctxt) { - if(ctxt->d_func()->component) + if (ctxt->d_func()->component) break; else ctxt = ctxt->parentContext(); } - if(ctxt) + if (ctxt) return ctxt->d_func()->component->url.resolved(src); } return QUrl(); @@ -380,16 +380,16 @@ QUrl QmlContext::resolvedUrl(const QUrl &src) QUrl QmlContext::resolvedUri(const QUrl &src) { QmlContext *ctxt = this; - if(src.isRelative()) { - if(ctxt) { + if (src.isRelative()) { + if (ctxt) { while(ctxt) { - if(ctxt->d_func()->component) + if (ctxt->d_func()->component) break; else ctxt = ctxt->parentContext(); } - if(ctxt) + if (ctxt) return ctxt->d_func()->engine->componentUrl(src, ctxt->d_func()->component->url); } return QUrl(); diff --git a/src/declarative/qml/qmldom.cpp b/src/declarative/qml/qmldom.cpp index cbe5d5d..72c1c76 100644 --- a/src/declarative/qml/qmldom.cpp +++ b/src/declarative/qml/qmldom.cpp @@ -59,12 +59,12 @@ QmlDomDocumentPrivate::QmlDomDocumentPrivate(const QmlDomDocumentPrivate &other) : QSharedData(other), root(0) { root = other.root; - if(root) root->addref(); + if (root) root->addref(); } QmlDomDocumentPrivate::~QmlDomDocumentPrivate() { - if(root) root->release(); + if (root) root->release(); } /*! @@ -152,7 +152,7 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data) d->error = QString(); QmlScriptParser parser; - if(!parser.parse(data)) { + if (!parser.parse(data)) { d->error = parser.errorDescription(); return false; } @@ -162,12 +162,12 @@ bool QmlDomDocument::load(QmlEngine *engine, const QByteArray &data) // ### // compiler.compile(engine, parser, &component); - if(compiler.isError()) { + if (compiler.isError()) { d->error = compiler.errorDescription(); return false; } - if(parser.tree()) { + if (parser.tree()) { component.dump(0, parser.tree()); d->root = parser.tree(); d->root->addref(); @@ -214,7 +214,7 @@ QmlDomObject QmlDomDocument::rootObject() const { QmlDomObject rv; rv.d->object = d->root; - if(rv.d->object) rv.d->object->addref(); + if (rv.d->object) rv.d->object->addref(); return rv; } @@ -227,12 +227,12 @@ QmlDomPropertyPrivate::QmlDomPropertyPrivate(const QmlDomPropertyPrivate &other) : QSharedData(other), property(0) { property = other.property; - if(property) property->addref(); + if (property) property->addref(); } QmlDomPropertyPrivate::~QmlDomPropertyPrivate() { - if(property) property->release(); + if (property) property->release(); } /*! @@ -313,7 +313,7 @@ QByteArray QmlDomProperty::propertyName() const */ QList<QByteArray> QmlDomProperty::propertyNameParts() const { - if(d->propertyName.isEmpty()) return QList<QByteArray>(); + if (d->propertyName.isEmpty()) return QList<QByteArray>(); else return d->propertyName.split('.'); } @@ -344,7 +344,7 @@ bool QmlDomProperty::isDefaultProperty() const QmlDomValue QmlDomProperty::value() const { QmlDomValue rv; - if(d->property) { + if (d->property) { rv.d->property = d->property; rv.d->value = d->property->values.at(0); rv.d->property->addref(); @@ -371,13 +371,13 @@ QmlDomObjectPrivate::QmlDomObjectPrivate(const QmlDomObjectPrivate &other) : QSharedData(other), object(0), isVirtualComponent(false) { object = other.object; - if(object) object->addref(); + if (object) object->addref(); isVirtualComponent = other.isVirtualComponent; } QmlDomObjectPrivate::~QmlDomObjectPrivate() { - if(object) object->release(); + if (object) object->release(); } QmlDomObjectPrivate::Properties @@ -385,7 +385,7 @@ QmlDomObjectPrivate::properties() const { Properties rv; - for(QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = + for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = object->properties.begin(); iter != object->properties.end(); ++iter) { @@ -401,9 +401,9 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const { Properties rv; - if(property->value) { + if (property->value) { - for(QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = + for (QHash<QByteArray, QmlParser::Property *>::ConstIterator iter = property->value->properties.begin(); iter != property->value->properties.end(); ++iter) { @@ -413,13 +413,13 @@ QmlDomObjectPrivate::properties(QmlParser::Property *property) const } QByteArray name(property->name + "."); - for(Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter) + for (Properties::Iterator iter = rv.begin(); iter != rv.end(); ++iter) iter->second.prepend(name); } else { // We don't display "id" sets as a property in the dom - if(property->values.count() != 1 || + if (property->values.count() != 1 || property->values.at(0)->type != QmlParser::Value::Id) rv << qMakePair(property, property->name); @@ -515,7 +515,7 @@ bool QmlDomObject::isValid() const */ QByteArray QmlDomObject::objectType() const { - if(d->object) return d->object->typeName; + if (d->object) return d->object->typeName; else return QByteArray(); } @@ -530,7 +530,7 @@ QByteArray QmlDomObject::objectType() const */ QByteArray QmlDomObject::objectId() const { - if(d->object) return d->object->id; + if (d->object) return d->object->id; else return QByteArray(); } @@ -557,11 +557,11 @@ QList<QmlDomProperty> QmlDomObject::properties() const { QList<QmlDomProperty> rv; - if(!d->object) + if (!d->object) return rv; QmlDomObjectPrivate::Properties properties = d->properties(); - for(int ii = 0; ii < properties.count(); ++ii) { + for (int ii = 0; ii < properties.count(); ++ii) { QmlDomProperty domProperty; domProperty.d->property = properties.at(ii).first; @@ -571,7 +571,7 @@ QList<QmlDomProperty> QmlDomObject::properties() const } - if(d->object->defaultProperty) { + if (d->object->defaultProperty) { QmlDomProperty domProperty; domProperty.d->property = d->object->defaultProperty; domProperty.d->property->addref(); @@ -596,8 +596,8 @@ QList<QmlDomProperty> QmlDomObject::properties() const QmlDomProperty QmlDomObject::property(const QByteArray &name) const { QList<QmlDomProperty> props = properties(); - for(int ii = 0; ii < props.count(); ++ii) - if(props.at(ii).propertyName() == name) + for (int ii = 0; ii < props.count(); ++ii) + if (props.at(ii).propertyName() == name) return props.at(ii); return QmlDomProperty(); } @@ -684,7 +684,7 @@ bool QmlDomObject::isComponent() const QmlDomComponent QmlDomObject::toComponent() const { QmlDomComponent rv; - if(isComponent()) + if (isComponent()) rv.d = d; return rv; } @@ -698,12 +698,12 @@ QmlDomBasicValuePrivate::QmlDomBasicValuePrivate(const QmlDomBasicValuePrivate & : QSharedData(other), value(0) { value = other.value; - if(value) value->addref(); + if (value) value->addref(); } QmlDomBasicValuePrivate::~QmlDomBasicValuePrivate() { - if(value) value->release(); + if (value) value->release(); } /*! @@ -761,7 +761,7 @@ QmlDomValueLiteral &QmlDomValueLiteral::operator=(const QmlDomValueLiteral &othe */ QString QmlDomValueLiteral::literal() const { - if(d->value) return d->value->primitive; + if (d->value) return d->value->primitive; else return QString(); } @@ -827,7 +827,7 @@ QmlDomValueBinding &QmlDomValueBinding::operator=(const QmlDomValueBinding &othe */ QString QmlDomValueBinding::binding() const { - if(d->value) + if (d->value) return d->value->primitive.mid(1, d->value->primitive.length() - 2); else return QString(); @@ -907,7 +907,7 @@ QmlDomValueValueSource &QmlDomValueValueSource::operator=(const QmlDomValueValue QmlDomObject QmlDomValueValueSource::object() const { QmlDomObject rv; - if(d->value) { + if (d->value) { rv.d->object = d->value->object; rv.d->object->addref(); } @@ -933,14 +933,14 @@ QmlDomValuePrivate::QmlDomValuePrivate(const QmlDomValuePrivate &other) { property = other.property; value = other.value; - if(property) property->addref(); - if(value) value->addref(); + if (property) property->addref(); + if (value) value->addref(); } QmlDomValuePrivate::~QmlDomValuePrivate() { - if(property) property->release(); - if(value) value->release(); + if (property) property->release(); + if (value) value->release(); } /*! @@ -969,13 +969,13 @@ QmlDomValuePrivate::~QmlDomValuePrivate() QmlDomObject root = document.rootObject(); QmlDomProperty text = root.property("text"); - if(text.value().isLiteral()) { + if (text.value().isLiteral()) { QmlDomValueLiteral literal = text.value().toLiteral(); qDebug() << literal.literal(); } QmlDomProperty y = root.property("y"); - if(y.value().isBinding()) { + if (y.value().isBinding()) { QmlDomValueBinding binding = y.value().toBinding(); qDebug() << binding.binding(); } @@ -1032,8 +1032,8 @@ QmlDomValue &QmlDomValue::operator=(const QmlDomValue &other) */ QmlDomValue::Type QmlDomValue::type() const { - if(d->property) - if(QmlMetaType::isList(d->property->type) || + if (d->property) + if (QmlMetaType::isList(d->property->type) || QmlMetaType::isQmlList(d->property->type) || (d->property && d->property->values.count() > 1)) return List; @@ -1121,7 +1121,7 @@ bool QmlDomValue::isList() const QmlDomValueLiteral QmlDomValue::toLiteral() const { QmlDomValueLiteral rv; - if(type() == Literal) { + if (type() == Literal) { rv.d->value = d->value; rv.d->value->addref(); } @@ -1137,7 +1137,7 @@ QmlDomValueLiteral QmlDomValue::toLiteral() const QmlDomValueBinding QmlDomValue::toBinding() const { QmlDomValueBinding rv; - if(type() == PropertyBinding) { + if (type() == PropertyBinding) { rv.d->value = d->value; rv.d->value->addref(); } @@ -1153,7 +1153,7 @@ QmlDomValueBinding QmlDomValue::toBinding() const QmlDomValueValueSource QmlDomValue::toValueSource() const { QmlDomValueValueSource rv; - if(type() == ValueSource) { + if (type() == ValueSource) { rv.d->value = d->value; rv.d->value->addref(); } @@ -1169,7 +1169,7 @@ QmlDomValueValueSource QmlDomValue::toValueSource() const QmlDomObject QmlDomValue::toObject() const { QmlDomObject rv; - if(type() == Object) { + if (type() == Object) { rv.d->object = d->value->object; rv.d->object->addref(); } @@ -1185,7 +1185,7 @@ QmlDomObject QmlDomValue::toObject() const QmlDomList QmlDomValue::toList() const { QmlDomList rv; - if(type() == List) { + if (type() == List) { rv.d = d; } return rv; @@ -1254,10 +1254,10 @@ QmlDomList &QmlDomList::operator=(const QmlDomList &other) QList<QmlDomValue> QmlDomList::values() const { QList<QmlDomValue> rv; - if(!d->property) + if (!d->property) return rv; - for(int ii = 0; ii < d->property->values.count(); ++ii) { + for (int ii = 0; ii < d->property->values.count(); ++ii) { QmlDomValue v; v.d->value = d->property->values.at(ii); v.d->value->addref(); @@ -1342,17 +1342,17 @@ QmlDomComponent &QmlDomComponent::operator=(const QmlDomComponent &other) QmlDomObject QmlDomComponent::componentRoot() const { QmlDomObject rv; - if(d->isVirtualComponent) { + if (d->isVirtualComponent) { rv.d->object = d->object; rv.d->object->addref(); - } else if(d->object) { + } else if (d->object) { QmlParser::Object *obj = 0; - if(d->object->defaultProperty && + if (d->object->defaultProperty && d->object->defaultProperty->values.count() == 1 && d->object->defaultProperty->values.at(0)->object) obj = d->object->defaultProperty->values.at(0)->object; - if(obj) { + if (obj) { rv.d->object = obj; rv.d->object->addref(); } diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp index 5e698c2..30848c1 100644 --- a/src/declarative/qml/qmlengine.cpp +++ b/src/declarative/qml/qmlengine.cpp @@ -86,7 +86,7 @@ QML_DEFINE_TYPE(QObject,Object); static QScriptValue qmlMetaProperty_emit(QScriptContext *ctx, QScriptEngine *engine) { QmlMetaProperty mp = qscriptvalue_cast<QmlMetaProperty>(ctx->thisObject()); - if(mp.type() & QmlMetaProperty::Signal) + if (mp.type() & QmlMetaProperty::Signal) mp.emitSignal(); return engine->nullValue(); } @@ -118,8 +118,8 @@ QmlEngineStack::QmlEngineStack() QStack<QmlEngine *> *QmlEngineStack::engines() { - if(mainThread== 0) { - if(!QCoreApplication::instance()) + if (mainThread== 0) { + if (!QCoreApplication::instance()) return 0; mainThread = QCoreApplication::instance()->thread(); } @@ -127,11 +127,11 @@ QStack<QmlEngine *> *QmlEngineStack::engines() // Note: This is very slightly faster than just using the thread storage // for everything. QStack<QmlEngine *> *engines = 0; - if(QThread::currentThread() == mainThread) { + if (QThread::currentThread() == mainThread) { engines = &mainThreadEngines; } else { engines = storage.localData(); - if(!engines) { + if (!engines) { engines = new QStack<QmlEngine *>; storage.setLocalData(engines); } @@ -171,7 +171,7 @@ void QmlEnginePrivate::init() objectClass = new QmlObjectScriptClass(q); rootContext = new QmlContext(q); #ifdef QT_SCRIPTTOOLS_LIB - if(debuggerEnabled()){ + if (debuggerEnabled()){ debugger = new QScriptEngineDebugger(q); debugger->attachTo(&scriptEngine); } @@ -196,7 +196,7 @@ QmlEnginePrivate::queryObject(const QString &propName, QScriptClass::QueryFlags rv = 0; QmlMetaProperty prop(obj, propName); - if(prop.type() == QmlMetaProperty::Invalid) { + if (prop.type() == QmlMetaProperty::Invalid) { QPair<const QMetaObject *, QString> key = qMakePair(obj->metaObject(), propName); bool isFunction = false; @@ -209,7 +209,7 @@ QmlEnginePrivate::queryObject(const QString &propName, functionCache()->insert(key, isFunction); } - if(isFunction) { + if (isFunction) { *id = QmlScriptClass::FunctionId; rv |= QScriptClass::HandlesReadAccess; } @@ -218,7 +218,7 @@ QmlEnginePrivate::queryObject(const QString &propName, *id |= prop.save(); rv |= QScriptClass::HandlesReadAccess; - if(prop.isWritable()) + if (prop.isWritable()) rv |= QScriptClass::HandlesWriteAccess; } @@ -228,25 +228,25 @@ QmlEnginePrivate::queryObject(const QString &propName, QScriptValue QmlEnginePrivate::propertyObject(const QScriptString &propName, QObject *obj, uint id) { - if(id == QmlScriptClass::FunctionId) { + if (id == QmlScriptClass::FunctionId) { QScriptValue sobj = scriptEngine.newQObject(obj); QScriptValue func = sobj.property(propName); return func; } else { QmlMetaProperty prop; prop.restore(id, obj); - if(!prop.isValid()) + if (!prop.isValid()) return QScriptValue(); - if(prop.type() & QmlMetaProperty::Signal) { + if (prop.type() & QmlMetaProperty::Signal) { return scriptEngine.newVariant(qVariantFromValue(prop)); } else { QVariant var = prop.read(); capturedProperties << prop; QObject *varobj = QmlMetaType::toQObject(var); - if(!varobj) + if (!varobj) varobj = qvariant_cast<QObject *>(var); - if(varobj) { + if (varobj) { return scriptEngine.newObject(objectClass, scriptEngine.newVariant(QVariant::fromValue(varobj))); } else { if (var.type() == QVariant::Bool) @@ -263,20 +263,20 @@ void QmlEnginePrivate::contextActivated(QmlContext *) { Q_Q(QmlEngine); QmlEngineStack *stack = engineStack(); - if(!stack) + if (!stack) return; QStack<QmlEngine *> *engines = stack->engines(); - if(engines) + if (engines) engines->push(q); } void QmlEnginePrivate::contextDeactivated(QmlContext *) { QmlEngineStack *stack = engineStack(); - if(!stack) + if (!stack) return; QStack<QmlEngine *> *engines = stack->engines(); - if(engines) { + if (engines) { Q_ASSERT(engines->top() == q_func()); engines->pop(); } @@ -289,19 +289,19 @@ bool QmlEnginePrivate::fetchCache(QmlBasicScriptNodeCache &cache, const QString { QmlMetaProperty prop(obj, propName); - if(!prop.isValid()) + if (!prop.isValid()) return false; capturedProperties << prop; - if(prop.type() & QmlMetaProperty::Attached) { + if (prop.type() & QmlMetaProperty::Attached) { cache.object = obj; cache.type = QmlBasicScriptNodeCache::Attached; cache.attached = prop.d->attachedObject(); return true; - } else if(prop.type() & QmlMetaProperty::Property) { + } else if (prop.type() & QmlMetaProperty::Property) { cache.object = obj; cache.type = QmlBasicScriptNodeCache::Core; @@ -309,14 +309,14 @@ bool QmlEnginePrivate::fetchCache(QmlBasicScriptNodeCache &cache, const QString cache.coreType = prop.propertyType(); return true; - } else if(prop.type() & QmlMetaProperty::SignalProperty) { + } else if (prop.type() & QmlMetaProperty::SignalProperty) { cache.object = obj; cache.type = QmlBasicScriptNodeCache::SignalProperty; cache.core = prop.coreIndex(); return true; - } else if(prop.type() & QmlMetaProperty::Signal) { + } else if (prop.type() & QmlMetaProperty::Signal) { cache.object = obj; cache.type = QmlBasicScriptNodeCache::Signal; @@ -331,25 +331,25 @@ bool QmlEnginePrivate::fetchCache(QmlBasicScriptNodeCache &cache, const QString bool QmlEnginePrivate::loadCache(QmlBasicScriptNodeCache &cache, const QString &propName, QmlContextPrivate *context) { while(context) { - if(context->variantProperties.contains(propName)) { + if (context->variantProperties.contains(propName)) { cache.object = 0; cache.type = QmlBasicScriptNodeCache::Variant; cache.context = context; return true; } - if(context->properties.contains(propName)) { + if (context->properties.contains(propName)) { cache.object = context->properties[propName]; cache.type = QmlBasicScriptNodeCache::Explicit; return true; } foreach(QObject *obj, context->defaultObjects) { - if(fetchCache(cache, propName, obj)) + if (fetchCache(cache, propName, obj)) return true; } - if(context->parent) + if (context->parent) context = context->parent->d_func(); else context = 0; @@ -453,7 +453,7 @@ QmlContext *QmlEngine::rootContext() QmlContext *QmlEngine::activeContext() { Q_D(QmlEngine); - if(d->currentBindContext) + if (d->currentBindContext) return d->currentBindContext; else return 0; @@ -591,7 +591,7 @@ void QmlEngine::setNetworkAccessManager(QNetworkAccessManager *network) QNetworkAccessManager *QmlEngine::networkAccessManager() const { Q_D(const QmlEngine); - if(!d->networkAccessManager) + if (!d->networkAccessManager) d->networkAccessManager = new QNetworkAccessManager; return d->networkAccessManager; } @@ -613,12 +613,12 @@ void QmlEngine::setContextForObject(QObject *object, QmlContext *context) QmlSimpleDeclarativeData *data = static_cast<QmlSimpleDeclarativeData *>(priv->declarativeData); - if(data && data->context) { + if (data && data->context) { qWarning("QmlEngine::setContextForObject(): Object already has a QmlContext"); return; } - if(!data) { + if (!data) { priv->declarativeData = &context->d_func()->contextData; } else { // ### - Don't have to use extended data here @@ -648,23 +648,23 @@ QObject *qmlAttachedPropertiesObjectById(int id, const QObject *object) QmlExtendedDeclarativeData *edata = (data && data->flags & QmlSimpleDeclarativeData::Extended)?static_cast<QmlExtendedDeclarativeData *>(data):0; - if(edata) { + if (edata) { QObject *rv = edata->attachedProperties.value(id); - if(rv) + if (rv) return rv; } QmlAttachedPropertiesFunc pf = QmlMetaType::attachedPropertiesFuncById(id); - if(!pf) + if (!pf) return 0; QObject *rv = pf(const_cast<QObject *>(object)); - if(rv) { - if(!edata) { + if (rv) { + if (!edata) { edata = new QmlExtendedDeclarativeData; - if(data) edata->context = data->context; + if (data) edata->context = data->context; priv->declarativeData = edata; } @@ -697,15 +697,15 @@ QScriptEngine *QmlEngine::scriptEngine() QmlEngine *QmlEngine::activeEngine() { QmlEngineStack *stack = engineStack(); - if(!stack) return 0; + if (!stack) return 0; QStack<QmlEngine *> *engines = stack->engines(); - if(!engines) { + if (!engines) { qWarning("QmlEngine::activeEngine() cannot be called before the construction of QCoreApplication"); return 0; } - if(engines->isEmpty()) + if (engines->isEmpty()) return 0; else return engines->top(); @@ -726,7 +726,7 @@ QmlExpressionPrivate::QmlExpressionPrivate(QmlExpression *b, void *expr, QmlRefC QmlExpressionPrivate::QmlExpressionPrivate(QmlExpression *b, const QString &expr, bool ssecompile) : q(b), ctxt(0), expression(expr), sseData(0), proxy(0), me(0), trackChange(true) { - if(ssecompile) { + if (ssecompile) { #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::BindCompile> pt; #endif @@ -816,7 +816,7 @@ QmlContext *QmlExpression::context() const */ QString QmlExpression::expression() const { - if(d->sse.isValid()) + if (d->sse.isValid()) return QLatin1String(d->sse.expression()); else return d->expression; @@ -835,7 +835,7 @@ void QmlExpression::clearExpression() */ void QmlExpression::setExpression(const QString &expression) { - if(d->sseData) { + if (d->sseData) { d->sse.deleteScriptState(d->sseData); d->sseData = 0; } @@ -844,7 +844,7 @@ void QmlExpression::setExpression(const QString &expression) d->expression = expression; - if(d->expression.isEmpty()) + if (d->expression.isEmpty()) d->sse.clear(); else d->sse.compile(expression.toLatin1()); @@ -875,10 +875,10 @@ void BindExpressionProxy::changed() */ QVariant QmlExpression::value() { - if(bindValueDebug()) + if (bindValueDebug()) qWarning() << "QmlEngine: Evaluating:" << expression(); QVariant rv; - if(!d->ctxt || (!d->sse.isValid() && d->expression.isEmpty())) + if (!d->ctxt || (!d->sse.isValid() && d->expression.isEmpty())) return rv; #ifdef Q_ENABLE_PERFORMANCE_LOG @@ -890,14 +890,14 @@ QVariant QmlExpression::value() QmlEnginePrivate *ep = engine()->d_func(); QmlExpression *lastCurrentExpression = ep->currentExpression; ep->currentExpression = this; - if(d->sse.isValid()) { + if (d->sse.isValid()) { #ifdef Q_ENABLE_PERFORMANCE_LOG QFxPerfTimer<QFxPerf::BindValueSSE> perfsse; #endif context()->d_func()->defaultObjects.insert(context()->d_func()->highPriorityCount, d->me); - if(!d->sseData) + if (!d->sseData) d->sseData = d->sse.newScriptState(); rv = d->sse.run(context(), d->sseData, &cacheState); @@ -920,7 +920,7 @@ QVariant QmlExpression::value() if (scriptEngine->hasUncaughtException()) { if (scriptEngine->uncaughtException().isError()){ QScriptValue exception = scriptEngine->uncaughtException(); - if(!exception.property(QLatin1String("fileName")).toString().isEmpty()){ + if (!exception.property(QLatin1String("fileName")).toString().isEmpty()){ qWarning() << exception.property(QLatin1String("fileName")).toString() << scriptEngine->uncaughtExceptionLineNumber() << exception.toString(); @@ -932,14 +932,14 @@ QVariant QmlExpression::value() } context()->d_func()->defaultObjects.removeAt(context()->d_func()->highPriorityCount); - if(svalue.isArray()) { + if (svalue.isArray()) { int length = svalue.property(QLatin1String("length")).toInt32(); - if(length && svalue.property(0).isObject()) { + if (length && svalue.property(0).isObject()) { QList<QObject *> list; - for(int ii = 0; ii < length; ++ii) { + for (int ii = 0; ii < length; ++ii) { QScriptValue arrayItem = svalue.property(ii); QObject *d = qvariant_cast<QObject *>(arrayItem.data().toVariant()); - if(d) { + if (d) { list << d; } else { list << 0; @@ -954,7 +954,7 @@ QVariant QmlExpression::value() if (objValue.isValid()) rv = objValue.toVariant(); } - if(rv.isNull()) { + if (rv.isNull()) { rv = svalue.toVariant(); } @@ -967,35 +967,35 @@ QVariant QmlExpression::value() } ep->currentExpression = lastCurrentExpression; - if(cacheState != QmlBasicScript::NoChange) { - if(cacheState != QmlBasicScript::Incremental && d->proxy) { + if (cacheState != QmlBasicScript::NoChange) { + if (cacheState != QmlBasicScript::Incremental && d->proxy) { delete d->proxy; d->proxy = 0; } - if(trackChange() && ep->capturedProperties.count()) { - if(!d->proxy) + if (trackChange() && ep->capturedProperties.count()) { + if (!d->proxy) d->proxy = new BindExpressionProxy(this); static int changedIndex = -1; - if(changedIndex == -1) + if (changedIndex == -1) changedIndex = BindExpressionProxy::staticMetaObject.indexOfSlot("changed()"); - if(bindValueDebug()) + if (bindValueDebug()) qWarning() << " Depends on:"; - for(int ii = 0; ii < ep->capturedProperties.count(); ++ii) { + for (int ii = 0; ii < ep->capturedProperties.count(); ++ii) { const QmlMetaProperty &prop = ep->capturedProperties.at(ii); - if(prop.hasChangedNotifier()) { + if (prop.hasChangedNotifier()) { prop.connectNotifier(d->proxy, changedIndex); - if(bindValueDebug()) + if (bindValueDebug()) qWarning() << " property" << prop.name() << prop.object() << prop.object()->metaObject()->superClass()->className(); - } else if(bindValueDebug()) { + } else if (bindValueDebug()) { qWarning() << " non-subscribable property" << prop.name() << prop.object() @@ -1006,7 +1006,7 @@ QVariant QmlExpression::value() } ep->capturedProperties.clear(); - if(bindValueDebug()) + if (bindValueDebug()) qWarning() << " Result:" << rv << "(SSE: " << d->sse.isValid() << ")"; return rv; @@ -1177,10 +1177,10 @@ QmlContextScriptClass::queryProperty(const QScriptValue &object, *id = ObjectListPropertyId; } - for(int ii = 0; !rv && ii < bindContext->d_func()->defaultObjects.count(); ++ii) { + for (int ii = 0; !rv && ii < bindContext->d_func()->defaultObjects.count(); ++ii) { rv = engine->d_func()->queryObject(propName, id, bindContext->d_func()->defaultObjects.at(ii)); - if(rv) + if (rv) *id |= (ii << 24); } @@ -1234,7 +1234,7 @@ QScriptValue QmlContextScriptClass::property(const QScriptValue &object, QObject *obj = bindContext->d_func()->defaultObjects.at(objId); QScriptValue rv = engine->d_func()->propertyObject(name, obj, id & ~QmlScriptClass::ClassIdSelectorMask); - if(rv.isValid()) { + if (rv.isValid()) { #ifdef PROPERTY_DEBUG qWarning() << "~Property: Resolved property" << propName << "to context default object" << bindContext << obj <<". Value:" << rv.toVariant(); @@ -1340,7 +1340,7 @@ QScriptValue QmlObjectScriptClass::property(const QScriptValue &object, #endif QScriptValue rv = engine->d_func()->propertyObject(name, obj, id); - if(rv.isValid()) { + if (rv.isValid()) { #ifdef PROPERTY_DEBUG qWarning() << "~Property: Resolved property" << propName << "to object" << obj <<". Value:" << rv.toVariant(); diff --git a/src/declarative/qml/qmlinfo.cpp b/src/declarative/qml/qmlinfo.cpp index dc7f44c..a2b304f 100644 --- a/src/declarative/qml/qmlinfo.cpp +++ b/src/declarative/qml/qmlinfo.cpp @@ -75,7 +75,7 @@ QmlInfo::QmlInfo(QObject *object) : QDebug(QtWarningMsg) { *this << "QML"; - if(object) + if (object) *this << object->metaObject()->className(); *this << "(unknown location):"; } diff --git a/src/declarative/qml/qmlinstruction.cpp b/src/declarative/qml/qmlinstruction.cpp index 848c8db..82924c8 100644 --- a/src/declarative/qml/qmlinstruction.cpp +++ b/src/declarative/qml/qmlinstruction.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE void QmlCompiledComponent::dump(QmlInstruction *instr, int idx) { QByteArray lineNumber = QByteArray::number(instr->line); - if(instr->line == (unsigned short)-1) + if (instr->line == (unsigned short)-1) lineNumber = "NA"; const char *line = lineNumber.constData(); diff --git a/src/declarative/qml/qmlmetaproperty.cpp b/src/declarative/qml/qmlmetaproperty.cpp index 780f8a8..1a511eb 100644 --- a/src/declarative/qml/qmlmetaproperty.cpp +++ b/src/declarative/qml/qmlmetaproperty.cpp @@ -127,13 +127,13 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, QmlContext *ctxt) void QmlMetaProperty::initDefault(QObject *obj) { - if(!obj) + if (!obj) return; d->object = obj; QHash<const QMetaObject *, QMetaPropertyEx>::ConstIterator iter = qmlCacheDefProp.find(obj->metaObject()); - if(iter != qmlCacheDefProp.end()) { + if (iter != qmlCacheDefProp.end()) { d->prop = *iter; d->propType = iter->propertyType; d->coreIdx = iter->propertyType; @@ -142,10 +142,10 @@ void QmlMetaProperty::initDefault(QObject *obj) d->prop = p; d->propType = p.propertyType; d->coreIdx = d->prop.propertyIndex(); - if(!QObjectPrivate::get(obj)->metaObject) + if (!QObjectPrivate::get(obj)->metaObject) qmlCacheDefProp.insert(obj->metaObject(), d->prop); } - if(d->prop.name() != 0) { + if (d->prop.name() != 0) { d->type = Property | Default; d->name = QLatin1String(d->prop.name()); } @@ -169,7 +169,7 @@ QmlMetaProperty::QmlMetaProperty(QObject *obj, int idx, PropertyCategory cat, Qm d->prop = p; d->propType = p.propertyType; d->coreIdx = idx; - if(d->prop.name() != 0) + if (d->prop.name() != 0) d->name = QLatin1String(d->prop.name()); } @@ -203,22 +203,22 @@ void QmlMetaProperty::initProperty(QObject *obj, const QString &name) { d->name = name; d->object = obj; - if(name.isEmpty() || !obj) + if (name.isEmpty() || !obj) return; - if(name.at(0).isUpper()) { + if (name.at(0).isUpper()) { // Attached property d->attachedFunc = QmlMetaType::attachedPropertiesFuncId(name.toLatin1()); - if(d->attachedFunc != -1) + if (d->attachedFunc != -1) d->type = Property | Attached; return; - } else if(name.count() >= 3 && name.startsWith(QLatin1String("on")) && name.at(2).isUpper()) { + } else if (name.count() >= 3 && name.startsWith(QLatin1String("on")) && name.at(2).isUpper()) { // Signal QString signalName = name.mid(2); signalName[0] = signalName.at(0).toLower(); d->findSignalInt(obj, signalName); - if(d->signal.signature() != 0) { + if (d->signal.signature() != 0) { d->type = SignalProperty; return; } @@ -227,7 +227,7 @@ void QmlMetaProperty::initProperty(QObject *obj, const QString &name) // Property QHash<QString, QMetaPropertyEx> &props = qmlCacheProps[obj->metaObject()]; QHash<QString, QMetaPropertyEx>::ConstIterator iter = props.find(name); - if(iter != props.end()) { + if (iter != props.end()) { d->prop = *iter; d->propType = iter->propertyType; d->coreIdx = iter->propertyIndex(); @@ -239,12 +239,12 @@ void QmlMetaProperty::initProperty(QObject *obj, const QString &name) if (!QObjectPrivate::get(obj)->metaObject) props.insert(name, p); } - if(d->prop.name() != 0) + if (d->prop.name() != 0) d->type = Property; - if(d->type == Invalid) { + if (d->type == Invalid) { int sig = findSignal(obj, name.toLatin1()); - if(sig != -1) { + if (sig != -1) { d->signal = obj->metaObject()->method(sig); d->type = Signal; d->coreIdx = sig; @@ -271,17 +271,17 @@ QmlMetaProperty::PropertyCategory QmlMetaProperty::propertyCategory() const QmlMetaProperty::PropertyCategory QmlMetaPropertyPrivate::propertyCategory() const { - if(category == QmlMetaProperty::Unknown) { + if (category == QmlMetaProperty::Unknown) { int type = propertyType(); - if(type == QmlMetaProperty::Invalid) + if (type == QmlMetaProperty::Invalid) category = QmlMetaProperty::InvalidProperty; - else if(type == qMetaTypeId<QmlBindableValue *>()) + else if (type == qMetaTypeId<QmlBindableValue *>()) category = QmlMetaProperty::Bindable; - else if(QmlMetaType::isList(type)) + else if (QmlMetaType::isList(type)) category = QmlMetaProperty::List; - else if(QmlMetaType::isQmlList(type)) + else if (QmlMetaType::isQmlList(type)) category = QmlMetaProperty::QmlList; - else if(QmlMetaType::isObject(type)) + else if (QmlMetaType::isObject(type)) category = QmlMetaProperty::Object; else category = QmlMetaProperty::Normal; @@ -295,22 +295,22 @@ QmlMetaPropertyPrivate::propertyCategory() const QmlMetaProperty::PropertyCategory QmlMetaProperty::propertyCategory(const QMetaProperty &prop) { - if(prop.name()) { + if (prop.name()) { int type = 0; - if(prop.type() == QVariant::LastType) + if (prop.type() == QVariant::LastType) type = qMetaTypeId<QVariant>(); - else if(prop.type() == QVariant::UserType) + else if (prop.type() == QVariant::UserType) type = prop.userType(); else type = prop.type(); - if(type == qMetaTypeId<QmlBindableValue *>()) + if (type == qMetaTypeId<QmlBindableValue *>()) return Bindable; - else if(QmlMetaType::isList(type)) + else if (QmlMetaType::isList(type)) return List; - else if(QmlMetaType::isQmlList(type)) + else if (QmlMetaType::isQmlList(type)) return QmlList; - else if(QmlMetaType::isObject(type)) + else if (QmlMetaType::isObject(type)) return Object; else return Normal; @@ -325,7 +325,7 @@ QmlMetaProperty::propertyCategory(const QMetaProperty &prop) */ const char *QmlMetaProperty::propertyTypeName() const { - if(d->prop.name()) { + if (d->prop.name()) { return d->prop.typeName(); } else { return 0; @@ -357,12 +357,12 @@ int QmlMetaPropertyPrivate::propertyType() const { int rv = QVariant::Invalid; - if(prop.name()) { - if(propType == (int)QVariant::LastType) + if (prop.name()) { + if (propType == (int)QVariant::LastType) rv = qMetaTypeId<QVariant>(); else rv = propType; - } else if(attachedFunc) { + } else if (attachedFunc) { rv = qMetaTypeId<QObject *>(); } @@ -423,11 +423,11 @@ QmlMetaProperty &QmlMetaProperty::operator=(const QmlMetaProperty &other) */ bool QmlMetaProperty::isWritable() const { - if(propertyCategory() == List || propertyCategory() == QmlList) + if (propertyCategory() == List || propertyCategory() == QmlList) return true; - else if(d->prop.name() != 0) + else if (d->prop.name() != 0) return d->prop.isWritable(); - else if(type() & SignalProperty) + else if (type() & SignalProperty) return true; else return false; @@ -438,7 +438,7 @@ bool QmlMetaProperty::isWritable() const */ bool QmlMetaProperty::isDesignable() const { - if(d->prop.name() != 0) + if (d->prop.name() != 0) return d->prop.isDesignable(); else return false; @@ -458,12 +458,12 @@ bool QmlMetaProperty::isValid() const */ QStringList QmlMetaProperty::properties(QObject *obj) { - if(!obj) + if (!obj) return QStringList(); QStringList rv; const QMetaObject *mo = obj->metaObject(); - for(int ii = 0; ii < mo->propertyCount(); ++ii) { + for (int ii = 0; ii < mo->propertyCount(); ++ii) { QMetaProperty prop = mo->property(ii); rv << QLatin1String(prop.name()); } @@ -490,16 +490,16 @@ const QMetaProperty &QmlMetaProperty::property() const */ QmlBindableValue *QmlMetaProperty::binding() { - if(!isProperty() || type() & Attached) + if (!isProperty() || type() & Attached) return 0; const QObjectList &children = object()->children(); - for(QObjectList::ConstIterator iter = children.begin(); + for (QObjectList::ConstIterator iter = children.begin(); iter != children.end(); ++iter) { QObject *child = *iter; - if(child->metaObject() == &QmlBindableValue::staticMetaObject) { + if (child->metaObject() == &QmlBindableValue::staticMetaObject) { QmlBindableValue *v = static_cast<QmlBindableValue *>(child); - if(v->property() == *this) + if (v->property() == *this) return v; } } @@ -511,16 +511,16 @@ int QmlMetaProperty::findSignal(const QObject *obj, const char *name) { const QMetaObject *mo = obj->metaObject(); int methods = mo->methodCount(); - for(int ii = 0; ii < methods; ++ii) { + for (int ii = 0; ii < methods; ++ii) { QMetaMethod method = mo->method(ii); - if(method.methodType() != QMetaMethod::Signal) + if (method.methodType() != QMetaMethod::Signal) continue; QByteArray methodName = method.signature(); int idx = methodName.indexOf('('); methodName = methodName.left(idx); - if(methodName == name) + if (methodName == name) return ii; } return -1; @@ -531,13 +531,13 @@ void QmlMetaPropertyPrivate::findSignalInt(QObject *obj, const QString &name) const QMetaObject *mo = obj->metaObject(); int methods = mo->methodCount(); - for(int ii = 0; ii < methods; ++ii) { + for (int ii = 0; ii < methods; ++ii) { QMetaMethod method = mo->method(ii); QString methodName = QLatin1String(method.signature()); int idx = methodName.indexOf(QLatin1Char('(')); methodName = methodName.left(idx); - if(methodName == name) { + if (methodName == name) { signal = method; coreIdx = ii; return; @@ -547,7 +547,7 @@ void QmlMetaPropertyPrivate::findSignalInt(QObject *obj, const QString &name) QObject *QmlMetaPropertyPrivate::attachedObject() const { - if(attachedFunc == -1) + if (attachedFunc == -1) return 0; else return qmlAttachedPropertiesObjectById(attachedFunc, object); @@ -558,17 +558,17 @@ QObject *QmlMetaPropertyPrivate::attachedObject() const */ QVariant QmlMetaProperty::read() const { - if(type() & SignalProperty) { + if (type() & SignalProperty) { const QObjectList &children = object()->children(); - for(int ii = 0; ii < children.count(); ++ii) { + for (int ii = 0; ii < children.count(); ++ii) { QmlBoundSignal *sig = qobject_cast<QmlBoundSignal *>(children.at(ii)); - if(sig && sig->index() == d->coreIdx) + if (sig && sig->index() == d->coreIdx) return sig->expression(); } - } else if(type() & Property) { - if(type() & Attached) + } else if (type() & Property) { + if (type() & Attached) return QVariant::fromValue(d->attachedObject()); else return d->prop.read(object()); @@ -583,10 +583,10 @@ void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value) QString expr = value.toString(); const QObjectList &children = object->children(); - for(int ii = 0; ii < children.count(); ++ii) { + for (int ii = 0; ii < children.count(); ++ii) { QmlBoundSignal *sig = qobject_cast<QmlBoundSignal *>(children.at(ii)); - if(sig && sig->index() == coreIdx) { - if(expr.isEmpty()) { + if (sig && sig->index() == coreIdx) { + if (expr.isEmpty()) { sig->disconnect(); sig->deleteLater(); } else { @@ -596,7 +596,7 @@ void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value) } } - if(!expr.isEmpty()) { + if (!expr.isEmpty()) { // XXX scope (void *)new QmlBoundSignal(QmlContext::activeContext(), expr, object, coreIdx, object); @@ -605,7 +605,7 @@ void QmlMetaPropertyPrivate::writeSignalProperty(const QVariant &value) void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) { - if(prop.isEnumType()) { + if (prop.isEnumType()) { QVariant v = value; if (value.type() == QVariant::Double) { //enum values come through the script engine as doubles double integral; @@ -615,43 +615,43 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) } prop.write(object, v); } else { - if(!value.isValid()) + if (!value.isValid()) return; int t = propertyType(); int vt = value.type(); - if(vt == t || + if (vt == t || value.userType() == t) { void *a[1]; a[0] = (void *)value.constData(); QMetaObject::metacall(object, QMetaObject::WriteProperty, coreIdx, a); - } else if(qMetaTypeId<QVariant>() == t) { + } else if (qMetaTypeId<QVariant>() == t) { prop.write(object, value); - } else if(propertyCategory() == QmlMetaProperty::Object) { + } else if (propertyCategory() == QmlMetaProperty::Object) { QObject *o = QmlMetaType::toQObject(value); - if(o) + if (o) prop.write(object, QmlMetaType::fromObject(o, propertyType())); } else if (propertyCategory() == QmlMetaProperty::List) { int listType = QmlMetaType::listType(t); - if(value.userType() == qMetaTypeId<QList<QObject *> >()) { + if (value.userType() == qMetaTypeId<QList<QObject *> >()) { const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value); QVariant listVar = prop.read(object); QmlMetaType::clear(listVar); - for(int ii = 0; ii < list.count(); ++ii) { + for (int ii = 0; ii < list.count(); ++ii) { QVariant v = QmlMetaType::fromObject(list.at(ii), listType); QmlMetaType::append(listVar, v); } - } else if(vt == listType || + } else if (vt == listType || value.userType() == listType) { QVariant listVar = prop.read(object); if (!QmlMetaType::append(listVar, value)) { @@ -673,13 +673,13 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) const QMetaObject *objMo = obj->metaObject(); bool found = false; while(!found && objMo) { - if(objMo == mo) + if (objMo == mo) found = true; else objMo = objMo->superClass(); } - if(!found) { + if (!found) { qWarning() << "Unable to assign object to list"; return; } @@ -689,22 +689,22 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) void *d = (void *)&obj; li->append(d); } - } else if(propertyCategory() == QmlMetaProperty::Normal) { + } else if (propertyCategory() == QmlMetaProperty::Normal) { switch(t) { case QVariant::Double: { qreal r; bool found = true; - if(vt == QVariant::Int) { + if (vt == QVariant::Int) { r = value.toInt(); - } else if(vt == QVariant::UInt) { + } else if (vt == QVariant::UInt) { r = value.toUInt(); } else { found = false; } - if(found) { + if (found) { void *a[1]; a[0] = &r; QMetaObject::metacall(object, @@ -719,15 +719,15 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) { int i; bool found = true; - if(vt == QVariant::Double) { + if (vt == QVariant::Double) { i = (int)value.toDouble(); - } else if(vt == QVariant::UInt) { + } else if (vt == QVariant::UInt) { i = (int)value.toUInt(); } else { found = false; } - if(found) { + if (found) { void *a[1]; a[0] = &i; QMetaObject::metacall(object, @@ -742,13 +742,13 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) { QString s; bool found = true; - if(vt == QVariant::ByteArray) { + if (vt == QVariant::ByteArray) { s = QLatin1String(value.toByteArray()); } else { found = false; } - if(found) { + if (found) { void *a[1]; a[0] = &s; QMetaObject::metacall(object, @@ -774,13 +774,13 @@ void QmlMetaPropertyPrivate::writeValueProperty(const QVariant &value) */ void QmlMetaProperty::write(const QVariant &value) const { - if(type() & SignalProperty) { + if (type() & SignalProperty) { d->writeSignalProperty(value); - } else if(d->prop.name()) { + } else if (d->prop.name()) { - if(d->prop.isEnumType()) { + if (d->prop.isEnumType()) { QVariant v = value; if (value.type() == QVariant::Double) { //enum values come through the script engine as doubles double integral; @@ -790,43 +790,43 @@ void QmlMetaProperty::write(const QVariant &value) const } d->prop.write(object(), v); } else { - if(!value.isValid()) + if (!value.isValid()) return; int t = propertyType(); int vt = value.type(); - if(vt == t || + if (vt == t || value.userType() == t) { void *a[1]; a[0] = (void *)value.constData(); QMetaObject::metacall(object(), QMetaObject::WriteProperty, d->coreIdx, a); - } else if(qMetaTypeId<QVariant>() == t) { + } else if (qMetaTypeId<QVariant>() == t) { d->prop.write(object(), value); - } else if(propertyCategory() == Object) { + } else if (propertyCategory() == Object) { QObject *o = QmlMetaType::toQObject(value); - if(o) + if (o) d->prop.write(object(), QmlMetaType::fromObject(o, propertyType())); } else if (propertyCategory() == List) { int listType = QmlMetaType::listType(t); - if(value.userType() == qMetaTypeId<QList<QObject *> >()) { + if (value.userType() == qMetaTypeId<QList<QObject *> >()) { const QList<QObject *> &list = qvariant_cast<QList<QObject *> >(value); QVariant listVar = d->prop.read(object()); QmlMetaType::clear(listVar); - for(int ii = 0; ii < list.count(); ++ii) { + for (int ii = 0; ii < list.count(); ++ii) { QVariant v = QmlMetaType::fromObject(list.at(ii), listType); QmlMetaType::append(listVar, v); } - } else if(vt == listType || + } else if (vt == listType || value.userType() == listType) { QVariant listVar = d->prop.read(object()); if (!QmlMetaType::append(listVar, value)) { @@ -848,13 +848,13 @@ void QmlMetaProperty::write(const QVariant &value) const const QMetaObject *objMo = obj->metaObject(); bool found = false; while(!found && objMo) { - if(objMo == mo) + if (objMo == mo) found = true; else objMo = objMo->superClass(); } - if(!found) { + if (!found) { qWarning() << "Unable to assign object to list"; return; } @@ -864,22 +864,22 @@ void QmlMetaProperty::write(const QVariant &value) const void *d = (void *)&obj; li->append(d); } - } else if(propertyCategory() == Normal) { + } else if (propertyCategory() == Normal) { switch(t) { case QVariant::Double: { qreal r; bool found = true; - if(vt == QVariant::Int) { + if (vt == QVariant::Int) { r = value.toInt(); - } else if(vt == QVariant::UInt) { + } else if (vt == QVariant::UInt) { r = value.toUInt(); } else { found = false; } - if(found) { + if (found) { void *a[1]; a[0] = &r; QMetaObject::metacall(object(), @@ -894,15 +894,15 @@ void QmlMetaProperty::write(const QVariant &value) const { int i; bool found = true; - if(vt == QVariant::Double) { + if (vt == QVariant::Double) { i = (int)value.toDouble(); - } else if(vt == QVariant::UInt) { + } else if (vt == QVariant::UInt) { i = (int)value.toUInt(); } else { found = false; } - if(found) { + if (found) { void *a[1]; a[0] = &i; QMetaObject::metacall(object(), @@ -917,13 +917,13 @@ void QmlMetaProperty::write(const QVariant &value) const { QString s; bool found = true; - if(vt == QVariant::ByteArray) { + if (vt == QVariant::ByteArray) { s = QLatin1String(value.toByteArray()); } else { found = false; } - if(found) { + if (found) { void *a[1]; a[0] = &s; QMetaObject::metacall(object(), @@ -950,7 +950,7 @@ void QmlMetaProperty::write(const QVariant &value) const */ bool QmlMetaProperty::hasChangedNotifier() const { - if(type() & Property && !(type() & Attached)) { + if (type() & Property && !(type() & Attached)) { return d->prop.hasNotifySignal(); } return false; @@ -966,10 +966,10 @@ bool QmlMetaProperty::hasChangedNotifier() const */ bool QmlMetaProperty::connectNotifier(QObject *dest, int method) const { - if(!(type() & Property) || type() & Attached) + if (!(type() & Property) || type() & Attached) return false; - if(d->prop.hasNotifySignal()) { + if (d->prop.hasNotifySignal()) { return QMetaObject::connect(d->object, d->prop.notifySignalIndex(), dest, method, Qt::DirectConnection); } else { return false; @@ -986,10 +986,10 @@ bool QmlMetaProperty::connectNotifier(QObject *dest, int method) const */ bool QmlMetaProperty::connectNotifier(QObject *dest, const char *slot) const { - if(!(type() & Property) || type() & Attached) + if (!(type() & Property) || type() & Attached) return false; - if(d->prop.hasNotifySignal()) { + if (d->prop.hasNotifySignal()) { QByteArray signal(QByteArray("2") + d->prop.notifySignal().signature()); return QObject::connect(d->object, signal.constData(), dest, slot); } else { @@ -1000,8 +1000,8 @@ bool QmlMetaProperty::connectNotifier(QObject *dest, const char *slot) const /*! \internal */ void QmlMetaProperty::emitSignal() { - if(type() & Signal) { - if(d->signal.parameterTypes().isEmpty()) + if (type() & Signal) { + if (d->signal.parameterTypes().isEmpty()) d->object->metaObject()->activate(d->object, d->coreIdx, 0); else qWarning() << "QmlMetaProperty: Cannot emit signal with parameters"; @@ -1023,9 +1023,9 @@ int QmlMetaProperty::coreIndex() const quint32 QmlMetaProperty::save() const { quint32 rv = 0; - if(type() & Attached) { + if (type() & Attached) { rv = d->attachedFunc; - } else if(type() != Invalid) { + } else if (type() != Invalid) { rv = d->coreIdx; } @@ -1050,14 +1050,14 @@ void QmlMetaProperty::restore(quint32 id, QObject *obj) d->type = id >> 16; id &= 0xFFFF; - if(d->type & Attached) { + if (d->type & Attached) { d->attachedFunc = id; - } else if(d->type & Property) { + } else if (d->type & Property) { QMetaPropertyEx p(obj->metaObject()->property(id)); d->prop = p; d->propType = p.propertyType; d->coreIdx = id; - } else if(d->type & SignalProperty || d->type & Signal) { + } else if (d->type & SignalProperty || d->type & Signal) { d->signal = obj->metaObject()->method(id); d->coreIdx = id; } diff --git a/src/declarative/qml/qmlmetatype.cpp b/src/declarative/qml/qmlmetatype.cpp index c12f01a..9b99917 100644 --- a/src/declarative/qml/qmlmetatype.cpp +++ b/src/declarative/qml/qmlmetatype.cpp @@ -164,7 +164,7 @@ QmlType::QmlType(int type, int listType, int qmlListType, d->m_extFunc = extFunc; d->m_index = index; - if(extMetaObject) + if (extMetaObject) d->m_extMetaObject = extMetaObject; } @@ -175,16 +175,16 @@ QmlType::~QmlType() void QmlTypePrivate::init() const { - if(m_isSetup) return; + if (m_isSetup) return; QWriteLocker lock(metaTypeDataLock()); - if(m_isSetup) + if (m_isSetup) return; // Setup extended meta object // XXX - very inefficient const QMetaObject *mo = m_baseMetaObject; - if(m_extFunc) { + if (m_extFunc) { QMetaObject *mmo = new QMetaObject; *mmo = *m_extMetaObject; mmo->d.superdata = mo; @@ -195,12 +195,12 @@ void QmlTypePrivate::init() const mo = mo->d.superdata; while(mo) { QmlType *t = metaTypeData()->metaObjectToType.value(mo); - if(t) { - if(t->d->m_extFunc) { + if (t) { + if (t->d->m_extFunc) { QMetaObject *mmo = new QMetaObject; *mmo = *t->d->m_extMetaObject; mmo->d.superdata = m_baseMetaObject; - if(!m_metaObjects.isEmpty()) + if (!m_metaObjects.isEmpty()) m_metaObjects.last().metaObject->d.superdata = mmo; QmlProxyMetaObject::ProxyData data = { mmo, t->d->m_extFunc, 0 }; m_metaObjects << data; @@ -209,7 +209,7 @@ void QmlTypePrivate::init() const mo = mo->d.superdata; } - for(int ii = 0; ii < m_metaObjects.count(); ++ii) + for (int ii = 0; ii < m_metaObjects.count(); ++ii) m_metaObjects[ii].propertyOffset = m_metaObjects.at(ii).metaObject->propertyOffset(); @@ -218,7 +218,7 @@ void QmlTypePrivate::init() const const QMetaObject *myMetaObject = m_metaObjects.isEmpty()?m_baseMetaObject:m_metaObjects.first().metaObject; - for(int ii = 0; ii < myMetaObject->propertyCount(); ++ii) { + for (int ii = 0; ii < myMetaObject->propertyCount(); ++ii) { QMetaProperty prop = myMetaObject->property(ii); hashData.append(prop.type()); hashData.append("|"); @@ -226,7 +226,7 @@ void QmlTypePrivate::init() const hashData.append("|"); } - for(int ii = 0; ii < myMetaObject->methodCount(); ++ii) { + for (int ii = 0; ii < myMetaObject->methodCount(); ++ii) { QMetaMethod method = myMetaObject->method(ii); hashData.append(method.signature()); hashData.append("|"); @@ -240,7 +240,7 @@ void QmlTypePrivate::init() const QByteArray QmlType::typeName() const { - if(d->m_baseMetaObject) + if (d->m_baseMetaObject) return d->m_baseMetaObject->className(); else return QByteArray(); @@ -324,7 +324,7 @@ const QMetaObject *QmlType::metaObject() const { d->init(); - if(d->m_metaObjects.isEmpty()) + if (d->m_metaObjects.isEmpty()) return d->m_baseMetaObject; else return d->m_metaObjects.first().metaObject; @@ -383,11 +383,11 @@ int QmlMetaType::registerInterface(const QmlPrivate::MetaTypeIds &id, data->idToType.insert(type->qmlListTypeId(), type); data->nameToType.insert(type->qmlTypeName(), type); - if(data->interfaces.size() < id.typeId) + if (data->interfaces.size() < id.typeId) data->interfaces.resize(id.typeId + 16); - if(data->qmllists.size() < id.qmlListId) + if (data->qmllists.size() < id.qmlListId) data->qmllists.resize(id.qmlListId + 16); - if(data->lists.size() < id.listId) + if (data->lists.size() < id.listId) data->lists.resize(id.listId + 16); data->interfaces.setBit(id.typeId, true); data->qmllists.setBit(id.qmlListId, true); @@ -403,8 +403,8 @@ int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Fun QmlMetaTypeData *data = metaTypeData(); QString name = QLatin1String(cname); - for(int ii = 0; ii < name.count(); ++ii) { - if(!name.at(ii).isLetterOrNumber()) { + for (int ii = 0; ii < name.count(); ++ii) { + if (!name.at(ii).isLetterOrNumber()) { qWarning("QmlMetaType: Invalid QML name %s", cname); return -1; } @@ -421,16 +421,16 @@ int QmlMetaType::registerType(const QmlPrivate::MetaTypeIds &id, QmlPrivate::Fun data->idToType.insert(type->qListTypeId(), type); data->idToType.insert(type->qmlListTypeId(), type); - if(!type->qmlTypeName().isEmpty()) + if (!type->qmlTypeName().isEmpty()) data->nameToType.insert(type->qmlTypeName(), type); data->metaObjectToType.insert(type->baseMetaObject(), type); - if(data->objects.size() <= id.typeId) + if (data->objects.size() <= id.typeId) data->objects.resize(id.typeId + 16); - if(data->qmllists.size() <= id.qmlListId) + if (data->qmllists.size() <= id.qmlListId) data->qmllists.resize(id.qmlListId + 16); - if(data->lists.size() <= id.listId) + if (data->lists.size() <= id.listId) data->lists.resize(id.listId + 16); data->objects.setBit(id.typeId, true); data->qmllists.setBit(id.qmlListId, true); @@ -446,7 +446,7 @@ void QmlMetaType::registerCustomParser(const char *qmlName, QmlMetaTypeData *data = metaTypeData(); Q_ASSERT(parser); - if(data->customParsers.contains(qmlName)) { + if (data->customParsers.contains(qmlName)) { delete parser; return; } @@ -468,7 +468,7 @@ int QmlMetaType::qmlParserStatusCast(int userType) QReadLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(userType); - if(type && type->typeId() == userType) + if (type && type->typeId() == userType) return type->parserStatusCast(); else return -1; @@ -476,7 +476,7 @@ int QmlMetaType::qmlParserStatusCast(int userType) QObject *QmlMetaType::toQObject(const QVariant &v) { - if(!isObject(v.userType())) + if (!isObject(v.userType())) return 0; // NOTE: This assumes a cast to QObject does not alter the @@ -493,7 +493,7 @@ int QmlMetaType::listType(int id) QReadLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(id); - if(type && type->qListTypeId() == id) + if (type && type->qListTypeId() == id) return type->typeId(); else return 0; @@ -507,7 +507,7 @@ int QmlMetaType::qmlListType(int id) QReadLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(id); - if(type && type->qmlListTypeId() == id) + if (type && type->qmlListTypeId() == id) return type->typeId(); else return 0; @@ -520,7 +520,7 @@ bool QmlMetaType::clear(const QVariant &list) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(userType); lock.unlock(); - if(type && type->qListTypeId() == userType) { + if (type && type->qListTypeId() == userType) { type->listClear(list); return true; } else { @@ -535,7 +535,7 @@ bool QmlMetaType::append(const QVariant &list, const QVariant &item) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(userType); lock.unlock(); - if(type && type->qListTypeId() == userType && + if (type && type->qListTypeId() == userType && item.userType() == type->typeId()) { type->listAppend(list, item); return true; @@ -551,7 +551,7 @@ QObject *QmlMetaType::create(const QByteArray &name) lock.unlock(); QmlType *type = data->nameToType.value(name); - if(type) + if (type) return type->create(); else return 0; @@ -563,7 +563,7 @@ QVariant QmlMetaType::fromObject(QObject *obj, int typeId) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(typeId); - if(type && type->typeId() == typeId) + if (type && type->typeId() == typeId) return type->fromObject(obj); else return QVariant(); @@ -575,7 +575,7 @@ const QMetaObject *QmlMetaType::rawMetaObjectForType(int id) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(id); - if(type && type->typeId() == id) + if (type && type->typeId() == id) return type->baseMetaObject(); else return 0; @@ -587,7 +587,7 @@ const QMetaObject *QmlMetaType::rawMetaObjectForType(const QByteArray &name) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->nameToType.value(name); - if(type) + if (type) return type->baseMetaObject(); else return 0; @@ -600,7 +600,7 @@ const QMetaObject *QmlMetaType::metaObjectForType(int id) QmlType *type = data->idToType.value(id); lock.unlock(); - if(type && type->typeId() == id) + if (type && type->typeId() == id) return type->metaObject(); else return 0; @@ -613,7 +613,7 @@ const QMetaObject *QmlMetaType::metaObjectForType(const QByteArray &name) QmlType *type = data->nameToType.value(name); lock.unlock(); - if(type) + if (type) return type->metaObject(); else return 0; @@ -625,7 +625,7 @@ int QmlMetaType::type(const QByteArray &name) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->nameToType.value(name); - if(type) + if (type) return type->typeId(); else return 0; @@ -637,7 +637,7 @@ int QmlMetaType::attachedPropertiesFuncId(const QByteArray &name) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->nameToType.value(name); - if(type && type->attachedPropertiesFunction()) + if (type && type->attachedPropertiesFunction()) return type->index(); else return -1; @@ -649,7 +649,7 @@ int QmlMetaType::attachedPropertiesFuncId(const QMetaObject *mo) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->metaObjectToType.value(mo); - if(type && type->attachedPropertiesFunction()) + if (type && type->attachedPropertiesFunction()) return type->index(); else return -1; @@ -657,7 +657,7 @@ int QmlMetaType::attachedPropertiesFuncId(const QMetaObject *mo) QmlAttachedPropertiesFunc QmlMetaType::attachedPropertiesFuncById(int id) { - if(id < 0) + if (id < 0) return 0; QReadLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); @@ -670,7 +670,7 @@ QmlMetaType::attachedPropertiesFunc(const QByteArray &name) QReadLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->nameToType.value(name); - if(type) + if (type) return type->attachedPropertiesFunction(); else return 0; @@ -679,15 +679,15 @@ QmlMetaType::attachedPropertiesFunc(const QByteArray &name) QMetaProperty QmlMetaType::defaultProperty(const QMetaObject *metaObject) { int idx = metaObject->indexOfClassInfo("DefaultProperty"); - if(-1 == idx) + if (-1 == idx) return QMetaProperty(); QMetaClassInfo info = metaObject->classInfo(idx); - if(!info.value()) + if (!info.value()) return QMetaProperty(); idx = metaObject->indexOfProperty(info.value()); - if(-1 == idx) + if (-1 == idx) return QMetaProperty(); return metaObject->property(idx); @@ -695,7 +695,7 @@ QMetaProperty QmlMetaType::defaultProperty(const QMetaObject *metaObject) QMetaProperty QmlMetaType::defaultProperty(QObject *obj) { - if(!obj) + if (!obj) return QMetaProperty(); const QMetaObject *metaObject = obj->metaObject(); @@ -705,15 +705,15 @@ QMetaProperty QmlMetaType::defaultProperty(QObject *obj) QMetaMethod QmlMetaType::defaultMethod(const QMetaObject *metaObject) { int idx = metaObject->indexOfClassInfo("DefaultMethod"); - if(-1 == idx) + if (-1 == idx) return QMetaMethod(); QMetaClassInfo info = metaObject->classInfo(idx); - if(!info.value()) + if (!info.value()) return QMetaMethod(); idx = metaObject->indexOfMethod(info.value()); - if(-1 == idx) + if (-1 == idx) return QMetaMethod(); return metaObject->method(idx); @@ -721,7 +721,7 @@ QMetaMethod QmlMetaType::defaultMethod(const QMetaObject *metaObject) QMetaMethod QmlMetaType::defaultMethod(QObject *obj) { - if(!obj) + if (!obj) return QMetaMethod(); const QMetaObject *metaObject = obj->metaObject(); @@ -739,13 +739,13 @@ QMetaProperty QmlMetaType::property(QObject *obj, const QByteArray &bname) */ QMetaProperty QmlMetaType::property(QObject *obj, const char *name) { - if(!obj) + if (!obj) return QMetaProperty(); const QMetaObject *metaObject = obj->metaObject(); int idx = metaObject->indexOfProperty(name); - if(-1 == idx) + if (-1 == idx) return QMetaProperty(); return metaObject->property(idx); @@ -771,7 +771,7 @@ const char *QmlMetaType::interfaceIId(int userType) QmlMetaTypeData *data = metaTypeData(); QmlType *type = data->idToType.value(userType); lock.unlock(); - if(type && type->isInterface() && type->typeId() == userType) + if (type && type->isInterface() && type->typeId() == userType) return type->interfaceIId(); else return 0; @@ -780,7 +780,7 @@ const char *QmlMetaType::interfaceIId(int userType) bool QmlMetaType::isObject(const QMetaObject *mo) { while(mo) { - if(mo == &QObject::staticMetaObject) + if (mo == &QObject::staticMetaObject) return true; mo = mo->superClass(); } @@ -815,7 +815,7 @@ int QmlMetaType::listCount(const QVariant &v) QmlType *type = data->idToType.value(userType); lock.unlock(); - if(type && type->qListTypeId() == userType) + if (type && type->qListTypeId() == userType) return type->listCount(v); else return 0; @@ -830,7 +830,7 @@ QVariant QmlMetaType::listAt(const QVariant &v, int idx) QmlType *type = data->idToType.value(userType); lock.unlock(); - if(type && type->qListTypeId() == userType) + if (type && type->qListTypeId() == userType) return type->listAt(v, idx); else return 0; @@ -856,7 +856,7 @@ void QmlMetaType::registerCustomStringConverter(int type, StringConverter conver QWriteLocker lock(metaTypeDataLock()); QmlMetaTypeData *data = metaTypeData(); - if(data->stringConverters.contains(type)) + if (data->stringConverters.contains(type)) return; data->stringConverters.insert(type, converter); } diff --git a/src/declarative/qml/qmlmetatype.h b/src/declarative/qml/qmlmetatype.h index c17d47f..83fb60b 100644 --- a/src/declarative/qml/qmlmetatype.h +++ b/src/declarative/qml/qmlmetatype.h @@ -199,7 +199,7 @@ int qmlRegisterExtendedType(const char *typeName) QmlAttachedPropertiesFunc attached = QmlPrivate::attachedPropertiesFunc<E>(); - if(!attached) + if (!attached) attached = QmlPrivate::attachedPropertiesFunc<T>(); return QmlMetaType::registerType(ids, QmlPrivate::list_nocreate_op<T>, 0, @@ -221,7 +221,7 @@ int qmlRegisterExtendedType(const char *qmlName, const char *typeName) QmlAttachedPropertiesFunc attached = QmlPrivate::attachedPropertiesFunc<E>(); - if(!attached) + if (!attached) attached = QmlPrivate::attachedPropertiesFunc<T>(); return QmlMetaType::registerType(ids, QmlPrivate::list_op<T>, diff --git a/src/declarative/qml/qmlparser.cpp b/src/declarative/qml/qmlparser.cpp index 1dd0d4e..ecb6f0b 100644 --- a/src/declarative/qml/qmlparser.cpp +++ b/src/declarative/qml/qmlparser.cpp @@ -70,16 +70,16 @@ QmlParser::Object::Object() QmlParser::Object::~Object() { - if(defaultProperty) defaultProperty->release(); + if (defaultProperty) defaultProperty->release(); foreach(Property *prop, properties) prop->release(); - if(dynamicPropertiesProperty) dynamicPropertiesProperty->release(); - if(dynamicSignalsProperty) dynamicSignalsProperty->release(); + if (dynamicPropertiesProperty) dynamicPropertiesProperty->release(); + if (dynamicSignalsProperty) dynamicSignalsProperty->release(); } const QMetaObject *Object::metaObject() const { - if(extObject && metatype) + if (extObject && metatype) return extObject; else return metatype; @@ -87,15 +87,15 @@ const QMetaObject *Object::metaObject() const QmlParser::Property *Object::getDefaultProperty() { - if(!defaultProperty) + if (!defaultProperty) defaultProperty = new Property; return defaultProperty; } Property *QmlParser::Object::getProperty(const QByteArray &name, bool create) { - if(!properties.contains(name)) { - if(create) + if (!properties.contains(name)) { + if (create) properties.insert(name, new Property(name)); else return 0; @@ -140,12 +140,12 @@ QmlParser::Property::~Property() { foreach(Value *value, values) value->release(); - if(value) value->release(); + if (value) value->release(); } Object *QmlParser::Property::getValue() { - if(!value) value = new Object; + if (!value) value = new Object; return value; } @@ -167,7 +167,7 @@ QmlParser::Value::Value() QmlParser::Value::~Value() { - if(object) object->release(); + if (object) object->release(); } QT_END_NAMESPACE diff --git a/src/declarative/qml/qmlprivate.h b/src/declarative/qml/qmlprivate.h index 183f42b..590e0c0 100644 --- a/src/declarative/qml/qmlprivate.h +++ b/src/declarative/qml/qmlprivate.h @@ -221,7 +221,7 @@ int QmlPrivate::list_op(QmlPrivate::ListOp op, int val, const QVariant &value, void **out) { - if(op == QmlPrivate::Create) { + if (op == QmlPrivate::Create) { QObject *obj = static_cast<QObject *>(new T); *((QObject **)out) = obj; return 0; @@ -256,7 +256,7 @@ int QmlPrivate::list_op(QmlPrivate::ListOp op, int val, { QObject *fromObj = value.value<QObject *>(); T *me = qobject_cast<T *>(fromObj); - if(me) { + if (me) { *((QVariant *)*out) = QVariant::fromValue(me); } } @@ -304,7 +304,7 @@ int QmlPrivate::list_nocreate_op(QmlPrivate::ListOp op, int val, { QObject *fromObj = value.value<QObject *>(); T *me = qobject_cast<T *>(fromObj); - if(me) { + if (me) { *((QVariant *)*out) = QVariant::fromValue(me); } } diff --git a/src/declarative/qml/qmlproxymetaobject.cpp b/src/declarative/qml/qmlproxymetaobject.cpp index 3b9f6ca..d24c5c4 100644 --- a/src/declarative/qml/qmlproxymetaobject.cpp +++ b/src/declarative/qml/qmlproxymetaobject.cpp @@ -53,7 +53,7 @@ QmlProxyMetaObject::QmlProxyMetaObject(QObject *obj, QList<ProxyData> *mList) *static_cast<QMetaObject *>(this) = *metaObjects->last().metaObject; QObjectPrivate *op = QObjectPrivate::get(obj); - if(op->metaObject) + if (op->metaObject) parent = static_cast<QAbstractDynamicMetaObject*>(op->metaObject); op->metaObject = this; @@ -69,31 +69,31 @@ QmlProxyMetaObject::QmlProxyMetaObject(QObject *obj, QList<ProxyData> *mList) QmlProxyMetaObject::~QmlProxyMetaObject() { - if(parent) + if (parent) delete parent; parent = 0; - if(proxies) + if (proxies) delete [] proxies; proxies = 0; } int QmlProxyMetaObject::metaCall(QMetaObject::Call c, int id, void **a) { - if((c == QMetaObject::ReadProperty || + if ((c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty) && id >= metaObjects->last().propertyOffset) { - for(int ii = 0; ii < metaObjects->count(); ++ii) { + for (int ii = 0; ii < metaObjects->count(); ++ii) { const ProxyData &data = metaObjects->at(ii); - if(id >= data.propertyOffset) { - if(!proxies) { + if (id >= data.propertyOffset) { + if (!proxies) { proxies = new QObject*[metaObjects->count()]; ::memset(proxies, 0, sizeof(QObject *) * metaObjects->count()); } - if(!proxies[ii]) + if (!proxies[ii]) proxies[ii] = data.createFunc(object); int proxyOffset = proxies[ii]->metaObject()->propertyOffset(); @@ -104,7 +104,7 @@ int QmlProxyMetaObject::metaCall(QMetaObject::Call c, int id, void **a) } } - if(parent) + if (parent) return parent->metaCall(c, id, a); else return object->qt_metacall(c, id, a); diff --git a/src/declarative/qml/qmlrefcount.cpp b/src/declarative/qml/qmlrefcount.cpp index 4e47ee1..8f71f1b 100644 --- a/src/declarative/qml/qmlrefcount.cpp +++ b/src/declarative/qml/qmlrefcount.cpp @@ -60,7 +60,7 @@ void QmlRefCount::release() { Q_ASSERT(refCount > 0); --refCount; - if(refCount == 0) + if (refCount == 0) delete this; } diff --git a/src/declarative/qml/qmlscriptparser.cpp b/src/declarative/qml/qmlscriptparser.cpp index 4e0c283..317a3bf 100644 --- a/src/declarative/qml/qmlscriptparser.cpp +++ b/src/declarative/qml/qmlscriptparser.cpp @@ -247,7 +247,7 @@ Object *ProcessAST::defineObjectBinding_helper(int line, Value *v = new Value; v->object = obj; v->line = line; - if(state.property) + if (state.property) state.property->addValue(v); else state.object->getDefaultProperty()->addValue(v); @@ -403,7 +403,7 @@ QString ProcessAST::getPrimitive(const QByteArray &propertyName, AST::Expression { QString primitive; - if(isSignalProperty(propertyName)) { + if (isSignalProperty(propertyName)) { primitive = asString(expr); } else if (propertyName == "id" && expr && expr->kind == AST::Node::Kind_IdentifierExpression) { primitive = asString(expr); @@ -593,7 +593,7 @@ Object *QmlScriptParser::tree() const void QmlScriptParser::clear() { - if(root) { + if (root) { root->release(); root = 0; } diff --git a/src/declarative/qml/qmlstringconverters.cpp b/src/declarative/qml/qmlstringconverters.cpp index 82d6eee..c1f4b8c 100644 --- a/src/declarative/qml/qmlstringconverters.cpp +++ b/src/declarative/qml/qmlstringconverters.cpp @@ -51,18 +51,18 @@ QT_BEGIN_NAMESPACE static uchar fromHex(const uchar c, const uchar c2) { uchar rv = 0; - if(c >= '0' && c <= '9') + if (c >= '0' && c <= '9') rv += (c - '0') * 16; - else if(c >= 'A' && c <= 'F') + else if (c >= 'A' && c <= 'F') rv += (c - 'A' + 10) * 16; - else if(c >= 'a' && c <= 'f') + else if (c >= 'a' && c <= 'f') rv += (c - 'a' + 10) * 16; - if(c2 >= '0' && c2 <= '9') + if (c2 >= '0' && c2 <= '9') rv += (c2 - '0'); - else if(c2 >= 'A' && c2 <= 'F') + else if (c2 >= 'A' && c2 <= 'F') rv += (c2 - 'A' + 10); - else if(c2 >= 'a' && c2 <= 'f') + else if (c2 >= 'a' && c2 <= 'f') rv += (c2 - 'a' + 10); return rv; @@ -77,41 +77,41 @@ static uchar fromHex(const QString &s, int idx) QVariant QmlStringConverters::variantFromString(const QString &s) { - if(s.isEmpty()) + if (s.isEmpty()) return QVariant(s); - if(s.startsWith(QLatin1Char('\'')) && s.endsWith(QLatin1Char('\''))) { + if (s.startsWith(QLatin1Char('\'')) && s.endsWith(QLatin1Char('\''))) { QString data = s.mid(1, s.length() - 2); return QVariant(data); } bool ok = false; QRectF r = rectFFromString(s, &ok); - if(ok) return QVariant(r); + if (ok) return QVariant(r); QColor c = colorFromString(s, &ok); - if(ok) return QVariant(c); + if (ok) return QVariant(c); QPointF p = pointFFromString(s, &ok); - if(ok) return QVariant(p); + if (ok) return QVariant(p); QSizeF sz = sizeFFromString(s, &ok); - if(ok) return QVariant(sz); + if (ok) return QVariant(sz); bool b = boolFromString(s, &ok); - if(ok) return QVariant(b); + if (ok) return QVariant(b); return QVariant(s); } QColor QmlStringConverters::colorFromString(const QString &s, bool *ok) { - if(s.startsWith(QLatin1Char('#')) && s.length() == 9) { + if (s.startsWith(QLatin1Char('#')) && s.length() == 9) { uchar a = fromHex(s, 1); uchar r = fromHex(s, 3); uchar g = fromHex(s, 5); uchar b = fromHex(s, 7); - if(ok) *ok = true; + if (ok) *ok = true; return QColor(r, g, b, a); } else { QColor rv; - if(s.startsWith(QLatin1Char('#')) || QColor::colorNames().contains(s.toLower())) + if (s.startsWith(QLatin1Char('#')) || QColor::colorNames().contains(s.toLower())) rv = QColor(s); - if(ok) *ok = rv.isValid(); + if (ok) *ok = rv.isValid(); return rv; } } diff --git a/src/declarative/qml/qmlvme.cpp b/src/declarative/qml/qmlvme.cpp index 62a0864..253e9a7 100644 --- a/src/declarative/qml/qmlvme.cpp +++ b/src/declarative/qml/qmlvme.cpp @@ -224,13 +224,13 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QStack<QmlMetaProperty> pushedProperties; QObject **savedObjects = 0; - if(start == -1) start = 0; - if(count == -1) count = comp->bytecode.count(); + if (start == -1) start = 0; + if (count == -1) count = comp->bytecode.count(); - for(int ii = start; !isError() && ii < (start + count); ++ii) { + for (int ii = start; !isError() && ii < (start + count); ++ii) { QmlInstruction &instr = comp->bytecode[ii]; - if(instr.type >= QmlInstruction::StoreInstructionsStart && + if (instr.type >= QmlInstruction::StoreInstructionsStart && instr.type <= QmlInstruction::StoreInstructionsEnd) { runStoreInstruction(stack, instr, comp); @@ -240,7 +240,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in switch(instr.type) { case QmlInstruction::Init: { - if(instr.init.dataSize) { + if (instr.init.dataSize) { savedObjects = new QObject*[instr.init.dataSize]; ::memset(savedObjects, 0, sizeof(QObject *)*instr.init.dataSize); @@ -254,10 +254,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QFxCompilerTimer<QFxCompiler::InstrCreateObject> cc; #endif QObject *o = types.at(instr.create.type).createInstance(QmlContext::activeContext()); - if(!o) + if (!o) VME_EXCEPTION("Unable to create object of type" << types.at(instr.create.type).className); - if(!stack.isEmpty()) { + if (!stack.isEmpty()) { QObject *parent = stack.top(); o->setParent(parent); } @@ -274,11 +274,11 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in types.at(instr.createCustom.type).parser->create(datas.at(instr.createCustom.data)); // XXX QObject *o = QmlMetaType::toQObject(v); - if(!o) + if (!o) VME_EXCEPTION("Unable to create" << types.at(instr.create.type).className); QmlEngine::setContextForObject(o, QmlContext::activeContext()); - if(!stack.isEmpty()) { + if (!stack.isEmpty()) { QObject *parent = stack.top(); o->setParent(parent); } @@ -296,7 +296,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QmlContext::activeContext(); ctxt->setContextProperty(primitives.at(instr.setId.value), target); - if(instr.setId.save != -1) + if (instr.setId.save != -1) savedObjects[instr.setId.save] = target; } break; @@ -365,14 +365,14 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in const QByteArray &pr = datas.at(sigIdx); QmlMetaProperty prop(target, QLatin1String(pr)); - if(prop.type() & QmlMetaProperty::SignalProperty) { + if (prop.type() & QmlMetaProperty::SignalProperty) { int coreIdx = prop.coreIndex(); int primRef = instr.assignSignal.value; instr.type = QmlInstruction::StoreSignal; instr.storeSignal.signalIndex = coreIdx; instr.storeSignal.value = primRef; --ii; - } else if(prop.type() & QmlMetaProperty::Property) { + } else if (prop.type() & QmlMetaProperty::Property) { int prop = sigIdx; int primRef = instr.assignSignal.value; instr.type = QmlInstruction::AssignConstant; @@ -398,18 +398,18 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in const QByteArray &pr = datas.at(sigIdx); QmlMetaProperty prop(target, QLatin1String(pr)); - if(prop.type() & QmlMetaProperty::SignalProperty) { + if (prop.type() & QmlMetaProperty::SignalProperty) { QMetaMethod method = QmlMetaType::defaultMethod(assign); - if(method.signature() == 0) + if (method.signature() == 0) VME_EXCEPTION("Cannot assign object type" << assign->metaObject()->className() << "with no default method"); - if(!QMetaObject::checkConnectArgs(prop.method().signature(), method.signature())) + if (!QMetaObject::checkConnectArgs(prop.method().signature(), method.signature())) VME_EXCEPTION("Cannot connect mismatched signal/slot" << method.signature() << prop.method().signature()); QMetaObject::connect(target, prop.coreIndex(), assign, method.methodIndex()); - } else if(prop.type() & QmlMetaProperty::Property) { + } else if (prop.type() & QmlMetaProperty::Property) { instr.type = QmlInstruction::AssignObject; instr.assignObject.castValue = 0; instr.assignObject.property = sigIdx; @@ -432,7 +432,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QMetaMethod signal = target->metaObject()->method(instr.storeSignal.signalIndex); - if(signal.parameterTypes().isEmpty()) { + if (signal.parameterTypes().isEmpty()) { (void *)new QmlBoundSignal(QmlContext::activeContext(), primitives.at(instr.storeSignal.value), target, instr.storeSignal.signalIndex, target); } else { (void *)new QmlBoundSignalProxy(new QmlContext(QmlContext::activeContext(), target), primitives.at(instr.storeSignal.value), target, instr.storeSignal.signalIndex, target); @@ -450,9 +450,9 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in int propIdx = instr.assignConstant.property; int idx = instr.assignConstant.constant; QByteArray pr; - if(propIdx == -1) { + if (propIdx == -1) { pr = QmlMetaType::defaultProperty(target).name(); - if(pr.isEmpty()) + if (pr.isEmpty()) VME_EXCEPTION("Cannot resolve defalt property on type" << target->metaObject()->className()); } else { pr = datas.at(propIdx); @@ -460,14 +460,14 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in int coreIdx = qIndexOfProperty(target, pr); - if(coreIdx != -1) { + if (coreIdx != -1) { QMetaProperty prop = target->metaObject()->property(coreIdx); bool replace = !prop.isDynamic(); QmlInstruction *writeInstr = 0; QmlInstruction dummy; - if(replace) { + if (replace) { writeInstr = &instr; } else { writeInstr = &dummy; @@ -476,8 +476,8 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QmlCompiler::StoreInstructionResult r = QmlCompiler::generateStoreInstruction(*comp, *writeInstr, prop, coreIdx, idx, &primitives.at(idx)); - if(r != QmlCompiler::Ok) { - if(prop.isEnumType()){ + if (r != QmlCompiler::Ok) { + if (prop.isEnumType()){ VME_EXCEPTION(primitives.at(idx) << "is not a valid enumeration value"); } else if (r == QmlCompiler::UnknownType) { VME_EXCEPTION("Property" << prop.name() << "is of an unknown type"); @@ -507,7 +507,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QmlParserStatus *status = qobject_cast<QmlParserStatus *>(target); - if(status) { + if (status) { instr.type = QmlInstruction::BeginObject; instr.begin.castValue = int(reinterpret_cast<char *>(status) - reinterpret_cast<char *>(target)); --ii; @@ -538,7 +538,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QmlParserStatus *status = qobject_cast<QmlParserStatus *>(target); - if(status) { + if (status) { instr.type = QmlInstruction::CompleteObject; instr.complete.castValue = int(reinterpret_cast<char *>(status) - reinterpret_cast<char *>(target)); --ii; @@ -570,10 +570,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in int idx = qIndexOfProperty(target, pr); // XXX - need to check if the type is QmlBindableValue* - if(idx == -1) { + if (idx == -1) { VME_EXCEPTION("Unknown property" << pr); } else { - if(QmlInstruction::AssignCompiledBinding == instr.type) + if (QmlInstruction::AssignCompiledBinding == instr.type) instr.type = QmlInstruction::StoreCompiledBinding; else instr.type = QmlInstruction::StoreBinding; @@ -589,16 +589,16 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QObject *target = stack.at(stack.count() - 2); int propIdx = instr.assignValueSource.property; QByteArray pr; - if(propIdx == -1) { + if (propIdx == -1) { pr = QmlMetaType::defaultProperty(target).name(); - if(pr.isEmpty()) + if (pr.isEmpty()) VME_EXCEPTION("Unable to resolve default property"); } else { pr = datas.at(propIdx); } int coreIdx = qIndexOfProperty(target, pr); - if(coreIdx != -1) { + if (coreIdx != -1) { instr.type = QmlInstruction::StoreValueSource; instr.assignValueSource.property = coreIdx; ii--; @@ -685,18 +685,18 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in #endif QObject *assign = stack.pop(); const ListInstance &list = qliststack.top(); - if(list.qmlListInterface) { + if (list.qmlListInterface) { int type = list.type; void *d = 0; void *ptr = 0; bool found = false; - if(QmlMetaType::isInterface(type)) { + if (QmlMetaType::isInterface(type)) { const char *iid = QmlMetaType::interfaceIId(type); - if(iid) + if (iid) ptr = assign->qt_metacast(iid); - if(ptr) { + if (ptr) { d = &ptr; found = true; } @@ -706,7 +706,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in const QMetaObject *assignMo = assign->metaObject(); while(!found && assignMo) { - if(assignMo == mo) + if (assignMo == mo) found = true; else assignMo = assignMo->superClass(); @@ -718,7 +718,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } - if(!found) + if (!found) VME_EXCEPTION("Cannot assign object to list"); list.qmlListInterface->append(d); @@ -726,10 +726,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } else { int type = list.type; - if(QmlMetaType::isInterface(type)) { + if (QmlMetaType::isInterface(type)) { void *ptr = 0; const char *iid = QmlMetaType::interfaceIId(type); - if(iid) + if (iid) ptr = assign->qt_metacast(iid); QVariant v(list.type, &ptr); QmlMetaType::append(list.list, v); @@ -750,7 +750,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QObject *target = stack.top(); QByteArray property; - if(instr.assignObject.property == -1) { + if (instr.assignObject.property == -1) { // XXX - optimize! property = QmlMetaType::defaultProperty(target).name(); @@ -760,17 +760,17 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in int coreIdx = qIndexOfProperty(target, property); - if(coreIdx != -1) { + if (coreIdx != -1) { QMetaProperty prop = target->metaObject()->property(coreIdx); int t = prop.userType(); // XXX - optimize! - if(QmlMetaType::isList(t)) { + if (QmlMetaType::isList(t)) { QVariant list = prop.read(target); int listtype = QmlMetaType::listType(t); QVariant v = QmlMetaType::fromObject(assign, listtype); QmlMetaType::append(list, v); - } else if(QmlMetaType::isQmlList(t)) { + } else if (QmlMetaType::isQmlList(t)) { // XXX - optimize! QVariant list = prop.read(target); @@ -785,13 +785,13 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in const QMetaObject *assignMo = assign->metaObject(); bool found = false; while(!found && assignMo) { - if(assignMo == mo) + if (assignMo == mo) found = true; else assignMo = assignMo->superClass(); } - if(!found) + if (!found) VME_EXCEPTION("Cannot assign object to list"); // NOTE: This assumes a cast to QObject does not alter @@ -799,12 +799,12 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in void *d = (void *)&assign; li->append(d); - } else if(QmlMetaType::isInterface(t)) { + } else if (QmlMetaType::isInterface(t)) { const char *iid = QmlMetaType::interfaceIId(t); bool ok = false; - if(iid) { + if (iid) { void *ptr = assign->qt_metacast(iid); - if(ptr) { + if (ptr) { void *a[1]; a[0] = &ptr; QMetaObject::metacall(target, QMetaObject::WriteProperty, @@ -813,10 +813,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } } - if(!ok) + if (!ok) VME_EXCEPTION("Cannot assign object to interface property" << property); - } else if(prop.userType() == -1 /* means qvariant */) { + } else if (prop.userType() == -1 /* means qvariant */) { prop.write(target, qVariantFromValue(assign)); } else { const QMetaObject *propmo = @@ -831,11 +831,11 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in c = c->superClass(); } - if(isAssignable) { + if (isAssignable) { // XXX - optimize! QVariant v = QmlMetaType::fromObject(assign, t); prop.write(target, v); - } else if(isPropertyValue) { + } else if (isPropertyValue) { QmlPropertyValueSource *vs = static_cast<QmlPropertyValueSource *>(assign); vs->setParent(target); @@ -862,7 +862,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QObject *qmlObject = qmlAttachedPropertiesObjectById(instr.fetchAttached.id, target); - if(!qmlObject) + if (!qmlObject) VME_EXCEPTION("Unable to create attached object"); stack.push(qmlObject); @@ -883,7 +883,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in a[0] = &list; QMetaObject::metacall(target, QMetaObject::ReadProperty, instr.fetchQmlList.property, a); - if(!list) + if (!list) VME_EXCEPTION("Cannot assign to null list"); qliststack.push(ListInstance(list, instr.fetchQmlList.type)); @@ -911,14 +911,14 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QObject *target = stack.top(); const QByteArray &pr = datas.at(instr.fetch.property); int idx = qIndexOfProperty(target, pr); - if(idx == -1) + if (idx == -1) VME_EXCEPTION("Cannot resolve property" << pr); QMetaProperty prop = target->metaObject()->property(idx); instr.type = QmlInstruction::FetchObject; instr.fetch.property = idx; - if(QmlMetaType::isObject(prop.userType())) { + if (QmlMetaType::isObject(prop.userType())) { instr.fetch.isObject = true; - } else if(prop.userType() == -1) { + } else if (prop.userType() == -1) { instr.fetch.isObject = false; } else { VME_EXCEPTION("Cannot set properties on" << prop.name() << "as it is of unknown type"); @@ -935,7 +935,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in QObject *target = stack.top(); QObject *obj = 0; - if(instr.fetch.isObject) { + if (instr.fetch.isObject) { // NOTE: This assumes a cast to QObject does not alter the // object pointer void *a[1]; @@ -952,7 +952,7 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } - if(!obj) + if (!obj) VME_EXCEPTION("Cannot set properties on" << target->metaObject()->property(instr.fetch.property).name() << "as it is null"); stack.push(obj); @@ -994,13 +994,13 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in bool found = false; while(!found && assignMo) { - if(assignMo == mo) + if (assignMo == mo) found = true; else assignMo = assignMo->superClass(); } - if(!found) + if (!found) VME_EXCEPTION("Unable to assign object"); instr.type = QmlInstruction::StoreStackObject; @@ -1042,8 +1042,8 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in } } - if(isError()) { - if(!stack.isEmpty()) { + if (isError()) { + if (!stack.isEmpty()) { delete stack.at(0); } return 0; @@ -1055,10 +1055,10 @@ QObject *QmlVME::run(QmlContext *ctxt, QmlCompiledComponent *comp, int start, in comp->dumpPost(); - if(savedObjects) + if (savedObjects) delete [] savedObjects; - if(stack.isEmpty()) + if (stack.isEmpty()) return 0; else return stack.top(); diff --git a/src/declarative/qml/qmlvmemetaobject.cpp b/src/declarative/qml/qmlvmemetaobject.cpp index 2b1060b..f7d2635 100644 --- a/src/declarative/qml/qmlvmemetaobject.cpp +++ b/src/declarative/qml/qmlvmemetaobject.cpp @@ -52,7 +52,7 @@ QmlVMEMetaObject::QmlVMEMetaObject(QObject *obj, QmlRefCount *rc) : object(obj), ref(rc) { - if(ref) + if (ref) ref->addref(); *static_cast<QMetaObject *>(this) = *other; @@ -64,9 +64,9 @@ QmlVMEMetaObject::QmlVMEMetaObject(QObject *obj, data = new QVariant[propertyCount() - baseProp]; vTypes.resize(propertyCount() - baseProp); - for(int ii = baseProp; ii < propertyCount(); ++ii) { + for (int ii = baseProp; ii < propertyCount(); ++ii) { QMetaProperty prop = property(ii); - if((int)prop.type() != -1) { + if ((int)prop.type() != -1) { data[ii - baseProp] = QVariant((QVariant::Type)prop.userType()); } else { vTypes.setBit(ii - baseProp, true); @@ -76,27 +76,27 @@ QmlVMEMetaObject::QmlVMEMetaObject(QObject *obj, QmlVMEMetaObject::~QmlVMEMetaObject() { - if(ref) + if (ref) ref->release(); delete [] data; } int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int id, void **a) { - if(id >= baseProp) { + if (id >= baseProp) { int propId = id - baseProp; bool needActivate = false; - if(vTypes.testBit(propId)) { - if(c == QMetaObject::ReadProperty) { + if (vTypes.testBit(propId)) { + if (c == QMetaObject::ReadProperty) { *reinterpret_cast<QVariant *>(a[0]) = data[propId]; - } else if(c == QMetaObject::WriteProperty) { + } else if (c == QMetaObject::WriteProperty) { needActivate = (data[propId] != *reinterpret_cast<QVariant *>(a[0])); data[propId] = *reinterpret_cast<QVariant *>(a[0]); } } else { - if(c == QMetaObject::ReadProperty) { + if (c == QMetaObject::ReadProperty) { switch(data[propId].type()) { case QVariant::Int: *reinterpret_cast<int *>(a[0]) = data[propId].toInt(); @@ -120,7 +120,7 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int id, void **a) qFatal("Unknown type"); break; } - } else if(c == QMetaObject::WriteProperty) { + } else if (c == QMetaObject::WriteProperty) { QVariant value = QVariant((QVariant::Type)data[propId].type(), a[0]); needActivate = (data[propId] != value); @@ -128,7 +128,7 @@ int QmlVMEMetaObject::metaCall(QMetaObject::Call c, int id, void **a) } } - if(c == QMetaObject::WriteProperty && needActivate) { + if (c == QMetaObject::WriteProperty && needActivate) { activate(object, baseSig + propId, 0); } diff --git a/src/declarative/qml/qmlxmlparser.cpp b/src/declarative/qml/qmlxmlparser.cpp index 0af9115..b3565a0 100644 --- a/src/declarative/qml/qmlxmlparser.cpp +++ b/src/declarative/qml/qmlxmlparser.cpp @@ -70,7 +70,7 @@ struct QmlXmlParserStateStack : public QStack<QmlXmlParserState> void pushProperty(const QString &name, int lineNumber) { const QmlXmlParserState &state = top(); - if(state.property) { + if (state.property) { QmlXmlParserState s(state.property->getValue(), state.property->getValue()->getProperty(name.toLatin1())); s.property->line = lineNumber; @@ -86,7 +86,7 @@ struct QmlXmlParserStateStack : public QStack<QmlXmlParserState> QmlXmlParser::~QmlXmlParser() { - if(root) + if (root) root->release(); } @@ -189,7 +189,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) if (isType) { // Class int typeId = _typeNames.indexOf(qualifiedname); - if(typeId == -1) { + if (typeId == -1) { typeId = _typeNames.count(); _typeNames.append(qualifiedname); } @@ -214,7 +214,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) } - if(!root) { + if (!root) { root = obj; states.pushObject(obj); } else { @@ -222,7 +222,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) Value *v = new Value; v->object = obj; v->line = line; - if(state.property) + if (state.property) state.property->addValue(v); else state.object->getDefaultProperty()->addValue(v); @@ -235,7 +235,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) break; } QStringList str = name.split(QLatin1Char('.')); - for(int ii = 0; ii < str.count(); ++ii) { + for (int ii = 0; ii < str.count(); ++ii) { QString s = str.at(ii); states.pushProperty(s, line); } @@ -253,7 +253,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) foreach(QXmlStreamAttribute attr, attrs) { QStringList str = attr.name().toString().split(QLatin1Char('.')); - for(int ii = 0; ii < str.count(); ++ii) { + for (int ii = 0; ii < str.count(); ++ii) { QString s = str.at(ii); states.pushProperty(s, line); } @@ -264,7 +264,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) v->line = reader.lineNumber(); state.property->addValue(v); - for(int ii = str.count() - 1; ii >= 0; --ii) + for (int ii = str.count() - 1; ii >= 0; --ii) states.pop(); } } @@ -280,24 +280,24 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) { QString name = reader.name().toString(); Q_ASSERT(!name.isEmpty()); - if(name.at(0).isUpper() && !name.contains(QLatin1Char('.'))) { + if (name.at(0).isUpper() && !name.contains(QLatin1Char('.'))) { // Class states.pop(); } else { // Property QStringList str = name.split(QLatin1Char('.')); - for(int ii = 0; ii < str.count(); ++ii) + for (int ii = 0; ii < str.count(); ++ii) states.pop(); } } break; case QXmlStreamReader::Characters: - if(!reader.isWhitespace()) { + if (!reader.isWhitespace()) { const QmlXmlParserState &state = states.top(); Value *v = new Value; v->primitive = reader.text().toString(); v->line = reader.lineNumber(); - if(state.property) + if (state.property) state.property->addValue(v); else state.object->getDefaultProperty()->addValue(v); @@ -309,11 +309,11 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) case QXmlStreamReader::EntityReference: break; case QXmlStreamReader::ProcessingInstruction: - if(reader.processingInstructionTarget() == QLatin1String("qtfx")) { + if (reader.processingInstructionTarget() == QLatin1String("qtfx")) { QString str = reader.processingInstructionData().toString(); QString token, data; int idx = str.indexOf(QLatin1Char(':')); - if(-1 != idx) { + if (-1 != idx) { token = str.left(idx); data = str.mid(idx + 1); } else { @@ -324,7 +324,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) // <?qtfx namespacepath: namespace=path> - if(token == QLatin1String("namespacepath")) { + if (token == QLatin1String("namespacepath")) { int eq=data.indexOf(QLatin1Char('=')); if (eq>=0) { _nameSpacePaths.insertMulti(data.left(eq),data.mid(eq+1)); @@ -338,7 +338,7 @@ bool QmlXmlParser::parse(const QByteArray &data, const QUrl &url) } } - if(reader.hasError()) { + if (reader.hasError()) { if (root) { root->release(); root = 0; @@ -379,7 +379,7 @@ QString QmlXmlParser::errorDescription() const void QmlXmlParser::clear() { - if(root) { + if (root) { root->release(); root = 0; } diff --git a/src/declarative/qml/script/generator/main.cpp b/src/declarative/qml/script/generator/main.cpp index 676671f..a841cbc 100644 --- a/src/declarative/qml/script/generator/main.cpp +++ b/src/declarative/qml/script/generator/main.cpp @@ -72,7 +72,7 @@ void newState(QList<State> &states, const char *token, const char *lexem) while(*lexem) { int next = states[state].next[(int)*lexem]; - if(!next) { + if (!next) { next = states.size(); states += State(character?"CHARACTER":"INCOMPLETE"); states[state].next[(int)*lexem] = next; @@ -89,7 +89,7 @@ void newState(QList<State> &states, const char *token, const char *lexem) void newState(QList<State> &states, const char *token, char lexem) { int next = states[0].next[(int)lexem]; - if(!next) { + if (!next) { next = states.size(); states += State(token); states[0].next[(int)lexem] = next; @@ -111,11 +111,11 @@ int main() newState(states, "CHARACTER", '_'); // add digits - for(int cc = '0'; cc <= '9'; ++cc) + for (int cc = '0'; cc <= '9'; ++cc) newState(states, "DIGIT", cc); // keywords - for(int ii = 0; keywords[ii].lexem; ++ii) + for (int ii = 0; keywords[ii].lexem; ++ii) newState(states, keywords[ii].token, keywords[ii].lexem); ::printf("static const struct\n{\n" @@ -123,9 +123,9 @@ int main() " char next[128];\n" "} keywords[] = {\n"); - for(int ii = 0; ii < states.size(); ++ii) { + for (int ii = 0; ii < states.size(); ++ii) { printf("%s { %s, { ", ii?",\n":"", states[ii].token.data()); - for(int jj = 0; jj < 128; jj++) + for (int jj = 0; jj < 128; jj++) printf("%s%d", jj?",":"", states[ii].next[jj]); printf(" } }"); } diff --git a/src/declarative/qml/script/qmlbasicscript.cpp b/src/declarative/qml/script/qmlbasicscript.cpp index 4f40016..8b38e08 100644 --- a/src/declarative/qml/script/qmlbasicscript.cpp +++ b/src/declarative/qml/script/qmlbasicscript.cpp @@ -48,7 +48,7 @@ public: static unsigned int alignRound(int s) { - if(s % 4) + if (s % 4) s += 4 - (s % 4); return s; } @@ -171,7 +171,7 @@ static QVariant fetch_value(QObject *o, int idx, int type) break; default: { - if(QmlMetaType::isObject(type)) { + if (QmlMetaType::isObject(type)) { // NOTE: This assumes a cast to QObject does not alter the // object pointer QObject *val = 0; @@ -180,7 +180,7 @@ static QVariant fetch_value(QObject *o, int idx, int type) return QVariant::fromValue(val); } else { QVariant var = o->metaObject()->property(idx).read(o); - if(QmlMetaType::isObject(var.userType())) { + if (QmlMetaType::isObject(var.userType())) { QObject *obj = 0; obj = *(QObject **)var.data(); var = QVariant::fromValue(obj); @@ -299,7 +299,7 @@ QmlBasicScript::QmlBasicScript() QmlBasicScript::QmlBasicScript(const char *data, QmlRefCount *owner) : flags(0), d((QmlBasicScriptPrivate *)data), rc(owner) { - if(rc) rc->addref(); + if (rc) rc->addref(); } /*! @@ -307,7 +307,7 @@ QmlBasicScript::QmlBasicScript(const char *data, QmlRefCount *owner) */ QByteArray QmlBasicScript::expression() const { - if(!d) + if (!d) return QByteArray(); else return QByteArray(d->expr()); @@ -318,9 +318,9 @@ QByteArray QmlBasicScript::expression() const */ QmlBasicScript::~QmlBasicScript() { - if(flags & QmlBasicScriptPrivate::OwnData) + if (flags & QmlBasicScriptPrivate::OwnData) free(d); - if(rc) rc->release(); + if (rc) rc->release(); d = 0; rc = 0; } @@ -331,9 +331,9 @@ QmlBasicScript::~QmlBasicScript() */ void QmlBasicScript::clear() { - if(flags & QmlBasicScriptPrivate::OwnData) + if (flags & QmlBasicScriptPrivate::OwnData) free(d); - if(rc) rc->release(); + if (rc) rc->release(); d = 0; rc = 0; flags = 0; @@ -345,7 +345,7 @@ void QmlBasicScript::clear() */ void *QmlBasicScript::newScriptState() { - if(!d) { + if (!d) { return 0; } else { void *rv = ::malloc(d->stateSize * sizeof(QmlBasicScriptNodeCache)); @@ -359,7 +359,7 @@ void *QmlBasicScript::newScriptState() */ void QmlBasicScript::deleteScriptState(void *data) { - if(!data) return; + if (!data) return; Q_ASSERT(d); clearCache(data); free(data); @@ -370,12 +370,12 @@ void QmlBasicScript::deleteScriptState(void *data) */ void QmlBasicScript::dump() { - if(!d) + if (!d) return; qWarning() << d->instructionCount << "instructions:"; const char *data = d->data(); - for(int ii = 0; ii < d->instructionCount; ++ii) { + for (int ii = 0; ii < d->instructionCount; ++ii) { const ScriptInstruction &instr = d->instructions()[ii]; switch(instr.type) { @@ -438,7 +438,7 @@ bool QmlBasicScript::compile(const QByteArray &src) */ bool QmlBasicScript::compile(const char *src) { - if(!src) return false; + if (!src) return false; QmlBasicScriptCompiler bsc; bsc.script = this; @@ -446,14 +446,14 @@ bool QmlBasicScript::compile(const char *src) bsc.src = src; // dumpTokens(src, bsc.tokens); - if(d) { - if(flags & QmlBasicScriptPrivate::OwnData) + if (d) { + if (flags & QmlBasicScriptPrivate::OwnData) free(d); d = 0; flags = 0; } - if(bsc.compile()) { + if (bsc.compile()) { int len = ::strlen(src); flags = QmlBasicScriptPrivate::OwnData; int size = sizeof(QmlBasicScriptPrivate) + @@ -465,7 +465,7 @@ bool QmlBasicScript::compile(const char *src) d->instructionCount = bsc.bytecode.count(); d->exprLen = len; ::memcpy((char *)d->expr(), src, len + 1); - for(int ii = 0; ii < d->instructionCount; ++ii) + for (int ii = 0; ii < d->instructionCount; ++ii) d->instructions()[ii] = bsc.bytecode.at(ii); ::memcpy((char *)d->data(), bsc.data.constData(), bsc.data.count()); } @@ -481,21 +481,21 @@ void QmlBasicScriptCompiler::skipWhitespace() bool QmlBasicScriptCompiler::compile() { - if(!compileExpr()) + if (!compileExpr()) return false; skipWhitespace(); - if(atEnd()) + if (atEnd()) return true; int t = token(); - if(t != AND) + if (t != AND) return false; adv(); skipWhitespace(); - if(!compileExpr()) + if (!compileExpr()) return false; ScriptInstruction instr; @@ -513,12 +513,12 @@ bool QmlBasicScriptCompiler::compileExpr() EXPRESSION := <NAME><OPERATOR>[<CONSTANT>|<NAME>] */ - if(!parseName()) + if (!parseName()) return false; skipWhitespace(); - if(atEnd()) + if (atEnd()) return true; int t = token(); @@ -539,7 +539,7 @@ bool QmlBasicScriptCompiler::compileExpr() skipWhitespace(); - if(!parseConstant() && + if (!parseConstant() && !parseName()) return false; @@ -578,18 +578,18 @@ bool QmlBasicScriptCompiler::parseName() bool pushed = false; while(!atEnd()) { int t = token(); - if(t == CHARACTER) { + if (t == CHARACTER) { named = true; seendot = false; seenchar = true; namestart = index(); adv(); - } else if(t == DIGIT) { - if(!seenchar) break; + } else if (t == DIGIT) { + if (!seenchar) break; adv(); - } else if(t == DOT) { + } else if (t == DOT) { seendot = true; - if(namestart == -1) + if (namestart == -1) break; seenchar = false; @@ -598,7 +598,7 @@ bool QmlBasicScriptCompiler::parseName() data.append(name); data.append('\0'); ScriptInstruction instr; - if(pushed) + if (pushed) instr.type = ScriptInstruction::Fetch; else instr.type = ScriptInstruction::Load; @@ -613,13 +613,13 @@ bool QmlBasicScriptCompiler::parseName() } } - if(namestart != -1) { + if (namestart != -1) { QByteArray name = string(namestart, index() - 1); int nref = data.count(); data.append(name); data.append('\0'); ScriptInstruction instr; - if(pushed) + if (pushed) instr.type = ScriptInstruction::Fetch; else instr.type = ScriptInstruction::Load; @@ -629,7 +629,7 @@ bool QmlBasicScriptCompiler::parseName() ++stateSize; } - if(seendot) + if (seendot) return false; else return named; @@ -688,7 +688,7 @@ int QmlBasicScriptCompiler::index() const QByteArray QmlBasicScriptCompiler::string(int from, int to) { QByteArray rv; - for(int ii = from; ii <= to; ++ii) { + for (int ii = from; ii <= to; ++ii) { const LexerToken &token = tokens.at(ii); rv.append(QByteArray(src + token.start, token.end - token.start + 1)); } @@ -703,8 +703,8 @@ void QmlBasicScript::clearCache(void *voidCache) QmlBasicScriptNodeCache *dataCache = reinterpret_cast<QmlBasicScriptNodeCache *>(voidCache); - for(int ii = 0; ii < d->stateSize; ++ii) { - if(!dataCache[ii].isCore() && !dataCache[ii].isExplicit() && + for (int ii = 0; ii < d->stateSize; ++ii) { + if (!dataCache[ii].isCore() && !dataCache[ii].isExplicit() && dataCache[ii].object) { QMetaObject::removeGuard(&dataCache[ii].object); dataCache[ii].object = 0; @@ -715,9 +715,9 @@ void QmlBasicScript::clearCache(void *voidCache) void QmlBasicScript::guard(QmlBasicScriptNodeCache &n) { - if(n.object) { - if(n.isExplicit()) { - } else if(n.isCore()) { + if (n.object) { + if (n.isExplicit()) { + } else if (n.isCore()) { n.metaObject = n.object->metaObject(); } else { @@ -750,7 +750,7 @@ bool QmlBasicScript::valid(QmlBasicScriptNodeCache &n, QObject *obj) */ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *cached) { - if(!isValid()) + if (!isValid()) return QVariant(); QmlBasicScriptNodeCache *dataCache = @@ -763,7 +763,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c const char *data = d->data(); - if(dataCache[0].type == QmlBasicScriptNodeCache::Invalid) { + if (dataCache[0].type == QmlBasicScriptNodeCache::Invalid) { resetting = true; hasReset = true; } @@ -771,7 +771,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c CacheState state = NoChange; dataCacheItem = 0; - for(int idx = 0; idx < d->instructionCount; ++idx) { + for (int idx = 0; idx < d->instructionCount; ++idx) { const ScriptInstruction &instr = d->instructions()[idx]; switch(instr.type) { @@ -781,9 +781,9 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c const char *id = data + instr.fetch.idx; QmlBasicScriptNodeCache &n = dataCache[dataCacheItem]; - if(instr.type == ScriptInstruction::Load) { + if (instr.type == ScriptInstruction::Load) { - if(n.type == QmlBasicScriptNodeCache::Invalid) { + if (n.type == QmlBasicScriptNodeCache::Invalid) { context->engine()->d_func()->loadCache(n, QLatin1String(id), static_cast<QmlContextPrivate*>(context->d_ptr)); state = Incremental; } @@ -792,9 +792,9 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c QVariant o = stack.pop(); QObject *obj = qvariant_cast<QObject *>(o); - if(!obj) { - if(n.type == QmlBasicScriptNodeCache::Invalid) { - if(scriptWarnings()) + if (!obj) { + if (n.type == QmlBasicScriptNodeCache::Invalid) { + if (scriptWarnings()) qWarning() << "QmlBasicScript: Unable to convert" << o; *cached = state; return QVariant(); @@ -804,11 +804,11 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c CacheState dummy; return run(context, voidCache, &dummy); } - } else if(n.type == QmlBasicScriptNodeCache::Invalid) { + } else if (n.type == QmlBasicScriptNodeCache::Invalid) { context->engine()->d_func()->fetchCache(n, QLatin1String(id), obj); guard(n); state = Incremental; - } else if(!valid(n, obj)) { + } else if (!valid(n, obj)) { clearCache(dataCache); *cached = Reset; CacheState dummy; @@ -875,7 +875,7 @@ QVariant QmlBasicScript::run(QmlContext *context, void *voidCache, CacheState *c *cached = state; - if(stack.isEmpty()) + if (stack.isEmpty()) return QVariant(); else return stack.top(); @@ -895,7 +895,7 @@ const char *QmlBasicScript::compileData() const */ unsigned int QmlBasicScript::compileDataSize() const { - if(d) + if (d) return d->size; else return 0; @@ -903,7 +903,7 @@ unsigned int QmlBasicScript::compileDataSize() const bool QmlBasicScript::isSingleLoad() const { - if(!d) + if (!d) return false; return d->instructionCount == 1 && @@ -912,7 +912,7 @@ bool QmlBasicScript::isSingleLoad() const QByteArray QmlBasicScript::singleLoadTarget() const { - if(!isSingleLoad()) + if (!isSingleLoad()) return QByteArray(); // We know there is one instruction and it is a load diff --git a/src/declarative/test/qfxtestengine.cpp b/src/declarative/test/qfxtestengine.cpp index d9e3533..70e600d 100644 --- a/src/declarative/test/qfxtestengine.cpp +++ b/src/declarative/test/qfxtestengine.cpp @@ -110,15 +110,15 @@ public: bool QFxTestEnginePrivate::compare(const QImage &img1, const QImage &img2) { - if(img1.size() != img2.size()) + if (img1.size() != img2.size()) return false; int errorCount = 0; - for(int yy = 0; yy < img1.height(); ++yy) { - for(int xx = 0; xx < img1.width(); ++xx) { - if(img1.pixel(xx, yy) != img2.pixel(xx, yy)) { + for (int yy = 0; yy < img1.height(); ++yy) { + for (int xx = 0; xx < img1.width(); ++xx) { + if (img1.pixel(xx, yy) != img2.pixel(xx, yy)) { errorCount++; - if(errorCount > MAX_MISMATCHED_PIXELS) + if (errorCount > MAX_MISMATCHED_PIXELS) return false; } } @@ -138,13 +138,13 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir, d->testDirectory = dir; d->testMode = mode; - if(d->testMode == RecordTest) { + if (d->testMode == RecordTest) { qWarning("QFxTestEngine: Record ON"); - } else if(d->testMode == PlaybackTest) { + } else if (d->testMode == PlaybackTest) { QString fileName(d->testDirectory + QLatin1String("/manifest.xml")); QFile f(fileName); - if(!f.open(QIODevice::ReadOnly)) { + if (!f.open(QIODevice::ReadOnly)) { qWarning() << "QFxTestEngine: Unable to open file" << fileName; return; } @@ -153,7 +153,7 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir, QmlComponent c(&d->engine, data, QUrl(d->testDirectory + QLatin1String("/manifest.xml"))); QObject *o = c.create(); TestLog *log = qobject_cast<TestLog *>(o); - if(log) { + if (log) { log->setParent(this); d->playbackTestData.actions() = log->actions(); qWarning("QFxTestEngine: Playback ON"); @@ -164,18 +164,18 @@ QFxTestEngine::QFxTestEngine(TestMode mode, const QString &dir, } } - if(d->testMode != NoTest) { + if (d->testMode != NoTest) { QUnifiedTimer::instance()->setConsistentTiming(true); QObject::connect(canvas, SIGNAL(framePainted()), this, SLOT(framePainted())); canvas->installEventFilter(this); - for(int ii = 0; ii < d->playbackTestData.actions().count(); ++ii) { + for (int ii = 0; ii < d->playbackTestData.actions().count(); ++ii) { TestObject *o = d->playbackTestData.actions().at(ii); - if(TestMouse *m = qobject_cast<TestMouse *>(o)) + if (TestMouse *m = qobject_cast<TestMouse *>(o)) d->toPost << m; - else if(TestKey *k = qobject_cast<TestKey *>(o)) + else if (TestKey *k = qobject_cast<TestKey *>(o)) d->toPost << k; } } @@ -190,7 +190,7 @@ void QFxTestEngine::framePainted() { QImage img = d->canvas->asImage(); - if(d->fullFrame) { + if (d->fullFrame) { d->fullFrame = false; d->recordFullFrameEvent(img); } else { @@ -207,11 +207,11 @@ void QFxTestEnginePrivate::recordFullFrameEvent(const QImage &img) fullFrames << img; testData.actions() << ff; - if(testMode == QFxTestEngine::PlaybackTest) { + if (testMode == QFxTestEngine::PlaybackTest) { TestFullFrame *pf = qobject_cast<TestFullFrame *>(playbackTestData.next()); QString filename = testDirectory + QLatin1String("/image") + QString::number(pf->frameId()) + QLatin1String(".png"); QImage recImg(filename); - if(!pf || !compare(recImg, img) || pf->time() != QUnifiedTimer::instance()->elapsedTime()) { + if (!pf || !compare(recImg, img) || pf->time() != QUnifiedTimer::instance()->elapsedTime()) { message(Fail, "FFrame mismatch"); } else { message(Success, "FFrame OK"); @@ -226,11 +226,11 @@ static QByteArray toHex(uchar c) QByteArray rv; uint h = c / 16; uint l = c % 16; - if(h >= 10) + if (h >= 10) rv.append(h - 10 + 'A'); else rv.append(h + '0'); - if(l >= 10) + if (l >= 10) rv.append(l - 10 + 'A'); else rv.append(l + '0'); @@ -245,7 +245,7 @@ void QFxTestEnginePrivate::recordFrameEvent(const QImage &img) QByteArray result = hash.result(); QByteArray hexResult; - for(int ii = 0; ii < result.count(); ++ii) + for (int ii = 0; ii < result.count(); ++ii) hexResult.append(toHex(result.at(ii))); TestFrame *f = new TestFrame(q); @@ -253,13 +253,13 @@ void QFxTestEnginePrivate::recordFrameEvent(const QImage &img) f->setHash(QLatin1String(hexResult)); testData.actions() << f; - if(testMode == QFxTestEngine::PlaybackTest) { + if (testMode == QFxTestEngine::PlaybackTest) { TestObject *o = playbackTestData.next(); TestFrame *f = qobject_cast<TestFrame *>(o); - if(!f || f->time() != QUnifiedTimer::instance()->elapsedTime() || + if (!f || f->time() != QUnifiedTimer::instance()->elapsedTime() || f->hash() != QLatin1String(hexResult)) { mismatchedFrames++; - if(mismatchedFrames > MAX_MISMATCHED_FRAMES || + if (mismatchedFrames > MAX_MISMATCHED_FRAMES || lastFrameMismatch) message(Fail, "Frame mismatch"); else @@ -276,23 +276,23 @@ void QFxTestEnginePrivate::recordFrameEvent(const QImage &img) void QFxTestEnginePrivate::updateCurrentTime(int) { - if(status != Working) + if (status != Working) return; while(!toPost.isEmpty()) { int t = QUnifiedTimer::instance()->elapsedTime(); TestObject *o = toPost.first(); - if(testMode == QFxTestEngine::RecordTest) + if (testMode == QFxTestEngine::RecordTest) o->setTime(t); - else if(o->time() != t) + else if (o->time() != t) return; toPost.takeFirst(); - if(TestMouse *m = qobject_cast<TestMouse *>(o)) { + if (TestMouse *m = qobject_cast<TestMouse *>(o)) { QMouseEvent e((QEvent::Type)m->type(), m->pos(), m->globalPos(), (Qt::MouseButton)m->button(), (Qt::MouseButtons)m->buttons(), (Qt::KeyboardModifiers)0); postedEvents.insert(&e); QApplication::sendEvent(canvas, &e); - } else if(TestKey *k = qobject_cast<TestKey *>(o)) { + } else if (TestKey *k = qobject_cast<TestKey *>(o)) { QKeyEvent e((QEvent::Type)k->type(), k->key(), (Qt::KeyboardModifiers)k->modifiers(), k->text()); postedEvents.insert(&e); QApplication::sendEvent(canvas, &e); @@ -302,25 +302,25 @@ void QFxTestEnginePrivate::updateCurrentTime(int) bool QFxTestEngine::eventFilter(QObject *, QEvent *event) { - if(d->status != QFxTestEnginePrivate::Working) + if (d->status != QFxTestEnginePrivate::Working) return false; - if(event->type() == QEvent::MouseButtonPress || + if (event->type() == QEvent::MouseButtonPress || event->type() == QEvent::MouseButtonDblClick || event->type() == QEvent::MouseButtonRelease || event->type() == QEvent::MouseMove) { - if(d->testMode == RecordTest && d->postedEvents.contains(event)) { + if (d->testMode == RecordTest && d->postedEvents.contains(event)) { d->postedEvents.remove(event); } else { d->recordMouseEvent(static_cast<QMouseEvent *>(event)); return d->testMode == RecordTest; } - } else if(event->type() == QEvent::KeyPress || + } else if (event->type() == QEvent::KeyPress || event->type() == QEvent::KeyRelease) { QKeyEvent *key = static_cast<QKeyEvent *>(event); - if(key->key() < Qt::Key_F1 || key->key() > Qt::Key_F9) { + if (key->key() < Qt::Key_F1 || key->key() > Qt::Key_F9) { - if(d->testMode == RecordTest && d->postedEvents.contains(event)) { + if (d->testMode == RecordTest && d->postedEvents.contains(event)) { d->postedEvents.remove(event); } else { d->recordKeyEvent(key); @@ -344,9 +344,9 @@ void QFxTestEnginePrivate::recordMouseEvent(QMouseEvent *e) m->setPos(e->pos()); testData.actions() << m; - if(testMode == QFxTestEngine::PlaybackTest) { + if (testMode == QFxTestEngine::PlaybackTest) { TestMouse *m = qobject_cast<TestMouse *>(playbackTestData.next()); - if(!m || m->time() != QUnifiedTimer::instance()->elapsedTime() || + if (!m || m->time() != QUnifiedTimer::instance()->elapsedTime() || m->type() != e->type() || m->button() != e->button() || m->buttons() != e->buttons() || @@ -372,9 +372,9 @@ void QFxTestEnginePrivate::recordKeyEvent(QKeyEvent *e) k->setText(e->text()); k->setKey(e->key()); testData.actions() << k; - if(testMode == QFxTestEngine::PlaybackTest) { + if (testMode == QFxTestEngine::PlaybackTest) { TestKey *f = qobject_cast<TestKey *>(playbackTestData.next()); - if(!f || f->time() != QUnifiedTimer::instance()->elapsedTime() || + if (!f || f->time() != QUnifiedTimer::instance()->elapsedTime() || f->type() != e->type() || f->modifiers() != e->QInputEvent::modifiers() || f->text() != e->text() || @@ -396,10 +396,10 @@ void QFxTestEngine::captureFullFrame() void QFxTestEnginePrivate::message(MessageType t, const char *message) { - if(exitOnFail) + if (exitOnFail) qWarning("%s", message); - if(t == Fail) { - if(exitOnFail) { + if (t == Fail) { + if (exitOnFail) { save(QLatin1String("manifest-fail.xml"), false); qFatal("Failed"); } else { @@ -417,15 +417,15 @@ void QFxTestEnginePrivate::save(const QString &filename, bool images) testData.save(&manifest); manifest.close(); - if(images) { - for(int ii = 0; ii < fullFrames.count(); ++ii) + if (images) { + for (int ii = 0; ii < fullFrames.count(); ++ii) fullFrames.at(ii).save(testDirectory + QLatin1String("/image") + QString::number(ii) + QLatin1String(".png")); } } void QFxTestEngine::save() { - if(d->testMode != RecordTest) + if (d->testMode != RecordTest) return; d->save(QLatin1String("manifest.xml")); @@ -433,9 +433,9 @@ void QFxTestEngine::save() void QFxTestEnginePrivate::testPass() { - if(playbackTestData.atEnd()) { + if (playbackTestData.atEnd()) { qWarning("Test PASSED"); - if(exitOnFail) { + if (exitOnFail) { save(QLatin1String("manifest-play.xml")); exit(0); } else { diff --git a/src/declarative/test/qfxtestobjects.cpp b/src/declarative/test/qfxtestobjects.cpp index e93b9ed..be1ab07 100644 --- a/src/declarative/test/qfxtestobjects.cpp +++ b/src/declarative/test/qfxtestobjects.cpp @@ -71,7 +71,7 @@ int TestObject::time() const void TestObject::setTime(int t) { - if(t == _time) + if (t == _time) return; _time = t; emit dataChanged(); @@ -97,7 +97,7 @@ QString TestFrame::hash() const void TestFrame::setHash(const QString &h) { - if(_hash == h) + if (_hash == h) return; _hash = h; emit frameChanged(); @@ -123,7 +123,7 @@ int TestFullFrame::frameId() const void TestFullFrame::setFrameId(int id) { - if(id == _frameId) + if (id == _frameId) return; _frameId = id; emit frameChanged(); @@ -149,7 +149,7 @@ int TestMouse::type() const void TestMouse::setType(int t) { - if(_type == t) + if (_type == t) return; _type = t; emit mouseChanged(); @@ -162,7 +162,7 @@ int TestMouse::button() const void TestMouse::setButton(int b) { - if(b == _button) + if (b == _button) return; _button = b; emit mouseChanged(); @@ -175,7 +175,7 @@ int TestMouse::buttons() const void TestMouse::setButtons(int buttons) { - if(_buttons == buttons) + if (_buttons == buttons) return; _buttons = buttons; emit mouseChanged(); @@ -188,7 +188,7 @@ QPoint TestMouse::globalPos() const void TestMouse::setGlobalPos(const QPoint &g) { - if(_globalPos == g) + if (_globalPos == g) return; _globalPos = g; emit mouseChanged(); @@ -201,7 +201,7 @@ QPoint TestMouse::pos() const void TestMouse::setPos(const QPoint &p) { - if(p == _pos) + if (p == _pos) return; _pos = p; emit mouseChanged(); @@ -231,7 +231,7 @@ int TestKey::type() const void TestKey::setType(int t) { - if(t == _type) + if (t == _type) return; _type = t; emit keyChanged(); @@ -244,7 +244,7 @@ int TestKey::modifiers() const void TestKey::setModifiers(int m) { - if(m == _modifiers) + if (m == _modifiers) return; _modifiers = m; emit keyChanged(); @@ -257,7 +257,7 @@ QString TestKey::text() const void TestKey::setText(const QString &t) { - if(_text == t) + if (_text == t) return; _text = t; emit keyChanged(); @@ -270,7 +270,7 @@ int TestKey::key() const void TestKey::setKey(int k) { - if(_key == k) + if (_key == k) return; _key = k; emit keyChanged(); @@ -283,7 +283,7 @@ void TestKey::save(QXmlStreamWriter *device) device->writeAttribute(QLatin1String("type"), QString::number(type())); device->writeAttribute(QLatin1String("modifiers"), QString::number(modifiers())); device->writeAttribute(QLatin1String("key"), QString::number(key())); - if(key() != Qt::Key_Escape) + if (key() != Qt::Key_Escape) device->writeAttribute(QLatin1String("text"), text()); device->writeEndElement(); } @@ -317,7 +317,7 @@ void TestLog::save(QIODevice *device) writer.setAutoFormatting(true); writer.writeStartDocument(QLatin1String("1.0")); writer.writeStartElement(QLatin1String("TestLog")); - for(int ii = 0; ii < _actions.count(); ++ii) + for (int ii = 0; ii < _actions.count(); ++ii) _actions.at(ii)->save(&writer); writer.writeEndElement(); writer.writeEndDocument(); @@ -325,7 +325,7 @@ void TestLog::save(QIODevice *device) TestObject *TestLog::next() { - if(atEnd()) + if (atEnd()) return 0; TestObject *rv = _actions.at(_current); _current++; @@ -334,7 +334,7 @@ TestObject *TestLog::next() bool TestLog::atEnd() const { - if(_current >= _actions.count()) + if (_current >= _actions.count()) return true; else return false; diff --git a/src/declarative/timeline/qmltimeline.cpp b/src/declarative/timeline/qmltimeline.cpp index fc901eb..b9f79ac 100644 --- a/src/declarative/timeline/qmltimeline.cpp +++ b/src/declarative/timeline/qmltimeline.cpp @@ -141,7 +141,7 @@ QmlTimeLinePrivate::QmlTimeLinePrivate(QmlTimeLine *parent) void QmlTimeLinePrivate::add(QmlTimeLineObject &g, const Op &o) { - if(g._t && g._t != q) { + if (g._t && g._t != q) { qWarning() << "QmlTimeLine: Cannot modify a QmlTimeLineValue owned by" << "another timeline."; return; @@ -149,12 +149,12 @@ void QmlTimeLinePrivate::add(QmlTimeLineObject &g, const Op &o) g._t = q; Ops::Iterator iter = ops.find(&g); - if(iter == ops.end()) { + if (iter == ops.end()) { iter = ops.insert(&g, TimeLine()); - if(syncPoint > 0) + if (syncPoint > 0) q->pause(g, syncPoint); } - if(!iter->ops.isEmpty() && + if (!iter->ops.isEmpty() && o.type == Op::Pause && iter->ops.last().type == Op::Pause) { iter->ops.last().length += o.length; @@ -164,22 +164,22 @@ void QmlTimeLinePrivate::add(QmlTimeLineObject &g, const Op &o) iter->length += o.length; } - if(iter->length > length) + if (iter->length > length) length = iter->length; - if(!clockRunning) { + if (!clockRunning) { q->stop(); prevTime = 0; clockRunning = true; - if(syncMode == QmlTimeLine::LocalSync) { + if (syncMode == QmlTimeLine::LocalSync) { syncAdj = -1; } else { syncAdj = 0; } q->start(); /* q->tick(0); - if(syncMode == QmlTimeLine::LocalSync) { + if (syncMode == QmlTimeLine::LocalSync) { syncAdj = -1; } else { syncAdj = 0; @@ -201,33 +201,33 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change case Op::Set: return op.value; case Op::Move: - if(time == 0) { + if (time == 0) { return base; - } else if(time == (op.length)) { + } else if (time == (op.length)) { return op.value; } else { qreal delta = op.value - base; qreal pTime = (qreal)(time) / (qreal)op.length; - if(op.easing.type() == QEasingCurve::Linear) + if (op.easing.type() == QEasingCurve::Linear) return base + delta * pTime; else return base + delta * op.easing.valueForProgress(pTime); } case Op::MoveBy: - if(time == 0) { + if (time == 0) { return base; - } else if(time == (op.length)) { + } else if (time == (op.length)) { return base + op.value; } else { qreal delta = op.value; qreal pTime = (qreal)(time) / (qreal)op.length; - if(op.easing.type() == QEasingCurve::Linear) + if (op.easing.type() == QEasingCurve::Linear) return base + delta * pTime; else return base + delta * op.easing.valueForProgress(pTime); } case Op::Accel: - if(time == 0) { + if (time == 0) { return base; } else { qreal t = (qreal)(time) / 1000.0f; @@ -235,9 +235,9 @@ qreal QmlTimeLinePrivate::value(const Op &op, int time, qreal base, bool *change return base + delta; } case Op::AccelDistance: - if(time == 0) { + if (time == 0) { return base; - } else if(time == (op.length)) { + } else if (time == (op.length)) { return base + op.value2; } else { qreal t = (qreal)(time) / 1000.0f; @@ -326,7 +326,7 @@ QmlTimeLine::QmlTimeLine(QObject *parent) */ QmlTimeLine::~QmlTimeLine() { - for(QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin(); + for (QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin(); iter != d->ops.end(); ++iter) iter.key()->_t = 0; @@ -359,7 +359,7 @@ void QmlTimeLine::setSyncMode(SyncMode syncMode) */ void QmlTimeLine::pause(QmlTimeLineObject &obj, int time) { - if(time <= 0) return; + if (time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Pause, time, 0., 0., d->order++); d->add(obj, op); } @@ -390,7 +390,7 @@ void QmlTimeLine::set(QmlTimeLineValue &timeLineValue, qreal value) */ int QmlTimeLine::accel(QmlTimeLineValue &timeLineValue, qreal velocity, qreal acceleration) { - if((velocity > 0.0f) == (acceleration > 0.0f)) + if ((velocity > 0.0f) == (acceleration > 0.0f)) acceleration = acceleration * -1.0f; int time = static_cast<int>(-1000 * velocity / acceleration); @@ -416,10 +416,10 @@ int QmlTimeLine::accel(QmlTimeLineValue &timeLineValue, qreal velocity, qreal ac Q_ASSERT(acceleration >= 0.0f && maxDistance >= 0.0f); qreal maxAccel = (velocity * velocity) / (2.0f * maxDistance); - if(maxAccel > acceleration) + if (maxAccel > acceleration) acceleration = maxAccel; - if((velocity > 0.0f) == (acceleration > 0.0f)) + if ((velocity > 0.0f) == (acceleration > 0.0f)) acceleration = acceleration * -1.0f; int time = static_cast<int>(-1000 * velocity / acceleration); @@ -457,7 +457,7 @@ int QmlTimeLine::accelDistance(QmlTimeLineValue &timeLineValue, qreal velocity, */ void QmlTimeLine::move(QmlTimeLineValue &timeLineValue, qreal destination, int time) { - if(time <= 0) return; + if (time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++); d->add(timeLineValue, op); } @@ -468,7 +468,7 @@ void QmlTimeLine::move(QmlTimeLineValue &timeLineValue, qreal destination, int t */ void QmlTimeLine::move(QmlTimeLineValue &timeLineValue, qreal destination, const QEasingCurve &easing, int time) { - if(time <= 0) return; + if (time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::Move, time, destination, 0.0f, d->order++, QmlTimeLineEvent(), easing); d->add(timeLineValue, op); } @@ -479,7 +479,7 @@ void QmlTimeLine::move(QmlTimeLineValue &timeLineValue, qreal destination, const */ void QmlTimeLine::moveBy(QmlTimeLineValue &timeLineValue, qreal change, int time) { - if(time <= 0) return; + if (time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++); d->add(timeLineValue, op); } @@ -490,7 +490,7 @@ void QmlTimeLine::moveBy(QmlTimeLineValue &timeLineValue, qreal change, int time */ void QmlTimeLine::moveBy(QmlTimeLineValue &timeLineValue, qreal change, const QEasingCurve &easing, int time) { - if(time <= 0) return; + if (time <= 0) return; QmlTimeLinePrivate::Op op(QmlTimeLinePrivate::Op::MoveBy, time, change, 0.0f, d->order++, QmlTimeLineEvent(), easing); d->add(timeLineValue, op); } @@ -500,9 +500,9 @@ void QmlTimeLine::moveBy(QmlTimeLineValue &timeLineValue, qreal change, const QE */ void QmlTimeLine::reset(QmlTimeLineValue &timeLineValue) { - if(!timeLineValue._t) + if (!timeLineValue._t) return; - if(timeLineValue._t != this) { + if (timeLineValue._t != this) { qWarning() << "QmlTimeLine: Cannot reset a QmlTimeLineValue owned by another timeline."; return; } @@ -529,12 +529,12 @@ int QmlTimeLine::duration() const void QmlTimeLine::sync(QmlTimeLineValue &timeLineValue, QmlTimeLineValue &syncTo) { QmlTimeLinePrivate::Ops::Iterator iter = d->ops.find(&syncTo); - if(iter == d->ops.end()) + if (iter == d->ops.end()) return; int length = iter->length; iter = d->ops.find(&timeLineValue); - if(iter == d->ops.end()) { + if (iter == d->ops.end()) { pause(timeLineValue, length); } else { int glength = iter->length; @@ -554,7 +554,7 @@ void QmlTimeLine::sync(QmlTimeLineValue &timeLineValue, QmlTimeLineValue &syncTo void QmlTimeLine::sync(QmlTimeLineValue &timeLineValue) { QmlTimeLinePrivate::Ops::Iterator iter = d->ops.find(&timeLineValue); - if(iter == d->ops.end()) { + if (iter == d->ops.end()) { pause(timeLineValue, d->length); } else { pause(timeLineValue, d->length - iter->length); @@ -591,7 +591,7 @@ void QmlTimeLine::sync(QmlTimeLineValue &timeLineValue) /*void QmlTimeLine::sync() { - for(QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin(); + for (QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin(); iter != d->ops.end(); ++iter) pause(*iter.key(), d->length - iter->length); @@ -658,7 +658,7 @@ void QmlTimeLine::complete() */ void QmlTimeLine::clear() { - for(QmlTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter) + for (QmlTimeLinePrivate::Ops::ConstIterator iter = d->ops.begin(); iter != d->ops.end(); ++iter) iter.key()->_t = 0; d->ops.clear(); d->length = 0; @@ -680,13 +680,13 @@ int QmlTimeLine::time() const void QmlTimeLine::updateCurrentTime(int v) { - if(d->syncAdj == -1) + if (d->syncAdj == -1) d->syncAdj = v; v -= d->syncAdj; int timeChanged = v - d->prevTime; #if 0 - if(!timeChanged) + if (!timeChanged) return; #endif d->prevTime = v; @@ -694,18 +694,18 @@ void QmlTimeLine::updateCurrentTime(int v) emit updated(); // Do we need to stop the clock? - if(d->ops.isEmpty()) { + if (d->ops.isEmpty()) { stop(); d->prevTime = 0; d->clockRunning = false; emit completed(); - } /*else if(pauseTime > 0) { + } /*else if (pauseTime > 0) { GfxClock::cancelClock(); d->prevTime = 0; GfxClock::pauseFor(pauseTime); d->syncAdj = 0; d->clockRunning = false; - }*/ else if(/*!GfxClock::isActive()*/ state() != Running) { + }*/ else if (/*!GfxClock::isActive()*/ state() != Running) { stop(); d->prevTime = 0; d->clockRunning = true; @@ -729,14 +729,14 @@ int QmlTimeLinePrivate::advance(int t) pauseTime = -1; // Minimal advance time int advanceTime = t; - for(Ops::Iterator iter = ops.begin(); iter != ops.end(); ++iter) { + for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ++iter) { TimeLine &tl = *iter; Op &op = tl.ops.first(); int length = op.length - tl.consumedOpLength; - if(length < advanceTime) { + if (length < advanceTime) { advanceTime = length; - if(advanceTime == 0) + if (advanceTime == 0) break; } } @@ -746,28 +746,28 @@ int QmlTimeLinePrivate::advance(int t) // sets. QList<QPair<int, Update> > updates; - for(Ops::Iterator iter = ops.begin(); iter != ops.end(); ) { + for (Ops::Iterator iter = ops.begin(); iter != ops.end(); ) { QmlTimeLineValue *v = static_cast<QmlTimeLineValue *>(iter.key()); TimeLine &tl = *iter; Q_ASSERT(!tl.ops.isEmpty()); do { Op &op = tl.ops.first(); - if(advanceTime == 0 && op.length != 0) + if (advanceTime == 0 && op.length != 0) continue; - if(tl.consumedOpLength == 0 && + if (tl.consumedOpLength == 0 && op.type != Op::Pause && op.type != Op::Execute) tl.base = v->value(); - if((tl.consumedOpLength + advanceTime) == op.length) { - if(op.type == Op::Execute) { + if ((tl.consumedOpLength + advanceTime) == op.length) { + if (op.type == Op::Execute) { updates << qMakePair(op.order, Update(op.event)); } else { bool changed = false; qreal val = value(op, op.length, tl.base, &changed); - if(changed) + if (changed) updates << qMakePair(op.order, Update(v, val)); } tl.length -= qMin(advanceTime, tl.length); @@ -777,7 +777,7 @@ int QmlTimeLinePrivate::advance(int t) tl.consumedOpLength += advanceTime; bool changed = false; qreal val = value(op, tl.consumedOpLength, tl.base, &changed); - if(changed) + if (changed) updates << qMakePair(op.order, Update(v, val)); tl.length -= qMin(advanceTime, tl.length); break; @@ -786,13 +786,13 @@ int QmlTimeLinePrivate::advance(int t) } while(!tl.ops.isEmpty() && advanceTime == 0 && tl.ops.first().length == 0); - if(tl.ops.isEmpty()) { + if (tl.ops.isEmpty()) { iter = ops.erase(iter); v->_t = 0; } else { - if(tl.ops.first().type == Op::Pause && pauseTime != 0) { + if (tl.ops.first().type == Op::Pause && pauseTime != 0) { int opPauseTime = tl.ops.first().length - tl.consumedOpLength; - if(pauseTime == -1 || opPauseTime < pauseTime) + if (pauseTime == -1 || opPauseTime < pauseTime) pauseTime = opPauseTime; } else { pauseTime = 0; @@ -806,9 +806,9 @@ int QmlTimeLinePrivate::advance(int t) qSort(updates.begin(), updates.end()); updateQueue = &updates; - for(int ii = 0; ii < updates.count(); ++ii) { + for (int ii = 0; ii < updates.count(); ++ii) { const Update &v = updates.at(ii).second; - if(v.g) + if (v.g) v.g->setValue(v.v); else v.e.execute(); @@ -826,27 +826,27 @@ void QmlTimeLine::remove(QmlTimeLineObject *v) int len = iter->length; d->ops.erase(iter); - if(len == d->length) { + if (len == d->length) { // We need to recalculate the length d->length = 0; - for(QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin(); + for (QmlTimeLinePrivate::Ops::Iterator iter = d->ops.begin(); iter != d->ops.end(); ++iter) { - if(iter->length > d->length) + if (iter->length > d->length) d->length = iter->length; } } - if(d->ops.isEmpty()) { + if (d->ops.isEmpty()) { stop(); d->clockRunning = false; - } else if(/*!GfxClock::isActive()*/ state() != Running) { + } else if (/*!GfxClock::isActive()*/ state() != Running) { stop(); d->prevTime = 0; d->clockRunning = true; - if(d->syncMode == QmlTimeLine::LocalSync) { + if (d->syncMode == QmlTimeLine::LocalSync) { d->syncAdj = -1; } else { d->syncAdj = 0; @@ -854,9 +854,9 @@ void QmlTimeLine::remove(QmlTimeLineObject *v) start(); } - if(d->updateQueue) { - for(int ii = 0; ii < d->updateQueue->count(); ++ii) { - if(d->updateQueue->at(ii).second.g == v || + if (d->updateQueue) { + for (int ii = 0; ii < d->updateQueue->count(); ++ii) { + if (d->updateQueue->at(ii).second.g == v || d->updateQueue->at(ii).second.e.eventObject() == v) { d->updateQueue->removeAt(ii); --ii; @@ -906,7 +906,7 @@ QmlTimeLineObject::QmlTimeLineObject() QmlTimeLineObject::~QmlTimeLineObject() { - if(_t) { + if (_t) { _t->remove(this); _t = 0; } diff --git a/src/declarative/timeline/qmltimelinevalueproxy.h b/src/declarative/timeline/qmltimelinevalueproxy.h index add45dd..853db4e 100644 --- a/src/declarative/timeline/qmltimelinevalueproxy.h +++ b/src/declarative/timeline/qmltimelinevalueproxy.h @@ -69,8 +69,8 @@ public: virtual void setValue(qreal v) { QmlTimeLineValue::setValue(v); - if(_setFunctionReal) (_class->*_setFunctionReal)(v); - else if(_setFunctionInt) (_class->*_setFunctionInt)((int)v); + if (_setFunctionReal) (_class->*_setFunctionReal)(v); + else if (_setFunctionInt) (_class->*_setFunctionInt)((int)v); } private: diff --git a/src/declarative/util/qfxglobal.h b/src/declarative/util/qfxglobal.h index 52cf021..887351d 100644 --- a/src/declarative/util/qfxglobal.h +++ b/src/declarative/util/qfxglobal.h @@ -88,10 +88,10 @@ QT_MODULE(Declarative) static bool name() \ { \ static enum { Yes, No, Unknown } status = Unknown; \ - if(status == Unknown) { \ + if (status == Unknown) { \ QByteArray v = qgetenv(#var); \ bool value = !v.isEmpty() && v != "0" && v != "false"; \ - if(value) status = Yes; \ + if (value) status = Yes; \ else status = No; \ } \ return status == Yes; \ diff --git a/src/declarative/util/qfxview.cpp b/src/declarative/util/qfxview.cpp index 993d5cb..1e9d5a4 100644 --- a/src/declarative/util/qfxview.cpp +++ b/src/declarative/util/qfxview.cpp @@ -200,7 +200,7 @@ void QFxView::execute() d->component = new QmlComponent(&d->engine, d->xml.toUtf8(), d->source); } - if(!d->component->isLoading()) { + if (!d->component->isLoading()) { continueExecute(); } else { connect(d->component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(continueExecute())); @@ -211,18 +211,18 @@ void QFxView::continueExecute() { disconnect(d->component, SIGNAL(statusChanged(QmlComponent::Status)), this, SLOT(continueExecute())); - if(!d->component){ + if (!d->component){ qWarning() << "Error in loading" << d->source; return; } QObject *obj = d->component->create(); rootContext()->deactivate(); - if(obj) { - if(QFxItem *item = qobject_cast<QFxItem *>(obj)) { + if (obj) { + if (QFxItem *item = qobject_cast<QFxItem *>(obj)) { item->QSimpleCanvasItem::setParent(QSimpleCanvas::root()); - if(itemTreeDump()) + if (itemTreeDump()) item->dump(); QPerformanceLog::displayData(); @@ -231,7 +231,7 @@ void QFxView::continueExecute() connect(item, SIGNAL(widthChanged()), this, SLOT(sizeChanged())); connect(item, SIGNAL(heightChanged()), this, SLOT(sizeChanged())); sizeChanged(); - } else if(QWidget *wid = qobject_cast<QWidget *>(obj)) { + } else if (QWidget *wid = qobject_cast<QWidget *>(obj)) { window()->setAttribute(Qt::WA_OpaquePaintEvent, false); window()->setAttribute(Qt::WA_NoSystemBackground, false); if (!layout()) { @@ -256,14 +256,14 @@ void QFxView::sizeChanged() QFxItem* QFxView::addItem(const QString &xml, QFxItem* parent) { - if(!d->root) + if (!d->root) return 0; QmlComponent component(&d->engine, xml.toUtf8(), QUrl()); QObject *obj = component.create(); - if(obj){ + if (obj){ QFxItem *item = static_cast<QFxItem *>(obj); - if(!parent) + if (!parent) parent = d->root; item->setItemParent(parent); @@ -280,7 +280,7 @@ void QFxView::reset() void QFxView::clearItems() { - if(!d->root) + if (!d->root) return; delete d->root; d->root = 0; @@ -293,7 +293,7 @@ QFxItem *QFxView::root() const void QFxView::resizeEvent(QResizeEvent *e) { - if(d->root) { + if (d->root) { d->root->setWidth(width()); d->root->setHeight(height()); } diff --git a/src/declarative/util/qmlanimation.cpp b/src/declarative/util/qmlanimation.cpp index 91a5361..c09b378 100644 --- a/src/declarative/util/qmlanimation.cpp +++ b/src/declarative/util/qmlanimation.cpp @@ -73,9 +73,9 @@ QEasingCurve stringToCurve(const QString &curve) bool hasParams = curve.contains(QLatin1Char('(')); QStringList props; - if(hasParams) { + if (hasParams) { QString easeName = curve.trimmed(); - if(!easeName.endsWith(QLatin1Char(')'))) { + if (!easeName.endsWith(QLatin1Char(')'))) { qWarning("QEasingCurve: Unmatched perenthesis in easing function '%s'", curve.toLatin1().constData()); return easingCurve; @@ -104,10 +104,10 @@ QEasingCurve stringToCurve(const QString &curve) easingCurve.setType((QEasingCurve::Type)value); if (hasParams) { - foreach(QString str, props) { + foreach(const QString &str, props) { int sep = str.indexOf(QLatin1Char(':')); - if(sep == -1) { + if (sep == -1) { qWarning("QEasingCurve: Improperly specified property in easing function '%s'", curve.toLatin1().constData()); return easingCurve; @@ -117,7 +117,7 @@ QEasingCurve stringToCurve(const QString &curve) bool isOk; qreal propValue = str.mid(sep + 1).trimmed().toDouble(&isOk); - if(propName.isEmpty() || !isOk) { + if (propName.isEmpty() || !isOk) { qWarning("QEasingCurve: Improperly specified property in easing function '%s'", curve.toLatin1().constData()); return easingCurve; @@ -188,13 +188,13 @@ QmlAbstractAnimation::QmlAbstractAnimation(QmlAbstractAnimationPrivate &dd, QObj Likewise, the \c running property can be read to determine if the animation is running. In the following example the text element will indicate whether or not the animation is running. - + \code <NumericAnimation id="MyAnimation" /> <Text text="{MyAnimation.running?'Animation is running':'Animation is not running'}" /> \endcode - Animations can also be started and stopped imperatively from JavaScript + Animations can also be started and stopped imperatively from JavaScript using the \c start() and \c stop() methods. By default, animations are not running. @@ -211,7 +211,7 @@ void QmlAbstractAnimationPrivate::commence() q->prepare(userProperty.value); q->qtAnimation()->start(); - if(!q->qtAnimation()->state() == QAbstractAnimation::Running) { + if (!q->qtAnimation()->state() == QAbstractAnimation::Running) { running = false; emit q->completed(); } @@ -220,17 +220,17 @@ void QmlAbstractAnimationPrivate::commence() void QmlAbstractAnimation::setRunning(bool r) { Q_D(QmlAbstractAnimation); - if(d->running == r) + if (d->running == r) return; - if(d->group) { + if (d->group) { qWarning("QmlAbstractAnimation: setRunning() cannot be used on non-root animation nodes"); return; } d->running = r; - if(d->running) { - if(!d->connectedTimeLine) { + if (d->running) { + if (!d->connectedTimeLine) { QObject::connect(qtAnimation(), SIGNAL(finished()), this, SLOT(timelineComplete())); d->connectedTimeLine = true; @@ -241,7 +241,7 @@ void QmlAbstractAnimation::setRunning(bool r) d->startOnCompletion = true; emit started(); } else { - if(!d->finishPlaying) + if (!d->finishPlaying) qtAnimation()->stop(); emit completed(); } @@ -272,7 +272,7 @@ void QmlAbstractAnimation::componentComplete() calling the \c stop() method. The \c complete() method is not effected by this value. - This behaviour is most useful when the \c repeat property is set, as the + This behaviour is most useful when the \c repeat property is set, as the animation will finish playing normally but not restart. By default, the finishPlaying property is not set. @@ -286,7 +286,7 @@ bool QmlAbstractAnimation::finishPlaying() const void QmlAbstractAnimation::setFinishPlaying(bool f) { Q_D(QmlAbstractAnimation); - if(d->finishPlaying == f) + if (d->finishPlaying == f) return; d->finishPlaying = f; @@ -297,7 +297,7 @@ void QmlAbstractAnimation::setFinishPlaying(bool f) \qmlproperty bool Animation::repeat This property holds whether the animation should repeat. - If set, the animation will continuously repeat until it is explicitly + If set, the animation will continuously repeat until it is explicitly stopped - either by setting the \c running property to false, or by calling the \c stop() method. @@ -320,7 +320,7 @@ bool QmlAbstractAnimation::repeat() const void QmlAbstractAnimation::setRepeat(bool r) { Q_D(QmlAbstractAnimation); - if(r == d->repeat) + if (r == d->repeat) return; d->repeat = r; @@ -338,20 +338,20 @@ QmlAnimationGroup *QmlAbstractAnimation::group() const void QmlAbstractAnimation::setGroup(QmlAnimationGroup *g) { Q_D(QmlAbstractAnimation); - if(d->group == g) + if (d->group == g) return; - if(d->group) + if (d->group) static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.removeAll(this); d->group = g; - if(d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.contains(this)) + if (d->group && !static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.contains(this)) static_cast<QmlAnimationGroupPrivate *>(d->group->d_ptr)->animations.append(this); if (d->group) ((QAnimationGroup*)d->group->qtAnimation())->addAnimation(qtAnimation()); - //if(g) //if removed from a group, then the group should no longer be the parent + //if (g) //if removed from a group, then the group should no longer be the parent setParent(g); } @@ -371,11 +371,11 @@ QObject *QmlAbstractAnimation::target() const void QmlAbstractAnimation::setTarget(QObject *o) { Q_D(QmlAbstractAnimation); - if(d->target == o) + if (d->target == o) return; d->target = o; - if(d->target && !d->propertyName.isEmpty()) { + if (d->target && !d->propertyName.isEmpty()) { d->userProperty = QmlMetaProperty(d->target, d->propertyName); } else { d->userProperty.invalidate(); @@ -400,11 +400,11 @@ QString QmlAbstractAnimation::property() const void QmlAbstractAnimation::setProperty(const QString &n) { Q_D(QmlAbstractAnimation); - if(d->propertyName == n) + if (d->propertyName == n) return; d->propertyName = n; - if(d->target && !d->propertyName.isEmpty()) { + if (d->target && !d->propertyName.isEmpty()) { d->userProperty = QmlMetaProperty(d->target, d->propertyName); } else { d->userProperty.invalidate(); @@ -443,7 +443,7 @@ void QmlAbstractAnimation::start() \endcode was stopped at time 250ms, the \c x property will have a value of 50. - However, if the \c finishPlaying property is set, the animation will + However, if the \c finishPlaying property is set, the animation will continue running until it completes and then stop. The \c running property will still become false immediately. */ @@ -482,12 +482,12 @@ void QmlAbstractAnimation::restart() </Rect> \endcode calling \c stop() at time 250ms will result in the \c x property having - a value of 50, while calling \c complete() will set the \c x property to + a value of 50, while calling \c complete() will set the \c x property to 100, exactly as though the animation had played the whole way through. */ void QmlAbstractAnimation::complete() { - if(isRunning()) { + if (isRunning()) { qtAnimation()->setCurrentTime(qtAnimation()->duration()); } } @@ -495,7 +495,7 @@ void QmlAbstractAnimation::complete() void QmlAbstractAnimation::setTarget(const QmlMetaProperty &p) { Q_D(QmlAbstractAnimation); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->userProperty = p; } @@ -588,13 +588,13 @@ int QmlPauseAnimation::duration() const void QmlPauseAnimation::setDuration(int duration) { - if(duration < 0) { + if (duration < 0) { qWarning("QmlPauseAnimation: Cannot set a duration of < 0"); return; } Q_D(QmlPauseAnimation); - if(d->pa->duration() == duration) + if (d->pa->duration() == duration) return; d->pa->setDuration(duration); emit durationChanged(duration); @@ -603,7 +603,7 @@ void QmlPauseAnimation::setDuration(int duration) void QmlPauseAnimation::prepare(QmlMetaProperty &p) { Q_D(QmlPauseAnimation); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -678,13 +678,13 @@ int QmlColorAnimation::duration() const void QmlColorAnimation::setDuration(int duration) { - if(duration < 0) { + if (duration < 0) { qWarning("QmlColorAnimation: Cannot set a duration of < 0"); return; } Q_D(QmlColorAnimation); - if(d->ca->duration() == duration) + if (d->ca->duration() == duration) return; d->ca->setDuration(duration); emit durationChanged(duration); @@ -707,7 +707,7 @@ QColor QmlColorAnimation::from() const void QmlColorAnimation::setFrom(const QColor &f) { Q_D(QmlColorAnimation); - if(d->fromValue.isValid() && f == d->fromValue) + if (d->fromValue.isValid() && f == d->fromValue) return; d->fromValue = f; emit fromChanged(f); @@ -730,7 +730,7 @@ QColor QmlColorAnimation::to() const void QmlColorAnimation::setTo(const QColor &t) { Q_D(QmlColorAnimation); - if(d->toValue.isValid() && t == d->toValue) + if (d->toValue.isValid() && t == d->toValue) return; d->toValue = t; emit toChanged(t); @@ -753,7 +753,7 @@ QString QmlColorAnimation::easing() const void QmlColorAnimation::setEasing(const QString &e) { Q_D(QmlColorAnimation); - if(d->easing == e) + if (d->easing == e) return; d->easing = e; @@ -766,7 +766,7 @@ void QmlColorAnimation::setEasing(const QString &e) This property holds the items selected to be affected by this animation (all if not set). \sa exclude */ -QList<QObject *> *QmlColorAnimation::filter() +QList<QObject *> *QmlColorAnimation::filter() { Q_D(QmlColorAnimation); return &d->filter; @@ -786,7 +786,7 @@ QList<QObject *> *QmlColorAnimation::exclude() void QmlColorAnimation::prepare(QmlMetaProperty &p) { Q_D(QmlColorAnimation); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -813,7 +813,7 @@ void QmlColorAnimation::transition(QmlStateActions &actions, QmlStateActions actions; void write(QmlMetaProperty &property, const QColor &color) { - if(property.propertyType() == qMetaTypeId<QColor>()) { + if (property.propertyType() == qMetaTypeId<QColor>()) { property.write(color); } } @@ -821,17 +821,17 @@ void QmlColorAnimation::transition(QmlStateActions &actions, void setValue(qreal v) { QmlTimeLineValue::setValue(v); - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QColor to(action.toValue.value<QColor>()); - if(v == 1.) { + if (v == 1.) { write(action.property, to); } else { - if(action.fromValue.isNull()) { + if (action.fromValue.isNull()) { action.fromValue = action.property.read(); - if(action.fromValue.isNull()) + if (action.fromValue.isNull()) action.fromValue = QVariant(QColor()); } @@ -852,26 +852,26 @@ void QmlColorAnimation::transition(QmlStateActions &actions, //XXX should we get rid of this? QStringList props; props << QLatin1String("color"); - if(!d->propertyName.isEmpty() && !props.contains(d->propertyName)) + if (!d->propertyName.isEmpty() && !props.contains(d->propertyName)) props.append(d->propertyName); NTransitionData *data = new NTransitionData; QSet<QObject *> objs; - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QObject *obj = action.property.object(); QString propertyName = action.property.name(); - if((d->filter.isEmpty() || d->filter.contains(obj)) && + if ((d->filter.isEmpty() || d->filter.contains(obj)) && (!d->exclude.contains(obj)) && props.contains(propertyName) && (!target() || target() == obj)) { objs.insert(obj); Action myAction = action; - if(d->fromValue.isValid()) + if (d->fromValue.isValid()) myAction.fromValue = QVariant(d->fromValue); - if(d->toValue.isValid()) + if (d->toValue.isValid()) myAction.toValue = QVariant(d->toValue); modified << action.property; @@ -880,13 +880,13 @@ void QmlColorAnimation::transition(QmlStateActions &actions, } } - if(d->toValue.isValid() && target() && !objs.contains(target())) { + if (d->toValue.isValid() && target() && !objs.contains(target())) { QObject *obj = target(); - for(int jj = 0; jj < props.count(); ++jj) { + for (int jj = 0; jj < props.count(); ++jj) { Action myAction; myAction.property = QmlMetaProperty(obj, props.at(jj)); - if(d->fromValue.isValid()) + if (d->fromValue.isValid()) myAction.fromValue = QVariant(d->fromValue); myAction.toValue = QVariant(d->toValue); @@ -896,7 +896,7 @@ void QmlColorAnimation::transition(QmlStateActions &actions, } } - if(data->actions.count()) + if (data->actions.count()) d->ca->setAnimValue(data, QAbstractAnimation::DeleteWhenStopped); else delete data; @@ -905,8 +905,8 @@ void QmlColorAnimation::transition(QmlStateActions &actions, void QmlColorAnimationPrivate::valueChanged(qreal v) { - if(!fromSourced) { - if(!fromValue.isValid()) { + if (!fromSourced) { + if (!fromValue.isValid()) { fromValue = QColor(qvariant_cast<QColor>(property.read())); } fromSourced = true; @@ -918,7 +918,7 @@ void QmlColorAnimationPrivate::valueChanged(qreal v) uint blue = uint(qreal(fromValue.blue()) + v * (qreal(toValue.blue()) - qreal(fromValue.blue()))); uint alpha = uint(qreal(fromValue.alpha()) + v * (qreal(toValue.alpha()) - qreal(fromValue.alpha()))); - if(property.propertyType() == qMetaTypeId<QColor>()) { + if (property.propertyType() == qMetaTypeId<QColor>()) { property.write(QColor(red, green, blue, alpha)); } } @@ -967,7 +967,7 @@ QString QmlRunScriptAction::script() const void QmlRunScriptAction::setScript(const QString &script) { Q_D(QmlRunScriptAction); - if(script == d->script) + if (script == d->script) return; d->script = script; emit scriptChanged(script); @@ -986,7 +986,7 @@ QString QmlRunScriptAction::file() const void QmlRunScriptAction::setFile(const QString &file) { Q_D(QmlRunScriptAction); - if(file == d->file) + if (file == d->file) return; d->file = file; emit fileChanged(file); @@ -996,14 +996,14 @@ void QmlRunScriptActionPrivate::execute() { Q_Q(QmlRunScriptAction); QString scriptStr = script; - if(!file.isEmpty()){ + if (!file.isEmpty()){ QFile scriptFile(file); - if(scriptFile.open(QIODevice::ReadOnly | QIODevice::Text)){ + if (scriptFile.open(QIODevice::ReadOnly | QIODevice::Text)){ scriptStr = QString::fromUtf8(scriptFile.readAll()); } } - if(!scriptStr.isEmpty()) { + if (!scriptStr.isEmpty()) { QmlExpression expr(qmlContext(q), scriptStr, q); expr.setTrackChange(false); expr.value(); @@ -1074,7 +1074,7 @@ QString QmlSetPropertyAction::properties() const void QmlSetPropertyAction::setProperties(const QString &p) { Q_D(QmlSetPropertyAction); - if(d->properties == p) + if (d->properties == p) return; d->properties = p; emit propertiesChanged(p); @@ -1116,7 +1116,7 @@ QVariant QmlSetPropertyAction::value() const void QmlSetPropertyAction::setValue(const QVariant &v) { Q_D(QmlSetPropertyAction); - if(d->value.isNull || d->value != v) { + if (d->value.isNull || d->value != v) { d->value = v; emit valueChanged(v); } @@ -1137,7 +1137,7 @@ void QmlSetPropertyAction::prepare(QmlMetaProperty &p) { Q_D(QmlSetPropertyAction); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -1157,7 +1157,7 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, QmlStateActions actions; virtual void doAction() { - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { const Action &action = actions.at(ii); QmlBehaviour::_ignore = true; action.property.write(action.toValue); @@ -1167,27 +1167,27 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, }; QStringList props = d->properties.split(QLatin1Char(',')); - for(int ii = 0; ii < props.count(); ++ii) + for (int ii = 0; ii < props.count(); ++ii) props[ii] = props.at(ii).trimmed(); - if(!d->propertyName.isEmpty() && !props.contains(d->propertyName)) + if (!d->propertyName.isEmpty() && !props.contains(d->propertyName)) props.append(d->propertyName); QmlSetPropertyAnimationAction *data = new QmlSetPropertyAnimationAction; QSet<QObject *> objs; - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QObject *obj = action.property.object(); QString propertyName = action.property.name(); - if((d->filter.isEmpty() || d->filter.contains(obj)) && + if ((d->filter.isEmpty() || d->filter.contains(obj)) && (!d->exclude.contains(obj)) && props.contains(propertyName) && (!target() || target() == obj)) { objs.insert(obj); Action myAction = action; - if(d->value.isValid()) + if (d->value.isValid()) myAction.toValue = d->value; modified << action.property; @@ -1196,9 +1196,9 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, } } - if(d->value.isValid() && target() && !objs.contains(target())) { + if (d->value.isValid() && target() && !objs.contains(target())) { QObject *obj = target(); - for(int jj = 0; jj < props.count(); ++jj) { + for (int jj = 0; jj < props.count(); ++jj) { Action myAction; myAction.property = QmlMetaProperty(obj, props.at(jj)); myAction.toValue = d->value; @@ -1206,7 +1206,7 @@ void QmlSetPropertyAction::transition(QmlStateActions &actions, } } - if(data->actions.count()) { + if (data->actions.count()) { d->spa->setAnimAction(data, QAbstractAnimation::DeleteWhenStopped); } else { delete data; @@ -1249,9 +1249,9 @@ void QmlParentChangeAction::prepare(QmlMetaProperty &p) { Q_D(QmlParentChangeAction); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; - else + else d->property = d->userProperty; //XXX @@ -1275,7 +1275,7 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, QmlStateActions actions; virtual void doAction() { - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { const Action &action = actions.at(ii); QmlBehaviour::_ignore = true; action.property.write(action.toValue); @@ -1287,17 +1287,17 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, QmlParentChangeActionData *data = new QmlParentChangeActionData; QSet<QObject *> objs; - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QObject *obj = action.property.object(); QString propertyName = action.property.name(); - if((!target() || target() == obj) && propertyName == QString(QLatin1String("moveToParent"))) { + if ((!target() || target() == obj) && propertyName == QString(QLatin1String("moveToParent"))) { objs.insert(obj); Action myAction = action; - /*if(d->value.isValid()) + /*if (d->value.isValid()) myAction.toValue = d->value;*/ modified << action.property; @@ -1306,9 +1306,9 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, } } - /*if(d->value.isValid() && target() && !objs.contains(target())) { + /*if (d->value.isValid() && target() && !objs.contains(target())) { QObject *obj = target(); - for(int jj = 0; jj < props.count(); ++jj) { + for (int jj = 0; jj < props.count(); ++jj) { Action myAction; myAction.property = QmlMetaProperty(obj, props.at(jj)); myAction.toValue = d->value; @@ -1316,7 +1316,7 @@ void QmlParentChangeAction::transition(QmlStateActions &actions, } }*/ - if(data->actions.count()) { + if (data->actions.count()) { d->cpa->setAnimAction(data, QAbstractAnimation::DeleteWhenStopped); } else { delete data; @@ -1387,13 +1387,13 @@ int QmlNumericAnimation::duration() const void QmlNumericAnimation::setDuration(int duration) { - if(duration < 0) { + if (duration < 0) { qWarning("QmlNumericAnimation: Cannot set a duration of < 0"); return; } Q_D(QmlNumericAnimation); - if(d->na->duration() == duration) + if (d->na->duration() == duration) return; d->na->setDuration(duration); emit durationChanged(duration); @@ -1417,7 +1417,7 @@ qreal QmlNumericAnimation::from() const void QmlNumericAnimation::setFrom(qreal f) { Q_D(QmlNumericAnimation); - if(!d->from.isNull && f == d->from) + if (!d->from.isNull && f == d->from) return; d->from = f; emit fromChanged(f); @@ -1441,7 +1441,7 @@ qreal QmlNumericAnimation::to() const void QmlNumericAnimation::setTo(qreal t) { Q_D(QmlNumericAnimation); - if(!d->to.isNull && t == d->to) + if (!d->to.isNull && t == d->to) return; d->to = t; emit toChanged(t); @@ -1513,7 +1513,7 @@ QString QmlNumericAnimation::easing() const void QmlNumericAnimation::setEasing(const QString &e) { Q_D(QmlNumericAnimation); - if(d->easing == e) + if (d->easing == e) return; d->easing = e; @@ -1544,7 +1544,7 @@ QString QmlNumericAnimation::properties() const void QmlNumericAnimation::setProperties(const QString &prop) { Q_D(QmlNumericAnimation); - if(d->properties == prop) + if (d->properties == prop) return; d->properties = prop; @@ -1556,7 +1556,7 @@ void QmlNumericAnimation::setProperties(const QString &prop) This property holds the items selected to be affected by this animation (all if not set). \sa exclude */ -QList<QObject *> *QmlNumericAnimation::filter() +QList<QObject *> *QmlNumericAnimation::filter() { Q_D(QmlNumericAnimation); return &d->filter; @@ -1575,8 +1575,8 @@ QList<QObject *> *QmlNumericAnimation::exclude() void QmlNumericAnimationPrivate::valueChanged(qreal r) { - if(!fromSourced) { - if(from.isNull) { + if (!fromSourced) { + if (from.isNull) { fromValue = qvariant_cast<qreal>(property.read()); } else { fromValue = from; @@ -1584,7 +1584,7 @@ void QmlNumericAnimationPrivate::valueChanged(qreal r) fromSourced = true; } - if(r == 1.) { + if (r == 1.) { property.write(to.value); } else { qreal val = fromValue + (to-fromValue) * r; @@ -1595,7 +1595,7 @@ void QmlNumericAnimationPrivate::valueChanged(qreal r) void QmlNumericAnimation::prepare(QmlMetaProperty &p) { Q_D(QmlNumericAnimation); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -1623,16 +1623,16 @@ void QmlNumericAnimation::transition(QmlStateActions &actions, void setValue(qreal v) { QmlTimeLineValue::setValue(v); - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QmlBehaviour::_ignore = true; - if(v == 1.) + if (v == 1.) action.property.write(action.toValue.toDouble()); else { - if(action.fromValue.isNull()) { + if (action.fromValue.isNull()) { action.fromValue = action.property.read(); - if(action.fromValue.isNull()) { + if (action.fromValue.isNull()) { action.fromValue = QVariant(0.); } } @@ -1647,31 +1647,31 @@ void QmlNumericAnimation::transition(QmlStateActions &actions, }; QStringList props = d->properties.split(QLatin1Char(',')); - for(int ii = 0; ii < props.count(); ++ii) + for (int ii = 0; ii < props.count(); ++ii) props[ii] = props.at(ii).trimmed(); - if(!d->propertyName.isEmpty() && !props.contains(d->propertyName)) + if (!d->propertyName.isEmpty() && !props.contains(d->propertyName)) props.append(d->propertyName); NTransitionData *data = new NTransitionData; QSet<QObject *> objs; - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QObject *obj = action.property.object(); QString propertyName = action.property.name(); - if((d->filter.isEmpty() || d->filter.contains(obj)) && + if ((d->filter.isEmpty() || d->filter.contains(obj)) && (!d->exclude.contains(obj)) && props.contains(propertyName) && (!target() || target() == obj)) { objs.insert(obj); Action myAction = action; - if(d->from.isValid()) { + if (d->from.isValid()) { myAction.fromValue = QVariant(d->from); } else { myAction.fromValue = QVariant(); } - if(d->to.isValid()) + if (d->to.isValid()) myAction.toValue = QVariant(d->to); modified << action.property; @@ -1681,13 +1681,13 @@ void QmlNumericAnimation::transition(QmlStateActions &actions, } } - if(d->to.isValid() && target() && !objs.contains(target())) { + if (d->to.isValid() && target() && !objs.contains(target())) { QObject *obj = target(); - for(int jj = 0; jj < props.count(); ++jj) { + for (int jj = 0; jj < props.count(); ++jj) { Action myAction; myAction.property = QmlMetaProperty(obj, props.at(jj)); - if(d->from.isValid()) + if (d->from.isValid()) myAction.fromValue = QVariant(d->from); myAction.toValue = QVariant(d->to); @@ -1697,7 +1697,7 @@ void QmlNumericAnimation::transition(QmlStateActions &actions, } } - if(data->actions.count()) { + if (data->actions.count()) { d->na->setAnimValue(data, QAbstractAnimation::DeleteWhenStopped); } else { delete data; @@ -1755,7 +1755,7 @@ QmlSequentialAnimation::~QmlSequentialAnimation() void QmlSequentialAnimation::prepare(QmlMetaProperty &p) { Q_D(QmlAnimationGroup); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -1778,7 +1778,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions, int inc = 1; int from = 0; - if(direction == Backward) { + if (direction == Backward) { inc = -1; from = d->animations.count() - 1; } @@ -1787,7 +1787,7 @@ void QmlSequentialAnimation::transition(QmlStateActions &actions, for (int i = d->ag->animationCount()-1; i >= 0; --i) d->ag->takeAnimationAt(i); - for(int ii = from; ii < d->animations.count() && ii >= 0; ii += inc) { + for (int ii = from; ii < d->animations.count() && ii >= 0; ii += inc) { d->animations.at(ii)->transition(actions, modified, direction); d->ag->addAnimation(d->animations.at(ii)->qtAnimation()); } @@ -1805,7 +1805,7 @@ QML_DEFINE_TYPE(QmlSequentialAnimation,SequentialAnimation); Animations contained in ParallelAnimation will be run at the same time. - The following animation demonstrates animating the \c MyItem item + The following animation demonstrates animating the \c MyItem item to (100,100) by animating the x and y properties in parallel. \code @@ -1846,7 +1846,7 @@ QmlParallelAnimation::~QmlParallelAnimation() void QmlParallelAnimation::prepare(QmlMetaProperty &p) { Q_D(QmlAnimationGroup); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -1867,7 +1867,7 @@ void QmlParallelAnimation::transition(QmlStateActions &actions, { Q_D(QmlAnimationGroup); - for(int ii = 0; ii < d->animations.count(); ++ii) { + for (int ii = 0; ii < d->animations.count(); ++ii) { d->animations.at(ii)->transition(actions, modified, direction); } } @@ -1976,13 +1976,13 @@ int QmlVariantAnimation::duration() const void QmlVariantAnimation::setDuration(int duration) { - if(duration < 0) { + if (duration < 0) { qWarning("QmlVariantAnimation: Cannot set a duration of < 0"); return; } Q_D(QmlVariantAnimation); - if(d->va->duration() == duration) + if (d->va->duration() == duration) return; d->va->setDuration(duration); emit durationChanged(duration); @@ -2006,7 +2006,7 @@ QVariant QmlVariantAnimation::from() const void QmlVariantAnimation::setFrom(const QVariant &f) { Q_D(QmlVariantAnimation); - if(!d->from.isNull && f == d->from) + if (!d->from.isNull && f == d->from) return; d->from = f; emit fromChanged(f); @@ -2030,7 +2030,7 @@ QVariant QmlVariantAnimation::to() const void QmlVariantAnimation::setTo(const QVariant &t) { Q_D(QmlVariantAnimation); - if(!d->to.isNull && t == d->to) + if (!d->to.isNull && t == d->to) return; d->to = t; emit toChanged(t); @@ -2059,7 +2059,7 @@ QString QmlVariantAnimation::easing() const void QmlVariantAnimation::setEasing(const QString &e) { Q_D(QmlVariantAnimation); - if(d->easing == e) + if (d->easing == e) return; d->easing = e; @@ -2090,7 +2090,7 @@ QString QmlVariantAnimation::properties() const void QmlVariantAnimation::setProperties(const QString &prop) { Q_D(QmlVariantAnimation); - if(d->properties == prop) + if (d->properties == prop) return; d->properties = prop; @@ -2121,8 +2121,8 @@ QList<QObject *> *QmlVariantAnimation::exclude() void QmlVariantAnimationPrivate::valueChanged(qreal r) { - if(!fromSourced) { - if(from.isNull) { + if (!fromSourced) { + if (from.isNull) { fromValue = property.read(); } else { fromValue = from; @@ -2130,7 +2130,7 @@ void QmlVariantAnimationPrivate::valueChanged(qreal r) fromSourced = true; } - if(r == 1.) { + if (r == 1.) { property.write(to.value); } else { QVariant val = interpolateVariant(fromValue, to.value, r); @@ -2147,7 +2147,7 @@ QAbstractAnimation *QmlVariantAnimation::qtAnimation() void QmlVariantAnimation::prepare(QmlMetaProperty &p) { Q_D(QmlVariantAnimation); - if(d->userProperty.isNull) + if (d->userProperty.isNull) d->property = p; else d->property = d->userProperty; @@ -2174,15 +2174,15 @@ void QmlVariantAnimation::transition(QmlStateActions &actions, void setValue(qreal v) { QmlTimeLineValue::setValue(v); - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; - if(v == 1.) + if (v == 1.) action.property.write(action.toValue); else { - if(action.fromValue.isNull()) { + if (action.fromValue.isNull()) { action.fromValue = action.property.read(); - /*if(action.fromValue.isNull()) + /*if (action.fromValue.isNull()) action.fromValue = QVariant(0.);*/ //XXX can we give a default value for any type? } QVariant val = QmlVariantAnimationPrivate::interpolateVariant(action.fromValue, action.toValue, v); @@ -2193,29 +2193,32 @@ void QmlVariantAnimation::transition(QmlStateActions &actions, }; QStringList props = d->properties.split(QLatin1Char(',')); - for(int ii = 0; ii < props.count(); ++ii) + for (int ii = 0; ii < props.count(); ++ii) props[ii] = props.at(ii).trimmed(); - if(!d->propertyName.isEmpty() && !props.contains(d->propertyName)) + if (!d->propertyName.isEmpty() && !props.contains(d->propertyName)) props.append(d->propertyName); NTransitionData *data = new NTransitionData; QSet<QObject *> objs; - for(int ii = 0; ii < actions.count(); ++ii) { + for (int ii = 0; ii < actions.count(); ++ii) { Action &action = actions[ii]; QObject *obj = action.property.object(); QString propertyName = action.property.name(); - if((d->filter.isEmpty() || d->filter.contains(obj)) && + if ((d->filter.isEmpty() || d->filter.contains(obj)) && (!d->exclude.contains(obj)) && props.contains(propertyName) && (!target() || target() == obj)) { objs.insert(obj); Action myAction = action; - if(d->from.isValid()) + if (d->from.isValid()) { myAction.fromValue = QVariant(d->from); - if(d->to.isValid()) + } else { + myAction.fromValue = QVariant(); + } + if (d->to.isValid()) myAction.toValue = QVariant(d->to); d->convertVariant(myAction.fromValue, (QVariant::Type)myAction.property.propertyType()); @@ -2228,13 +2231,13 @@ void QmlVariantAnimation::transition(QmlStateActions &actions, } } - if(d->to.isValid() && target() && !objs.contains(target())) { + if (d->to.isValid() && target() && !objs.contains(target())) { QObject *obj = target(); - for(int jj = 0; jj < props.count(); ++jj) { + for (int jj = 0; jj < props.count(); ++jj) { Action myAction; myAction.property = QmlMetaProperty(obj, props.at(jj)); - if(d->from.isValid()) { + if (d->from.isValid()) { d->convertVariant(d->from.value, (QVariant::Type)myAction.property.propertyType()); myAction.fromValue = QVariant(d->from); } @@ -2247,7 +2250,7 @@ void QmlVariantAnimation::transition(QmlStateActions &actions, } } - if(data->actions.count()) { + if (data->actions.count()) { d->va->setAnimValue(data, QAbstractAnimation::DeleteWhenStopped); } else { delete data; @@ -2257,5 +2260,4 @@ void QmlVariantAnimation::transition(QmlStateActions &actions, //XXX whats the best name for this? (just Animation?) QML_DEFINE_TYPE(QmlVariantAnimation,VariantAnimation); - QT_END_NAMESPACE diff --git a/src/declarative/util/qmlanimation_p.h b/src/declarative/util/qmlanimation_p.h index 80cc7f7..728584c 100644 --- a/src/declarative/util/qmlanimation_p.h +++ b/src/declarative/util/qmlanimation_p.h @@ -334,7 +334,7 @@ public: QmlAnimationGroupPrivate *anim; }; - + AnimationList animations; QAnimationGroup *ag; }; diff --git a/src/declarative/util/qmlbehaviour.cpp b/src/declarative/util/qmlbehaviour.cpp index 3fff06c..58e515f 100644 --- a/src/declarative/util/qmlbehaviour.cpp +++ b/src/declarative/util/qmlbehaviour.cpp @@ -182,12 +182,12 @@ bool QmlBehaviour::_ignore = false; void QmlBehaviour::propertyValueChanged() { Q_D(QmlBehaviour); - if(_ignore) + if (_ignore) return; QVariant newValue = d->property.read(); - if((!fromValue().isValid() || fromValue() == d->currentValue) && + if ((!fromValue().isValid() || fromValue() == d->currentValue) && (!toValue().isValid() || toValue() == newValue)) { //### does this clean up everything needed? @@ -208,11 +208,11 @@ void QmlBehaviour::propertyValueChanged() d->property.write(d->currentValue); QList<QmlMetaProperty> after; - for(int ii = 0; ii < d->operations.count(); ++ii) { + for (int ii = 0; ii < d->operations.count(); ++ii) { d->operations.at(ii)->transition(actions, after, QmlAbstractAnimation::Forward); } d->group->start(); - if(!after.contains(d->property)) + if (!after.contains(d->property)) d->property.write(newValue); _ignore = false; } @@ -231,7 +231,7 @@ void QmlBehaviour::setTarget(const QmlMetaProperty &property) void QmlBehaviour::classBegin() { Q_D(QmlBehaviour); - if(!d->context) { + if (!d->context) { d->context = new QmlContext(qmlContext(this), this); d->context->addDefaultObject(d->valueData); } diff --git a/src/declarative/util/qmlbind.cpp b/src/declarative/util/qmlbind.cpp index 4451ca2..3b51c6a 100644 --- a/src/declarative/util/qmlbind.cpp +++ b/src/declarative/util/qmlbind.cpp @@ -193,7 +193,7 @@ void QmlBind::setValue(const QVariant &v) void QmlBind::eval() { Q_D(QmlBind); - if(!d->obj || d->value.isNull || !d->when) + if (!d->obj || d->value.isNull || !d->when) return; QmlMetaProperty prop(d->obj, d->prop); diff --git a/src/declarative/util/qmlconnection.cpp b/src/declarative/util/qmlconnection.cpp index 1d3b368..5cd4371 100644 --- a/src/declarative/util/qmlconnection.cpp +++ b/src/declarative/util/qmlconnection.cpp @@ -165,7 +165,7 @@ void QmlConnection::connectIfValid() QList<QByteArray> sigparams; if (lparen >= 0 && d->signal.length() > lparen+2) { QStringList l = d->signal.mid(lparen+1,d->signal.length()-lparen-2).split(QLatin1Char(',')); - foreach (QString s, l) { + foreach (const QString &s, l) { sigparams.append(s.toLatin1()); } } @@ -173,12 +173,12 @@ void QmlConnection::connectIfValid() QObject *sender = d->signalSender ? d->signalSender : parent(); const QMetaObject *mo = sender->metaObject(); int methods = mo->methodCount(); - for(int ii = 0; ii < methods; ++ii) { + for (int ii = 0; ii < methods; ++ii) { QMetaMethod method = mo->method(ii); QString methodName = QLatin1String(method.signature()); int idx = methodName.indexOf(QLatin1Char('(')); methodName = methodName.left(idx); - if(methodName == signalname && (lparen<0 || method.parameterNames() == sigparams)) { + if (methodName == signalname && (lparen<0 || method.parameterNames() == sigparams)) { sigIdx = ii; break; } diff --git a/src/declarative/util/qmllistaccessor.cpp b/src/declarative/util/qmllistaccessor.cpp index 9387bbc..da54b6e 100644 --- a/src/declarative/util/qmllistaccessor.cpp +++ b/src/declarative/util/qmllistaccessor.cpp @@ -64,20 +64,20 @@ void QmlListAccessor::setList(const QVariant &v) { d = v; - if(!d.isValid()) { + if (!d.isValid()) { type = Invalid; - } else if(d.type() == QVariant::StringList) { + } else if (d.type() == QVariant::StringList) { type = StringList; - } else if(d.type() != QVariant::UserType) { + } else if (d.type() != QVariant::UserType) { type = Instance; - } else if(QmlMetaType::isObject(d.userType())) { + } else if (QmlMetaType::isObject(d.userType())) { QObject *data = 0; data = *(QObject **)v.constData(); d = QVariant::fromValue(data); type = Instance; - } else if(QmlMetaType::isQmlList(d.userType())) { + } else if (QmlMetaType::isQmlList(d.userType())) { type = QmlList; - } else if(QmlMetaType::isList(d.userType())) { + } else if (QmlMetaType::isList(d.userType())) { type = QList; } else { type = Invalid; diff --git a/src/declarative/util/qmllistmodel.cpp b/src/declarative/util/qmllistmodel.cpp index 24f2d5c..54aea2c 100644 --- a/src/declarative/util/qmllistmodel.cpp +++ b/src/declarative/util/qmllistmodel.cpp @@ -70,7 +70,7 @@ public: { type = QmlListModel::Invalid; model = QVariant(); - if(listModelInterface) + if (listModelInterface) listModelInterface->disconnect(q); listModelInterface = 0; singleObject = 0; @@ -80,11 +80,11 @@ public: void updateRoleCache() { - if(roleCacheValid) + if (roleCacheValid) return; roleCacheValid = true; - if(type == QmlListModel::SingleObject) + if (type == QmlListModel::SingleObject) roleCache = QmlMetaProperty::properties(singleObject); } @@ -164,7 +164,7 @@ bool QmlListModel::setModel(const QVariant &model) d->clear(); QListModelInterface *iface = qvariant_cast<QListModelInterface *>(model); - if(iface) { + if (iface) { QObject::connect(iface, SIGNAL(itemsInserted(int,int)), this, SIGNAL(itemsInserted(int,int))); QObject::connect(iface, SIGNAL(itemsRemoved(int,int)), @@ -180,14 +180,14 @@ bool QmlListModel::setModel(const QVariant &model) } QObject *object = qvariant_cast<QObject *>(model); - if(object) { + if (object) { d->singleObject = object; d->type = SingleObject; d->model = model; return true; } - if(QmlMetaType::isList(model)) { + if (QmlMetaType::isList(model)) { d->type = SimpleList; d->model = model; return true; @@ -214,7 +214,7 @@ QList<int> QmlListModel::roles() const case SingleObject: { QList<int> rv; - for(int ii = 0; ii < d->roleCache.count(); ++ii) + for (int ii = 0; ii < d->roleCache.count(); ++ii) rv << ii; return rv; } @@ -230,14 +230,14 @@ QString QmlListModel::toString(int role) const case Invalid: return QString(); case SimpleList: - if(role == DATA_ROLE_ID) + if (role == DATA_ROLE_ID) return QLatin1String(DATA_ROLE_NAME); else return QString(); case ListInterface: return d->listModelInterface->toString(role); case SingleObject: - if(role >= d->roleCache.count()) + if (role >= d->roleCache.count()) return QString(); else return d->roleCache.at(role); @@ -272,14 +272,14 @@ QHash<int,QVariant> QmlListModel::data(int index, const QList<int> &roles) const case Invalid: break; case SimpleList: - if(roles.contains(DATA_ROLE_ID)) + if (roles.contains(DATA_ROLE_ID)) rv.insert(DATA_ROLE_ID, QmlMetaType::listAt(d->model, index)); break; case ListInterface: return d->listModelInterface->data(index, roles); case SingleObject: { - for(int ii = 0; ii < roles.count(); ++ii) { + for (int ii = 0; ii < roles.count(); ++ii) { QmlMetaProperty prop(d->singleObject, toString(roles.at(ii))); rv.insert(roles.at(ii), prop.read()); } @@ -344,7 +344,7 @@ struct ModelNode QHash<QString, ModelNode *> properties; ListModel *model() { - if(!modelCache) { + if (!modelCache) { modelCache = new ListModel; modelCache->_root = this; } @@ -352,7 +352,7 @@ struct ModelNode } ModelObject *object() { - if(!objectCache) { + if (!objectCache) { objectCache = new ModelObject(this); QHash<QString, ModelNode *>::iterator it; for (it = properties.begin(); it != properties.end(); ++it) { @@ -382,13 +382,13 @@ ListModel::ListModel(QObject *parent) void ListModel::checkRoles() const { - if(_rolesOk) + if (_rolesOk) return; - for(int ii = 0; ii < _root->values.count(); ++ii) { + for (int ii = 0; ii < _root->values.count(); ++ii) { ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(ii)); - if(node) { - foreach(QString role, node->properties.keys()) + if (node) { + foreach (const QString &role, node->properties.keys()) addRole(role); } } @@ -398,7 +398,7 @@ void ListModel::checkRoles() const void ListModel::addRole(const QString &role) const { - if(!roleStrings.contains(role)) + if (!roleStrings.contains(role)) roleStrings << role; } @@ -406,7 +406,7 @@ QList<int> ListModel::roles() const { checkRoles(); QList<int> rv; - for(int ii = 0; ii < roleStrings.count(); ++ii) + for (int ii = 0; ii < roleStrings.count(); ++ii) rv << ii; return rv; } @@ -414,7 +414,7 @@ QList<int> ListModel::roles() const QString ListModel::toString(int role) const { checkRoles(); - if(role < roleStrings.count()) + if (role < roleStrings.count()) return roleStrings.at(role); else return QString(); @@ -424,30 +424,30 @@ QVariant ListModel::valueForNode(ModelNode *node) const { QObject *rv = 0; - if(!node->properties.isEmpty()) { + if (!node->properties.isEmpty()) { // Object rv = node->object(); - } else if(node->values.count() == 0) { + } else if (node->values.count() == 0) { // Invalid return QVariant(); - } else if(node->values.count() == 1) { + } else if (node->values.count() == 1) { // Value QVariant &var = node->values[0]; ModelNode *valueNode = qvariant_cast<ModelNode *>(var); - if(valueNode) { - if(!valueNode->properties.isEmpty()) + if (valueNode) { + if (!valueNode->properties.isEmpty()) rv = valueNode->object(); else rv = valueNode->model(); } else { return var; } - } else if(node->values.count() > 1) { + } else if (node->values.count() > 1) { // List rv = node->model(); } - if(rv) + if (rv) return QVariant::fromValue(rv); else return QVariant(); @@ -457,19 +457,19 @@ QHash<int,QVariant> ListModel::data(int index, const QList<int> &roles) const { checkRoles(); QHash<int, QVariant> rv; - if(index >= count()) + if (index >= count()) return rv; ModelNode *node = qvariant_cast<ModelNode *>(_root->values.at(index)); - if(!node) + if (!node) return rv; - for(int ii = 0; ii < roles.count(); ++ii) { + for (int ii = 0; ii < roles.count(); ++ii) { const QString &roleString = roleStrings.at(roles.at(ii)); QHash<QString, ModelNode *>::ConstIterator iter = node->properties.find(roleString); - if(iter != node->properties.end()) { + if (iter != node->properties.end()) { ModelNode *row = *iter; rv.insert(roles.at(ii), valueForNode(row)); } @@ -480,7 +480,7 @@ QHash<int,QVariant> ListModel::data(int index, const QList<int> &roles) const int ListModel::count() const { - if(!_root) return 0; + if (!_root) return 0; return _root->values.count(); } @@ -503,9 +503,9 @@ static void dump(ModelNode *node, int ind) QByteArray indentBa(ind * 4, ' '); const char *indent = indentBa.constData(); - for(int ii = 0; ii < node->values.count(); ++ii) { + for (int ii = 0; ii < node->values.count(); ++ii) { ModelNode *subNode = qvariant_cast<ModelNode *>(node->values.at(ii)); - if(subNode) { + if (subNode) { qWarning().nospace() << indent << "Sub-node " << ii << ": class " << subNode->className; dump(subNode, ind + 1); } else { @@ -513,7 +513,7 @@ static void dump(ModelNode *node, int ind) } } - for(QHash<QString, ModelNode *>::ConstIterator iter = node->properties.begin(); iter != node->properties.end(); ++iter) { + for (QHash<QString, ModelNode *>::ConstIterator iter = node->properties.begin(); iter != node->properties.end(); ++iter) { qWarning().nospace() << indent << "Property " << iter.key() << ":"; dump(iter.value(), ind + 1); } @@ -527,11 +527,11 @@ ModelNode::ModelNode() ModelNode::~ModelNode() { qDeleteAll(properties); - for(int ii = 0; ii < values.count(); ++ii) { + for (int ii = 0; ii < values.count(); ++ii) { ModelNode *node = qvariant_cast<ModelNode *>(values.at(ii)); - if(node) { delete node; node = 0; } + if (node) { delete node; node = 0; } } - if(modelCache) { delete modelCache; modelCache = 0; } + if (modelCache) { delete modelCache; modelCache = 0; } } struct ListModelData @@ -650,7 +650,7 @@ QByteArray ListModelParser::compile(QXmlStreamReader& reader, bool *ok) lmd->dataOffset = sizeof(ListModelData) + instr.count() * sizeof(ListInstruction); lmd->instrCount = instr.count(); - for(int ii = 0; ii < instr.count(); ++ii) + for (int ii = 0; ii < instr.count(); ++ii) lmd->instructions()[ii] = instr.at(ii); ::memcpy(rv.data() + lmd->dataOffset, data.constData(), data.count()); @@ -668,7 +668,7 @@ QVariant ListModelParser::create(const QByteArray &d) const ListModelData *lmd = (const ListModelData *)d.constData(); const char *data = ((const char *)lmd) + lmd->dataOffset; - for(int ii = 0; ii < lmd->instrCount; ++ii) { + for (int ii = 0; ii < lmd->instrCount; ++ii) { const ListInstruction &instr = lmd->instructions()[ii]; switch(instr.type) { diff --git a/src/declarative/util/qmlopenmetaobject.cpp b/src/declarative/util/qmlopenmetaobject.cpp index 09d71bd..87d8f4d 100644 --- a/src/declarative/util/qmlopenmetaobject.cpp +++ b/src/declarative/util/qmlopenmetaobject.cpp @@ -51,7 +51,7 @@ QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, bool automatic) mob.setFlags(QMetaObjectBuilder::DynamicMetaObject); QObjectPrivate *op = QObjectPrivate::get(obj); - if(op->metaObject) + if (op->metaObject) mob.setSuperClass(op->metaObject); mem = mob.toMetaObject(); @@ -63,21 +63,21 @@ QmlOpenMetaObject::QmlOpenMetaObject(QObject *obj, bool automatic) QmlOpenMetaObject::~QmlOpenMetaObject() { - if(parent) + if (parent) delete parent; qFree(mem); } int QmlOpenMetaObject::metaCall(QMetaObject::Call c, int id, void **a) { - if(( c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty) + if (( c == QMetaObject::ReadProperty || c == QMetaObject::WriteProperty) && id >= _propertyOffset) { int propId = id - _propertyOffset; - if(c == QMetaObject::ReadProperty) { + if (c == QMetaObject::ReadProperty) { propertyRead(propId); *reinterpret_cast<QVariant *>(a[0]) = data[propId]; - } else if(c == QMetaObject::WriteProperty) { - if(data[propId] != *reinterpret_cast<QVariant *>(a[0])) { + } else if (c == QMetaObject::WriteProperty) { + if (data[propId] != *reinterpret_cast<QVariant *>(a[0])) { propertyWrite(propId); data[propId] = *reinterpret_cast<QVariant *>(a[0]); activate(_object, _signalOffset + propId, 0); @@ -85,7 +85,7 @@ int QmlOpenMetaObject::metaCall(QMetaObject::Call c, int id, void **a) } return -1; } else { - if(parent) + if (parent) return parent->metaCall(c, id, a); else return _object->qt_metacall(c, id, a); @@ -108,7 +108,7 @@ void QmlOpenMetaObject::setValue(int id, const QVariant &value) QVariant QmlOpenMetaObject::value(const QByteArray &name) const { QHash<QByteArray, int>::ConstIterator iter = names.find(name); - if(iter == names.end()) + if (iter == names.end()) return QVariant(); return data.at(*iter); @@ -119,13 +119,13 @@ void QmlOpenMetaObject::setValue(const QByteArray &name, const QVariant &val) QHash<QByteArray, int>::ConstIterator iter = names.find(name); int id = -1; - if(iter == names.end()) { + if (iter == names.end()) { id = doCreateProperty(name.constData()) - _propertyOffset; } else { id = *iter; } - if(data[id] == val) + if (data[id] == val) return; data[id] = val; @@ -134,7 +134,7 @@ void QmlOpenMetaObject::setValue(const QByteArray &name, const QVariant &val) int QmlOpenMetaObject::createProperty(const char *name, const char *) { - if(autoCreate) + if (autoCreate) return doCreateProperty(name); else return -1; diff --git a/src/declarative/util/qmlpackage.cpp b/src/declarative/util/qmlpackage.cpp index 264d186..aa7ed38 100644 --- a/src/declarative/util/qmlpackage.cpp +++ b/src/declarative/util/qmlpackage.cpp @@ -109,10 +109,10 @@ QmlList<QObject *> *QmlPackage::data() bool QmlPackage::hasPart(const QString &name) { Q_D(QmlPackage); - for(int ii = 0; ii < d->dataList.count(); ++ii) { + for (int ii = 0; ii < d->dataList.count(); ++ii) { QObject *obj = d->dataList.at(ii); QmlPackageAttached *a = QmlPackageAttached::attached.value(obj); - if(a && a->name() == name) + if (a && a->name() == name) return true; } return false; @@ -121,17 +121,17 @@ bool QmlPackage::hasPart(const QString &name) QObject *QmlPackage::part(const QString &name) { Q_D(QmlPackage); - if(name.isEmpty() && !d->dataList.isEmpty()) + if (name.isEmpty() && !d->dataList.isEmpty()) return d->dataList.at(0); - for(int ii = 0; ii < d->dataList.count(); ++ii) { + for (int ii = 0; ii < d->dataList.count(); ++ii) { QObject *obj = d->dataList.at(ii); QmlPackageAttached *a = QmlPackageAttached::attached.value(obj); - if(a && a->name() == name) + if (a && a->name() == name) return obj; } - if(name == QLatin1String("default") && !d->dataList.isEmpty()) + if (name == QLatin1String("default") && !d->dataList.isEmpty()) return d->dataList.at(0); return 0; diff --git a/src/declarative/util/qmlscript.cpp b/src/declarative/util/qmlscript.cpp index 73c8c07..fbaf56e 100644 --- a/src/declarative/util/qmlscript.cpp +++ b/src/declarative/util/qmlscript.cpp @@ -194,7 +194,7 @@ void QmlScriptPrivate::addScriptToEngine(const QString &script, const QString &f if (scriptEngine->hasUncaughtException()) { if (scriptEngine->uncaughtException().isError()){ QScriptValue exception = scriptEngine->uncaughtException(); - if(!exception.property(QLatin1String("fileName")).toString().isEmpty()){ + if (!exception.property(QLatin1String("fileName")).toString().isEmpty()){ qWarning() << exception.property(QLatin1String("fileName")).toString() << scriptEngine->uncaughtExceptionLineNumber() << exception.toString(); diff --git a/src/declarative/util/qmlscript.h b/src/declarative/util/qmlscript.h index fc038b4..8047a88 100644 --- a/src/declarative/util/qmlscript.h +++ b/src/declarative/util/qmlscript.h @@ -58,7 +58,7 @@ class Q_DECLARATIVE_EXPORT QmlScript : public QObject Q_DECLARE_PRIVATE(QmlScript); Q_PROPERTY(QString script READ script WRITE setScript); - Q_PROPERTY(QString src READ source WRITE setSource); + Q_PROPERTY(QString source READ source WRITE setSource); Q_CLASSINFO("DefaultProperty", "script"); public: diff --git a/src/declarative/util/qmlsetproperties.cpp b/src/declarative/util/qmlsetproperties.cpp index 61890b9..108f2b2 100644 --- a/src/declarative/util/qmlsetproperties.cpp +++ b/src/declarative/util/qmlsetproperties.cpp @@ -80,7 +80,7 @@ QmlSetPropertiesMetaObject::QmlSetPropertiesMetaObject(QObject *obj) void QmlSetPropertiesMetaObject::propertyRead(int id) { - if(!value(id).isValid()) + if (!value(id).isValid()) setValue(id, QVariant::fromValue((QObject *)new QmlSetPropertiesProxyObject(object()))); QmlOpenMetaObject::propertyRead(id); @@ -88,10 +88,10 @@ void QmlSetPropertiesMetaObject::propertyRead(int id) void QmlSetPropertiesMetaObject::propertyWrite(int id) { - if(value(id).userType() == qMetaTypeId<QObject *>()) { + if (value(id).userType() == qMetaTypeId<QObject *>()) { QObject *val = qvariant_cast<QObject *>(value(id)); QmlSetPropertiesProxyObject *proxy = qobject_cast<QmlSetPropertiesProxyObject *>(val); - if(proxy) { + if (proxy) { setValue(id, QVariant()); delete proxy; } @@ -203,9 +203,9 @@ QmlSetProperties::doAction(QmlSetPropertiesMetaObject *metaObject, QmlMetaProperty prop(object, QLatin1String(name)); - if(po) { + if (po) { QObject *objVal = QmlMetaType::toQObject(prop.read()); - if(!objVal) { + if (!objVal) { qmlInfo(this) << object->metaObject()->className() << "has no object property named" << name; continue; diff --git a/src/declarative/util/qmlstate.cpp b/src/declarative/util/qmlstate.cpp index 6a9cc12..cd33f5e 100644 --- a/src/declarative/util/qmlstate.cpp +++ b/src/declarative/util/qmlstate.cpp @@ -170,7 +170,7 @@ void QmlState::setWhen(QmlBindableValue *when) { Q_D(QmlState); d->when = when; - if(d->group) + if (d->group) d->group->updateAutoState(); } @@ -237,10 +237,10 @@ QmlState &QmlState::operator<<(QmlStateOperation *op) #if 0 static void dump(const QmlStateOperation::ActionList &list) { - if(!QString(getenv("STATE_DEBUG")).isEmpty()) + if (!QString(getenv("STATE_DEBUG")).isEmpty()) return; - for(int ii = 0; ii < list.count(); ++ii) { + for (int ii = 0; ii < list.count(); ++ii) { const Action &action = list.at(ii); qWarning() << action.property.object << action.property.name << action.toValue; } @@ -259,9 +259,9 @@ void QmlStatePrivate::complete() } ////////////////////////////////////////////////////////// - for(int ii = 0; ii < reverting.count(); ++ii) { - for(int jj = 0; jj < revertList.count(); ++jj) { - if(revertList.at(jj).property == reverting.at(ii)) { + for (int ii = 0; ii < reverting.count(); ++ii) { + for (int jj = 0; jj < revertList.count(); ++jj) { + if (revertList.at(jj).property == reverting.at(ii)) { revertList.removeAt(jj); break; } @@ -269,7 +269,7 @@ void QmlStatePrivate::complete() } reverting.clear(); - for(int ii = 0; ii < completeList.count(); ++ii) { + for (int ii = 0; ii < completeList.count(); ++ii) { const QmlMetaProperty &prop = completeList.at(ii).property; prop.write(completeList.at(ii).value); } @@ -282,15 +282,15 @@ void QmlStatePrivate::complete() QmlStateOperation::ActionList QmlStatePrivate::generateActionList(QmlStateGroup *group) const { QmlStateOperation::ActionList applyList; - if(inState) + if (inState) return applyList; inState = true; - if(!extends.isEmpty()) { + if (!extends.isEmpty()) { QList<QmlState *> states = group->states(); - for(int ii = 0; ii < states.count(); ++ii) - if(states.at(ii)->name() == extends) + for (int ii = 0; ii < states.count(); ++ii) + if (states.at(ii)->name() == extends) applyList = static_cast<QmlStatePrivate*>(states.at(ii)->d_ptr)->generateActionList(group); } @@ -327,41 +327,41 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever Q_D(QmlState); cancel(); - if(revert) + if (revert) revert->cancel(); d->revertList.clear(); d->reverting.clear(); d->bindingsList.clear(); - if(revert) + if (revert) d->revertList = static_cast<QmlStatePrivate*>(revert->d_ptr)->revertList; QmlStateOperation::RevertActionList additionalReverts; QmlStateOperation::ActionList applyList = d->generateActionList(group); - for(int ii = 0; ii < applyList.count(); ++ii) { + for (int ii = 0; ii < applyList.count(); ++ii) { const Action &action = applyList.at(ii); - if(action.event) + if (action.event) continue; bool found = false; - for(int jj = 0; !found && jj < d->revertList.count(); ++jj) { - if(d->revertList.at(jj).property == action.property) + for (int jj = 0; !found && jj < d->revertList.count(); ++jj) { + if (d->revertList.at(jj).property == action.property) found = true; } - if(!found) { + if (!found) { RevertAction r(action); additionalReverts << r; } } - for(int ii = 0; ii < d->revertList.count(); ++ii) { + for (int ii = 0; ii < d->revertList.count(); ++ii) { bool found = false; - for(int jj = 0; !found && jj < applyList.count(); ++jj) { + for (int jj = 0; !found && jj < applyList.count(); ++jj) { const Action &action = applyList.at(jj); - if(action.property == d->revertList.at(ii).property) + if (action.property == d->revertList.at(ii).property) found = true; } - if(!found) { + if (!found) { QVariant cur = d->revertList.at(ii).property.read(); Action a; a.property = d->revertList.at(ii).property; @@ -383,7 +383,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever //### 4 foreach loops! //////////////////////////////////////////////////////////////////// foreach(const Action &action, applyList) { - if(stateChangeDebug()) + if (stateChangeDebug()) qWarning() << " Action:" << action.property.object() << action.property.name() << action.toValue; if (action.bv && !action.toBinding.isEmpty()) { @@ -396,14 +396,14 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever foreach(const Action &action, applyList) { if (action.bv && !action.toBinding.isEmpty()) { action.bv->setExpression(action.toBinding); - } else if(!action.event) { + } else if (!action.event) { action.property.write(action.toValue); } } for (int ii = 0; ii < applyList.size(); ++ii) { Action *action = &applyList[ii]; - if(action->event) + if (action->event) continue; const QmlMetaProperty &prop = action->property; @@ -413,7 +413,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever } foreach(const Action &action, applyList) { - if(action.event) + if (action.event) continue; if (action.bv && !action.toBinding.isEmpty()) @@ -426,23 +426,23 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever QmlStateOperation::ActionList modList = applyList; QList<QmlMetaProperty> touched; d->completeList.clear(); - if(trans) { + if (trans) { d->transition = trans; trans->prepare(modList, touched, this); - for(int ii = 0; ii < modList.count(); ++ii) { + for (int ii = 0; ii < modList.count(); ++ii) { const Action &action = modList.at(ii); - if(action.event) { - if(action.actionDone) { + if (action.event) { + if (action.actionDone) { modList.removeAt(ii); --ii; } } else { - if(action.toValue != action.fromValue) { + if (action.toValue != action.fromValue) { d->completeList << RevertAction(action, false); } - if(touched.contains(action.property)) { + if (touched.contains(action.property)) { modList.removeAt(ii); --ii; } @@ -451,7 +451,7 @@ void QmlState::apply(QmlStateGroup *group, QmlTransition *trans, QmlState *rever } foreach(const Action &action, modList) { - if(action.event) + if (action.event) action.event->execute(); else action.property.write(action.toValue); diff --git a/src/declarative/util/qmlstategroup.cpp b/src/declarative/util/qmlstategroup.cpp index 36fea4e..cabef63 100644 --- a/src/declarative/util/qmlstategroup.cpp +++ b/src/declarative/util/qmlstategroup.cpp @@ -68,7 +68,7 @@ public: :group(g) {} void append(QmlState *s) { QmlConcreteList<QmlState *>::append(s); - if(s) s->setStateGroup(group); + if (s) s->setStateGroup(group); } private: QmlStateGroup *group; @@ -121,7 +121,7 @@ QString QmlStateGroup::state() const void QmlStateGroup::setState(const QString &state) { Q_D(QmlStateGroup); - if(d->currentState == state) + if (d->currentState == state) return; d->setCurrentStateInternal(state); @@ -152,27 +152,27 @@ void QmlStateGroup::updateAutoState() void QmlStateGroupPrivate::updateAutoState() { Q_Q(QmlStateGroup); - if(!classComplete) + if (!classComplete) return; bool revert = false; - for(int ii = 0; ii < states.count(); ++ii) { + for (int ii = 0; ii < states.count(); ++ii) { QmlState *state = states.at(ii); - if(state->isWhenKnown()) { - if(!state->name().isEmpty()) { - if(state->when() && state->when()->value().toBool()) { - if(stateChangeDebug()) + if (state->isWhenKnown()) { + if (!state->name().isEmpty()) { + if (state->when() && state->when()->value().toBool()) { + if (stateChangeDebug()) qWarning() << "Setting auto state due to:" << state->when()->expression(); q->setState(state->name()); return; - } else if(state->name() == currentState) { + } else if (state->name() == currentState) { revert = true; } } } } - if(revert) + if (revert) q->setState(QString()); } @@ -183,11 +183,11 @@ QmlTransition *QmlStateGroupPrivate::findTransition(const QString &from, const Q bool reversed = false; bool done = false; - for(int ii = 0; !done && ii < transitions.count(); ++ii) { + for (int ii = 0; !done && ii < transitions.count(); ++ii) { QmlTransition *t = transitions.at(ii); - for(int ii = 0; ii < 2; ++ii) + for (int ii = 0; ii < 2; ++ii) { - if(ii && (!t->reversible() || + if (ii && (!t->reversible() || (t->fromState() == QLatin1String("*") && t->toState() == QLatin1String("*")))) break; @@ -196,40 +196,40 @@ QmlTransition *QmlStateGroupPrivate::findTransition(const QString &from, const Q fromState = t->fromState().split(QLatin1Char(',')); toState = t->toState().split(QLatin1Char(',')); - if(ii == 1) + if (ii == 1) qSwap(fromState, toState); int tScore = 0; - if(fromState.contains(from)) + if (fromState.contains(from)) tScore += 2; - else if(fromState.contains(QLatin1String("*"))) + else if (fromState.contains(QLatin1String("*"))) tScore += 1; else continue; - if(toState.contains(to)) + if (toState.contains(to)) tScore += 2; - else if(toState.contains(QLatin1String("*"))) + else if (toState.contains(QLatin1String("*"))) tScore += 1; else continue; - if(ii == 1) + if (ii == 1) reversed = true; else reversed = false; - if(tScore == 4) { + if (tScore == 4) { highest = t; done = true; break; - } else if(tScore > score) { + } else if (tScore > score) { score = tScore; highest = t; } } } - if(highest) + if (highest) highest->setReversed(reversed); return highest; @@ -239,21 +239,21 @@ void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state, bool ignoreTrans) { Q_Q(QmlStateGroup); - if(!componentComplete) + if (!componentComplete) return; QmlTransition *transition = (ignoreTrans || ignoreTrans) ? 0 : findTransition(currentState, state); - if(stateChangeDebug()) { + if (stateChangeDebug()) { qWarning() << this << "Changing state. From" << currentState << ". To" << state; - if(transition) + if (transition) qWarning() << " using transition" << transition->fromState() << transition->toState(); } QmlState *oldState = 0; - if(!currentState.isEmpty()) { - for(int ii = 0; ii < states.count(); ++ii) { - if(states.at(ii)->name() == currentState) { + if (!currentState.isEmpty()) { + for (int ii = 0; ii < states.count(); ++ii) { + if (states.at(ii)->name() == currentState) { oldState = states.at(ii); break; } @@ -263,17 +263,17 @@ void QmlStateGroupPrivate::setCurrentStateInternal(const QString &state, currentState = state; QmlState *newState = 0; - for(int ii = 0; ii < states.count(); ++ii) { - if(states.at(ii)->name() == currentState) { + for (int ii = 0; ii < states.count(); ++ii) { + if (states.at(ii)->name() == currentState) { newState = states.at(ii); break; } } - if(oldState == 0 || newState == 0) { - if(!nullState) { nullState = new QmlState(q); } - if(!oldState) oldState = nullState; - if(!newState) newState = nullState; + if (oldState == 0 || newState == 0) { + if (!nullState) { nullState = new QmlState(q); } + if (!oldState) oldState = nullState; + if (!newState) newState = nullState; } newState->apply(q, transition, oldState); @@ -284,7 +284,7 @@ void QmlStateGroup::componentComplete() Q_D(QmlStateGroup); d->updateAutoState(); d->componentComplete = true; - if(!d->currentState.isEmpty()) { + if (!d->currentState.isEmpty()) { QString cs = d->currentState; d->currentState = QString(); d->setCurrentStateInternal(cs, true); diff --git a/src/declarative/util/qmlstateoperations.cpp b/src/declarative/util/qmlstateoperations.cpp index c70977a..8a10ca3 100644 --- a/src/declarative/util/qmlstateoperations.cpp +++ b/src/declarative/util/qmlstateoperations.cpp @@ -109,7 +109,7 @@ void QmlParentChange::setParent(QObject *parent) QmlStateOperation::ActionList QmlParentChange::actions() { Q_D(QmlParentChange); - if(!d->target || !d->parent) + if (!d->target || !d->parent) return ActionList(); QString propName(QLatin1String("moveToParent")); @@ -118,7 +118,7 @@ QmlStateOperation::ActionList QmlParentChange::actions() qmlInfo(this) << d->target->metaObject()->className() << "has no property named" << propName; return ActionList(); - }else if(!prop.isWritable()){ + }else if (!prop.isWritable()){ qmlInfo(this) << d->target->metaObject()->className() << propName << "is not a writable property and cannot be set."; return ActionList(); @@ -187,7 +187,7 @@ void QmlRunScript::setName(const QString &n) void QmlRunScript::execute() { Q_D(QmlRunScript); - if(!d->script.isEmpty()) { + if (!d->script.isEmpty()) { QmlExpression expr(qmlContext(this), d->script, this); expr.setTrackChange(false); expr.value(); @@ -354,7 +354,7 @@ void QmlSetProperty::setBinding(const QString &binding) QmlSetProperty::ActionList QmlSetProperty::actions() { Q_D(QmlSetProperty); - if(!d->obj) + if (!d->obj) return ActionList(); QObject *obj = d->obj; @@ -362,10 +362,10 @@ QmlSetProperty::ActionList QmlSetProperty::actions() if (d->prop.contains(QLatin1Char('.'))) { //handle dot properties QStringList str = d->prop.split(QLatin1Char('.')); - for(int ii = 0; ii < str.count()-1; ++ii) { + for (int ii = 0; ii < str.count()-1; ++ii) { const QString &s = str.at(ii); QmlMetaProperty prop(obj, s); - if(!prop.isValid()) { + if (!prop.isValid()) { qmlInfo(this) << obj->metaObject()->className() << "has no property named" << s; return ActionList(); @@ -386,7 +386,7 @@ QmlSetProperty::ActionList QmlSetProperty::actions() qmlInfo(this) << obj->metaObject()->className() << "has no property named" << propName; return ActionList(); - }else if(!prop.isWritable()){ + }else if (!prop.isWritable()){ qmlInfo(this) << obj->metaObject()->className() << propName << "is not a writable property and cannot be set."; return ActionList(); @@ -399,7 +399,7 @@ QmlSetProperty::ActionList QmlSetProperty::actions() a.toValue = d->value; if (!d->binding.isEmpty()) { QmlBindableValue *bv = prop.binding(); - if(bv) { + if (bv) { a.fromBinding = bv->expression(); a.bv = bv; } diff --git a/src/declarative/util/qmltransition.cpp b/src/declarative/util/qmltransition.cpp index 181fdb9..a515f58 100644 --- a/src/declarative/util/qmltransition.cpp +++ b/src/declarative/util/qmltransition.cpp @@ -165,12 +165,12 @@ void QmlTransition::prepare(QmlStateOperation::ActionList &actions, { Q_D(QmlTransition); - if(d->reversed) { - for(int ii = d->operations.count() - 1; ii >= 0; --ii) { + if (d->reversed) { + for (int ii = d->operations.count() - 1; ii >= 0; --ii) { d->operations.at(ii)->transition(actions, after, QmlAbstractAnimation::Backward); } } else { - for(int ii = 0; ii < d->operations.count(); ++ii) { + for (int ii = 0; ii < d->operations.count(); ++ii) { d->operations.at(ii)->transition(actions, after, QmlAbstractAnimation::Forward); } } diff --git a/src/declarative/util/qperformancelog.cpp b/src/declarative/util/qperformancelog.cpp index 52ccc0d..8065f9d 100644 --- a/src/declarative/util/qperformancelog.cpp +++ b/src/declarative/util/qperformancelog.cpp @@ -77,22 +77,22 @@ QPerformanceLog::LogData::LogData(const char *desc) QPerformanceLog::LogMetric::LogMetric(LogData *l, int id, const char *desc) { - if(id < 0) + if (id < 0) qFatal("QPerformanceLog: Invalid log id %d ('%s')", id, desc); QPerformanceLogData *logData = performanceLogData(); QPerformanceLogData::Logs::Iterator logIter = logData->logs.find(l); - if(logIter == logData->logs.end()) + if (logIter == logData->logs.end()) qFatal("QPerformanceLog: Unable to locate log for metric '%s'", desc); QPerformanceLogData::Log &log = *logIter; - if(log.descriptions.contains(id)) + if (log.descriptions.contains(id)) qFatal("QPerformanceLog: Duplicate log metric %d ('%s')", id, desc); log.descriptions.insert(id, desc); - if(log.maxId < id) { + if (log.maxId < id) { log.maxId = id; - if(l->data) delete [] l->data; + if (l->data) delete [] l->data; l->data = new unsigned int[2 * (log.maxId + 1)]; ::memset(l->data, 0, 2 * (log.maxId + 1) * sizeof(unsigned int)); } @@ -107,7 +107,7 @@ static void QPerformanceLog_displayData(const QPerformanceLog::LogData *l, const { qWarning() << pl->logDescription << "performance data"; unsigned int total = 0; - for(QHash<int, const char *>::ConstIterator iter = pl->descriptions.begin(); + for (QHash<int, const char *>::ConstIterator iter = pl->descriptions.begin(); iter != pl->descriptions.end(); ++iter) { @@ -126,7 +126,7 @@ void QPerformanceLog::displayData() { QPerformanceLogData *logData = performanceLogData(); - for(QPerformanceLogData::Logs::ConstIterator iter = logData->logs.begin(); + for (QPerformanceLogData::Logs::ConstIterator iter = logData->logs.begin(); iter != logData->logs.end(); ++iter) { QPerformanceLog_displayData(iter.key(), &(*iter)); @@ -137,7 +137,7 @@ void QPerformanceLog::clear() { QPerformanceLogData *logData = performanceLogData(); - for(QPerformanceLogData::Logs::ConstIterator iter = logData->logs.begin(); + for (QPerformanceLogData::Logs::ConstIterator iter = logData->logs.begin(); iter != logData->logs.end(); ++iter) { QPerformanceLog_clear(iter.key(), &(*iter)); @@ -148,7 +148,7 @@ void QPerformanceLog::displayData(LogData *l) { QPerformanceLogData *logData = performanceLogData(); QPerformanceLogData::Logs::ConstIterator iter = logData->logs.find(l); - if(iter == logData->logs.end()) + if (iter == logData->logs.end()) qFatal("QPerformanceLog: Internal corruption - unable to locate log"); QPerformanceLog_displayData(iter.key(), &(*iter)); @@ -158,7 +158,7 @@ void QPerformanceLog::clear(LogData *l) { QPerformanceLogData *logData = performanceLogData(); QPerformanceLogData::Logs::ConstIterator iter = logData->logs.find(l); - if(iter == logData->logs.end()) + if (iter == logData->logs.end()) qFatal("QPerformanceLog: Internal corruption - unable to locate log"); QPerformanceLog_clear(iter.key(), &(*iter)); diff --git a/src/declarative/widgets/graphicslayouts.cpp b/src/declarative/widgets/graphicslayouts.cpp index 8e0081b..d6c4ac2 100644 --- a/src/declarative/widgets/graphicslayouts.cpp +++ b/src/declarative/widgets/graphicslayouts.cpp @@ -119,7 +119,7 @@ void QGraphicsLinearLayoutObject::insertLayoutItem(int index, QGraphicsLayoutIte insertItem(index, item); //connect attached properties - if(QObject *obj = attachedProperties.value(item)) { + if (QObject *obj = attachedProperties.value(item)) { setStretchFactor(item, static_cast<LinearLayoutAttached *>(obj)->stretchFactor()); setAlignment(item, static_cast<LinearLayoutAttached *>(obj)->alignment()); QObject::connect(obj, SIGNAL(stretchChanged(QGraphicsLayoutItem*,int)), @@ -261,7 +261,7 @@ QGraphicsGridLayoutObject::~QGraphicsGridLayoutObject() void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid) { //use attached properties - if(QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) { + if (QObject *obj = attachedProperties.value(qobject_cast<QGraphicsLayoutItem*>(wid))) { int row = static_cast<GridLayoutAttached *>(obj)->row(); int column = static_cast<GridLayoutAttached *>(obj)->column(); int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan(); @@ -277,7 +277,7 @@ void QGraphicsGridLayoutObject::addWidget(QGraphicsWidget *wid) void QGraphicsGridLayoutObject::addLayoutItem(QGraphicsLayoutItem *item) { //use attached properties - if(QObject *obj = attachedProperties.value(item)) { + if (QObject *obj = attachedProperties.value(item)) { int row = static_cast<GridLayoutAttached *>(obj)->row(); int column = static_cast<GridLayoutAttached *>(obj)->column(); int rowSpan = static_cast<GridLayoutAttached *>(obj)->rowSpan(); diff --git a/src/declarative/widgets/graphicswidgets.cpp b/src/declarative/widgets/graphicswidgets.cpp index 1d0e638..b808807 100644 --- a/src/declarative/widgets/graphicswidgets.cpp +++ b/src/declarative/widgets/graphicswidgets.cpp @@ -84,13 +84,13 @@ private: virtual void clear() { for (int i = 0; i < count(); ++i) - if(QGraphicsWidget *w = qobject_cast<QGraphicsWidget *>(at(i))) + if (QGraphicsWidget *w = qobject_cast<QGraphicsWidget *>(at(i))) static_cast<QGraphicsScene *>(q)->removeItem(w); QmlConcreteList<QObject *>::clear(); } virtual void removeAt(int i) { - if(QGraphicsWidget *w = qobject_cast<QGraphicsWidget *>(at(i))) + if (QGraphicsWidget *w = qobject_cast<QGraphicsWidget *>(at(i))) static_cast<QGraphicsScene *>(q)->removeItem(w); QmlConcreteList<QObject *>::removeAt(i); } @@ -99,7 +99,7 @@ private: QmlConcreteList<QObject *>::insert(i, o); //XXX are there any cases when insertion should be different from appension? - if(QGraphicsWidget *w = qobject_cast<QGraphicsWidget *>(o)) + if (QGraphicsWidget *w = qobject_cast<QGraphicsWidget *>(o)) static_cast<QGraphicsScene *>(q)->addItem(w); //else if (QWidget *w = qobject_cast<QWidget *>(o)) // static_cast<QGraphicsScene *>(q)->addWidget(w); diff --git a/src/gui/dialogs/qfiledialog.cpp b/src/gui/dialogs/qfiledialog.cpp index d786f3e..073c25b 100644 --- a/src/gui/dialogs/qfiledialog.cpp +++ b/src/gui/dialogs/qfiledialog.cpp @@ -1538,52 +1538,51 @@ extern QString qt_win_get_existing_directory(const QFileDialogArgs &args); #endif /*! - This is a convenience static function that returns an existing file - selected by the user. If the user presses Cancel, it returns a null - string. + This is a convenience static function that returns an existing file + selected by the user. If the user presses Cancel, it returns a null string. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 8 - The function creates a modal file dialog with the given \a parent widget. - If the parent is not 0, the dialog will be shown centered over the - parent widget. + The function creates a modal file dialog with the given \a parent widget. + If \a parent is not 0, the dialog will be shown centered over the parent + widget. - The file dialog's working directory will be set to \a dir. If \a - dir includes a file name, the file will be selected. Only files - that match the given \a filter are shown. The filter selected is - set to \a selectedFilter. The parameters \a dir, \a - selectedFilter, and \a filter may be empty strings. If you want - multiple filters, separate them with ';;', for example: + The file dialog's working directory will be set to \a dir. If \a dir + includes a file name, the file will be selected. Only files that match the + given \a filter are shown. The filter selected is set to \a selectedFilter. + The parameters \a dir, \a selectedFilter, and \a filter may be empty + strings. If you want multiple filters, separate them with ';;', for + example: - \code + \code "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" - \endcode + \endcode - The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. - The dialog's caption is set to \a caption. If \a caption is not - specified then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified + then a default caption will be used. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks, - the file dialog will treat symlinks as regular directories. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog will treat + symlinks as regular directories. - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory() + \sa getOpenFileNames(), getSaveFileName(), getExistingDirectory() */ QString QFileDialog::getOpenFileName(QWidget *parent, const QString &caption, @@ -1626,54 +1625,53 @@ QString QFileDialog::getOpenFileName(QWidget *parent, } /*! - This is a convenience static function that will return one or more - existing files selected by the user. + This is a convenience static function that will return one or more existing + files selected by the user. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 9 - This function creates a modal file dialog with the given \a parent - widget. If the parent is not 0, the dialog will be shown centered - over the parent widget. + This function creates a modal file dialog with the given \a parent widget. + If \a parent is not 0, the dialog will be shown centered over the parent + widget. - The file dialog's working directory will be set to \a dir. If \a - dir includes a file name, the file will be selected. The filter - is set to \a filter so that only those files which match the filter - are shown. The filter selected is set to \a selectedFilter. The parameters - \a dir, \a selectedFilter and \a filter may be empty strings. If you - need multiple filters, separate them with ';;', for instance: + The file dialog's working directory will be set to \a dir. If \a dir + includes a file name, the file will be selected. The filter is set to + \a filter so that only those files which match the filter are shown. The + filter selected is set to \a selectedFilter. The parameters \a dir, + \a selectedFilter and \a filter may be empty strings. If you need multiple + filters, separate them with ';;', for instance: - \code + \code "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" - \endcode + \endcode - The dialog's caption is set to \a caption. If \a caption is not - specified then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified + then a default caption will be used. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. On Mac OS X, the \a dir argument - is ignored, the native dialog always displays the last visited directory. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. - Note that if you want to iterate over the list of files, you should - iterate over a copy. For example: + \note If you want to iterate over the list of files, you should iterate + over a copy. For example: \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 10 - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileName(), getSaveFileName(), getExistingDirectory() + \sa getOpenFileName(), getSaveFileName(), getExistingDirectory() */ QStringList QFileDialog::getOpenFileNames(QWidget *parent, const QString &caption, @@ -1717,54 +1715,54 @@ QStringList QFileDialog::getOpenFileNames(QWidget *parent, } /*! - This is a convenience static function that will return a file name - selected by the user. The file does not have to exist. + This is a convenience static function that will return a file name selected + by the user. The file does not have to exist. - It creates a modal file dialog with the given \a parent widget. If the - parent is not 0, the dialog will be shown centered over the parent - widget. + It creates a modal file dialog with the given \a parent widget. If + \a parent is not 0, the dialog will be shown centered over the parent + widget. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 11 - The file dialog's working directory will be set to \a dir. If \a - dir includes a file name, the file will be selected. Only files that - match the \a filter are shown. The filter selected is set to - \a selectedFilter. The parameters \a dir, \a selectedFilter, and - \a filter may be empty strings. Multiple filters are separated with ';;'. - For instance: + The file dialog's working directory will be set to \a dir. If \a dir + includes a file name, the file will be selected. Only files that match the + \a filter are shown. The filter selected is set to \a selectedFilter. The + parameters \a dir, \a selectedFilter, and \a filter may be empty strings. + Multiple filters are separated with ';;'. For instance: - \code + \code "Images (*.png *.xpm *.jpg);;Text files (*.txt);;XML files (*.xml)" - \endcode + \endcode - The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. - The default filter can be chosen by setting \a selectedFilter to the desired value. + The default filter can be chosen by setting \a selectedFilter to the + desired value. - The dialog's caption is set to \a caption. If \a caption is not - specified then a default caption will be used. + The dialog's caption is set to \a caption. If \a caption is not specified, + a default caption will be used. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. - On Mac OS X, the filter argument is ignored. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. On Mac OS X, with its native file + dialog, the filter argument is ignored. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks, - the file dialog will treat symlinks as regular directories. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks the file dialog will treat symlinks + as regular directories. - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory() + \sa getOpenFileName(), getOpenFileNames(), getExistingDirectory() */ QString QFileDialog::getSaveFileName(QWidget *parent, const QString &caption, @@ -1810,46 +1808,43 @@ QString QFileDialog::getSaveFileName(QWidget *parent, } /*! - This is a convenience static function that will return an existing - directory selected by the user. + This is a convenience static function that will return an existing + directory selected by the user. - \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12 + \snippet doc/src/snippets/code/src_gui_dialogs_qfiledialog.cpp 12 - This function creates a modal file dialog with the given \a parent - widget. If the parent is not 0, the dialog will be shown centered over - the parent widget. + This function creates a modal file dialog with the given \a parent widget. + If \a parent is not 0, the dialog will be shown centered over the parent + widget. - The dialog's working directory is set to \a dir, and the caption is - set to \a caption. Either of these may be an empty string in which case - the current directory and a default caption will be used - respectively. + The dialog's working directory is set to \a dir, and the caption is set to + \a caption. Either of these may be an empty string in which case the + current directory and a default caption will be used respectively. - The \a options argument holds various - options about how to run the dialog, see the QFileDialog::Option enum for - more information on the flags you can pass. Note that \l{QFileDialog::}{ShowDirsOnly} - must be set to ensure a native file dialog. + The \a options argument holds various options about how to run the dialog, + see the QFileDialog::Option enum for more information on the flags you can + pass. To ensure a native file dialog, \l{QFileDialog::}{ShowDirsOnly} must + be set. - Under Windows and Mac OS X, this static function will use the native - file dialog and not a QFileDialog. On Mac OS X, the \a dir argument - is ignored, the native dialog always displays the last visited directory. - On Windows CE, if the device has no native file dialog, a QFileDialog - will be used. + On Windows and Mac OS X, this static function will use the native file + dialog and not a QFileDialog. On Windows CE, if the device has no native + file dialog, a QFileDialog will be used. - Under Unix/X11, the normal behavior of the file dialog is to resolve - and follow symlinks. For example, if \c{/usr/tmp} is a symlink to - \c{/var/tmp}, the file dialog will change to \c{/var/tmp} after - entering \c{/usr/tmp}. If \a options includes DontResolveSymlinks, - the file dialog will treat symlinks as regular directories. + On Unix/X11, the normal behavior of the file dialog is to resolve and + follow symlinks. For example, if \c{/usr/tmp} is a symlink to \c{/var/tmp}, + the file dialog will change to \c{/var/tmp} after entering \c{/usr/tmp}. If + \a options includes DontResolveSymlinks, the file dialog will treat + symlinks as regular directories. - Note that on Windows the dialog will spin a blocking modal event loop - that will not dispatch any QTimers, and if parent is not 0 then it will - position the dialog just under the parent's title bar. + On Windows the dialog will spin a blocking modal event loop that will not + dispatch any QTimers, and if \a parent is not 0 then it will position the + dialog just below the parent's title bar. - \warning Do not delete \a parent during the execution of the dialog. - If you want to do this, you should create the dialog - yourself using one of the QFileDialog constructors. + \warning Do not delete \a parent during the execution of the dialog. If you + want to do this, you should create the dialog yourself using one of the + QFileDialog constructors. - \sa getOpenFileName(), getOpenFileNames(), getSaveFileName() + \sa getOpenFileName(), getOpenFileNames(), getSaveFileName() */ QString QFileDialog::getExistingDirectory(QWidget *parent, const QString &caption, diff --git a/src/gui/dialogs/qfilesystemmodel_p.h b/src/gui/dialogs/qfilesystemmodel_p.h index 0a1265a..61e8b4c 100644 --- a/src/gui/dialogs/qfilesystemmodel_p.h +++ b/src/gui/dialogs/qfilesystemmodel_p.h @@ -164,9 +164,12 @@ public: QHash<QString, QFileSystemNode *>::const_iterator iterator; for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) { //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/) - if (!path.isEmpty()) - iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); - else + if (!path.isEmpty()) { + if (path.endsWith(QLatin1Char('/'))) + iterator.value()->updateIcon(iconProvider, path + iterator.value()->fileName); + else + iterator.value()->updateIcon(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); + } else iterator.value()->updateIcon(iconProvider, iterator.value()->fileName); } } @@ -177,9 +180,12 @@ public: QHash<QString, QFileSystemNode *>::const_iterator iterator; for(iterator = children.constBegin() ; iterator != children.constEnd() ; ++iterator) { //On windows the root (My computer) has no path so we don't want to add a / for nothing (e.g. /C:/) - if (!path.isEmpty()) - iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); - else + if (!path.isEmpty()) { + if (path.endsWith(QLatin1Char('/'))) + iterator.value()->retranslateStrings(iconProvider, path + iterator.value()->fileName); + else + iterator.value()->retranslateStrings(iconProvider, path + QLatin1Char('/') + iterator.value()->fileName); + } else iterator.value()->retranslateStrings(iconProvider, iterator.value()->fileName); } } diff --git a/src/gui/dialogs/qfontdialog_mac.mm b/src/gui/dialogs/qfontdialog_mac.mm index 42be3be..50917a1 100644 --- a/src/gui/dialogs/qfontdialog_mac.mm +++ b/src/gui/dialogs/qfontdialog_mac.mm @@ -87,7 +87,6 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin NSButton *mOkButton; NSButton *mCancelButton; QFontDialogPrivate *mPriv; - NSFont *mCocoaFont; QFont *mQtFont; BOOL mPanelHackedWithButtons; CGFloat mDialogExtraWidth; @@ -119,6 +118,29 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)cleanUpAfterMyself; @end +static QFont qfontForCocoaFont(NSFont *cocoaFont, const QFont &resolveFont) +{ + QFont newFont; + if (cocoaFont) { + int pSize = qRound([cocoaFont pointSize]); + QString family(QCFString::toQString(reinterpret_cast<CFStringRef>([cocoaFont familyName]))); + QString typeface(QCFString::toQString(reinterpret_cast<CFStringRef>([cocoaFont fontName]))); +// qDebug() << "original family" << family << "typeface" << typeface << "psize" << pSize; + int hyphenPos = typeface.indexOf(QLatin1Char('-')); + if (hyphenPos != -1) { + typeface.remove(0, hyphenPos + 1); + } else { + typeface = QLatin1String("Normal"); + } +// qDebug() << " massaged family" << family << "typeface" << typeface << "psize" << pSize; + newFont = QFontDatabase().font(family, typeface, pSize); + newFont.setUnderline(resolveFont.underline()); + newFont.setStrikeOut(resolveFont.strikeOut()); + + } + return newFont; +} + @implementation QCocoaFontPanelDelegate - (id)initWithFontPanel:(NSFontPanel *)panel stolenContentView:(NSView *)stolenContentView @@ -134,7 +156,6 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin mOkButton = okButton; mCancelButton = cancelButton; mPriv = priv; - mCocoaFont = 0; mPanelHackedWithButtons = (okButton != 0); mDialogExtraWidth = extraWidth; mDialogExtraHeight = extraHeight; @@ -155,42 +176,14 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)dealloc { - if (mCocoaFont) - [mCocoaFont release]; delete mQtFont; [super dealloc]; } - (void)changeFont:(id)sender { - Q_UNUSED(sender); - - QFont newFont; - - if (mCocoaFont) - [mCocoaFont autorelease]; NSFont *dummyFont = [NSFont userFontOfSize:12.0]; - mCocoaFont = [sender convertFont:dummyFont]; - if (mCocoaFont) { - [mCocoaFont retain]; - - int pSize = qRound([mCocoaFont pointSize]); - QString family(QCFString::toQString(reinterpret_cast<CFStringRef>([mCocoaFont familyName]))); - QString typeface(QCFString::toQString(reinterpret_cast<CFStringRef>([mCocoaFont fontName]))); -// qDebug() << "original family" << family << "typeface" << typeface << "psize" << pSize; - int hyphenPos = typeface.indexOf(QLatin1Char('-')); - if (hyphenPos != -1) { - typeface.remove(0, hyphenPos + 1); - } else { - typeface = QLatin1String("Normal"); - } -// qDebug() << " massaged family" << family << "typeface" << typeface << "psize" << pSize; - newFont = QFontDatabase().font(family, typeface, pSize); - newFont.setUnderline(mQtFont->underline()); - newFont.setStrikeOut(mQtFont->strikeOut()); - } - - [self setQtFont:newFont]; + [self setQtFont:qfontForCocoaFont([sender convertFont:dummyFont], *mQtFont)]; if (mPriv) mPriv->updateSampleFont(*mQtFont); } @@ -317,6 +310,9 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin - (void)onOkClicked { Q_ASSERT(mPanelHackedWithButtons); + NSFontManager *fontManager = [NSFontManager sharedFontManager]; + [self setQtFont:qfontForCocoaFont([fontManager convertFont:[fontManager selectedFont]], + *mQtFont)]; [[mStolenContentView window] close]; [self finishOffWithCode:NSOKButton]; } @@ -374,16 +370,7 @@ const int StyleMask = NSTitledWindowMask | NSClosableWindowMask | NSResizableWin mModalSession = 0; } - // temporary hack to work around bug in deleteLater() in Qt/Mac Cocoa -#if 1 - bool deleteDialog = mPriv->fontDialog()->testAttribute(Qt::WA_DeleteOnClose); - mPriv->fontDialog()->setAttribute(Qt::WA_DeleteOnClose, false); -#endif mPriv->done((code == NSOKButton) ? QDialog::Accepted : QDialog::Rejected); -#if 1 - if (deleteDialog) - delete mPriv->fontDialog(); -#endif } else { [NSApp stopModalWithCode:code]; } diff --git a/src/gui/dialogs/qsidebar.cpp b/src/gui/dialogs/qsidebar.cpp index bfdb37e..26108d7 100644 --- a/src/gui/dialogs/qsidebar.cpp +++ b/src/gui/dialogs/qsidebar.cpp @@ -248,7 +248,11 @@ void QUrlModel::addUrls(const QList<QUrl> &list, int row, bool move) if (!url.isValid() || url.scheme() != QLatin1String("file")) continue; for (int j = 0; move && j < rowCount(); ++j) { +#if defined(Q_OS_WIN) + if (index(j, 0).data(UrlRole).toUrl().toLocalFile().toLower() == url.toLocalFile().toLower()) { +#else if (index(j, 0).data(UrlRole) == url) { +#endif removeRow(j); if (j <= row) row--; diff --git a/src/gui/embedded/qscreentransformed_qws.cpp b/src/gui/embedded/qscreentransformed_qws.cpp index f988789..46ac1d1 100644 --- a/src/gui/embedded/qscreentransformed_qws.cpp +++ b/src/gui/embedded/qscreentransformed_qws.cpp @@ -410,7 +410,9 @@ void QTransformedScreen::blit(const QImage &image, const QPoint &topLeft, #endif #ifdef QT_QWS_DEPTH_8 case 8: - if (image.depth() == 16) + if (image.format() == QImage::Format_RGB444) + SET_BLIT_FUNC(quint8, qrgb444, trans, func); + else if (image.depth() == 16) SET_BLIT_FUNC(quint8, quint16, trans, func); else SET_BLIT_FUNC(quint8, quint32, trans, func); diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index 7971711..92be62f 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -885,6 +885,38 @@ void QGraphicsItemPrivate::setParentItemHelper(QGraphicsItem *newParent, bool de /*! \internal + Returns the bounding rect of this item's children (excluding itself). +*/ +void QGraphicsItemPrivate::childrenBoundingRectHelper(QTransform *x, QRectF *rect) +{ + for (int i = 0; i < children.size(); ++i) { + QGraphicsItem *child = children.at(i); + QGraphicsItemPrivate *childd = child->d_ptr; + bool hasX = childd->hasTransform; + bool hasPos = !childd->pos.isNull(); + if (hasPos || hasX) { + QTransform matrix; + if (hasX) + matrix = child->transform(); + if (hasPos) { + const QPointF &p = childd->pos; + matrix *= QTransform::fromTranslate(p.x(), p.y()); + } + matrix *= *x; + *rect |= matrix.mapRect(child->boundingRect()); + if (!childd->children.isEmpty()) + childd->childrenBoundingRectHelper(&matrix, rect); + } else { + *rect |= x->mapRect(child->boundingRect()); + if (!childd->children.isEmpty()) + childd->childrenBoundingRectHelper(x, rect); + } + } +} + +/*! + \internal + Empty all cached pixmaps from the pixmap cache. */ void QGraphicsItemCache::purge() @@ -3255,13 +3287,8 @@ void QGraphicsItem::setZValue(qreal z) QRectF QGraphicsItem::childrenBoundingRect() const { QRectF childRect; - foreach (QGraphicsItem *child, children()) { - QPointF childPos = child->pos(); - QTransform matrix = child->transform(); - if (!childPos.isNull()) - matrix *= QTransform::fromTranslate(childPos.x(), childPos.y()); - childRect |= matrix.mapRect(child->boundingRect() | child->childrenBoundingRect()); - } + QTransform x; + d_ptr->childrenBoundingRectHelper(&x, &childRect); return childRect; } diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index fb0bd2d..bcbd737 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -187,6 +187,7 @@ public: void addChild(QGraphicsItem *child); void removeChild(QGraphicsItem *child); void setParentItemHelper(QGraphicsItem *parent, bool deleting); + void childrenBoundingRectHelper(QTransform *x, QRectF *rect); virtual void resolveFont(uint inheritedMask) { diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp index a9d585c..7720a10 100644 --- a/src/gui/graphicsview/qgraphicsview.cpp +++ b/src/gui/graphicsview/qgraphicsview.cpp @@ -2809,9 +2809,7 @@ void QGraphicsView::setupViewport(QWidget *widget) const bool isGLWidget = widget->inherits("QGLWidget"); - d->accelerateScrolling = !(isGLWidget - || widget->testAttribute(Qt::WA_MSWindowsUseDirect3D) - || qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)); + d->accelerateScrolling = !(isGLWidget); widget->setFocusPolicy(Qt::StrongFocus); diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 3b82da8..f495b31 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -1359,14 +1359,6 @@ bool QPixmap::isDetached() const void QPixmap::deref() { if (data && !data->ref.deref()) { // Destroy image if last ref -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) - if (data->classId() == QPixmapData::RasterClass) { - QRasterPixmapData *rData = static_cast<QRasterPixmapData*>(data); - if (rData->texture) - rData->texture->Release(); - rData->texture = 0; - } -#endif if (data->is_cached && qt_pixmap_cleanup_hook_64) qt_pixmap_cleanup_hook_64(cacheKey()); delete data; @@ -1938,12 +1930,6 @@ void QPixmap::detach() if (id == QPixmapData::RasterClass) { QRasterPixmapData *rasterData = static_cast<QRasterPixmapData*>(data); rasterData->image.detach(); -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - if (rasterData->texture) { - rasterData->texture->Release(); - rasterData->texture = 0; - } -#endif } if (data->is_cached && qt_pixmap_cleanup_hook_64 && data->ref == 1) diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index cd3b465..a5609e4 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -254,8 +254,6 @@ private: friend class QWidgetPrivate; friend class QRasterPaintEngine; friend class QRasterBuffer; - friend class QDirect3DPaintEngine; - friend class QDirect3DPaintEnginePrivate; friend class QDetachedPixmap; #if !defined(QT_NO_DATASTREAM) friend Q_GUI_EXPORT QDataStream &operator>>(QDataStream &, QPixmap &); diff --git a/src/gui/image/qpixmap_raster.cpp b/src/gui/image/qpixmap_raster.cpp index 145b02a..b5556cd 100644 --- a/src/gui/image/qpixmap_raster.cpp +++ b/src/gui/image/qpixmap_raster.cpp @@ -50,12 +50,6 @@ #include <private/qwidget_p.h> #include <private/qdrawhelper_p.h> -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) -#include <private/qpaintengine_d3d_p.h> -#include <d3d9.h> -extern QDirect3DPaintEngine *qt_d3dEngine(); -#endif - QT_BEGIN_NAMESPACE const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08, @@ -63,9 +57,6 @@ const uchar qt_pixmap_bit_mask[] = { 0x01, 0x02, 0x04, 0x08, QRasterPixmapData::QRasterPixmapData(PixelType type) : QPixmapData(type, RasterClass) -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - , texture(0) -#endif { } diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 48d5cf8..9d3bf72 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -58,9 +58,6 @@ #ifdef Q_WS_WIN # include "qt_windows.h" -# ifndef QT_NO_DIRECT3D -# include <d3d9.h> -# endif #endif QT_BEGIN_NAMESPACE @@ -88,10 +85,6 @@ protected: int metric(QPaintDevice::PaintDeviceMetric metric) const; private: -#if defined(Q_WS_WIN) && !defined(QT_NO_DIRECT3D) - friend class QDirect3DPaintEnginePrivate; - IDirect3DTexture9 *texture; -#endif friend class QPixmap; friend class QBitmap; friend class QDetachedPixmap; diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index eedb6a3..458d6b9 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -187,6 +187,11 @@ bool QPMCache::insert(const QString& key, const QPixmap &pixmap, int cost) cacheKeys.insert(key, cacheKey); return true; } + qint64 oldCacheKey = cacheKeys.value(key, -1); + //If for the same key we add already a pixmap we should delete it + if (oldCacheKey != -1) + QCache<qint64, QDetachedPixmap>::remove(oldCacheKey); + bool success = QCache<qint64, QDetachedPixmap>::insert(cacheKey, new QDetachedPixmap(pixmap), cost); if (success) { cacheKeys.insert(key, cacheKey); diff --git a/src/gui/itemviews/qsortfilterproxymodel.cpp b/src/gui/itemviews/qsortfilterproxymodel.cpp index 91431c4..fee19c9 100644 --- a/src/gui/itemviews/qsortfilterproxymodel.cpp +++ b/src/gui/itemviews/qsortfilterproxymodel.cpp @@ -56,6 +56,15 @@ QT_BEGIN_NAMESPACE typedef QList<QPair<QModelIndex, QPersistentModelIndex> > QModelIndexPairList; +static inline QSet<int> qVectorToSet(const QVector<int> &vector) +{ + QSet<int> set; + set.reserve(vector.size()); + for(int i=0; i < vector.size(); ++i) + set << vector.at(i); + return set; +} + class QSortFilterProxyModelLessThan { public: @@ -223,8 +232,8 @@ public: QModelIndexPairList store_persistent_indexes(); void update_persistent_indexes(const QModelIndexPairList &source_indexes); - void filter_changed(); - void handle_filter_changed( + void filter_changed(const QModelIndex &source_parent = QModelIndex()); + QSet<int> handle_filter_changed( QVector<int> &source_to_proxy, QVector<int> &proxy_to_source, const QModelIndex &source_parent, Qt::Orientation orient); @@ -928,27 +937,39 @@ void QSortFilterProxyModelPrivate::update_persistent_indexes( q->changePersistentIndexList(from, to); } + /*! \internal Updates the proxy model (adds/removes rows) based on the new filter. */ -void QSortFilterProxyModelPrivate::filter_changed() +void QSortFilterProxyModelPrivate::filter_changed(const QModelIndex &source_parent) { - QMap<QModelIndex, Mapping *>::const_iterator it; - for (it = source_index_mapping.constBegin(); it != source_index_mapping.constEnd(); ++it) { - QModelIndex source_parent = it.key(); - Mapping *m = it.value(); - handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical); - handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal); + IndexMap::const_iterator it = source_index_mapping.constFind(source_parent); + if (it == source_index_mapping.constEnd()) + return; + Mapping *m = it.value(); + QSet<int> rows_removed = handle_filter_changed(m->proxy_rows, m->source_rows, source_parent, Qt::Vertical); + QSet<int> columns_removed = handle_filter_changed(m->proxy_columns, m->source_columns, source_parent, Qt::Horizontal); + QVector<QModelIndex>::iterator it2 = m->mapped_children.end(); + while (it2 != m->mapped_children.begin()) { + --it2; + const QModelIndex source_child_index = *it2; + if (rows_removed.contains(source_child_index.row()) || columns_removed.contains(source_child_index.column())) { + it2 = m->mapped_children.erase(it2); + remove_from_mapping(source_child_index); + } else { + filter_changed(source_child_index); + } } } /*! \internal + returns the removed items indexes */ -void QSortFilterProxyModelPrivate::handle_filter_changed( +QSet<int> QSortFilterProxyModelPrivate::handle_filter_changed( QVector<int> &source_to_proxy, QVector<int> &proxy_to_source, const QModelIndex &source_parent, Qt::Orientation orient) { @@ -985,6 +1006,7 @@ void QSortFilterProxyModelPrivate::handle_filter_changed( insert_source_items(source_to_proxy, proxy_to_source, source_items_insert, source_parent, orient); } + return qVectorToSet(source_items_remove); } void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &source_top_left, @@ -1035,15 +1057,14 @@ void QSortFilterProxyModelPrivate::_q_sourceDataChanged(const QModelIndex &sourc if (!source_rows_remove.isEmpty()) { remove_source_items(m->proxy_rows, m->source_rows, source_rows_remove, source_parent, Qt::Vertical); - QSet<int> source_rows_remove_set = source_rows_remove.toList().toSet(); - QVector<QModelIndex>::iterator it = m->mapped_children.begin(); - while (it != m->mapped_children.end()) { + QSet<int> source_rows_remove_set = qVectorToSet(source_rows_remove); + QVector<QModelIndex>::iterator it = m->mapped_children.end(); + while (it != m->mapped_children.begin()) { + --it; const QModelIndex source_child_index = *it; if (source_rows_remove_set.contains(source_child_index.row())) { it = m->mapped_children.erase(it); remove_from_mapping(source_child_index); - } else { - ++it; } } } diff --git a/src/gui/kernel/kernel.pri b/src/gui/kernel/kernel.pri index cb2b014..a1b982a 100644 --- a/src/gui/kernel/kernel.pri +++ b/src/gui/kernel/kernel.pri @@ -193,7 +193,7 @@ embedded { MENU_NIB.path = Resources MENU_NIB.version = Versions QMAKE_BUNDLE_DATA += MENU_NIB - RESOURCES += mac/maccursors.qrc + RESOURCES += mac/macresources.qrc LIBS += -framework AppKit } diff --git a/src/gui/kernel/qaction.cpp b/src/gui/kernel/qaction.cpp index 921be22..c6addc1 100644 --- a/src/gui/kernel/qaction.cpp +++ b/src/gui/kernel/qaction.cpp @@ -136,27 +136,25 @@ void QActionPrivate::redoGrab(QShortcutMap &map) void QActionPrivate::redoGrabAlternate(QShortcutMap &map) { Q_Q(QAction); - for (int i = 0; i < alternateShortcutIds.size(); ++i) - if (int id = alternateShortcutIds.at(i)) + foreach (int id, alternateShortcutIds) + if (id) map.removeShortcut(id, q); alternateShortcutIds.clear(); if (alternateShortcuts.isEmpty()) return; - for (int i = 0; i < alternateShortcuts.size(); ++i) { - const QKeySequence &alternate = alternateShortcuts.at(i); + foreach (const QKeySequence& alternate, alternateShortcuts) { if (!alternate.isEmpty()) alternateShortcutIds.append(map.addShortcut(q, alternate, shortcutContext)); else alternateShortcutIds.append(0); } - if (!enabled) { - for (int i = 0; i < alternateShortcutIds.size(); ++i) - map.setShortcutEnabled(false, alternateShortcutIds.at(i), q); + foreach (int id, alternateShortcutIds) + map.setShortcutEnabled(false, id, q); } if (!autorepeat) { - for (int i = 0; i < alternateShortcutIds.size(); ++i) - map.setShortcutAutoRepeat(false, alternateShortcutIds.at(i), q); + foreach (int id, alternateShortcutIds) + map.setShortcutAutoRepeat(false, id, q); } } @@ -165,26 +163,10 @@ void QActionPrivate::setShortcutEnabled(bool enable, QShortcutMap &map) Q_Q(QAction); if (shortcutId) map.setShortcutEnabled(enable, shortcutId, q); - for (int i = 0; i < alternateShortcutIds.size(); ++i) - if (int id = alternateShortcutIds.at(i)) + foreach (int id, alternateShortcutIds) + if (id) map.setShortcutEnabled(enable, id, q); } - -void QActionPrivate::removeAll(QShortcutMap &map) -{ - Q_Q(QAction); - if (shortcutId) { - map.removeShortcut(shortcutId, q); - shortcutId = 0; - } - - for (int i = 0; i < alternateShortcutIds.size(); ++i) - if (int id = alternateShortcutIds.at(i)) - map.removeShortcut(id, q); - - alternateShortcutIds.clear(); -} - #endif // QT_NO_SHORTCUT @@ -633,8 +615,8 @@ QAction::~QAction() #ifndef QT_NO_SHORTCUT if (d->shortcutId && qApp) { qApp->d_func()->shortcutMap.removeShortcut(d->shortcutId, this); - for (int i = 0; i < d->alternateShortcutIds.size(); ++i) - qApp->d_func()->shortcutMap.removeShortcut(d->alternateShortcutIds.at(i), this); + foreach (int id, d->alternateShortcutIds) + qApp->d_func()->shortcutMap.removeShortcut(id, this); } #endif } @@ -1067,12 +1049,7 @@ void QAction::setVisible(bool b) d->visible = b; d->enabled = b && !d->forceDisabled && (!d->group || d->group->isEnabled()) ; #ifndef QT_NO_SHORTCUT - if (b) { - d->redoGrab(qApp->d_func()->shortcutMap); - d->redoGrabAlternate(qApp->d_func()->shortcutMap); - } else { - d->removeAll(qApp->d_func()->shortcutMap); - } + d->setShortcutEnabled(d->enabled, qApp->d_func()->shortcutMap); #endif d->sendDataChanged(); } diff --git a/src/gui/kernel/qaction_p.h b/src/gui/kernel/qaction_p.h index a5b3731..0617ef5 100644 --- a/src/gui/kernel/qaction_p.h +++ b/src/gui/kernel/qaction_p.h @@ -111,7 +111,6 @@ public: void redoGrab(QShortcutMap &map); void redoGrabAlternate(QShortcutMap &map); void setShortcutEnabled(bool enable, QShortcutMap &map); - void removeAll(QShortcutMap &map); static QShortcutMap *globalMap; #endif // QT_NO_SHORTCUT diff --git a/src/gui/kernel/qapplication.cpp b/src/gui/kernel/qapplication.cpp index fd189c7..34c135c 100644 --- a/src/gui/kernel/qapplication.cpp +++ b/src/gui/kernel/qapplication.cpp @@ -107,9 +107,6 @@ static void initResources() Q_INIT_RESOURCE(qstyle); #endif -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) - Q_INIT_RESOURCE(qpaintengine_d3d); -#endif Q_INIT_RESOURCE(qmessagebox); #if !defined(QT_NO_PRINTDIALOG) Q_INIT_RESOURCE(qprintdialog); @@ -620,13 +617,6 @@ void QApplicationPrivate::process_cmdline() and QPixmaps. Available options are \c{raster} and \c{opengl}. \endlist - The Windows version of Qt supports an additional command line option, if - Direct3D support has been compiled into Qt: - \list - \o -direct3d will make the Direct3D paint engine the default widget - paint engine in Qt. \bold {This functionality is experimental.} - \endlist - The X11 version of Qt supports some traditional X11 command line options: \list \o -display \e display, sets the X display (default is $DISPLAY). @@ -832,12 +822,13 @@ QApplication::QApplication(Display *dpy, int &argc, char **argv, #endif // Q_WS_X11 +extern void qInitDrawhelperAsm(); /*! + \fn void QApplicationPrivate::initialize() + Initializes the QApplication object, called from the constructors. */ -extern void qInitDrawhelperAsm(); - void QApplicationPrivate::initialize() { QWidgetPrivate::mapper = new QWidgetMapper; @@ -2106,8 +2097,8 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason) if (that) QApplication::sendEvent(that->style(), &in); } + emit qApp->focusChanged(prev, focus_widget); } - emit qApp->focusChanged(prev, focus_widget); } } @@ -3504,7 +3495,7 @@ void QApplication::changeOverrideCursor(const QCursor &cursor) It is necessary to call this function to start event handling. The main event loop receives events from the window system and dispatches these to the application widgets. - + Generally, no user interaction can take place before calling exec(). As a special case, modal widgets like QMessageBox can be used before calling exec(), because modal widgets call exec() to start a local event loop. diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 2f2fc2c..c1cb7e2 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -745,9 +745,6 @@ void qt_init(QApplicationPrivate *priv, int) appNoGrab = !appNoGrab; else #endif // QT_DEBUG - if (qstrcmp(argv[i], "-direct3d") == 0) - QApplication::setAttribute(Qt::AA_MSWindowsUseDirect3DByDefault); - else argv[j++] = argv[i]; } if(j < priv->argc) { diff --git a/src/gui/kernel/qapplication_x11.cpp b/src/gui/kernel/qapplication_x11.cpp index 366e576..d7ca2f4 100644 --- a/src/gui/kernel/qapplication_x11.cpp +++ b/src/gui/kernel/qapplication_x11.cpp @@ -402,7 +402,7 @@ extern bool qt_xdnd_dragging; // gui or non-gui from qapplication.cpp extern bool qt_is_gui_used; -/*! +/*! \internal Try to resolve a \a symbol from \a library with the version specified by \a vernum. @@ -840,7 +840,7 @@ bool QApplicationPrivate::x11_apply_settings() } int kdeSessionVersion = QString::fromLocal8Bit(qgetenv("KDE_SESSION_VERSION")).toInt(); - + if (!appFont) { QFont font(QApplication::font()); QString fontDescription; @@ -1583,6 +1583,7 @@ static PtrWacomConfigOpenDevice ptrWacomConfigOpenDevice = 0; static PtrWacomConfigGetRawParam ptrWacomConfigGetRawParam = 0; static PtrWacomConfigCloseDevice ptrWacomConfigCloseDevice = 0; static PtrWacomConfigTerm ptrWacomConfigTerm = 0; +Q_GLOBAL_STATIC(QByteArray, wacomDeviceName) #endif #endif @@ -1952,11 +1953,17 @@ void qt_init(QApplicationPrivate *priv, int, { QString displayName = QLatin1String(XDisplayName(NULL)); - // apparently MITSHM only works for local displays, so do a quick check here - // to determine whether the display is local or not (not 100 % accurate) + // MITSHM only works for local displays, so do a quick check here + // to determine whether the display is local or not (not 100 % accurate). + // BGR server layouts are not supported either, since it requires the raster + // engine to work on a QImage with BGR layout. bool local = displayName.isEmpty() || displayName.lastIndexOf(QLatin1Char(':')) == 0; - if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) - X11->use_mitshm = mitshm_pixmaps; + if (local && (qgetenv("QT_X11_NO_MITSHM").toInt() == 0)) { + Visual *defaultVisual = DefaultVisual(X11->display, DefaultScreen(X11->display)); + X11->use_mitshm = mitshm_pixmaps && (defaultVisual->red_mask == 0xff0000 + && defaultVisual->green_mask == 0xff00 + && defaultVisual->blue_mask == 0xff); + } } #endif // QT_NO_MITSHM @@ -2377,6 +2384,8 @@ void qt_init(QApplicationPrivate *priv, int, #else if (devs->type == ATOM(XWacomStylus)) { deviceType = QTabletEvent::Stylus; + if (wacomDeviceName()->isEmpty()) + wacomDeviceName()->append(devs->name); gotStylus = true; } else if (devs->type == ATOM(XWacomEraser)) { deviceType = QTabletEvent::XFreeEraser; @@ -4511,8 +4520,7 @@ void fetchWacomToolId(int &deviceType, qint64 &serialId) WACOMCONFIG *config = ptrWacomConfigInit(X11->display, 0); if (config == 0) return; - const char *name = "stylus"; // TODO get this from the X config instead (users may have called it differently) - WACOMDEVICE *device = ptrWacomConfigOpenDevice (config, name); + WACOMDEVICE *device = ptrWacomConfigOpenDevice (config, wacomDeviceName()->constData()); if (device == 0) return; unsigned keys[1]; diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index dcb3564..cf66605 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -293,9 +293,18 @@ extern "C" { QPoint posDrag(localPoint.x, localPoint.y); NSDragOperation nsActions = [sender draggingSourceOperationMask]; Qt::DropActions qtAllowed = qt_mac_mapNSDragOperations(nsActions); + QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastOperation) = nsActions; + Qt::KeyboardModifiers modifiers = Qt::NoModifier; + if ([sender draggingSource] != nil) { + // modifier flags might have changed, update it here since we don't send any input events. + QApplicationPrivate::modifier_buttons = qt_cocoaModifiers2QtModifiers([[NSApp currentEvent] modifierFlags]); + modifiers = QApplication::keyboardModifiers(); + } else { + // when the source is from another application the above technique will not work. + modifiers = qt_cocoaDragOperation2QtModifiers(nsActions); + } // send the drag enter event to the widget. - QDragEnterEvent qDEEvent(posDrag, qtAllowed, mimeData, - QApplication::mouseButtons(), QApplication::keyboardModifiers()); + QDragEnterEvent qDEEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); QApplication::sendEvent(qwidget, &qDEEvent); if (!qDEEvent.isAccepted()) { // widget is not interested in this drag, so ignore this drop data. @@ -303,24 +312,23 @@ extern "C" { return NSDragOperationNone; } else { // send a drag move event immediately after a drag enter event (as per documentation). - QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, - QApplication::mouseButtons(), QApplication::keyboardModifiers()); + QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); qDMEvent.setDropAction(qDEEvent.dropAction()); qDMEvent.accept(); // accept by default, since enter event was accepted. QApplication::sendEvent(qwidget, &qDMEvent); if (!qDMEvent.isAccepted() || qDMEvent.dropAction() == Qt::IgnoreAction) { // since we accepted the drag enter event, the widget expects // future drage move events. - // ### check if we need to treat this like the drag enter event. + // ### check if we need to treat this like the drag enter event. nsActions = QT_PREPEND_NAMESPACE(qt_mac_mapDropAction)(qDEEvent.dropAction()); } else { nsActions = QT_PREPEND_NAMESPACE(qt_mac_mapDropAction)(qDMEvent.dropAction()); - } + } QT_PREPEND_NAMESPACE(qt_mac_copy_answer_rect)(qDMEvent); - return nsActions; + return nsActions; } } - + - (NSDragOperation)draggingUpdated:(id < NSDraggingInfo >)sender { // drag enter event was rejected, so ignore the move event. @@ -338,11 +346,19 @@ extern "C" { // send drag move event to the widget QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec.lastOperation) = nsActions; Qt::DropActions qtAllowed = QT_PREPEND_NAMESPACE(qt_mac_mapNSDragOperations)(nsActions); + Qt::KeyboardModifiers modifiers = Qt::NoModifier; + if ([sender draggingSource] != nil) { + // modifier flags might have changed, update it here since we don't send any input events. + QApplicationPrivate::modifier_buttons = qt_cocoaModifiers2QtModifiers([[NSApp currentEvent] modifierFlags]); + modifiers = QApplication::keyboardModifiers(); + } else { + // when the source is from another application the above technique will not work. + modifiers = qt_cocoaDragOperation2QtModifiers(nsActions); + } QMimeData *mimeData = dropData; if (QDragManager::self()->source()) mimeData = QDragManager::self()->dragPrivate()->data; - QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, - QApplication::mouseButtons(), QApplication::keyboardModifiers()); + QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers); qDMEvent.setDropAction(QT_PREPEND_NAMESPACE(qt_mac_dnd_answer_rec).lastAction); qDMEvent.accept(); QApplication::sendEvent(qwidget, &qDMEvent); @@ -371,12 +387,12 @@ extern "C" { - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender { [self addDropData:sender]; - + NSPoint windowPoint = [sender draggingLocation]; NSPoint globalPoint = [[sender draggingDestinationWindow] convertBaseToScreen:windowPoint]; NSPoint localPoint = [self convertPoint:windowPoint fromView:nil]; QPoint posDrop(localPoint.x, localPoint.y); - + NSDragOperation nsActions = [sender draggingSourceOperationMask]; Qt::DropActions qtAllowed = qt_mac_mapNSDragOperations(nsActions); QMimeData *mimeData = dropData; @@ -388,6 +404,8 @@ extern "C" { if (QDragManager::self()->object) QDragManager::self()->dragPrivate()->target = qwidget; QApplication::sendEvent(qwidget, &de); + if (QDragManager::self()->object) + QDragManager::self()->dragPrivate()->executed_action = de.dropAction(); if (!de.isAccepted()) return NO; else @@ -419,10 +437,9 @@ extern "C" { - (void) setFrameSize:(NSSize)newSize { [super setFrameSize:newSize]; - + // A change in size has required the view to be invalidated. - if ([self inLiveResize]) - { + if ([self inLiveResize]) { NSRect rects[4]; NSInteger count; [self getRectsExposedDuringLiveResize:rects count:&count]; @@ -430,9 +447,7 @@ extern "C" { { [self setNeedsDisplayInRect:rects[count]]; } - } - else - { + } else { [self setNeedsDisplay:YES]; } } @@ -567,7 +582,7 @@ extern "C" { if (!qAppInstance()->activeModalWidget() || QApplicationPrivate::tryModalHelper(qwidget, 0)) { QApplication::sendEvent(qwidget, &enterEvent); qt_mouseover = qwidget; - + // Update cursor and dispatch hover events. qt_mac_update_cursor_at_global_pos(flipPoint(globalPoint).toPoint()); if (qwidget->testAttribute(Qt::WA_Hover) && @@ -622,7 +637,7 @@ extern "C" { [viewsToLookAt addObject:qt_mac_nativeview_for(parentWidget)]; parentWidget = parentWidget->parentWidget(); } - + // Now walk through the subviews of each view and determine which subview should // get the event. We look through all the subviews at a given level with // the assumption that the last item to be found the candidate has a higher z-order. @@ -758,7 +773,7 @@ extern "C" { if (currentIManager && [currentIManager wantsToHandleMouseEvents]) { [currentIManager handleMouseEvent:theEvent]; } - + NSPoint windowPoint = [theEvent locationInWindow]; NSPoint globalPoint = [[theEvent window] convertBaseToScreen:windowPoint]; NSPoint localPoint = [self convertPoint:windowPoint fromView:nil]; @@ -767,7 +782,7 @@ extern "C" { Qt::MouseButton buttons = cocoaButton2QtButton([theEvent buttonNumber]); bool wheelOK = false; Qt::KeyboardModifiers keyMods = qt_cocoaModifiers2QtModifiers([theEvent modifierFlags]); - + // Mouse wheel deltas seem to tick in at increments of 0.1. Qt widgets // expect the delta to be a multiple of 120. const int ScrollFactor = 10 * 120; @@ -789,7 +804,7 @@ extern "C" { wheelOK = qwe2.isAccepted(); } } - + if (deltaY) { QWheelEvent qwe(qlocal, qglobal, deltaY, buttons, keyMods, Qt::Vertical); qt_sendSpontaneousEvent(qwidget, &qwe); @@ -802,7 +817,7 @@ extern "C" { wheelOK = qwe2.isAccepted(); } } - + if (deltaZ) { // Qt doesn't explicitly support wheels with a Z component. In a misguided attempt to // try to be ahead of the pack, I'm adding this extra value. @@ -891,6 +906,11 @@ extern "C" { Q_UNUSED(anImage); Q_UNUSED(aPoint); qMacDnDParams()->performedAction = operation; + if (QDragManager::self()->object + && QDragManager::self()->dragPrivate()->executed_action != Qt::ActionMask) { + qMacDnDParams()->performedAction = + qt_mac_mapDropAction(QDragManager::self()->dragPrivate()->executed_action); + } } - (QWidget *)qt_qwidget @@ -1214,13 +1234,13 @@ Qt::DropAction QDragManager::drag(QDrag *o) so we just bail early to prevent it */ if(!(GetCurrentEventButtonState() & kEventMouseButtonPrimary)) return Qt::IgnoreAction; - + if(object) { dragPrivate()->source->removeEventFilter(this); cancel(); beingCancelled = false; } - + object = o; dragPrivate()->target = 0; @@ -1232,7 +1252,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) QMacPasteboard dragBoard((CFStringRef) NSDragPboard, QMacPasteboardMime::MIME_DND); dragPrivate()->data->setData(QLatin1String("application/x-qt-mime-type-name"), QByteArray()); dragBoard.setMimeData(dragPrivate()->data); - + // create the image QPoint hotspot; QPixmap pix = dragPrivate()->pixmap; @@ -1278,6 +1298,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) NSSize mouseOffset = {0.0, 0.0}; NSPasteboard *pboard = [NSPasteboard pasteboardWithName:NSDragPboard]; NSPoint windowPoint = [dndParams->theEvent locationInWindow]; + dragPrivate()->executed_action = Qt::ActionMask; // do the drag [dndParams->view retain]; [dndParams->view dragImage:image @@ -1289,6 +1310,7 @@ Qt::DropAction QDragManager::drag(QDrag *o) slideBack:YES]; [dndParams->view release]; [image release]; + dragPrivate()->executed_action = Qt::IgnoreAction; object = 0; Qt::DropAction performedAction(qt_mac_mapNSDragOperation(dndParams->performedAction)); // do post drag processing, if required. diff --git a/src/gui/kernel/qshortcut.cpp b/src/gui/kernel/qshortcut.cpp index f3c93c6..50b6e59 100644 --- a/src/gui/kernel/qshortcut.cpp +++ b/src/gui/kernel/qshortcut.cpp @@ -385,21 +385,19 @@ bool QShortcut::event(QEvent *e) { Q_D(QShortcut); bool handled = false; - if (e->type() == QEvent::Shortcut) { + if (d->sc_enabled && e->type() == QEvent::Shortcut) { QShortcutEvent *se = static_cast<QShortcutEvent *>(e); if (se->shortcutId() == d->sc_id && se->key() == d->sc_sequence){ - if (d->sc_enabled) { #ifndef QT_NO_WHATSTHIS - if (QWhatsThis::inWhatsThisMode()) { - QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis); - handled = true; - } else + if (QWhatsThis::inWhatsThisMode()) { + QWhatsThis::showText(QCursor::pos(), d->sc_whatsthis); + handled = true; + } else #endif - if (se->isAmbiguous()) - emit activatedAmbiguously(); - else - emit activated(); - } + if (se->isAmbiguous()) + emit activatedAmbiguously(); + else + emit activated(); handled = true; } } diff --git a/src/gui/kernel/qshortcutmap.cpp b/src/gui/kernel/qshortcutmap.cpp index 9766a69..ed9654b 100644 --- a/src/gui/kernel/qshortcutmap.cpp +++ b/src/gui/kernel/qshortcutmap.cpp @@ -370,8 +370,9 @@ bool QShortcutMap::tryShortcutEvent(QObject *o, QKeyEvent *e) default: break; } - - return true; + // If nextState is QKeySequence::ExactMatch && identicals.count == 0 + // we've only found disabled shortcuts + return identicalMatches > 0 || result == QKeySequence::PartialMatch; } /*! \internal @@ -493,7 +494,9 @@ QKeySequence::SequenceMatch QShortcutMap::find(QKeyEvent *e) // We don't need partials, if we have identicals if (d->identicals.size()) break; - partialFound = true; + // We only care about enabled partials, so we don't consume + // key events when all partials are disabled! + partialFound |= (*it).enabled; } } ++it; diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 52e76d8..f000292 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -515,6 +515,18 @@ Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags) return qtMods; } +Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations) +{ + Qt::KeyboardModifiers qtMods =Qt::NoModifier; + if (dragOperations & NSDragOperationLink) + qtMods |= Qt::MetaModifier; + if (dragOperations & NSDragOperationGeneric) + qtMods |= Qt::ControlModifier; + if (dragOperations & NSDragOperationCopy) + qtMods |= Qt::AltModifier; + return qtMods; +} + static inline QEvent::Type cocoaEvent2QtEvent(NSUInteger eventType) { // Handle the trivial cases that can be determined from the type. diff --git a/src/gui/kernel/qt_cocoa_helpers_mac_p.h b/src/gui/kernel/qt_cocoa_helpers_mac_p.h index ef55aa4..63a301c 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac_p.h +++ b/src/gui/kernel/qt_cocoa_helpers_mac_p.h @@ -141,6 +141,7 @@ inline QApplication *qAppInstance() { return static_cast<QApplication *>(QCoreAp struct ::TabletProximityRec; void qt_dispatchTabletProximityEvent(const ::TabletProximityRec &proxRec); Qt::KeyboardModifiers qt_cocoaModifiers2QtModifiers(ulong modifierFlags); +Qt::KeyboardModifiers qt_cocoaDragOperation2QtModifiers(uint dragOperations); inline int flipYCoordinate(int y) { return QApplication::desktop()->screenGeometry(0).height() - y; diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index 9f5f18d..9f0d2a4 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -183,6 +183,7 @@ QWidgetPrivate::QWidgetPrivate(int version) : ,inDirtyList(0) ,isScrolled(0) ,isMoved(0) + ,usesDoubleBufferedGLContext(0) #ifdef Q_WS_WIN ,noPaintOnScreen(0) #endif @@ -2132,6 +2133,10 @@ QWidget *QWidget::find(WId id) If a widget is non-native (alien) and winId() is invoked on it, that widget will be provided a native handle. + On Mac OS X, the type returned depends on which framework Qt was linked + against. If Qt is using Carbon, the {WId} is actually an HIViewRef. If Qt + is using Cocoa, {WId} is a pointer to an NSView. + \note We recommend that you do not store this value as it is likely to change at run-time. @@ -4714,10 +4719,13 @@ void QWidget::render(QPaintDevice *target, const QPoint &targetOffset, if (redirected) { target = redirected; offset -= redirectionOffset; - if (!inRenderWithPainter) { // Clip handled by shared painter (in qpainter.cpp). - const QRegion redirectedSystemClip = redirected->paintEngine()->systemClip(); - if (!redirectedSystemClip.isEmpty()) - paintRegion &= redirectedSystemClip.translated(-offset); + } + + if (!inRenderWithPainter) { // Clip handled by shared painter (in qpainter.cpp). + if (QPaintEngine *targetEngine = target->paintEngine()) { + const QRegion targetSystemClip = targetEngine->systemClip(); + if (!targetSystemClip.isEmpty()) + paintRegion &= targetSystemClip.translated(-offset); } } @@ -9792,27 +9800,6 @@ void QWidget::setAttribute(Qt::WidgetAttribute attribute, bool on) QEvent e(QEvent::MouseTrackingChange); QApplication::sendEvent(this, &e); break; } -#if !defined(QT_NO_DIRECT3D) && defined(Q_WS_WIN) - case Qt::WA_MSWindowsUseDirect3D: - if (!qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)) { - if (on) { - if (!d->extra) - d->createExtra(); - d->extra->had_auto_fill_bg = d->extra->autoFillBackground; - d->extra->had_no_system_bg = testAttribute(Qt::WA_NoSystemBackground); - d->extra->had_paint_on_screen = testAttribute(Qt::WA_PaintOnScreen); - // enforce the opaque widget state D3D needs - d->extra->autoFillBackground = true; - setAttribute(Qt::WA_PaintOnScreen); - setAttribute(Qt::WA_NoSystemBackground); - } else if (d->extra) { - d->extra->autoFillBackground = d->extra->had_auto_fill_bg; - setAttribute(Qt::WA_PaintOnScreen, d->extra->had_paint_on_screen); - setAttribute(Qt::WA_NoSystemBackground, d->extra->had_no_system_bg); - } - } - break; -#endif case Qt::WA_NativeWindow: { QInputContext *ic = 0; if (on && !internalWinId() && testAttribute(Qt::WA_InputMethodEnabled) && hasFocus()) { diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 013fc1e..0f74c32 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -3995,6 +3995,33 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) } } +void QWidgetPrivate::applyMaxAndMinSizeConstraints(int &w, int &h) +{ + if (QWExtra *extra = extraData()) { + w = qMin(w, extra->maxw); + h = qMin(h, extra->maxh); + w = qMax(w, extra->minw); + h = qMax(h, extra->minh); + + // Deal with size increment + if (QTLWExtra *top = topData()) { + if(top->incw) { + w = w/top->incw; + w *= top->incw; + } + if(top->inch) { + h = h/top->inch; + h *= top->inch; + } + } + } + + if (isRealWindow()) { + w = qMax(0, w); + h = qMax(0, h); + } +} + void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) { Q_Q(QWidget); @@ -4005,7 +4032,9 @@ void QWidgetPrivate::setGeometry_sys(int x, int y, int w, int h, bool isMove) QMacCocoaAutoReleasePool pool; bool realWindow = isRealWindow(); + if (realWindow && !(w == 0 && h == 0) && !q->testAttribute(Qt::WA_DontShowOnScreen)) { + applyMaxAndMinSizeConstraints(w, h); topData()->isSetGeometry = 1; topData()->isMove = isMove; #ifndef QT_MAC_USE_COCOA @@ -4031,10 +4060,26 @@ void QWidgetPrivate::setGeometry_sys_helper(int x, int y, int w, int h, bool isM { Q_Q(QWidget); bool realWindow = isRealWindow(); - if(QWExtra *extra = extraData()) { // any size restrictions? - if(realWindow) { + + QPoint oldp = q->pos(); + QSize olds = q->size(); + const bool isResize = (olds != QSize(w, h)); + + if (!realWindow && !isResize && QPoint(x, y) == oldp) + return; + + if (isResize) + data.window_state = data.window_state & ~Qt::WindowMaximized; + + const bool visible = q->isVisible(); + data.crect = QRect(x, y, w, h); + + if (realWindow) { + if (QWExtra *extra = extraData()) { + applyMaxAndMinSizeConstraints(w, h); qt_mac_update_sizer(q); - if(q->windowFlags() & Qt::WindowMaximizeButtonHint) { + + if (q->windowFlags() & Qt::WindowMaximizeButtonHint) { #ifndef QT_MAC_USE_COCOA OSWindowRef window = qt_mac_window_for(q); if(extra->maxw && extra->maxh && extra->maxw == extra->minw @@ -4045,43 +4090,8 @@ void QWidgetPrivate::setGeometry_sys_helper(int x, int y, int w, int h, bool isM } #endif } - } - - w = qMin(w,extra->maxw); - h = qMin(h,extra->maxh); - w = qMax(w,extra->minw); - h = qMax(h,extra->minh); - - // Deal with size increment - if(QTLWExtra *top = topData()) { - if(top->incw) { - w = w/top->incw; - w *= top->incw; - } - if(top->inch) { - h = h/top->inch; - h *= top->inch; - } - } - } - - if (realWindow) { - w = qMax(0, w); - h = qMax(0, h); - } - - QPoint oldp = q->pos(); - QSize olds = q->size(); - const bool isResize = (olds != QSize(w, h)); - if(!realWindow && !isResize && QPoint(x, y) == oldp) - return; - if(isResize && q->isMaximized()) - data.window_state = data.window_state & ~Qt::WindowMaximized; - const bool visible = q->isVisible(); - data.crect = QRect(x, y, w, h); - if(realWindow) { - if(QWExtra *extra = extraData()) { //set constraints + // Update max and min constraints: const float max_f(20000); #ifndef QT_MAC_USE_COCOA #define SF(x) ((x > max_f) ? max_f : x) diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index 9e93f66..8731551 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -177,11 +177,6 @@ struct QWExtra { //bit flags at the end to improve packing #if defined(Q_WS_WIN) uint shown_mode : 8; // widget show mode -#ifndef QT_NO_DIRECT3D - uint had_paint_on_screen : 1; - uint had_no_system_bg : 1; - uint had_auto_fill_bg : 1; -#endif #endif #if defined(Q_WS_X11) uint compress_events : 1; @@ -257,6 +252,7 @@ public: void macUpdateIsOpaque(); void setEnabled_helper_sys(bool enable); bool isRealWindow() const; + void applyMaxAndMinSizeConstraints(int &w, int &h); #endif void raise_sys(); @@ -535,6 +531,7 @@ public: uint inDirtyList : 1; uint isScrolled : 1; uint isMoved : 1; + uint usesDoubleBufferedGLContext : 1; #ifdef Q_WS_WIN uint noPaintOnScreen : 1; // see qwidget_win.cpp ::paintEngine() diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index ffbb341..7374994 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -56,12 +56,6 @@ #include "private/qbackingstore_p.h" #include "private/qwindowsurface_raster_p.h" -#ifndef QT_NO_DIRECT3D -#include "private/qpaintengine_d3d_p.h" -#include "private/qwindowsurface_d3d_p.h" -#endif - - #include <qdebug.h> #include <private/qapplication_p.h> @@ -1716,11 +1710,6 @@ void QWidgetPrivate::createSysExtra() #ifndef QT_NO_DRAGANDDROP extra->dropTarget = 0; #endif -#ifndef QT_NO_DIRECT3D - extra->had_auto_fill_bg = 0; - extra->had_paint_on_screen = 0; - extra->had_no_system_bg = 0; -#endif } void QWidgetPrivate::deleteSysExtra() @@ -1931,22 +1920,6 @@ void QWidgetPrivate::setWindowOpacity_sys(qreal level) // }; // Q_GLOBAL_STATIC(QGlobalRasterPaintEngine, globalRasterPaintEngine) -#ifndef QT_NO_DIRECT3D -static void cleanup_d3d_engine(); -Q_GLOBAL_STATIC_WITH_INITIALIZER(QDirect3DPaintEngine, _qt_d3dEngine, - { - qAddPostRoutine(cleanup_d3d_engine); - }) -static void cleanup_d3d_engine() -{ - _qt_d3dEngine()->cleanup(); -} -QDirect3DPaintEngine* qt_d3dEngine() -{ - return _qt_d3dEngine(); -} -#endif - #ifndef QT_NO_DIRECTDRAW static uchar *qt_primary_surface_bits; @@ -2059,19 +2032,6 @@ void qt_win_initialize_directdraw() { } QPaintEngine *QWidget::paintEngine() const { -#ifndef QT_NO_DIRECT3D - if ((qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault) - || testAttribute(Qt::WA_MSWindowsUseDirect3D)) - && qt_d3dEngine()->hasDirect3DSupport()) - { - QDirect3DPaintEngine *engine = qt_d3dEngine(); - if (qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault)) - engine->setFlushOnEnd(false); - else - engine->setFlushOnEnd(true); - return engine; - } -#endif #ifndef QT_NO_DIRECTDRAW QOnScreenRasterPaintEngine *pe = onScreenPaintEngine(); pe->widget = this; @@ -2100,13 +2060,6 @@ QPaintEngine *QWidget::paintEngine() const QWindowSurface *QWidgetPrivate::createDefaultWindowSurface_sys() { Q_Q(QWidget); -#ifndef QT_NO_DIRECT3D - extern QDirect3DPaintEngine *qt_d3dEngine(); - if (qApp->testAttribute(Qt::AA_MSWindowsUseDirect3DByDefault) && (q->windowOpacity() == 1.0f) - && qt_d3dEngine()->hasDirect3DSupport()) { - return new QD3DWindowSurface(q); - } -#endif return new QRasterWindowSurface(q); } diff --git a/src/gui/mac/images/leopard-unified-toolbar-on.png b/src/gui/mac/images/leopard-unified-toolbar-on.png Binary files differnew file mode 100644 index 0000000..6716597 --- /dev/null +++ b/src/gui/mac/images/leopard-unified-toolbar-on.png diff --git a/src/gui/mac/maccursors.qrc b/src/gui/mac/macresources.qrc index d80a63b..9696002 100644 --- a/src/gui/mac/maccursors.qrc +++ b/src/gui/mac/macresources.qrc @@ -6,4 +6,7 @@ <file>images/waitcursor.png</file> <file>images/pluscursor.png</file> </qresource> +<qresource prefix="/trolltech/mac/style"> +<file>images/leopard-unified-toolbar-on.png</file> +</qresource> </RCC> diff --git a/src/gui/painting/painting.pri b/src/gui/painting/painting.pri index 528559c..34d1779 100644 --- a/src/gui/painting/painting.pri +++ b/src/gui/painting/painting.pri @@ -103,12 +103,6 @@ win32 { painting/qprinterinfo_win.cpp \ painting/qregion_win.cpp !win32-borland:!wince*:LIBS += -lmsimg32 - contains(QT_CONFIG, direct3d) { - HEADERS += painting/qpaintengine_d3d_p.h - SOURCES += painting/qpaintengine_d3d.cpp - RESOURCES += painting/qpaintengine_d3d.qrc - LIBS += -ldxguid - } } embedded { @@ -362,8 +356,4 @@ embedded { SOURCES += painting/qwindowsurface_qws.cpp } -win32:contains(QT_CONFIG, direct3d) { - HEADERS += painting/qwindowsurface_d3d_p.h - SOURCES += painting/qwindowsurface_d3d.cpp -} diff --git a/src/gui/painting/qbackingstore.cpp b/src/gui/painting/qbackingstore.cpp index fbac811a..34df6c9 100644 --- a/src/gui/painting/qbackingstore.cpp +++ b/src/gui/painting/qbackingstore.cpp @@ -1517,13 +1517,20 @@ void QWidgetPrivate::repaint_sys(const QRegion &rgn) extra->staticContentsSize = data.crect.size(); } + QPaintEngine *engine = q->paintEngine(); + // QGLWidget does not support partial updates if: + // 1) The context is double buffered + // 2) The context is single buffered and auto-fill background is enabled. + const bool noPartialUpdateSupport = (engine && engine->type() == QPaintEngine::OpenGL) + && (usesDoubleBufferedGLContext || q->autoFillBackground()); + QRegion toBePainted(noPartialUpdateSupport ? q->rect() : rgn); + #ifdef Q_WS_MAC // No difference between update() and repaint() on the Mac. - update_sys(rgn); + update_sys(toBePainted); return; #endif - QRegion toBePainted(rgn); toBePainted &= clipRect(); clipToEffectiveMask(toBePainted); if (toBePainted.isEmpty()) diff --git a/src/gui/painting/qmemrotate.cpp b/src/gui/painting/qmemrotate.cpp index 7ad0e42..4058143 100644 --- a/src/gui/painting/qmemrotate.cpp +++ b/src/gui/painting/qmemrotate.cpp @@ -537,6 +537,7 @@ QT_IMPL_MEMROTATE(quint32, quint24) QT_IMPL_MEMROTATE(quint32, quint18) QT_IMPL_MEMROTATE(quint32, quint8) QT_IMPL_MEMROTATE(quint16, quint8) +QT_IMPL_MEMROTATE(qrgb444, quint8) QT_IMPL_MEMROTATE(quint8, quint8) #ifdef QT_QWS_DEPTH_GENERIC QT_IMPL_MEMROTATE(quint32, qrgb_generic16) diff --git a/src/gui/painting/qmemrotate_p.h b/src/gui/painting/qmemrotate_p.h index bd6006b..c1eb93e 100644 --- a/src/gui/painting/qmemrotate_p.h +++ b/src/gui/painting/qmemrotate_p.h @@ -90,6 +90,7 @@ QT_DECL_MEMROTATE(quint32, quint24); QT_DECL_MEMROTATE(quint32, quint18); QT_DECL_MEMROTATE(quint32, quint8); QT_DECL_MEMROTATE(quint16, quint8); +QT_DECL_MEMROTATE(qrgb444, quint8); QT_DECL_MEMROTATE(quint8, quint8); #ifdef QT_QWS_DEPTH_GENERIC QT_DECL_MEMROTATE(quint32, qrgb_generic16); diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index ad09060..7de1ec4 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -949,8 +949,8 @@ void QPaintEngine::setSystemClip(const QRegion ®ion) Q_D(QPaintEngine); d->systemClip = region; // Be backward compatible and only call d->systemStateChanged() - // if we currently have a system transform set. - if (d->hasSystemTransform) { + // if we currently have a system transform/viewport set. + if (d->hasSystemTransform || d->hasSystemViewport) { d->transformSystemClip(); d->systemStateChanged(); } diff --git a/src/gui/painting/qpaintengine_d3d.cpp b/src/gui/painting/qpaintengine_d3d.cpp deleted file mode 100644 index 9a7638b..0000000 --- a/src/gui/painting/qpaintengine_d3d.cpp +++ /dev/null @@ -1,4576 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include <qdebug.h> -#include "qpaintengine_d3d_p.h" - -#include "private/qdrawhelper_p.h" -#include "private/qfont_p.h" -#include "private/qfontengine_p.h" -#include "private/qpaintengine_p.h" -#include "private/qtessellator_p.h" -#include <private/qbezier_p.h> -#include <private/qpainter_p.h> -#include <private/qpixmap_raster_p.h> -#include <private/qpolygonclipper_p.h> -#include <qbuffer.h> -#include <qcache.h> -#include <qdir.h> -#include <qfileinfo.h> -#include <qlibrary.h> -#include <qlibraryinfo.h> -#include <qmath.h> -#include <qpaintdevice.h> -#include <qpixmapcache.h> - -#include <qwidget.h> -#include <d3d9.h> -#include <d3dx9.h> - -#include <mmintrin.h> -#include <xmmintrin.h> - -QT_BEGIN_NAMESPACE - -#ifndef M_PI - #define M_PI 3.14159265358979323846 -#endif - -#define QD3D_MASK_MARGIN 1 -#define QD3D_BATCH_SIZE 256 - -// for the ClearType detection stuff.. -#ifndef SPI_GETFONTSMOOTHINGTYPE -#define SPI_GETFONTSMOOTHINGTYPE 0x200A -#endif - -#ifndef FE_FONTSMOOTHINGCLEARTYPE -#define FE_FONTSMOOTHINGCLEARTYPE 0x0002 -#endif - -//#include <performance.h> -#define PM_INIT -#define PM_MEASURE(A) -#define PM_DISPLAY - -//debugging -//#define QT_DEBUG_VERTEXBUFFER_ACCESS -//#define QT_DEBUG_D3D -//#define QT_DEBUG_D3D_CALLS - -#define QD3D_SET_MARK(output) \ - D3DPERF_SetMarker(0, QString(output).utf16()); - -#define QT_VERTEX_RESET_LIMIT 24576 -#define QT_VERTEX_BUF_SIZE 32768 -#define QD3DFVF_CSVERTEX (D3DFVF_XYZ | D3DFVF_DIFFUSE | D3DFVF_TEX2 | D3DFVF_TEXCOORDSIZE4(0) | D3DFVF_TEXCOORDSIZE4(1)) - -// this is a different usage of the effect framework than intended, -// but it's convenient for us to use (See effect file) -#define PASS_STENCIL_ODDEVEN 0 -#define PASS_STENCIL_WINDING 1 -#define PASS_STENCIL_DRAW 2 -#define PASS_STENCIL_DRAW_DIRECT 3 -#define PASS_STENCIL_CLIP 4 -#define PASS_STENCIL_NOSTENCILCHECK 5 -#define PASS_STENCIL_NOSTENCILCHECK_DIRECT 6 -#define PASS_TEXT 7 -#define PASS_CLEARTYPE_TEXT 8 -#define PASS_ALIASED_LINES 9 -#define PASS_ALIASED_LINES_DIRECT 10 - -#define PASS_AA_CREATEMASK 0 -#define PASS_AA_DRAW 1 -#define PASS_AA_DRAW_DIRECT 2 - -#define D3D_STAGE_COUNT 2 -#define D3D_RENDER_STATES 210 -#define D3D_TEXTURE_STATES 33 -#define D3D_SAMPLE_STATES 14 - - -typedef HRESULT (APIENTRY *PFND3DXCREATEBUFFER)(DWORD, LPD3DXBUFFER *); -typedef HRESULT (APIENTRY *PFND3DXCREATEEFFECT)(LPDIRECT3DDEVICE9, LPCVOID, UINT, CONST D3DXMACRO *, - LPD3DXINCLUDE, DWORD, LPD3DXEFFECTPOOL, - LPD3DXEFFECT *, LPD3DXBUFFER *); -typedef D3DXMATRIX *(APIENTRY *PFND3DXMATRIXORTHOOFFCENTERLH)(D3DMATRIX *, FLOAT, FLOAT, - FLOAT, FLOAT, FLOAT, FLOAT); -typedef IDirect3D9 *(APIENTRY *PFNDIRECT3DCREATE9)(uint); - -static PFNDIRECT3DCREATE9 pDirect3DCreate9 = 0; -static PFND3DXCREATEBUFFER pD3DXCreateBuffer = 0; -static PFND3DXCREATEEFFECT pD3DXCreateEffect = 0; -static PFND3DXMATRIXORTHOOFFCENTERLH pD3DXMatrixOrthoOffCenterLH = 0; - - -class QD3DSurfaceManager : public QObject { - Q_OBJECT - -public: - enum QD3DSurfaceManagerStatus { - NoStatus = 0, - NeedsResetting = 0x01, - MaxSizeChanged = 0x02 - }; - - QD3DSurfaceManager(); - ~QD3DSurfaceManager(); - - void init(LPDIRECT3D9 object); - - void setPaintDevice(QPaintDevice *pd); - - int status() const; - void reset(); - - LPDIRECT3DSURFACE9 renderTarget(); - - LPDIRECT3DSURFACE9 surface(QPaintDevice *pd); - LPDIRECT3DSWAPCHAIN9 swapChain(QPaintDevice *pd); - void releasePaintDevice(QPaintDevice *pd); - - LPDIRECT3DDEVICE9 device(); - void cleanup(); - - QSize maxSize() const; - -private: - struct D3DSwapChain { - QSize size; - LPDIRECT3DSWAPCHAIN9 swapchain; - LPDIRECT3DSURFACE9 surface; - }; - - void updateMaxSize(); - void initPresentParameters(D3DPRESENT_PARAMETERS *params); - D3DSwapChain *createSwapChain(QWidget *w); - - QSize m_max_size; - int m_status; - QMap<QPaintDevice *, D3DSwapChain *> m_swapchains; - - LPDIRECT3DDEVICE9 m_device; - QPaintDevice *m_pd; - HWND m_dummy; - D3DSwapChain *m_current; - -private Q_SLOTS: - void cleanupPaintDevice(QObject *); -}; - -struct vertex { - D3DVECTOR pos; - DWORD color; - FLOAT s0, t0, r0, q0; - FLOAT s1, t1, r1, q1; -}; - -struct QD3DMaskPosition { - int x, y, channel; -}; - - -struct QD3DBatchItem { - enum QD3DBatchInfo { - BI_WINDING = 0x0001, - BI_AA = 0x0002, - BI_BRECT = 0x0004, - BI_MASKFULL = 0x0008, - BI_TEXT = 0x0010, - BI_MASK = 0x0020, - BI_CLIP = 0x0040, - BI_SCISSOR = 0x0080, - - BI_PIXMAP = 0x0100, - BI_IMAGE = 0x0200, - BI_COMPLEXBRUSH = 0x0400, - - BI_CLEARCLIP = 0x0800, // clip nothing (filling the clip mask with 0) - BI_TRANSFORM = 0x1000, - BI_MASKSCISSOR = 0x2000, - BI_FASTLINE = 0x4000, - BI_COSMETICPEN = 0x8000 - }; - - int m_info; - - int m_count; - int m_offset; - - QD3DMaskPosition m_maskpos; - qreal m_xoffset; - qreal m_yoffset; - qreal m_opacity; - - QPixmap m_pixmap; - QRectF m_brect; - QBrush m_brush; - - IDirect3DTexture9 *m_texture; - - qreal m_width; - qreal m_distance; - - QTransform m_matrix; - QPainter::CompositionMode m_cmode; - - QVector<int> m_pointstops; -}; - -struct QD3DBatch { - int m_item_index; - QD3DBatchItem items[QD3D_BATCH_SIZE]; -}; - -class QD3DStateManager; -class QD3DFontCache; -class QD3DDrawHelper; -class QD3DGradientCache; - -class QDirect3DPaintEnginePrivate : public QPaintEnginePrivate -{ - Q_DECLARE_PUBLIC(QDirect3DPaintEngine) - -public: - enum RenderTechnique { - RT_NoTechnique, - RT_Antialiased, - RT_Aliased, - }; - - QDirect3DPaintEnginePrivate() - : m_d3d_object(0) - , m_d3d_device(0) - , m_txop(QTransform::TxNone) - , m_effect(0) - , m_flush_on_end(0) - { init(); } - - ~QDirect3DPaintEnginePrivate(); - - bool init(); - void initDevice(); - - inline QD3DBatchItem *nextBatchItem(); - - QPolygonF brushCoordinates(const QRectF &r, bool stroke, qreal *fp) const; - void fillAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform); - void fillAntialiasedPath(const QPainterPath &path, const QRectF &brect, - const QTransform &txform, bool stroke); - void fillPath(const QPainterPath &path, QRectF brect); - - void strokePath(const QPainterPath &path, QRectF brect, bool simple = false); - QPainterPath strokePathFastPen(const QPainterPath &path); - void strokeAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform); - - void flushBatch(); - int flushAntialiased(int offset); - void flushAliased(QD3DBatchItem *item, int offset); - void flushText(QD3DBatchItem *item, int offset); - void flushLines(QD3DBatchItem *item, int offset); - - void updateTransform(const QTransform &matrix); - void updatePen(const QPen &pen); - void updateBrush(const QBrush &pen); - void updateClipRegion(const QRegion &clipregion, Qt::ClipOperation op = Qt::ReplaceClip); - void updateClipPath(const QPainterPath &clipregion, Qt::ClipOperation op = Qt::ReplaceClip); - void updateFont(const QFont &font); - - void setRenderTechnique(RenderTechnique technique); - - QPointF transformPoint(const QPointF &p, qreal *w) const; - - bool prepareBatch(QD3DBatchItem *item, int offset); - void prepareItem(QD3DBatchItem *item); - void cleanupItem(QD3DBatchItem *item); - void setCompositionMode(QPainter::CompositionMode mode); - - void verifyTexture(const QPixmap &pixmap); - - bool isFastRect(const QRectF &rect); - - void releaseDC(); - - void cleanup(); - bool testCaps(); - - QPixmap getPattern(Qt::BrushStyle style) const; - - // clipping - QPainterPath m_sysclip_path; - QPainterPath m_clip_path; - QRegion m_sysclip_region; - QRegion m_clip_region; - - qreal m_opacity; - D3DCOLOR m_opacity_color; - - int m_current_state; - - ID3DXEffect* m_effect; - - RenderTechnique m_current_technique; - - QTransform m_matrix; - qreal m_inv_scale; - - QPen m_pen; - Qt::BrushStyle m_pen_brush_style; - QTransform m_inv_pen_matrix; - D3DCOLOR m_pen_color; - qreal m_pen_width; - - QBrush m_brush; - Qt::BrushStyle m_brush_style; - QTransform m_inv_brush_matrix; - D3DCOLOR m_brush_color; - QTransform m_brush_origin; - - uint m_clipping_enabled : 1; - uint m_has_complex_clipping : 1; - uint m_cleartype_text: 1; - uint m_has_pen : 1; - uint m_has_cosmetic_pen : 1; - uint m_has_brush : 1; - uint m_has_fast_pen : 1; - uint m_has_aa_fast_pen : 1; - uint m_flush_on_end : 1; - uint m_supports_d3d : 1; - - QTransform::TransformationType m_txop; - - QPainter::CompositionMode m_cmode; - - QD3DSurfaceManager m_surface_manager; - QSize m_surface_size; - - LPDIRECT3D9 m_d3d_object; - LPDIRECT3DDEVICE9 m_d3d_device; - IDirect3DSurface9 *m_current_surface; - bool m_in_scene; - - QD3DGradientCache *m_gradient_cache; - QD3DDrawHelper *m_draw_helper; - QD3DBatch m_batch; - QD3DStateManager *m_statemanager; - - HDC m_dc; - IDirect3DSurface9 *m_dcsurface; - - QMap<Qt::BrushStyle, QPixmap> m_patterns; -}; - - -class QD3DStateManager : public ID3DXEffectStateManager { -public: - QD3DStateManager(LPDIRECT3DDEVICE9 pDevice, ID3DXEffect *effect); - void reset(); - - inline void startStateBlock(); - inline void endStateBlock(); - - inline void setCosmeticPen(bool enabled); - inline void setBrushMode(int mode); - inline void setTexture(LPDIRECT3DBASETEXTURE9 pTexture); - inline void setTexture(LPDIRECT3DBASETEXTURE9 pTexture, QGradient::Spread spread); - inline void setTransformation(const QTransform *matrix = 0); - inline void setProjection(const D3DXMATRIX *pMatrix); - inline void setMaskChannel(int channel); - inline void setMaskOffset(qreal x, qreal y); - inline void setFocalDistance(const qreal &fd); - - inline void beginPass(int pass); - inline void endPass(); - - STDMETHOD(QueryInterface)(REFIID iid, LPVOID *ppv); - STDMETHOD_(ULONG, AddRef)(); - STDMETHOD_(ULONG, Release)(); - - STDMETHOD(SetTransform)(D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix); - STDMETHOD(SetMaterial)(CONST D3DMATERIAL9 *pMaterial); - STDMETHOD(SetLight)(DWORD Index, CONST D3DLIGHT9 *pLight); - STDMETHOD(LightEnable)(DWORD Index, BOOL Enable); - STDMETHOD(SetRenderState)(D3DRENDERSTATETYPE State, DWORD Value); - STDMETHOD(SetTexture)(DWORD Stage, LPDIRECT3DBASETEXTURE9 pTexture); - STDMETHOD(SetTextureStageState)(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value); - STDMETHOD(SetSamplerState)(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value); - STDMETHOD(SetNPatchMode)(FLOAT NumSegments); - STDMETHOD(SetFVF)(DWORD FVF); - STDMETHOD(SetVertexShader)(LPDIRECT3DVERTEXSHADER9 pShader); - STDMETHOD(SetVertexShaderConstantF)(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount); - STDMETHOD(SetVertexShaderConstantI)(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount); - STDMETHOD(SetVertexShaderConstantB)(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount); - STDMETHOD(SetPixelShader)(LPDIRECT3DPIXELSHADER9 pShader); - STDMETHOD(SetPixelShaderConstantF)(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount); - STDMETHOD(SetPixelShaderConstantI)(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount); - STDMETHOD(SetPixelShaderConstantB)(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount); -private: - LPDIRECT3DVERTEXSHADER9 m_vertexshader; - LPDIRECT3DPIXELSHADER9 m_pixelshader; - - LPDIRECT3DBASETEXTURE9 m_textures[D3D_STAGE_COUNT]; - DWORD m_texturestates[D3D_STAGE_COUNT][D3D_TEXTURE_STATES]; - DWORD m_samplerstates[D3D_STAGE_COUNT][D3D_SAMPLE_STATES]; - DWORD m_renderstate[D3D_RENDER_STATES]; - - qreal m_radgradfd; - - bool m_cosmetic_pen; - int m_pass; - int m_maskchannel; - int m_brushmode; - LPDIRECT3DBASETEXTURE9 m_texture; - D3DXMATRIX m_projection; - - D3DXMATRIX m_d3dIdentityMatrix; - bool m_isIdentity; - QTransform m_transformation; - - LPDIRECT3DDEVICE9 m_pDevice; - ID3DXEffect *m_effect; - - LONG m_refs; - bool m_changed; - qreal m_xoffset, m_yoffset; - static int m_mask_channels[4][4]; -}; - -// -// font cache stuff -// - -struct QD3DGlyphCoord { - // stores the offset and size of a glyph texture - qreal x; - qreal y; - qreal width; - qreal height; - qreal log_width; - qreal log_height; - QFixed x_offset; - QFixed y_offset; -}; - -struct QD3DFontTexture { - int x_offset; // current glyph offset within the texture - int y_offset; - int width; - int height; - IDirect3DTexture9 *texture; -}; - -typedef QHash<glyph_t, QD3DGlyphCoord*> QD3DGlyphHash; -typedef QHash<QFontEngine*, QD3DGlyphHash*> QD3DFontGlyphHash; -typedef QHash<quint64, QD3DFontTexture*> QD3DFontTexHash; - -class QD3DGlyphCache : public QObject -{ - Q_OBJECT -public: - QD3DGlyphCache() - : QObject(0) - , current_cache(0) {} - ~QD3DGlyphCache(); - QD3DGlyphCoord *lookup(QFontEngine *, glyph_t); - void cacheGlyphs(QDirect3DPaintEngine *, const QTextItemInt &, const QVarLengthArray<glyph_t> &, - bool); - void cleanCache(); - inline QD3DFontTexture *fontTexture(QFontEngine *engine) { - return font_textures.constFind(reinterpret_cast<quint64>(engine)).value(); - } - -public slots: - void fontEngineDestroyed(QObject *); - -private: - QImage clearTypeGlyph(QFontEngine *, glyph_t glyph); - QD3DGlyphHash *current_cache; - QD3DFontTexHash font_textures; - QD3DFontGlyphHash font_cache; -}; - -QD3DGlyphCache::~QD3DGlyphCache() -{ -} - -QD3DGlyphCoord *QD3DGlyphCache::lookup(QFontEngine *, glyph_t g) -{ - Q_ASSERT(current_cache != 0); - QD3DGlyphHash::const_iterator it = current_cache->constFind(g); - if (it == current_cache->constEnd()) - return 0; - return it.value(); -} - -void QD3DGlyphCache::cleanCache() -{ - QList<quint64> keys = font_textures.keys(); - for (int i=0; i<keys.size(); ++i) - font_textures.value(keys.at(i))->texture->Release(); - - qDeleteAll(font_textures); - qDeleteAll(font_cache); - font_textures.clear(); - font_cache.clear(); - current_cache = 0; -} - -void QD3DGlyphCache::fontEngineDestroyed(QObject *object) -{ -// qDebug() << "=> font engine destroyed: " << object; - QFontEngine *engine = static_cast<QFontEngine *>(object); - - QD3DFontGlyphHash::iterator cache_it = font_cache.find(engine); - if (cache_it != font_cache.end()) { - QD3DGlyphHash *cache = font_cache.take(engine); - delete cache; - } - - quint64 font_key = reinterpret_cast<quint64>(engine); - QD3DFontTexture *tex = font_textures.take(font_key); - if (tex) { - tex->texture->Release(); - delete tex; - } -} - -QImage QD3DGlyphCache::clearTypeGlyph(QFontEngine *engine, glyph_t glyph) -{ - glyph_metrics_t gm = engine->boundingBox(glyph); - int glyph_x = qFloor(gm.x.toReal()); - int glyph_y = qFloor(gm.y.toReal()); - int glyph_width = qCeil((gm.x + gm.width).toReal()) - glyph_x + 2; - int glyph_height = qCeil((gm.y + gm.height).toReal()) - glyph_y + 2; - - if (glyph_width + glyph_x <= 0 || glyph_height <= 0) - return QImage(); - QImage im(glyph_width + glyph_x, glyph_height, QImage::Format_ARGB32_Premultiplied); - im.fill(0xff000000); // solid black - QPainter p(&im); - - p.setPen(Qt::white); - p.setBrush(Qt::NoBrush); - - QTextItemInt ti; - ti.ascent = engine->ascent(); - ti.descent = engine->descent(); - ti.width = glyph_width; - ti.fontEngine = engine; - - QGlyphLayoutArray<1> glyphLayout; - ti.glyphs = glyphLayout; - ti.glyphs.glyphs[0] = glyph; - ti.glyphs.advances_x[0] = glyph_width; - p.drawTextItem(QPointF(-glyph_x, -glyph_y), ti); - p.end(); - return im; -} - -#if 0 -static void dump_font_texture(QD3DFontTexture *tex) -{ - QColor color(Qt::red); - D3DLOCKED_RECT rect; - if (FAILED(tex->texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "debug: unable to lock texture rect."; - return; - } - -// cleartype version -// uint *tex_data = (uint *) rect.pBits; -// QImage im(tex->width, tex->height, QImage::Format_ARGB32); -// for (int y=0; y<tex->height; ++y) { -// for (int x=0; x<tex->width; ++x) { -// im.setPixel(x, y, ((*(tex_data+x+y*tex->width)))); -// } -// } - uchar *tex_data = (uchar *) rect.pBits; - QImage im(rect.Pitch, tex->height, QImage::Format_ARGB32); - for (int y=0; y<tex->height; ++y) { - for (int x=0; x<rect.Pitch; ++x) { - uchar val = ((*(tex_data+x+y*rect.Pitch))); - im.setPixel(x, y, 0xff000000 | (val << 16) | (val << 8) | val); - } - } - tex->texture->UnlockRect(0); - static int i= 0; - im.save(QString("tx%1.png").arg(i++)); -} -#endif - -void QD3DGlyphCache::cacheGlyphs(QDirect3DPaintEngine *engine, const QTextItemInt &ti, - const QVarLengthArray<glyph_t> &glyphs, bool clearType) -{ - IDirect3DDevice9 *device = engine->d_func()->m_d3d_device; - QD3DFontGlyphHash::const_iterator cache_it = font_cache.constFind(ti.fontEngine); - QD3DGlyphHash *cache = 0; - if (cache_it == font_cache.constEnd()) { - cache = new QD3DGlyphHash; - font_cache.insert(ti.fontEngine, cache); - connect(ti.fontEngine, SIGNAL(destroyed(QObject *)), SLOT(fontEngineDestroyed(QObject *))); - } else { - cache = cache_it.value(); - } - - current_cache = cache; - - D3DFORMAT tex_format = clearType ? D3DFMT_A8R8G8B8 : D3DFMT_A8; - quint64 font_key = reinterpret_cast<quint64>(ti.fontEngine); - QD3DFontTexHash::const_iterator it = font_textures.constFind(font_key); - QD3DFontTexture *font_tex = 0; - if (it == font_textures.constEnd()) { - // alloc a new texture, put it into the cache - int tex_height = qCeil(ti.ascent.toReal() + ti.descent.toReal()) + 5; - int tex_width = tex_height * 30; // ### - IDirect3DTexture9 *tex; - if (FAILED(device->CreateTexture(tex_width, tex_height, 1, 0, - tex_format, D3DPOOL_MANAGED, &tex, NULL))) - { - qWarning("QD3DGlyphCache::cacheGlyphs(): can't allocate font texture (%dx%d).", - tex_width, tex_height); - return; - } else { -// qDebug() << "=> new font texture: " << QSize(tex_width,tex_height); - font_tex = new QD3DFontTexture; - font_tex->texture = tex; - font_tex->x_offset = 0; - font_tex->y_offset = 0; - font_tex->width = tex_width; - font_tex->height = tex_height; - font_textures.insert(font_key, font_tex); - } - } else { - font_tex = it.value(); - // make it current render target.. - } - - // cache each glyph - for (int i=0; i<glyphs.size(); ++i) { - QD3DGlyphHash::const_iterator it = cache->constFind(glyphs[i]); - if (it == cache->constEnd()) { - glyph_metrics_t metrics = ti.fontEngine->boundingBox(glyphs[i]); - int glyph_width = qCeil(metrics.width.toReal()) + 5; - int glyph_height = qCeil(ti.ascent.toReal() + ti.descent.toReal()) + 5; - if (font_tex->x_offset + glyph_width > font_tex->width) { - // no room on the current line, start new glyph strip - int strip_height = glyph_height; - font_tex->x_offset = 0; - font_tex->y_offset += strip_height; - if (font_tex->y_offset >= font_tex->height) { - // if no room in the current texture - realloc a larger texture - int old_tex_height = font_tex->height; - font_tex->height += strip_height; - - IDirect3DTexture9 *new_tex; - if (FAILED(device->CreateTexture(font_tex->width, font_tex->height, 1, 0, - tex_format, D3DPOOL_MANAGED, &new_tex, NULL))) - { - qWarning("QD3DGlyphCache(): can't re-allocate font texture."); - return; - } else { -// qDebug() << " -> new glyph strip added:" << QSize(font_tex->width,font_tex->height); - - D3DLOCKED_RECT new_rect, old_rect; - if (FAILED(font_tex->texture->LockRect(0, &old_rect, 0, D3DLOCK_READONLY))) { - qDebug() << "QD3DGlyphCache: unable to lock texture rect."; - return; - } - if (FAILED(new_tex->LockRect(0, &new_rect, 0, 0))) { - qDebug() << "QD3DGlyphCache: unable to lock texture rect."; - return; - } - memcpy(new_rect.pBits, old_rect.pBits, new_rect.Pitch * old_tex_height); - font_tex->texture->UnlockRect(0); - new_tex->UnlockRect(0); - engine->d_func()->flushBatch(); - font_tex->texture->Release(); - font_tex->texture = new_tex; - } - - // update the texture coords and the y offset for the existing glyphs in - // the cache, because of the texture size change - QD3DGlyphHash::iterator it = cache->begin(); - while (it != cache->end()) { - it.value()->height = (it.value()->height * old_tex_height) / font_tex->height; - it.value()->y = (it.value()->y * old_tex_height) / font_tex->height; - ++it; - } - } - } - QD3DGlyphCoord *d3d_glyph = new QD3DGlyphCoord; - d3d_glyph->x = qreal(font_tex->x_offset) / font_tex->width; - d3d_glyph->y = qreal(font_tex->y_offset) / font_tex->height; - d3d_glyph->width = qreal(glyph_width) / font_tex->width; - d3d_glyph->height = qreal(glyph_height) / font_tex->height; - d3d_glyph->log_width = d3d_glyph->width * font_tex->width; - d3d_glyph->log_height = d3d_glyph->height * font_tex->height; - d3d_glyph->x_offset = -metrics.x; - d3d_glyph->y_offset = metrics.y; - - QImage glyph_im; - if (clearType) - glyph_im = clearTypeGlyph(ti.fontEngine, glyphs[i]); - else - glyph_im = ti.fontEngine->alphaMapForGlyph(glyphs[i]).convertToFormat(QImage::Format_Indexed8); - - // write glyph to texture - D3DLOCKED_RECT rect; - RECT glyph_rect = { font_tex->x_offset, font_tex->y_offset, - font_tex->x_offset + glyph_im.width(), - font_tex->y_offset + glyph_im.height() }; - -// qDebug() << " > new glyph char added:" << QSize(glyph_im.width(), glyph_im.height()); - if (FAILED(font_tex->texture->LockRect(0, &rect, &glyph_rect, 0))) { - qDebug() << "QD3DGlyphCache: unable to lock texture rect."; - return; - } - - // ### unify these loops - if (clearType) { - int ppl = rect.Pitch / 4; - uint *tex_data = (uint *) rect.pBits; - for (int y=0; y<glyph_im.height(); ++y) { - uint *s = (uint *) glyph_im.scanLine(y); - for (int x=0; x<glyph_im.width(); ++x) { - tex_data[ppl*y + x] = *s; - ++s; - } - } - } else { - int ppl = rect.Pitch; - uchar *tex_data = (uchar *) rect.pBits; - for (int y=0; y<glyph_im.height(); ++y) { - uchar *s = (uchar *) glyph_im.scanLine(y); - for (int x=0; x<glyph_im.width(); ++x) { - tex_data[ppl*y + x] = *s; - ++s; - } - } - } - font_tex->texture->UnlockRect(0); - - // debug -// dump_font_texture(font_tex); - - if (font_tex->x_offset + glyph_width > font_tex->width) { - font_tex->x_offset = 0; - font_tex->y_offset += glyph_height; - } else { - font_tex->x_offset += glyph_width; - } - - cache->insert(glyphs[i], d3d_glyph); - } - } -} - -Q_GLOBAL_STATIC(QD3DGlyphCache, qd3d_glyph_cache) - -// -// end font caching stuff -// - - -// -// D3D image cache stuff -// - -// ### keep the GL stuff in mind.. -typedef void (*_qt_image_cleanup_hook_64)(qint64); -extern Q_GUI_EXPORT _qt_image_cleanup_hook_64 qt_image_cleanup_hook_64; - -static void qd3d_image_cleanup(qint64 key); - -class QD3DImage -{ -public: - QD3DImage(IDirect3DDevice9 *device, const QImage &image); - ~QD3DImage(); - - IDirect3DTexture9 *texture; -}; - -static QList<IDirect3DTexture9 *> qd3d_release_list; - -QD3DImage::QD3DImage(IDirect3DDevice9 *device, const QImage &image) -{ - texture = 0; - Q_ASSERT(device); - QImage im = image.convertToFormat(QImage::Format_ARGB32); - if (FAILED(device->CreateTexture(im.width(), im.height(), 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &texture, 0))) { - qWarning("QD3DImage(): unable to create Direct3D texture."); - return; - } -// qDebug(" -> created image texture: %p - 0x%08x%08x",texture,uint (image.cacheKey() >> 32),uint (image.cacheKey() & 0xffffffff)); - D3DLOCKED_RECT rect; - if (FAILED(texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "QD3DImage: unable to lock texture rect."; - return; - } - DWORD *dst = (DWORD *) rect.pBits; - DWORD *src = (DWORD *) im.scanLine(0); - - Q_ASSERT((rect.Pitch/4) == (im.bytesPerLine()/4)); - memcpy(dst, src, rect.Pitch*im.height()); - texture->UnlockRect(0); -} - -QD3DImage::~QD3DImage() -{ - if (texture) - qd3d_release_list.append(texture); -} - -static int qd3d_cache_limit = 64*1024; // cache ~64 MB worth of textures -typedef QCache<quint64, QD3DImage> QD3DImageCache; - -class QD3DImageManager -{ -public: - QD3DImageManager() { - // ### GL does the same! - qt_image_cleanup_hook_64 = qd3d_image_cleanup; - cache.setMaxCost(qd3d_cache_limit); - } - ~QD3DImageManager() { -// qDebug() << "unhooking d3d image cache"; - qt_image_cleanup_hook_64 = 0; - cache.clear(); - } - - IDirect3DTexture9 *lookup(IDirect3DDevice9 *device, const QImage &image); - void remove(quint64 key); - -private: - QD3DImageCache cache; -}; - -IDirect3DTexture9 *QD3DImageManager::lookup(IDirect3DDevice9 *device, const QImage &image) -{ - QD3DImage *tex_image = 0; - - tex_image = cache.object(image.cacheKey()); - if (!tex_image) { - // to avoid cache thrashing we remove images from the cache - // that have the same serial no as the cached image, since - // that image is most likely destoyed already, and we got a - // stale cache entry - uint serial = (uint) (image.cacheKey() >> 32); - QList<quint64> keys = cache.keys(); - for (int i=0; i<keys.size(); ++i) { - if ((uint)(keys.at(i) >> 32) == serial) { - cache.remove(keys.at(i)); - break; - } - } -// qDebug(" => cached: %d, adding cache image: 0x%08x%08x",cache.size(), uint (image.cacheKey() >> 32),uint (image.cacheKey() & 0xffffffff)); - // add cache entry - int cost = image.width()*image.height()*4/1024; - if (cache.totalCost() + cost > cache.maxCost()) { - // no room for new entries? kick out half the cached images - int old_max_cost = cache.maxCost(); - cache.setMaxCost(old_max_cost/2); - cache.setMaxCost(old_max_cost); - } - tex_image = new QD3DImage(device, image); - cache.insert(image.cacheKey(), tex_image, cost); -// qDebug() << "==> total cache cost: " << cache.totalCost() << cost; - } - - return tex_image->texture; -} - -void QD3DImageManager::remove(quint64 key) -{ -// QList<quint64> keys = cache.keys(); -// if (keys.contains(key)) -// qDebug() << "entery removed from cache"; - cache.remove(key); -} - -Q_GLOBAL_STATIC(QD3DImageManager, qd3d_image_cache) - -static void qd3d_image_cleanup(qint64 key) -{ -// qDebug() << "qd3d_image_cleanup:"; -// qDebug(" => key: 0x%08x%08x", (uint) (key >> 32), (uint)(key & 0xffffffff)); - qd3d_image_cache()->remove(key); -} - -// -// end D3D image cache stuff -// - -class QD3DDrawHelper : public QTessellator -{ -public: - QD3DDrawHelper(QDirect3DPaintEnginePrivate *pe); - ~QD3DDrawHelper(); - - bool needsFlushing() const; - QD3DMaskPosition allocateMaskPosition(const QRectF &brect, bool *breakbatch); - - void setClipPath(const QPainterPath &path, QD3DBatchItem **item); - - void queueAntialiasedMask(const QPolygonF &poly, QD3DBatchItem **item, const QRectF &brect); - QRectF queueAliasedMask(const QPainterPath &path, QD3DBatchItem **item, D3DCOLOR color); - - void queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color, const QPolygonF &trect); - void queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color); - - void queueTextGlyph(const QRectF &rect, const qreal *tex_coords, QD3DBatchItem *item, - D3DCOLOR color); - - void queueAntialiasedLines(const QPainterPath &path, QD3DBatchItem **item, const QRectF &brect); - void queueAliasedLines(const QLineF *lines, int lineCount, QD3DBatchItem **item); - - int drawAntialiasedMask(int offset, int maxoffset); - void drawAliasedMask(int offset); - void drawAntialiasedBoundingRect(QD3DBatchItem *item); - void drawAliasedBoundingRect(QD3DBatchItem *item); - void drawTextItem(QD3DBatchItem *item); - void drawAliasedLines(QD3DBatchItem *item); - - void setMaskSize(QSize size); - - void beforeReset(); - void afterReset(); - - IDirect3DSurface9 *freeMaskSurface(); - - inline void lockVertexBuffer(); - inline void unlockVertexBuffer(); - - inline int index() { return m_index; } - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - enum VertexBufferAccess { - CLEAR = 0x00, - READ = 0x01, - WRITE = 0x02 - }; - int accesscontrol[QT_VERTEX_BUF_SIZE]; -#endif - -private: - void addTrap(const Trapezoid &trap); - void tessellate(const QPolygonF &poly); - inline void lineToStencil(qreal x, qreal y); - inline void curveToStencil(const QPointF &cp1, const QPointF &cp2, const QPointF &ep); - QRectF pathToVertexArrays(const QPainterPath &path); - void resetMask(); - - QDirect3DPaintEnginePrivate *m_pe; - - qreal m_xoffset, m_yoffset; - int m_startindex; - int m_index; - int m_height, m_width; - LPDIRECT3DVERTEXBUFFER9 m_d3dvbuff; - vertex *m_vbuff; - QD3DBatchItem *m_item; - QRectF m_boundingRect; - - qreal max_x; - qreal max_y; - qreal min_x; - qreal min_y; - qreal firstx; - qreal firsty; - - QPointF tess_lastpoint; - int tess_index; - - bool m_locked; - IDirect3DTexture9 *m_mask; - IDirect3DSurface9 *m_maskSurface; - IDirect3DSurface9 *m_depthStencilSurface; - - D3DCOLOR m_color; - bool m_clearmask; - bool m_isLine; - bool m_firstPoint; - - QD3DMaskPosition m_mask_position; - int m_mask_offsetX2; - int m_mask_offsetY2; -}; - -QD3DStateManager::QD3DStateManager(LPDIRECT3DDEVICE9 pDevice, ID3DXEffect *effect) - : m_pDevice(pDevice), m_effect(effect), m_refs(0) -{ - if (FAILED(D3DXMatrixIdentity(&m_d3dIdentityMatrix))) { - qWarning("QDirect3DPaintEngine: D3DXMatrixIdentity failed"); - } - reset(); -} - -void QD3DStateManager::reset() -{ - m_radgradfd = -1; - - m_cosmetic_pen = false; - m_pass = -1; - m_maskchannel = -1; - m_brushmode = -1; - m_texture = 0; - m_xoffset = INT_MAX; - m_yoffset = INT_MAX; - - m_vertexshader = 0; - m_pixelshader = 0; - - m_isIdentity = true; - m_transformation = QTransform(); - m_effect->SetMatrix("g_mTransformation", &m_d3dIdentityMatrix); - - ZeroMemory(&m_projection, sizeof(D3DMATRIX)); - ZeroMemory(m_textures, sizeof(LPDIRECT3DBASETEXTURE9) * D3D_STAGE_COUNT); - FillMemory(m_samplerstates, sizeof(DWORD) * D3D_SAMPLE_STATES * D3D_STAGE_COUNT, 0xFFFFFFFE); - FillMemory(m_texturestates, sizeof(DWORD) * D3D_TEXTURE_STATES * D3D_STAGE_COUNT, 0xFFFFFFFE); - FillMemory(m_renderstate, sizeof(DWORD) * D3D_RENDER_STATES, 0xFFFFFFFE); -} - -inline void QD3DStateManager::beginPass(int pass) -{ - if (pass != m_pass) { - if (m_pass != -1) - m_effect->EndPass(); - m_effect->BeginPass(pass); - m_pass = pass; - } -} - -inline void QD3DStateManager::endPass() -{ - if (m_pass != -1) { - m_pass = -1; - m_effect->EndPass(); - } -} - -inline void QD3DStateManager::startStateBlock() { - m_changed = false; -} - -inline void QD3DStateManager::setCosmeticPen(bool enabled) -{ - if (enabled != m_cosmetic_pen) { - m_effect->SetBool("g_mCosmeticPen", enabled); - m_cosmetic_pen = enabled; - m_changed = true; - } -} - -inline void QD3DStateManager::setBrushMode(int mode) -{ - if (mode != m_brushmode) { - m_effect->SetInt("g_mBrushMode", mode); - m_brushmode = mode; - m_changed = true; - } -} - -inline void QD3DStateManager::setTexture(LPDIRECT3DBASETEXTURE9 pTexture) -{ - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_BORDER); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_BORDER); - - if (pTexture != m_texture) { - m_texture = pTexture; - m_effect->SetTexture("g_mTexture", pTexture); - m_changed = true; - } -} - -inline void QD3DStateManager::setTexture(LPDIRECT3DBASETEXTURE9 pTexture, QGradient::Spread spread) -{ - switch(spread) { - case QGradient::RepeatSpread: - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_WRAP); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_WRAP); - break; - case QGradient::ReflectSpread: - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_MIRROR); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_MIRROR); - break; - default: - SetSamplerState(0, D3DSAMP_ADDRESSU, D3DTADDRESS_CLAMP); - SetSamplerState(0, D3DSAMP_ADDRESSV, D3DTADDRESS_CLAMP); - break; - }; - - if (pTexture != m_texture) { - m_texture = pTexture; - m_effect->SetTexture("g_mTexture", pTexture); - m_changed = true; - } -} - -inline void QD3DStateManager::setTransformation(const QTransform *matrix) -{ - if (matrix) { - if (*matrix != m_transformation) { - D3DXMATRIX dxmatrix(matrix->m11(), matrix->m12(), 0, matrix->m13(), - matrix->m21(), matrix->m22(), 0, matrix->m23(), - 0, 0, 1, 0, - matrix->dx(), matrix->dy(), 0, 1); - m_effect->SetMatrix("g_mTransformation", &dxmatrix); - m_transformation = *matrix; - m_changed = true; - m_isIdentity = false; - } - } else if (!m_isIdentity) { - m_effect->SetMatrix("g_mTransformation", &m_d3dIdentityMatrix); - m_transformation = QTransform(); - m_changed = true; - m_isIdentity = true; - } -} - -inline void QD3DStateManager::setProjection(const D3DXMATRIX *pMatrix) -{ - if (*pMatrix != m_projection) { - m_effect->SetMatrix("g_mViewProjection", pMatrix); - m_projection = *pMatrix; - m_changed = true; - } -} - -inline void QD3DStateManager::setFocalDistance(const qreal &fd) -{ - if (fd != m_radgradfd) { - m_effect->SetFloat("g_mFocalDist", fd); - m_changed = true; - m_radgradfd = fd; - } -} - -inline void QD3DStateManager::setMaskOffset(qreal x, qreal y) -{ - if (x != m_xoffset || y != m_yoffset) { - float offset[2] = {x, y}; - m_effect->SetFloatArray("g_mMaskOffset", offset, 2); - m_xoffset = x; - m_yoffset = y; - m_changed = true; - } -} - -inline void QD3DStateManager::setMaskChannel(int channel) -{ - if (m_maskchannel != channel) { - m_effect->SetIntArray("g_mChannel", m_mask_channels[channel], 4); - m_maskchannel = channel; - m_changed = true; - } -} - -inline void QD3DStateManager::endStateBlock() -{ - if (m_changed) { - m_effect->CommitChanges(); - m_changed = false; - } -} - -STDMETHODIMP QD3DStateManager::QueryInterface(REFIID iid, LPVOID *ppv) -{ - if(iid == IID_IUnknown || iid == IID_ID3DXEffectStateManager) - { - *ppv = this; - ++m_refs; - return NOERROR; - } - *ppv = NULL; - return ResultFromScode(E_NOINTERFACE); -} - -STDMETHODIMP_(ULONG) QD3DStateManager::AddRef(void) -{ - return (ULONG)InterlockedIncrement( &m_refs ); -} - - -STDMETHODIMP_(ULONG) QD3DStateManager::Release(void) -{ - if( 0L == InterlockedDecrement( &m_refs ) ) { - delete this; - return 0L; - } - - return m_refs; -} -STDMETHODIMP QD3DStateManager::SetTransform(D3DTRANSFORMSTATETYPE State, CONST D3DMATRIX *pMatrix) -{ - return m_pDevice->SetTransform(State, pMatrix); -} - -STDMETHODIMP QD3DStateManager::SetMaterial(CONST D3DMATERIAL9 *pMaterial) -{ - return m_pDevice->SetMaterial(pMaterial); -} - -STDMETHODIMP QD3DStateManager::SetLight(DWORD Index, CONST D3DLIGHT9 *pLight) -{ - return m_pDevice->SetLight(Index, pLight); -} - -STDMETHODIMP QD3DStateManager::LightEnable(DWORD Index, BOOL Enable) -{ - return m_pDevice->LightEnable(Index, Enable); -} - -STDMETHODIMP QD3DStateManager::SetRenderState(D3DRENDERSTATETYPE State, DWORD Value) -{ - if (State < D3D_RENDER_STATES) { - if (m_renderstate[State] == Value) - return S_OK; - m_renderstate[State] = Value; - } - return m_pDevice->SetRenderState(State, Value); -} - -STDMETHODIMP QD3DStateManager::SetTexture(DWORD Stage, LPDIRECT3DBASETEXTURE9 pTexture) -{ - if (Stage < D3D_STAGE_COUNT) { - if (m_textures[Stage] == pTexture) - return S_OK; - m_textures[Stage] = pTexture; - } - return m_pDevice->SetTexture(Stage, pTexture); -} - -STDMETHODIMP QD3DStateManager::SetTextureStageState(DWORD Stage, D3DTEXTURESTAGESTATETYPE Type, DWORD Value) -{ - if (Stage < D3D_STAGE_COUNT && Type < D3D_TEXTURE_STATES) { - if (m_texturestates[Stage][Type] == Value) - return S_OK; - m_texturestates[Stage][Type] = Value; - } - return m_pDevice->SetTextureStageState(Stage, Type, Value); -} - -STDMETHODIMP QD3DStateManager::SetSamplerState(DWORD Sampler, D3DSAMPLERSTATETYPE Type, DWORD Value) -{ - if (Sampler < D3D_STAGE_COUNT && Type < D3D_SAMPLE_STATES) { - if (m_samplerstates[Sampler][Type] == Value) - return S_OK; - m_samplerstates[Sampler][Type] = Value; - } - return m_pDevice->SetSamplerState(Sampler, Type, Value); -} - -STDMETHODIMP QD3DStateManager::SetNPatchMode(FLOAT NumSegments) -{ - return m_pDevice->SetNPatchMode(NumSegments); -} - -STDMETHODIMP QD3DStateManager::SetFVF(DWORD FVF) -{ - return m_pDevice->SetFVF(FVF); -} - -STDMETHODIMP QD3DStateManager::SetVertexShader(LPDIRECT3DVERTEXSHADER9 pShader) -{ - if (m_vertexshader == pShader) - return S_OK; - m_vertexshader = pShader; - return m_pDevice->SetVertexShader(pShader); -} - -STDMETHODIMP QD3DStateManager::SetVertexShaderConstantF(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetVertexShaderConstantF(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetVertexShaderConstantI(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetVertexShaderConstantI(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetVertexShaderConstantB(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetVertexShaderConstantB(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetPixelShader(LPDIRECT3DPIXELSHADER9 pShader) -{ - if (m_pixelshader == pShader) - return S_OK; - m_pixelshader = pShader; - return m_pDevice->SetPixelShader(pShader); -} - -STDMETHODIMP QD3DStateManager::SetPixelShaderConstantF(UINT RegisterIndex, CONST FLOAT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetPixelShaderConstantF(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetPixelShaderConstantI(UINT RegisterIndex, CONST INT *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetPixelShaderConstantI(RegisterIndex, pConstantData, RegisterCount); -} - -STDMETHODIMP QD3DStateManager::SetPixelShaderConstantB(UINT RegisterIndex, CONST BOOL *pConstantData, UINT RegisterCount) -{ - return m_pDevice->SetPixelShaderConstantB(RegisterIndex, pConstantData, RegisterCount); -} - -#define QD3D_GRADIENT_CACHE_SIZE 60 -#define QD3D_GRADIENT_PALETTE_SIZE 1024 - -class QD3DGradientCache -{ - struct CacheInfo - { - inline CacheInfo(QGradientStops s, qreal op) : - stops(s), opacity(op) {} - - IDirect3DTexture9 *texture; - QGradientStops stops; - qreal opacity; - }; - - typedef QMultiHash<quint64, CacheInfo> QD3DGradientColorTableHash; - -public: - QD3DGradientCache(LPDIRECT3DDEVICE9 device); - ~QD3DGradientCache(); - - inline IDirect3DTexture9 *getBuffer(const QGradientStops &stops, qreal opacity); - -protected: - inline void generateGradientColorTable(const QGradientStops& s, - uint *colorTable, - int size, qreal opacity) const; - IDirect3DTexture9 *addCacheElement(quint64 hash_val, const QGradientStops &stops, qreal opacity); - void cleanCache(); - - QD3DGradientColorTableHash cache; - LPDIRECT3DDEVICE9 m_device; -}; - -QD3DGradientCache::QD3DGradientCache(LPDIRECT3DDEVICE9 device) - : m_device(device) -{ - -} - -QD3DGradientCache::~QD3DGradientCache() -{ - cleanCache(); -} - -inline IDirect3DTexture9 *QD3DGradientCache::getBuffer(const QGradientStops &stops, qreal opacity) -{ - quint64 hash_val = 0; - - for (int i = 0; i < stops.size() && i <= 2; i++) - hash_val += stops[i].second.rgba(); - - QD3DGradientColorTableHash::const_iterator it = cache.constFind(hash_val); - - if (it == cache.constEnd()) - return addCacheElement(hash_val, stops, opacity); - else { - do { - const CacheInfo &cache_info = it.value(); - if (cache_info.stops == stops && cache_info.opacity == opacity) { - return cache_info.texture; - } - ++it; - } while (it != cache.constEnd() && it.key() == hash_val); - // an exact match for these stops and opacity was not found, create new cache - return addCacheElement(hash_val, stops, opacity); - } -} - -void QD3DGradientCache::generateGradientColorTable(const QGradientStops& s, uint *colorTable, int size, qreal opacity) const -{ - int pos = 0; - qreal fpos = 0.0; - qreal incr = 1.0 / qreal(size); - QVector<uint> colors(s.size()); - - for (int i = 0; i < s.size(); ++i) - colors[i] = s[i].second.rgba(); - - uint alpha = qRound(opacity * 255); - while (fpos < s.first().first) { - colorTable[pos] = ARGB_COMBINE_ALPHA(colors[0], alpha); - pos++; - fpos += incr; - } - - for (int i = 0; i < s.size() - 1; ++i) { - qreal delta = 1/(s[i+1].first - s[i].first); - while (fpos < s[i+1].first && pos < size) { - int dist = int(256 * ((fpos - s[i].first) * delta)); - int idist = 256 - dist; - uint current_color = ARGB_COMBINE_ALPHA(colors[i], alpha); - uint next_color = ARGB_COMBINE_ALPHA(colors[i+1], alpha); -#if Q_BYTE_ORDER == Q_LITTLE_ENDIAN - colorTable[pos] = INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist); -#else - uint c = INTERPOLATE_PIXEL_256(current_color, idist, next_color, dist); - colorTable[pos] = ( (c << 24) & 0xff000000) - | ((c >> 24) & 0x000000ff) - | ((c << 8) & 0x00ff0000) - | ((c >> 8) & 0x0000ff00); -#endif // Q_BYTE_ORDER - ++pos; - fpos += incr; - } - } - for (;pos < size; ++pos) - colorTable[pos] = colors[s.size() - 1]; -} - -IDirect3DTexture9 *QD3DGradientCache::addCacheElement(quint64 hash_val, const QGradientStops &stops, qreal opacity) -{ - if (cache.size() == QD3D_GRADIENT_CACHE_SIZE) { - int elem_to_remove = qrand() % QD3D_GRADIENT_CACHE_SIZE; - uint key = cache.keys()[elem_to_remove]; - - // need to call release on each removed cache entry: - QD3DGradientColorTableHash::const_iterator it = cache.constFind(key); - do { - it.value().texture->Release(); - } while (++it != cache.constEnd() && it.key() == key); - - cache.remove(key); // may remove more than 1, but OK - } - - CacheInfo cache_entry(stops, opacity); - uint buffer[QD3D_GRADIENT_PALETTE_SIZE]; - generateGradientColorTable(stops, buffer, QD3D_GRADIENT_PALETTE_SIZE, opacity); - - if (FAILED(m_device->CreateTexture(QD3D_GRADIENT_PALETTE_SIZE, 1, 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &cache_entry.texture, 0))) { - qWarning("QD3DGradientCache::addCacheElement(): unable to create Direct3D texture."); - return 0; - } - - D3DLOCKED_RECT rect; - if (FAILED(cache_entry.texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "QD3DGradientCache::addCacheElement(): unable to lock texture rect."; - return 0; - } - memcpy(rect.pBits, buffer, rect.Pitch); - cache_entry.texture->UnlockRect(0); - - return cache.insert(hash_val, cache_entry).value().texture; -} - -void QD3DGradientCache::cleanCache() -{ - QD3DGradientColorTableHash::const_iterator it = cache.constBegin(); - for (; it != cache.constEnd(); ++it) { - const CacheInfo &cache_info = it.value(); - cache_info.texture->Release(); - } - cache.clear(); -} - -QD3DSurfaceManager::QD3DSurfaceManager() : - m_status(NoStatus), m_dummy(0), m_device(0), m_pd(0), m_current(0) -{ - -} - -QD3DSurfaceManager::~QD3DSurfaceManager() -{ -} - -void QD3DSurfaceManager::setPaintDevice(QPaintDevice *pd) -{ - m_status = NoStatus; - m_pd = pd; - m_current = 0; - - if (m_device->TestCooperativeLevel() != D3D_OK) { - m_status = NeedsResetting; - return; - } - - m_current = m_swapchains.value(pd, 0); - QWidget *w = static_cast<QWidget*>(pd); - - if (m_current) { - if (m_current->size != w->size()) { - m_swapchains.remove(pd); - m_current->surface->Release(); - m_current->swapchain->Release(); - delete m_current; - m_current = 0; - } - } - - if (!m_current) { - m_current = createSwapChain(w); - updateMaxSize(); - } -} - -int QD3DSurfaceManager::status() const -{ - return m_status; -} - -void QD3DSurfaceManager::reset() -{ - QList<QPaintDevice *> pds = m_swapchains.keys(); - - QMap<QPaintDevice *, D3DSwapChain *>::const_iterator i = m_swapchains.constBegin(); - while (i != m_swapchains.constEnd()) { - i.value()->surface->Release(); - i.value()->swapchain->Release(); - ++i; - } - qDeleteAll(m_swapchains.values()); - m_swapchains.clear(); - - D3DPRESENT_PARAMETERS params; - initPresentParameters(¶ms); - params.hDeviceWindow = m_dummy; - - HRESULT res = m_device->Reset(¶ms); - if (FAILED(res)) { - switch (res) { - case D3DERR_DEVICELOST: - qWarning("QDirect3DPaintEngine: Reset failed (D3DERR_DEVICELOST)"); - break; - case D3DERR_DRIVERINTERNALERROR: - qWarning("QDirect3DPaintEngine: Reset failed (D3DERR_DRIVERINTERNALERROR)"); - break; - case D3DERR_OUTOFVIDEOMEMORY: - qWarning("QDirect3DPaintEngine: Reset failed (D3DERR_OUTOFVIDEOMEMORY)"); - break; - default: - qWarning("QDirect3DPaintEngine: Reset failed"); - }; - } - - for (int i=0; i<pds.count(); ++i) { - QWidget *w = static_cast<QWidget*>(pds.at(i)); - createSwapChain(w); - } - - // reset the mask as well - m_status = MaxSizeChanged; - - setPaintDevice(m_pd); - updateMaxSize(); -} - -LPDIRECT3DSURFACE9 QD3DSurfaceManager::renderTarget() -{ - return m_current ? m_current->surface : 0; -} - -LPDIRECT3DSURFACE9 QD3DSurfaceManager::surface(QPaintDevice *pd) -{ - D3DSwapChain *swapchain = m_swapchains.value(pd, 0); - return swapchain ? swapchain->surface : 0; -} - -LPDIRECT3DSWAPCHAIN9 QD3DSurfaceManager::swapChain(QPaintDevice *pd) -{ - D3DSwapChain *swapchain = m_swapchains.value(pd, 0); - return swapchain ? swapchain->swapchain : 0; -} - -void QD3DSurfaceManager::releasePaintDevice(QPaintDevice *pd) -{ - D3DSwapChain *swapchain = m_swapchains.take(pd); - - if (swapchain) { - swapchain->surface->Release(); - swapchain->swapchain->Release(); - delete swapchain; - if (swapchain == m_current) - m_current = 0; - } -} - -LPDIRECT3DDEVICE9 QD3DSurfaceManager::device() -{ - return m_device; -} - -void QD3DSurfaceManager::cleanup() -{ - QPixmapCache::clear(); - qd3d_glyph_cache()->cleanCache(); - - // release doomed textures - for (int k=0; k<qd3d_release_list.size(); ++k) - qd3d_release_list.at(k)->Release(); - qd3d_release_list.clear(); - - QMap<QPaintDevice *, D3DSwapChain *>::const_iterator i = m_swapchains.constBegin(); - while (i != m_swapchains.constEnd()) { - i.value()->surface->Release(); - i.value()->swapchain->Release(); - ++i; - } - qDeleteAll(m_swapchains.values()); - - if (m_device) - m_device->Release(); - - DestroyWindow(m_dummy); - QString cname(QLatin1String("qt_d3d_dummy")); - QT_WA({ - UnregisterClass((TCHAR*)cname.utf16(), (HINSTANCE)qWinAppInst()); - } , { - UnregisterClassA(cname.toLatin1(), (HINSTANCE)qWinAppInst()); - }); -} - -QSize QD3DSurfaceManager::maxSize() const -{ - return m_max_size; -} - -extern "C" { - LRESULT CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam); -}; - -void QD3DSurfaceManager::init(LPDIRECT3D9 object) -{ - QString cname(QLatin1String("qt_d3d_dummy")); - uint style = CS_DBLCLKS | CS_SAVEBITS; - ATOM atom; - QT_WA({ - WNDCLASS wc; - wc.style = style; - wc.lpfnWndProc = (WNDPROC)QtWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = (HINSTANCE)qWinAppInst(); - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = 0; - wc.lpszClassName = (TCHAR*)cname.utf16(); - atom = RegisterClass(&wc); - } , { - WNDCLASSA wc; - wc.style = style; - wc.lpfnWndProc = (WNDPROC)QtWndProc; - wc.cbClsExtra = 0; - wc.cbWndExtra = 0; - wc.hInstance = (HINSTANCE)qWinAppInst(); - wc.hIcon = 0; - wc.hCursor = 0; - wc.hbrBackground = 0; - wc.lpszMenuName = 0; - QByteArray tempArray = cname.toLatin1(); - wc.lpszClassName = tempArray; - atom = RegisterClassA(&wc); - }); - - QT_WA({ - const TCHAR *className = (TCHAR*)cname.utf16(); - m_dummy = CreateWindow(className, className, 0, - 0, 0, 1, 1, - 0, 0, qWinAppInst(), 0); - } , { - m_dummy = CreateWindowA(cname.toLatin1(), cname.toLatin1(), 0, - 0, 0, 1, 1, - 0, 0, qWinAppInst(), 0); - }); - - D3DPRESENT_PARAMETERS params; - initPresentParameters(¶ms); - params.hDeviceWindow = m_dummy; - - HRESULT res = object->CreateDevice(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, 0, - D3DCREATE_PUREDEVICE|D3DCREATE_HARDWARE_VERTEXPROCESSING|D3DCREATE_NOWINDOWCHANGES|D3DCREATE_FPU_PRESERVE, - ¶ms, &m_device); - - if (FAILED(res) || m_device == 0) - qWarning("QDirect3DPaintEngine: failed to create Direct3D device (error=0x%x).", res); -} - -void QD3DSurfaceManager::updateMaxSize() -{ - int w = 0, h = 0; - QMap<QPaintDevice *, D3DSwapChain *>::const_iterator i = m_swapchains.constBegin(); - while (i != m_swapchains.constEnd()) { - - int nw = i.key()->width(); - if (nw > w) - w = nw; - - int nh = i.key()->height(); - if (nh > h) - h = nh; - - ++i; - } - - QSize newsize = QSize(w, h); - if (newsize != m_max_size) { - m_status |= MaxSizeChanged; - m_max_size = newsize; - } -} - -void QD3DSurfaceManager::initPresentParameters(D3DPRESENT_PARAMETERS *params) -{ - ZeroMemory(params, sizeof(D3DPRESENT_PARAMETERS)); - params->Windowed = true; - params->SwapEffect = D3DSWAPEFFECT_COPY; - params->BackBufferFormat = D3DFMT_UNKNOWN; - params->PresentationInterval = D3DPRESENT_INTERVAL_IMMEDIATE; - params->Flags = D3DPRESENTFLAG_LOCKABLE_BACKBUFFER; -} - -QD3DSurfaceManager::D3DSwapChain *QD3DSurfaceManager::createSwapChain(QWidget *w) -{ - D3DPRESENT_PARAMETERS params; - initPresentParameters(¶ms); - params.hDeviceWindow = w->winId(); - D3DSwapChain *swapchain = new D3DSwapChain(); - swapchain->size = w->size(); - if (FAILED(m_device->CreateAdditionalSwapChain(¶ms, &swapchain->swapchain))) - qWarning("QDirect3DPaintEngine: CreateAdditionalSwapChain failed"); - if (FAILED(swapchain->swapchain->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &swapchain->surface))) - qWarning("QDirect3DPaintEngine: GetBackBuffer failed"); - m_swapchains.insert(w, swapchain); - connect(w, SIGNAL(destroyed(QObject *)), SLOT(cleanupPaintDevice(QObject *))); - - // init with background color - QColor bg = w->palette().color(QPalette::Background); - m_device->ColorFill(swapchain->surface, 0, D3DCOLOR_ARGB(bg.alpha(), bg.red(),bg.green(),bg.blue())); - - return swapchain; -} - -void QD3DSurfaceManager::cleanupPaintDevice(QObject *object) -{ - QWidget *w = static_cast<QWidget *>(object); - releasePaintDevice(w); -} - -int QD3DStateManager::m_mask_channels[4][4] = - {{1,0,0,0},{0,1,0,0},{0,0,1,0},{0,0,0,1}}; - -QD3DDrawHelper::QD3DDrawHelper(QDirect3DPaintEnginePrivate *pe) - : m_pe(pe), m_d3dvbuff(0), m_maskSurface(0), m_depthStencilSurface(0), - m_locked(false), m_mask(0), m_startindex(0), m_index(0), m_vbuff(0), m_clearmask(true), - m_isLine(false), m_firstPoint(true) -{ - resetMask(); -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - memset(accesscontrol, 0, QT_VERTEX_BUF_SIZE * sizeof(VertexBufferAccess)); -#endif - - // create vertex buffer - afterReset(); -} - -QD3DDrawHelper::~QD3DDrawHelper() -{ - if (m_maskSurface) - m_maskSurface->Release(); - - if (m_mask) - m_mask->Release(); - - if (m_depthStencilSurface) - m_depthStencilSurface->Release(); - - if (m_d3dvbuff) - m_d3dvbuff->Release(); -} - -inline void QD3DDrawHelper::lockVertexBuffer() -{ - if (!m_locked) { - DWORD lockflags = D3DLOCK_NOOVERWRITE; - if (m_startindex >= QT_VERTEX_RESET_LIMIT) { - m_startindex = 0; - m_index = 0; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=0; i<QT_VERTEX_BUF_SIZE; ++i) { - if (accesscontrol[i] != (WRITE|READ) && accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - } - memset(accesscontrol, 0, QT_VERTEX_BUF_SIZE * sizeof(VertexBufferAccess)); -#endif - - lockflags = D3DLOCK_DISCARD; - } - - if (FAILED(m_d3dvbuff->Lock(0, 0, (void**)&m_vbuff, lockflags))) { - qWarning() << "QDirect3DPaintEngine: unable to lock vertex buffer."; - } - m_locked = true; - } -} - -inline void QD3DDrawHelper::unlockVertexBuffer() -{ - if (m_locked) { - if (FAILED(m_d3dvbuff->Unlock())) { - qWarning() << "QDirect3DPaintEngine: unable to unlock vertex buffer."; - } - m_locked = false; - } -} - -void QD3DDrawHelper::setClipPath(const QPainterPath &path, QD3DBatchItem **item) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_maskpos.x = m_item->m_maskpos.y = 0; - m_item->m_maskpos.channel = 3; - m_item->m_info |= QD3DBatchItem::BI_CLIP; - - bool winding = (path.fillRule() == Qt::WindingFill); - if (winding) - m_item->m_info |= QD3DBatchItem::BI_WINDING; - - if (!path.isEmpty()) { - m_item->m_info |= QD3DBatchItem::BI_MASK; - m_item->m_info &= ~QD3DBatchItem::BI_AA; - m_color = 0; - QRectF brect = pathToVertexArrays(path); - queueRect(brect, m_item, 0); - } - - *item = m_item; -} - - - -void QD3DDrawHelper::queueAntialiasedMask(const QPolygonF &poly, QD3DBatchItem **item, const QRectF &brect) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_MASK; - setWinding(m_item->m_info & QD3DBatchItem::BI_WINDING); - - int xoffset = m_item->m_maskpos.x; - int yoffset = m_item->m_maskpos.y; - - int x = brect.left(); - int y = brect.top(); - - m_item->m_xoffset = (xoffset - x) + 1; - m_item->m_yoffset = (yoffset - y) + 1; - - m_boundingRect = brect; - tessellate(poly); - - *item = m_item; -} - -QRectF QD3DDrawHelper::queueAliasedMask(const QPainterPath &path, QD3DBatchItem **item, D3DCOLOR color) -{ - lockVertexBuffer(); - - m_color = color; - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_MASK; - - bool winding = (path.fillRule() == Qt::WindingFill); - if (winding) - m_item->m_info |= QD3DBatchItem::BI_WINDING; - - QRectF result = pathToVertexArrays(path); - *item = m_item; - return result; -} - -// used for drawing aliased transformed rects directly -// don't use for antialiased or masked drawing -void QD3DDrawHelper::queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color, const QPolygonF &trect) -{ - lockVertexBuffer(); - - qreal zval = (item->m_info & QD3DBatchItem::BI_CLIP) ? 0.0f : 0.5f; - item->m_info |= QD3DBatchItem::BI_BRECT; - - // if the item does not have a mask, the offset is different - if (!(item->m_info & QD3DBatchItem::BI_MASK)) { - item->m_offset = m_index; - item->m_count = (item->m_info & QD3DBatchItem::BI_AA) ? 0 : -2; - } - - qreal x1 = rect.left(); - qreal y1 = rect.top(); - qreal x2 = rect.right(); - qreal y2 = rect.bottom(); - - QPointF tc = trect.at(0); - vertex v1 = { {x1, y1, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f }; - - tc = trect.at(1); - vertex v2 = { {x2, y1, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - - tc = trect.at(2); - vertex v3 = { {x2, y2, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f};; - - tc = trect.at(3); - vertex v4 = { {x1, y2, zval} , color, - tc.x(), tc.y(), 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 4); ++i) { - if ((m_index + 4) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - - m_startindex = m_index; -} - - -QD3DMaskPosition QD3DDrawHelper::allocateMaskPosition(const QRectF &brect, bool *breakbatch) -{ - int w = brect.width(); - int h = brect.height(); - - w += 3; - h += 3; - - if (w > m_width) - w = m_width; - if (h > m_height) - h = m_height; - - *breakbatch = false; - - if ((m_height - m_mask_offsetY2) >= h && (m_width - m_mask_position.x) >= w) { - m_mask_position.y = m_mask_offsetY2; - } else if ((m_width - m_mask_offsetX2) >= w) { - m_mask_position.y = QD3D_MASK_MARGIN; - m_mask_position.x = m_mask_offsetX2; - } else if (m_mask_position.channel < 3) { - ++m_mask_position.channel; - m_mask_position.x = m_mask_position.y = QD3D_MASK_MARGIN; - m_mask_offsetX2 = m_mask_offsetY2 = QD3D_MASK_MARGIN; - } else { - resetMask(); - *breakbatch = true; - } - - int newoffset = m_mask_position.x + w; - if (m_mask_offsetX2 < newoffset) - m_mask_offsetX2 = newoffset; - m_mask_offsetY2 = (m_mask_position.y + h); - - return m_mask_position; - -} - -void QD3DDrawHelper::queueRect(const QRectF &rect, QD3DBatchItem *item, D3DCOLOR color) -{ - lockVertexBuffer(); - - QRectF brect; - item->m_info |= QD3DBatchItem::BI_BRECT; - qreal zval = (item->m_info & QD3DBatchItem::BI_CLIP) ? 0.0f : 0.5f; - - if (item->m_info & QD3DBatchItem::BI_AA) { - int xoffset = item->m_maskpos.x; - int yoffset = item->m_maskpos.y; - - int x = rect.left(); - int y = rect.top(); - - brect = QRectF(x, y, rect.width() + 1, rect.height() + 1); - - item->m_xoffset = (xoffset - x) + 1; - item->m_yoffset = (yoffset - y) + 1; - - // if the item does not have a mask, the offset is different - if (!(item->m_info & QD3DBatchItem::BI_MASK)) { - item->m_offset = m_index; - item->m_count = 0; - } - } else { - brect = rect; - - if (!(item->m_info & QD3DBatchItem::BI_MASK)) { - item->m_offset = m_index; - item->m_count = -2; - } - } - - qreal left = brect.left(); - qreal right = brect.right(); - qreal top = brect.top(); - qreal bottom = brect.bottom(); - - vertex v1 = { {left, bottom, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - vertex v2 = { {left, top, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - vertex v3 = { {right, top, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - vertex v4 = { {right, bottom, zval}, color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 4); ++i) { - if ((m_index + 4) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - - m_startindex = m_index; -} - -void QD3DDrawHelper::queueAntialiasedLines(const QPainterPath &path, QD3DBatchItem **item, const QRectF &brect) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_MASK; - setWinding(m_item->m_info & QD3DBatchItem::BI_WINDING); - - int xoffset = m_item->m_maskpos.x; - int yoffset = m_item->m_maskpos.y; - int x = brect.left(); - int y = brect.top(); - - m_item->m_xoffset = (xoffset - x) + 1; - m_item->m_yoffset = (yoffset - y) + 1; - - m_boundingRect = brect; - - m_xoffset = (x - xoffset) + 0.5f; - m_yoffset = (y - yoffset) + 0.5f; - - QPointF last; - for (int i = 0; i < path.elementCount(); ++i) { - QPainterPath::Element element = path.elementAt(i); - - //Q_ASSERT(!element.isCurveTo()); - - if (element.isLineTo()) - QTessellator::tessellateRect(last, element, m_item->m_width); - - last = element; - } - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 3; - m_startindex = m_index; - - *item = m_item; -} - -void QD3DDrawHelper::queueAliasedLines(const QLineF *lines, int lineCount, QD3DBatchItem **item) -{ - lockVertexBuffer(); - - m_item = *item; - m_item->m_info |= QD3DBatchItem::BI_FASTLINE; - - for (int i=0; i<lineCount; ++i) { - const QLineF line = lines[i]; - qreal p1x = line.p1().x(); - qreal p1y = line.p1().y(); - qreal p2x = line.p2().x(); - qreal p2y = line.p2().y(); - - vertex v1 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - -1.f, -1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - vertex v2 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - 1.f, -1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - vertex v3 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - 1.f, 1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - vertex v4 = { {p1x, p1y, m_pe->m_pen_width} , m_pe->m_pen_color, - -1.f, 1.f, p2x, p2y, - 0.f, 0.f, 0.f, 0.f }; - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - - if (m_index >= (QT_VERTEX_BUF_SIZE - 16)) { - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 2; - m_startindex = m_index; - - QD3DBatchItem itemcopy = *m_item; - m_item = m_pe->nextBatchItem(); - *m_item = itemcopy; - - lockVertexBuffer(); - } - } - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) - 2; - m_startindex = m_index; - - *item = m_item; -} - -void QD3DDrawHelper::queueTextGlyph(const QRectF &rect, const qreal *tex_coords, - QD3DBatchItem *item, D3DCOLOR color) -{ - lockVertexBuffer(); - - qreal x1 = rect.left(); - qreal y1 = rect.top(); - qreal x2 = rect.right(); - qreal y2 = rect.bottom(); - - vertex v1 = { {x1, y1, 0.5f}, color, - tex_coords[0], tex_coords[1], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v2 = { {x2, y1, 0.5f}, color, - tex_coords[2], tex_coords[1], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v3 = { {x2, y2, 0.5f}, color, - tex_coords[2], tex_coords[3], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v4 = { {x1, y1, 0.5f}, color, - tex_coords[0], tex_coords[1], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v5 = { {x2, y2, 0.5f}, color, - tex_coords[2], tex_coords[3], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - vertex v6 = { {x1, y2, 0.5f}, color, - tex_coords[0], tex_coords[3], 0.f, 0.f, - 0.f , 0.f , 0.f, 0.f}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 6); ++i) { - if ((m_index + 6) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v5; - m_vbuff[m_index++] = v6; - - m_startindex = m_index; - ++item->m_count; -} - -bool QD3DDrawHelper::needsFlushing() const -{ - return (m_pe->m_batch.m_item_index >= QD3D_BATCH_SIZE || m_startindex >= QT_VERTEX_RESET_LIMIT); -} - -void QD3DDrawHelper::setMaskSize(QSize size) -{ - m_width = size.width(); - m_height = size.height(); - - if (m_maskSurface) - m_maskSurface->Release(); - - if (m_mask) - m_mask->Release(); - - if (FAILED(m_pe->m_d3d_device->CreateTexture(m_width, m_height, 1, D3DUSAGE_RENDERTARGET, - D3DFMT_A8R8G8B8, D3DPOOL_DEFAULT, &m_mask, NULL))) { - qWarning() << "QDirect3DPaintEngine: CreateTexture() failed."; - } - - if (m_depthStencilSurface) - m_depthStencilSurface->Release(); - - if (FAILED(m_pe->m_d3d_device->CreateDepthStencilSurface(m_width, m_height, D3DFMT_D24S8, D3DMULTISAMPLE_NONE, 0, - TRUE, &m_depthStencilSurface, NULL))) { - qWarning() << "QDirect3DPaintEngine: CreateDepthStencilSurface() failed."; - } - - m_pe->m_d3d_device->SetDepthStencilSurface(m_depthStencilSurface); - m_pe->m_d3d_device->Clear(0, 0, D3DCLEAR_ZBUFFER|D3DCLEAR_STENCIL, 0, 0.0f, 0); - - if (FAILED(m_mask->GetSurfaceLevel(0, &m_maskSurface))) { - qWarning() << "QDirect3DPaintEngine: GetSurfaceLevel() failed."; - } - - m_pe->m_d3d_device->ColorFill(m_maskSurface, 0, D3DCOLOR_ARGB(0,0,0,0)); - D3DXMATRIX projMatrix; - pD3DXMatrixOrthoOffCenterLH(&projMatrix, 0, m_width, m_height, 0, 0, 1); - m_pe->m_effect->SetMatrix("g_mMaskProjection", &projMatrix); - m_pe->m_effect->SetTexture("g_mAAMask", m_mask); -} - -void QD3DDrawHelper::beforeReset() -{ - resetMask(); - m_clearmask = true; - - if (m_maskSurface) { - m_maskSurface->Release(); - m_maskSurface = 0; - } - - if (m_mask) { - m_mask->Release(); - m_mask = 0; - } - - if (m_depthStencilSurface) { - m_depthStencilSurface->Release(); - m_depthStencilSurface = 0; - } - - if (m_d3dvbuff) - m_d3dvbuff->Release(); -} - -void QD3DDrawHelper::afterReset() -{ - if (FAILED(m_pe->m_d3d_device->CreateVertexBuffer(QT_VERTEX_BUF_SIZE*sizeof(vertex), D3DUSAGE_DYNAMIC|D3DUSAGE_WRITEONLY, - QD3DFVF_CSVERTEX, - D3DPOOL_DEFAULT, &m_d3dvbuff, NULL))) { - qWarning() << "QDirect3DPaintEngine: failed to create vertex buffer."; - } - - m_pe->m_d3d_device->SetStreamSource(0, m_d3dvbuff, 0, sizeof(vertex)); - m_pe->m_d3d_device->SetFVF(QD3DFVF_CSVERTEX); - - m_startindex = 0; - m_index = 0; -} - -IDirect3DSurface9 *QD3DDrawHelper::freeMaskSurface() -{ - // we need to make sure the mask is cleared when it's used for something else - resetMask(); - m_clearmask = true; - - return m_maskSurface; -} - -int QD3DDrawHelper::drawAntialiasedMask(int offset, int maxoffset) -{ - int newoffset = offset; - QD3DBatchItem *item = &(m_pe->m_batch.items[offset]); - - // set mask as render target - if (FAILED(m_pe->m_d3d_device->SetRenderTarget(0, m_maskSurface))) - qWarning() << "QDirect3DPaintEngine: SetRenderTarget failed!"; - - if (m_clearmask) { - m_pe->m_d3d_device->Clear(0, 0, D3DCLEAR_TARGET,D3DCOLOR_ARGB(0,0,0,0), 0, 0); - m_clearmask = false; - } - - // fill the mask - m_pe->m_statemanager->beginPass(PASS_AA_CREATEMASK); - for (; newoffset<maxoffset; ++newoffset) { - item = &(m_pe->m_batch.items[newoffset]); - if (!(item->m_info & QD3DBatchItem::BI_AA) || !(item->m_info & QD3DBatchItem::BI_MASK)) { - break; - } else if (item->m_info & QD3DBatchItem::BI_MASKFULL) { - item->m_info &= ~QD3DBatchItem::BI_MASKFULL; - m_clearmask = true; - break; - } - - m_pe->m_statemanager->startStateBlock(); - if (item->m_info & QD3DBatchItem::BI_MASKSCISSOR) { - RECT rect; - QRectF srect = item->m_brect.adjusted(item->m_xoffset, item->m_yoffset, - item->m_xoffset, item->m_yoffset); - rect.left = qMax(qRound(srect.left()), 0); - rect.top = qMax(qRound(srect.top()), 0); - rect.bottom = qMin(m_height, qRound(srect.bottom())); - rect.right = qMin(m_width, qRound(srect.right())); - m_pe->m_d3d_device->SetScissorRect(&rect); - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); - } - m_pe->m_statemanager->setMaskChannel(item->m_maskpos.channel); - m_pe->m_statemanager->endStateBlock(); - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = item->m_offset; - for (int i=vbstart; i<(vbstart + (item->m_count * 3)); ++i) { - if (accesscontrol[i] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= READ; - } -#endif - - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLELIST, item->m_offset, item->m_count); - - if (item->m_info & QD3DBatchItem::BI_MASKSCISSOR) { - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); - } - } - m_pe->m_statemanager->endPass(); - - return newoffset; -} - -void QD3DDrawHelper::drawAliasedMask(int offset) -{ - QD3DBatchItem *item = &(m_pe->m_batch.items[offset]); - if (item->m_info & QD3DBatchItem::BI_MASK) { - m_pe->m_statemanager->beginPass( (item->m_info & QD3DBatchItem::BI_WINDING) ? PASS_STENCIL_WINDING : PASS_STENCIL_ODDEVEN ); - int prev_stop = 0; - for (int i=0; i<item->m_pointstops.count(); ++i) { - int stop = item->m_pointstops.at(i); - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = (item->m_offset + prev_stop); - for (int j=vbstart; j<(vbstart+(stop - prev_stop)); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLEFAN, item->m_offset + prev_stop, (stop - prev_stop) - 2); - prev_stop = stop; - } - m_pe->m_statemanager->endPass(); - } -} - -void QD3DDrawHelper::drawTextItem(QD3DBatchItem *item) -{ -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = item->m_offset; - for (int j=vbstart; j<(vbstart + ((item->m_count * 2) * 3)); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLELIST, item->m_offset, item->m_count*2); -} - -void QD3DDrawHelper::drawAliasedLines(QD3DBatchItem *item) -{ - m_pe->m_statemanager->setCosmeticPen(item->m_info & QD3DBatchItem::BI_COSMETICPEN); - if (item->m_info & QD3DBatchItem::BI_TRANSFORM) { - m_pe->m_statemanager->setTransformation(&item->m_matrix); - } else { - m_pe->m_statemanager->setTransformation(); - } - int pass = (item->m_info & QD3DBatchItem::BI_MASK) - ? PASS_ALIASED_LINES - : PASS_ALIASED_LINES_DIRECT; - m_pe->m_statemanager->beginPass(pass); - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLELIST, item->m_offset, (item->m_count + 2) / 3); - m_pe->m_statemanager->endPass(); -} - -void QD3DDrawHelper::drawAntialiasedBoundingRect(QD3DBatchItem *item) -{ - if (item->m_info & QD3DBatchItem::BI_SCISSOR) { - RECT rect; - rect.left = qMax(qRound(item->m_brect.left()), 0); - rect.top = qMax(qRound(item->m_brect.top()), 0); - rect.bottom = qMin(m_height, qRound(item->m_brect.bottom())); - rect.right = qMin(m_width, qRound(item->m_brect.right())); - m_pe->m_d3d_device->SetScissorRect(&rect); - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, TRUE); - } - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = item->m_offset + (item->m_count * 3); - for (int j=vbstart; j<(vbstart + 4); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLEFAN, item->m_offset + (item->m_count * 3), 2); - - if (item->m_info & QD3DBatchItem::BI_SCISSOR) { - m_pe->m_statemanager->SetRenderState(D3DRS_SCISSORTESTENABLE, FALSE); - } -} - -void QD3DDrawHelper::drawAliasedBoundingRect(QD3DBatchItem *item) -{ -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - int vbstart = (item->m_offset + item->m_count + 2); - for (int j=vbstart; j<(vbstart + 4); ++j) { - if (accesscontrol[j] != WRITE) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[j] |= READ; - } -#endif - - m_pe->m_d3d_device->DrawPrimitive(D3DPT_TRIANGLEFAN, item->m_offset + item->m_count + 2, 2); -} - -void QD3DDrawHelper::addTrap(const Trapezoid &trap) -{ - qreal topLeftY = Q27Dot5ToDouble(trap.topLeft->y) - m_yoffset; - qreal topLeftX = Q27Dot5ToDouble(trap.topLeft->x) - m_xoffset; - qreal topRightY = Q27Dot5ToDouble(trap.topRight->y) - m_yoffset; - qreal topRightX = Q27Dot5ToDouble(trap.topRight->x) - m_xoffset; - qreal top = Q27Dot5ToDouble(trap.top) - m_yoffset; - qreal bottom = Q27Dot5ToDouble(trap.bottom) - m_yoffset; - - Q27Dot5 _h = trap.topLeft->y - trap.bottomLeft->y; - Q27Dot5 _w = trap.topLeft->x - trap.bottomLeft->x; - qreal _leftA = (qreal)_w/_h; - qreal _leftB = topLeftX - _leftA * topLeftY; - - _h = trap.topRight->y - trap.bottomRight->y; - _w = trap.topRight->x - trap.bottomRight->x; - qreal _rightA = (qreal)_w/_h; - qreal _rightB = topRightX - _rightA * topRightY; - - qreal invLeftA = qFuzzyIsNull(_leftA) ? 0.0 : 1.0 / _leftA; - qreal invRightA = qFuzzyIsNull(_rightA) ? 0.0 : 1.0 / _rightA; - - vertex v1 = { {1.f, top - 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v2 = { {0.f, top - 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v3 = { {0.f, bottom + 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - - vertex v4 = { {1.f, top - 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v5 = { {0.f, bottom + 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - vertex v6 = { {1.f, bottom + 1.f, 0.5f}, 0.f, - top, bottom, invLeftA, -invRightA, - _leftA, _leftB, _rightA, _rightB}; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - for (int i=m_index; i<(m_index + 6); ++i) { - if ((m_index + 6) > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[i] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[i] |= WRITE; - } -#endif - - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v5; - m_vbuff[m_index++] = v6; - - // check if buffer is full - if (m_index >= (QT_VERTEX_BUF_SIZE - 16)) { - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 3; - m_startindex = m_index; - - QD3DBatchItem itemcopy = *m_item; - m_item = m_pe->nextBatchItem(); - *m_item = itemcopy; - m_item->m_info &= ~QD3DBatchItem::BI_MASKFULL; - - lockVertexBuffer(); - } -} - -void QD3DDrawHelper::tessellate(const QPolygonF &poly) { - int xoffset = m_item->m_maskpos.x; - int yoffset = m_item->m_maskpos.y; - - int x = m_boundingRect.left(); - int y = m_boundingRect.top(); - m_xoffset = (x - xoffset) + 0.5f; - m_yoffset = (y - yoffset) + 0.5f; - - QTessellator::tessellate(poly.data(), poly.count()); - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) / 3; - m_startindex = m_index; -} - -inline void QD3DDrawHelper::lineToStencil(qreal x, qreal y) -{ - QPointF lastPt = tess_lastpoint; - tess_lastpoint = QPointF(x, y); - - if (m_isLine && m_firstPoint) - return; - - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - if (m_index > QT_VERTEX_BUF_SIZE) - qDebug() << "Vertex Buffer: Buffer overflow"; - if (accesscontrol[m_index] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[m_index] |= WRITE; -#endif - - vertex v; - if (m_isLine) { - vertex v1 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - -1.f, -1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - vertex v2 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - 1.f, -1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - vertex v3 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - 1.f, 1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - vertex v4 = { {lastPt.x(), lastPt.y(), m_pe->m_pen_width }, m_color, - -1.f, 1.f, x, y, - 0.f, 0.f, 0.f, 0.f}; - m_vbuff[m_index++] = v1; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v4; - m_vbuff[m_index++] = v2; - m_vbuff[m_index++] = v3; - } else { - vertex v1 = { {x, y, 0.5f}, m_color, - 0.f, 0.f, 0.f, 0.f, - 0.f, 0.f, 0.f, 0.f}; - m_vbuff[m_index++] = v1; - v = v1; - } - ++tess_index; - - // check if buffer is full - if (m_index >= (QT_VERTEX_BUF_SIZE - 16)) { - int firstindex = m_startindex; - if (!m_item->m_pointstops.isEmpty()) - firstindex = m_item->m_pointstops.last(); - - vertex first = m_vbuff[firstindex]; - - // finish current polygon - m_item->m_pointstops.append(tess_index); - m_item->m_offset = m_startindex; - m_startindex = m_index; - - // copy item - QD3DBatchItem itemcopy = *m_item; - m_item = m_pe->nextBatchItem(); - *m_item = itemcopy; - - // start new polygon - lockVertexBuffer(); - m_item->m_pointstops.clear(); - if (!m_isLine) { - tess_index = 2; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - if (accesscontrol[m_index] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[m_index] |= WRITE; -#endif - - m_vbuff[m_index++] = first; - -#ifdef QT_DEBUG_VERTEXBUFFER_ACCESS - if (accesscontrol[m_index] != CLEAR) - qDebug() << "Vertex Buffer: Access Error"; - accesscontrol[m_index] |= WRITE; -#endif - - m_vbuff[m_index++] = v; - } else { - tess_index = 0; - } - } - - if (x > max_x) - max_x = x; - else if (x < min_x) - min_x = x; - if (y > max_y) - max_y = y; - else if (y < min_y) - min_y = y; -} - -inline void QD3DDrawHelper::curveToStencil(const QPointF &cp1, const QPointF &cp2, - const QPointF &ep) -{ - qreal inverseScale = 0.5f; - qreal inverseScaleHalf = inverseScale / 2; - - QBezier beziers[32]; - beziers[0] = QBezier::fromPoints(tess_lastpoint, cp1, cp2, ep); - QBezier *b = beziers; - while (b >= beziers) { - // check if we can pop the top bezier curve from the stack - qreal l = qAbs(b->x4 - b->x1) + qAbs(b->y4 - b->y1); - qreal d; - if (l > inverseScale) { - d = qAbs( (b->x4 - b->x1)*(b->y1 - b->y2) - (b->y4 - b->y1)*(b->x1 - b->x2) ) - + qAbs( (b->x4 - b->x1)*(b->y1 - b->y3) - (b->y4 - b->y1)*(b->x1 - b->x3) ); - d /= l; - } else { - d = qAbs(b->x1 - b->x2) + qAbs(b->y1 - b->y2) + - qAbs(b->x1 - b->x3) + qAbs(b->y1 - b->y3); - } - if (d < inverseScaleHalf || b == beziers + 31) { - // good enough, we pop it off and add the endpoint - lineToStencil(b->x4, b->y4); - --b; - } else { - // split, second half of the polygon goes lower into the stack - b->split(b+1, b); - ++b; - } - } -} - -QRectF QD3DDrawHelper::pathToVertexArrays(const QPainterPath &path) -{ - m_isLine = (m_item->m_info & QD3DBatchItem::BI_FASTLINE); - const QPainterPath::Element &first = path.elementAt(0); - firstx = first.x; - firsty = first.y; - min_x = max_x = firstx; - min_y = max_y = firsty; - - m_firstPoint = true; - tess_index = 0; - m_item->m_pointstops.clear(); - lineToStencil(firstx, firsty); - m_firstPoint = false; - - for (int i=1; i<path.elementCount(); ++i) { - const QPainterPath::Element &e = path.elementAt(i); - switch (e.type) { - case QPainterPath::MoveToElement: - m_item->m_pointstops.append(tess_index); - m_firstPoint = true; - lineToStencil(e.x, e.y); - m_firstPoint = false; - break; - case QPainterPath::LineToElement: - lineToStencil(e.x, e.y); - break; - case QPainterPath::CurveToElement: - curveToStencil(e, path.elementAt(i+1), path.elementAt(i+2)); - i+=2; - break; - default: - break; - } - } - - if (!m_isLine) - lineToStencil(firstx, firsty); - - m_item->m_pointstops.append(tess_index); - - m_item->m_offset = m_startindex; - m_item->m_count = ( m_index - m_startindex ) - 2; - m_startindex = m_index; - - QRectF result; - result.setLeft(min_x); - result.setRight(max_x); - result.setTop(min_y); - result.setBottom(max_y); - - if (m_isLine) - result.adjust(0,0,1,1); - - return result; -} - -void QD3DDrawHelper::resetMask() -{ - m_mask_position.x = m_mask_position.y = QD3D_MASK_MARGIN; - m_mask_position.channel = 0; - m_mask_offsetX2 = m_mask_offsetY2 = QD3D_MASK_MARGIN; -} - - -static inline QPainterPath strokeForPath(const QPainterPath &path, const QPen &cpen) { - QPainterPathStroker stroker; - if (cpen.style() == Qt::CustomDashLine) - stroker.setDashPattern(cpen.dashPattern()); - else - stroker.setDashPattern(cpen.style()); - - stroker.setCapStyle(cpen.capStyle()); - stroker.setJoinStyle(cpen.joinStyle()); - stroker.setMiterLimit(cpen.miterLimit()); - stroker.setWidth(cpen.widthF()); - - QPainterPath stroke = stroker.createStroke(path); - stroke.setFillRule(Qt::WindingFill); - return stroke; -} - - -QDirect3DPaintEnginePrivate::~QDirect3DPaintEnginePrivate() -{ - -} - -void QDirect3DPaintEnginePrivate::updateClipPath(const QPainterPath &path, Qt::ClipOperation op) -{ - //#### remove me - QRegion r(path.toFillPolygon().toPolygon(), path.fillRule()); - updateClipRegion(r, op); - -/* if (m_draw_helper->needsFlushing()) - flushBatch(); - - if (op == Qt::IntersectClip && !has_clipping) - op = Qt::ReplaceClip; - - // switch to paths - if (!m_has_complex_clipping) { - m_clip_path = QPainterPath(); - m_clip_path.addRegion(m_clip_region); - m_clip_region = QRegion(); - m_sysclip_path = QPainterPath(); - m_sysclip_path.addRegion(m_sysclip_region); - m_sysclip_region = QRegion(); - m_has_complex_clipping = true; - } - - QPainterPath cpath = m_matrix.map(path); - - QD3DBatchItem *item = &m_batch.items[m_batch.m_item_index++]; - item->m_info = QD3DBatchItem::BI_COMPLEXCLIP; - - switch (op) { - case Qt::UniteClip: - has_clipping = true; - m_clip_path = m_clip_path.united(cpath); - break; - case Qt::ReplaceClip: - has_clipping = true; - m_clip_path = cpath; - break; - case Qt::NoClip: - m_has_complex_clipping = false; - has_clipping = false; - item->m_info |= QD3DBatchItem::BI_CLEARCLIP; - break; - default: // intersect clip - has_clipping = true; - m_clip_path = m_clip_path.intersected(cpath); - break; - } - - if (!m_sysclip_path.isEmpty()) { - item->m_info &= ~QD3DBatchItem::BI_CLEARCLIP; - if (has_clipping) - m_clip_path = m_clip_path.intersected(m_sysclip_path); - else - m_clip_path = m_sysclip_path; - } - - // update the aliased clipping mask - m_draw_helper->setClipPath(m_clip_path, item); - - // update the antialiased clipping mask - if (m_draw_helper->needsFlushing()) - flushBatch(); - - QD3DBatchItem *aaitem = &m_batch.items[m_batch.m_item_index++]; - aaitem->m_info = item->m_info|QD3DBatchItem::BI_AA; - m_draw_helper->setClipPath(m_clip_path, aaitem); */ -} - -extern QPainterPath qt_regionToPath(const QRegion ®ion); - -void QDirect3DPaintEnginePrivate::updateClipRegion(const QRegion &clipregion, Qt::ClipOperation op) -{ - if (m_draw_helper->needsFlushing()) - flushBatch(); - if (m_has_complex_clipping) { - QPainterPath path = qt_regionToPath(clipregion); - updateClipPath(path, op); - return; - } - - if (op == Qt::IntersectClip && m_clip_region.isEmpty()) - op = Qt::ReplaceClip; - - QRegion cregion = m_matrix.map(clipregion); - - QD3DBatchItem *item = nextBatchItem(); - item->m_info &= ~QD3DBatchItem::BI_AA; - - switch (op) { - case Qt::UniteClip: - m_clip_region = m_clip_region.united(cregion); - break; - case Qt::ReplaceClip: - m_clip_region = cregion; - break; - case Qt::NoClip: - m_clip_region = QRegion(); - item->m_info |= QD3DBatchItem::BI_CLEARCLIP; - break; - default: // intersect clip - m_clip_region = m_clip_region.intersected(cregion); - break; - } - - QRegion crgn = m_clip_region; - if (!m_sysclip_region.isEmpty()) { - item->m_info &= ~QD3DBatchItem::BI_CLEARCLIP; - if (!crgn.isEmpty()) - crgn = crgn.intersected(m_sysclip_region); - else - crgn = m_sysclip_region; - } - - QPainterPath path = qt_regionToPath(crgn); - m_draw_helper->setClipPath(path, &item); -} - -void QDirect3DPaintEnginePrivate::updateFont(const QFont &) -{ -} - -void QDirect3DPaintEnginePrivate::setRenderTechnique(RenderTechnique technique) -{ - if (m_current_technique != technique) { - if (m_current_technique != RT_NoTechnique) - m_effect->End(); - - if (technique == RT_Aliased) { - m_effect->SetTechnique("Aliased"); - m_effect->Begin(0,D3DXFX_DONOTSAVESTATE); - } else if (technique == RT_Antialiased) { - m_effect->SetTechnique("Antialiased"); - m_effect->Begin(0,D3DXFX_DONOTSAVESTATE); - } - } - - m_current_technique = technique; -} - -/*QPolygonF QDirect3DPaintEnginePrivate::transformedRect(const QRectF &brect) const -{ - QPolygonF poly(brect); - return m_matrix.map(poly); -} - -QPolygonF QDirect3DPaintEnginePrivate::calcTextureCoords(const QPolygonF &trect) const -{ - QPolygonF result(4); - QRectF brect = trect.boundingRect(); - qreal angle = atan(trect.at(0).x() - -} - -QPolygonF QDirect3DPaintEnginePrivate::offsetTextureCoords(const QRectF &brect, const QPolygonF &trect) const -{ - -}*/ - -inline QD3DBatchItem *QDirect3DPaintEnginePrivate::nextBatchItem() -{ - if (m_draw_helper->needsFlushing()) - flushBatch(); - - QD3DBatchItem *item = &m_batch.items[m_batch.m_item_index++]; - item->m_info = m_current_state; - item->m_cmode = m_cmode; - return item; -} - -qreal calculateAngle(qreal dx, qreal dy) -{ - qreal angle; - - if (qFuzzyIsNull(dx)) { - angle = (dy < 0) ? -M_PI/2 : M_PI/2; - } else { - angle = atanf(dy/dx); - if (dx < 0) - angle += M_PI; - } - - return angle; -} - -QPolygonF QDirect3DPaintEnginePrivate::brushCoordinates(const QRectF &r, bool stroke, qreal *fd) const -{ - QBrush brush; - QTransform matrix; - Qt::BrushStyle style; - - if (stroke) { - brush = m_pen.brush(); - matrix = m_inv_pen_matrix; - style = m_pen_brush_style; - } else { - brush = m_brush; - matrix = m_inv_brush_matrix; - style = m_brush_style; - } - - QPolygonF bpoly; - switch(style) { - case Qt::TexturePattern: { - QTransform totxcoords; - QRectF adj_brect = r.adjusted(-0.5f, -0.5f, -0.5f, -0.5f); - totxcoords.scale(1.0f/brush.texture().width(), - 1.0f/brush.texture().height()); - bpoly = matrix.map(QPolygonF(adj_brect)); - bpoly = totxcoords.map(bpoly); - break; } - case Qt::LinearGradientPattern: { - const QLinearGradient *g = static_cast<const QLinearGradient *>(brush.gradient()); - QPointF start = g->start(); - QPointF stop = g->finalStop(); - qreal dx = stop.x() - start.x(); - qreal dy = stop.y() - start.y(); - qreal length = sqrt(dx * dx + dy * dy); - qreal angle = calculateAngle(dx, dy); - QTransform totxcoords; - QRectF adj_brect = r.adjusted(-0.5f, -0.5f, -0.5f, -0.5f); - totxcoords.scale(1.0f/length, 1.0f/length); - totxcoords.rotateRadians(-angle); - totxcoords.translate(-start.x(), -start.y()); - bpoly = matrix.map(QPolygonF(adj_brect)); - bpoly = totxcoords.map(bpoly); - break; } - case Qt::ConicalGradientPattern: { - const QConicalGradient *g = static_cast<const QConicalGradient *>(brush.gradient()); - QPointF center = g->center(); - qreal angle = g->angle(); - QTransform totxcoords; - totxcoords.rotate(angle); - totxcoords.translate(-center.x(), -center.y()); - bpoly = matrix.map(QPolygonF(r)); - bpoly = totxcoords.map(bpoly); - break; } - case Qt::RadialGradientPattern: { - const QRadialGradient *g = static_cast<const QRadialGradient *>(brush.gradient()); - QPointF center = g->center(); - QPointF focalpoint = g->focalPoint(); - qreal dx = focalpoint.x() - center.x(); - qreal dy = focalpoint.y() - center.y(); - qreal radius = g->radius(); - *fd = sqrt(dx * dx + dy * dy) / radius; - qreal angle = calculateAngle(dx, dy); - QTransform totxcoords; - totxcoords.scale(1.0f/radius, 1.0f/radius); - totxcoords.rotateRadians(-angle); - totxcoords.translate(-center.x(), -center.y()); - bpoly = matrix.map(QPolygonF(r)); - bpoly = totxcoords.map(bpoly); - break; } - default: { - QTransform totxcoords; - QRectF adj_brect = r.adjusted(-0.5f, -0.5f, -0.5f, -0.5f); - QPixmap pat = getPattern(style); - totxcoords.scale(1.0f/pat.width(), - 1.0f/pat.height()); - bpoly = matrix.map(QPolygonF(adj_brect)); - bpoly = totxcoords.map(bpoly); } - }; - - return bpoly; -} - -void QDirect3DPaintEnginePrivate::strokeAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform) -{ - D3DCOLOR solid_color; - QD3DBatchItem *item = nextBatchItem(); - - if (!txform.isIdentity()) - path = txform.map(path); - - QRectF trect; - QPolygonF txcoord; - - solid_color = m_pen_color; - bool has_complex_brush = false; - if (m_pen_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_pen.brush(); - item->m_info |= QD3DBatchItem::BI_COMPLEXBRUSH; - item->m_opacity = m_opacity; - } - - if (m_has_fast_pen) { - item->m_info |= QD3DBatchItem::BI_FASTLINE; - if (m_pen_brush_style == Qt::SolidPattern) { - m_draw_helper->queueAliasedMask(path, &item, solid_color); - item->m_info &= ~QD3DBatchItem::BI_MASK; // bypass stencil buffer - return; - } - } - - QRectF txrect = m_draw_helper->queueAliasedMask(path, &item, 0); - - if (has_complex_brush) { - trect = brect; - txcoord = brushCoordinates(brect, true, &item->m_distance); - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = m_matrix; - } else { - trect = txrect; - static const QPolygonF empty_poly(4); - txcoord = empty_poly; - } - - m_draw_helper->queueRect(trect, item, solid_color, txcoord); -} - -void QDirect3DPaintEnginePrivate::fillAliasedPath(QPainterPath path, const QRectF &brect, const QTransform &txform) -{ - D3DCOLOR solid_color; - QD3DBatchItem *item = nextBatchItem(); - - if (!txform.isIdentity()) - path = txform.map(path); - - QRectF trect; - QPolygonF txcoord; - - solid_color = m_brush_color; - bool has_complex_brush = false; - if (m_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_brush; - item->m_info |= QD3DBatchItem::BI_COMPLEXBRUSH; - item->m_opacity = m_opacity; - } - - QRectF txrect = m_draw_helper->queueAliasedMask(path, &item, 0); - - if (has_complex_brush) { - trect = brect; - txcoord = brushCoordinates(brect, false, &item->m_distance); - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = m_matrix; - } else { - trect = txrect; - static const QPolygonF empty_poly(4); - txcoord = empty_poly; - } - - m_draw_helper->queueRect(trect, item, solid_color, txcoord); -} - -void QDirect3DPaintEnginePrivate::fillAntialiasedPath(const QPainterPath &path, const QRectF &brect, - const QTransform &txform, bool stroke) -{ - D3DCOLOR solid_color; - bool winding = (path.fillRule() == Qt::WindingFill); - QPolygonF poly; - QRectF txrect; - QPainterPath tpath; - - if (m_has_aa_fast_pen && stroke) { - tpath = txform.map(path); - txrect = tpath.controlPointRect(); - txrect.adjust(-(m_pen_width/2),-(m_pen_width/2), m_pen_width, m_pen_width); - } else { - poly = path.toFillPolygon(txform); - txrect = poly.boundingRect(); - } - - // brect = approx. bounding rect before transformation - // txrect = exact bounding rect after transformation - // trect = the rectangle to be drawn - // txcoord = the texture coordinates - // adj_txrect = adjusted rect to include aliased outline - - bool use_scissor = false; - if (txrect.left() < 0) { - txrect.adjust(-txrect.left(),0,0,0); - use_scissor = true; - } - if (txrect.top() < 0) { - txrect.adjust(0,-txrect.top(),0,0); - use_scissor = true; - } - - if (!txrect.isValid()) - return; - - QD3DBatchItem *item = nextBatchItem(); - - QRectF adj_txrect = txrect.adjusted(-1,-1,1,1); - QRectF trect; - QPolygonF txcoord; - - bool has_complex_brush = false; - if (stroke) { - solid_color = m_pen_color; - if (m_pen_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_pen.brush(); - } - item->m_width = m_pen_width; - } else { - solid_color = m_brush_color; - if (m_brush_style != Qt::SolidPattern) { - has_complex_brush = true; - item->m_brush = m_brush; - } - } - - qreal focaldist = 0; - if (has_complex_brush) { - trect = brect; - txcoord = brushCoordinates(brect, stroke, &focaldist); - } else { - trect = adj_txrect; - static const QPolygonF empty_poly(4); - txcoord = empty_poly; - } - - bool maskfull; - item->m_maskpos = m_draw_helper->allocateMaskPosition(txrect, &maskfull); - if (maskfull) - item->m_info |= QD3DBatchItem::BI_MASKFULL; - item->m_distance = focaldist; - - if (winding) - item->m_info |= QD3DBatchItem::BI_WINDING; - - if (has_complex_brush) { - item->m_info |= QD3DBatchItem::BI_SCISSOR|QD3DBatchItem::BI_COMPLEXBRUSH| - QD3DBatchItem::BI_TRANSFORM; - item->m_brect = adj_txrect; - item->m_matrix = m_matrix; - item->m_opacity = m_opacity; - } - if (use_scissor) { - item->m_info |= QD3DBatchItem::BI_MASKSCISSOR; - item->m_brect = adj_txrect; - } - - if (m_has_aa_fast_pen && stroke) { - m_draw_helper->queueAntialiasedLines(tpath, &item, txrect); - } else { - m_draw_helper->queueAntialiasedMask(poly, &item, txrect); - } - - m_draw_helper->queueRect(trect, item, solid_color, txcoord); -} - -QPainterPath QDirect3DPaintEnginePrivate::strokePathFastPen(const QPainterPath &path) -{ - QPainterPath result; - QBezier beziers[32]; - for (int i=0; i<path.elementCount(); ++i) { - const QPainterPath::Element &e = path.elementAt(i); - switch (e.type) { - case QPainterPath::MoveToElement: - result.moveTo(e.x, e.y); - break; - case QPainterPath::LineToElement: - result.lineTo(e.x, e.y); - break; - - case QPainterPath::CurveToElement: - { - QPointF sp = path.elementAt(i-1); - QPointF cp2 = path.elementAt(i+1); - QPointF ep = path.elementAt(i+2); - i+=2; - - qreal inverseScaleHalf = m_inv_scale / 2; - beziers[0] = QBezier::fromPoints(sp, e, cp2, ep); - QBezier *b = beziers; - while (b >= beziers) { - // check if we can pop the top bezier curve from the stack - qreal l = qAbs(b->x4 - b->x1) + qAbs(b->y4 - b->y1); - qreal d; - if (l > m_inv_scale) { - d = qAbs( (b->x4 - b->x1)*(b->y1 - b->y2) - - (b->y4 - b->y1)*(b->x1 - b->x2) ) - + qAbs( (b->x4 - b->x1)*(b->y1 - b->y3) - - (b->y4 - b->y1)*(b->x1 - b->x3) ); - d /= l; - } else { - d = qAbs(b->x1 - b->x2) + qAbs(b->y1 - b->y2) + - qAbs(b->x1 - b->x3) + qAbs(b->y1 - b->y3); - } - if (d < inverseScaleHalf || b == beziers + 31) { - // good enough, we pop it off and add the endpoint - result.lineTo(b->x4, b->y4); - --b; - } else { - // split, second half of the polygon goes lower into the stack - b->split(b+1, b); - ++b; - } - } - } // case CurveToElement - default: - break; - } // end of switch - } - return result; -} - -void QDirect3DPaintEnginePrivate::strokePath(const QPainterPath &path, QRectF brect, bool simple) -{ - QTransform txform; - QPainterPath tpath; - - if (m_has_fast_pen || m_has_aa_fast_pen) { - if (!simple) - tpath = strokePathFastPen(path); - else - tpath = path; //already only lines - } else { - tpath = strokeForPath(path, m_pen); - } - - if (tpath.isEmpty()) - return; - - //brect is null if the path is not transformed - if (brect.isNull()) - txform = m_matrix; - - if (!brect.isNull()) { - // brect is set when the path is transformed already, - // this is the case when we have a cosmetic pen. - brect.adjust(-(m_pen_width/2),-(m_pen_width/2), m_pen_width, m_pen_width); - } - - if (brect.isNull()) - brect = tpath.controlPointRect(); - brect.adjust(-m_inv_scale,-m_inv_scale,m_inv_scale,m_inv_scale); //adjust for antialiasing - - if (m_current_state & QD3DBatchItem::BI_AA) { - fillAntialiasedPath(tpath, brect, txform, true); - } else { - strokeAliasedPath(tpath, brect, txform); - } -} - -void QDirect3DPaintEnginePrivate::fillPath(const QPainterPath &path, QRectF brect) -{ - QTransform txform; - - //brect is null if the path is not transformed - if (brect.isNull()) - txform = m_matrix; - - if (brect.isNull()) - brect = path.controlPointRect(); - brect.adjust(-m_inv_scale,-m_inv_scale,m_inv_scale,m_inv_scale); //adjust for antialiasing - - if (m_current_state & QD3DBatchItem::BI_AA) { - fillAntialiasedPath(path, brect, txform, false); - } else { - fillAliasedPath(path, brect, txform); - } -} - - -bool QDirect3DPaintEnginePrivate::init() -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEnginePrivate::init()"; -#endif - - m_draw_helper = 0; - m_gradient_cache = 0; - m_dc = 0; - m_dcsurface = 0; - - m_supports_d3d = false; - m_current_state = 0; - m_in_scene = false; - m_has_fast_pen = false; - m_has_aa_fast_pen = false; - m_has_pen = false; - m_has_brush = false; - m_pen_color = 0; - m_brush_color = 0; - m_current_surface = 0; - m_batch.m_item_index = 0; - m_current_technique = RT_NoTechnique; - - if (!pDirect3DCreate9) { - QLibrary d3d_lib(QLatin1String("d3d9.dll")); - pDirect3DCreate9 = (PFNDIRECT3DCREATE9) d3d_lib.resolve("Direct3DCreate9"); - if (!pDirect3DCreate9) { - qWarning("QDirect3DPaintEngine: failed to resolve symbols from d3d9.dll.\n" - "Make sure you have the DirectX run-time installed."); - return false; - } - } - - if (!pD3DXCreateBuffer || !pD3DXCreateEffect || !pD3DXMatrixOrthoOffCenterLH) { - QLibrary d3dx_lib(QLatin1String("d3dx9_32.dll")); - pD3DXCreateBuffer = (PFND3DXCREATEBUFFER) d3dx_lib.resolve("D3DXCreateBuffer"); - pD3DXCreateEffect = (PFND3DXCREATEEFFECT) d3dx_lib.resolve("D3DXCreateEffect"); - pD3DXMatrixOrthoOffCenterLH = (PFND3DXMATRIXORTHOOFFCENTERLH) - d3dx_lib.resolve("D3DXMatrixOrthoOffCenterLH"); - if (!(pD3DXCreateBuffer && pD3DXCreateEffect && pD3DXMatrixOrthoOffCenterLH)) { - qWarning("QDirect3DPaintEngine: failed to resolve symbols from d3dx9_32.dll.\n" - "Make sure you have the DirectX run-time installed."); - return false; - } - } - - if (!m_d3d_object) { - m_d3d_object = pDirect3DCreate9(D3D_SDK_VERSION); - if (!m_d3d_object) { - qWarning("QDirect3DPaintEngine: failed to create Direct3D object.\n" - "Direct3D support in Qt will be disabled."); - return false; - } - } - - m_supports_d3d = testCaps(); - if (!m_supports_d3d) - return false; - - m_surface_manager.init(m_d3d_object); - m_d3d_device = m_surface_manager.device(); - - if (!m_d3d_device) - return false; - - /* load shaders */ - QFile file(QLatin1String(":/qpaintengine_d3d.fx")); - QByteArray fxFile; - if (file.open(QFile::ReadOnly)) - fxFile = file.readAll(); - - if (fxFile.size() > 0) { - LPD3DXBUFFER compout; - pD3DXCreateBuffer(4096, &compout); - DWORD dwShaderFlags = D3DXFX_NOT_CLONEABLE|D3DXFX_DONOTSAVESTATE|D3DXSHADER_OPTIMIZATION_LEVEL3; - if(FAILED(pD3DXCreateEffect(m_d3d_device, fxFile.constData(), fxFile.size(), - NULL, NULL, dwShaderFlags, NULL, &m_effect, &compout))) { - qWarning("QDirect3DPaintEngine: failed to compile effect file"); - if (compout) - qWarning((char *)compout->GetBufferPointer()); - m_supports_d3d = false; - return false; - } - if (m_effect) { - m_statemanager = new QD3DStateManager(m_d3d_device, m_effect); - m_effect->SetStateManager(m_statemanager); - m_draw_helper = new QD3DDrawHelper(this); - initDevice(); - m_gradient_cache = new QD3DGradientCache(m_d3d_device); - } - } else { - return false; - } - - return true; -} - -QPixmap QDirect3DPaintEnginePrivate::getPattern(Qt::BrushStyle style) const -{ - if (!m_patterns.contains(style)) { - QImage img(16,16,QImage::Format_ARGB32); - img.fill(0); - QPainter p(&img); - p.setBrush(QBrush(Qt::white, style)); - p.setPen(Qt::NoPen); - p.drawRect(0,0,16,16); - p.end(); - QPixmap pattern(QPixmap::fromImage(img)); - QDirect3DPaintEnginePrivate *ct = const_cast<QDirect3DPaintEnginePrivate *>(this); - ct->verifyTexture(pattern); - ct->m_patterns.insert(style, pattern); - } - - return m_patterns.value(style); -} - -bool QDirect3DPaintEnginePrivate::testCaps() -{ - D3DCAPS9 caps; - if (FAILED(m_d3d_object->GetDeviceCaps(D3DADAPTER_DEFAULT, D3DDEVTYPE_HAL, &caps))) - return false; - - if ((caps.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE) - && (caps.DevCaps & D3DDEVCAPS_PUREDEVICE) - && (caps.RasterCaps & D3DPRASTERCAPS_SCISSORTEST) - && (caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED)) - return true; -#if 0 - qDebug() << "Direct3D caps:"; - qDebug() << "D3DPRESENT_INTERVAL_IMMEDIATE:" << ((caps.PresentationIntervals & D3DPRESENT_INTERVAL_IMMEDIATE) != 0); - qDebug() << "D3DDEVCAPS_PUREDEVICE:" << ((caps.DevCaps & D3DDEVCAPS_PUREDEVICE) != 0); - qDebug() << "D3DPRASTERCAPS_SCISSORTEST:" << ((caps.RasterCaps & D3DPRASTERCAPS_SCISSORTEST) != 0); - qDebug() << "D3DSTENCILCAPS_TWOSIDED:" << ((caps.StencilCaps & D3DSTENCILCAPS_TWOSIDED) != 0); -#endif - return false; -} - -void QDirect3DPaintEnginePrivate::initDevice() -{ - m_statemanager->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); - m_statemanager->SetRenderState(D3DRS_ZENABLE, D3DZB_FALSE); - m_statemanager->SetRenderState(D3DRS_ZWRITEENABLE, FALSE); - m_statemanager->SetRenderState(D3DRS_LIGHTING, FALSE); - m_statemanager->SetRenderState(D3DRS_ALPHABLENDENABLE, TRUE); - m_statemanager->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); - m_statemanager->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_DESTALPHA); -} - -void QDirect3DPaintEnginePrivate::updatePen(const QPen &pen) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updatePen"; -#endif - m_pen = pen; - m_has_cosmetic_pen = false; - m_has_pen = (m_pen.style() != Qt::NoPen); - if (m_has_pen) { - m_pen_brush_style = m_pen.brush().style(); - - if (m_pen_brush_style >= Qt::SolidPattern && m_pen_brush_style <= Qt::DiagCrossPattern) { - int a, r, g, b; - m_pen.color().getRgb(&r, &g, &b, &a); - m_pen_color = D3DCOLOR_ARGB((int)(a * m_opacity),r,g,b); - } else { - m_pen_color = m_opacity_color; - } - - m_has_cosmetic_pen = m_pen.isCosmetic(); - - if (m_pen_brush_style != Qt::NoBrush && - m_pen_brush_style != Qt::SolidPattern) { - bool ok; - m_inv_pen_matrix = m_pen.brush().transform().inverted(&ok); - if (!ok) - qWarning() << "QDirect3DPaintEngine: No inverse matix for pen brush matrix."; - } - - m_pen_width = m_pen.widthF(); - if (m_pen_width == 0.0f) - m_pen_width = 1.0f; - } -} - -void QDirect3DPaintEnginePrivate::updateBrush(const QBrush &brush) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updateBrush"; -#endif - m_brush = brush; - m_brush_style = m_brush.style(); - m_has_brush = (m_brush_style != Qt::NoBrush); - if (m_has_brush) { - if (m_brush_style >= Qt::SolidPattern && m_brush_style <= Qt::DiagCrossPattern) { - int a, r, g, b; - m_brush.color().getRgb(&r, &g, &b, &a); - m_brush_color = D3DCOLOR_ARGB((int)(a * m_opacity),r,g,b); - } else { - m_brush_color = m_opacity_color; - } - - if (m_brush_style != Qt::SolidPattern) { - bool ok; - m_inv_brush_matrix = (m_brush.transform() * m_brush_origin).inverted(&ok); - if (!ok) - qWarning() << "QDirect3DPaintEngine: No inverse matix for brush matrix."; - - // make sure the texture is loaded as a texture - if (m_brush_style == Qt::TexturePattern) - verifyTexture(m_brush.texture()); - - - } - } -} - -void QDirect3DPaintEnginePrivate::updateTransform(const QTransform &matrix) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updateTransform"; -#endif - m_matrix = matrix; - m_inv_scale = qMax(1 / qMax( qMax(qAbs(m_matrix.m11()), qAbs(m_matrix.m22())), - qMax(qAbs(m_matrix.m12()), qAbs(m_matrix.m21())) ), 0.0001); - m_txop = matrix.type(); -} - -int QDirect3DPaintEnginePrivate::flushAntialiased(int offset) -{ - // fills the mask (returns number of items added to the mask) - int newoffset = m_draw_helper->drawAntialiasedMask(offset, m_batch.m_item_index); - - // set the render target to the current output surface - if (FAILED(m_d3d_device->SetRenderTarget(0, m_current_surface))) - qWarning() << "QDirect3DPaintEngine: SetRenderTarget failed!"; - - // draw the bounding boxes (using the mask generated by drawAntialiasedMask) - for (int i=offset; i<newoffset; ++i) { - QD3DBatchItem *item = &(m_batch.items[i]); - int pass = (item->m_info & QD3DBatchItem::BI_COMPLEXBRUSH) ? PASS_AA_DRAW : PASS_AA_DRAW_DIRECT; - m_statemanager->beginPass(pass); - prepareItem(item); - if (item->m_info & QD3DBatchItem::BI_BRECT) - m_draw_helper->drawAntialiasedBoundingRect(item); - cleanupItem(item); - } - - m_statemanager->endPass(); - - return newoffset; -} - -bool QDirect3DPaintEnginePrivate::prepareBatch(QD3DBatchItem *item, int offset) -{ - if (item->m_info & QD3DBatchItem::BI_CLIP) { - setRenderTechnique(RT_Aliased); - if (item->m_info & QD3DBatchItem::BI_CLEARCLIP) { - m_d3d_device->Clear(0, 0, D3DCLEAR_ZBUFFER, 0, 0.0f, 0); - return true; - } - - m_draw_helper->drawAliasedMask(offset); - m_d3d_device->Clear(0, 0, D3DCLEAR_ZBUFFER, 0, 1.0f, 0); - if (item->m_info & QD3DBatchItem::BI_BRECT) { - m_statemanager->beginPass(PASS_STENCIL_CLIP); - m_draw_helper->drawAliasedBoundingRect(item); - m_statemanager->endPass(); - } - - return true; - } - - if (item->m_info & QD3DBatchItem::BI_AA) { - setRenderTechnique(RT_Antialiased); - } else { - setRenderTechnique(RT_Aliased); - } - - return false; -} - -void QDirect3DPaintEnginePrivate::prepareItem(QD3DBatchItem *item) { - // pixmap - int brushmode = 0; - m_statemanager->startStateBlock(); - if ((item->m_info & QD3DBatchItem::BI_PIXMAP) || (item->m_info & QD3DBatchItem::BI_IMAGE)) { - QRasterPixmapData *data = static_cast<QRasterPixmapData*>(item->m_pixmap.data); - IDirect3DTexture9 *tex = (item->m_info & QD3DBatchItem::BI_PIXMAP) ? - data->texture : item->m_texture; - m_statemanager->setTexture(tex); - brushmode = 5; - } - - if (item->m_info & QD3DBatchItem::BI_AA) { - m_statemanager->setMaskChannel(item->m_maskpos.channel); - m_statemanager->setMaskOffset(item->m_xoffset, item->m_yoffset); - } - - if (item->m_info & QD3DBatchItem::BI_COMPLEXBRUSH) { - const QBrush brush = item->m_brush; - switch (brush.style()) { - case Qt::TexturePattern: { - QRasterPixmapData *data = static_cast<QRasterPixmapData*>(brush.texture().data); - m_statemanager->setTexture(data->texture, QGradient::RepeatSpread); - brushmode = 1; - break; - } - case Qt::LinearGradientPattern: - m_statemanager->setTexture(m_gradient_cache-> - getBuffer(brush.gradient()->stops(), item->m_opacity), - brush.gradient()->spread()); - brushmode = 2; - break; - case Qt::ConicalGradientPattern: - m_statemanager->setTexture(m_gradient_cache-> - getBuffer(brush.gradient()->stops(), item->m_opacity), - brush.gradient()->spread()); - brushmode = 3; - break; - case Qt::RadialGradientPattern: - m_statemanager->setTexture(m_gradient_cache-> - getBuffer(brush.gradient()->stops(), item->m_opacity), - brush.gradient()->spread()); - m_statemanager->setFocalDistance(item->m_distance); - brushmode = 4; - break; - default: { - QRasterPixmapData *data = static_cast<QRasterPixmapData*>(getPattern(brush.style()).data); - m_statemanager->setTexture(data->texture, QGradient::RepeatSpread); - brushmode = 5; - } - }; - } - - if (item->m_info & QD3DBatchItem::BI_TRANSFORM) { - m_statemanager->setTransformation(&item->m_matrix); - } else { - m_statemanager->setTransformation(); - } - - m_statemanager->setBrushMode(brushmode); - setCompositionMode(item->m_cmode); - m_statemanager->endStateBlock(); -} - - -void QDirect3DPaintEnginePrivate::releaseDC() -{ - if (m_dc) { - m_dcsurface->ReleaseDC(m_dc); - m_dcsurface = 0; - m_dc = 0; - } -} - - -void QDirect3DPaintEnginePrivate::cleanupItem(QD3DBatchItem *item) -{ - if (item->m_info & QD3DBatchItem::BI_PIXMAP) - item->m_pixmap = QPixmap(); - item->m_brush = QBrush(); -} - -void QDirect3DPaintEnginePrivate::verifyTexture(const QPixmap &pm) -{ - QRasterPixmapData *pmData = static_cast<QRasterPixmapData*>(pm.data); - if (!pmData->texture) { - QImage im = pmData->image; - // bitmaps are drawn with the current pen color - if (im.depth() == 1) { - QVector<QRgb> colors(2); - colors[0] = 0; - colors[1] = m_pen.color().rgba(); - im.setColorTable(colors); - } - im = im.convertToFormat(QImage::Format_ARGB32); - if (FAILED(m_d3d_device->CreateTexture(im.width(), im.height(), 1, 0, - D3DFMT_A8R8G8B8, D3DPOOL_MANAGED, &pmData->texture, 0))) - { - qWarning("QDirect3DPaintEngine: unable to create Direct3D texture from pixmap."); - return; - } - D3DLOCKED_RECT rect; - if (FAILED(pmData->texture->LockRect(0, &rect, 0, 0))) { - qDebug() << "QDirect3DPaintEngine: unable to lock texture rect."; - return; - } - DWORD *dst = (DWORD *) rect.pBits; - DWORD *src = (DWORD *) im.scanLine(0); - - Q_ASSERT((rect.Pitch/4) == (im.bytesPerLine()/4)); - memcpy(dst, src, rect.Pitch*im.height()); - pmData->texture->UnlockRect(0); - } -} - -bool QDirect3DPaintEnginePrivate::isFastRect(const QRectF &rect) -{ - if (m_matrix.type() < QTransform::TxRotate) { - QRectF r = m_matrix.mapRect(rect); - return r.topLeft().toPoint() == r.topLeft() - && r.bottomRight().toPoint() == r.bottomRight(); - } - - return false; -} - -void QDirect3DPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode mode) -{ - switch(mode) { - case QPainter::CompositionMode_SourceOver: - default: - m_statemanager->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); - m_statemanager->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); - }; -} - -void QDirect3DPaintEnginePrivate::cleanup() -{ - // clean batch - for(int i=0; i<QD3D_BATCH_SIZE; ++i) { - m_batch.items[i].m_brush = QBrush(); - m_batch.items[i].m_pixmap = QPixmap(); - } - - m_surface_manager.cleanup(); - m_patterns.clear(); - - delete m_gradient_cache; - delete m_draw_helper; - - if (m_effect) - m_effect->Release(); - - if (m_d3d_object) - m_d3d_object->Release(); - - m_effect = 0; - m_d3d_object = 0; - m_gradient_cache = 0; - m_draw_helper = 0; -} - -void QDirect3DPaintEnginePrivate::flushAliased(QD3DBatchItem *item, int offset) -{ - m_draw_helper->drawAliasedMask(offset); - - if (item->m_info & QD3DBatchItem::BI_BRECT) { - int pass = (item->m_info & QD3DBatchItem::BI_MASK) ? PASS_STENCIL_DRAW_DIRECT : PASS_STENCIL_NOSTENCILCHECK_DIRECT; - if (item->m_info & (QD3DBatchItem::BI_COMPLEXBRUSH|QD3DBatchItem::BI_IMAGE|QD3DBatchItem::BI_PIXMAP) ) - pass = (item->m_info & QD3DBatchItem::BI_MASK) ? PASS_STENCIL_DRAW : PASS_STENCIL_NOSTENCILCHECK; - m_statemanager->beginPass(pass); - prepareItem(item); - m_draw_helper->drawAliasedBoundingRect(item); - cleanupItem(item); - m_statemanager->endPass(); - } -} - -void QDirect3DPaintEnginePrivate::flushText(QD3DBatchItem *item, int) -{ - prepareItem(item); - m_statemanager->setTexture(item->m_texture); - m_statemanager->setBrushMode(1); -// m_statemanager->SetRenderState(D3DRS_BLENDFACTOR, item->m_brush.color().rgba()); - m_statemanager->beginPass(m_cleartype_text ? PASS_CLEARTYPE_TEXT : PASS_TEXT); - m_draw_helper->drawTextItem(item); - m_statemanager->endPass(); - cleanupItem(item); -} - -void QDirect3DPaintEnginePrivate::flushLines(QD3DBatchItem *item, int) -{ - m_draw_helper->drawAliasedLines(item); - - if (item->m_info & QD3DBatchItem::BI_BRECT) { - int pass = (item->m_info & QD3DBatchItem::BI_COMPLEXBRUSH) ? PASS_STENCIL_DRAW : PASS_STENCIL_DRAW_DIRECT; - m_statemanager->beginPass(pass); - prepareItem(item); - m_draw_helper->drawAliasedBoundingRect(item); - cleanupItem(item); - m_statemanager->endPass(); - } -} - -void QDirect3DPaintEnginePrivate::flushBatch() -{ -// static int dbgcounter = 0; -// ++dbgcounter; -// qDebug() << " -> flush" << dbgcounter; - - int offset = 0; - m_draw_helper->unlockVertexBuffer(); - releaseDC(); - - // iterate over all items in the batch - while (offset != m_batch.m_item_index) { - QD3DBatchItem *item = &(m_batch.items[offset]); - - if (prepareBatch(item, offset)) { - ++offset; - continue; - } - - if (item->m_info & QD3DBatchItem::BI_FASTLINE) { - flushLines(item, offset++); - } else if (item->m_info & QD3DBatchItem::BI_AA) { - offset = flushAntialiased(offset); - } else if (item->m_info & QD3DBatchItem::BI_TEXT) { - flushText(item, offset++); - } else { - flushAliased(item, offset++); - } - } - - // reset batch - m_batch.m_item_index = 0; - - // release doomed textures - for (int i=0; i<qd3d_release_list.size(); ++i) - qd3d_release_list.at(i)->Release(); - qd3d_release_list.clear(); -} - -QDirect3DPaintEngine::QDirect3DPaintEngine() - : QPaintEngine(*(new QDirect3DPaintEnginePrivate), - PaintEngineFeatures(AllFeatures & ~ObjectBoundingModeGradients)) -{ } - -QDirect3DPaintEngine::~QDirect3DPaintEngine() -{ -} - -bool QDirect3DPaintEngine::begin(QPaintDevice *device) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::begin"; -#endif - Q_D(QDirect3DPaintEngine); - setActive(true); - - QSize old_size = d->m_surface_size; - d->m_surface_size = QRect(0, 0, device->width(), device->height()).size(); - - d->m_current_state = 0; - d->m_inv_scale = 1; - d->m_opacity = 1.0f; - d->m_opacity_color = D3DCOLOR_ARGB(255,255,255,255); - d->m_matrix = QTransform(); - d->m_brush_origin = QTransform(); - d->m_txop = QTransform::TxNone; - d->m_cmode = QPainter::CompositionMode_SourceOver; - - Q_ASSERT(device && device->devType() == QInternal::Widget); - if (d->m_d3d_device == 0) { - qWarning() << "QDirect3DPaintEngine: No Device!"; - return false; - } - - d->m_cleartype_text = false; -// QT_WA({ -// UINT result; -// BOOL ok; -// ok = SystemParametersInfoW(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0); -// if (ok) -// d->m_cleartype_text = (result == FE_FONTSMOOTHINGCLEARTYPE); -// }, { -// UINT result; -// BOOL ok; -// ok = SystemParametersInfoA(SPI_GETFONTSMOOTHINGTYPE, 0, &result, 0); -// if (ok) -// d->m_cleartype_text = (result == FE_FONTSMOOTHINGCLEARTYPE); -// }); - - d->m_surface_manager.setPaintDevice(device); - int status = d->m_surface_manager.status(); - if (status & QD3DSurfaceManager::NeedsResetting) { - d->m_effect->OnLostDevice(); - d->m_draw_helper->beforeReset(); - d->m_statemanager->reset(); - d->m_surface_manager.reset(); - d->m_draw_helper->afterReset(); - d->m_effect->OnResetDevice(); - d->initDevice(); - } - - LPDIRECT3DSURFACE9 newsurface = d->m_surface_manager.renderTarget(); - if (d->m_current_surface != newsurface) { - d->m_current_surface = newsurface; - if (FAILED(d->m_d3d_device->SetRenderTarget(0, newsurface))) - qWarning() << "QDirect3DPaintEngine: SetRenderTarget failed!"; - } - - status = d->m_surface_manager.status(); - if (status & QD3DSurfaceManager::MaxSizeChanged) { - QSize maxsize = d->m_surface_manager.maxSize(); - d->m_draw_helper->setMaskSize(maxsize); - int masksize[2] = {maxsize.width(), maxsize.height()}; - d->m_effect->SetIntArray("g_mMaskSize", masksize, 2); - } - - if (old_size != d->m_surface_size) { - D3DXMATRIX projMatrix; - pD3DXMatrixOrthoOffCenterLH(&projMatrix, 0, d->m_surface_size.width(), d->m_surface_size.height(), 0, 0.0f, 1.0f); - d->m_statemanager->setProjection(&projMatrix); - } - - if (!d->m_in_scene) { - if (FAILED(d->m_d3d_device->BeginScene())) { - qWarning() << "QDirect3DPaintEngine: BeginScene() failed."; - return false; - } - QWidget *widget = static_cast<QWidget *>(device); - if (widget->autoFillBackground() == true) { - QColor color = widget->palette().brush(widget->backgroundRole()).color(); - RECT rect = {0, 0, widget->width(), widget->height()}; - d->m_d3d_device->ColorFill(d->m_current_surface, &rect, - D3DCOLOR_ARGB(color.alpha(), color.red(), color.green(), color.blue())); - } - d->m_in_scene = true; - } - - // set system clip - d->m_clipping_enabled = false; - d->m_has_complex_clipping = false; - - d->m_sysclip_region = systemClip(); - QVector<QRect> rects = d->m_sysclip_region.rects(); - if (rects.count() == 1 && rects.at(0).size() == d->m_surface_size) - d->m_sysclip_region = QRegion(); - - d->updateClipRegion(QRegion(), Qt::NoClip); - - return true; -} - -void QDirect3DPaintEngine::drawEllipse(const QRectF &rect) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawEllipse (float)"; -#endif - QPaintEngine::drawEllipse(rect); -} - -void QDirect3DPaintEngine::drawEllipse(const QRect &rect) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawEllipse"; -#endif - QPaintEngine::drawEllipse(rect); -} - -void QDirect3DPaintEngine::drawImage(const QRectF &r, const QImage &image, const QRectF &sr, - Qt::ImageConversionFlags) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawImage"; -#endif - - Q_D(QDirect3DPaintEngine); - int width = image.width(); - int height = image.height(); - - // transform rectangle - QPolygonF txrect(QRectF(sr.left() / width, sr.top() / height, - sr.width() / width, sr.height() / height)); - - QD3DBatchItem *item = d->nextBatchItem(); - item->m_info = QD3DBatchItem::BI_IMAGE | QD3DBatchItem::BI_TRANSFORM; - item->m_texture = qd3d_image_cache()->lookup(d->m_d3d_device, image); - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueRect(r.adjusted(-0.5f,-0.5f,-0.5f,-0.5f), item, d->m_opacity_color, txrect); -} - -void QDirect3DPaintEngine::drawLines(const QLineF *lines, int lineCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawLines (float)"; -#endif - Q_D(QDirect3DPaintEngine); - - if (!d->m_has_pen) - return; - - if (d->m_has_fast_pen && (d->m_pen_brush_style == Qt::SolidPattern)) { - QD3DBatchItem *item = d->nextBatchItem(); - if (d->m_pen.isCosmetic()) - item->m_info |= QD3DBatchItem::BI_COSMETICPEN; - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueAliasedLines(lines, lineCount, &item); - } else { - QRectF brect; - QPainterPath path; - - // creates a path with the lines - path.moveTo(lines[0].x1(), lines[0].y1()); - qreal lastx = lines[0].x2(); - qreal lasty = lines[0].y2(); - path.lineTo(lastx, lasty); - - for (int i=1; i<lineCount; ++i) { - qreal x = lines[i].x1(); - qreal y = lines[i].y1(); - if (lastx != x || lasty != y) { - path.moveTo(x, y); - } - path.lineTo(lines[i].x2(), lines[i].y2()); - } - - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - d->strokePath(path, brect, true); - } -} - -void QDirect3DPaintEngine::drawLines(const QLine *lines, int lineCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawLines"; -#endif - QPaintEngine::drawLines(lines, lineCount); -} - -void QDirect3DPaintEngine::drawPath(const QPainterPath &path) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPath"; -#endif - Q_D(QDirect3DPaintEngine); - - if (path.isEmpty()) - return; - - QRectF brect; - QPainterPath tpath; - - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - tpath = d->m_matrix.map(path); - } else { - tpath = path; - } - - if (d->m_has_brush) - d->fillPath(tpath, brect); - - if (d->m_has_pen) - d->strokePath(tpath, brect); -} - - -QPointF QDirect3DPaintEnginePrivate::transformPoint(const QPointF &p, qreal *w) const -{ - (*w) = 1.0f; - qreal fx = p.x(); - qreal fy = p.y(); - qreal nx = m_matrix.m11()*fx + m_matrix.m21()*fy + m_matrix.m31(); - qreal ny = m_matrix.m12()*fx + m_matrix.m22()*fy + m_matrix.m32(); - if (!m_matrix.isAffine()) { - *w = m_matrix.m13()*fx + m_matrix.m23()*fy + m_matrix.m33(); - //*w = 1/(*w); - nx = nx/(*w); - ny = ny/(*w); - } - return QPointF(nx, ny); -} - -void QDirect3DPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPixmap"; -#endif - Q_D(QDirect3DPaintEngine); - - if (d->m_draw_helper->needsFlushing()) - d->flushBatch(); - - int width = pm.width(); - int height = pm.height(); - - // transform rectangle - QPolygonF txrect(QRectF(sr.left() / width, sr.top() / height, - sr.width() / width, sr.height() / height)); - - QD3DBatchItem *item = d->nextBatchItem(); - item->m_info = QD3DBatchItem::BI_PIXMAP|QD3DBatchItem::BI_TRANSFORM; - - item->m_pixmap = pm; - d->verifyTexture(item->m_pixmap); - - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueRect(r.adjusted(-0.5f,-0.5f,-0.5f,-0.5f), item, d->m_opacity_color, txrect); -} - -void QDirect3DPaintEngine::drawPoints(const QPointF *points, int pointCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPoints (float)"; -#endif - QPaintEngine::drawPoints(points, pointCount); -} - -void QDirect3DPaintEngine::drawPoints(const QPoint *points, int pointCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPoints"; -#endif - QPaintEngine::drawPoints(points, pointCount); -} - -void QDirect3DPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPolygon"; -#endif - Q_D(QDirect3DPaintEngine); - - if (d->m_has_brush && mode != PolylineMode) { - QPainterPath path; - path.setFillRule(mode == WindingMode ? Qt::WindingFill : Qt::OddEvenFill); - path.moveTo(points[0]); - for (int i=1; i<pointCount; ++i) - path.lineTo(points[i]); - if (path.isEmpty()) - return; - d->fillPath(path, QRectF()); - } - - if (d->m_has_pen) { - QPainterPath path(points[0]); - for (int i = 1; i < pointCount; ++i) - path.lineTo(points[i]); - if (mode != PolylineMode) - path.lineTo(points[0]); - - if (path.isEmpty()) - return; - QRectF brect; - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - d->strokePath(path, brect); - } -} - -void QDirect3DPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawPolygon"; -#endif - QPaintEngine::drawPolygon(points, pointCount, mode); -} - -void QDirect3DPaintEngine::drawRects(const QRectF *rects, int rectCount) -{ - Q_D(QDirect3DPaintEngine); -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawRects (float)"; -#endif - for (int i=0; i<rectCount; ++i) { - if ((d->m_brush_style == Qt::SolidPattern) && - (!(d->m_current_state & QD3DBatchItem::BI_AA) || d->isFastRect(rects[i]))) { - QD3DBatchItem *item = d->nextBatchItem(); - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_info &= ~QD3DBatchItem::BI_AA; - item->m_matrix = d->m_matrix; - const QRectF rect = rects[i]; - d->m_draw_helper->queueRect(rect, item, d->m_brush_color); - - if (d->m_has_pen) { - if (d->m_has_fast_pen && (d->m_pen_brush_style == Qt::SolidPattern)) { - QLineF lines[4]; - qreal x1 = rect.x(); - qreal y1 = rect.y(); - qreal x2 = rect.width() + x1; - qreal y2 = rect.height() + y1; - lines[0] = QLineF(x1, y1, x2, y1); - lines[1] = QLineF(x2, y1, x2, y2); - lines[2] = QLineF(x2, y2, x1, y2); - lines[3] = QLineF(x1, y2, x1, y1); - QD3DBatchItem *item = d->nextBatchItem(); - if (d->m_pen.isCosmetic()) - item->m_info |= QD3DBatchItem::BI_COSMETICPEN; - item->m_info |= QD3DBatchItem::BI_TRANSFORM; - item->m_matrix = d->m_matrix; - d->m_draw_helper->queueAliasedLines(lines, 4, &item); - } else { - QPainterPath path; - QRectF brect; - - path.addRect(rects[i]); - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - d->strokePath(path, brect, true); - } - } - } else { - QPainterPath path; - QRectF brect; - - path.addRect(rects[i]); - if (d->m_has_cosmetic_pen) { - brect = path.controlPointRect(); - path = d->m_matrix.map(path); - } - - if (d->m_has_brush) - d->fillPath(path, brect); - - if (d->m_has_pen) - d->strokePath(path, brect, true); - } - } -} - -void QDirect3DPaintEngine::drawRects(const QRect *rects, int rectCount) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawRects"; -#endif - QPaintEngine::drawRects(rects, rectCount); -} - - -void QDirect3DPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) -{ - Q_D(QDirect3DPaintEngine); - -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawTextItem"; -#endif -// if (d->m_matrix.isScaling() || (d->m_pen_brush_style >= Qt::LinearGradientPattern -// && d->m_pen_brush_style <= Qt::ConicalGradientPattern)) { -// QPaintEngine::drawTextItem(p, textItem); -// return; -// } - - const QTextItemInt &ti = static_cast<const QTextItemInt &>(textItem); - QVarLengthArray<QFixedPoint> positions; - QVarLengthArray<glyph_t> glyphs; - QTransform matrix; - matrix.translate(p.x(), p.y()); - ti.fontEngine->getGlyphPositions(ti.glyphs, matrix, ti.flags, glyphs, positions); - - qd3d_glyph_cache()->cacheGlyphs(this, ti, glyphs, d->m_cleartype_text); - QD3DFontTexture *font_tex = qd3d_glyph_cache()->fontTexture(ti.fontEngine); - - QD3DBatchItem *item = d->nextBatchItem(); - d->m_draw_helper->lockVertexBuffer(); - - item->m_info = QD3DBatchItem::BI_TEXT - | (d->m_current_state & ~QD3DBatchItem::BI_AA) | QD3DBatchItem::BI_TRANSFORM; - item->m_texture = font_tex->texture; - item->m_offset = d->m_draw_helper->index(); - item->m_matrix = d->m_matrix; - item->m_count = 0; - item->m_brush = d->m_pen.brush(); - - for (int i=0; i< glyphs.size(); ++i) { - QD3DGlyphCoord *g = qd3d_glyph_cache()->lookup(ti.fontEngine, glyphs[i]); - - // we don't cache glyphs with no width/height - if (!g) - continue; - - // texture coords - qreal tex_coords[] = { g->x, g->y, g->x + g->width, g->y + g->height }; - QPointF logical_pos(qRound((positions[i].x - g->x_offset).toReal()) - 0.5f, - qRound((positions[i].y + g->y_offset).toReal()) - 0.5f); - - QRectF glyph_rect(logical_pos, QSizeF(g->log_width, g->log_height)); - d->m_draw_helper->queueTextGlyph(glyph_rect, tex_coords, item, d->m_pen_color); - } -} - -void QDirect3DPaintEngine::drawTiledPixmap(const QRectF &rect, const QPixmap &pixmap, const QPointF &p) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::drawTiledPixmap"; -#endif - QPaintEngine::drawTiledPixmap(rect, pixmap, p); -} - -bool QDirect3DPaintEngine::end() -{ - Q_D(QDirect3DPaintEngine); - - d->flushBatch(); - - if (d->m_flush_on_end) { - QPaintDevice *pdev = paintDevice(); - LPDIRECT3DSWAPCHAIN9 swapchain = swapChain(pdev); - - - QWidget *w = 0; - if (pdev->devType() == QInternal::Widget) { - w = static_cast<QWidget *>(pdev); - } - - if (w && swapchain) { - QRect br = w->rect(); - QRect wbr = br;//.translated(-w->pos()); - - RECT destrect; - destrect.left = wbr.x(); - destrect.top = wbr.y(); - destrect.right = destrect.left + wbr.width(); - destrect.bottom = destrect.top + wbr.height(); - - RECT srcrect; - srcrect.left = br.x();// + w->x(); - srcrect.top = br.y();// + w->y(); - srcrect.right = wbr.width() + srcrect.left; - srcrect.bottom = wbr.height() + srcrect.top; - int devwidth = w->width(); - int devheight = w->height(); - - if (devwidth <= srcrect.right) { - int diff = srcrect.right - devwidth; - srcrect.right -= diff; - destrect.right -= diff; - if (srcrect.right <= srcrect.left) - return false; - } - if (devheight <= srcrect.bottom) { - int diff = srcrect.bottom - devheight; - srcrect.bottom -= diff; - destrect.bottom -= diff; - if (srcrect.bottom <= srcrect.top) - return false; - } - - if (FAILED(swapchain->Present(&srcrect, &destrect, w->winId(), 0, 0))) - qWarning("QDirect3DPaintEngine: failed to present back buffer."); - } - } - - - return true; -} - -void QDirect3DPaintEngine::updateState(const QPaintEngineState &state) -{ -#ifdef QT_DEBUG_D3D_CALLS - qDebug() << "QDirect3DPaintEngine::updateState"; -#endif - Q_D(QDirect3DPaintEngine); - - bool update_fast_pen = false; - DirtyFlags flags = state.state(); - - if (flags & DirtyOpacity) { - d->m_opacity = state.opacity(); - if (d->m_opacity > 1.0f) - d->m_opacity = 1.0f; - if (d->m_opacity < 0.f) - d->m_opacity = 0.f; - uint c = (d->m_opacity * 255); - d->m_opacity_color = D3DCOLOR_ARGB(c,c,c,c); - flags |= (DirtyPen | DirtyBrush); - } - - if (flags & DirtyCompositionMode) { - d->m_cmode = state.compositionMode(); - } - - if (flags & DirtyTransform) { - d->updateTransform(state.transform()); - update_fast_pen = true; - } - - if (flags & DirtyHints) { - if (state.renderHints() & QPainter::Antialiasing) - d->m_current_state |= QD3DBatchItem::BI_AA; - else - d->m_current_state &= ~QD3DBatchItem::BI_AA; - update_fast_pen = true; - } - - if (flags & DirtyFont) { - d->updateFont(state.font()); - } - - if (state.state() & DirtyClipEnabled) { - if (state.isClipEnabled() && !d->m_clipping_enabled) { - d->m_clipping_enabled = true; - if (d->m_has_complex_clipping) - d->updateClipPath(painter()->clipPath(), Qt::ReplaceClip); - else - d->updateClipRegion(painter()->clipRegion(), Qt::ReplaceClip); - } else if (!state.isClipEnabled() && d->m_clipping_enabled) { - d->m_clipping_enabled = false; - if (d->m_has_complex_clipping) - d->updateClipPath(QPainterPath(), Qt::NoClip); - else - d->updateClipRegion(QRegion(), Qt::NoClip); - } - } - - if (flags & DirtyClipRegion) { - d->updateClipRegion(state.clipRegion(), state.clipOperation()); - } - - if (flags & DirtyClipPath) { - d->updateClipPath(state.clipPath(), state.clipOperation()); - } - - if (flags & DirtyBrushOrigin) { - d->m_brush_origin = QTransform(); - d->m_brush_origin.translate(-state.brushOrigin().x(), - -state.brushOrigin().y()); - flags |= DirtyBrush; - } - - if (flags & DirtyPen) { - d->updatePen(state.pen()); - update_fast_pen = true; - } - - if (flags & DirtyBrush) - d->updateBrush(state.brush()); - - if (update_fast_pen && d->m_has_pen) { - if (d->m_current_state & QD3DBatchItem::BI_AA) { - d->m_has_fast_pen = false; - d->m_has_aa_fast_pen = ((d->m_txop <= QTransform::TxTranslate) || d->m_has_cosmetic_pen) - && (d->m_pen_width <= 1.0f) - && (d->m_pen.style() == Qt::SolidLine); - } else { - d->m_has_aa_fast_pen = false; - d->m_has_fast_pen = ((d->m_txop <= QTransform::TxTranslate) || d->m_has_cosmetic_pen) - && (d->m_pen.style() == Qt::SolidLine) - && (d->m_pen.capStyle() == Qt::SquareCap); - } - } -} - -void QDirect3DPaintEngine::cleanup() -{ - Q_D(QDirect3DPaintEngine); - d->cleanup(); -} - -void QDirect3DPaintEngine::scroll(QPaintDevice *pd, const RECT &srcrect, const RECT &destrect) -{ - Q_D(QDirect3DPaintEngine); - LPDIRECT3DSURFACE9 srcsurf = d->m_surface_manager.surface(pd); - LPDIRECT3DSURFACE9 masksurf = d->m_draw_helper->freeMaskSurface(); - if (FAILED(d->m_d3d_device->StretchRect(srcsurf, &srcrect, masksurf, &srcrect, D3DTEXF_NONE))) - qWarning("QDirect3DPaintEngine: StretchRect failed."); - if (FAILED(d->m_d3d_device->StretchRect(masksurf, &srcrect, srcsurf, &destrect, D3DTEXF_NONE))) - qWarning("QDirect3DPaintEngine: StretchRect failed."); -} - -LPDIRECT3DSWAPCHAIN9 QDirect3DPaintEngine::swapChain(QPaintDevice *pd) -{ - Q_D(QDirect3DPaintEngine); - - if (d->m_in_scene) { - if (d->m_d3d_device == 0) { - qWarning("QDirect3DPaintEngine: No device!"); - return false; - } - - d->setRenderTechnique(QDirect3DPaintEnginePrivate::RT_NoTechnique); - if (FAILED(d->m_d3d_device->EndScene())) - qWarning("QDirect3DPaintEngine: failed to end scene."); - - d->m_in_scene = false; - } - - return d->m_surface_manager.swapChain(pd); -} - -void QDirect3DPaintEngine::releaseSwapChain(QPaintDevice *pd) -{ - Q_D(QDirect3DPaintEngine); - d->m_surface_manager.releasePaintDevice(pd); -} - -HDC QDirect3DPaintEngine::getDC() const -{ - QDirect3DPaintEnginePrivate *d = const_cast<QDirect3DPaintEnginePrivate *>(d_func()); - - if (!d->m_dc && d->m_current_surface) { - d->m_dcsurface = d->m_current_surface; - if (FAILED(d->m_current_surface->GetDC(&d->m_dc))) - qWarning() << "QDirect3DPaintEngine::getDC() failed!"; - } - - return d->m_dc; -} - -void QDirect3DPaintEngine::setFlushOnEnd(bool flushOnEnd) -{ - Q_D(QDirect3DPaintEngine); - - d->m_flush_on_end = flushOnEnd; -} - -bool QDirect3DPaintEngine::hasDirect3DSupport() -{ - Q_D(QDirect3DPaintEngine); - return d->m_supports_d3d; -} - -QT_END_NAMESPACE - -#include "qpaintengine_d3d.moc" diff --git a/src/gui/painting/qpaintengine_d3d.fx b/src/gui/painting/qpaintengine_d3d.fx deleted file mode 100644 index 1148b2a..0000000 --- a/src/gui/painting/qpaintengine_d3d.fx +++ /dev/null @@ -1,608 +0,0 @@ -bool g_mCosmeticPen; -int4 g_mChannel; -float2 g_mMaskOffset; -int2 g_mMaskSize; -float4x4 g_mMaskProjection; -float4x4 g_mViewProjection; -float4x4 g_mTransformation; -texture g_mAAMask; -texture g_mTexture; -int g_mBrushMode; -float g_mFocalDist; - -#define M_PI 3.14159265358979323846 - -sampler PixmapSampler = sampler_state -{ - texture = <g_mTexture>; - MIPFILTER = NONE; - MINFILTER = LINEAR; - MAGFILTER = LINEAR; -}; - -sampler TextSampler = sampler_state -{ - texture = <g_mTexture>; - MIPFILTER = NONE; - MINFILTER = POINT; - MAGFILTER = POINT; -}; - -sampler AAMaskSampler = sampler_state -{ - texture = <g_mAAMask>; - AddressU = WRAP; - AddressV = WRAP; - AddressW = WRAP; - MIPFILTER = NONE; - MINFILTER = POINT; - MAGFILTER = POINT; -}; - -struct VS_FULL -{ - float4 Position : POSITION; - float4 Diffuse : COLOR0; - float4 TexCoords0 : TEXCOORD0; - float4 TexCoords1 : TEXCOORD1; -}; - -VS_FULL TrapezoidVS( float4 Position : POSITION, - float4 Diffuse : COLOR0, - float4 TexCoords0 : TEXCOORD0, - float4 TexCoords1 : TEXCOORD1) -{ - VS_FULL Output; - - float a = (TexCoords1.x * Position.x) + (TexCoords1.z * (1.0 - Position.x) ); // left or right a - float b = (TexCoords1.y * Position.x) + (TexCoords1.w * (1.0 - Position.x) ); // left or right b - float d = 1.0 - (Position.x * 2); - - Position.x = (a * Position.y + b) + ( sqrt( abs(a * a) ) * d ); - //Position.x += step(abs(a), 0) * d; - Position.x += (0.5 * d); - - Output.Position = mul(Position, g_mMaskProjection); - Output.Diffuse = Diffuse; - Output.TexCoords0 = TexCoords0; - Output.TexCoords1 = TexCoords1; - - return Output; -} - -struct PS_OUTPUT -{ - float4 Color : COLOR0; -}; - -PS_OUTPUT TrapezoidPS(VS_FULL In, float2 pixelPos : VPOS) -{ - PS_OUTPUT Out; - - float top = max(pixelPos.y - 0.5, In.TexCoords0.x); - float bottom = min(pixelPos.y + 0.5, In.TexCoords0.y); - - float area = bottom - top; - - float left = pixelPos.x - 0.5; - float right = pixelPos.x + 0.5; - - // use line equations to compute intersections of left/right edges with top/bottom of truncated pixel - // vecX: x = (left, top), y = (left, bottom), z = (right, top), w = (right, bottom) - float4 vecX = In.TexCoords1.xxzz * float2(top, bottom).xyxy + In.TexCoords1.yyww; - - float2 invA = In.TexCoords0.zw; - - // transform right line to left to be able to use same calculations for both - vecX.zw = 2 * pixelPos.x - vecX.zw; - - float2 topX = float2(vecX.x, vecX.z); - float2 bottomX = float2(vecX.y, vecX.w); - - // transform lines such that top intersection is to the right of bottom intersection - float2 topXTemp = max(topX, bottomX); - float2 bottomXTemp = min(topX, bottomX); - - // make sure line slope reflects mirrored lines - invA = lerp(invA, -invA, step(topX, bottomX)); - - float2 vecLeftRight = float2(left, right); - - // compute the intersections of the lines with the left and right edges of the pixel - // intersectY: x = (left_line, left), y = (left_line, right), z = (right_line, left), w = (right_line, right) - float4 intersectY = top + (vecLeftRight.xyxy - topXTemp.xxyy) * invA.xxyy; - - float2 temp = lerp(area - 0.5 * (right - bottomXTemp) * (bottom - intersectY.yw), // left < bottom < right < top - (0.5 * (topXTemp + bottomXTemp) - left) * area, // left < bottom < top < right - step(topXTemp, right)); - - float2 excluded = 0.5 * (intersectY.xz - top) * (topXTemp - left); // bottom < left < top < right - - excluded = lerp(0.5 * (intersectY.yw + intersectY.xz) - top, // bottom < left < right < top - excluded, step(topXTemp, right)); - - excluded = lerp(temp, // left < bottom < right (see calculation of temp) - excluded, step(bottomXTemp, left)); - - excluded = lerp(float2(area, area), // right < bottom < top - excluded, step(bottomXTemp, right)); - - excluded *= step(left, topXTemp); - - float result = (area - excluded.x - excluded.y) * step(top, bottom); - Out.Color.r = result * g_mChannel[0]; - Out.Color.g = result * g_mChannel[1]; - Out.Color.b = result * g_mChannel[2]; - Out.Color.a = result * g_mChannel[3]; - - return Out; -} - -VS_FULL ViewProjectionVS( float4 Position : POSITION, - float4 Diffuse : COLOR0, - float4 TexCoords0 : TEXCOORD0, - float4 TexCoords1 : TEXCOORD1) -{ - VS_FULL Output; - - Output.Position = mul(Position, g_mTransformation); - Output.Position = mul(Output.Position, g_mViewProjection); - Output.Diffuse = Diffuse; - Output.TexCoords0 = TexCoords0; - Output.TexCoords1 = TexCoords1; - - return Output; -} - -PS_OUTPUT DirectMaskPS(VS_FULL In, float2 pixelPos : VPOS) -{ - PS_OUTPUT Out; - Out.Color = In.Diffuse; - - float2 maskcoords = ( (pixelPos + g_mMaskOffset) - 0.5 ) / g_mMaskSize; - float2 clipcoords = (pixelPos - 0.5) / g_mMaskSize; - - float4 c = tex2D(AAMaskSampler, maskcoords.xy) * Out.Color.a; - Out.Color.a = c.r * g_mChannel[0]; - Out.Color.a += c.g * g_mChannel[1]; - Out.Color.a += c.b * g_mChannel[2]; - Out.Color.a += c.a * g_mChannel[3]; - - return Out; -} - -PS_OUTPUT MaskPS(VS_FULL In, float2 pixelPos : VPOS) -{ - PS_OUTPUT Out; - - if (g_mBrushMode == 1) { - float x = In.TexCoords0.x; - float y = In.TexCoords0.y; - x = x - int(x); - y = y - int(y); - Out.Color = tex2D(PixmapSampler, float2(x, y)); - Out.Color.a = Out.Color.a * In.Diffuse.a; - } else if (g_mBrushMode == 2) { - Out.Color = tex1D(PixmapSampler, In.TexCoords0.x); - } else if (g_mBrushMode == 3) { - float t = atan2(In.TexCoords0.y, -In.TexCoords0.x) / (2 * M_PI); - Out.Color = tex1D(PixmapSampler, t + 0.5); - } else if (g_mBrushMode == 4) { - float2 tc = float2(In.TexCoords0.x, abs(In.TexCoords0.y)); - float a = (tc.x - g_mFocalDist) / tc.y; - float b = g_mFocalDist; - - float A = 1 + (a * a); - float B = 2.0 * a * b; - float C = (b * b) - 1; - - float y = (-B + sqrt(B*B - 4.0*A*C)) / (2.0*A); - Out.Color = tex1D(PixmapSampler, (tc.y / y) ); - } else if (g_mBrushMode == 5) { - Out.Color = tex2D(PixmapSampler, In.TexCoords0.xy); - Out.Color = Out.Color * In.Diffuse; - } else { - Out.Color = In.Diffuse; - } - - float2 maskcoords = ( (pixelPos + g_mMaskOffset) - 0.5 ) / g_mMaskSize; - - float4 c = tex2D(AAMaskSampler, maskcoords.xy) * Out.Color.a; - Out.Color.a = c.r * g_mChannel[0]; - Out.Color.a += c.g * g_mChannel[1]; - Out.Color.a += c.b * g_mChannel[2]; - Out.Color.a += c.a * g_mChannel[3]; - - return Out; -} - -struct VS_NORMAL -{ - float4 Position : POSITION; - float4 Diffuse : COLOR0; - float4 TexCoords : TEXCOORD0; -}; - -VS_NORMAL MaskProjectionVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - Output.Position = mul(In.Position, g_mMaskProjection); - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - -float4 DirectSimplePS(float4 Color : COLOR0) : COLOR0 -{ - return Color; -} - -float4 SimplePS(float4 Color : COLOR0, float4 TexCoords : TEXCOORD0) : COLOR0 -{ - if (g_mBrushMode == 1) { - float opacity = Color.a; - float x = TexCoords.x; - float y = TexCoords.y; - x = x - int(x); - y = y - int(y); - Color = tex2D(PixmapSampler, float2(x, y)); - Color.a = Color.a * opacity; - } else if (g_mBrushMode == 2) { - Color = tex1D(PixmapSampler, TexCoords.x); - } else if (g_mBrushMode == 3) { - float t = atan2(TexCoords.y, -TexCoords.x) / (2 * M_PI); - Color = tex1D(PixmapSampler, t + 0.5); - } else if (g_mBrushMode == 4) { - float2 tc = float2(TexCoords.x, abs(TexCoords.y)); - float a = (tc.x - g_mFocalDist) / tc.y; - float b = g_mFocalDist; - - float A = 1 + (a * a); - float B = 2.0 * a * b; - float C = (b * b) - 1; - - float y = (-B + sqrt(B*B - 4.0*A*C)) / (2.0*A); - Color = tex1D(PixmapSampler, (tc.y / y) ); - } else if (g_mBrushMode == 5) { - Color = tex2D(PixmapSampler, TexCoords.xy) * Color; - } - - return Color; -} - -float4 TextPS(float4 Color : COLOR0, float4 TexCoords : TEXCOORD0) : COLOR0 -{ - Color.a *= tex2D(TextSampler, TexCoords.xy).a; - return Color; -} - -float4 ClearTypePS(float4 Color : COLOR0, float4 TexCoords : TEXCOORD0) : COLOR0 -{ -// if (g_mUsePixmap) { -// float4 MaskColor = tex2D(PixmapSampler, TexCoords.xy); -// Color = float4(1.0, 0.0, 0.0, 1.0); -// Color.a = (1 - MaskColor.a) + MaskColor.a * Color.a; -// Color.r = (1.0 - MaskColor.r) + (MaskColor.r * Color.r); -// Color.g = (1.0 - MaskColor.g) + (MaskColor.g * Color.g); -// Color.b = (1.0 - MaskColor.b) + (MaskColor.b * Color.b); -// Color = MaskColor; - return tex2D(PixmapSampler, TexCoords.xy); -} - -VS_NORMAL NoTxAliasedVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - Output.Position = mul(In.Position, g_mViewProjection); - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - -VS_NORMAL AliasedVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - Output.Position = mul(In.Position, g_mTransformation); - Output.Position = mul(Output.Position, g_mViewProjection); - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - -VS_NORMAL AliasedLinesVS(VS_NORMAL In) -{ - VS_NORMAL Output; - - float4 start = float4(In.Position.x, In.Position.y, 0.5, In.Position.w); - float4 end = float4(In.TexCoords.z, In.TexCoords.w, 0.5, In.Position.w); - if (g_mCosmeticPen) { - start = mul(start, g_mTransformation); - end = mul(end, g_mTransformation); - } - - float2 line_vec = end - start; - float2 vec = normalize(line_vec); - float2 norm = float2(-vec.y, vec.x); - - float pen_width = In.Position.z; - norm = norm * pen_width * 0.5; - vec = vec * pen_width * 0.5; - - Output.Position.w = In.Position.w; - Output.Position.x = start.x + (vec.x * In.TexCoords.x); - Output.Position.x = Output.Position.x + (norm.x * In.TexCoords.y); - Output.Position.x = Output.Position.x + (line_vec.x * step(0, In.TexCoords.x)); - Output.Position.y = start.y + (vec.y * In.TexCoords.x); - Output.Position.y = Output.Position.y + (norm.y * In.TexCoords.y); - Output.Position.y = Output.Position.y + (line_vec.y * step(0, In.TexCoords.x)); - Output.Position.z = 0.5; - - if (!g_mCosmeticPen) { - Output.Position = mul(Output.Position, g_mTransformation); - } - Output.Position = mul(Output.Position, g_mViewProjection); - - Output.Diffuse = In.Diffuse; - Output.TexCoords = In.TexCoords; - - return Output; -} - - -technique Antialiased -{ - pass PASS_AA_CREATEMASK - { - StencilEnable = False; - ZWriteEnable = False; - ColorWriteEnable = 0x0f; - ZEnable = False; - - SrcBlend = One; - DestBlend = One; - - VertexShader = compile vs_3_0 TrapezoidVS(); - PixelShader = compile ps_3_0 TrapezoidPS(); - } - - pass PASS_AA_DRAW - { - StencilEnable = False; - ZFunc = Greater; - ZWriteEnable = False; - ZEnable = True; - ColorWriteEnable = 0x0f; - - VertexShader = compile vs_3_0 ViewProjectionVS(); - PixelShader = compile ps_3_0 MaskPS(); - } - - pass PASS_AA_DRAW_DIRECT - { - StencilEnable = False; - ZFunc = Greater; - ZEnable = True; - ZWriteEnable = False; - ColorWriteEnable = 0x0f; - - VertexShader = compile vs_3_0 ViewProjectionVS(); - PixelShader = compile ps_3_0 DirectMaskPS(); - } -} - -technique Aliased -{ - pass PASS_STENCIL_ODDEVEN - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilPass = Invert; - StencilFunc = Always; - ColorWriteEnable = 0; - - ZEnable = False; - ZWriteEnable = False; - - VertexShader = compile vs_1_1 NoTxAliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_WINDING - { - TwoSidedStencilMode = True; - StencilEnable = True; - StencilRef = 0; - StencilMask = 0xFFFFFFFF; - - CCW_StencilPass = Incr; - CCW_StencilFunc = Always; - - StencilPass = Decr; - StencilFunc = Always; - - ColorWriteEnable = 0; - - ZEnable = False; - ZWriteEnable = False; - - VertexShader = compile vs_1_1 NoTxAliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_DRAW - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilFunc = NotEqual; - StencilMask = 0xFFFFFFFF; - StencilRef = 0; - StencilPass = Zero; - StencilFail = Zero; - StencilZFail = Zero; - - ColorWriteEnable = 0x0f; - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 SimplePS(); - } - - pass PASS_STENCIL_DRAW_DIRECT - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilFunc = NotEqual; - StencilMask = 0xFFFFFFFF; - StencilRef = 0; - StencilPass = Zero; - StencilFail = Zero; - StencilZFail = Zero; - - ColorWriteEnable = 0x0f; - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_CLIP - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilFunc = NotEqual; - StencilMask = 0xFFFFFFFF; - StencilRef = 0; - StencilPass = Zero; - StencilFail = Zero; - StencilZFail = Zero; - - ColorWriteEnable = 0; - ZEnable = True; - ZWriteEnable = True; - ZFunc = Always; - - VertexShader = compile vs_1_1 NoTxAliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_STENCIL_NOSTENCILCHECK - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 SimplePS(); - } - - pass PASS_STENCIL_NOSTENCILCHECK_DIRECT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_TEXT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedVS(); - PixelShader = compile ps_2_0 TextPS(); - } - - pass PASS_CLEARTYPE_TEXT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - -// SrcBlend = SrcAlpha; -// DestBlend = InvSrcAlpha; - -// SrcBlend = DestColor; -// DestBlend = Zero; - SrcBlend = BlendFactor; - DestBlend = InvSrcColor; - -// SrcBlend = Zero; -// DestBlend = SrcColor; - -// SrcBlend = One; -// DestBlend = Zero; - - VertexShader = compile vs_3_0 AliasedVS(); - PixelShader = compile ps_3_0 ClearTypePS(); - } - - pass PASS_ALIASED_LINES - { - TwoSidedStencilMode = False; - StencilEnable = True; - StencilPass = Invert; - StencilFunc = Always; - ColorWriteEnable = 0; - - ZEnable = False; - ZWriteEnable = False; - - VertexShader = compile vs_1_1 AliasedLinesVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } - - pass PASS_ALIASED_LINES_DIRECT - { - StencilEnable = False; - - ZEnable = True; - ZWriteEnable = False; - ZFunc = Greater; - - ColorWriteEnable = 0x0f; - - SrcBlend = SrcAlpha; - DestBlend = InvSrcAlpha; - - VertexShader = compile vs_1_1 AliasedLinesVS(); - PixelShader = compile ps_2_0 DirectSimplePS(); - } -} - diff --git a/src/gui/painting/qpaintengine_d3d.qrc b/src/gui/painting/qpaintengine_d3d.qrc deleted file mode 100644 index c106f2b..0000000 --- a/src/gui/painting/qpaintengine_d3d.qrc +++ /dev/null @@ -1,5 +0,0 @@ -<!DOCTYPE RCC><RCC version="1.0"> -<qresource> - <file>qpaintengine_d3d.fx</file> -</qresource> -</RCC> diff --git a/src/gui/painting/qpaintengine_d3d_p.h b/src/gui/painting/qpaintengine_d3d_p.h deleted file mode 100644 index 8fa5cf6..0000000 --- a/src/gui/painting/qpaintengine_d3d_p.h +++ /dev/null @@ -1,120 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QPAINTENGINE_D3D_P_H -#define QPAINTENGINE_D3D_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include "QtGui/qpaintengine.h" -#include <d3d9.h> - -QT_BEGIN_NAMESPACE - -class QDirect3DPaintEnginePrivate; -class QDirect3DPaintEngine : public QPaintEngine -{ - Q_DECLARE_PRIVATE(QDirect3DPaintEngine) -public: - QDirect3DPaintEngine(); - ~QDirect3DPaintEngine(); - bool begin(QPaintDevice *device); - - void drawEllipse(const QRectF &rect); - void drawEllipse(const QRect &rect); - - void drawImage(const QRectF &rectangle, const QImage &image, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor); - - void drawLines(const QLineF *lines, int lineCount); - void drawLines(const QLine *lines, int lineCount); - - void drawPath(const QPainterPath &path); - - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr); - - void drawPoints(const QPointF *points, int pointCount); - void drawPoints(const QPoint *points, int pointCount); - - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode); - - void drawRects(const QRectF *rects, int rectCount); - void drawRects(const QRect * rects, int rectCount); - - void drawTextItem(const QPointF &p, const QTextItem &textItem); - - void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr); - - bool end(); - - Type type() const { return Direct3D; } - void updateState(const QPaintEngineState &state); - - void cleanup(); - - HDC getDC() const; - void setFlushOnEnd(bool flushOnEnd); - bool hasDirect3DSupport(); - -public: - void scroll(QPaintDevice *pd, const RECT &srcrect, const RECT &destrect); - LPDIRECT3DSWAPCHAIN9 swapChain(QPaintDevice *pd); - void releaseSwapChain(QPaintDevice *pd); - -private: - Q_DISABLE_COPY(QDirect3DPaintEngine) - friend class QPixmap; - friend class QD3DGlyphCache; -}; - -QT_END_NAMESPACE - -#endif diff --git a/src/gui/painting/qpaintengine_p.h b/src/gui/painting/qpaintengine_p.h index eeba7ec..0b5e175 100644 --- a/src/gui/painting/qpaintengine_p.h +++ b/src/gui/painting/qpaintengine_p.h @@ -83,10 +83,12 @@ public: if (systemClip.isEmpty()) return; - if (systemTransform.type() <= QTransform::TxTranslate) - systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy())); - else - systemClip = systemTransform.map(systemClip); + if (hasSystemTransform) { + if (systemTransform.type() <= QTransform::TxTranslate) + systemClip.translate(qRound(systemTransform.dx()), qRound(systemTransform.dy())); + else + systemClip = systemTransform.map(systemClip); + } // Make sure we're inside the viewport. if (hasSystemViewport) { @@ -101,7 +103,7 @@ public: inline void setSystemTransform(const QTransform &xform) { systemTransform = xform; - if ((hasSystemTransform = !xform.isIdentity())) + if ((hasSystemTransform = !xform.isIdentity()) || hasSystemViewport) transformSystemClip(); systemStateChanged(); } diff --git a/src/gui/painting/qpaintengine_raster.cpp b/src/gui/painting/qpaintengine_raster.cpp index d2b1ed7..295abc5 100644 --- a/src/gui/painting/qpaintengine_raster.cpp +++ b/src/gui/painting/qpaintengine_raster.cpp @@ -4409,6 +4409,9 @@ void QClipData::fixup() */ void QClipData::setClipRect(const QRect &rect) { + if (rect == clipRect) + return; + // qDebug() << "setClipRect" << clipSpanHeight << count << allocated << rect; hasRectClip = true; clipRect = rect; @@ -4418,6 +4421,11 @@ void QClipData::setClipRect(const QRect &rect) ymin = qMin(rect.y(), clipSpanHeight); ymax = qMin(rect.y() + rect.height(), clipSpanHeight); + if (m_spans) { + delete m_spans; + m_spans = 0; + } + // qDebug() << xmin << xmax << ymin << ymax; } @@ -4441,6 +4449,12 @@ void QClipData::setClipRegion(const QRegion ®ion) ymin = rect.y(); ymax = rect.y() + rect.height(); } + + if (m_spans) { + delete m_spans; + m_spans = 0; + } + } /*! diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index caed293..d9c7937 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -5167,6 +5167,9 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) Q_D(QPainter); + if (!d->engine) + return; + #ifndef QT_NO_DEBUG qt_painter_thread_test(d->device->devType(), "drawPixmap()"); #endif @@ -5176,9 +5179,6 @@ void QPainter::drawPixmap(const QPointF &p, const QPixmap &pm) return; } - if (!d->engine) - return; - qreal x = p.x(); qreal y = p.y(); diff --git a/src/gui/painting/qprintengine_win.cpp b/src/gui/painting/qprintengine_win.cpp index c8674b7..7601beb 100644 --- a/src/gui/painting/qprintengine_win.cpp +++ b/src/gui/painting/qprintengine_win.cpp @@ -1532,7 +1532,7 @@ QVariant QWin32PrintEngine::property(PrintEnginePropertyKey key) const value = rect; } else { value = QTransform(1/d->stretch_x, 0, 0, 1/d->stretch_y, 0, 0) - .mapRect(d->fullPage ? d->devPaperRect : d->devPageRect); + .mapRect(d->fullPage ? d->devPhysicalPageRect : d->devPageRect); } break; diff --git a/src/gui/painting/qprinter.cpp b/src/gui/painting/qprinter.cpp index 4f3e71c..5161e32 100644 --- a/src/gui/painting/qprinter.cpp +++ b/src/gui/painting/qprinter.cpp @@ -834,11 +834,15 @@ void QPrinter::setPrinterName(const QString &name) #endif QList<QPrinterInfo> prnList = QPrinterInfo::availablePrinters(); - d->validPrinter = false; - for (int i = 0; i < prnList.size(); ++i) { - if (prnList[i].printerName() == name) { - d->validPrinter = true; - break; + if (name.isEmpty()) { + d->validPrinter = d->outputFormat == QPrinter::PdfFormat || d->outputFormat == QPrinter::PostScriptFormat; + } else { + d->validPrinter = false; + for (int i = 0; i < prnList.size(); ++i) { + if (prnList[i].printerName() == name) { + d->validPrinter = true; + break; + } } } diff --git a/src/gui/painting/qwindowsurface_d3d.cpp b/src/gui/painting/qwindowsurface_d3d.cpp deleted file mode 100644 index 2b7f633..0000000 --- a/src/gui/painting/qwindowsurface_d3d.cpp +++ /dev/null @@ -1,169 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -//#define D3D_DEBUG_BACKBUFFER - -#include <QtGui/QPaintDevice> -#include <QtGui/QWidget> -#include "qdebug.h" - -#include "qpaintengine_d3d_p.h" -#include "qwindowsurface_d3d_p.h" -#include "private/qwidget_p.h" -#include "private/qbackingstore_p.h" - -#include <d3d9.h> - -QT_BEGIN_NAMESPACE - -extern QDirect3DPaintEngine *qt_d3dEngine(); - -struct QD3DWindowSurfacePrivate -{ - QSize m_lastSize; - QWidget *m_widget; -}; - -QD3DWindowSurface::QD3DWindowSurface(QWidget *window) - : QWindowSurface(window), d_ptr(new QD3DWindowSurfacePrivate) -{ - Q_ASSERT(window->isTopLevel()); - d_ptr->m_widget = window; -} - - -QD3DWindowSurface::~QD3DWindowSurface() -{ - delete d_ptr; -} - -QPaintDevice *QD3DWindowSurface::paintDevice() -{ - return d_ptr->m_widget; -} - - -void QD3DWindowSurface::flush(QWidget *widget, const QRegion &rgn, const QPoint &offset) -{ - QPoint wOffset = qt_qwidget_data(widget)->wrect.topLeft(); - - QDirect3DPaintEngine *engine = qt_d3dEngine(); - LPDIRECT3DSWAPCHAIN9 swapchain = engine->swapChain(d_ptr->m_widget); - - if (swapchain) { - QRect br = rgn.boundingRect(); - QRect wbr = br.translated(-wOffset); - - RECT destrect; - destrect.left = wbr.x(); - destrect.top = wbr.y(); - destrect.right = destrect.left + wbr.width(); - destrect.bottom = destrect.top + wbr.height(); - - RECT srcrect; - srcrect.left = br.x() + offset.x(); - srcrect.top = br.y() + offset.y(); - srcrect.right = wbr.width() + srcrect.left; - srcrect.bottom = wbr.height() + srcrect.top; - int devwidth = d_ptr->m_lastSize.width(); - int devheight = d_ptr->m_lastSize.height(); - - if (devwidth <= srcrect.right) { - int diff = srcrect.right - devwidth; - srcrect.right -= diff; - destrect.right -= diff; - if (srcrect.right <= srcrect.left) - return; - } - if (devheight <= srcrect.bottom) { - int diff = srcrect.bottom - devheight; - srcrect.bottom -= diff; - destrect.bottom -= diff; - if (srcrect.bottom <= srcrect.top) - return; - } - - if (FAILED(swapchain->Present(&srcrect, &destrect, widget->winId(), 0, 0))) - qWarning("QDirect3DPaintEngine: failed to present back buffer."); - -#ifdef D3D_DEBUG_BACKBUFFER - qDebug() << widget << srcrect.left << srcrect.top << wbr.width() << wbr.height() << "Dest: " << destrect.left << destrect.top; - IDirect3DSurface9 *surface; - swapchain->GetBackBuffer(0, D3DBACKBUFFER_TYPE_MONO, &surface); - QString filename("C:\\test.bmp"); - D3DXSaveSurfaceToFile(filename.utf16(), D3DXIFF_BMP, surface, 0, 0); - surface->Release(); -#endif - } -} - -void QD3DWindowSurface::setGeometry(const QRect &rect) -{ - if (rect.isEmpty()) - qt_d3dEngine()->releaseSwapChain(d_ptr->m_widget); - - d_ptr->m_lastSize = rect.size(); - QWindowSurface::setGeometry(rect); -} - - -bool QD3DWindowSurface::scroll(const QRegion &area, int dx, int dy) -{ - QDirect3DPaintEngine *engine = qt_d3dEngine(); - QRect rect = area.boundingRect(); - - RECT destrect; - destrect.left = rect.x()+dx; - destrect.top = rect.y()+dy; - destrect.right = rect.width() + destrect.left; - destrect.bottom = rect.height() + destrect.top; - - RECT srcrect; - srcrect.left = rect.x(); - srcrect.top = rect.y(); - srcrect.right = rect.width() + srcrect.left; - srcrect.bottom = rect.height() + srcrect.top; - - engine->scroll(d_ptr->m_widget, srcrect, destrect); - return true; -} - -QT_END_NAMESPACE diff --git a/src/gui/painting/qwindowsurface_d3d_p.h b/src/gui/painting/qwindowsurface_d3d_p.h deleted file mode 100644 index 9cdfe29..0000000 --- a/src/gui/painting/qwindowsurface_d3d_p.h +++ /dev/null @@ -1,84 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). -** Contact: Qt Software Information (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** No Commercial Usage -** This file contains pre-release code and may not be distributed. -** You may use this file in accordance with the terms and conditions -** contained in the either Technology Preview License Agreement or the -** Beta Release License Agreement. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 2.1 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 2.1 requirements -** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain -** additional rights. These rights are described in the Nokia Qt LGPL -** Exception version 1.0, included in the file LGPL_EXCEPTION.txt in this -** package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 3.0 as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL included in the -** packaging of this file. Please review the following information to -** ensure the GNU General Public License version 3.0 requirements will be -** met: http://www.gnu.org/copyleft/gpl.html. -** -** If you are unsure which license is appropriate for your use, please -** contact the sales department at qt-sales@nokia.com. -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QWINDOWSURFACE_D3D_P_H -#define QWINDOWSURFACE_D3D_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of the QLibrary class. This header file may change from -// version to version without notice, or even be removed. -// -// We mean it. -// - -#include <qglobal.h> -#include "private/qwindowsurface_p.h" - -QT_BEGIN_NAMESPACE - -class QPaintDevice; -class QPoint; -class QRegion; -class QWidget; -struct QD3DWindowSurfacePrivate; - -class QD3DWindowSurface : public QWindowSurface -{ -public: - QD3DWindowSurface(QWidget *widget); - ~QD3DWindowSurface(); - - QPaintDevice *paintDevice(); - void flush(QWidget *widget, const QRegion ®ion, const QPoint &offset); - void setGeometry(const QRect &rect); - bool scroll(const QRegion &area, int dx, int dy); - -private: - QD3DWindowSurfacePrivate *d_ptr; -}; - -QT_END_NAMESPACE - -#endif // QWINDOWSURFACE_D3D_P_H diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index acb8437..0842ec7 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -746,9 +746,9 @@ static void setupGtkFileChooser(GtkWidget* gtkFileChooser, QWidget *parent, foreach (const QString &rawfilter, filters) { GtkFileFilter *gtkFilter = QGtk::gtk_file_filter_new (); QString name = rawfilter.left(rawfilter.indexOf(QLatin1Char('('))); - QGtk::gtk_file_filter_set_name(gtkFilter, qPrintable(name)); - QStringList extensions = extract_filter(rawfilter); + QGtk::gtk_file_filter_set_name(gtkFilter, qPrintable(name.isEmpty() ? extensions.join(QLS(", ")) : name)); + foreach (const QString &fileExtension, extensions) { QGtk::gtk_file_filter_add_pattern (gtkFilter, qPrintable(fileExtension)); } diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index be80d37..f8ae1a6 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -2019,7 +2019,9 @@ void QCommonStyle::drawControl(ControlElement element, const QStyleOption *opt, : QIcon::Disabled); QPixmap tabIcon = tabV2.icon.pixmap(iconSize, (tabV2.state & State_Enabled) ? QIcon::Normal - : QIcon::Disabled); + : QIcon::Disabled, + (tabV2.state & State_Selected) ? QIcon::On + : QIcon::Off); int offset = 6; int left = opt->rect.left(); diff --git a/src/gui/styles/qgtkstyle.cpp b/src/gui/styles/qgtkstyle.cpp index b7fa575..ca71da2 100644 --- a/src/gui/styles/qgtkstyle.cpp +++ b/src/gui/styles/qgtkstyle.cpp @@ -951,14 +951,15 @@ void QGtkStyle::drawPrimitive(PrimitiveElement element, "interior-focus", &interior_focus, "focus-line-width", &focus_line_width, NULL); + // See https://bugzilla.mozilla.org/show_bug.cgi?id=405421 for info about this hack + g_object_set_data(G_OBJECT(gtkEntry), "transparent-bg-hint", GINT_TO_POINTER(TRUE)); + if (!interior_focus && option->state & State_HasFocus) rect.adjust(focus_line_width, focus_line_width, -focus_line_width, -focus_line_width); - gtkPainter.paintShadow(gtkEntry, "entry", rect, option->state & State_Enabled ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE, GTK_SHADOW_IN, gtkEntry->style, option->state & State_HasFocus ? QLS("focus") : QString()); - if (!interior_focus && option->state & State_HasFocus) gtkPainter.paintShadow(gtkEntry, "entry", option->rect, option->state & State_Enabled ? GTK_STATE_ACTIVE : GTK_STATE_INSENSITIVE, diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 5d08c58..e32c5e2 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -2649,6 +2649,9 @@ int QMacStyle::pixelMetric(PixelMetric metric, const QStyleOption *opt, const QW case PM_MenuHMargin: ret = 0; break; + case PM_ToolBarFrameWidth: + ret = 0; + break; default: ret = QWindowsStyle::pixelMetric(metric, opt, widget); break; @@ -3679,8 +3682,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter if (tb->toolButtonStyle != Qt::ToolButtonIconOnly) { needText = true; if (tb->toolButtonStyle == Qt::ToolButtonTextUnderIcon) { - pr.setHeight(pixmap.size().height() + 6); - cr.adjust(0, pr.bottom(), 0, -3); + pr.setHeight(pixmap.size().height()); + cr.adjust(0, pr.bottom() + 1, 0, 1); alignment |= Qt::AlignCenter; } else { pr.setWidth(pixmap.width() + 8); @@ -3688,7 +3691,7 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter alignment |= Qt::AlignLeft | Qt::AlignVCenter; } } - if (down) { + if (opt->state & State_Sunken) { pr.translate(shiftX, shiftY); pixmap = darkenPixmap(pixmap); } @@ -3718,7 +3721,8 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter } drawItemText(p, cr, alignment, pal, tb->state & State_Enabled, tb->text, role); - if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5 && down) { + if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5 && + (tb->state & State_Sunken)) { // Draw a "drop shadow" in earlier versions. drawItemText(p, cr.adjusted(0, 1, 0, 1), alignment, tb->palette, tb->state & State_Enabled, tb->text); @@ -4544,9 +4548,10 @@ void QMacStyle::drawControl(ControlElement ce, const QStyleOption *opt, QPainter case CE_ToolBar: { // For unified tool bars, draw nothing. if (w) { - if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(w->window())) + if (QMainWindow * mainWindow = qobject_cast<QMainWindow *>(w->window())) { if (mainWindow->unifiedTitleAndToolBarOnMac()) break; + } } // draw background gradient @@ -5270,6 +5275,7 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex if (const QStyleOptionToolButton *tb = qstyleoption_cast<const QStyleOptionToolButton *>(opt)) { if (widget && qobject_cast<QToolBar *>(widget->parentWidget())) { +// p->fillRect(tb->rect, QColor(155, 0, 155, 155)); if (tb->subControls & SC_ToolButtonMenu) { QStyleOption arrowOpt(0); arrowOpt.rect = subControlRect(cc, tb, SC_ToolButtonMenu, widget); @@ -5282,16 +5288,22 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex drawToolbarButtonArrow(tb->rect, tds, cg); } if (tb->state & State_On) { - QPen oldPen = p->pen(); - p->setPen(QColor(0, 0, 0, 0x3a)); - p->fillRect(tb->rect.adjusted(1, 1, -1, -1), QColor(0, 0, 0, 0x12)); - p->drawLine(tb->rect.left() + 1, tb->rect.top(), - tb->rect.right() - 1, tb->rect.top()); - p->drawLine(tb->rect.left() + 1, tb->rect.bottom(), - tb->rect.right() - 1, tb->rect.bottom()); - p->drawLine(tb->rect.topLeft(), tb->rect.bottomLeft()); - p->drawLine(tb->rect.topRight(), tb->rect.bottomRight()); - p->setPen(oldPen); + if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_5) { + static QPixmap pm(QLatin1String(":/trolltech/mac/style/images/leopard-unified-toolbar-on.png")); + p->setRenderHint(QPainter::SmoothPixmapTransform); + QStyleHelper::drawBorderPixmap(pm, p, tb->rect, 2, 2, 2, 2); + } else { + QPen oldPen = p->pen(); + p->setPen(QColor(0, 0, 0, 0x3a)); + p->fillRect(tb->rect.adjusted(1, 1, -1, -1), QColor(0, 0, 0, 0x12)); + p->drawLine(tb->rect.left() + 1, tb->rect.top(), + tb->rect.right() - 1, tb->rect.top()); + p->drawLine(tb->rect.left() + 1, tb->rect.bottom(), + tb->rect.right() - 1, tb->rect.bottom()); + p->drawLine(tb->rect.topLeft(), tb->rect.bottomLeft()); + p->drawLine(tb->rect.topRight(), tb->rect.bottomRight()); + p->setPen(oldPen); + } } drawControl(CE_ToolButtonLabel, opt, p, widget); } else { @@ -6009,6 +6021,14 @@ QSize QMacStyle::sizeFromContents(ContentsType ct, const QStyleOption *opt, } break; case CT_ToolButton: + if (widget && qobject_cast<const QToolBar *>(widget->parentWidget())) { + sz.rwidth() += 4; + if (sz.height() <= 32) { + // Workaround strange HIToolBar bug when getting constraints. + sz.rheight() += 1; + } + return sz; + } sz.rwidth() += 10; sz.rheight() += 10; return sz; diff --git a/src/gui/styles/qstylehelper.cpp b/src/gui/styles/qstylehelper.cpp index 3320970..69f8cd2 100644 --- a/src/gui/styles/qstylehelper.cpp +++ b/src/gui/styles/qstylehelper.cpp @@ -50,9 +50,10 @@ QT_BEGIN_NAMESPACE -const bool QStyleHelper::UsePixmapCache = true; +namespace QStyleHelper { +const bool UsePixmapCache = true; -QString QStyleHelper::uniqueName(const QString &key, const QStyleOption *option, const QSize &size) +QString uniqueName(const QString &key, const QStyleOption *option, const QSize &size) { QString tmp; const QStyleOptionComplex *complexOption = qstyleoption_cast<const QStyleOptionComplex *>(option); @@ -74,7 +75,7 @@ QString QStyleHelper::uniqueName(const QString &key, const QStyleOption *option, #ifndef QT_NO_DIAL -int QStyleHelper::calcBigLineSize(int radius) +int calcBigLineSize(int radius) { int bigLineSize = radius / 6; if (bigLineSize < 4) @@ -107,7 +108,7 @@ static QPointF calcRadialPos(const QStyleOptionSlider *dial, qreal offset) return pos; } -qreal QStyleHelper::angle(const QPointF &p1, const QPointF &p2) +qreal angle(const QPointF &p1, const QPointF &p2) { static const qreal rad_factor = 180 / Q_PI; qreal _angle = 0; @@ -139,7 +140,7 @@ qreal QStyleHelper::angle(const QPointF &p1, const QPointF &p2) return _angle; } -QPolygonF QStyleHelper::calcLines(const QStyleOptionSlider *dial) +QPolygonF calcLines(const QStyleOptionSlider *dial) { QPolygonF poly; int width = dial->rect.width(); @@ -182,7 +183,7 @@ QPolygonF QStyleHelper::calcLines(const QStyleOptionSlider *dial) // This will draw a nice and shiny QDial for us. We don't want // all the shinyness in QWindowsStyle, hence we place it here -void QStyleHelper::drawDial(const QStyleOptionSlider *option, QPainter *painter) +void drawDial(const QStyleOptionSlider *option, QPainter *painter) { QPalette pal = option->palette; QColor buttonColor = pal.button().color(); @@ -292,4 +293,61 @@ void QStyleHelper::drawDial(const QStyleOptionSlider *option, QPainter *painter) } #endif //QT_NO_DIAL +void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, + int left, int top, int right, + int bottom) +{ + QSize size = pixmap.size(); + //painter->setRenderHint(QPainter::SmoothPixmapTransform); + + //top + if (top > 0) { + painter->drawPixmap(QRect(rect.left() + left, rect.top(), rect.width() -right - left, top), pixmap, + QRect(left, 0, size.width() -right - left, top)); + + //top-left + if(left > 0) + painter->drawPixmap(QRect(rect.left(), rect.top(), left, top), pixmap, + QRect(0, 0, left, top)); + + //top-right + if (right > 0) + painter->drawPixmap(QRect(rect.left() + rect.width() - right, rect.top(), right, top), pixmap, + QRect(size.width() - right, 0, right, top)); + } + + //left + if (left > 0) + painter->drawPixmap(QRect(rect.left(), rect.top()+top, left, rect.height() - top - bottom), pixmap, + QRect(0, top, left, size.height() - bottom - top)); + + //center + painter->drawPixmap(QRect(rect.left() + left, rect.top()+top, rect.width() -right - left, + rect.height() - bottom - top), pixmap, + QRect(left, top, size.width() -right -left, + size.height() - bottom - top)); + //right + if (right > 0) + painter->drawPixmap(QRect(rect.left() +rect.width() - right, rect.top()+top, right, rect.height() - top - bottom), pixmap, + QRect(size.width() - right, top, right, size.height() - bottom - top)); + + //bottom + if (bottom > 0) { + painter->drawPixmap(QRect(rect.left() +left, rect.top() + rect.height() - bottom, + rect.width() - right - left, bottom), pixmap, + QRect(left, size.height() - bottom, + size.width() - right - left, bottom)); + //bottom-left + if (left > 0) + painter->drawPixmap(QRect(rect.left(), rect.top() + rect.height() - bottom, left, bottom), pixmap, + QRect(0, size.height() - bottom, left, bottom)); + + //bottom-right + if (right > 0) + painter->drawPixmap(QRect(rect.left() + rect.width() - right, rect.top() + rect.height() - bottom, right, bottom), pixmap, + QRect(size.width() - right, size.height() - bottom, right, bottom)); + + } +} +} QT_END_NAMESPACE diff --git a/src/gui/styles/qstylehelper_p.h b/src/gui/styles/qstylehelper_p.h index d9b2e28..711bd2d 100644 --- a/src/gui/styles/qstylehelper_p.h +++ b/src/gui/styles/qstylehelper_p.h @@ -19,6 +19,7 @@ QT_BEGIN_NAMESPACE class QPainter; +class QPixmap; class QStyleOptionSlider; class QStyleOption; @@ -32,6 +33,9 @@ namespace QStyleHelper int calcBigLineSize(int radius); void drawDial(const QStyleOptionSlider *dial, QPainter *painter); #endif //QT_NO_DIAL + void drawBorderPixmap(const QPixmap &pixmap, QPainter *painter, const QRect &rect, + int left = 0, int top = 0, int right = 0, + int bottom = 0); } QT_END_NAMESPACE diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 49ac57a..f480008 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -2876,12 +2876,6 @@ void QStyleSheetStyle::polish(QWidget *w) QRenderRule rule = renderRule(w, PseudoElement_None, PseudoClass_Any); if (rule.hasDrawable() || rule.hasBox()) { if (w->metaObject() == &QWidget::staticMetaObject -#ifndef QT_NO_MENUBAR - || qobject_cast<QMenuBar *>(w) -#endif -#ifndef QT_NO_MENU - || qobject_cast<QMenu *>(w) -#endif #ifndef QT_NO_ITEMVIEWS || qobject_cast<QHeaderView *>(w) #endif @@ -4164,9 +4158,8 @@ void QStyleSheetStyle::drawControl(ControlElement ce, const QStyleOption *opt, Q rule.configurePalette(&frmOpt.palette, QPalette::Text, QPalette::Base); frmOpt.rect = rule.borderRect(frmOpt.rect); baseStyle()->drawControl(ce, &frmOpt, p, w); - } else { - rule.drawBorder(p, rule.borderRect(opt->rect)); } + // else, borders are already drawn in PE_Widget } return; @@ -4220,12 +4213,6 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op QRect rect = opt->rect; switch (pe) { - case PE_PanelStatusBar: - if (rule.hasDrawable()) { - rule.drawRule(p, opt->rect); - return; - } - break; case PE_FrameStatusBar: { QRenderRule subRule = renderRule(w->parentWidget(), opt, PseudoElement_Item); @@ -4337,36 +4324,34 @@ void QStyleSheetStyle::drawPrimitive(PrimitiveElement pe, const QStyleOption *op return; case PE_Widget: - if (!rule.hasBackground()) { + if (!rule.hasDrawable()) { QWidget *container = containerWidget(w); if (autoFillDisabledWidgets->contains(container) - && (container == w || !renderRule(container, opt).hasBackground())) { + && (container == w || !renderRule(container, opt).hasDrawable())) { //we do not have a background, but we disabled the autofillbackground anyway. so fill the background now. // (this may happen if we have rules like :focus) p->fillRect(opt->rect, opt->palette.brush(w->backgroundRole())); } break; } - #ifndef QT_NO_SCROLLAREA if (const QAbstractScrollArea *sa = qobject_cast<const QAbstractScrollArea *>(w)) { const QAbstractScrollAreaPrivate *sap = sa->d_func(); rule.drawBackground(p, opt->rect, sap->contentsOffset()); - } else -#endif - { - rule.drawBackground(p, opt->rect); + if (rule.hasBorder()) + rule.drawBorder(p, rule.borderRect(opt->rect)); + break; } - - return; - - case PE_FrameMenu: +#endif + //fall tghought + case PE_PanelMenu: case PE_PanelMenuBar: - if (!rule.hasNativeBorder()) { - rule.drawBorder(p, rule.borderRect(opt->rect)); + case PE_PanelStatusBar: + if(rule.hasDrawable()) { + rule.drawRule(p, opt->rect); return; } - break; + break; case PE_IndicatorToolBarSeparator: case PE_IndicatorToolBarHandle: { @@ -5887,13 +5872,11 @@ void QStyleSheetStyle::clearWidgetFont(QWidget* w) const w->setProperty("_q_styleSheetWidgetFont", QVariant(QVariant::Invalid)); } -// Returns the palette that should be used when the particular widget is focused. -// This needs to be called by some widgets that do drawing themselves instead -// of through the style. -// ### This should be removed ideally by Qt 4.5, and at least by Qt 5, and fixed -// for good by letting the style draw everything. +// Polish palette that should be used for a particular widget, with particular states +// (eg. :focus, :hover, ...) +// this is called by widgets that paint themself in their paint event // Returns true if there is a new palette in pal. -bool QStyleSheetStyle::focusPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal) +bool QStyleSheetStyle::styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal) { if (!w || !opt || !pal) return false; diff --git a/src/gui/styles/qstylesheetstyle_p.h b/src/gui/styles/qstylesheetstyle_p.h index 1f61445..e057274 100644 --- a/src/gui/styles/qstylesheetstyle_p.h +++ b/src/gui/styles/qstylesheetstyle_p.h @@ -131,7 +131,7 @@ public: void saveWidgetFont(QWidget* w, const QFont& font) const; void clearWidgetFont(QWidget* w) const; - bool focusPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal); + bool styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal); protected Q_SLOTS: QIcon standardIconImplementation(StandardPixmap standardIcon, const QStyleOption *opt = 0, diff --git a/src/gui/widgets/qlabel.cpp b/src/gui/widgets/qlabel.cpp index 63c1315..016b7c1 100644 --- a/src/gui/widgets/qlabel.cpp +++ b/src/gui/widgets/qlabel.cpp @@ -971,6 +971,13 @@ void QLabel::paintEvent(QPaintEvent *) #endif if (d->isTextLabel) { QRectF lr = d->layoutRect(); + QStyleOption opt; + opt.initFrom(this); +#ifndef QT_NO_STYLE_STYLESHEET + if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style)) { + cssStyle->styleSheetPalette(this, &opt, &opt.palette); + } +#endif if (d->control) { #ifndef QT_NO_SHORTCUT const bool underline = (bool)style->styleHint(QStyle::SH_UnderlineShortcut, 0, this, 0); @@ -984,11 +991,9 @@ void QLabel::paintEvent(QPaintEvent *) d->ensureTextLayouted(); QAbstractTextDocumentLayout::PaintContext context; - QStyleOption opt(0); - opt.init(this); if (!isEnabled() && style->styleHint(QStyle::SH_EtchDisabledText, &opt, this)) { - context.palette = palette(); + context.palette = opt.palette; context.palette.setColor(QPalette::Text, context.palette.light().color()); painter.save(); painter.translate(lr.x() + 1, lr.y() + 1); @@ -999,12 +1004,7 @@ void QLabel::paintEvent(QPaintEvent *) } // Adjust the palette - context.palette = palette(); -#ifndef QT_NO_STYLE_STYLESHEET - if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style)) { - cssStyle->focusPalette(this, &opt, &context.palette); - } -#endif + context.palette = opt.palette; if (foregroundRole() != QPalette::Text && isEnabled()) context.palette.setColor(QPalette::Text, context.palette.color(foregroundRole())); @@ -1019,12 +1019,10 @@ void QLabel::paintEvent(QPaintEvent *) int flags = align; if (d->hasShortcut) { flags |= Qt::TextShowMnemonic; - QStyleOption opt; - opt.initFrom(this); if (!style->styleHint(QStyle::SH_UnderlineShortcut, &opt, this)) flags |= Qt::TextHideMnemonic; } - style->drawItemText(&painter, lr.toRect(), flags, palette(), isEnabled(), d->text, foregroundRole()); + style->drawItemText(&painter, lr.toRect(), flags, opt.palette, isEnabled(), d->text, foregroundRole()); } } else #ifndef QT_NO_PICTURE diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index e243ad0..d16ed10 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -2518,7 +2518,7 @@ void QLineEdit::paintEvent(QPaintEvent *) // draw text, selections and cursors #ifndef QT_NO_STYLE_STYLESHEET if (QStyleSheetStyle* cssStyle = qobject_cast<QStyleSheetStyle*>(style())) { - cssStyle->focusPalette(this, &panel, &pal); + cssStyle->styleSheetPalette(this, &panel, &pal); } #endif p.setPen(pal.text().color()); diff --git a/src/gui/widgets/qmainwindowlayout_mac.mm b/src/gui/widgets/qmainwindowlayout_mac.mm index c807afb..53e1ad5 100644 --- a/src/gui/widgets/qmainwindowlayout_mac.mm +++ b/src/gui/widgets/qmainwindowlayout_mac.mm @@ -502,11 +502,11 @@ void QMainWindowLayout::fixSizeInUnifiedToolbar(QToolBar *tb) const QMacCocoaAutoReleasePool pool; QWidgetItem layoutItem(tb); QSize size = layoutItem.maximumSize(); - NSSize nssize = NSMakeSize(size.width(), size.height()); + NSSize nssize = NSMakeSize(size.width(), size.height() - 2); [item setMaxSize:nssize]; size = layoutItem.minimumSize(); nssize.width = size.width(); - nssize.height = size.height(); + nssize.height = size.height() - 2; [item setMinSize:nssize]; } } diff --git a/src/gui/widgets/qtabbar.cpp b/src/gui/widgets/qtabbar.cpp index b562b1f..49de8c1 100644 --- a/src/gui/widgets/qtabbar.cpp +++ b/src/gui/widgets/qtabbar.cpp @@ -1941,8 +1941,10 @@ void QTabBar::changeEvent(QEvent *event) if (event->type() == QEvent::StyleChange) { d->elideMode = Qt::TextElideMode(style()->styleHint(QStyle::SH_TabBar_ElideMode, 0, this)); d->useScrollButtons = !style()->styleHint(QStyle::SH_TabBar_PreferNoArrows, 0, this); + d->refresh(); + } else if (event->type() == QEvent::FontChange) { + d->refresh(); } - d->refresh(); QWidget::changeEvent(event); } diff --git a/src/network/access/qhttpnetworkconnection.cpp b/src/network/access/qhttpnetworkconnection.cpp index 980c0e0..5940fba 100644 --- a/src/network/access/qhttpnetworkconnection.cpp +++ b/src/network/access/qhttpnetworkconnection.cpp @@ -265,6 +265,11 @@ bool QHttpNetworkConnectionPrivate::ensureConnection(QAbstractSocket *socket) if (socket->state() != QAbstractSocket::ConnectedState) { // connect to the host if not already connected. int index = indexOf(socket); + // resend this request after we receive the disconnected signal + if (socket->state() == QAbstractSocket::ClosingState) { + channels[index].resendCurrent = true; + return false; + } channels[index].state = ConnectingState; channels[index].pendingEncrypt = encrypt; @@ -982,6 +987,9 @@ void QHttpNetworkConnectionPrivate::_q_disconnected() channels[i].state = ReadingState; if (channels[i].reply) receiveReply(socket, channels[i].reply); + } else if (channels[i].state == IdleState && channels[i].resendCurrent) { + // re-sending request because the socket was in ClosingState + QMetaObject::invokeMethod(q, "_q_startNextRequest", Qt::QueuedConnection); } channels[i].state = IdleState; } diff --git a/src/network/socket/qlocalserver_unix.cpp b/src/network/socket/qlocalserver_unix.cpp index 065a9de..e7d2252 100644 --- a/src/network/socket/qlocalserver_unix.cpp +++ b/src/network/socket/qlocalserver_unix.cpp @@ -148,9 +148,11 @@ void QLocalServerPrivate::closeServer() QT_CLOSE(listenSocket); listenSocket = -1; - if (socketNotifier) + if (socketNotifier) { + socketNotifier->setEnabled(false); // Otherwise, closed socket is checked before deleter runs socketNotifier->deleteLater(); - socketNotifier = 0; + socketNotifier = 0; + } if (!fullServerName.isEmpty()) QFile::remove(fullServerName); diff --git a/src/network/socket/qlocalsocket_win.cpp b/src/network/socket/qlocalsocket_win.cpp index e759d0b..39c9284 100644 --- a/src/network/socket/qlocalsocket_win.cpp +++ b/src/network/socket/qlocalsocket_win.cpp @@ -298,7 +298,7 @@ qint64 QLocalSocketPrivate::bytesAvailable() if (PeekNamedPipe(handle, NULL, 0, NULL, &bytes, NULL)) { return bytes; } else { - if (ERROR_BROKEN_PIPE == GetLastError() && !pipeClosed) { + if (!pipeClosed) { pipeClosed = true; QTimer::singleShot(0, q, SLOT(_q_pipeClosed())); } diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index b8fa133..18d9125 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -2452,6 +2452,10 @@ bool QGLContext::create(const QGLContext* shareContext) return false; reset(); d->valid = chooseContext(shareContext); + if (d->valid && d->paintDevice->devType() == QInternal::Widget) { + QWidgetPrivate *wd = qt_widget_private(static_cast<QWidget *>(d->paintDevice)); + wd->usesDoubleBufferedGLContext = d->glFormat.doubleBuffer(); + } if (d->sharing) // ok, we managed to share qgl_share_reg()->addShare(this, shareContext); return d->valid; diff --git a/src/opengl/qwindowsurface_gl.cpp b/src/opengl/qwindowsurface_gl.cpp index 837ccf2..b41adf9 100644 --- a/src/opengl/qwindowsurface_gl.cpp +++ b/src/opengl/qwindowsurface_gl.cpp @@ -86,7 +86,7 @@ QT_BEGIN_NAMESPACE // QGLGraphicsSystem // #ifdef Q_WS_WIN -Q_GUI_EXPORT bool qt_win_owndc_required; +extern Q_GUI_EXPORT bool qt_win_owndc_required; #endif QGLGraphicsSystem::QGLGraphicsSystem() : QGraphicsSystem() diff --git a/src/plugins/gfxdrivers/directfb/directfb.pro b/src/plugins/gfxdrivers/directfb/directfb.pro index 89a289c..1ee9030 100644 --- a/src/plugins/gfxdrivers/directfb/directfb.pro +++ b/src/plugins/gfxdrivers/directfb/directfb.pro @@ -3,7 +3,7 @@ include(../../qpluginbase.pri) QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers -# These defines might be necessary if your DirectFB driver doesn't +# These defines might be necessary if your DirectFB driver doesn't # support all of the DirectFB API. # #DEFINES += QT_NO_DIRECTFB_WM @@ -14,6 +14,8 @@ QTDIR_build:DESTDIR = $$QT_BUILD_TREE/plugins/gfxdrivers #DEFINES += QT_NO_DIRECTFB_KEYBOARD #DEFINES += QT_DIRECTFB_TIMING #DEFINES += QT_NO_DIRECTFB_OPAQUE_DETECTION +#DEFINES += QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +#DEFINES += QT_DIRECTFB_DISABLE_RASTERFALLBACKS target.path = $$[QT_INSTALL_PLUGINS]/gfxdrivers INSTALLS += target diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp index cd19f69..368b9f9 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbkeyboard.cpp @@ -173,6 +173,22 @@ void QDirectFBKeyboardHandlerPrivate::readKeyboardData() Qt::KeyboardModifiers modifiers = Qt::NoModifier; + // Not implemented: + // if (input.modifiers & DIMM_SUPER) + // if (input.modifiers & DIMM_HYPER) + + if (!(input.flags & DIEF_KEYSYMBOL) || + !(input.flags & DIEF_KEYID) || + !(input.type & (DIET_KEYPRESS|DIET_KEYRELEASE))) + { + static bool first = true; + if (first) { + qWarning("QDirectFBKeyboardHandler - Getting unexpected non-keyboard related events"); + first = false; + } + break; + } + if (input.flags & DIEF_MODIFIERS) { if (input.modifiers & DIMM_SHIFT) modifiers |= Qt::ShiftModifier; @@ -185,31 +201,15 @@ void QDirectFBKeyboardHandlerPrivate::readKeyboardData() if (input.modifiers & DIMM_META) modifiers |= Qt::MetaModifier; } - // Not implemented: - // if (input.modifiers & DIMM_SUPER) - // if (input.modifiers & DIMM_HYPER) - if ( !(input.flags & DIEF_KEYSYMBOL) || - !(input.flags & DIEF_KEYID) || - !(input.type & (DIET_KEYPRESS | DIET_KEYRELEASE)) ) - { - static int warningCount = 0; - if (!warningCount) { - qWarning("QDirectFBKeyboardHandler - Getting unexpected non-keyboard related events"); - warningCount = 100; - } - else - warningCount--; - break; - } - bool press = input.type & DIET_KEYPRESS; + const bool press = input.type & DIET_KEYPRESS; DFBInputDeviceKeySymbol symbol = input.key_symbol; int unicode = -1; int keycode = 0; keycode = keymap()->value(symbol); - if (keycode == 0 && DFB_KEY_TYPE(symbol) == DIKT_UNICODE) + if (DFB_KEY_TYPE(symbol) == DIKT_UNICODE) unicode = symbol; if (unicode != -1 || keycode != 0) { @@ -314,6 +314,100 @@ KeyMap::KeyMap() insert(DIKS_DEAD_SEMIVOICED_SOUND , Qt::Key_Dead_Semivoiced_Sound); insert(DIKS_DEAD_TILDE , Qt::Key_Dead_Tilde); insert(DIKS_DEAD_VOICED_SOUND , Qt::Key_Dead_Voiced_Sound); + insert(DIKS_SPACE , Qt::Key_Space); + insert(DIKS_EXCLAMATION_MARK , Qt::Key_Exclam); + insert(DIKS_QUOTATION , Qt::Key_QuoteDbl); + insert(DIKS_NUMBER_SIGN , Qt::Key_NumberSign); + insert(DIKS_DOLLAR_SIGN , Qt::Key_Dollar); + insert(DIKS_PERCENT_SIGN , Qt::Key_Percent); + insert(DIKS_AMPERSAND , Qt::Key_Ampersand); + insert(DIKS_APOSTROPHE , Qt::Key_Apostrophe); + insert(DIKS_PARENTHESIS_LEFT , Qt::Key_ParenLeft); + insert(DIKS_PARENTHESIS_RIGHT , Qt::Key_ParenRight); + insert(DIKS_ASTERISK , Qt::Key_Asterisk); + insert(DIKS_PLUS_SIGN , Qt::Key_Plus); + insert(DIKS_COMMA , Qt::Key_Comma); + insert(DIKS_MINUS_SIGN , Qt::Key_Minus); + insert(DIKS_PERIOD , Qt::Key_Period); + insert(DIKS_SLASH , Qt::Key_Slash); + insert(DIKS_0 , Qt::Key_0); + insert(DIKS_1 , Qt::Key_1); + insert(DIKS_2 , Qt::Key_2); + insert(DIKS_3 , Qt::Key_3); + insert(DIKS_4 , Qt::Key_4); + insert(DIKS_5 , Qt::Key_5); + insert(DIKS_6 , Qt::Key_6); + insert(DIKS_7 , Qt::Key_7); + insert(DIKS_8 , Qt::Key_8); + insert(DIKS_9 , Qt::Key_9); + insert(DIKS_COLON , Qt::Key_Colon); + insert(DIKS_SEMICOLON , Qt::Key_Semicolon); + insert(DIKS_LESS_THAN_SIGN , Qt::Key_Less); + insert(DIKS_EQUALS_SIGN , Qt::Key_Equal); + insert(DIKS_GREATER_THAN_SIGN , Qt::Key_Greater); + insert(DIKS_QUESTION_MARK , Qt::Key_Question); + insert(DIKS_AT , Qt::Key_At); + insert(DIKS_CAPITAL_A , Qt::Key_A); + insert(DIKS_CAPITAL_B , Qt::Key_B); + insert(DIKS_CAPITAL_C , Qt::Key_C); + insert(DIKS_CAPITAL_D , Qt::Key_D); + insert(DIKS_CAPITAL_E , Qt::Key_E); + insert(DIKS_CAPITAL_F , Qt::Key_F); + insert(DIKS_CAPITAL_G , Qt::Key_G); + insert(DIKS_CAPITAL_H , Qt::Key_H); + insert(DIKS_CAPITAL_I , Qt::Key_I); + insert(DIKS_CAPITAL_J , Qt::Key_J); + insert(DIKS_CAPITAL_K , Qt::Key_K); + insert(DIKS_CAPITAL_L , Qt::Key_L); + insert(DIKS_CAPITAL_M , Qt::Key_M); + insert(DIKS_CAPITAL_N , Qt::Key_N); + insert(DIKS_CAPITAL_O , Qt::Key_O); + insert(DIKS_CAPITAL_P , Qt::Key_P); + insert(DIKS_CAPITAL_Q , Qt::Key_Q); + insert(DIKS_CAPITAL_R , Qt::Key_R); + insert(DIKS_CAPITAL_S , Qt::Key_S); + insert(DIKS_CAPITAL_T , Qt::Key_T); + insert(DIKS_CAPITAL_U , Qt::Key_U); + insert(DIKS_CAPITAL_V , Qt::Key_V); + insert(DIKS_CAPITAL_W , Qt::Key_W); + insert(DIKS_CAPITAL_X , Qt::Key_X); + insert(DIKS_CAPITAL_Y , Qt::Key_Y); + insert(DIKS_CAPITAL_Z , Qt::Key_Z); + insert(DIKS_SQUARE_BRACKET_LEFT , Qt::Key_BracketLeft); + insert(DIKS_BACKSLASH , Qt::Key_Backslash); + insert(DIKS_SQUARE_BRACKET_RIGHT , Qt::Key_BracketRight); + insert(DIKS_CIRCUMFLEX_ACCENT , Qt::Key_AsciiCircum); + insert(DIKS_UNDERSCORE , Qt::Key_Underscore); + insert(DIKS_SMALL_A , Qt::Key_A); + insert(DIKS_SMALL_B , Qt::Key_B); + insert(DIKS_SMALL_C , Qt::Key_C); + insert(DIKS_SMALL_D , Qt::Key_D); + insert(DIKS_SMALL_E , Qt::Key_E); + insert(DIKS_SMALL_F , Qt::Key_F); + insert(DIKS_SMALL_G , Qt::Key_G); + insert(DIKS_SMALL_H , Qt::Key_H); + insert(DIKS_SMALL_I , Qt::Key_I); + insert(DIKS_SMALL_J , Qt::Key_J); + insert(DIKS_SMALL_K , Qt::Key_K); + insert(DIKS_SMALL_L , Qt::Key_L); + insert(DIKS_SMALL_M , Qt::Key_M); + insert(DIKS_SMALL_N , Qt::Key_N); + insert(DIKS_SMALL_O , Qt::Key_O); + insert(DIKS_SMALL_P , Qt::Key_P); + insert(DIKS_SMALL_Q , Qt::Key_Q); + insert(DIKS_SMALL_R , Qt::Key_R); + insert(DIKS_SMALL_S , Qt::Key_S); + insert(DIKS_SMALL_T , Qt::Key_T); + insert(DIKS_SMALL_U , Qt::Key_U); + insert(DIKS_SMALL_V , Qt::Key_V); + insert(DIKS_SMALL_W , Qt::Key_W); + insert(DIKS_SMALL_X , Qt::Key_X); + insert(DIKS_SMALL_Y , Qt::Key_Y); + insert(DIKS_SMALL_Z , Qt::Key_Z); + insert(DIKS_CURLY_BRACKET_LEFT , Qt::Key_BraceLeft); + insert(DIKS_VERTICAL_BAR , Qt::Key_Bar); + insert(DIKS_CURLY_BRACKET_RIGHT , Qt::Key_BraceRight); + insert(DIKS_TILDE , Qt::Key_AsciiTilde); } #include "qdirectfbkeyboard.moc" diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp index 2a2ef5c..924090c 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintdevice.cpp @@ -56,23 +56,16 @@ IDirectFBSurface *QDirectFBPaintDevice::directFBSurface() const } -// Locks the dfb surface and creates a QImage (lockedImage) from the pointer -void QDirectFBPaintDevice::lockDirectFB() { - +void QDirectFBPaintDevice::lockDirectFB() +{ if (lockedImage) return; // Already locked - void *mem; - int w, h; - DFBResult result = dfbSurface->Lock(dfbSurface, DSLF_WRITE, &mem, &bpl); - if (result != DFB_OK || !mem) { - DirectFBError("QDirectFBPixmapData::buffer()", result); - return; + if (uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl)) { + const QSize s = size(); + lockedImage = new QImage(mem, s.width(), s.height(), bpl, + QDirectFBScreen::getImageFormat(dfbSurface)); } - - dfbSurface->GetSize(dfbSurface, &w, &h); - lockedImage = new QImage(static_cast<uchar*>(mem), w, h, bpl, - QDirectFBScreen::getImageFormat(dfbSurface)); } diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp index d9346fd..ba5d71a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.cpp @@ -54,6 +54,70 @@ #include <private/qpixmapdata_p.h> #include <private/qpixmap_raster_p.h> +#ifdef QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +template <typename T> inline const T *ptr(const T &t) { return &t; } +template <> inline const bool* ptr<bool>(const bool &) { return 0; } +template <typename device, typename T1, typename T2, typename T3> +static void rasterFallbackWarn(const char *msg, const char *func, const device *dev, + bool matrixScale, bool matrixRotShear, bool simplePen, + bool dfbHandledClip, bool forceRasterPrimitives, + const char *nameOne, const T1 &one, + const char *nameTwo, const T2 &two, + const char *nameThree, const T3 &three) +{ + QString out; + QDebug dbg(&out); + dbg << msg << (QByteArray(func) + "()") << "painting on"; + if (dev->devType() == QInternal::Widget) { + dbg << static_cast<const QWidget*>(dev); + } else { + dbg << dev << "of type" << dev->devType(); + } + + dbg << "matrixScale" << matrixScale + << "matrixRotShear" << matrixRotShear + << "simplePen" << simplePen + << "dfbHandledClip" << dfbHandledClip + << "forceRasterPrimitives" << forceRasterPrimitives; + + const T1 *t1 = ptr(one); + const T2 *t2 = ptr(two); + const T3 *t3 = ptr(three); + + if (t1) { + dbg << nameOne << *t1; + if (t2) { + dbg << nameTwo << *t2; + if (t3) { + dbg << nameThree << *t3; + } + } + } + qWarning("%s", qPrintable(out)); +} +#endif + +#if defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS && defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define RASTERFALLBACK(one, two, three) rasterFallbackWarn("Disabled raster engine operation", \ + __FUNCTION__, state()->painter->device(), \ + d_func()->matrixScale, d_func()->matrixRotShear, \ + d_func()->simplePen, d_func()->dfbCanHandleClip(), \ + d_func()->forceRasterPrimitives, \ + #one, one, #two, two, #three, three); \ + return; +#elif defined QT_DIRECTFB_DISABLE_RASTERFALLBACKS +#define RASTERFALLBACK(one, two, three) return; +#elif defined QT_DIRECTFB_WARN_ON_RASTERFALLBACKS +#define RASTERFALLBACK(one, two, three) rasterFallbackWarn("Falling back to raster engine for", \ + __FUNCTION__, state()->painter->device(), \ + d_func()->matrixScale, d_func()->matrixRotShear, \ + d_func()->simplePen, d_func()->dfbCanHandleClip(), \ + d_func()->forceRasterPrimitives, \ + #one, one, #two, two, #three, three); +#else +#define RASTERFALLBACK(one, two, three) +#endif + static inline uint ALPHA_MUL(uint x, uint a) { uint t = x * a; @@ -181,20 +245,17 @@ public: IDirectFBSurface *surface; QPen pen; - QBrush brush; bool antialiased; bool forceRasterPrimitives; bool simplePen; - bool simpleBrush; bool matrixRotShear; bool matrixScale; void setTransform(const QTransform &m); void setPen(const QPen &pen); - void setBrush(const QBrush &brush); void setCompositionMode(QPainter::CompositionMode mode); void setOpacity(quint8 value); void setRenderHints(QPainter::RenderHints hints); @@ -207,6 +268,7 @@ public: inline bool dfbCanHandleClip(const QRect &rect) const; inline bool dfbCanHandleClip(const QRectF &rect) const; inline bool dfbCanHandleClip() const; + inline bool isSimpleBrush(const QBrush &brush) const; void drawLines(const QLine *lines, int count) const; void drawLines(const QLineF *lines, int count) const; @@ -217,6 +279,7 @@ public: void fillRects(const QRectF *rects, int count) const; void drawRects(const QRectF *rects, int count) const; + void drawPixmap(const QRectF &dest, const QPixmap &pixmap, const QRectF &src); void drawTiledPixmap(const QRectF &dest, const QPixmap &pixmap); @@ -253,7 +316,7 @@ private: QDirectFBPaintEnginePrivate::QDirectFBPaintEnginePrivate(QDirectFBPaintEngine *p) : surface(0), antialiased(false), forceRasterPrimitives(false), simplePen(false), - simpleBrush(false), matrixRotShear(false), matrixScale(false), lastLockedHeight(-1), + matrixRotShear(false), matrixScale(false), lastLockedHeight(-1), fbWidth(-1), fbHeight(-1), opacity(255), drawFlagsFromCompositionMode(0), blitFlagsFromCompositionMode(0), porterDuffRule(DSPD_SRC_OVER), dirtyClip(true), dfbHandledClip(false), dfbDevice(0), q(p) @@ -287,6 +350,11 @@ bool QDirectFBPaintEnginePrivate::dfbCanHandleClip() const return dfbHandledClip; } +bool QDirectFBPaintEnginePrivate::isSimpleBrush(const QBrush &brush) const +{ + return (brush.style() == Qt::NoBrush) || (brush.style() == Qt::SolidPattern && !antialiased); +} + void QDirectFBPaintEnginePrivate::setClipDirty() { dirtyClip = true; @@ -366,13 +434,6 @@ void QDirectFBPaintEnginePrivate::setPen(const QPen &p) && (pen.widthF() <= 1 && !matrixScale)); } -void QDirectFBPaintEnginePrivate::setBrush(const QBrush &b) -{ - brush = b; - simpleBrush = (brush.style() == Qt::NoBrush) || - (brush.style() == Qt::SolidPattern && !antialiased); -} - void QDirectFBPaintEnginePrivate::setCompositionMode(QPainter::CompositionMode mode) { blitFlagsFromCompositionMode = DSBLIT_NOFX; @@ -755,14 +816,6 @@ void QDirectFBPaintEngine::penChanged() QRasterPaintEngine::penChanged(); } -void QDirectFBPaintEngine::brushChanged() -{ - Q_D(QDirectFBPaintEngine); - d->setBrush(state()->brush); - - QRasterPaintEngine::brushChanged(); -} - void QDirectFBPaintEngine::opacityChanged() { Q_D(QDirectFBPaintEngine); @@ -801,7 +854,6 @@ void QDirectFBPaintEngine::setState(QPainterState *s) QRasterPaintEngine::setState(s); d->setClipDirty(); d->setPen(state()->pen); - d->setBrush(state()->brush); d->setOpacity(quint8(state()->opacity * 255)); d->setCompositionMode(state()->compositionMode()); d->setTransform(state()->transform()); @@ -834,8 +886,11 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) { Q_D(QDirectFBPaintEngine); d->updateClip(); - if (!d->dfbCanHandleClip() || d->matrixRotShear || !d->simpleBrush - || !d->simplePen || d->forceRasterPrimitives) { + const QBrush &brush = state()->brush; + if (!d->dfbCanHandleClip() || d->matrixRotShear + || !d->simplePen || d->forceRasterPrimitives + || !d->isSimpleBrush(brush)) { + RASTERFALLBACK(rectCount, static_cast<bool>(false), static_cast<bool>(false)); d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); return; @@ -843,8 +898,8 @@ void QDirectFBPaintEngine::drawRects(const QRect *rects, int rectCount) d->unlock(); - if (d->brush != Qt::NoBrush) { - d->setDFBColor(d->brush.color()); + if (brush != Qt::NoBrush) { + d->setDFBColor(brush.color()); d->fillRects(rects, rectCount); } if (d->pen != Qt::NoPen) { @@ -857,8 +912,10 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) { Q_D(QDirectFBPaintEngine); d->updateClip(); - if (!d->dfbCanHandleClip() || d->matrixRotShear || !d->simpleBrush - || !d->simplePen || d->forceRasterPrimitives) { + const QBrush &brush = state()->brush; + if (!d->dfbCanHandleClip() || d->matrixRotShear + || !d->simplePen || d->forceRasterPrimitives + || !d->isSimpleBrush(brush)) { d->lock(); QRasterPaintEngine::drawRects(rects, rectCount); return; @@ -866,8 +923,8 @@ void QDirectFBPaintEngine::drawRects(const QRectF *rects, int rectCount) d->unlock(); - if (d->brush != Qt::NoBrush) { - d->setDFBColor(d->brush.color()); + if (brush != Qt::NoBrush) { + d->setDFBColor(brush.color()); d->fillRects(rects, rectCount); } if (d->pen != Qt::NoPen) { @@ -881,6 +938,7 @@ void QDirectFBPaintEngine::drawLines(const QLine *lines, int lineCount) Q_D(QDirectFBPaintEngine); d->updateClip(); if (!d->simplePen || !d->dfbCanHandleClip() || d->forceRasterPrimitives) { + RASTERFALLBACK(lineCount, static_cast<bool>(false), static_cast<bool>(false)); d->lock(); QRasterPaintEngine::drawLines(lines, lineCount); return; @@ -898,6 +956,7 @@ void QDirectFBPaintEngine::drawLines(const QLineF *lines, int lineCount) Q_D(QDirectFBPaintEngine); d->updateClip(); if (!d->simplePen || !d->dfbCanHandleClip() || d->forceRasterPrimitives) { + RASTERFALLBACK(lineCount, static_cast<bool>(false), static_cast<bool>(false)); d->lock(); QRasterPaintEngine::drawLines(lines, lineCount); return; @@ -923,6 +982,7 @@ void QDirectFBPaintEngine::drawImage(const QRectF &r, const QImage &image, || QDirectFBScreen::getSurfacePixelFormat(image.format()) == DSPF_UNKNOWN) #endif { + RASTERFALLBACK(r, image.size(), sr); d->lock(); QRasterPaintEngine::drawImage(r, image, sr, flags); return; @@ -946,9 +1006,11 @@ void QDirectFBPaintEngine::drawPixmap(const QRectF &r, const QPixmap &pixmap, d->updateClip(); if (pixmap.pixmapData()->classId() != QPixmapData::DirectFBClass) { + // not using RASTERFALLBACK since this is the way we do bitmaps? d->lock(); QRasterPaintEngine::drawPixmap(r, pixmap, sr); } else if (!d->dfbCanHandleClip(r) || d->matrixRotShear) { + RASTERFALLBACK(r, pixmap.size(), sr); const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(); d->lock(); QRasterPaintEngine::drawImage(r, *img, sr); @@ -973,6 +1035,7 @@ void QDirectFBPaintEngine::drawTiledPixmap(const QRectF &r, d->lock(); QRasterPaintEngine::drawTiledPixmap(r, pixmap, sp); } else if (!d->dfbCanHandleClip(r) || d->matrixRotShear || !sp.isNull()) { + RASTERFALLBACK(r, pixmap.size(), sp); const QImage *img = static_cast<QDirectFBPixmapData*>(pixmap.pixmapData())->buffer(); d->lock(); QRasterPixmapData *data = new QRasterPixmapData(QPixmapData::PixmapType); @@ -995,6 +1058,7 @@ void QDirectFBPaintEngine::stroke(const QVectorPath &path, const QPen &pen) void QDirectFBPaintEngine::drawPath(const QPainterPath &path) { + RASTERFALLBACK(path.boundingRect(), static_cast<bool>(false), static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPath(path); @@ -1002,6 +1066,7 @@ void QDirectFBPaintEngine::drawPath(const QPainterPath &path) void QDirectFBPaintEngine::drawPoints(const QPointF *points, int pointCount) { + RASTERFALLBACK(pointCount, static_cast<bool>(false), static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPoints(points, pointCount); @@ -1009,6 +1074,7 @@ void QDirectFBPaintEngine::drawPoints(const QPointF *points, int pointCount) void QDirectFBPaintEngine::drawPoints(const QPoint *points, int pointCount) { + RASTERFALLBACK(pointCount, static_cast<bool>(false), static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPoints(points, pointCount); @@ -1016,6 +1082,7 @@ void QDirectFBPaintEngine::drawPoints(const QPoint *points, int pointCount) void QDirectFBPaintEngine::drawEllipse(const QRectF &rect) { + RASTERFALLBACK(rect, static_cast<bool>(false), static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawEllipse(rect); @@ -1024,6 +1091,7 @@ void QDirectFBPaintEngine::drawEllipse(const QRectF &rect) void QDirectFBPaintEngine::drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) { + RASTERFALLBACK(pointCount, mode, static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPolygon(points, pointCount, mode); @@ -1032,6 +1100,7 @@ void QDirectFBPaintEngine::drawPolygon(const QPointF *points, int pointCount, void QDirectFBPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) { + RASTERFALLBACK(pointCount, mode, static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawPolygon(points, pointCount, mode); @@ -1040,6 +1109,7 @@ void QDirectFBPaintEngine::drawPolygon(const QPoint *points, int pointCount, void QDirectFBPaintEngine::drawTextItem(const QPointF &p, const QTextItem &textItem) { + RASTERFALLBACK(p, textItem.text(), static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::drawTextItem(p, textItem); @@ -1047,6 +1117,7 @@ void QDirectFBPaintEngine::drawTextItem(const QPointF &p, void QDirectFBPaintEngine::fill(const QVectorPath &path, const QBrush &brush) { + RASTERFALLBACK(path, brush, static_cast<bool>(false)); Q_D(QDirectFBPaintEngine); d->lock(); QRasterPaintEngine::fill(path, brush); @@ -1080,6 +1151,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QBrush &brush) break; } } + RASTERFALLBACK(rect, brush, static_cast<bool>(false)); d->lock(); QRasterPaintEngine::fillRect(rect, brush); } @@ -1089,6 +1161,7 @@ void QDirectFBPaintEngine::fillRect(const QRectF &rect, const QColor &color) Q_D(QDirectFBPaintEngine); d->updateClip(); if (!d->dfbCanHandleClip() || d->matrixRotShear || d->forceRasterPrimitives) { + RASTERFALLBACK(rect, color, static_cast<bool>(false)); d->lock(); QRasterPaintEngine::fillRect(rect, color); } else { @@ -1105,6 +1178,7 @@ void QDirectFBPaintEngine::drawColorSpans(const QSpan *spans, int count, { Q_D(QDirectFBPaintEngine); if (d->forceRasterPrimitives) { + RASTERFALLBACK(count, color, static_cast<bool>(false)); d->lock(); QRasterPaintEngine::drawColorSpans(spans, count, color); } else { diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h index 3c2cefa..e79ec61 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpaintengine.h @@ -96,7 +96,6 @@ public: virtual void clipEnabledChanged(); virtual void penChanged(); - virtual void brushChanged(); virtual void opacityChanged(); virtual void compositionModeChanged(); virtual void renderHintsChanged(); diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp index 0a1696a..ea9bb3a 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbpixmap.cpp @@ -157,10 +157,13 @@ static bool checkForAlphaPixels(const QImage &img) return false; } -void QDirectFBPixmapData::fromImage(const QImage &img, +void QDirectFBPixmapData::fromImage(const QImage &i, Qt::ImageConversionFlags flags) { - Q_ASSERT(img.depth() != 1); // these should be handled by QRasterPixmapData +#ifdef QT_NO_DIRECTFB_OPAQUE_DETECTION + Q_UNUSED(flags); +#endif + const QImage img = (i.depth() == 1 ? i.convertToFormat(screen->alphaPixmapFormat()) : i); if (img.hasAlphaChannel() #ifndef QT_NO_DIRECTFB_OPAQUE_DETECTION && (flags & Qt::NoOpaqueDetection || ::checkForAlphaPixels(img)) @@ -267,16 +270,17 @@ void QDirectFBPixmapData::fill(const QColor &color) if (forceRaster) { // in DSPF_RGB32 all dfb drawing causes the Alpha byte to be // set to 0. This causes issues for the raster engine. - char *mem; - int bpl; - const int h = QPixmapData::height(); - dfbSurface->Lock(dfbSurface, DSLF_WRITE, (void**)&mem, &bpl); - const int c = color.rgba(); - for (int i = 0; i < h; ++i) { - memset(mem, c, bpl); - mem += bpl; + uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl); + if (mem) { + const int h = QPixmapData::height(); + const int w = QPixmapData::width() * 4; // 4 bytes per 32 bit pixel + const int c = color.rgba(); + for (int i = 0; i < h; ++i) { + memset(mem, c, w); + mem += bpl; + } + dfbSurface->Unlock(dfbSurface); } - dfbSurface->Unlock(dfbSurface); } else { dfbSurface->Clear(dfbSurface, color.red(), color.green(), color.blue(), color.alpha()); diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp index 041d522..3e54e7f 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.cpp @@ -159,15 +159,17 @@ IDirectFBSurface* QDirectFBScreen::createDFBSurface(const QImage &img, SurfaceCr IDirectFBSurface *surface = createDFBSurface(&desc, options); #ifdef QT_NO_DIRECTFB_PREALLOCATED if (surface) { - char *mem; int bpl; - surface->Lock(surface, DSLF_WRITE, (void**)&mem, &bpl); - const int h = img.height(); - for (int i = 0; i < h; ++i) { - memcpy(mem, img.scanLine(i), bpl); - mem += bpl; + uchar *mem = QDirectFBScreen::lockSurface(surface, DSLF_WRITE, &bpl); + if (mem) { + const int h = img.height(); + const int w = img.width() * img.depth() / 8; + for (int i = 0; i < h; ++i) { + memcpy(mem, img.scanLine(i), w); + mem += bpl; + } + surface->Unlock(surface); } - surface->Unlock(surface); } #endif #ifndef QT_NO_DIRECTFB_PALETTE @@ -317,15 +319,17 @@ IDirectFBSurface *QDirectFBScreen::copyToDFBSurface(const QImage &img, imgSurface->Release(imgSurface); #else // QT_NO_DIRECTFB_PREALLOCATED Q_ASSERT(image.format() == pixmapFormat); - char *mem; int bpl; - dfbSurface->Lock(dfbSurface, DSLF_WRITE, (void**)&mem, &bpl); - const int w = image.width() * image.depth() / 8; - for (int i = 0; i < image.height(); ++i) { - memcpy(mem, image.scanLine(i), w); - mem += bpl; + uchar *mem = QDirectFBScreen::lockSurface(dfbSurface, DSLF_WRITE, &bpl); + if (mem) { + const int h = image.height(); + const int w = image.width() * image.depth() / 8; + for (int i=0; i<h; ++i) { + memcpy(mem, image.scanLine(i), w); + mem += bpl; + } + dfbSurface->Unlock(dfbSurface); } - dfbSurface->Unlock(dfbSurface); #endif return dfbSurface; } @@ -833,15 +837,15 @@ bool QDirectFBScreen::connect(const QString &displaySpec) description.flags = DFBSurfaceDescriptionFlags(description.flags | DSDESC_WIDTH); if (::setIntOption(displayArgs, QLatin1String("height"), &description.height)) description.flags = DFBSurfaceDescriptionFlags(description.flags | DSDESC_HEIGHT); - description.caps = DFBSurfaceCapabilities(DSCAPS_PRIMARY - | DSCAPS_DOUBLE - | DSCAPS_STATIC_ALLOC); - if (displayArgs.contains(QLatin1String("forcepremultiplied"), - Qt::CaseInsensitive)) { - description.caps = DFBSurfaceCapabilities(description.caps - | DSCAPS_PREMULTIPLIED); + uint caps = DSCAPS_PRIMARY|DSCAPS_DOUBLE; + if (displayArgs.contains(QLatin1String("static_alloc"))) + caps |= DSCAPS_STATIC_ALLOC; + + if (displayArgs.contains(QLatin1String("forcepremultiplied"), Qt::CaseInsensitive)) { + caps |= DSCAPS_PREMULTIPLIED; } + description.caps = DFBSurfaceCapabilities(caps); // We don't track the primary surface as it's released in disconnect d_ptr->dfbSurface = createDFBSurface(&description, DontTrackSurface); if (!d_ptr->dfbSurface) { @@ -952,16 +956,15 @@ void QDirectFBScreen::disconnect() bool QDirectFBScreen::initDevice() { - QWSServer *server = QWSServer::instance(); #ifndef QT_NO_DIRECTFB_MOUSE if (qgetenv("QWS_MOUSE_PROTO").isEmpty()) { - server->setDefaultMouse("None"); + QWSServer::instance()->setDefaultMouse("None"); d_ptr->mouse = new QDirectFBMouseHandler; } #endif #ifndef QT_NO_DIRECTFB_KEYBOARD if (qgetenv("QWS_KEYBOARD").isEmpty()) { - server->setDefaultKeyboard("None"); + QWSServer::instance()->setDefaultKeyboard("None"); d_ptr->keyboard = new QDirectFBKeyboardHandler(QString()); } #endif @@ -1188,23 +1191,23 @@ void QDirectFBScreen::blit(IDirectFBSurface *src, const QPoint &topLeft, points.data(), n); } +// This function is only ever called by QScreen::drawBackground which +// is only ever called by QScreen::compose which is never called with +// DirectFB so it's really a noop. void QDirectFBScreen::solidFill(const QColor &color, const QRegion ®ion) { if (region.isEmpty()) return; if (QDirectFBScreen::getImageFormat(d_ptr->dfbSurface) == QImage::Format_RGB32) { - uchar *mem; - int bpl; - d_ptr->dfbSurface->Lock(d_ptr->dfbSurface, DSLF_WRITE, (void**)&mem, &bpl); - QImage img(mem, w, h, bpl, QImage::Format_RGB32); - QPainter p(&img); - p.setBrush(color); - p.setPen(Qt::NoPen); - const QVector<QRect> rects = region.rects(); - p.drawRects(rects.constData(), rects.size()); - p.end(); + data = QDirectFBScreen::lockSurface(d_ptr->dfbSurface, DSLF_WRITE, &lstep); + if (!data) + return; + + QScreen::solidFill(color, region); d_ptr->dfbSurface->Unlock(d_ptr->dfbSurface); + data = 0; + lstep = 0; } else { d_ptr->dfbSurface->SetColor(d_ptr->dfbSurface, color.red(), color.green(), color.blue(), @@ -1241,3 +1244,15 @@ bool QDirectFBScreen::initSurfaceDescriptionPixelFormat(DFBSurfaceDescription *d } return true; } + +uchar *QDirectFBScreen::lockSurface(IDirectFBSurface *surface, DFBSurfaceLockFlags flags, int *bpl) +{ + void *mem; + const DFBResult result = surface->Lock(surface, flags, static_cast<void**>(&mem), bpl); + if (result != DFB_OK) { + DirectFBError("QDirectFBPixmapData::lockSurface()", result); + } + + return reinterpret_cast<uchar*>(mem); +} + diff --git a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h index f394ac1..8dd38dc 100644 --- a/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h +++ b/src/plugins/gfxdrivers/directfb/qdirectfbscreen.h @@ -127,6 +127,8 @@ public: const QImage &image); #endif + static uchar *lockSurface(IDirectFBSurface *surface, DFBSurfaceLockFlags flags, int *bpl = 0); + private: void compose(const QRegion &r); void blit(IDirectFBSurface *src, const QPoint &topLeft, diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c index 5c37253..4771d14 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable.c @@ -72,7 +72,7 @@ static int pvrQwsInitFbScreen(int screen) /* Bail out if already initialized, or the number is incorrect */ if (screen < 0 || screen >= PVRQWS_MAX_SCREENS) return 0; - if (pvrQwsDisplay.screens[screen].mapped) + if (pvrQwsDisplay.screens[screen].initialized) return 1; /* Open the framebuffer and fetch its properties */ @@ -125,26 +125,33 @@ static int pvrQwsInitFbScreen(int screen) start = fix.smem_start; length = var.xres_virtual * var.yres_virtual * bytesPerPixel; - /* Map the framebuffer region into memory */ - mapped = mmap(0, length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); - if (!mapped || mapped == (void *)(-1)) { - perror("mmap"); - close(fd); - return 0; - } - - /* Allocate a PVR2D memory region for the framebuffer */ - memInfo = 0; - if (pvrQwsDisplay.context) { - pageAddresses[0] = start & 0xFFFFF000; - pageAddresses[1] = 0; - if (PVR2DMemWrap - (pvrQwsDisplay.context, mapped, PVR2D_WRAPFLAG_CONTIGUOUS, - length, pageAddresses, &memInfo) != PVR2D_OK) { - munmap(mapped, length); + if (screen == 0) { + /* We use PVR2DGetFrameBuffer to map the first screen. + On some chipsets it is more reliable than using PVR2DMemWrap */ + mapped = 0; + memInfo = 0; + } else { + /* Other screens: map the framebuffer region into memory */ + mapped = mmap(0, length, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0); + if (!mapped || mapped == (void *)(-1)) { + perror("mmap"); close(fd); return 0; } + + /* Allocate a PVR2D memory region for the framebuffer */ + memInfo = 0; + if (pvrQwsDisplay.context) { + pageAddresses[0] = start & 0xFFFFF000; + pageAddresses[1] = 0; + if (PVR2DMemWrap + (pvrQwsDisplay.context, mapped, PVR2D_WRAPFLAG_CONTIGUOUS, + length, pageAddresses, &memInfo) != PVR2D_OK) { + munmap(mapped, length); + close(fd); + return 0; + } + } } /* We don't need the file descriptor any more */ @@ -158,11 +165,17 @@ static int pvrQwsInitFbScreen(int screen) pvrQwsDisplay.screens[screen].screenStride = stride; pvrQwsDisplay.screens[screen].pixelFormat = format; pvrQwsDisplay.screens[screen].bytesPerPixel = bytesPerPixel; - pvrQwsDisplay.screens[screen].frameBuffer = memInfo; pvrQwsDisplay.screens[screen].screenDrawable = 0; - pvrQwsDisplay.screens[screen].mapped = mapped; + if (mapped) { + /* Don't set these fields if mapped is 0, because PVR2DGetFrameBuffer + may have already been called and set them */ + pvrQwsDisplay.screens[screen].frameBuffer = memInfo; + pvrQwsDisplay.screens[screen].mapped = mapped; + } pvrQwsDisplay.screens[screen].mappedLength = length; pvrQwsDisplay.screens[screen].screenStart = start; + pvrQwsDisplay.screens[screen].needsUnmap = (mapped != 0); + pvrQwsDisplay.screens[screen].initialized = 1; return 1; } @@ -209,7 +222,7 @@ static int pvrQwsAddDrawable(void) /* Create the PVR2DMEMINFO blocks for the active framebuffers */ for (screen = 0; screen < PVRQWS_MAX_SCREENS; ++screen) { - if (pvrQwsDisplay.screens[screen].mapped) { + if (screen != 0 && pvrQwsDisplay.screens[screen].mapped) { pageAddresses[0] = pvrQwsDisplay.screens[screen].screenStart & 0xFFFFF000; pageAddresses[1] = 0; @@ -224,6 +237,17 @@ static int pvrQwsAddDrawable(void) return 0; } pvrQwsDisplay.screens[screen].frameBuffer = memInfo; + } else if (screen == 0) { + if (PVR2DGetFrameBuffer + (pvrQwsDisplay.context, + PVR2D_FB_PRIMARY_SURFACE, &memInfo) != PVR2D_OK) { + fprintf(stderr, "QWSWSEGL: could not get the primary framebuffer surface\n"); + PVR2DDestroyDeviceContext(pvrQwsDisplay.context); + pvrQwsDisplay.context = 0; + return 0; + } + pvrQwsDisplay.screens[screen].frameBuffer = memInfo; + pvrQwsDisplay.screens[screen].mapped = memInfo->pBase; } } @@ -330,7 +354,7 @@ void pvrQwsDisplayClose(void) pvrQwsDestroyDrawableForced(info->screenDrawable); if (info->frameBuffer) PVR2DMemFree(pvrQwsDisplay.context, info->frameBuffer); - if (info->mapped) + if (info->mapped && info->needsUnmap) munmap(info->mapped, info->mappedLength); } diff --git a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h index d6c42a6..4f3ea90 100644 --- a/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h +++ b/src/plugins/gfxdrivers/powervr/QWSWSEGL/pvrqwsdrawable_p.h @@ -76,6 +76,8 @@ typedef struct { void *mapped; int mappedLength; unsigned long screenStart; + int needsUnmap; + int initialized; } PvrQwsScreenInfo; diff --git a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp index 7fdf81f..c7249d3 100644 --- a/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp +++ b/src/plugins/iconengines/svgiconengine/qsvgiconengine.cpp @@ -121,7 +121,7 @@ QSize QSvgIconEngine::actualSize(const QSize &size, QIcon::Mode mode, if (!pm.isNull() && pm.size() == size) return size; } - + QSvgRenderer renderer; d->loadDataForModeAndState(&renderer, mode, state); if (renderer.isValid()) { @@ -158,9 +158,13 @@ void QSvgIconEnginePrivate::loadDataForModeAndState(QSvgRenderer *renderer, QIco QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) -{ +{ QPixmap pm; + QString pmckey(d->pmcKey(size, mode, state)); + if (QPixmapCache::find(pmckey, pm)) + return pm; + if (d->addedPixmaps) { pm = d->addedPixmaps->value(d->hashKey(mode, state)); if (!pm.isNull() && pm.size() == size) @@ -176,10 +180,6 @@ QPixmap QSvgIconEngine::pixmap(const QSize &size, QIcon::Mode mode, if (!actualSize.isNull()) actualSize.scale(size, Qt::KeepAspectRatio); - QString pmckey(d->pmcKey(actualSize, mode, state)); - if (QPixmapCache::find(pmckey, pm)) - return pm; - QImage img(actualSize, QImage::Format_ARGB32_Premultiplied); img.fill(0x00000000); QPainter p(&img); diff --git a/src/plugins/imageformats/ico/qicohandler.cpp b/src/plugins/imageformats/ico/qicohandler.cpp index aa53370..da5ae15 100644 --- a/src/plugins/imageformats/ico/qicohandler.cpp +++ b/src/plugins/imageformats/ico/qicohandler.cpp @@ -80,7 +80,7 @@ typedef struct typedef struct { // BMP information header quint32 biSize; // size of this struct quint32 biWidth; // pixmap width - quint32 biHeight; // pixmap height + quint32 biHeight; // pixmap height (specifies the combined height of the XOR and AND masks) quint16 biPlanes; // should be 1 quint16 biBitCount; // number of bits per pixel quint32 biCompression; // compression method @@ -108,7 +108,7 @@ private: bool readHeader(); bool readIconEntry(int index, ICONDIRENTRY * iconEntry); - bool readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header); + bool readBMPHeader(quint32 imageOffset, BMP_INFOHDR * header); void findColorInfo(QImage & image); void readColorTable(QImage & image); @@ -343,7 +343,7 @@ bool ICOReader::readHeader() return headerRead; } -bool ICOReader::readIconEntry(int index, ICONDIRENTRY * iconEntry) +bool ICOReader::readIconEntry(int index, ICONDIRENTRY *iconEntry) { if (iod) { if (iod->seek(startpos + ICONDIR_SIZE + (index * ICONDIRENTRY_SIZE))) { @@ -355,37 +355,12 @@ bool ICOReader::readIconEntry(int index, ICONDIRENTRY * iconEntry) -bool ICOReader::readBMPHeader(ICONDIRENTRY & iconEntry, BMP_INFOHDR * header) +bool ICOReader::readBMPHeader(quint32 imageOffset, BMP_INFOHDR * header) { - memset(&icoAttrib, 0, sizeof(IcoAttrib)); if (iod) { - if (iod->seek(startpos + iconEntry.dwImageOffset)) { + if (iod->seek(startpos + imageOffset)) { if (readBMPInfoHeader(iod, header)) { - - icoAttrib.nbits = header->biBitCount ? header->biBitCount : iconEntry.wBitCount; - icoAttrib.h = header->biHeight / 2; // this height is always double the iconEntry height (for the mask) - icoAttrib.w = header->biWidth; - - switch (icoAttrib.nbits) { - case 32: - case 24: - case 16: - icoAttrib.depth = 32; - break; - case 8: - case 4: - icoAttrib.depth = 8; - break; - default: - icoAttrib.depth = 1; - } - - if ( icoAttrib.depth == 32 ) // there's no colormap - icoAttrib.ncolors = 0; - else // # colors used - icoAttrib.ncolors = header->biClrUsed ? header->biClrUsed : 1 << icoAttrib.nbits; - //qDebug() << "Bits:" << icoAttrib.nbits << "Depth:" << icoAttrib.depth << "Ncols:" << icoAttrib.ncolors; - return TRUE; + return TRUE; } } } @@ -548,7 +523,28 @@ QImage ICOReader::iconAt(int index) if (readIconEntry(index, &iconEntry)) { BMP_INFOHDR header; - if (readBMPHeader(iconEntry, &header)) { + if (readBMPHeader(iconEntry.dwImageOffset, &header)) { + icoAttrib.nbits = header.biBitCount ? header.biBitCount : iconEntry.wBitCount; + + switch (icoAttrib.nbits) { + case 32: + case 24: + case 16: + icoAttrib.depth = 32; + break; + case 8: + case 4: + icoAttrib.depth = 8; + break; + default: + icoAttrib.depth = 1; + } + if (icoAttrib.depth == 32) // there's no colormap + icoAttrib.ncolors = 0; + else // # colors used + icoAttrib.ncolors = header.biClrUsed ? header.biClrUsed : 1 << icoAttrib.nbits; + icoAttrib.w = iconEntry.bWidth; + icoAttrib.h = iconEntry.bHeight; QImage::Format format = QImage::Format_ARGB32; if (icoAttrib.nbits == 24) diff --git a/src/plugins/qpluginbase.pri b/src/plugins/qpluginbase.pri index 446efab..ae39021 100644 --- a/src/plugins/qpluginbase.pri +++ b/src/plugins/qpluginbase.pri @@ -1,6 +1,6 @@ TEMPLATE = lib isEmpty(QT_MAJOR_VERSION) { - VERSION=4.5.1 + VERSION=4.5.2 } else { VERSION=$${QT_MAJOR_VERSION}.$${QT_MINOR_VERSION}.$${QT_PATCH_VERSION} } diff --git a/src/svg/qsvgstyle.cpp b/src/svg/qsvgstyle.cpp index b065395..bd0804c 100644 --- a/src/svg/qsvgstyle.cpp +++ b/src/svg/qsvgstyle.cpp @@ -808,6 +808,7 @@ void QSvgGradientStyle::resolveStops() static_cast<QSvgGradientStyle*>(prop); st->resolveStops(); m_gradient->setStops(st->qgradient()->stops()); + m_gradientStopsSet = st->gradientStopsSet(); } } m_link = QString(); diff --git a/src/svg/qsvgwidget.cpp b/src/svg/qsvgwidget.cpp index a4200ca..ac8595f 100644 --- a/src/svg/qsvgwidget.cpp +++ b/src/svg/qsvgwidget.cpp @@ -83,18 +83,6 @@ class QSvgWidgetPrivate : public QWidgetPrivate { Q_DECLARE_PUBLIC(QSvgWidget) public: - QSvgWidgetPrivate() - : QWidgetPrivate() - { - Q_Q(QSvgWidget); - renderer = new QSvgRenderer(q); - } - QSvgWidgetPrivate(const QString &file) - : QWidgetPrivate() - { - Q_Q(QSvgWidget); - renderer = new QSvgRenderer(file, q); - } QSvgRenderer *renderer; }; @@ -104,6 +92,7 @@ public: QSvgWidget::QSvgWidget(QWidget *parent) : QWidget(*new QSvgWidgetPrivate, parent, 0) { + d_func()->renderer = new QSvgRenderer(this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), this, SLOT(update())); } @@ -113,8 +102,9 @@ QSvgWidget::QSvgWidget(QWidget *parent) of the specified \a file. */ QSvgWidget::QSvgWidget(const QString &file, QWidget *parent) - : QWidget(*new QSvgWidgetPrivate(file), parent, 0) + : QWidget(*new QSvgWidgetPrivate, parent, 0) { + d_func()->renderer = new QSvgRenderer(file, this); QObject::connect(d_func()->renderer, SIGNAL(repaintNeeded()), this, SLOT(update())); } diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index a9b85e8..936b936 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -1487,7 +1487,7 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) } #endif -#if defined(QTEST_NOEXITCODE) || (defined(QT_BUILD_INTERNAL) && !defined(QTEST_FORCE_EXITCODE)) +#if defined(QTEST_NOEXITCODE) return 0; #else |
