cpython.git - https://github.com/python/cpython.git

summary refs log tree commit diff stats

path: root/Doc/texipost.dat

blob: 7897e44b099c4aa6f4fe9a2ae85a96cdc0226faa (plain)

@node Function Index, , ,
@unnumbered Function Index

@printindex fn

@node Variable Index, , ,
@unnumbered Variable Index

@printindex vr

@node Module Index, , ,
@unnumbered Module Index

@printindex pg

@node Concept Index, , ,
@unnumbered Concept Index

@printindex cp

@summarycontents
@contents
@bye

relib/animation/qvariantanimation.cpp index e647318..fc11815 100644 --- a/src/corelib/animation/qvariantanimation.cpp +++ b/src/corelib/animation/qvariantanimation.cpp @@ -220,52 +220,39 @@ void QVariantAnimationPrivate::updateInterpolator() */ void QVariantAnimationPrivate::recalculateCurrentInterval(bool force/*=false*/) { - // can't interpolate if we have only 1 key value - if ((keyValues.count() + (defaultStartValue.isValid() ? 1 : 0)) <=1) + // can't interpolate if we don't have at least 2 values + if ((keyValues.count() + (defaultStartEndValue.isValid() ? 1 : 0)) < 2) return; const qreal progress = easing.valueForProgress(((duration == 0) ? qreal(1) : qreal(currentTime) / qreal(duration))); - if (force || progress < currentInterval.start.first || progress > currentInterval.end.first) { + //0 and 1 are still the boundaries + if (force || (currentInterval.start.first > 0 && progress < currentInterval.start.first) + || (currentInterval.end.first < 1 && progress > currentInterval.end.first)) { //let's update currentInterval QVariantAnimation::KeyValues::const_iterator it = qLowerBound(keyValues.constBegin(), - keyValues.constEnd(), - qMakePair(progress, QVariant()), - animationValueLessThan); - if (it == keyValues.constEnd()) { - if (direction == QVariantAnimation::Backward && defaultStartValue.isValid()) { - --it; - if (it->first == 1) { - //we have an end value (item with progress = 1) - currentInterval.start = *(it-1); - currentInterval.end = *it; - } else if (direction == QVariantAnimation::Backward && defaultStartValue.isValid()) { - //the default start value should be used as the default end value - currentInterval.start = *it; - currentInterval.end = qMakePair(qreal(1), defaultStartValue); - } else { - ///This should not happen - } - } - } else if (it == keyValues.constBegin()) { - if (it+1 != keyValues.constEnd() && (it->first == progress || it->first == 0)) { - //the item pointed to by it is the start element in the range - //we also test if the current element is for progress 0 (ie the real start) because - //some easing curves might get the progress below 0. + keyValues.constEnd(), + qMakePair(progress, QVariant()), + animationValueLessThan); + if (it == keyValues.constBegin()) { + //the item pointed to by it is the start element in the range + if (it->first == 0 && keyValues.count() > 1) { currentInterval.start = *it; currentInterval.end = *(it+1); - } else if (defaultStartValue.isValid()) { - if (direction == QVariantAnimation::Forward) { - //we should have an end value - currentInterval.start = qMakePair(qreal(0), defaultStartValue); - currentInterval.end = *it; - } else { - //we should have a start value - currentInterval.start = *it; - currentInterval.end = qMakePair(qreal(1), defaultStartValue); - } } else { - ///this should not happen + currentInterval.start = qMakePair(qreal(0), defaultStartEndValue); + currentInterval.end = *it; + } + } else if (it == keyValues.constEnd()) { + --it; //position the iterator on the last item + if (it->first == 1 && keyValues.count() > 1) { + //we have an end value (item with progress = 1) + currentInterval.start = *(it-1); + currentInterval.end = *it; + } else { + //we use the default end value here + currentInterval.start = *it; + currentInterval.end = qMakePair(qreal(1), defaultStartEndValue); } } else { currentInterval.start = *(it-1); @@ -329,9 +316,9 @@ void QVariantAnimationPrivate::setValueAt(qreal step, const QVariant &value) recalculateCurrentInterval(/*force=*/true); } -void QVariantAnimationPrivate::setDefaultStartValue(const QVariant &value) +void QVariantAnimationPrivate::setDefaultStartEndValue(const QVariant &value) { - defaultStartValue = value; + defaultStartEndValue = value; recalculateCurrentInterval(/*force=*/true); } diff --git a/src/corelib/animation/qvariantanimation_p.h b/src/corelib/animation/qvariantanimation_p.h index 9c9d25b..ef57a4c 100644 --- a/src/corelib/animation/qvariantanimation_p.h +++ b/src/corelib/animation/qvariantanimation_p.h @@ -76,14 +76,14 @@ public: return q->d_func(); } - void setDefaultStartValue(const QVariant &value); + void setDefaultStartEndValue(const QVariant &value); int duration; QEasingCurve easing; QVariantAnimation::KeyValues keyValues; QVariant currentValue; - QVariant defaultStartValue; + QVariant defaultStartEndValue; //this is used to keep track of the KeyValue interval in which we currently are struct -- cgit v0.12 From bd2cc45fefb024f91f9c0736c5abfe853e49b540 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 13 Aug 2009 10:47:32 +0200 Subject: Fix compile issue for animation framework --- src/corelib/animation/qpropertyanimation.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/animation/qpropertyanimation.cpp b/src/corelib/animation/qpropertyanimation.cpp index 51fd387..0c1feee 100644 --- a/src/corelib/animation/qpropertyanimation.cpp +++ b/src/corelib/animation/qpropertyanimation.cpp @@ -293,7 +293,7 @@ void QPropertyAnimation::updateState(QAbstractAnimation::State oldState, hash.insert(key, this); // update the default start value if (oldState == Stopped) { - d->setDefaultStartValue(d->target->property(d->propertyName.constData())); + d->setDefaultStartEndValue(d->target->property(d->propertyName.constData())); //let's check if we have a start value and an end value if (d->direction == Forward && !startValue().isValid() && !d->defaultStartEndValue.isValid()) qWarning("QPropertyAnimation::updateState: starting an animation without start value"); -- cgit v0.12 From bf6cf7cd8723f05037c461106e4dc8da75889509 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Thu, 13 Aug 2009 10:55:49 +0200 Subject: Fix compiler warning We need to remove Zm200 from compiler flags before adding Zm1200 Reviewed-by: Marius Storm-Olsen --- demos/boxes/boxes.pro | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/demos/boxes/boxes.pro b/demos/boxes/boxes.pro index 33f1f14..59c9132 100644 --- a/demos/boxes/boxes.pro +++ b/demos/boxes/boxes.pro @@ -42,6 +42,8 @@ wince*: { } win32-msvc* { - QMAKE_CXXFLAGS += /Zm1200 - QMAKE_CFLAGS += /Zm1200 + QMAKE_CXXFLAGS -= -Zm200 + QMAKE_CFLAGS -= -Zm200 + QMAKE_CXXFLAGS += -Zm1200 + QMAKE_CFLAGS += -Zm1200 } -- cgit v0.12 From 7f1cba82a377d79ddb2fd2c40e1782ae9fc125f6 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Thu, 13 Aug 2009 12:37:39 +0200 Subject: Pick a suitable default architecture for qmake-based applications. If the Qt package contains one of x86 and x86_64, pick that one. If it contains both then use the compiler default. Make a similiar decision for PowerPC-based systems. Note that this logic assumes that Qt has been configured with an architecture that is usable on the system. Reviewed-by: Marius Storm-Olsen --- mkspecs/features/mac/default_post.prf | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index ea9e9bd..210a704 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -1,2 +1,18 @@ load(default_post) !no_objective_c:CONFIG += objective_c + +# Pick a suitable default architecture for qmake-based applications. +# If the Qt package contains one of x86 and x86_64, pick that one. If it +# contains both then use the compiler default. Make a similiar decision for +# PowerPC-based systems. Note that this logic assumes that Qt has been +# configured with an architecture that is usable on the system. +message(hei $$QT_CONFIG ) +qt:!isEmpty(QT_CONFIG) { + contains(QMAKE_HOST.arch, ppc) { + !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc + contains(QT_CONFIG, ppc64):!contains(QT_CONFIG, ppc):CONFIG += ppc64 + } else { + !contains(QT_CONFIG, x86_64):contains(QT_CONFIG, x86):CONFIG += x86 + contains(QT_CONFIG, x86_64):!contains(QT_CONFIG, x86):CONFIG += x86_64 + } +} -- cgit v0.12 From c090e68c25f6c5ffeac33ba81e50147800200b59 Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 13 Aug 2009 13:06:03 +0200 Subject: Fix to autotest of QDockWidget Mac needs a bit more time to update the widgets when they are redocked --- tests/auto/qdockwidget/tst_qdockwidget.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qdockwidget/tst_qdockwidget.cpp b/tests/auto/qdockwidget/tst_qdockwidget.cpp index e0548a7..686f62f 100644 --- a/tests/auto/qdockwidget/tst_qdockwidget.cpp +++ b/tests/auto/qdockwidget/tst_qdockwidget.cpp @@ -598,7 +598,7 @@ void tst_QDockWidget::visibilityChanged() QCOMPARE(spy.count(), 0); mw.addDockWidget(Qt::RightDockWidgetArea, &dw2); - qApp->processEvents(); + QTest::qWait(200); QCOMPARE(spy.count(), 1); QCOMPARE(spy.at(0).at(0).toBool(), true); } -- cgit v0.12 From 200f20d1503b6739f05916b606168da67726ffa6 Mon Sep 17 00:00:00 2001 From: Morten Sorvig Date: Thu, 13 Aug 2009 13:08:46 +0200 Subject: Remove yet another forgotten debug message. --- mkspecs/features/mac/default_post.prf | 1 - 1 file changed, 1 deletion(-) diff --git a/mkspecs/features/mac/default_post.prf b/mkspecs/features/mac/default_post.prf index 210a704..4999762 100644 --- a/mkspecs/features/mac/default_post.prf +++ b/mkspecs/features/mac/default_post.prf @@ -6,7 +6,6 @@ load(default_post) # contains both then use the compiler default. Make a similiar decision for # PowerPC-based systems. Note that this logic assumes that Qt has been # configured with an architecture that is usable on the system. -message(hei $$QT_CONFIG ) qt:!isEmpty(QT_CONFIG) { contains(QMAKE_HOST.arch, ppc) { !contains(QT_CONFIG, ppc64):contains(QT_CONFIG, ppc):CONFIG += ppc -- cgit v0.12 From f8d84ba4bfc71550879c117f96289ce80d74b7db Mon Sep 17 00:00:00 2001 From: Kavindra Devi Palaraja Date: Thu, 13 Aug 2009 15:05:18 +0200 Subject: Doc - Some cleanup on the documentation of QWebElement Reviewed-By: Simon Hausmann --- src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp | 378 +++++++++++++--------- 1 file changed, 220 insertions(+), 158 deletions(-) diff --git a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp index 1dfb409..dd90f39 100644 --- a/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp +++ b/src/3rdparty/webkit/WebKit/qt/Api/qwebelement.cpp @@ -53,45 +53,57 @@ public: /*! \class QWebElement \since 4.6 - \brief The QWebElement class provides convenient access to DOM elements in a QWebFrame. + \brief The QWebElement class provides convenient access to DOM elements in + a QWebFrame. - QWebElement is the main class to easily access to the document model. - The document model is represented by a tree-like structure of DOM elements. - The root of the tree is called the document element and can be accessed using QWebFrame::documentElement(). - You can reach specific elements using findAll() and findFirst(); the elements - are identified through CSS selectors. + A QWebElement object allows easy access to the document model, represented + by a tree-like structure of DOM elements. The root of the tree is called + the document element and can be accessed using + QWebFrame::documentElement(). + + Specific elements can be accessed using findAll() and findFirst(). These + elements are identified using CSS selectors. The code snippet below + demonstrates the use of findAll(). \snippet webkitsnippets/webelement/main.cpp FindAll - The first list contains all \c span elements in the document. The second list contains - \c span elements that are children of \c p, classified with \c intro. + The first list contains all \c span elements in the document. The second + list contains \c span elements that are children of \c p, classified with + \c intro. - Using findFirst() is more efficient than calling findAll() and extracting the first element - only in the returned list. + Using findFirst() is more efficient than calling findAll(), and extracting + the first element only in the list returned. - Alternatively you can manually traverse the document using firstChild() and nextSibling(): + Alternatively you can traverse the document manually using firstChild() and + nextSibling(): \snippet webkitsnippets/webelement/main.cpp Traversing with QWebElement - The underlying content of QWebElement is explicitly shared. Creating a copy of a QWebElement - does not create a copy of the content. Instead, both instances point to the same element. + The underlying content of QWebElement is explicitly shared. Creating a copy + of a QWebElement does not create a copy of the content. Instead, both + instances point to the same element. - The element's attributes can be read using attribute() and modified with setAttribute(). + The element's attributes can be read using attribute() and modified with + setAttribute(). - The contents of child elements can be converted to plain text with toPlainText() and to - XHTML using toInnerXml(). To also include the element's tag in the output, use toOuterXml(). + The contents of child elements can be converted to plain text with + toPlainText(); to XHTML using toInnerXml(). To include the element's tag in + the output, use toOuterXml(). - It is possible to replace the contents using setPlainText() and setInnerXml(). To replace - the element itself and its contents, use setOuterXml(). + It is possible to replace the contents of child elements using + setPlainText() and setInnerXml(). To replace the element itself and its + contents, use setOuterXml(). - In the JavaScript DOM interfaces, elements can have additional functions depending on their - type. For example an HTML form element can be triggered to submit the entire form to the - web server using the submit() function. A list of these special functions can be obtained - in QWebElement using functions(); they can be invoked using callFunction(). + In the JavaScript DOM interfaces, elements can have additional functions + depending on their type. For example, an HTML form element can be triggered + to submit the entire form to the web server using the submit() function. A + list of these special functions can be obtained in QWebElement using + functions(); they can be invoked using callFunction(). - Similarly element specific properties can be obtained using scriptableProperties() and - read/written using scriptableProperty()/setScriptableProperty(). + Similarly, element specific properties can be obtained using + scriptableProperties() and read or written using scriptableProperty() or + setScriptableProperty(). */ /*! @@ -156,7 +168,7 @@ QWebElement &QWebElement::operator=(const QWebElement &other) } /*! - Destroys the element. The underlying DOM element is not destroyed. + Destroys the element. However, the underlying DOM element is not destroyed. */ QWebElement::~QWebElement() { @@ -176,7 +188,7 @@ bool QWebElement::operator!=(const QWebElement& o) const } /*! - Returns true if the element is a null element; false otherwise. + Returns true if the element is a null element; otherwise returns false. */ bool QWebElement::isNull() const { @@ -184,13 +196,16 @@ bool QWebElement::isNull() const } /*! - Returns a new list of child elements matching the given CSS selector \a selectorQuery. - If there are no matching elements, an empty list is returned. + Returns a new list of child elements matching the given CSS selector + \a selectorQuery. If there are no matching elements, an empty list is + returned. - \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is - used for the query. + \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} + syntax is used for the query. \note This search is performed recursively. + + \sa findFirst() */ QList QWebElement::findAll(const QString &selectorQuery) const { @@ -212,12 +227,15 @@ QList QWebElement::findAll(const QString &selectorQuery) const } /*! - Returns the first child element that matches the given CSS selector \a selectorQuery. + Returns the first child element that matches the given CSS selector + \a selectorQuery. - \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} syntax is - used for the query. + \l{http://www.w3.org/TR/REC-CSS2/selector.html#q1}{Standard CSS2 selector} + syntax is used for the query. \note This search is performed recursively. + + \sa findAll() */ QWebElement QWebElement::findFirst(const QString &selectorQuery) const { @@ -231,6 +249,8 @@ QWebElement QWebElement::findFirst(const QString &selectorQuery) const Replaces the existing content of this element with \a text. This is equivalent to setting the HTML innerText property. + + \sa toPlainText() */ void QWebElement::setPlainText(const QString &text) { @@ -245,6 +265,8 @@ void QWebElement::setPlainText(const QString &text) element. This is equivalent to reading the HTML innerText property. + + \sa setPlainText() */ QString QWebElement::toPlainText() const { @@ -254,11 +276,13 @@ QString QWebElement::toPlainText() const } /*! - Replaces the contents of this element as well as its own tag with \a markup. - The string may contain HTML or XML tags, which is parsed and formatted - before insertion into the document. + Replaces the contents of this element as well as its own tag with + \a markup. The string may contain HTML or XML tags, which is parsed and + formatted before insertion into the document. \note This is currently only implemented for (X)HTML elements. + + \sa toOuterXml(), toInnerXml(), setInnerXml() */ void QWebElement::setOuterXml(const QString &markup) { @@ -272,9 +296,11 @@ void QWebElement::setOuterXml(const QString &markup) /*! Returns this element converted to XML, including the start and the end - tag of this element and its attributes. + tags as well as its attributes. - \note This is currently only implemented for (X)HTML elements. + \note This is currently implemented for (X)HTML elements only. + + \sa setOuterXml(), setInnerXml(), toInnerXml() */ QString QWebElement::toOuterXml() const { @@ -285,11 +311,13 @@ QString QWebElement::toOuterXml() const } /*! - Replaces the content of this element with \a markup. - The string may contain HTML or XML tags, which is parsed and formatted - before insertion into the document. + Replaces the contents of this element with \a markup. The string may + contain HTML or XML tags, which is parsed and formatted before insertion + into the document. - \note This is currently only implemented for (X)HTML elements. + \note This is currently implemented for (X)HTML elements only. + + \sa toInnerXml(), toOuterXml(), setOuterXml() */ void QWebElement::setInnerXml(const QString &markup) { @@ -302,10 +330,11 @@ void QWebElement::setInnerXml(const QString &markup) } /*! - Returns the XML between the start and the end tag of this - element. + Returns the XML content between the element's start and end tags. - \note This is currently only implemented for (X)HTML elements. + \note This is currently implemented for (X)HTML elements only. + + \sa setInnerXml(), setOuterXml(), toOuterXml() */ QString QWebElement::toInnerXml() const { @@ -316,8 +345,10 @@ QString QWebElement::toInnerXml() const } /*! - Adds an attribute called \a name with the value \a value. If an attribute - with the same name exists, its value is replaced by \a value. + Adds an attribute with the given \a name and \a value. If an attribute with + the same name exists, its value is replaced by \a value. + + \sa attribute(), attributeNS(), setAttributeNS() */ void QWebElement::setAttribute(const QString &name, const QString &value) { @@ -328,9 +359,11 @@ void QWebElement::setAttribute(const QString &name, const QString &value) } /*! - Adds an attribute called \a name in the namespace described with \a namespaceUri - with the value \a value. If an attribute with the same name exists, its value is - replaced by \a value. + Adds an attribute with the given \a name in \a namespaceUri with \a value. + If an attribute with the same name exists, its value is replaced by + \a value. + + \sa attributeNS(), attribute(), setAttribute() */ void QWebElement::setAttributeNS(const QString &namespaceUri, const QString &name, const QString &value) { @@ -341,8 +374,10 @@ void QWebElement::setAttributeNS(const QString &namespaceUri, const QString &nam } /*! - Returns the attributed called \a name. If the attribute does not exist \a defaultValue is - returned. + Returns the attribute with the given \a name. If the attribute does not + exist, \a defaultValue is returned. + + \sa setAttribute(), setAttributeNS(), attributeNS() */ QString QWebElement::attribute(const QString &name, const QString &defaultValue) const { @@ -355,8 +390,10 @@ QString QWebElement::attribute(const QString &name, const QString &defaultValue) } /*! - Returns the attributed called \a name in the namespace described with \a namespaceUri. - If the attribute does not exist \a defaultValue is returned. + Returns the attribute with the given \a name in \a namespaceUri. If the + attribute does not exist, \a defaultValue is returned. + + \sa setAtributeNS(), setAttribute(), attribute() */ QString QWebElement::attributeNS(const QString &namespaceUri, const QString &name, const QString &defaultValue) const { @@ -369,7 +406,10 @@ QString QWebElement::attributeNS(const QString &namespaceUri, const QString &nam } /*! - Returns true if this element has an attribute called \a name; otherwise returns false. + Returns true if this element has an attribute with the given \a name; + otherwise returns false. + + \sa attribute(), setAttribute() */ bool QWebElement::hasAttribute(const QString &name) const { @@ -379,8 +419,10 @@ bool QWebElement::hasAttribute(const QString &name) const } /*! - Returns true if this element has an attribute called \a name in the namespace described - with \a namespaceUri; otherwise returns false. + Returns true if this element has an attribute with the given \a name, in + \a namespaceUri; otherwise returns false. + + \sa attributeNS(), setAttributeNS() */ bool QWebElement::hasAttributeNS(const QString &namespaceUri, const QString &name) const { @@ -390,7 +432,9 @@ bool QWebElement::hasAttributeNS(const QString &namespaceUri, const QString &nam } /*! - Removes the attribute called \a name from this element. + Removes the attribute with the given \a name from this element. + + \sa attribute(), setAttribute(), hasAttribute() */ void QWebElement::removeAttribute(const QString &name) { @@ -401,8 +445,10 @@ void QWebElement::removeAttribute(const QString &name) } /*! - Removes the attribute called \a name in the namespace described with \a namespaceUri - from this element. + Removes the attribute with the given \a name, in \a namespaceUri, from this + element. + + \sa attributeNS(), setAttributeNS(), hasAttributeNS() */ void QWebElement::removeAttributeNS(const QString &namespaceUri, const QString &name) { @@ -413,7 +459,10 @@ void QWebElement::removeAttributeNS(const QString &namespaceUri, const QString & } /*! - Returns true if the element has any attributes defined; otherwise returns false; + Returns true if the element has any attributes defined; otherwise returns + false; + + \sa attribute(), setAttribute() */ bool QWebElement::hasAttributes() const { @@ -424,6 +473,8 @@ bool QWebElement::hasAttributes() const /*! Returns the geometry of this element, relative to its containing frame. + + \sa tagName() */ QRect QWebElement::geometry() const { @@ -434,6 +485,8 @@ QRect QWebElement::geometry() const /*! Returns the tag name of this element. + + \sa geometry() */ QString QWebElement::tagName() const { @@ -443,7 +496,8 @@ QString QWebElement::tagName() const } /*! - Returns the namespace prefix of the element or an empty string if the element has no namespace prefix. + Returns the namespace prefix of the element. If the element has no\ + namespace prefix, empty string is returned. */ QString QWebElement::prefix() const { @@ -453,8 +507,8 @@ QString QWebElement::prefix() const } /*! - If the element uses namespaces, this function returns the local name of the element; - otherwise it returns an empty string. + Returns the local name of the element. If the element does not use + namespaces, an empty string is returned. */ QString QWebElement::localName() const { @@ -464,7 +518,8 @@ QString QWebElement::localName() const } /*! - Returns the namespace URI of this element or an empty string if the element has no namespace URI. + Returns the namespace URI of this element. If the element has no namespace + URI, an empty string is returned. */ QString QWebElement::namespaceUri() const { @@ -474,8 +529,8 @@ QString QWebElement::namespaceUri() const } /*! - Returns the parent element of this element or a null element if this element - is the root document element. + Returns the parent element of this elemen. If this element is the root + document element, a null element is returned. */ QWebElement QWebElement::parent() const { @@ -485,9 +540,9 @@ QWebElement QWebElement::parent() const } /*! - Returns the first child element of this element. + Returns the element's first child. - \sa lastChild() previousSibling() nextSibling() + \sa lastChild(), previousSibling(), nextSibling() */ QWebElement QWebElement::firstChild() const { @@ -503,9 +558,9 @@ QWebElement QWebElement::firstChild() const } /*! - Returns the last child element of this element. + Returns the element's last child. - \sa firstChild() previousSibling() nextSibling() + \sa firstChild(), previousSibling(), nextSibling() */ QWebElement QWebElement::lastChild() const { @@ -521,9 +576,9 @@ QWebElement QWebElement::lastChild() const } /*! - Returns the next sibling element of this element. + Returns the element's next sibling. - \sa firstChild() previousSibling() lastChild() + \sa firstChild(), previousSibling(), lastChild() */ QWebElement QWebElement::nextSibling() const { @@ -539,9 +594,9 @@ QWebElement QWebElement::nextSibling() const } /*! - Returns the previous sibling element of this element. + Returns the element's previous sibling. - \sa firstChild() nextSibling() lastChild() + \sa firstChild(), nextSibling(), lastChild() */ QWebElement QWebElement::previousSibling() const { @@ -557,7 +612,7 @@ QWebElement QWebElement::previousSibling() const } /*! - Returns the document this element belongs to. + Returns the document which this element belongs to. */ QWebElement QWebElement::document() const { @@ -570,8 +625,8 @@ QWebElement QWebElement::document() const } /*! - Returns the web frame this elements is a part of. If the element is - a null element null is returned. + Returns the web frame which this element is a part of. If the element is a + null element, null is returned. */ QWebFrame *QWebElement::webFrame() const { @@ -647,7 +702,7 @@ static bool setupScriptObject(WebCore::Element* element, ScriptObject& object, S } /*! - Executes the \a scriptSource with this element as the `this' object. + Executes \a scriptSource with this element as \c this object. \sa callFunction() */ @@ -680,9 +735,10 @@ QVariant QWebElement::evaluateScript(const QString& scriptSource) /*! Calls the function with the given \a name and \a arguments. - The underlying DOM element that QWebElement wraps may have dedicated functions depending - on its type. For example a form element can have the "submit" function, that would submit - the form to the destination specified in the HTML. + The underlying DOM element that QWebElement wraps may have dedicated + functions, depending on its type. For example, a form element can have the + \c submit function, that would submit the form to the destination specified + in the HTML. \sa functions() */ @@ -713,7 +769,7 @@ QVariant QWebElement::callFunction(const QString &name, const QVariantList &argu /*! Returns a list of function names this element supports. - The function names returned are the same functions that are callable from the DOM + The function names returned are the same functions callable from the DOM element's JavaScript binding. \sa callFunction() @@ -763,14 +819,14 @@ QStringList QWebElement::functions() const } /*! - Returns the value of the element's \a name property. + Returns the value of the element's \a name property. If no such property + exists, an invalid QVariant is returned. - If no such property exists, the returned variant is invalid. + The return value's property has the same value as the corresponding + property in the element's JavaScript binding with the same name. - The return property has the same value as the corresponding property - in the element's JavaScript binding with the same name. - - Information about all available properties is provided through scriptProperties(). + Information about all available properties is provided through + scriptProperties(). \sa setScriptableProperty(), scriptableProperties() */ @@ -797,10 +853,11 @@ QVariant QWebElement::scriptableProperty(const QString &name) const /*! Sets the value of the element's \a name property to \a value. - Information about all available properties is provided through scriptProperties(). + Information about all available properties is provided through + scriptProperties(). - Setting the property will affect the corresponding property - in the element's JavaScript binding with the same name. + Setting the property will affect the corresponding property in the + element's JavaScript binding with the same name. \sa scriptableProperty(), scriptableProperties() */ @@ -827,8 +884,8 @@ void QWebElement::setScriptableProperty(const QString &name, const QVariant &val /*! Returns a list of property names this element supports. - The function names returned are the same properties that are accessible from the DOM - element's JavaScript binding. + The function names returned are the same properties that are accessible + from the DOM element's JavaScript binding. \sa setScriptableProperty(), scriptableProperty() */ @@ -894,10 +951,12 @@ QStringList QWebElement::scriptableProperties() const This enum describes how QWebElement's styleProperty resolves the given property name. - \value IgnoreCascadingStyles Return the property value as it is defined - in the element, without respecting style inheritance and other CSS rules. - \value RespectCascadingStyles The property's value is determined using - the inheritance and importance rules defined in the document's stylesheet. + \value IgnoreCascadingStyles Return the property value as it is defined in + the element, without respecting style inheritance and other CSS + rules. + \value RespectCascadingStyles The property's value is determined using the + inheritance and importance rules defined in the document's + stylesheet. */ /*! @@ -907,17 +966,17 @@ QStringList QWebElement::scriptableProperties() const This enum describes the priority newly set CSS properties should have when set using QWebElement::setStyleProperty(). - \value NormalStylePriority Define the property without important - priority even if "!important" is explicitly set in \a value. - \value DeclaredStylePriority Define the property respecting the - priority specified in \a value. - \value ImportantStylePriority Define the property to have - an important priority, this is equal to appending "!important" to the value. + \value NormalStylePriority Define the property without important priority + even if "!important" is explicitly set in \a value. + \value DeclaredStylePriority Define the property respecting the priority + specified in \a value. + \value ImportantStylePriority Define the property to have an important + priority. This is equal to appending "!important" to the value. */ /*! - Returns the value of the style named \a name or an empty string if such one - does not exist. + Returns the value of the style with the given \a name. If a style with + \name does not exist, an empty string is returned. If \a rule is IgnoreCascadingStyles, the value defined inside the element (inline in CSS terminology) is returned. @@ -925,14 +984,17 @@ QStringList QWebElement::scriptableProperties() const if \a rule is RespectCascadingStyles, the actual style applied to the element is returned. - In CSS, the cascading part has to do with which CSS rule has priority and - is thus applied. Generally speaking, the last defined rule has priority, - thus an inline style rule has priority over an embedded block style rule, - which in return has priority over an external style rule. + In CSS, the cascading part depends on which CSS rule has priority and is + thus applied. Generally, the last defined rule has priority. Thus, an + inline style rule has priority over an embedded block style rule, which + in return has priority over an external style rule. + + If the "!important" declaration is set on one of those, the declaration + receives highest priority, unless other declarations also use the + "!important" declaration. Then, the last "!important" declaration takes + predecence. - If the !important declaration is set on one of those, the declaration gets - highest priority, unless other declarations also use the !important - declaration, in which the last !important declaration takes predecence. + \sa setStyleProperty() */ QString QWebElement::styleProperty(const QString &name, ResolveRule rule) const { @@ -981,9 +1043,9 @@ QString QWebElement::styleProperty(const QString &name, ResolveRule rule) const } /*! - Sets the value of the style named \a name to \a value. + Sets the value of the style with the given \a name to \a value. - Setting a value, doesn't necessarily mean that it will become the applied + Setting a value, does not necessarily mean that it will become the applied value, due to the fact that the style property's value might have been set earlier with priority in external or embedded style declarations. @@ -998,7 +1060,8 @@ QString QWebElement::styleProperty(const QString &name, ResolveRule rule) const Using NormalStylePriority as \a priority, the property will have normal priority, and any "!important" declaration will be ignored. On the other hand, using ImportantStylePriority sets the important priority even when - not explicit passed in \a value. + it is not explicitly passed in \a value. + By using DeclaredStylePriority as \a priority the property will respect the priority specified in \a value. */ @@ -1035,7 +1098,8 @@ void QWebElement::setStyleProperty(const QString &name, const QString &value, St } /*! - Returns the computed value for style named \a name or an empty string if the style has no such name. + Returns the computed value for style with the given \a name. If a style + with \name does not exist, an empty string is returned. */ QString QWebElement::computedStyleProperty(const QString &name) const { @@ -1083,7 +1147,8 @@ QStringList QWebElement::classes() const } /*! - Returns true if this element has a class called \a name; otherwise returns false. + Returns true if this element has a class with the given \a name; otherwise + returns false. */ bool QWebElement::hasClass(const QString &name) const { @@ -1092,7 +1157,7 @@ bool QWebElement::hasClass(const QString &name) const } /*! - Adds the specified class \a name to the element. + Adds the specified class with the given \a name to the element. */ void QWebElement::addClass(const QString &name) { @@ -1105,7 +1170,7 @@ void QWebElement::addClass(const QString &name) } /*! - Removes the specified class \a name from the element. + Removes the specified class with the given \a name from the element. */ void QWebElement::removeClass(const QString &name) { @@ -1118,8 +1183,8 @@ void QWebElement::removeClass(const QString &name) } /*! - Adds the specified class \a name if it is not present, - removes it if it is already present. + Adds the specified class with the given \a name if it is not present. If + the class is already present, it will be removed. */ void QWebElement::toggleClass(const QString &name) { @@ -1134,11 +1199,11 @@ void QWebElement::toggleClass(const QString &name) } /*! - Appends \a element as the element's last child. + Appends the given \a element as the element's last child. - If \a element is the child of another element, it is re-parented - to this element. If \a element is a child of this element, then - its position in the list of children is changed. + If \a element is the child of another element, it is re-parented to this + element. If \a element is a child of this element, then its position in + the list of children is changed. Calling this function on a null element does nothing. @@ -1178,9 +1243,9 @@ void QWebElement::appendInside(const QString &markup) /*! Prepends \a element as the element's first child. - If \a element is the child of another element, it is re-parented - to this element. If \a element is a child of this element, then - its position in the list of children is changed. + If \a element is the child of another element, it is re-parented to this + element. If \a element is a child of this element, then its position in + the list of children is changed. Calling this function on a null element does nothing. @@ -1227,10 +1292,10 @@ void QWebElement::prependInside(const QString &markup) /*! - Inserts \a element before this element. + Inserts the given \a element before this element. - If \a element is the child of another element, it is re-parented - to the parent of this element. + If \a element is the child of another element, it is re-parented to the + parent of this element. Calling this function on a null element does nothing. @@ -1274,10 +1339,10 @@ void QWebElement::prependOutside(const QString &markup) } /*! - Inserts \a element after this element. + Inserts the given \a element after this element. - If \a element is the child of another element, it is re-parented - to the parent of this element. + If \a element is the child of another element, it is re-parented to the + parent of this element. Calling this function on a null element does nothing. @@ -1342,11 +1407,10 @@ QWebElement QWebElement::clone() const } /*! - Removes this element from the document and returns a reference - to this. + Removes this element from the document and returns a reference to it. - The element is still valid after removal, and can be inserted into - other parts of the document. + The element is still valid after removal, and can be inserted into other + parts of the document. \sa removeChildren(), removeFromDocument() */ @@ -1362,8 +1426,7 @@ QWebElement &QWebElement::takeFromDocument() } /*! - Removes this element from the document and makes this - a null element. + Removes this element from the document and makes it a null element. \sa removeChildren(), takeFromDocument() */ @@ -1414,9 +1477,10 @@ static RefPtr findInsertionPoint(PassRefPtr root) } /*! - Enclose the contents of this element in \a element as the child - of the deepest descendant element within the structure of the - first element provided. + Encloses the contents of this element with \a element. This element becomes + the child of the deepest descendant within \a element. + + ### illustration \sa encloseWith() */ @@ -1446,9 +1510,8 @@ void QWebElement::encloseContentsWith(const QWebElement &element) } /*! - Enclose the contents of this element in the result of parsing - \a markup as the child of the deepest descendant element within - the structure of the first element provided. + Encloses the contents of this element with the result of parsing \a markup. + This element becomes the child of the deepest descendant within \a markup. \sa encloseWith() */ @@ -1490,9 +1553,8 @@ void QWebElement::encloseContentsWith(const QString &markup) } /*! - Enclose this element in \a element as the child of the deepest - descendant element within the structure of the first element - provided. + Encloses this element with \a element. This element becomes the child of + the deepest descendant within \a element. \sa replace() */ @@ -1523,8 +1585,8 @@ void QWebElement::encloseWith(const QWebElement &element) } /*! - Enclose this element in the result of parsing \a markup, - as the last child. + Encloses this element with the result of parsing \a markup. This element + becomes the child of the deepest descendant within \a markup. \sa replace() */ @@ -1569,8 +1631,7 @@ void QWebElement::encloseWith(const QString &markup) /*! Replaces this element with \a element. - It is not possible to replace the , , or - elements using this method. + This method will not replace the , or elements. \sa encloseWith() */ @@ -1586,8 +1647,7 @@ void QWebElement::replace(const QWebElement &element) /*! Replaces this element with the result of parsing \a markup. - It is not possible to replace the , , or - elements using this method. + This method will not replace the , or elements. \sa encloseWith() */ @@ -1603,11 +1663,13 @@ void QWebElement::replace(const QString &markup) /*! \fn inline bool QWebElement::operator==(const QWebElement& o) const; - Returns true if this element points to the same underlying DOM object than \a o; otherwise returns false. + Returns true if this element points to the same underlying DOM object as + \a o; otherwise returns false. */ /*! \fn inline bool QWebElement::operator!=(const QWebElement& o) const; - Returns true if this element points to a different underlying DOM object than \a o; otherwise returns false. + Returns true if this element points to a different underlying DOM object + than \a o; otherwise returns false. */ -- cgit v0.12 From be4c288579314e2c11bd284d03a45007c2d3b300 Mon Sep 17 00:00:00 2001 From: Martin Smith Date: Thu, 13 Aug 2009 15:08:24 +0200 Subject: qdoc: Disabled reporting the NOTIFY signal until I know what it broke. Task-number: 259071 --- tools/qdoc3/cppcodeparser.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/qdoc3/cppcodeparser.cpp b/tools/qdoc3/cppcodeparser.cpp index ca12e92..ebe5ec9 100644 --- a/tools/qdoc3/cppcodeparser.cpp +++ b/tools/qdoc3/cppcodeparser.cpp @@ -1724,9 +1724,6 @@ bool CppCodeParser::matchProperty(InnerNode *parent) value = "?"; } - /* - Task 259071 requires work here. See gui/widgets/qdatetime.h, for example. - */ if (key == "READ") tre->addPropertyFunction(property, value, PropertyNode::Getter); else if (key == "WRITE") @@ -1737,9 +1734,11 @@ bool CppCodeParser::matchProperty(InnerNode *parent) property->setDesignable(value.toLower() == "true"); else if (key == "RESET") tre->addPropertyFunction(property, value, PropertyNode::Resetter); +#if 0 else if (key == "NOTIFY") { tre->addPropertyFunction(property, value, PropertyNode::Notifier); } +#endif } match(Tok_RightParen); return true; -- cgit v0.12 From e9b6e85b43bd233f16668dcb91da36e6dc31d4ff Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Thu, 13 Aug 2009 15:27:41 +0200 Subject: Fix auto test xmlpatternsschemats by adjusting build dependencies. --- tests/auto/auto.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index d7f27bd..dd188cd 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -444,6 +444,7 @@ SUBDIRS += checkxmlfiles \ xmlpatternsdiagnosticsts.depends = xmlpatternsxqts xmlpatternsview.depends = xmlpatternsxqts xmlpatternsxslts.depends = xmlpatternsxqts +xmlpatternsschemats.depends = xmlpatternsxqts } unix:!embedded:contains(QT_CONFIG, dbus):SUBDIRS += \ -- cgit v0.12 From 547af9bf8a2ec074a698f0b92ec9e2a1a935eb14 Mon Sep 17 00:00:00 2001 From: Prasanth Ullattil Date: Thu, 13 Aug 2009 15:30:59 +0200 Subject: Fix qmake warnings Removed the src/common.pri includes Reviewed-by: Trust Me --- tools/xmlpatterns/xmlpatterns.pro | 2 -- tools/xmlpatternsvalidator/xmlpatternsvalidator.pro | 2 -- 2 files changed, 4 deletions(-) diff --git a/tools/xmlpatterns/xmlpatterns.pro b/tools/xmlpatterns/xmlpatterns.pro index 9c1aac1..1c5ab2c 100644 --- a/tools/xmlpatterns/xmlpatterns.pro +++ b/tools/xmlpatterns/xmlpatterns.pro @@ -27,5 +27,3 @@ HEADERS = main.h \ qapplicationargumentparser.cpp \ qcoloringmessagehandler_p.h \ qcoloroutput_p.h - -include(../src/common.pri) diff --git a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro index dd5bd37..8491129 100644 --- a/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro +++ b/tools/xmlpatternsvalidator/xmlpatternsvalidator.pro @@ -15,5 +15,3 @@ CONFIG -= app_bundle SOURCES = main.cpp HEADERS = main.h - -include(../src/common.pri) -- cgit v0.12 From ff01481900f1d19d392c8ed8fe0f3b5c85751b8e Mon Sep 17 00:00:00 2001 From: Andreas Aardal Hanssen Date: Thu, 13 Aug 2009 12:20:52 +0200 Subject: Fix focus proxy deletion bugs/crashes in QGraphicsItem. This change would have been much simpler if either QGraphicsItem inherited QObject, or if we had some similar QPointer-like class that supported QGraphicsItem. The issue is this: Each item can delegate another item to be its focus proxy. That item can be a parent or child, or something completely unrelated. Either of the two items can be deleted independently. The former solution was to store backpointers in a map in the scene. Problem is, the items may not be in a scene when this happens, they may be removed from the scene, and the items may be moved between two scenes. The bad part about this fix is that it adds another pointer to QGraphicsItemPrivate. Reviewed-by: Shane Kearns --- src/gui/graphicsview/qgraphicsitem.cpp | 29 +++++++++++++----- src/gui/graphicsview/qgraphicsitem_p.h | 2 ++ src/gui/graphicsview/qgraphicsscene.cpp | 6 +--- src/gui/graphicsview/qgraphicsscene_p.h | 1 - tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp | 42 ++++++++++++++++++++++++++ 5 files changed, 66 insertions(+), 14 deletions(-) diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp index c3e5501..537dab7 100644 --- a/src/gui/graphicsview/qgraphicsitem.cpp +++ b/src/gui/graphicsview/qgraphicsitem.cpp @@ -1196,10 +1196,12 @@ QGraphicsItem::~QGraphicsItem() Q_ASSERT(d_ptr->children.isEmpty()); } - if (d_ptr->scene) + if (d_ptr->scene) { d_ptr->scene->d_func()->removeItemHelper(this); - else + } else { + d_ptr->resetFocusProxy(); d_ptr->setParentItemHelper(0); + } if (d_ptr->transformData) { for(int i = 0; i < d_ptr->transformData->graphicsTransforms.size(); ++i) { @@ -2613,13 +2615,11 @@ void QGraphicsItem::setFocusProxy(QGraphicsItem *item) } QGraphicsItem *lastFocusProxy = d_ptr->focusProxy; + if (lastFocusProxy) + lastFocusProxy->d_ptr->focusProxyRefs.removeOne(&d_ptr->focusProxy); d_ptr->focusProxy = item; - if (d_ptr->scene) { - if (lastFocusProxy) - d_ptr->scene->d_func()->focusProxyReverseMap.remove(lastFocusProxy, this); - if (item) - d_ptr->scene->d_func()->focusProxyReverseMap.insert(item, this); - } + if (item) + item->d_ptr->focusProxyRefs << &d_ptr->focusProxy; } /*! @@ -4626,6 +4626,19 @@ void QGraphicsItemPrivate::clearSubFocus() /*! \internal + Sets the focusProxy pointer to 0 for all items that have this item as their + focusProxy. ### Qt 5: Use QPointer instead. +*/ +void QGraphicsItemPrivate::resetFocusProxy() +{ + for (int i = 0; i < focusProxyRefs.size(); ++i) + *focusProxyRefs.at(i) = 0; + focusProxyRefs.clear(); +} + +/*! + \internal + Tells us if it is a proxy widget */ bool QGraphicsItemPrivate::isProxyWidget() const diff --git a/src/gui/graphicsview/qgraphicsitem_p.h b/src/gui/graphicsview/qgraphicsitem_p.h index 982cdfc..c654d4f 100644 --- a/src/gui/graphicsview/qgraphicsitem_p.h +++ b/src/gui/graphicsview/qgraphicsitem_p.h @@ -398,6 +398,7 @@ public: void setSubFocus(); void clearSubFocus(); + void resetFocusProxy(); inline QTransform transformToParent() const; inline void ensureSortedChildren(); @@ -419,6 +420,7 @@ public: int siblingIndex; int depth; QGraphicsItem *focusProxy; + QList focusProxyRefs; QGraphicsItem *subFocusItem; Qt::InputMethodHints imHints; diff --git a/src/gui/graphicsview/qgraphicsscene.cpp b/src/gui/graphicsview/qgraphicsscene.cpp index bdd1ac6..2178850 100644 --- a/src/gui/graphicsview/qgraphicsscene.cpp +++ b/src/gui/graphicsview/qgraphicsscene.cpp @@ -494,11 +494,7 @@ void QGraphicsScenePrivate::removeItemHelper(QGraphicsItem *item) item->d_func()->scene = 0; // Unregister focus proxy. - QMultiHash::iterator it = focusProxyReverseMap.find(item); - while (it != focusProxyReverseMap.end() && it.key() == item) { - it.value()->d_ptr->focusProxy = 0; - it = focusProxyReverseMap.erase(it); - } + item->d_ptr->resetFocusProxy(); // Remove from parent, or unregister from toplevels. if (QGraphicsItem *parentItem = item->parentItem()) { diff --git a/src/gui/graphicsview/qgraphicsscene_p.h b/src/gui/graphicsview/qgraphicsscene_p.h index 8b53306..836522d 100644 --- a/src/gui/graphicsview/qgraphicsscene_p.h +++ b/src/gui/graphicsview/qgraphicsscene_p.h @@ -131,7 +131,6 @@ public: QGraphicsWidget *activeWindow; int activationRefCount; void setFocusItemHelper(QGraphicsItem *item, Qt::FocusReason focusReason); - QMultiHash focusProxyReverseMap; QList popupWidgets; void addPopup(QGraphicsWidget *widget); diff --git a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp index eadf8b7..a623b50 100644 --- a/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp +++ b/tests/auto/qgraphicsitem/tst_qgraphicsitem.cpp @@ -280,6 +280,7 @@ private slots: void autoDetectFocusProxy(); void subFocus(); void reverseCreateAutoFocusProxy(); + void focusProxyDeletion(); // task specific tests below me void task141694_textItemEnsureVisible(); @@ -7516,5 +7517,46 @@ void tst_QGraphicsItem::reverseCreateAutoFocusProxy() QVERIFY(text2->hasFocus()); } +void tst_QGraphicsItem::focusProxyDeletion() +{ + QGraphicsRectItem *rect = new QGraphicsRectItem; + QGraphicsRectItem *rect2 = new QGraphicsRectItem; + rect->setFocusProxy(rect2); + QCOMPARE(rect->focusProxy(), (QGraphicsItem *)rect2); + + delete rect2; + QCOMPARE(rect->focusProxy(), (QGraphicsItem *)0); + + rect2 = new QGraphicsRectItem; + rect->setFocusProxy(rect2); + delete rect; // don't crash + + rect = new QGraphicsRectItem; + rect->setFocusProxy(rect2); + QGraphicsScene *scene = new QGraphicsScene; + scene->addItem(rect); + scene->addItem(rect2); + delete rect2; + QCOMPARE(rect->focusProxy(), (QGraphicsItem *)0); + + rect2 = new QGraphicsRectItem; + QTest::ignoreMessage(QtWarningMsg, "QGraphicsItem::setFocusProxy: focus proxy must be in same scene"); + rect->setFocusProxy(rect2); + QCOMPARE(rect->focusProxy(), (QGraphicsItem *)0); + scene->addItem(rect2); + rect->setFocusProxy(rect2); + QCOMPARE(rect->focusProxy(), (QGraphicsItem *)rect2); + delete rect; // don't crash + + rect = new QGraphicsRectItem; + rect2 = new QGraphicsRectItem; + rect->setFocusProxy(rect2); + QCOMPARE(rect->focusProxy(), (QGraphicsItem *)rect2); + scene->addItem(rect); + scene->addItem(rect2); + rect->setFocusProxy(rect2); + delete scene; // don't crash +} + QTEST_MAIN(tst_QGraphicsItem) #include "tst_qgraphicsitem.moc" -- cgit v0.12 From a55a7e06727610683a61461adfd144046d669b46 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 13 Aug 2009 15:52:51 +0200 Subject: clucene compiles on Windows CE now reimplmenting some missing C functions Task-number: 214990 Reviewed-by: kh --- src/3rdparty/clucene/src/CLucene/StdHeader.cpp | 2 ++ src/3rdparty/clucene/src/CLucene/StdHeader.h | 10 ++++++++++ src/3rdparty/clucene/src/CLucene/config/define_std.h | 3 +++ src/3rdparty/clucene/src/CLucene/config/repl_tchar.h | 20 ++++++++++++++++++++ src/3rdparty/clucene/src/CLucene/util/Misc.cpp | 10 ++++++++++ .../clucene/src/CLucene/util/fileinputstream.cpp | 5 +++++ 6 files changed, 50 insertions(+) diff --git a/src/3rdparty/clucene/src/CLucene/StdHeader.cpp b/src/3rdparty/clucene/src/CLucene/StdHeader.cpp index 9813a58..d64c51f 100644 --- a/src/3rdparty/clucene/src/CLucene/StdHeader.cpp +++ b/src/3rdparty/clucene/src/CLucene/StdHeader.cpp @@ -17,8 +17,10 @@ #if defined(_CLCOMPILER_MSVC) && defined(_DEBUG) # define CRTDBG_MAP_ALLOC # include +#ifndef UNDER_CE # include #endif +#endif CL_NS_USE(util) diff --git a/src/3rdparty/clucene/src/CLucene/StdHeader.h b/src/3rdparty/clucene/src/CLucene/StdHeader.h index d267d03..fbb3fd9 100644 --- a/src/3rdparty/clucene/src/CLucene/StdHeader.h +++ b/src/3rdparty/clucene/src/CLucene/StdHeader.h @@ -58,8 +58,10 @@ extern int _lucene_counter_break; //can set a watch on this #if defined(_CL_HAVE_UNISTD_H) #include #elif defined(_CL_HAVE_IO_H) && defined(_CL_HAVE_DIRECT_H) +#ifndef UNDER_CE #include #include +#endif #else #error "Neither unistd.h or (io.h & direct.h) were available" #endif @@ -75,7 +77,11 @@ extern int _lucene_counter_break; //can set a watch on this #if defined(_CL_STAT_MACROS_BROKEN) #error "Haven't implemented STAT_MACROS_BROKEN fix yet" #elif defined(_CL_HAVE_SYS_STAT_H) +#ifdef UNDER_CE + #include +#else #include +#endif #else #error "Haven't implemented platforms with no sys/stat.h" #endif @@ -179,13 +185,17 @@ extern int _lucene_counter_break; //can set a watch on this #include "CLucene/config/repl_tchar.h" #if defined(_CL_HAVE_ERRNO_H) +#ifndef UNDER_CE #include +#endif #else #error "Haven't implemented platforms with no errno.h" #endif #if defined(_CL_HAVE_FCNTL_H) +#ifndef UNDER_CE #include +#endif #else #error "Haven't implemented platforms with no fcntl.h" #endif diff --git a/src/3rdparty/clucene/src/CLucene/config/define_std.h b/src/3rdparty/clucene/src/CLucene/config/define_std.h index 3f92117..22a0790 100644 --- a/src/3rdparty/clucene/src/CLucene/config/define_std.h +++ b/src/3rdparty/clucene/src/CLucene/config/define_std.h @@ -72,6 +72,9 @@ #else #define _CL_HAVE_UNISTD_H #endif +#ifdef UNDER_CE +#undef _CL_HAVE_SYS_TIMEB_H +#endif //////////////////////////////////////////////// //now for individual functions. some compilers diff --git a/src/3rdparty/clucene/src/CLucene/config/repl_tchar.h b/src/3rdparty/clucene/src/CLucene/config/repl_tchar.h index d562cc8..ba8aef5 100644 --- a/src/3rdparty/clucene/src/CLucene/config/repl_tchar.h +++ b/src/3rdparty/clucene/src/CLucene/config/repl_tchar.h @@ -93,6 +93,26 @@ #endif #else //HAVE_TCHAR_H #include + +#ifdef UNDER_CE +#include +#define _i64tot i64tot +inline TCHAR* i64tot(__int64 value, TCHAR* str, int radix) +{ + QT_USE_NAMESPACE + _tcscpy(str, (TCHAR *) QString::number(value, radix).utf16()); + return str; +} + +#define _tcstoi64 tcstoi64 +inline __int64 tcstoi64(const TCHAR *nptr, TCHAR **endptr, int base) +{ + QT_USE_NAMESPACE + bool ok; + return QString::fromUtf16((ushort*) nptr).toInt(&ok, base); +} + +#endif //some tchar headers miss these... #ifndef _tcstoi64 diff --git a/src/3rdparty/clucene/src/CLucene/util/Misc.cpp b/src/3rdparty/clucene/src/CLucene/util/Misc.cpp index cb2efe2..42e3fd0 100644 --- a/src/3rdparty/clucene/src/CLucene/util/Misc.cpp +++ b/src/3rdparty/clucene/src/CLucene/util/Misc.cpp @@ -24,10 +24,15 @@ # include #endif +#ifdef UNDER_CE +#include +#endif + CL_NS_DEF(util) uint64_t Misc::currentTimeMillis() { +#ifndef UNDER_CE #if defined(_CLCOMPILER_MSVC) || defined(__MINGW32__) || defined(__BORLANDC__) struct _timeb tstruct; _ftime(&tstruct); @@ -41,6 +46,11 @@ uint64_t Misc::currentTimeMillis() return (((uint64_t) tstruct.tv_sec) * 1000) + tstruct.tv_usec / 1000; #endif +#else //UNDER_CE + QT_USE_NAMESPACE + QTime t = QTime::currentTime(); + return t.second() * 1000 + t.msec(); +#endif //UNDER_CE } // #pragma mark -- char related utils diff --git a/src/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp b/src/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp index 3803dfd..9125d84 100644 --- a/src/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp +++ b/src/3rdparty/clucene/src/CLucene/util/fileinputstream.cpp @@ -25,7 +25,10 @@ */ #include "jstreamsconfig.h" #include "fileinputstream.h" + +#ifndef UNDER_CE #include +#endif #include namespace jstreams { @@ -39,7 +42,9 @@ FileInputStream::FileInputStream(const char *filepath, int32_t buffersize) { error = "Could not read file '"; error += filepath; error += "': "; +#ifndef UNDER_CE error += strerror(errno); +#endif status = Error; return; } -- cgit v0.12 From b4db217bf195bda7ade32bda79be65b5d31e1c0e Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 13 Aug 2009 15:54:51 +0200 Subject: Assistant compiles on Windows CE no official support Task-number: 214990 Reviewed-by: kh --- tools/assistant/compat/mainwindow.cpp | 2 ++ tools/assistant/tools/assistant/remotecontrol.cpp | 6 ++++++ 2 files changed, 8 insertions(+) diff --git a/tools/assistant/compat/mainwindow.cpp b/tools/assistant/compat/mainwindow.cpp index 353efdb..13b555e 100644 --- a/tools/assistant/compat/mainwindow.cpp +++ b/tools/assistant/compat/mainwindow.cpp @@ -401,6 +401,7 @@ QString MainWindow::urlifyFileName(const QString &fileName) return name; } +#ifndef QT_NO_PRINTER class PrintThread : public QThread { QPrinter _printer; @@ -436,6 +437,7 @@ protected: _document = 0; } }; +#endif //QT_NO_PRINTER void MainWindow::on_actionFilePrint_triggered() { diff --git a/tools/assistant/tools/assistant/remotecontrol.cpp b/tools/assistant/tools/assistant/remotecontrol.cpp index b72d7e8..7867ba0 100644 --- a/tools/assistant/tools/assistant/remotecontrol.cpp +++ b/tools/assistant/tools/assistant/remotecontrol.cpp @@ -78,6 +78,8 @@ void StdInListenerWin::run() bool ok = true; char chBuf[4096]; DWORD dwRead; + +#ifndef Q_WS_WINCE HANDLE hStdin, hStdinDup; hStdin = GetStdHandle(STD_INPUT_HANDLE); @@ -89,6 +91,10 @@ void StdInListenerWin::run() 0, false, DUPLICATE_SAME_ACCESS); CloseHandle(hStdin); +#else + HANDLE hStdinDup; + hStdinDup = stdin; +#endif while (ok) { ok = ReadFile(hStdinDup, chBuf, 4096, &dwRead, NULL); -- cgit v0.12 From 1e6e479037670518630b3c234bd47ed39fa08dd2 Mon Sep 17 00:00:00 2001 From: Thomas Hartmann Date: Thu, 13 Aug 2009 15:55:57 +0200 Subject: fixing autotests for Windows CE (deployment - QHelp) Task-number: 214990 Reviewed-by: Joerg --- tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro | 16 +++++++++++++++- tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp | 2 ++ tests/auto/qhelpenginecore/tst_qhelpenginecore.pro | 17 ++++++++++++++++- 3 files changed, 33 insertions(+), 2 deletions(-) diff --git a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro index 7cd8d51..889aac9 100644 --- a/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro +++ b/tests/auto/qhelpcontentmodel/tst_qhelpcontentmodel.pro @@ -3,6 +3,20 @@ SOURCES += tst_qhelpcontentmodel.cpp CONFIG += help -DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_USE_USING_NAMESPACE !contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS + +wince*: { + DEFINES += SRCDIR=\\\"./\\\" + QT += network + addFiles.sources = $$PWD/data/*.* + addFiles.path = data + clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll + + DEPLOYMENT += addFiles + DEPLOYMENT += clucene + + DEPLOYMENT_PLUGIN += qsqlite +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} \ No newline at end of file diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp index 499c367..d765c25 100644 --- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp +++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.cpp @@ -98,6 +98,8 @@ void tst_QHelpEngineCore::init() // defined in profile m_path = QLatin1String(SRCDIR); + m_path = QFileInfo(m_path).absoluteFilePath(); + m_colFile = m_path + QLatin1String("/data/col.qhc"); if (QFile::exists(m_colFile)) QDir::current().remove(m_colFile); diff --git a/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro b/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro index 11fca8e..27ebd0f 100644 --- a/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro +++ b/tests/auto/qhelpenginecore/tst_qhelpenginecore.pro @@ -3,6 +3,21 @@ SOURCES += tst_qhelpenginecore.cpp CONFIG += help QT += sql -DEFINES += SRCDIR=\\\"$$PWD\\\" + DEFINES += QT_USE_USING_NAMESPACE !contains(QT_BUILD_PARTS, tools): DEFINES += QT_NO_BUILD_TOOLS + +wince*: { + DEFINES += SRCDIR=\\\"./\\\" + QT += network + addFiles.sources = $$PWD/data/*.* + addFiles.path = data + clucene.sources = $$QT_BUILD_TREE/lib/QtCLucene*.dll + + DEPLOYMENT += addFiles + DEPLOYMENT += clucene + + DEPLOYMENT_PLUGIN += qsqlite +} else { + DEFINES += SRCDIR=\\\"$$PWD\\\" +} -- cgit v0.12 From 9f13cde554e1a56fade3b9b298b264c54b1ef4b9 Mon Sep 17 00:00:00 2001 From: Paul Olav Tvete Date: Thu, 13 Aug 2009 16:20:27 +0200 Subject: Use the correct font for QLineEdit We don't get a FontChange event initially, so the control ended up with the default font instead. Reviewed-by: Andreas --- src/gui/widgets/qlineedit_p.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index 5950d85..08fce9b 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -138,6 +138,7 @@ void QLineEditPrivate::init(const QString& txt) { Q_Q(QLineEdit); control = new QLineControl(txt); + control->setFont(q->font()); QObject::connect(control, SIGNAL(textChanged(const QString &)), q, SIGNAL(textChanged(const QString &))); QObject::connect(control, SIGNAL(textEdited(const QString &)), -- cgit v0.12 From e2bb75e66f7ef9dda6fae489ebbb30ffb5e9e37e Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 13 Aug 2009 16:57:51 +0200 Subject: Fix coverity warnings for unreachable code, break missing and uninitialized members in constructors --- src/corelib/kernel/qvariant.cpp | 1 + src/gui/kernel/qkde.cpp | 2 -- src/gui/styles/qcommonstyle.cpp | 3 +-- src/gui/widgets/qmainwindow.cpp | 4 +--- 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp index dfed4db..b26cfdd 100644 --- a/src/corelib/kernel/qvariant.cpp +++ b/src/corelib/kernel/qvariant.cpp @@ -658,6 +658,7 @@ static bool convert(const QVariant::Private *d, QVariant::Type t, void *result, break; case QVariant::Url: *str = v_cast(d)->toString(); + break; default: return false; } diff --git a/src/gui/kernel/qkde.cpp b/src/gui/kernel/qkde.cpp index 23de838..98bf0a0 100644 --- a/src/gui/kernel/qkde.cpp +++ b/src/gui/kernel/qkde.cpp @@ -139,8 +139,6 @@ QString QKde::kdeStyle() return QLatin1String("plastique"); else return QLatin1String("windows"); - - return QString(); } /*!\internal diff --git a/src/gui/styles/qcommonstyle.cpp b/src/gui/styles/qcommonstyle.cpp index d4940d6..cce35b7 100644 --- a/src/gui/styles/qcommonstyle.cpp +++ b/src/gui/styles/qcommonstyle.cpp @@ -5196,8 +5196,7 @@ int QCommonStyle::styleHint(StyleHint sh, const QStyleOption *opt, const QWidget ret = Qt::ToolButtonIconOnly; #ifdef Q_WS_X11 { - Q_D(const QCommonStyle); - static int buttonStyle = d->lookupToolButtonStyle(); + static int buttonStyle = d_func()->lookupToolButtonStyle(); return buttonStyle; } #endif diff --git a/src/gui/widgets/qmainwindow.cpp b/src/gui/widgets/qmainwindow.cpp index 9243217..88059a0 100644 --- a/src/gui/widgets/qmainwindow.cpp +++ b/src/gui/widgets/qmainwindow.cpp @@ -73,7 +73,7 @@ class QMainWindowPrivate : public QWidgetPrivate Q_DECLARE_PUBLIC(QMainWindow) public: inline QMainWindowPrivate() - : layout(0), toolButtonStyle(Qt::ToolButtonIconOnly) + : layout(0), explicitIconSize(false), toolButtonStyle(Qt::ToolButtonIconOnly) #ifdef Q_WS_MAC , useHIToolBar(false) #endif @@ -107,8 +107,6 @@ void QMainWindowPrivate::init() layout = new QMainWindowLayout(q); const int metric = q->style()->pixelMetric(QStyle::PM_ToolBarIconSize, 0, q); iconSize = QSize(metric, metric); - explicitIconSize = false; - q->setAttribute(Qt::WA_Hover); } -- cgit v0.12 From a2cc46c89e73d089f333423f8382eb7582699e39 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Wed, 12 Aug 2009 11:52:15 +0200 Subject: Internal doc: explain how QSharedPointer works --- src/corelib/tools/qsharedpointer.cpp | 266 ++++++++++++++++++++++++++++++++ src/corelib/tools/qsharedpointer_impl.h | 57 ++++--- 2 files changed, 305 insertions(+), 18 deletions(-) diff --git a/src/corelib/tools/qsharedpointer.cpp b/src/corelib/tools/qsharedpointer.cpp index e3e1db6..60c7db4 100644 --- a/src/corelib/tools/qsharedpointer.cpp +++ b/src/corelib/tools/qsharedpointer.cpp @@ -107,6 +107,249 @@ cases, since they have the same functionality. See \l{QWeakPointer#tracking-qobject} for more information. + \section1 Optional pointer tracking + + A feature of QSharedPointer that can be enabled at compile-time for + debugging purposes is a pointer tracking mechanism. When enabled, + QSharedPointer registers in a global set all the pointers that it tracks. + This allows one to catch mistakes like assigning the same pointer to two + QSharedPointer objects. + + This function is enabled by defining the \tt{QT_SHAREDPOINTER_TRACK_POINTERS} + macro before including the QSharedPointer header. + + It is safe to use this feature even with code compiled without the + feature. QSharedPointer will ensure that the pointer is removed from the + tracker even from code compiled without pointer tracking. + + Note, however, that the pointer tracking feature has limitations on + multiple- or virtual-inheritance (that is, in cases where two different + pointer addresses can refer to the same object). In that case, if a + pointer is cast to a different type and its value changes, + QSharedPointer's pointer tracking mechanism mail fail to detect that the + object being tracked is the same. + + \omit + \secton1 QSharedPointer internals + + QSharedPointer is in reality implemented by two ancestor classes: + QtSharedPointer::Basic and QtSharedPointer::ExternalRefCount. The reason + for having that split is now mostly legacy: in the beginning, + QSharedPointer was meant to support both internal reference counting and + external reference counting. + + QtSharedPointer::Basic implements the basic functionality that is shared + between internal- and external-reference counting. That is, it's mostly + the accessor functions into QSharedPointer. Those are all inherited by + QSharedPointer, which adds another level of shared functionality (the + constructors and assignment operators). The Basic class has one member + variable, which is the actual pointer being tracked. + + QtSharedPointer::ExternalRefCount implements the actual reference + counting and introduces the d-pointer for QSharedPointer. That d-pointer + itself is shared with with other QSharedPointer objects as well as + QWeakPointer. + + The reason for keeping the pointer value itself outside the d-pointer is + because of multiple inheritance needs. If you have two QSharedPointer + objects of different pointer types, but pointing to the same object in + memory, it could happen that the pointer values are different. The \tt + differentPointers autotest exemplifies this problem. The same thing could + happen in the case of virtual inheritance: a pointer of class matching + the virtual base has different address compared to the pointer of the + complete object. See the \tt virtualBaseDifferentPointers autotest for + this problem. + + The d pointer is of type QtSharedPointer::ExternalRefCountData for simple + QSharedPointer objects, but could be of a derived type in some cases. It + is basically a reference-counted reference-counter. + + \section2 d-pointer + \section3 QtSharedPointer::ExternalRefCountData + + This class is basically a reference-counted reference-counter. It has two + members: \tt strongref and \tt weakref. The strong reference counter is + controlling the lifetime of the object tracked by QSharedPointer. a + positive value indicates that the object is alive. It's also the number + of QSharedObject instances that are attached to this Data. + + When the strong reference count decreases to zero, the object is deleted + (see below for information on custom deleters). The strong reference + count can also exceptionally be -1, indicating that there are no + QSharedPointers attached to an object, which is tracked too. The only + case where this is possible is that of + \l{QWeakPointer#tracking-qobject}{QWeakPointers tracking a QObject}. + + The weak reference count controls the lifetime of the d-pointer itself. + It can be thought of as an internal/intrusive reference count for + ExternalRefCountData itself. This count is equal to the number of + QSharedPointers and QWeakPointers that are tracking this object. (In case + the object tracked derives from QObject, this number is increased by 1, + since QObjectPrivate tracks it too). + + ExternalRefCountData is a virtual class: it has a virtual destructor and + a virtual destroy() function. The destroy() function is supposed to + delete the object being tracked and return true if it does so. Otherwise, + it returns false to indicate that the caller must simply call delete. + This allows the normal use-case of QSharedPointer without custom deleters + to use only one 12- or 16-byte (depending on whether it's a 32- or 64-bit + architecture) external descriptor structure, without paying the price for + the custom deleter that it isn't using. + + \section3 QtSharedPointer::ExternalRefCountDataWithDestroyFn + + This class is not used directly, per se. It only exists to enable the two + classes that derive from it. It adds one member variable, which is a + pointer to a function (which returns void and takes an + ExternalRefCountData* as a parameter). It also overrides the destroy() + function: it calls that function pointer with \tt this as parameter, and + returns true. + + That means when ExternalRefCountDataWithDestroyFn is used, the \tt + destroyer field must be set to a valid function that \b will delete the + object tracked. + + This class also adds an operator delete function to ensure that simply + calls the global operator delete. That should be the behaviour in all + compilers already, but to be on the safe side, this class ensures that no + funny business happens. + + On a 32-bit architecture, this class is 16 bytes in size, whereas it's 24 + bytes on 64-bit. (On Itanium where function pointers contain the global + pointer, it can be 32 bytes). + + \section3 QtSharedPointer::ExternalRefCountWithCustomDeleter + + This class derives from ExternalRefCountDataWithDestroyFn and is a + template class. As template parameters, it has the type of the pointer + being tracked (\tt T) and a \tt Deleter, which is anything. It adds two + fields to its parent class, matching those template parameters: a member + of type \tt Deleter and a member of type \tt T*. + + The purpose of this class is to store the pointer to be deleted and the + deleter code along with the d-pointer. This allows the last strong + reference to call any arbitrary function that disposes of the object. For + example, this allows calling QObject::deleteLater() on a given object. + The pointer to the object is kept here to avoid the extra cost of keeping + the deleter in the generic case. + + This class is never instantiated directly: the constructors and + destructor are private. Only the create() function may be called to + return an object of this type. See below for construction details. + + The size of this class depends on the size of \tt Deleter. If it's an + empty functor (i.e., no members), ABIs generally assign it the size of 1. + But given that it's followed by a pointer, up to 3 or 7 padding bytes may + be inserted: in that case, the size of this class is 16+4+4 = 24 bytes on + 32-bit architectures, or 24+8+8 = 40 bytes on 64-bit architectures (48 + bytes on Itanium with global pointers stored). If \tt Deleter is a + function pointer, the size should be the same as the empty structure + case, except for Itanium where it may be 56 bytes due to another global + pointer. If \tt Deleter is a pointer to a member function (PMF), the size + will be even bigger and will depend on the ABI. For architectures using + the Itanium C++ ABI, a PMF is twice the size of a normal pointer, or 24 + bytes on Itanium itself. In that case, the size of this structure will be + 16+8+4 = 28 bytes on 32-bit architectures, 24+16+8 = 48 bytes on 64-bit, + and 32+24+8 = 64 bytes on Itanium. + + (Values for Itanium consider an LP64 architecture; for ILP32, pointers + are 32-bit in length, function pointers are 64-bit and PMF are 96-bit, so + the sizes are slightly less) + + \section3 QtSharedPointer::ExternalRefCountWithContiguousData + + This class also derives from ExternalRefCountDataWithDestroyFn and it is + also a template class. The template parameter is the type \tt T of the + class which QSharedPointer tracks. It adds only one member to its parent, + which is of type \tt T (the actual type, not a pointer to it). + + The purpose of this class is to lay the \tt T object out next to the + reference counts, saving one memory allocation per shared pointer. This + is particularly interesting for small \tt T or for the cases when there + are few if any QWeakPointer tracking the object. This class exists to + implement the QSharedPointer::create() call. + + Like ExternalRefCountWithCustomDeleter, this class is never instantiated + directly. This class also provides a create() member that returns the + pointer, and hides its constructors and destructor. (With C++0x, we'd + delete them). + + The size of this class depends on the size of \tt T. + + \section3 Instantiating ExternalRefCountWithCustomDeleter and ExternalRefCountWithContiguousData + + Like explained above, these classes have private constructors. Moreover, + they are not defined anywhere, so trying to call \tt{new ClassType} would + result in a compilation or linker error. Instead, these classes must be + constructed via their create() methods. + + Instead of instantiating the class by the normal way, the create() method + calls \tt{operator new} directly with the size of the class, then calls + the parent class's constructor only (ExternalRefCountDataWithDestroyFn). + This ensures that the inherited members are initialised properly, as well + as the virtual table pointer, which must point to + ExternalRefCountDataWithDestroyFn's virtual table. That way, we also + ensure that the virtual destructor being called is + ExternalRefCountDataWithDestroyFn's. + + After initialising the base class, the + ExternalRefCountWithCustomDeleter::create() function initialises the new + members directly, by using the placement \tt{operator new}. In the case + of the ExternalRefCountWithContiguousData::create() function, the address + to the still-uninitialised \tt T member is saved for the callee to use. + The member is only initialised in QSharedPointer::create(), so that we + avoid having many variants of the internal functions according to the + arguments in use for calling the constructor. + + When initialising the parent class, the create() functions pass the + address of the static deleter() member function. That is, when the + virtual destroy() is called by QSharedPointer, the deleter() functions + are called instead. These functiosn static_cast the ExternalRefCountData* + parameter to their own type and execute their deletion: for the + ExternalRefCountWithCustomDeleter::deleter() case, it runs the user's + custom deleter, then destroys the deleter; for + ExternalRefCountWithContiguousData::deleter, it simply calls the \tt T + destructor directly. + + By not calling the constructor of the derived classes, we avoid + instantiating their virtual tables. Since these classes are + template-based, there would be one virtual table per \tt T and \tt + Deleter type. (This is what Qt 4.5 did) + + Instead, only one non-inline function is required per template, which is + the deleter() static member. All the other functions can be inlined. + What's more, the address of deleter() is calculated only in code, which + can be resolved at link-time if the linker can determine that the + function lies in the current application or library module (since these + classes are not exported, that is the case for Windows or for builds with + \tt{-fvisibility=hidden}). + + In contrast, a virtual table would require at least 3 relocations to be + resolved at module load-time, per module where these classes are used. + (In the Itanium C++ ABI, there would be more relocations, due to the + RTTI) + + \section3 Modifications due to pointer-tracking + + To ensure that pointers created with pointer-tracking enabled get + un-tracked when destroyed, even if destroyed by code compiled without the + feature, QSharedPointer modifies slightly the instructions of the + previous sections. + + When ExternalRefCountWithCustomDeleter or + ExternalRefCountWithContiguousData are used, their create() functions + will set the ExternalRefCountDataWithDestroyFn::destroyer function + pointer to safetyCheckDeleter() instead. These static member functions + simply call internalSafetyCheckRemove2() before passing control to the + normal deleter() function. + + If neither custom deleter nor QSharedPointer::create() are used, then + QSharedPointer uses a custom deleter of its own: the normalDeleter() + function, which simply calls \tt delete. By using a custom deleter, the + safetyCheckDeleter() procedure described above kicks in. + + \endomit + \sa QSharedDataPointer, QWeakPointer */ @@ -182,6 +425,29 @@ QWeakPointers created from QObject should never be passed to code that hasn't been recompiled. + \omit + \secton1 QWeakPointer internals + + QWeakPointer shares most of its internal functionality with + \l{QSharedPointer#qsharedpointer-internals}{QSharedPointer}, so see that + class's internal documentation for more information. + + QWeakPointer requires an external reference counter in order to operate. + Therefore, it is incompatible by design with \l QSharedData-derived + classes. + + It has a special QObject constructor, which works by calling + QtSharedPointer::ExternalRefCountData::getAndRef, which retrieves the + d-pointer from QObjectPrivate. If one isn't set yet, that function + creates the d-pointer and atomically sets it. + + If getAndRef needs to create a d-pointer, it sets the strongref to -1, + indicating that the QObject is not shared: QWeakPointer is used only to + determine whether the QObject has been deleted. In that case, it cannot + be upgraded to QSharedPointer (see the previous section). + + \endomit + \sa QSharedPointer */ diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h index ba479f9..cbeb79f 100644 --- a/src/corelib/tools/qsharedpointer_impl.h +++ b/src/corelib/tools/qsharedpointer_impl.h @@ -115,6 +115,9 @@ namespace QtSharedPointer { template struct RemovePointer > { typedef T Type; }; template struct RemovePointer > { typedef T Type; }; + // This class provides the basic functionality of a pointer wrapper. + // Its existence is mostly legacy, since originally QSharedPointer + // could also be used for internally-refcounted objects. template class Basic { @@ -155,6 +158,12 @@ namespace QtSharedPointer { Type *value; }; + // This class is the d-pointer of QSharedPointer and QWeakPointer. + // + // It is a reference-counted reference counter. "strongref" is the inner + // reference counter, and it tracks the lifetime of the pointer itself. + // "weakref" is the outer reference counter and it tracks the lifetime of + // the ExternalRefCountData object. struct ExternalRefCountData { QBasicAtomicInt weakref; @@ -168,6 +177,9 @@ namespace QtSharedPointer { inline ExternalRefCountData(Qt::Initialization) { } virtual inline ~ExternalRefCountData() { Q_ASSERT(!weakref); Q_ASSERT(strongref <= 0); } + // overridden by derived classes + // returns false to indicate caller should delete the pointer + // returns true in case it has already done so virtual inline bool destroy() { return false; } #ifndef QT_NO_QOBJECT @@ -178,18 +190,8 @@ namespace QtSharedPointer { }; // sizeof(ExternalRefCount) = 12 (32-bit) / 16 (64-bit) - template - struct CustomDeleter - { - Deleter deleter; - T *ptr; - - inline CustomDeleter(T *p, Deleter d) : deleter(d), ptr(p) {} - }; - // sizeof(CustomDeleter) = sizeof(Deleter) + sizeof(void*) - // for Deleter = function pointer: 8 (32-bit) / 16 (64-bit) - // for Deleter = PMF: 12 (32-bit) / 24 (64-bit) (GCC) - + // This class extends ExternalRefCountData with a pointer + // to a function, which is called by the destroy() function. struct ExternalRefCountWithDestroyFn: public ExternalRefCountData { typedef void (*DestroyerFn)(ExternalRefCountData *); @@ -204,13 +206,26 @@ namespace QtSharedPointer { }; // sizeof(ExternalRefCountWithDestroyFn) = 16 (32-bit) / 24 (64-bit) + // This class extends ExternalRefCountWithDestroyFn and implements + // the static function that deletes the object. The pointer and the + // custom deleter are kept in the "extra" member. template struct ExternalRefCountWithCustomDeleter: public ExternalRefCountWithDestroyFn { typedef ExternalRefCountWithCustomDeleter Self; - typedef ExternalRefCountWithDestroyFn Parent; - typedef CustomDeleter Next; - Next extra; + typedef ExternalRefCountWithDestroyFn BaseClass; + + struct CustomDeleter + { + Deleter deleter; + T *ptr; + + inline CustomDeleter(T *p, Deleter d) : deleter(d), ptr(p) {} + }; + CustomDeleter extra; + // sizeof(CustomDeleter) = sizeof(Deleter) + sizeof(void*) + // for Deleter = function pointer: 8 (32-bit) / 16 (64-bit) + // for Deleter = PMF: 12 (32-bit) / 24 (64-bit) (GCC) static inline void deleter(ExternalRefCountData *self) { @@ -218,7 +233,7 @@ namespace QtSharedPointer { executeDeleter(realself->extra.ptr, realself->extra.deleter); // delete the deleter too - realself->extra.~Next(); + realself->extra.~CustomDeleter(); } static void safetyCheckDeleter(ExternalRefCountData *self) { @@ -236,8 +251,8 @@ namespace QtSharedPointer { Self *d = static_cast(::operator new(sizeof(Self))); // initialize the two sub-objects - new (&d->extra) Next(ptr, userDeleter); - new (d) Parent(destroy); // can't throw + new (&d->extra) CustomDeleter(ptr, userDeleter); + new (d) BaseClass(destroy); // can't throw return d; } @@ -247,6 +262,10 @@ namespace QtSharedPointer { ~ExternalRefCountWithCustomDeleter(); }; + // This class extends ExternalRefCountWithDestroyFn and adds a "T" + // member. That way, when the create() function is called, we allocate + // memory for both QSharedPointer's d-pointer and the actual object being + // tracked. template struct ExternalRefCountWithContiguousData: public ExternalRefCountWithDestroyFn { @@ -289,6 +308,8 @@ namespace QtSharedPointer { ~ExternalRefCountWithContiguousData(); }; + // This is the main body of QSharedPointer. It implements the + // external reference counting functionality. template class ExternalRefCount: public Basic { -- cgit v0.12 From 07fcb3b032526e76086d7f75dad01b867233b5d5 Mon Sep 17 00:00:00 2001 From: Thiago Macieira Date: Thu, 13 Aug 2009 14:59:40 +0200 Subject: Add QIntegerForSize<1> and QIntegerForSize<2>. Undocumented, but maybe they're useful somewhere. It doesn't hurt to add them. --- src/corelib/global/qglobal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 7076a1e..5a2c329 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -848,6 +848,8 @@ typedef quint64 qulonglong; && sizeof(void *) == sizeof(qptrdiff) */ template struct QIntegerForSize; +template <> struct QIntegerForSize<1> { typedef quint8 Unsigned; typedef qint8 Signed; }; +template <> struct QIntegerForSize<2> { typedef quint16 Unsigned; typedef qint16 Signed; }; template <> struct QIntegerForSize<4> { typedef quint32 Unsigned; typedef qint32 Signed; }; template <> struct QIntegerForSize<8> { typedef quint64 Unsigned; typedef qint64 Signed; }; template struct QIntegerForSizeof: QIntegerForSize { }; -- cgit v0.12 From 942abf1a3ba60a60207a213dbeb383904f97e47d Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 13 Aug 2009 17:30:02 +0200 Subject: fixing return values _wchmod on Windows CE _wchmod returns 0 on success and -1 on error. Our Windows CE implementation did it wrong. Thanks to Konstantin Ritt for spotting this! Reviewed-by: mauricek --- src/corelib/io/qfsfileengine_win.cpp | 2 +- src/corelib/kernel/qfunctions_wince.cpp | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 3394a00..ba93a94 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1706,7 +1706,7 @@ bool QFSFileEngine::setPermissions(uint perms) #if !defined(Q_OS_WINCE) ret = ::_wchmod((wchar_t*)d->filePath.utf16(), mode) == 0; #else - ret = ::_wchmod((wchar_t*)d->longFileName(d->filePath).utf16(), mode); + ret = ::_wchmod((wchar_t*)d->longFileName(d->filePath).utf16(), mode) == 0; #endif return ret; } diff --git a/src/corelib/kernel/qfunctions_wince.cpp b/src/corelib/kernel/qfunctions_wince.cpp index 2b5d4fe..77f680a 100644 --- a/src/corelib/kernel/qfunctions_wince.cpp +++ b/src/corelib/kernel/qfunctions_wince.cpp @@ -292,13 +292,14 @@ bool qt_wince__chmod(const char *file, int mode) bool qt_wince__wchmod(const wchar_t *file, int mode) { + BOOL success = FALSE; // ### Does not work properly, what about just adding one property? if(mode&_S_IWRITE) { - return SetFileAttributes(file, FILE_ATTRIBUTE_NORMAL); + success = SetFileAttributes(file, FILE_ATTRIBUTE_NORMAL); } else if((mode&_S_IREAD) && !(mode&_S_IWRITE)) { - return SetFileAttributes(file, FILE_ATTRIBUTE_READONLY); + success = SetFileAttributes(file, FILE_ATTRIBUTE_READONLY); } - return false; + return success ? 0 : -1; } HANDLE qt_wince_CreateFileA(LPCSTR filename, DWORD access, DWORD share, LPSECURITY_ATTRIBUTES attr, DWORD dispo, DWORD flags, HANDLE tempFile) -- cgit v0.12 From f82a226607b079b360c88afbe0423d990071b0ba Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Thu, 13 Aug 2009 17:37:05 +0200 Subject: Fix coverity warnings --- src/gui/itemviews/qabstractitemview.cpp | 1 + src/gui/itemviews/qlistview.cpp | 3 ++- src/gui/itemviews/qtreeview.cpp | 9 ++++----- src/gui/itemviews/qtreeview_p.h | 2 +- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index 769ccef..4f32ecc 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -73,6 +73,7 @@ QAbstractItemViewPrivate::QAbstractItemViewPrivate() currentlyCommittingEditor(0), pressedModifiers(Qt::NoModifier), pressedPosition(QPoint(-1, -1)), + pressedAlreadySelected(false), viewportEnteredNeeded(false), state(QAbstractItemView::NoState), editTriggers(QAbstractItemView::DoubleClicked|QAbstractItemView::EditKeyPressed), diff --git a/src/gui/itemviews/qlistview.cpp b/src/gui/itemviews/qlistview.cpp index 945d5e7..1870a3b 100644 --- a/src/gui/itemviews/qlistview.cpp +++ b/src/gui/itemviews/qlistview.cpp @@ -1968,7 +1968,8 @@ QListViewPrivate::QListViewPrivate() modeProperties(0), column(0), uniformItemSizes(false), - batchSize(100) + batchSize(100), + showElasticBand(false) { } diff --git a/src/gui/itemviews/qtreeview.cpp b/src/gui/itemviews/qtreeview.cpp index cbe1d2a..539a642 100644 --- a/src/gui/itemviews/qtreeview.cpp +++ b/src/gui/itemviews/qtreeview.cpp @@ -2797,15 +2797,14 @@ int QTreeView::indexRowSizeHint(const QModelIndex &index) const if (isRightToLeft()) { start = (start == -1 ? count - 1 : start); - end = (end == -1 ? 0 : end); + end = 0; } else { start = (start == -1 ? 0 : start); - end = (end == -1 ? count - 1 : end); + end = count - 1; } - int tmp = start; - start = qMin(start, end); - end = qMax(tmp, end); + if (end < start) + qSwap(end, start); int height = -1; QStyleOptionViewItemV4 option = d->viewOptionsV4(); diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h index d17016f..1bbba89 100644 --- a/src/gui/itemviews/qtreeview_p.h +++ b/src/gui/itemviews/qtreeview_p.h @@ -82,7 +82,7 @@ public: uniformRowHeights(false), rootDecoration(true), itemsExpandable(true), sortingEnabled(false), expandsOnDoubleClick(true), - allColumnsShowFocus(false), current(0), + allColumnsShowFocus(false), current(0), spanning(false), animationsEnabled(false), columnResizeTimerID(0), autoExpandDelay(-1), hoverBranch(-1), geometryRecursionBlock(false) {} -- cgit v0.12 From e2eaf3cd9ce752fe88d2705111f28a5ad4a336ab Mon Sep 17 00:00:00 2001 From: Frans Englich Date: Thu, 13 Aug 2009 18:10:20 +0200 Subject: Fix build, by adjusting according to how test QProcess is. --- tests/auto/qtextcodec/test/test.pro | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tests/auto/qtextcodec/test/test.pro b/tests/auto/qtextcodec/test/test.pro index 9c07e76..99f94d4 100644 --- a/tests/auto/qtextcodec/test/test.pro +++ b/tests/auto/qtextcodec/test/test.pro @@ -1,6 +1,21 @@ load(qttest_p4) -TARGET = ../tst_qtextcodec + SOURCES += ../tst_qtextcodec.cpp + +!wince*: { +TARGET = ../tst_qtextcodec + +win32: { + CONFIG(debug, debug|release) { + TARGET = ../../debug/tst_qtextcodec +} else { + TARGET = ../../release/tst_qtextcodec + } +} +} else { + TARGET = tst_qtextcodec +} + wince*: { addFiles.sources = ../*.txt addFiles.path = . -- cgit v0.12 From 8de0b23ad3a49569d25f2fba803c622689581c19 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Thu, 13 Aug 2009 18:44:33 +0200 Subject: remove needless resolvings in qfsfileengine_win.cpp OpenProcessToken and SetFilePointerEx are present in all versions since NT4.0; use them if Q_OS_WINCE is not defined Merge-request: 1167 Reviewed-by: Joerg Bornemann --- src/corelib/io/qfsfileengine_win.cpp | 84 +++++++++++++----------------------- 1 file changed, 31 insertions(+), 53 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index ba93a94..d7d1684 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -119,12 +119,8 @@ typedef PVOID (WINAPI *PtrFreeSid)(PSID); static PtrFreeSid ptrFreeSid = 0; static TRUSTEE_W currentUserTrusteeW; -typedef BOOL (WINAPI *PtrOpenProcessToken)(HANDLE, DWORD, PHANDLE ); -static PtrOpenProcessToken ptrOpenProcessToken = 0; typedef BOOL (WINAPI *PtrGetUserProfileDirectoryW)(HANDLE, LPWSTR, LPDWORD); static PtrGetUserProfileDirectoryW ptrGetUserProfileDirectoryW = 0; -typedef BOOL (WINAPI *PtrSetFilePointerEx)(HANDLE, LARGE_INTEGER, PLARGE_INTEGER, DWORD); -static PtrSetFilePointerEx ptrSetFilePointerEx = 0; QT_END_INCLUDE_NAMESPACE @@ -204,14 +200,10 @@ void QFSFileEnginePrivate::resolveLibs() } FreeLibrary(versionHnd); } - ptrOpenProcessToken = (PtrOpenProcessToken)GetProcAddress(advapiHnd, "OpenProcessToken"); - HINSTANCE userenvHnd = LoadLibraryW(L"userenv"); + HINSTANCE userenvHnd = LoadLibraryW(L"userenv"); if (userenvHnd) { ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW"); } - HINSTANCE kernelHnd = LoadLibraryW(L"kernel32"); - if (kernelHnd) - ptrSetFilePointerEx = (PtrSetFilePointerEx)GetProcAddress(kernelHnd, "SetFilePointerEx"); } #endif } @@ -596,34 +588,27 @@ qint64 QFSFileEnginePrivate::nativePos() const if (fileHandle == INVALID_HANDLE_VALUE) return 0; -#if !defined(QT_NO_LIBRARY) && !defined(Q_OS_WINCE) - QFSFileEnginePrivate::resolveLibs(); - if (!ptrSetFilePointerEx) { -#endif - LARGE_INTEGER filepos; - filepos.HighPart = 0; - DWORD newFilePointer = SetFilePointer(fileHandle, 0, &filepos.HighPart, FILE_CURRENT); - if (newFilePointer == 0xFFFFFFFF && GetLastError() != NO_ERROR) { - thatQ->setError(QFile::UnspecifiedError, qt_error_string()); - return 0; - } - - // Note: This is the case for MOC, UIC, qmake and other - // bootstrapped tools, and for Windows CE. - filepos.LowPart = newFilePointer; - return filepos.QuadPart; -#if !defined(QT_NO_LIBRARY) && !defined(Q_OS_WINCE) - } - +#if !defined(Q_OS_WINCE) LARGE_INTEGER currentFilePos; LARGE_INTEGER offset; offset.QuadPart = 0; - if (!ptrSetFilePointerEx(fileHandle, offset, ¤tFilePos, FILE_CURRENT)) { + if (!::SetFilePointerEx(fileHandle, offset, ¤tFilePos, FILE_CURRENT)) { thatQ->setError(QFile::UnspecifiedError, qt_error_string()); return 0; } return qint64(currentFilePos.QuadPart); +#else + LARGE_INTEGER filepos; + filepos.HighPart = 0; + DWORD newFilePointer = SetFilePointer(fileHandle, 0, &filepos.HighPart, FILE_CURRENT); + if (newFilePointer == 0xFFFFFFFF && GetLastError() != NO_ERROR) { + thatQ->setError(QFile::UnspecifiedError, qt_error_string()); + return 0; + } + + filepos.LowPart = newFilePointer; + return filepos.QuadPart; #endif } @@ -632,39 +617,32 @@ qint64 QFSFileEnginePrivate::nativePos() const */ bool QFSFileEnginePrivate::nativeSeek(qint64 pos) { - Q_Q(const QFSFileEngine); - QFSFileEngine *thatQ = const_cast(q); + Q_Q(QFSFileEngine); if (fh || fd != -1) { // stdlib / stdio mode. return seekFdFh(pos); } -#if !defined(QT_NO_LIBRARY) && !defined(Q_OS_WINCE) - QFSFileEnginePrivate::resolveLibs(); - if (!ptrSetFilePointerEx) { -#endif - DWORD newFilePointer; - LARGE_INTEGER *li = reinterpret_cast(&pos); - newFilePointer = SetFilePointer(fileHandle, li->LowPart, &li->HighPart, FILE_BEGIN); - if (newFilePointer == 0xFFFFFFFF && GetLastError() != NO_ERROR) { - thatQ->setError(QFile::PositionError, qt_error_string()); - return false; - } - - // Note: This is the case for MOC, UIC, qmake and other - // bootstrapped tools, and for Windows CE. - return true; -#if !defined(QT_NO_LIBRARY) && !defined(Q_OS_WINCE) - } - +#if !defined(Q_OS_WINCE) LARGE_INTEGER currentFilePos; LARGE_INTEGER offset; offset.QuadPart = pos; - if (ptrSetFilePointerEx(fileHandle, offset, ¤tFilePos, FILE_BEGIN) == 0) { - thatQ->setError(QFile::UnspecifiedError, qt_error_string()); + if (!::SetFilePointerEx(fileHandle, offset, ¤tFilePos, FILE_BEGIN)) { + q->setError(QFile::UnspecifiedError, qt_error_string()); + return false; + } + + return true; +#else + DWORD newFilePointer; + LARGE_INTEGER *li = reinterpret_cast(&pos); + newFilePointer = SetFilePointer(fileHandle, li->LowPart, &li->HighPart, FILE_BEGIN); + if (newFilePointer == 0xFFFFFFFF && GetLastError() != NO_ERROR) { + q->setError(QFile::PositionError, qt_error_string()); return false; } + return true; #endif } @@ -1044,10 +1022,10 @@ QString QFSFileEngine::homePath() QString ret; #if !defined(QT_NO_LIBRARY) QFSFileEnginePrivate::resolveLibs(); - if (ptrOpenProcessToken && ptrGetUserProfileDirectoryW) { + if (ptrGetUserProfileDirectoryW) { HANDLE hnd = ::GetCurrentProcess(); HANDLE token = 0; - BOOL ok = ::ptrOpenProcessToken(hnd, TOKEN_QUERY, &token); + BOOL ok = ::OpenProcessToken(hnd, TOKEN_QUERY, &token); if (ok) { DWORD dwBufferSize = 0; // First call, to determine size of the strings (with '\0'). -- cgit v0.12 From a208436c0370dd92401647c15d48b22965f531ee Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Thu, 13 Aug 2009 18:44:35 +0200 Subject: use BuildTrusteeWithSid instead of BuildTrusteeWithName Get current user SID from the token of the current process and use it to fill UserTrustee with BuildTrusteeWithSid; Remove workaround for buggy secur32.dll version. Merge-request: 1167 Reviewed-by: Joerg Bornemann --- src/corelib/io/qfsfileengine_win.cpp | 65 ++++++++---------------------------- 1 file changed, 13 insertions(+), 52 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index d7d1684..0619fa6 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -111,8 +111,6 @@ typedef BOOL (WINAPI *PtrAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY, BY static PtrAllocateAndInitializeSid ptrAllocateAndInitializeSid = 0; typedef VOID (WINAPI *PtrBuildTrusteeWithSidW)(PTRUSTEE_W, PSID); static PtrBuildTrusteeWithSidW ptrBuildTrusteeWithSidW = 0; -typedef VOID (WINAPI *PtrBuildTrusteeWithNameW)(PTRUSTEE_W, unsigned short*); -static PtrBuildTrusteeWithNameW ptrBuildTrusteeWithNameW = 0; typedef DWORD (WINAPI *PtrGetEffectiveRightsFromAclW)(PACL, PTRUSTEE_W, OUT PACCESS_MASK); static PtrGetEffectiveRightsFromAclW ptrGetEffectiveRightsFromAclW = 0; typedef PVOID (WINAPI *PtrFreeSid)(PSID); @@ -150,61 +148,24 @@ void QFSFileEnginePrivate::resolveLibs() ptrLookupAccountSidW = (PtrLookupAccountSidW)GetProcAddress(advapiHnd, "LookupAccountSidW"); ptrAllocateAndInitializeSid = (PtrAllocateAndInitializeSid)GetProcAddress(advapiHnd, "AllocateAndInitializeSid"); ptrBuildTrusteeWithSidW = (PtrBuildTrusteeWithSidW)GetProcAddress(advapiHnd, "BuildTrusteeWithSidW"); - ptrBuildTrusteeWithNameW = (PtrBuildTrusteeWithNameW)GetProcAddress(advapiHnd, "BuildTrusteeWithNameW"); ptrGetEffectiveRightsFromAclW = (PtrGetEffectiveRightsFromAclW)GetProcAddress(advapiHnd, "GetEffectiveRightsFromAclW"); ptrFreeSid = (PtrFreeSid)GetProcAddress(advapiHnd, "FreeSid"); } - if (ptrBuildTrusteeWithNameW) { - HINSTANCE versionHnd = LoadLibraryW(L"version"); - if (versionHnd) { - typedef DWORD (WINAPI *PtrGetFileVersionInfoSizeW)(LPCWSTR lptstrFilename,LPDWORD lpdwHandle); - PtrGetFileVersionInfoSizeW ptrGetFileVersionInfoSizeW = (PtrGetFileVersionInfoSizeW)GetProcAddress(versionHnd, "GetFileVersionInfoSizeW"); - typedef BOOL (WINAPI *PtrGetFileVersionInfoW)(LPCWSTR lptstrFilename,DWORD dwHandle,DWORD dwLen,LPVOID lpData); - PtrGetFileVersionInfoW ptrGetFileVersionInfoW = (PtrGetFileVersionInfoW)GetProcAddress(versionHnd, "GetFileVersionInfoW"); - typedef BOOL (WINAPI *PtrVerQueryValueW)(const LPVOID pBlock,LPCWSTR lpSubBlock,LPVOID *lplpBuffer,PUINT puLen); - PtrVerQueryValueW ptrVerQueryValueW = (PtrVerQueryValueW)GetProcAddress(versionHnd, "VerQueryValueW"); - if(ptrGetFileVersionInfoSizeW && ptrGetFileVersionInfoW && ptrVerQueryValueW) { - DWORD fakeHandle; - DWORD versionSize = ptrGetFileVersionInfoSizeW(L"secur32.dll", &fakeHandle); - if(versionSize) { - LPVOID versionData; - versionData = malloc(versionSize); - if(ptrGetFileVersionInfoW(L"secur32.dll", 0, versionSize, versionData)) { - UINT puLen; - VS_FIXEDFILEINFO *pLocalInfo; - if(ptrVerQueryValueW(versionData, L"\\", (void**)&pLocalInfo, &puLen)) { - WORD wVer1, wVer2, wVer3, wVer4; - wVer1 = HIWORD(pLocalInfo->dwFileVersionMS); - wVer2 = LOWORD(pLocalInfo->dwFileVersionMS); - wVer3 = HIWORD(pLocalInfo->dwFileVersionLS); - wVer4 = LOWORD(pLocalInfo->dwFileVersionLS); - // It will not work with secur32.dll version 5.0.2195.2862 - if(!(wVer1 == 5 && wVer2 == 0 && wVer3 == 2195 && (wVer4 == 2862 || wVer4 == 4587))) { - HINSTANCE userHnd = LoadLibraryW(L"secur32"); - if (userHnd) { - typedef BOOL (WINAPI *PtrGetUserNameExW)(EXTENDED_NAME_FORMAT nameFormat, ushort* lpBuffer, LPDWORD nSize); - PtrGetUserNameExW ptrGetUserNameExW = (PtrGetUserNameExW)GetProcAddress(userHnd, "GetUserNameExW"); - if(ptrGetUserNameExW) { - static wchar_t buffer[258]; - DWORD bufferSize = 257; - ptrGetUserNameExW(NameSamCompatible, (ushort*)buffer, &bufferSize); - ptrBuildTrusteeWithNameW(¤tUserTrusteeW, (ushort*)buffer); - } - FreeLibrary(userHnd); - } - } - } - } - free(versionData); - } - } - FreeLibrary(versionHnd); - } - HINSTANCE userenvHnd = LoadLibraryW(L"userenv"); - if (userenvHnd) { - ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW"); + if (ptrBuildTrusteeWithSidW) { + // Create TRUSTEE for current user + HANDLE hnd = ::GetCurrentProcess(); + HANDLE token = 0; + if (::OpenProcessToken(hnd, TOKEN_QUERY, &token)) { + TOKEN_USER tu; + DWORD retsize; + if (::GetTokenInformation(token, TokenUser, &tu, sizeof(tu), &retsize)) + ptrBuildTrusteeWithSidW(¤tUserTrusteeW, tu.User.Sid); + ::CloseHandle(token); } } + HINSTANCE userenvHnd = LoadLibraryW(L"userenv"); + if (userenvHnd) + ptrGetUserProfileDirectoryW = (PtrGetUserProfileDirectoryW)GetProcAddress(userenvHnd, "GetUserProfileDirectoryW"); #endif } } -- cgit v0.12 From 0d36864727007671b0ee01ab501fec0988c71011 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Thu, 13 Aug 2009 18:44:37 +0200 Subject: create world TRUSTEE only once in QFSFileEngine (Win) Don't re-create world TRUSTEE everytime in getPermissions() Merge-request: 1167 Reviewed-by: Joerg Bornemann --- src/corelib/io/qfsfileengine_win.cpp | 45 ++++++++++++++++++------------------ 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index 0619fa6..e500d67 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -107,15 +107,12 @@ typedef DWORD (WINAPI *PtrGetNamedSecurityInfoW)(LPWSTR, SE_OBJECT_TYPE, SECURIT static PtrGetNamedSecurityInfoW ptrGetNamedSecurityInfoW = 0; typedef BOOL (WINAPI *PtrLookupAccountSidW)(LPCWSTR, PSID, LPWSTR, LPDWORD, LPWSTR, LPDWORD, PSID_NAME_USE); static PtrLookupAccountSidW ptrLookupAccountSidW = 0; -typedef BOOL (WINAPI *PtrAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY, BYTE, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, PSID*); -static PtrAllocateAndInitializeSid ptrAllocateAndInitializeSid = 0; typedef VOID (WINAPI *PtrBuildTrusteeWithSidW)(PTRUSTEE_W, PSID); static PtrBuildTrusteeWithSidW ptrBuildTrusteeWithSidW = 0; typedef DWORD (WINAPI *PtrGetEffectiveRightsFromAclW)(PACL, PTRUSTEE_W, OUT PACCESS_MASK); static PtrGetEffectiveRightsFromAclW ptrGetEffectiveRightsFromAclW = 0; -typedef PVOID (WINAPI *PtrFreeSid)(PSID); -static PtrFreeSid ptrFreeSid = 0; static TRUSTEE_W currentUserTrusteeW; +static TRUSTEE_W worldTrusteeW; typedef BOOL (WINAPI *PtrGetUserProfileDirectoryW)(HANDLE, LPWSTR, LPDWORD); static PtrGetUserProfileDirectoryW ptrGetUserProfileDirectoryW = 0; @@ -146,10 +143,8 @@ void QFSFileEnginePrivate::resolveLibs() if (advapiHnd) { ptrGetNamedSecurityInfoW = (PtrGetNamedSecurityInfoW)GetProcAddress(advapiHnd, "GetNamedSecurityInfoW"); ptrLookupAccountSidW = (PtrLookupAccountSidW)GetProcAddress(advapiHnd, "LookupAccountSidW"); - ptrAllocateAndInitializeSid = (PtrAllocateAndInitializeSid)GetProcAddress(advapiHnd, "AllocateAndInitializeSid"); ptrBuildTrusteeWithSidW = (PtrBuildTrusteeWithSidW)GetProcAddress(advapiHnd, "BuildTrusteeWithSidW"); ptrGetEffectiveRightsFromAclW = (PtrGetEffectiveRightsFromAclW)GetProcAddress(advapiHnd, "GetEffectiveRightsFromAclW"); - ptrFreeSid = (PtrFreeSid)GetProcAddress(advapiHnd, "FreeSid"); } if (ptrBuildTrusteeWithSidW) { // Create TRUSTEE for current user @@ -162,6 +157,19 @@ void QFSFileEnginePrivate::resolveLibs() ptrBuildTrusteeWithSidW(¤tUserTrusteeW, tu.User.Sid); ::CloseHandle(token); } + + typedef BOOL (WINAPI *PtrAllocateAndInitializeSid)(PSID_IDENTIFIER_AUTHORITY, BYTE, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, DWORD, PSID*); + PtrAllocateAndInitializeSid ptrAllocateAndInitializeSid = (PtrAllocateAndInitializeSid)GetProcAddress(advapiHnd, "AllocateAndInitializeSid"); + typedef PVOID (WINAPI *PtrFreeSid)(PSID); + PtrFreeSid ptrFreeSid = (PtrFreeSid)GetProcAddress(advapiHnd, "FreeSid"); + if (ptrAllocateAndInitializeSid && ptrFreeSid) { + // Create TRUSTEE for Everyone (World) + SID_IDENTIFIER_AUTHORITY worldAuth = { SECURITY_WORLD_SID_AUTHORITY }; + PSID pWorld = 0; + if (ptrAllocateAndInitializeSid(&worldAuth, 1, SECURITY_WORLD_RID, 0, 0, 0, 0, 0, 0, 0, &pWorld)) + ptrBuildTrusteeWithSidW(&worldTrusteeW, pWorld); + ptrFreeSid(pWorld); + } } HINSTANCE userenvHnd = LoadLibraryW(L"userenv"); if (userenvHnd) @@ -1332,7 +1340,7 @@ QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions() const enum { ReadMask = 0x00000001, WriteMask = 0x00000002, ExecMask = 0x00000020 }; resolveLibs(); - if(ptrGetNamedSecurityInfoW && ptrAllocateAndInitializeSid && ptrBuildTrusteeWithSidW && ptrGetEffectiveRightsFromAclW && ptrFreeSid) { + if(ptrGetNamedSecurityInfoW && ptrBuildTrusteeWithSidW && ptrGetEffectiveRightsFromAclW) { QString fname = filePath.endsWith(QLatin1String(".lnk")) ? readLink(filePath) : filePath; DWORD res = ptrGetNamedSecurityInfoW((wchar_t*)fname.utf16(), SE_FILE_OBJECT, @@ -1374,21 +1382,14 @@ QAbstractFileEngine::FileFlags QFSFileEnginePrivate::getPermissions() const ret |= QAbstractFileEngine::ExeGroupPerm; } { //other (world) - // Create SID for Everyone (World) - SID_IDENTIFIER_AUTHORITY worldAuth = { SECURITY_WORLD_SID_AUTHORITY }; - PSID pWorld = 0; - if(ptrAllocateAndInitializeSid(&worldAuth, 1, SECURITY_WORLD_RID, 0,0,0,0,0,0,0, &pWorld)) { - ptrBuildTrusteeWithSidW(&trustee, pWorld); - if(ptrGetEffectiveRightsFromAclW(pDacl, &trustee, &access_mask) != ERROR_SUCCESS) - access_mask = (ACCESS_MASK)-1; // ### - if(access_mask & ReadMask) - ret |= QAbstractFileEngine::ReadOtherPerm; - if(access_mask & WriteMask) - ret |= QAbstractFileEngine::WriteOtherPerm; - if(access_mask & ExecMask) - ret |= QAbstractFileEngine::ExeOtherPerm; - } - ptrFreeSid(pWorld); + if(ptrGetEffectiveRightsFromAclW(pDacl, &worldTrusteeW, &access_mask) != ERROR_SUCCESS) + access_mask = (ACCESS_MASK)-1; // ### + if(access_mask & ReadMask) + ret |= QAbstractFileEngine::ReadOtherPerm; + if(access_mask & WriteMask) + ret |= QAbstractFileEngine::WriteOtherPerm; + if(access_mask & ExecMask) + ret |= QAbstractFileEngine::ExeOtherPerm; } LocalFree(pSD); } -- cgit v0.12 From 98fb13e3ef2627664642c21f34d11c10537379f7 Mon Sep 17 00:00:00 2001 From: Ritt Konstantin Date: Thu, 13 Aug 2009 18:44:39 +0200 Subject: remove unneeded distinction between Windows and Windows CE Merge-request: 1167 Reviewed-by: Joerg Bornemann --- src/corelib/io/qfsfileengine_win.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/corelib/io/qfsfileengine_win.cpp b/src/corelib/io/qfsfileengine_win.cpp index e500d67..4bae9f4 100644 --- a/src/corelib/io/qfsfileengine_win.cpp +++ b/src/corelib/io/qfsfileengine_win.cpp @@ -1643,12 +1643,8 @@ bool QFSFileEngine::setPermissions(uint perms) if (mode == 0) // not supported return false; -#if !defined(Q_OS_WINCE) - ret = ::_wchmod((wchar_t*)d->filePath.utf16(), mode) == 0; -#else ret = ::_wchmod((wchar_t*)d->longFileName(d->filePath).utf16(), mode) == 0; -#endif - return ret; + return ret; } bool QFSFileEngine::setSize(qint64 size) -- cgit v0.12 From 2a5f0086fd45c92fe8fffc35db7a360c3e51778e Mon Sep 17 00:00:00 2001 From: David Boddie Date: Thu, 13 Aug 2009 18:58:14 +0200 Subject: Doc: Updated the version number of the latest Unicode specification. Task-number: 259091 Reviewed-by: Trust Me --- doc/src/unicode.qdoc | 24 ++++++++++-------------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/doc/src/unicode.qdoc b/doc/src/unicode.qdoc index 439070a..b4ba26a 100644 --- a/doc/src/unicode.qdoc +++ b/doc/src/unicode.qdoc @@ -71,22 +71,18 @@ \section1 The Standard - The current version of the standard is 4.0.0. + The current version of the standard is \l{http://www.unicode.org/versions/Unicode5.1.0/}{Unicode 5.1.0}. - \list - - \i \link http://www.amazon.com/exec/obidos/ASIN/0321185781/trolltech/t - The Unicode Standard, version 4.0.\endlink See also - \link http://www.unicode.org/unicode/standard/versions/ - its home page.\endlink - \i \link http://www.amazon.com/exec/obidos/ASIN/0201616335/trolltech/t - The Unicode Standard, version 3.2.\endlink - \i \link http://www.amazon.com/exec/obidos/ASIN/0201473459/trolltech/t - The Unicode Standard, version 2.0.\endlink See also the - \link http://www.unicode.org/unicode/reports/tr8.html 2.1 - update\endlink and - \link http://www.unicode.org/unicode/standard/versions/enumeratedversions.html#Unicode 2.1.9 the 2.1.9 data files\endlink at www.unicode.org. + Previous printed versions of the specification: + \list + \o \l{http://www.amazon.com/Unicode-Standard-Version-5-0-5th/dp/0321480910/trolltech/t}{The Unicode Standard, Version 5.0} + \o \l{http://www.amazon.com/exec/obidos/ASIN/0321185781/trolltech/t}{The Unicode Standard, version 4.0} + \o \l{http://www.amazon.com/exec/obidos/ASIN/0201616335/trolltech/t}{The Unicode Standard, version 3.2} + \o \l{http://www.amazon.com/exec/obidos/ASIN/0201473459/trolltech/t}{The Unicode Standard, version 2.0} \mdash + see also the \l{http://www.unicode.org/unicode/reports/tr8.html}{2.1 update} and + \l{http://www.unicode.org/unicode/standard/versions/enumeratedversions.html#Unicode 2.1.9}{the 2.1.9 data files} at + \l{http://www.unicode.org}. \endlist \section1 Unicode in Qt -- cgit v0.12 From 48de4b1b7b8ec0980e28e1d1642132c553001859 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 13 Aug 2009 19:51:59 +0200 Subject: Compile fix. tst_qobject deleteQObjectWhenDeletingEvent needs QtGui. --- tests/auto/qobject/tst_qobject.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qobject/tst_qobject.pro b/tests/auto/qobject/tst_qobject.pro index 9b2fec1..0500ea2 100644 --- a/tests/auto/qobject/tst_qobject.pro +++ b/tests/auto/qobject/tst_qobject.pro @@ -1,7 +1,7 @@ load(qttest_p4) SOURCES += tst_qobject.cpp -QT = core network +QT = core network gui contains(QT_CONFIG, qt3support):DEFINES+=QT_HAS_QT3SUPPORT wince*: { -- cgit v0.12 From 47603b9873071fa9463ce2bed01b4998ed340d7e Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Thu, 13 Aug 2009 19:58:46 +0200 Subject: Removed a few bogus includes --- tests/auto/qcolumnview/qcolumnview.pro | 4 ---- tests/auto/qdesktopservices/qdesktopservices.pro | 4 ---- tests/auto/qfilesystemmodel/qfilesystemmodel.pro | 3 --- 3 files changed, 11 deletions(-) diff --git a/tests/auto/qcolumnview/qcolumnview.pro b/tests/auto/qcolumnview/qcolumnview.pro index 00e3880..754f06f 100644 --- a/tests/auto/qcolumnview/qcolumnview.pro +++ b/tests/auto/qcolumnview/qcolumnview.pro @@ -1,8 +1,4 @@ CONFIG += qttest_p4 -include(../src/qcolumnview.pri) - SOURCES += tst_qcolumnview.cpp TARGET = tst_qcolumnview - - diff --git a/tests/auto/qdesktopservices/qdesktopservices.pro b/tests/auto/qdesktopservices/qdesktopservices.pro index 537b105..05110bb 100644 --- a/tests/auto/qdesktopservices/qdesktopservices.pro +++ b/tests/auto/qdesktopservices/qdesktopservices.pro @@ -2,7 +2,3 @@ CONFIG += qttest_p4 SOURCES += tst_qdesktopservices.cpp TARGET = tst_qdesktopservices - -include(../src/qdesktopservices.pri) - - diff --git a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro index 55f3b5c..1daae04 100644 --- a/tests/auto/qfilesystemmodel/qfilesystemmodel.pro +++ b/tests/auto/qfilesystemmodel/qfilesystemmodel.pro @@ -1,8 +1,5 @@ CONFIG += qttest_p4 -include(../../src/qfiledialog.pri) -include(../../../../modeltest/modeltest.pri) - QT = core gui SOURCES += tst_qfilesystemmodel.cpp -- cgit v0.12 From 5a3d956ae19ad411d13c7db28eb7705f4ffaad9d Mon Sep 17 00:00:00 2001 From: Kurt Korbatits Date: Fri, 14 Aug 2009 08:59:56 +1000 Subject: Fixed audio auto tests. Handle platforms that don't have backends. Reviewed-by: Bill King --- tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp | 60 ++++++---- .../auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp | 114 +++++++++++++------ tests/auto/qaudioinput/tst_qaudioinput.cpp | 61 ++++++---- tests/auto/qaudiooutput/tst_qaudiooutput.cpp | 123 ++++++++++++--------- 4 files changed, 229 insertions(+), 129 deletions(-) diff --git a/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp b/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp index 8f8d6a6..f87500c 100644 --- a/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp +++ b/tests/auto/qaudiodeviceid/tst_qaudiodeviceid.cpp @@ -56,41 +56,61 @@ public: tst_QAudioDeviceId(QObject* parent=0) : QObject(parent) {} private slots: + void initTestCase(); void checkNull(); void checkEquality(); + +private: + bool available; }; -void tst_QAudioDeviceId::checkNull() +void tst_QAudioDeviceId::initTestCase() { - // Default constructed is null. - QAudioDeviceId deviceId0; - QVERIFY(deviceId0.isNull()); + // Only perform tests if audio output device exists! + QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput); + if(devices.size() > 0) + available = true; + else { + qWarning()<<"NOTE: no audio output device found, no test will be performed"; + available = false; + } +} - // Null is transferred - QAudioDeviceId deviceId1(deviceId0); - QVERIFY(deviceId1.isNull()); +void tst_QAudioDeviceId::checkNull() +{ + if(available) { + // Default constructed is null. + QAudioDeviceId deviceId0; + QVERIFY(deviceId0.isNull()); + + // Null is transferred + QAudioDeviceId deviceId1(deviceId0); + QVERIFY(deviceId1.isNull()); + } } void tst_QAudioDeviceId::checkEquality() { - QAudioDeviceId deviceId0; - QAudioDeviceId deviceId1; + if(available) { + QAudioDeviceId deviceId0; + QAudioDeviceId deviceId1; - // Null ids are equivalent - QVERIFY(deviceId0 == deviceId1); - QVERIFY(!(deviceId0 != deviceId1)); + // Null ids are equivalent + QVERIFY(deviceId0 == deviceId1); + QVERIFY(!(deviceId0 != deviceId1)); - deviceId1 = QAudioDeviceInfo::defaultOutputDevice(); + deviceId1 = QAudioDeviceInfo::defaultOutputDevice(); - // Different - QVERIFY(deviceId0 != deviceId1); - QVERIFY(!(deviceId0 == deviceId1)); + // Different + QVERIFY(deviceId0 != deviceId1); + QVERIFY(!(deviceId0 == deviceId1)); - // Same - deviceId0 = deviceId1; + // Same + deviceId0 = deviceId1; - QVERIFY(deviceId0 == deviceId1); - QVERIFY(!(deviceId0 != deviceId1)); + QVERIFY(deviceId0 == deviceId1); + QVERIFY(!(deviceId0 != deviceId1)); + } } QTEST_MAIN(tst_QAudioDeviceId) diff --git a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp index 72121a7..47f3d00 100644 --- a/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp +++ b/tests/auto/qaudiodeviceinfo/tst_qaudiodeviceinfo.cpp @@ -55,6 +55,7 @@ public: tst_QAudioDeviceInfo(QObject* parent=0) : QObject(parent) {} private slots: + void initTestCase(); void checkAvailableDefaultInput(); void checkAvailableDefaultOutput(); void outputList(); @@ -69,89 +70,134 @@ private slots: void nearest(); private: + bool available; QAudioDeviceInfo* device; }; +void tst_QAudioDeviceInfo::initTestCase() +{ + // Only perform tests if audio output device exists! + QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput); + if(devices.size() > 0) + available = true; + else { + qWarning()<<"NOTE: no audio output device found, no test will be performed"; + available = false; + } +} + void tst_QAudioDeviceInfo::checkAvailableDefaultInput() { - QVERIFY(!QAudioDeviceInfo::defaultInputDevice().isNull()); + // Only perform tests if audio input device exists! + bool storeAvailable = available; + QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioInput); + if(devices.size() > 0) + available = true; + else { + qWarning()<<"NOTE: no audio input device found, no test will be performed"; + available = false; + } + if(available) + QVERIFY(!QAudioDeviceInfo::defaultInputDevice().isNull()); + available = storeAvailable; } void tst_QAudioDeviceInfo::checkAvailableDefaultOutput() { - QVERIFY(!QAudioDeviceInfo::defaultOutputDevice().isNull()); + if(available) + QVERIFY(!QAudioDeviceInfo::defaultOutputDevice().isNull()); } void tst_QAudioDeviceInfo::outputList() { - QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput); - QVERIFY(devices.size() > 0); - device = new QAudioDeviceInfo(devices.at(0), this); + if(available) { + QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput); + QVERIFY(devices.size() > 0); + device = new QAudioDeviceInfo(devices.at(0), this); + } } void tst_QAudioDeviceInfo::codecs() { - QStringList avail = device->supportedCodecs(); - QVERIFY(avail.size() > 0); + if(available) { + QStringList avail = device->supportedCodecs(); + QVERIFY(avail.size() > 0); + } } void tst_QAudioDeviceInfo::channels() { - QList avail = device->supportedChannels(); - QVERIFY(avail.size() > 0); + if(available) { + QList avail = device->supportedChannels(); + QVERIFY(avail.size() > 0); + } } void tst_QAudioDeviceInfo::sampleSizes() { - QList avail = device->supportedSampleSizes(); - QVERIFY(avail.size() > 0); + if(available) { + QList avail = device->supportedSampleSizes(); + QVERIFY(avail.size() > 0); + } } void tst_QAudioDeviceInfo::byteOrders() { - QList avail = device->supportedByteOrders(); - QVERIFY(avail.size() > 0); + if(available) { + QList avail = device->supportedByteOrders(); + QVERIFY(avail.size() > 0); + } } void tst_QAudioDeviceInfo::sampleTypes() { - QList avail = device->supportedSampleTypes(); - QVERIFY(avail.size() > 0); + if(available) { + QList avail = device->supportedSampleTypes(); + QVERIFY(avail.size() > 0); + } } void tst_QAudioDeviceInfo::frequencies() { - QList avail = device->supportedFrequencies(); - QVERIFY(avail.size() > 0); + if(available) { + QList avail = device->supportedFrequencies(); + QVERIFY(avail.size() > 0); + } } void tst_QAudioDeviceInfo::isformat() { - QAudioFormat format; - format.setFrequency(44100); - format.setChannels(2); - format.setSampleType(QAudioFormat::SignedInt); - format.setByteOrder(QAudioFormat::LittleEndian); - format.setSampleSize(16); - format.setCodec("audio/pcm"); - - // Should always be true for these format - QVERIFY(device->isFormatSupported(format)); + if(available) { + QAudioFormat format; + format.setFrequency(44100); + format.setChannels(2); + format.setSampleType(QAudioFormat::SignedInt); + format.setByteOrder(QAudioFormat::LittleEndian); + format.setSampleSize(16); + format.setCodec("audio/pcm"); + + // Should always be true for these format + QVERIFY(device->isFormatSupported(format)); + } } void tst_QAudioDeviceInfo::preferred() { - QAudioFormat format = device->preferredFormat(); - QVERIFY(format.frequency() == 44100); - QVERIFY(format.channels() == 2); + if(available) { + QAudioFormat format = device->preferredFormat(); + QVERIFY(format.frequency() == 44100); + QVERIFY(format.channels() == 2); + } } void tst_QAudioDeviceInfo::nearest() { - QAudioFormat format1, format2; - format1.setFrequency(8000); - format2 = device->nearestFormat(format1); - QVERIFY(format2.frequency() == 44100); + if(available) { + QAudioFormat format1, format2; + format1.setFrequency(8000); + format2 = device->nearestFormat(format1); + QVERIFY(format2.frequency() == 44100); + } } QTEST_MAIN(tst_QAudioDeviceInfo) diff --git a/tests/auto/qaudioinput/tst_qaudioinput.cpp b/tests/auto/qaudioinput/tst_qaudioinput.cpp index 891d1c4..6f1d568 100644 --- a/tests/auto/qaudioinput/tst_qaudioinput.cpp +++ b/tests/auto/qaudioinput/tst_qaudioinput.cpp @@ -60,6 +60,7 @@ private slots: void pullFile(); private: + bool available; QAudioFormat format; QAudioInput* audio; }; @@ -73,46 +74,62 @@ void tst_QAudioInput::initTestCase() format.setByteOrder(QAudioFormat::LittleEndian); format.setSampleType(QAudioFormat::UnSignedInt); - audio = new QAudioInput(format, this); + // Only perform tests if audio input device exists! + QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioInput); + if(devices.size() > 0) + available = true; + else { + qWarning()<<"NOTE: no audio input device found, no test will be performed"; + available = false; + } + + if(available) + audio = new QAudioInput(format, this); } void tst_QAudioInput::settings() { - QAudioFormat f = audio->format(); - - QVERIFY(format.channels() == f.channels()); - QVERIFY(format.frequency() == f.frequency()); - QVERIFY(format.sampleSize() == f.sampleSize()); - QVERIFY(format.codec() == f.codec()); - QVERIFY(format.byteOrder() == f.byteOrder()); - QVERIFY(format.sampleType() == f.sampleType()); + if(available) { + QAudioFormat f = audio->format(); + + QVERIFY(format.channels() == f.channels()); + QVERIFY(format.frequency() == f.frequency()); + QVERIFY(format.sampleSize() == f.sampleSize()); + QVERIFY(format.codec() == f.codec()); + QVERIFY(format.byteOrder() == f.byteOrder()); + QVERIFY(format.sampleType() == f.sampleType()); + } } void tst_QAudioInput::notifyInterval() { - QVERIFY(audio->notifyInterval() == 1000); // Default + if(available) { + QVERIFY(audio->notifyInterval() == 1000); // Default - audio->setNotifyInterval(500); - QVERIFY(audio->notifyInterval() == 500); // Custom + audio->setNotifyInterval(500); + QVERIFY(audio->notifyInterval() == 500); // Custom - audio->setNotifyInterval(1000); // reset + audio->setNotifyInterval(1000); // reset + } } void tst_QAudioInput::pullFile() { - QFile filename(SRCDIR "test.raw"); - filename.open( QIODevice::WriteOnly | QIODevice::Truncate ); + if(available) { + QFile filename(SRCDIR "test.raw"); + filename.open( QIODevice::WriteOnly | QIODevice::Truncate ); - QSignalSpy readSignal(audio, SIGNAL(notify())); - audio->start(&filename); + QSignalSpy readSignal(audio, SIGNAL(notify())); + audio->start(&filename); - QTest::qWait(5000); + QTest::qWait(5000); - QVERIFY(readSignal.count() > 0); - QVERIFY(audio->totalTime() > 0); + QVERIFY(readSignal.count() > 0); + QVERIFY(audio->totalTime() > 0); - audio->stop(); - filename.close(); + audio->stop(); + filename.close(); + } } QTEST_MAIN(tst_QAudioInput) diff --git a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp index 2c3f662..0552aa4 100644 --- a/tests/auto/qaudiooutput/tst_qaudiooutput.cpp +++ b/tests/auto/qaudiooutput/tst_qaudiooutput.cpp @@ -63,6 +63,7 @@ private slots: void pushFile(); private: + bool available; QAudioFormat format; QAudioOutput* audio; }; @@ -76,79 +77,95 @@ void tst_QAudioOutput::initTestCase() format.setByteOrder(QAudioFormat::LittleEndian); format.setSampleType(QAudioFormat::UnSignedInt); + // Only perform tests if audio output device exists! + QList devices = QAudioDeviceInfo::deviceList(QAudio::AudioOutput); + if(devices.size() > 0) + available = true; + else { + qWarning()<<"NOTE: no audio output device found, no test will be performed"; + available = false; + } audio = new QAudioOutput(format, this); } void tst_QAudioOutput::settings() { - QAudioFormat f = audio->format(); - - QVERIFY(format.channels() == f.channels()); - QVERIFY(format.frequency() == f.frequency()); - QVERIFY(format.sampleSize() == f.sampleSize()); - QVERIFY(format.codec() == f.codec()); - QVERIFY(format.byteOrder() == f.byteOrder()); - QVERIFY(format.sampleType() == f.sampleType()); + if(available) { + QAudioFormat f = audio->format(); + + QVERIFY(format.channels() == f.channels()); + QVERIFY(format.frequency() == f.frequency()); + QVERIFY(format.sampleSize() == f.sampleSize()); + QVERIFY(format.codec() == f.codec()); + QVERIFY(format.byteOrder() == f.byteOrder()); + QVERIFY(format.sampleType() == f.sampleType()); + } } void tst_QAudioOutput::notifyInterval() { - QVERIFY(audio->notifyInterval() == 1000); // Default + if(available) { + QVERIFY(audio->notifyInterval() == 1000); // Default - audio->setNotifyInterval(500); - QVERIFY(audio->notifyInterval() == 500); // Custom + audio->setNotifyInterval(500); + QVERIFY(audio->notifyInterval() == 500); // Custom - audio->setNotifyInterval(1000); // reset + audio->setNotifyInterval(1000); // reset + } } void tst_QAudioOutput::pullFile() { - QFile filename(SRCDIR "4.wav"); - QVERIFY(filename.exists()); - filename.open(QIODevice::ReadOnly); - - QSignalSpy readSignal(audio, SIGNAL(notify())); - audio->setNotifyInterval(100); - audio->start(&filename); - - QTestEventLoop::instance().enterLoop(1); - // 4.wav is a little less than 700ms, so notify should fire 6 times! - QVERIFY(readSignal.count() >= 6); - QVERIFY(audio->totalTime() == 692250); - - audio->stop(); - filename.close(); + if(available) { + QFile filename(SRCDIR "4.wav"); + QVERIFY(filename.exists()); + filename.open(QIODevice::ReadOnly); + + QSignalSpy readSignal(audio, SIGNAL(notify())); + audio->setNotifyInterval(100); + audio->start(&filename); + + QTestEventLoop::instance().enterLoop(1); + // 4.wav is a little less than 700ms, so notify should fire 6 times! + QVERIFY(readSignal.count() >= 6); + QVERIFY(audio->totalTime() == 692250); + + audio->stop(); + filename.close(); + } } void tst_QAudioOutput::pushFile() { - QFile filename(SRCDIR "4.wav"); - QVERIFY(filename.exists()); - filename.open(QIODevice::ReadOnly); - - const qint64 fileSize = filename.size(); - - QIODevice* feed = audio->start(0); - - char* buffer = new char[fileSize]; - filename.read(buffer, fileSize); - - qint64 counter=0; - qint64 written=0; - while(written < fileSize) { - written+=feed->write(buffer+written,fileSize-written); - QTest::qWait(20); - counter++; + if(available) { + QFile filename(SRCDIR "4.wav"); + QVERIFY(filename.exists()); + filename.open(QIODevice::ReadOnly); + + const qint64 fileSize = filename.size(); + + QIODevice* feed = audio->start(0); + + char* buffer = new char[fileSize]; + filename.read(buffer, fileSize); + + qint64 counter=0; + qint64 written=0; + while(written < fileSize) { + written+=feed->write(buffer+written,fileSize-written); + QTest::qWait(20); + counter++; + } + QTestEventLoop::instance().enterLoop(1); + + QVERIFY(written == fileSize); + QVERIFY(audio->totalTime() == 692250); + + audio->stop(); + filename.close(); + delete [] buffer; + delete audio; } - QTestEventLoop::instance().enterLoop(1); - - QVERIFY(written == fileSize); - QVERIFY(audio->totalTime() == 692250); - - audio->stop(); - filename.close(); - delete [] buffer; - delete audio; } QTEST_MAIN(tst_QAudioOutput) -- cgit v0.12 From 4b1b93f3f97de70af316052bc38048f52631b9e4 Mon Sep 17 00:00:00 2001 From: Keith Isdale Date: Fri, 14 Aug 2009 15:36:07 +1000 Subject: qmake's include function now supports three arguments The second and third arguments to qmake's include function are optional Task-number: 259398 Reviewed-by: Stian Sandvik Thomassen --- tools/linguist/shared/profileevaluator.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/linguist/shared/profileevaluator.cpp b/tools/linguist/shared/profileevaluator.cpp index b062dec..16eba4f 100644 --- a/tools/linguist/shared/profileevaluator.cpp +++ b/tools/linguist/shared/profileevaluator.cpp @@ -2145,10 +2145,12 @@ ProItem::ProItemReturn ProFileEvaluator::Private::evaluateConditionalFunction( if (m_skipLevel && !m_cumulative) return ProItem::ReturnFalse; QString parseInto; - if (args.count() == 2) { + // the third optional argument to include() controls warnings + // and is not used here + if ((args.count() == 2) || (args.count() == 3)) { parseInto = args[1]; } else if (args.count() != 1) { - q->logMessage(format("include(file) requires one or two arguments.")); + q->logMessage(format("include(file) requires one, two or three arguments.")); return ProItem::ReturnFalse; } QString fileName = args.first(); -- cgit v0.12 From b98b7d305ffebb700e471bd64a7dee59d947e056 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Fri, 14 Aug 2009 16:27:08 +1000 Subject: QT_NO_URL_CAST_FROM_STRING, like QT_NO_CAST_FROM_ASCII --- src/corelib/io/qurl.cpp | 23 +++++++++++++++++++++++ src/corelib/io/qurl.h | 5 +++++ 2 files changed, 28 insertions(+) diff --git a/src/corelib/io/qurl.cpp b/src/corelib/io/qurl.cpp index 79cd2f0..2841bac 100644 --- a/src/corelib/io/qurl.cpp +++ b/src/corelib/io/qurl.cpp @@ -4024,6 +4024,29 @@ QString QUrlPrivate::createErrorString() } /*! + \macro QT_NO_URL_CAST_FROM_STRING + \relates QUrl + + Disables automatic conversions from QString (or char *) to QUrl. + + Compiling your code with this define is useful when you have a lot of + code that uses QString for file names and you wish to convert it to + use QUrl for network transparency. In any code that uses QUrl, it can + help avoid missing QUrl::resolved() calls, and other misuses of + QString to QUrl conversions. + + \oldcode + url = filename; // probably not what you want + \newcode + url = QUrl::fromLocalFile(filename); + url = baseurl.resolved(QUrl(filename)); + \endcode + + \sa QT_NO_CAST_FROM_ASCII +*/ + + +/*! Constructs a URL by parsing \a url. \a url is assumed to be in human readable representation, with no percent encoding. QUrl will automatically percent encode all characters that are not allowed in a URL. diff --git a/src/corelib/io/qurl.h b/src/corelib/io/qurl.h index f72c45d..479c8b3 100644 --- a/src/corelib/io/qurl.h +++ b/src/corelib/io/qurl.h @@ -81,12 +81,17 @@ public: Q_DECLARE_FLAGS(FormattingOptions, FormattingOption) QUrl(); +#ifdef QT_NO_URL_CAST_FROM_STRING + explicit +#endif QUrl(const QString &url); QUrl(const QString &url, ParsingMode mode); // ### Qt 5: merge the two constructors, with mode = TolerantMode QUrl(const QUrl ©); QUrl &operator =(const QUrl ©); +#ifndef QT_NO_URL_CAST_FROM_STRING QUrl &operator =(const QString &url); +#endif ~QUrl(); void setUrl(const QString &url); -- cgit v0.12 From c80302a19f43ed1c39675a979762499fc589743a Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Fri, 14 Aug 2009 16:37:10 +1000 Subject: spel --- src/gui/painting/qpainter.cpp | 10 +++++----- src/gui/painting/qpainterpath.h | 4 ++-- src/gui/styles/qmacstyle_mac.mm | 10 +++++----- tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 4 ++-- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/gui/painting/qpainter.cpp b/src/gui/painting/qpainter.cpp index 2ccb0c5..0762138 100644 --- a/src/gui/painting/qpainter.cpp +++ b/src/gui/painting/qpainter.cpp @@ -7487,8 +7487,8 @@ void qt_format_text(const QFont &fnt, const QRectF &_r, QFontMetricsF fm(fnt); QString text = str; int offset = 0; -start_lenghtVariant: - bool hasMoreLenghtVariants = false; +start_lengthVariant: + bool hasMoreLengthVariants = false; // compatible behaviour to the old implementation. Replace // tabs by spaces bool has_tab = false; @@ -7510,7 +7510,7 @@ start_lenghtVariant: has_tab = true; } else if (chr == QChar(ushort(0x9c))) { // string with multiple length variants - hasMoreLenghtVariants = true; + hasMoreLengthVariants = true; break; } } @@ -7634,9 +7634,9 @@ start_lenghtVariant: } QRectF bounds = QRectF(r.x() + xoff, r.y() + yoff, width, height); - if (hasMoreLenghtVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) { + if (hasMoreLengthVariants && !(tf & Qt::TextLongestVariant) && !r.contains(bounds)) { offset++; - goto start_lenghtVariant; + goto start_lengthVariant; } if (brect) *brect = bounds; diff --git a/src/gui/painting/qpainterpath.h b/src/gui/painting/qpainterpath.h index 1adf315..e320c0b 100644 --- a/src/gui/painting/qpainterpath.h +++ b/src/gui/painting/qpainterpath.h @@ -298,9 +298,9 @@ inline void QPainterPath::lineTo(qreal x, qreal y) lineTo(QPointF(x, y)); } -inline void QPainterPath::arcTo(qreal x, qreal y, qreal w, qreal h, qreal startAngle, qreal arcLenght) +inline void QPainterPath::arcTo(qreal x, qreal y, qreal w, qreal h, qreal startAngle, qreal arcLength) { - arcTo(QRectF(x, y, w, h), startAngle, arcLenght); + arcTo(QRectF(x, y, w, h), startAngle, arcLength); } inline void QPainterPath::arcMoveTo(qreal x, qreal y, qreal w, qreal h, qreal angle) diff --git a/src/gui/styles/qmacstyle_mac.mm b/src/gui/styles/qmacstyle_mac.mm index 8736769..08b6ad8 100644 --- a/src/gui/styles/qmacstyle_mac.mm +++ b/src/gui/styles/qmacstyle_mac.mm @@ -4635,12 +4635,12 @@ void QMacStyle::drawComplexControl(ComplexControl cc, const QStyleOptionComplex // no longer possible to move it, second the up/down buttons are removed when // there is not enough space for them. if (cc == CC_ScrollBar) { - const int scrollBarLenght = (slider->orientation == Qt::Horizontal) + const int scrollBarLength = (slider->orientation == Qt::Horizontal) ? slider->rect.width() : slider->rect.height(); const QMacStyle::WidgetSizePolicy sizePolicy = widgetSizePolicy(widget); - if (scrollBarLenght < scrollButtonsCutoffSize(thumbIndicatorCutoff, sizePolicy)) + if (scrollBarLength < scrollButtonsCutoffSize(thumbIndicatorCutoff, sizePolicy)) tdi.attributes &= ~kThemeTrackShowThumb; - if (scrollBarLenght < scrollButtonsCutoffSize(scrollButtonsCutoff, sizePolicy)) + if (scrollBarLength < scrollButtonsCutoffSize(scrollButtonsCutoff, sizePolicy)) tdi.enableState = kThemeTrackNothingToScroll; } @@ -5109,9 +5109,9 @@ QStyle::SubControl QMacStyle::hitTestComplexControl(ComplexControl cc, // The arrow buttons are not drawn if the scroll bar is to short, // exclude them from the hit test. - const int scrollBarLenght = (sb->orientation == Qt::Horizontal) + const int scrollBarLength = (sb->orientation == Qt::Horizontal) ? sb->rect.width() : sb->rect.height(); - if (scrollBarLenght < scrollButtonsCutoffSize(scrollButtonsCutoff, widgetSizePolicy(widget))) + if (scrollBarLength < scrollButtonsCutoffSize(scrollButtonsCutoff, widgetSizePolicy(widget))) sbi.enableState = kThemeTrackNothingToScroll; sbi.viewsize = sb->pageStep; diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index f827bfc..9a743ef 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -71,7 +71,7 @@ private slots: void elidedText(); void veryNarrowElidedText(); void averageCharWidth(); - void elidedMultiLenght(); + void elidedMultiLength(); }; tst_QFontMetrics::tst_QFontMetrics() @@ -203,7 +203,7 @@ void tst_QFontMetrics::averageCharWidth() QVERIFY(fmf.averageCharWidth() != 0); } -void tst_QFontMetrics::elidedMultiLenght() +void tst_QFontMetrics::elidedMultiLength() { QString text1 = "Long Text 1\x9cShorter\x9csmall"; QString text1_long = "Long Text 1"; -- cgit v0.12 From 01ecc29ad3f737fb8e1cc3a33dfa4687cd74c1a5 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 09:39:14 +0300 Subject: Implemented minimalistic modal handling for Symbian OS. The implementation is likely not complete, but makes autotests using QApplication::activeModalWidget to pass. At least the following test now pass successfully: qcolordialog qmessagebox Might have positive impact to other autotests as well. --- src/gui/kernel/qapplication_s60.cpp | 24 +++++++++++++++++------- tests/auto/_Categories/QtGui.txt | 2 +- 2 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/gui/kernel/qapplication_s60.cpp b/src/gui/kernel/qapplication_s60.cpp index db78349..44ac380 100644 --- a/src/gui/kernel/qapplication_s60.cpp +++ b/src/gui/kernel/qapplication_s60.cpp @@ -75,10 +75,11 @@ QT_BEGIN_NAMESPACE #if defined(QT_DEBUG) static bool appNoGrab = false; // Grabbing enabled #endif - +static bool app_do_modal = false; // modal mode Q_GLOBAL_STATIC(QS60Data, qt_s60Data); -extern bool qt_sendSpontaneousEvent(QObject*,QEvent*); +extern bool qt_sendSpontaneousEvent(QObject*,QEvent*); +extern QWidgetList *qt_modal_stack; // stack of modal widgets extern QDesktopWidget *qt_desktopWidget; // qapplication.cpp QWidget *qt_button_down = 0; // widget got last button-down @@ -788,17 +789,26 @@ QString QApplicationPrivate::appName() const bool QApplicationPrivate::modalState() { - return false; + return app_do_modal; } -void QApplicationPrivate::enterModal_sys(QWidget * /* widget */) +void QApplicationPrivate::enterModal_sys(QWidget *widget) { - // TODO: Implement QApplicationPrivate::enterModal_sys(QWidget *widget) + if (!qt_modal_stack) + qt_modal_stack = new QWidgetList; + qt_modal_stack->insert(0, widget); + app_do_modal = true; } -void QApplicationPrivate::leaveModal_sys(QWidget * /* widget */) +void QApplicationPrivate::leaveModal_sys(QWidget *widget) { - // TODO: Implement QApplicationPrivate::leaveModal_sys(QWidget *widget) + if (qt_modal_stack && qt_modal_stack->removeAll(widget)) { + if (qt_modal_stack->isEmpty()) { + delete qt_modal_stack; + qt_modal_stack = 0; + } + } + app_do_modal = qt_modal_stack != 0; } void QApplicationPrivate::openPopup(QWidget *popup) diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt index 495a173..a50dd0c 100644 --- a/tests/auto/_Categories/QtGui.txt +++ b/tests/auto/_Categories/QtGui.txt @@ -100,7 +100,7 @@ qmainwindow #qmdisubwindow not relevant for S60, skip for now qmenu qmenubar -#qmessagebox that's a hanger +qmessagebox qmouseevent qmouseevent_modal qmovie -- cgit v0.12 From 7d68b34a1f261b2b23400fddcf46d6521eae32d1 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 09:47:41 +0300 Subject: Fixed and re-enabled anguagechange autotest for Symbian. Started to use QApplication::closeAllWindows instead of unexported QThreadData::current() and friends. --- tests/auto/_Categories/QtGui.txt | 2 +- tests/auto/languagechange/tst_languagechange.cpp | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/tests/auto/_Categories/QtGui.txt b/tests/auto/_Categories/QtGui.txt index a50dd0c..d8af499 100644 --- a/tests/auto/_Categories/QtGui.txt +++ b/tests/auto/_Categories/QtGui.txt @@ -1,6 +1,6 @@ exceptionsafety_objects #gestures This test is incomplete and also missing from auto.pro -> disabled for now -#languagechange Uses unexported method QThreadData::current() and also missing from auto.pro -> disabled for now +languagechange math3d modeltest qabstractbutton diff --git a/tests/auto/languagechange/tst_languagechange.cpp b/tests/auto/languagechange/tst_languagechange.cpp index 7cca3bf..7c98809 100644 --- a/tests/auto/languagechange/tst_languagechange.cpp +++ b/tests/auto/languagechange/tst_languagechange.cpp @@ -122,10 +122,7 @@ public slots: void install() { QCoreApplication::installTranslator(this); QTest::qWait(2500); - //### is there any better way to close a Qt dialog? - QThreadData *data = QThreadData::current(); - if (!data->eventLoops.isEmpty()) - data->eventLoops.top()->quit(); + QApplication::closeAllWindows(); } public: mutable QSet m_translations; -- cgit v0.12 From c57c204a63168e875e513d299bb152c0a1ab0094 Mon Sep 17 00:00:00 2001 From: Warwick Allison Date: Fri, 14 Aug 2009 16:56:46 +1000 Subject: Fix MLS test "sm"+ellipsis (...) is same length as "small" in some fonts --- tests/auto/qfontmetrics/tst_qfontmetrics.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp index 9a743ef..9ffbc05 100644 --- a/tests/auto/qfontmetrics/tst_qfontmetrics.cpp +++ b/tests/auto/qfontmetrics/tst_qfontmetrics.cpp @@ -218,8 +218,9 @@ void tst_QFontMetrics::elidedMultiLength() QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_short), text1_short); QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_short - 1), text1_small); + // Not even wide enough for "small" - should use ellipsis QChar ellipsisChar(0x2026); - QString text1_el = QString::fromLatin1("sm") + ellipsisChar; + QString text1_el = QString::fromLatin1("s") + ellipsisChar; int width_small = fm.width(text1_el); QCOMPARE(fm.elidedText(text1,Qt::ElideRight, width_small + 1), text1_el); -- cgit v0.12 From 0d58e2e27fba91a1310bca2fa8650700b1281afe Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 14 Aug 2009 09:11:08 +0200 Subject: Add stringbuilder auto test to auto.pro Reviewed-by: trustme --- tests/auto/auto.pro | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/auto/auto.pro b/tests/auto/auto.pro index dd188cd..585f461 100644 --- a/tests/auto/auto.pro +++ b/tests/auto/auto.pro @@ -316,6 +316,7 @@ SUBDIRS += \ qstatusbar \ qstl \ qstring \ + qstringbuilder \ qstringmatcher \ qstringlist \ qstringlistmodel \ -- cgit v0.12 From 6999732e677efafb342fe95241dea842ee0c9dbb Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 10:35:50 +0300 Subject: Fixed tst_QGraphicsView::scrollBarRanges autotest for Symbian. The scrollBarRanges test case is style specific, but we were using s60 style to run the test. Added Q_OS_SYMBIAN ifdef to enable windows style for this particular test case. --- tests/auto/qgraphicsview/tst_qgraphicsview.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp index a043d49..803898a 100644 --- a/tests/auto/qgraphicsview/tst_qgraphicsview.cpp +++ b/tests/auto/qgraphicsview/tst_qgraphicsview.cpp @@ -2531,7 +2531,7 @@ void tst_QGraphicsView::scrollBarRanges() QSKIP("No Motif style compiled.", SkipSingle); #endif } else { -#if defined(Q_OS_WINCE) +#if defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) view.setStyle(new QWindowsStyle); #elif !defined(QT_NO_STYLE_PLASTIQUE) view.setStyle(new QPlastiqueStyle); -- cgit v0.12 From f3879071f7976bcda3a6e8eed4ca284e80a1a3f9 Mon Sep 17 00:00:00 2001 From: Peter Yard Date: Mon, 3 Aug 2009 10:46:53 +1000 Subject: Make Qt::NoGesture visible. Needed for QGesture subclassing. --- doc/src/classes/qnamespace.qdoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/classes/qnamespace.qdoc b/doc/src/classes/qnamespace.qdoc index 2ccc639..48f18d0 100644 --- a/doc/src/classes/qnamespace.qdoc +++ b/doc/src/classes/qnamespace.qdoc @@ -2742,7 +2742,7 @@ This enum type describes the state of a gesture. - \omitvalue NoGesture + \value NoGesture Initial state \value GestureStarted A continuous gesture has started. \value GestureUpdated A gesture continues. \value GestureFinished A gesture has finished. -- cgit v0.12 From 28a67ceafaf65b56c7795b41f9a645b1349cd346 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 10:39:54 +0300 Subject: Fixed qdiriterator test for Symbian --- tests/auto/qdiriterator/tst_qdiriterator.cpp | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/auto/qdiriterator/tst_qdiriterator.cpp b/tests/auto/qdiriterator/tst_qdiriterator.cpp index 1419633..b0f7000 100644 --- a/tests/auto/qdiriterator/tst_qdiriterator.cpp +++ b/tests/auto/qdiriterator/tst_qdiriterator.cpp @@ -52,6 +52,11 @@ #define Q_NO_SYMLINKS #endif +#if defined(Q_OS_SYMBIAN) +// Open C in Symbian doesn't support symbolic links to directories +#define Q_NO_SYMLINKS_TO_DIRS +#endif + Q_DECLARE_METATYPE(QDirIterator::IteratorFlags) Q_DECLARE_METATYPE(QDir::Filters) @@ -92,16 +97,20 @@ tst_QDirIterator::tst_QDirIterator() QFile::remove("entrylist/directory/entrylist4.lnk"); #ifndef Q_NO_SYMLINKS -#ifdef Q_OS_WIN || defined(Q_OS_SYMBIAN) +# if defined(Q_OS_WIN) || defined(Q_OS_SYMBIAN) // ### Sadly, this is a platform difference right now. QFile::link("entrylist/file", "entrylist/linktofile.lnk"); +# ifndef Q_NO_SYMLINKS_TO_DIRS QFile::link("entrylist/directory", "entrylist/linktodirectory.lnk"); +# endif QFile::link("entrylist/nothing", "entrylist/brokenlink.lnk"); -#else +# else QFile::link("file", "entrylist/linktofile.lnk"); +# ifndef Q_NO_SYMLINKS_TO_DIRS QFile::link("directory", "entrylist/linktodirectory.lnk"); +# endif QFile::link("nothing", "entrylist/brokenlink.lnk"); -#endif +# endif #endif QFile("entrylist/writable").open(QIODevice::ReadWrite); } @@ -136,7 +145,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() << QString("entrylist") << QDirIterator::IteratorFlags(0) << QDir::Filters(QDir::NoFilter) << QStringList("*") << QString( -#if !defined(Q_OS_WINCE) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) "entrylist/.," "entrylist/..," #endif @@ -145,7 +154,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() "entrylist/linktofile.lnk," #endif "entrylist/directory," -#ifndef Q_NO_SYMLINKS +#if !defined(Q_NO_SYMLINKS) && !defined(Q_NO_SYMLINKS_TO_DIRS) "entrylist/linktodirectory.lnk," #endif "entrylist/writable").split(','); @@ -154,7 +163,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() << QString("entrylist") << QDirIterator::IteratorFlags(QDirIterator::Subdirectories | QDirIterator::FollowSymlinks) << QDir::Filters(QDir::NoFilter) << QStringList("*") << QString( -#if !defined(Q_OS_WINCE) +#if !defined(Q_OS_WINCE) && !defined(Q_OS_SYMBIAN) "entrylist/.," "entrylist/..," "entrylist/directory/.," @@ -166,7 +175,7 @@ void tst_QDirIterator::iterateRelativeDirectory_data() #endif "entrylist/directory," "entrylist/directory/dummy," -#ifndef Q_NO_SYMLINKS +#if !defined(Q_NO_SYMLINKS) && !defined(Q_NO_SYMLINKS_TO_DIRS) "entrylist/linktodirectory.lnk," #endif "entrylist/writable").split(','); @@ -200,11 +209,6 @@ void tst_QDirIterator::iterateRelativeDirectory() QFETCH(QStringList, nameFilters); QFETCH(QStringList, entries); -#if defined(Q_OS_SYMBIAN) - QEXPECT_FAIL("no flags", "Symlink to directories is currently unsupported by Open C", Continue); - QEXPECT_FAIL("QDir::Subdirectories | QDir::FollowSymlinks", "Symlink to directories is currently unsupported by Open C", Continue); -#endif // defined(Q_OS_SYMBIAN) - QDirIterator it(dirName, nameFilters, filters, flags); QStringList list; while (it.hasNext()) { -- cgit v0.12 From ff30df236f4f58f69eb7e56685aa7f8b979629f9 Mon Sep 17 00:00:00 2001 From: Peter Yard Date: Fri, 14 Aug 2009 17:35:50 +1000 Subject: Gesture Overview Documentation Overview of QGesture class and reference to QStandardGestures Gesture overview using ImageViewer example to demonstrate use of class by implementer. --- doc/src/gestures.qdoc | 170 +++++++++ doc/src/snippets/gestures/qgesture.cpp | 283 ++++++++++++++ doc/src/snippets/gestures/qgesture.h | 101 +++++ doc/src/snippets/gestures/qstandardgestures.cpp | 483 ++++++++++++++++++++++++ doc/src/snippets/gestures/qstandardgestures.h | 126 +++++++ 5 files changed, 1163 insertions(+) create mode 100644 doc/src/gestures.qdoc create mode 100644 doc/src/snippets/gestures/qgesture.cpp create mode 100644 doc/src/snippets/gestures/qgesture.h create mode 100644 doc/src/snippets/gestures/qstandardgestures.cpp create mode 100644 doc/src/snippets/gestures/qstandardgestures.h diff --git a/doc/src/gestures.qdoc b/doc/src/gestures.qdoc new file mode 100644 index 0000000..49a9ae3 --- /dev/null +++ b/doc/src/gestures.qdoc @@ -0,0 +1,170 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the documentation 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 http://www.qtsoftware.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page gestures-overview.html + \startpage index.html Qt Reference Documentation + + \title Gestures Programming + \ingroup howto + \brief An overview of the Qt support for Gesture programming. + + The QGesture class provides the ability to form gestures from a series + of events independent of the input method. A gesture could be a particular + movement of a mouse, a touch screen action, or a series of events from + some other source. The nature of the input, the interpretation + of the gesture and the action taken are the choice of the implementing + developer. + + \tableofcontents + + + \section1 Creating Your Own Gesture Recognizer + + QGesture is a base class for a user defined gesture recognizer class. In + order to implement the recognizer you will need to subclass the + QGesture class and implement the pure virtual function \l{QGesture::filterEvent()}{filterEvent()}. Once + you have implemented the \l{QGesture::filterEvent()}{filterEvent()} function to + make your own recognizer you can process events. A sequence of events may, + according to your own rules, represent a gesture. The events can be singly + passed to the recognizer via the \l{QGesture::filterEvent()}{filterEvent()} function or as a stream of + events by specifying a parent source of events. The events can be from any + source and could result in any action as defined by the user. The source + and action need not be graphical though that would be the most likely + scenario. To find how to connect a source of events to automatically feed into the recognizer see QGesture. + + Recognizers based on QGesture can emit any of the following signals: + + \snippet doc/src/snippets/gestures/qgesture.h qgesture-signals + + These signals are emitted when the state changes with the call to + \l{QGesture::updateState()}{updateState()}, more than one signal may + be emitted when a change of state occurs. There are four GestureStates + + \table + \header \o New State \o Description \o QGesture Actions on Entering this State + \row \o Qt::NoGesture \o Initial value \o emit \l {QGesture::cancelled()}{cancelled()} + \row \o Qt::GestureStarted \o A continuous gesture has started \o emit \l{QGesture::started()}{started()} and emit \l{QGesture::triggered()}{triggered()} + \row \o Qt::GestureUpdated \o A gesture continues \o emit \l{QGesture::triggered()}{triggered()} + \row \o Qt::GestureFinished \o A gesture has finished. \o emit \l{QGesture::finished()}{finished()} + \endtable + + \note \l{QGesture::started()}{started()} can be emitted if entering any + state greater than NoGesture if NoGesture was the previous state. This + means that your state machine does not need to explicitly use the + Qt::GestureStarted state, you can simply proceed from NoGesture to + Qt::GestureUpdated to emit a \l{QGesture::started()}{started()} signal + and a \l{QGesture::triggered()}{triggered()} signal. + + You may use some or all of these states when implementing the pure + virtual function \l{QGesture::filterEvent()}{filterEvent()}. + \l{QGesture::filterEvent()}{filterEvent()} will usually implement a + state machine using the GestureState enums, but the details of which + states are used is up to the developer. + + You may also need to reimplement the virtual function \l{QGesture::reset()}{reset()} + if internal data or objects need to be re-initialized. The function must + conclude with a call to \l{QGesture::updateState()}{updateState()} to + change the current state to Qt::NoGesture. + + \section1 An Example, ImageViewer + + To illustrate how to use QGesture we will look at the ImageViewer + example. This example uses QPanGesture, standard gesture, and an + implementation of TapAndHoldGesture. Note that TapAndHoldGesture is + platform dependent. + + \snippet doc/src/snippets/gestures/imageviewer/tapandholdgesture.cpp tapandhold-reset + + In ImageViewer we see that the ImageWidget class uses two gestures: + \l QPanGesture and TapAndHoldGesture. The + QPanGesture is a standard gesture which is part of Qt. + TapAndHoldGesture is defined and implemented as part of the example. + The ImageWidget listens for signals from the gestures, but is not + interested in the \l{QGesture::started()}{started()} signal. + + \snippet doc/src/snippets/gestures/imageviewer/imagewidget.h imagewidget-slots + + TapAndHoldGesture uses QTouchEvent events and mouse events to detect + start, update and end events that can be mapped onto the GestureState + changes. The implementation in this case uses a timer as well. If the + timeout event occurs a given number of times after the start of the gesture + then the gesture is considered to have finished whether or not the + appropriate touch or mouse event has occurred. Also if a large jump in + the position of the event occurs, as calculated by the \l {QPoint::manhattanLength()}{manhattanLength()} + call, then the gesture is cancelled by calling \l{QGesture::reset()}{reset()} + which tidies up and uses \l{QGesture::updateState()}{updateState()} to + change state to NoGesture which will result in the \l{QGesture::cancelled()}{cancelled()} + signal being emitted by the recognizer. + + ImageWidget handles the signals by connecting the slots to the signals, + although \c cancelled() is not connected here. + + \snippet doc/src/snippets/gestures/imageviewer/imagewidget.cpp imagewidget-connect + + These functions in turn will have to be aware of which gesture + object was the source of the signal since we have more than one source + per slot. This is easily done by using the QObject::sender() function + as shown here + + \snippet doc/src/snippets/gestures/imageviewer/imagewidget.cpp imagewidget-triggered-1 + + As \l{QGesture::triggered()}{triggered()} signals are handled by + gestureTriggered() there may be position updates invoking calls to, + for example, goNextImage(), this will cause a change in the image + handling logic of ImageWidget and a call to updateImage() to display + the changed state. + + Following the logic of how the QEvent is processed we can summmarize + it as follows: + \list + \o filterEvent() becomes the event filter of the parent ImageWidget object for a QPanGesture object and a + TapAndHoldGesture object. + \o filterEvent() then calls updateState() to change states + \o updateState() emits the appropriate signal(s) for the state change. + \o The signals are caught by the defined slots in ImageWidget + \o The widget logic changes and an update() results in a paint event. + \endlist + + + +*/ + diff --git a/doc/src/snippets/gestures/qgesture.cpp b/doc/src/snippets/gestures/qgesture.cpp new file mode 100644 index 0000000..79dcae1 --- /dev/null +++ b/doc/src/snippets/gestures/qgesture.cpp @@ -0,0 +1,283 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (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 http://qt.nokia.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qgesture.h" +#include +#include "qgraphicsitem.h" + +QT_BEGIN_NAMESPACE + + +class QEventFilterProxyGraphicsItem : public QGraphicsItem +{ +public: + QEventFilterProxyGraphicsItem(QGesture *g) + : gesture(g) + { + } + bool sceneEventFilter(QGraphicsItem *, QEvent *event) + { + return gesture ? gesture->filterEvent(event) : false; + } + QRectF boundingRect() const { return QRectF(); } + void paint(QPainter*, const QStyleOptionGraphicsItem*, QWidget*) { } + +private: + QGesture *gesture; +}; + +/*! + \class QGesture + \since 4.6 + + \brief The QGesture class is the base class for implementing custom + gestures. + + This class represents both an object that recognizes a gesture out of a set + of input events (a gesture recognizer), and a gesture object itself that + can be used to get extended information about the triggered gesture. + + The class has a list of properties that can be queried by the user to get + some gesture-specific parameters (for example, an offset of a Pan gesture). + + Usually gesture recognizer implements a state machine, storing its state + internally in the recognizer object. The recognizer receives input events + through the \l{QGesture::}{filterEvent()} virtual function and decides + whether the event should change the state of the recognizer by emitting an + appropriate signal. + + Input events should be either fed to the recognizer one by one with a + filterEvent() function, or the gesture recognizer should be attached to an + object it filters events for by specifying it as a parent object. The + QGesture object installs itself as an event filter to the parent object + automatically, the unsetObject() function should be used to remove an event + filter from the parent object. To make a + gesture that operates on a QGraphicsItem, both the appropriate QGraphicsView + should be passed as a parent object and setGraphicsItem() functions should + be used to attach a gesture to a graphics item. + + This is a base class, to create a custom gesture type, you should subclass + it and implement its pure virtual functions. + + \sa QPanGesture +*/ + +/*! \fn bool QGesture::filterEvent(QEvent *event) + + Parses input \a event and emits a signal when detects a gesture. + + In your reimplementation of this function, if you want to filter the \a + event out, i.e. stop it being handled further, return true; otherwise + return false; + + This is a pure virtual function that needs to be implemented in subclasses. +*/ + +/*! \fn void QGesture::started() + + The signal is emitted when the gesture is started. Extended information + about the gesture is contained in the signal sender object. + + In addition to started(), a triggered() signal should also be emitted. +*/ + +/*! \fn void QGesture::triggered() + + The signal is emitted when the gesture is detected. Extended information + about the gesture is contained in the signal sender object. +*/ + +/*! \fn void QGesture::finished() + + The signal is emitted when the gesture is finished. Extended information + about the gesture is contained in the signal sender object. +*/ + +/*! \fn void QGesture::cancelled() + + The signal is emitted when the gesture is cancelled, for example the reset() + function is called while the gesture was in the process of emitting a + triggered() signal. Extended information about the gesture is contained in + the sender object. +*/ + + +/*! + Creates a new gesture handler object and marks it as a child of \a parent. + + The \a parent object is also the default event source for the gesture, + meaning that the gesture installs itself as an event filter for the \a + parent. + + \sa setGraphicsItem() +*/ +QGesture::QGesture(QObject *parent) + : QObject(*new QGesturePrivate, parent) +{ + if (parent) + parent->installEventFilter(this); +} + +/*! \internal + */ +QGesture::QGesture(QGesturePrivate &dd, QObject *parent) + : QObject(dd, parent) +{ + if (parent) + parent->installEventFilter(this); +} + +/*! + Destroys the gesture object. +*/ +QGesture::~QGesture() +{ +} + +/*! \internal + */ +bool QGesture::eventFilter(QObject *receiver, QEvent *event) +{ + Q_D(QGesture); + if (d->graphicsItem && receiver == parent()) + return false; + return filterEvent(event); +} + +/*! + \property QGesture::state + + \brief The current state of the gesture. +*/ + +/*! + Returns the gesture recognition state. + */ +Qt::GestureState QGesture::state() const +{ + return d_func()->state; +} + +/*! + Sets this gesture's recognition state to \a state and emits appropriate + signals. + + This functions emits the signals according to the old state and the new + \a state, and it should be called after all the internal properties have been + initialized. + + \sa started(), triggered(), finished(), cancelled() + */ +void QGesture::updateState(Qt::GestureState state) +{ + Q_D(QGesture); + if (d->state == state) { + if (state == Qt::GestureUpdated) + emit triggered(); + return; + } + const Qt::GestureState oldState = d->state; + d->state = state; + if (state != Qt::NoGesture && oldState > state) { + // comparing the state as ints: state should only be changed from + // started to (optionally) updated and to finished. + qWarning("QGesture::updateState: incorrect new state"); + return; + } + if (oldState == Qt::NoGesture) + emit started(); + if (state == Qt::GestureUpdated) + emit triggered(); + else if (state == Qt::GestureFinished) + emit finished(); + else if (state == Qt::NoGesture) + emit cancelled(); + + if (state == Qt::GestureFinished) { + // gesture is finished, so we reset the internal state. + d->state = Qt::NoGesture; + } +} + +/*! + Sets the \a graphicsItem the gesture is filtering events for. + + The gesture will install an event filter to the \a graphicsItem and + redirect them to the filterEvent() function. + + \sa graphicsItem() +*/ +void QGesture::setGraphicsItem(QGraphicsItem *graphicsItem) +{ + Q_D(QGesture); + if (d->graphicsItem && d->eventFilterProxyGraphicsItem) + d->graphicsItem->removeSceneEventFilter(d->eventFilterProxyGraphicsItem); + d->graphicsItem = graphicsItem; + if (!d->eventFilterProxyGraphicsItem) + d->eventFilterProxyGraphicsItem = new QEventFilterProxyGraphicsItem(this); + if (graphicsItem) + graphicsItem->installSceneEventFilter(d->eventFilterProxyGraphicsItem); +} + +/*! + Returns the graphics item the gesture is filtering events for. + + \sa setGraphicsItem() +*/ +QGraphicsItem* QGesture::graphicsItem() const +{ + return d_func()->graphicsItem; +} + +/*! \fn void QGesture::reset() + + Resets the internal state of the gesture. This function might be called by + the filterEvent() implementation in a derived class, or by the user to + cancel a gesture. The base class implementation calls + updateState(Qt::NoGesture) which emits the cancelled() + signal if the state() of the gesture indicated it was active. +*/ +void QGesture::reset() +{ + updateState(Qt::NoGesture); +} + +QT_END_NAMESPACE diff --git a/doc/src/snippets/gestures/qgesture.h b/doc/src/snippets/gestures/qgesture.h new file mode 100644 index 0000000..beb3de0 --- /dev/null +++ b/doc/src/snippets/gestures/qgesture.h @@ -0,0 +1,101 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (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 http://qt.nokia.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QGESTURE_H +#define QGESTURE_H + +#include +#include +#include +#include +#include +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +class QGraphicsItem; +class QGesturePrivate; +class Q_GUI_EXPORT QGesture : public QObject +{ + Q_OBJECT + Q_DECLARE_PRIVATE(QGesture) + + Q_PROPERTY(Qt::GestureState state READ state) + +public: + explicit QGesture(QObject *parent = 0); + ~QGesture(); + + virtual bool filterEvent(QEvent *event) = 0; + + void setGraphicsItem(QGraphicsItem *); + QGraphicsItem *graphicsItem() const; + + Qt::GestureState state() const; + +protected: + QGesture(QGesturePrivate &dd, QObject *parent); + bool eventFilter(QObject*, QEvent*); + + virtual void reset(); + void updateState(Qt::GestureState state); + +//! [qgesture-signals] +Q_SIGNALS: + void started(); + void triggered(); + void finished(); + void cancelled(); +//! [qgesture-signals] + +private: + friend class QWidget; +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QGESTURE_H diff --git a/doc/src/snippets/gestures/qstandardgestures.cpp b/doc/src/snippets/gestures/qstandardgestures.cpp new file mode 100644 index 0000000..47f3146 --- /dev/null +++ b/doc/src/snippets/gestures/qstandardgestures.cpp @@ -0,0 +1,483 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (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 http://qt.nokia.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include "qstandardgestures.h" +#include "qstandardgestures_p.h" + +#include +#include +#include +#include +#include + +QT_BEGIN_NAMESPACE + +#ifdef Q_WS_WIN +QWidgetPrivate *qt_widget_private(QWidget *widget); +#endif + +/*! + \class QPanGesture + \since 4.6 + + \brief The QPanGesture class represents a Pan gesture, + providing additional information related to panning. +*/ + +/*! + Creates a new Pan gesture handler object and marks it as a child of \a + parent. + + On some platform like Windows it's necessary to provide a non-null widget + as \a parent to get native gesture support. +*/ +QPanGesture::QPanGesture(QWidget *parent) + : QGesture(*new QPanGesturePrivate, parent) +{ + if (parent) { + QApplicationPrivate *qAppPriv = QApplicationPrivate::instance(); + qAppPriv->widgetGestures[parent].pan = this; +#ifdef Q_WS_WIN + qt_widget_private(parent)->winSetupGestures(); +#endif + } +} + +/*! \internal */ +bool QPanGesture::event(QEvent *event) +{ + switch (event->type()) { + case QEvent::ParentAboutToChange: + if (QWidget *w = qobject_cast(parent())) { + QApplicationPrivate::instance()->widgetGestures[w].pan = 0; +#ifdef Q_WS_WIN + qt_widget_private(w)->winSetupGestures(); +#endif + } + break; + case QEvent::ParentChange: + if (QWidget *w = qobject_cast(parent())) { + QApplicationPrivate::instance()->widgetGestures[w].pan = this; +#ifdef Q_WS_WIN + qt_widget_private(w)->winSetupGestures(); +#endif + } + break; + default: + break; + } + +#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA) + Q_D(QPanGesture); + if (event->type() == QEvent::Timer) { + const QTimerEvent *te = static_cast(event); + if (te->timerId() == d->panFinishedTimer) { + killTimer(d->panFinishedTimer); + d->panFinishedTimer = 0; + d->lastOffset = QSize(0, 0); + updateState(Qt::GestureFinished); + } + } +#endif + + return QObject::event(event); +} + +bool QPanGesture::eventFilter(QObject *receiver, QEvent *event) +{ +#ifdef Q_WS_WIN + Q_D(QPanGesture); + if (receiver->isWidgetType() && event->type() == QEvent::NativeGesture) { + QNativeGestureEvent *ev = static_cast(event); + QApplicationPrivate *qAppPriv = QApplicationPrivate::instance(); + QApplicationPrivate::WidgetStandardGesturesMap::iterator it; + it = qAppPriv->widgetGestures.find(static_cast(receiver)); + if (it == qAppPriv->widgetGestures.end()) + return false; + if (this != it.value().pan) + return false; + Qt::GestureState nextState = Qt::NoGesture; + switch(ev->gestureType) { + case QNativeGestureEvent::GestureBegin: + // next we might receive the first gesture update event, so we + // prepare for it. + d->state = Qt::NoGesture; + return false; + case QNativeGestureEvent::Pan: + nextState = Qt::GestureUpdated; + event->accept(); + break; + case QNativeGestureEvent::GestureEnd: + if (state() == Qt::NoGesture) + return false; // some other gesture has ended + nextState = Qt::GestureFinished; + break; + default: + return false; + } + if (state() == Qt::NoGesture) { + d->lastOffset = d->totalOffset = QSize(); + } else { + d->lastOffset = QSize(ev->position.x() - d->lastPosition.x(), + ev->position.y() - d->lastPosition.y()); + d->totalOffset += d->lastOffset; + } + d->lastPosition = ev->position; + updateState(nextState); + return true; + } +#endif + return QGesture::eventFilter(receiver, event); +} + +/*! \internal */ +bool QPanGesture::filterEvent(QEvent *event) +{ + Q_D(QPanGesture); + if (!event->spontaneous()) + return false; + const QTouchEvent *ev = static_cast(event); + if (event->type() == QEvent::TouchBegin) { + QTouchEvent::TouchPoint p = ev->touchPoints().at(0); + d->lastPosition = p.pos().toPoint(); + d->lastOffset = d->totalOffset = QSize(); + } else if (event->type() == QEvent::TouchEnd) { + if (state() != Qt::NoGesture) { + if (!ev->touchPoints().isEmpty()) { + QTouchEvent::TouchPoint p = ev->touchPoints().at(0); + const QPoint pos = p.pos().toPoint(); + const QPoint lastPos = p.lastPos().toPoint(); + const QPoint startPos = p.startPos().toPoint(); + d->lastOffset = QSize(pos.x() - lastPos.x(), pos.y() - lastPos.y()); + d->totalOffset = QSize(pos.x() - startPos.x(), pos.y() - startPos.y()); + } + updateState(Qt::GestureFinished); + } + reset(); + } else if (event->type() == QEvent::TouchUpdate) { + QTouchEvent::TouchPoint p = ev->touchPoints().at(0); + const QPoint pos = p.pos().toPoint(); + const QPoint lastPos = p.lastPos().toPoint(); + const QPoint startPos = p.startPos().toPoint(); + d->lastOffset = QSize(pos.x() - lastPos.x(), pos.y() - lastPos.y()); + d->totalOffset = QSize(pos.x() - startPos.x(), pos.y() - startPos.y()); + if (d->totalOffset.width() > 10 || d->totalOffset.height() > 10 || + d->totalOffset.width() < -10 || d->totalOffset.height() < -10) { + updateState(Qt::GestureUpdated); + } + } +#ifdef Q_OS_MAC + else if (event->type() == QEvent::Wheel) { + // On Mac, there is really no native panning gesture. Instead, a two + // finger pan is delivered as mouse wheel events. Otoh, on Windows, you + // either get mouse wheel events or pan events. We have decided to make this + // the Qt behaviour as well, meaning that on Mac, wheel + // events will be masked away when listening for pan events. +#ifndef QT_MAC_USE_COCOA + // In Carbon we receive neither touch-, nor pan gesture events. + // So we create pan gestures by converting wheel events. After all, this + // is how things are supposed to work on mac in the first place. + const QWheelEvent *wev = static_cast(event); + int offset = wev->delta() / -120; + d->lastOffset = wev->orientation() == Qt::Horizontal ? QSize(offset, 0) : QSize(0, offset); + + if (state() == Qt::NoGesture) { + d->totalOffset = d->lastOffset; + } else { + d->totalOffset += d->lastOffset; + } + + killTimer(d->panFinishedTimer); + d->panFinishedTimer = startTimer(200); + updateState(Qt::GestureUpdated); +#endif + return true; + } +#endif + return false; +} + +/*! \internal */ +void QPanGesture::reset() +{ + Q_D(QPanGesture); + d->lastOffset = d->totalOffset = QSize(); + d->lastPosition = QPoint(); +#if defined(Q_OS_MAC) && !defined(QT_MAC_USE_COCOA) + if (d->panFinishedTimer) { + killTimer(d->panFinishedTimer); + d->panFinishedTimer = 0; + } +#endif + QGesture::reset(); +} + +/*! + \property QPanGesture::totalOffset + + Specifies a total pan offset since the start of the gesture. +*/ +QSize QPanGesture::totalOffset() const +{ + Q_D(const QPanGesture); + return d->totalOffset; +} + +/*! + \property QPanGesture::lastOffset + + Specifies a pan offset since the last time the gesture was + triggered. +*/ +QSize QPanGesture::lastOffset() const +{ + Q_D(const QPanGesture); + return d->lastOffset; +} + + +/*! + \class QPinchGesture + \since 4.6 + + \brief The QPinchGesture class represents a Pinch gesture, + providing additional information related to zooming and/or rotation. +*/ + +/*! + Creates a new Pinch gesture handler object and marks it as a child of \a + parent. + + On some platform like Windows it's necessary to provide a non-null widget + as \a parent to get native gesture support. +*/ +QPinchGesture::QPinchGesture(QWidget *parent) + : QGesture(*new QPinchGesturePrivate, parent) +{ + if (parent) { + QApplicationPrivate *qAppPriv = QApplicationPrivate::instance(); + qAppPriv->widgetGestures[parent].pinch = this; +#ifdef Q_WS_WIN + qt_widget_private(parent)->winSetupGestures(); +#endif + } +} + +/*! \internal */ +bool QPinchGesture::event(QEvent *event) +{ + switch (event->type()) { + case QEvent::ParentAboutToChange: + if (QWidget *w = qobject_cast(parent())) { + QApplicationPrivate::instance()->widgetGestures[w].pinch = 0; +#ifdef Q_WS_WIN + qt_widget_private(w)->winSetupGestures(); +#endif + } + break; + case QEvent::ParentChange: + if (QWidget *w = qobject_cast(parent())) { + QApplicationPrivate::instance()->widgetGestures[w].pinch = this; +#ifdef Q_WS_WIN + qt_widget_private(w)->winSetupGestures(); +#endif + } + break; + default: + break; + } + return QObject::event(event); +} + +bool QPinchGesture::eventFilter(QObject *receiver, QEvent *event) +{ +#ifdef Q_WS_WIN + Q_D(QPinchGesture); + if (receiver->isWidgetType() && event->type() == QEvent::NativeGesture) { + QNativeGestureEvent *ev = static_cast(event); + QApplicationPrivate *qAppPriv = QApplicationPrivate::instance(); + QApplicationPrivate::WidgetStandardGesturesMap::iterator it; + it = qAppPriv->widgetGestures.find(static_cast(receiver)); + if (it == qAppPriv->widgetGestures.end()) + return false; + if (this != it.value().pinch) + return false; + Qt::GestureState nextState = Qt::NoGesture; + switch(ev->gestureType) { + case QNativeGestureEvent::GestureBegin: + // next we might receive the first gesture update event, so we + // prepare for it. + d->state = Qt::NoGesture; + d->scaleFactor = d->lastScaleFactor = 1; + d->rotationAngle = d->lastRotationAngle = 0; + d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPoint(); + d->initialDistance = 0; + return false; + case QNativeGestureEvent::Rotate: + d->lastRotationAngle = d->rotationAngle; + d->rotationAngle = -1 * GID_ROTATE_ANGLE_FROM_ARGUMENT(ev->argument); + nextState = Qt::GestureUpdated; + event->accept(); + break; + case QNativeGestureEvent::Zoom: + if (d->initialDistance != 0) { + d->lastScaleFactor = d->scaleFactor; + int distance = int(qint64(ev->argument)); + d->scaleFactor = (qreal) distance / d->initialDistance; + } else { + d->initialDistance = int(qint64(ev->argument)); + } + nextState = Qt::GestureUpdated; + event->accept(); + break; + case QNativeGestureEvent::GestureEnd: + if (state() == Qt::NoGesture) + return false; // some other gesture has ended + nextState = Qt::GestureFinished; + break; + default: + return false; + } + if (d->startCenterPoint.isNull()) + d->startCenterPoint = d->centerPoint; + d->lastCenterPoint = d->centerPoint; + d->centerPoint = static_cast(receiver)->mapFromGlobal(ev->position); + updateState(nextState); + return true; + } +#endif + return QGesture::eventFilter(receiver, event); +} + +/*! \internal */ +bool QPinchGesture::filterEvent(QEvent *event) +{ + Q_UNUSED(event); + return false; +} + +/*! \internal */ +void QPinchGesture::reset() +{ + Q_D(QPinchGesture); + d->scaleFactor = d->lastScaleFactor = 0; + d->rotationAngle = d->lastRotationAngle = 0; + d->startCenterPoint = d->centerPoint = d->lastCenterPoint = QPoint(); + QGesture::reset(); +} + +/*! + \property QPinchGesture::scaleFactor + + Specifies a scale factor of the pinch gesture. +*/ +qreal QPinchGesture::scaleFactor() const +{ + return d_func()->scaleFactor; +} + +/*! + \property QPinchGesture::lastScaleFactor + + Specifies a previous scale factor of the pinch gesture. +*/ +qreal QPinchGesture::lastScaleFactor() const +{ + return d_func()->lastScaleFactor; +} + +/*! + \property QPinchGesture::rotationAngle + + Specifies a rotation angle of the gesture. +*/ +qreal QPinchGesture::rotationAngle() const +{ + return d_func()->rotationAngle; +} + +/*! + \property QPinchGesture::lastRotationAngle + + Specifies a previous rotation angle of the gesture. +*/ +qreal QPinchGesture::lastRotationAngle() const +{ + return d_func()->lastRotationAngle; +} + +/*! + \property QPinchGesture::centerPoint + + Specifies a center point of the gesture. The point can be used as a center + point that the object is rotated around. +*/ +QPoint QPinchGesture::centerPoint() const +{ + return d_func()->centerPoint; +} + +/*! + \property QPinchGesture::lastCenterPoint + + Specifies a previous center point of the gesture. +*/ +QPoint QPinchGesture::lastCenterPoint() const +{ + return d_func()->lastCenterPoint; +} + +/*! + \property QPinchGesture::startCenterPoint + + Specifies an initial center point of the gesture. Difference between the + startCenterPoint and the centerPoint is the distance at which pinching + fingers has shifted. +*/ +QPoint QPinchGesture::startCenterPoint() const +{ + return d_func()->startCenterPoint; +} + +QT_END_NAMESPACE + +#include "moc_qstandardgestures.cpp" + diff --git a/doc/src/snippets/gestures/qstandardgestures.h b/doc/src/snippets/gestures/qstandardgestures.h new file mode 100644 index 0000000..8b5421b --- /dev/null +++ b/doc/src/snippets/gestures/qstandardgestures.h @@ -0,0 +1,126 @@ +/**************************************************************************** +** +** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies). +** Contact: Nokia Corporation (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 http://qt.nokia.com/contact. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#ifndef QSTANDARDGESTURES_H +#define QSTANDARDGESTURES_H + +#include +#include + +#include + +QT_BEGIN_HEADER + +QT_BEGIN_NAMESPACE + +QT_MODULE(Gui) + +class QPanGesturePrivate; +class Q_GUI_EXPORT QPanGesture : public QGesture +{ + Q_OBJECT + Q_DECLARE_PRIVATE(QPanGesture) + + Q_PROPERTY(QSize totalOffset READ totalOffset) + Q_PROPERTY(QSize lastOffset READ lastOffset) + +public: + QPanGesture(QWidget *parent); + + bool filterEvent(QEvent *event); + + QSize totalOffset() const; + QSize lastOffset() const; + +protected: + void reset(); + +private: + bool event(QEvent *event); + bool eventFilter(QObject *receiver, QEvent *event); + + friend class QWidget; +}; + +class QPinchGesturePrivate; +class Q_GUI_EXPORT QPinchGesture : public QGesture +{ + Q_OBJECT + Q_DECLARE_PRIVATE(QPinchGesture) + + Q_PROPERTY(qreal scaleFactor READ scaleFactor) + Q_PROPERTY(qreal lastScaleFactor READ lastScaleFactor) + + Q_PROPERTY(qreal rotationAngle READ rotationAngle) + Q_PROPERTY(qreal lastRotationAngle READ lastRotationAngle) + + Q_PROPERTY(QPoint startCenterPoint READ startCenterPoint) + Q_PROPERTY(QPoint lastCenterPoint READ lastCenterPoint) + Q_PROPERTY(QPoint centerPoint READ centerPoint) + +public: + QPinchGesture(QWidget *parent); + + bool filterEvent(QEvent *event); + void reset(); + + QPoint startCenterPoint() const; + QPoint lastCenterPoint() const; + QPoint centerPoint() const; + + qreal scaleFactor() const; + qreal lastScaleFactor() const; + + qreal rotationAngle() const; + qreal lastRotationAngle() const; + +private: + bool event(QEvent *event); + bool eventFilter(QObject *receiver, QEvent *event); + + friend class QWidget; +}; + +QT_END_NAMESPACE + +QT_END_HEADER + +#endif // QSTANDARDGESTURES_H -- cgit v0.12 From 370092f2f7f67c9e8000e7360ca07cf5b3bd6a0f Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 10:41:47 +0300 Subject: Fixed qgraphicsscene autotest deployment for Symbian. Makes render test case to pass at least on emulator. --- tests/auto/qgraphicsscene/qgraphicsscene.pro | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qgraphicsscene/qgraphicsscene.pro b/tests/auto/qgraphicsscene/qgraphicsscene.pro index 6b8bc70..31bb769 100644 --- a/tests/auto/qgraphicsscene/qgraphicsscene.pro +++ b/tests/auto/qgraphicsscene/qgraphicsscene.pro @@ -6,7 +6,7 @@ win32:!wince*: LIBS += -lUser32 !wince*:!symbian:DEFINES += SRCDIR=\\\"$$PWD\\\" DEFINES += QT_NO_CAST_TO_ASCII -wince*!symbian*: { +wince*|symbian*: { rootFiles.sources = Ash_European.jpg graphicsScene_selection.data rootFiles.path = . renderFiles.sources = testData\render\* -- cgit v0.12 From 01fe6ce423cb334c8f22766a75f8bf8d2b861a42 Mon Sep 17 00:00:00 2001 From: Peter Yard Date: Fri, 14 Aug 2009 17:42:46 +1000 Subject: Fix trailing space in snippet file for gesture documentation. --- doc/src/snippets/gestures/qstandardgestures.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/src/snippets/gestures/qstandardgestures.cpp b/doc/src/snippets/gestures/qstandardgestures.cpp index 47f3146..fbeb050 100644 --- a/doc/src/snippets/gestures/qstandardgestures.cpp +++ b/doc/src/snippets/gestures/qstandardgestures.cpp @@ -206,7 +206,7 @@ bool QPanGesture::filterEvent(QEvent *event) } #ifdef Q_OS_MAC else if (event->type() == QEvent::Wheel) { - // On Mac, there is really no native panning gesture. Instead, a two + // On Mac, there is really no native panning gesture. Instead, a two // finger pan is delivered as mouse wheel events. Otoh, on Windows, you // either get mouse wheel events or pan events. We have decided to make this // the Qt behaviour as well, meaning that on Mac, wheel -- cgit v0.12 From a0ed07b8cd65fd5f18283a745792bf60814bf9dc Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 10:57:47 +0300 Subject: Fixed SRCDIR usage in QLabel autotest for Symbian. This commit fixed QLabel::task226479_movieResize autotest. --- tests/auto/qlabel/tst_qlabel.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qlabel/tst_qlabel.cpp b/tests/auto/qlabel/tst_qlabel.cpp index 13a75c1..3ff5bb4 100644 --- a/tests/auto/qlabel/tst_qlabel.cpp +++ b/tests/auto/qlabel/tst_qlabel.cpp @@ -54,7 +54,7 @@ //TESTED_CLASS= //TESTED_FILES= #if defined(Q_OS_SYMBIAN) -# define SRCDIR "." +# define SRCDIR "" #endif class Widget : public QWidget -- cgit v0.12 From 03330a4a6b4ebf0860f722b041185fb3ae469d3d Mon Sep 17 00:00:00 2001 From: Shane Kearns Date: Fri, 14 Aug 2009 10:00:47 +0200 Subject: Wrap long lines from auto test output Nokia's trace tools rely on the [component] and the message being on the same function call, so avoiding the copy with RawPrint won't work well in the normal case - even though it looks fine in serial debug and the emulator. Reviewed-by: Jason Barron --- src/testlib/qplaintestlogger.cpp | 38 +++++++++++++++++++++++--------------- 1 file changed, 23 insertions(+), 15 deletions(-) diff --git a/src/testlib/qplaintestlogger.cpp b/src/testlib/qplaintestlogger.cpp index a2be00f..26c5628 100644 --- a/src/testlib/qplaintestlogger.cpp +++ b/src/testlib/qplaintestlogger.cpp @@ -170,16 +170,24 @@ namespace QTest { OutputDebugStringA(str); LeaveCriticalSection(&outputCriticalSection); #elif defined(Q_OS_SYMBIAN) + // RDebug::Print has a cap of 256 characters so break it up TPtrC8 ptr(reinterpret_cast(str)); - HBufC* hbuffer = HBufC::New(ptr.Length()); - if (hbuffer) { - hbuffer->Des().Copy(ptr); - RDebug::Print(_L("[QTestLib Message] %S"), hbuffer); - delete hbuffer; - } else { - TBuf<256> tmp; - tmp.Copy(ptr.Left(Min(256, ptr.Length()))); - RDebug::Print(_L("[QTestLib Message] %S"), &tmp); + _LIT(format, "[QTestLib] %S"); + const int maxBlockSize = 256 - ((const TDesC &)format).Length(); + HBufC* hbuffer = HBufC::New(maxBlockSize); + if(hbuffer) { + for (int i = 0; i < ptr.Length(); i += maxBlockSize) { + int size = Min(maxBlockSize, ptr.Length() - i); + hbuffer->Des().Copy(ptr.Mid(i, size)); + RDebug::Print(format, hbuffer); + } + } + else { + // fast, no allocations, but truncates silently + RDebug::RawPrint(format); + TPtrC8 ptr(reinterpret_cast(str)); + RDebug::RawPrint(ptr); + RDebug::RawPrint(_L8("\n")); } #endif QAbstractTestLogger::outputString(str); @@ -247,10 +255,10 @@ namespace QTest { QString beforeDecimalPoint = QString::number(qint64(number), 'f', 0); QString afterDecimalPoint = QString::number(number, 'f', 20); afterDecimalPoint.remove(0, beforeDecimalPoint.count() + 1); - + int beforeUse = qMin(beforeDecimalPoint.count(), significantDigits); int beforeRemove = beforeDecimalPoint.count() - beforeUse; - + // Replace insignificant digits before the decimal point with zeros. beforeDecimalPoint.chop(beforeRemove); for (int i = 0; i < beforeRemove; ++i) { @@ -288,10 +296,10 @@ namespace QTest { print = beforeDecimalPoint; if (afterUse > 0) print.append(decimalPoint); - + print += afterDecimalPoint; - + return print; } @@ -312,7 +320,7 @@ namespace QTest { char buf1[1024]; QTest::qt_snprintf( buf1, sizeof(buf1), "%s: %s::%s", - bmtag, + bmtag, QTestResult::currentTestObjectName(), result.context.slotName.toAscii().data()); @@ -323,7 +331,7 @@ namespace QTest { if (tag.isEmpty() == false) { QTest::qt_snprintf(bufTag, sizeof(bufTag), ":\"%s\"", tag.data()); } - + char fillFormat[8]; int fillLength = 5; -- cgit v0.12 From 6e585191e028760b9aa89537c7a383b3857891da Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Fri, 14 Aug 2009 09:57:36 +0200 Subject: Replies are different for platforms as we target different server machines. On Symbian we read replies from external file, for others we put data into network-settings.h --- tests/auto/network-settings.h | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 1843ffd..20d342d 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -158,15 +158,11 @@ public: } return imapExpectedReply.data(); } -#endif - /*QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ); - expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); - expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n");*/ - - QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4REV1] " ); - expected = expected.append(QtNetworkSettings::serverLocalName().toAscii()); +#else + QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ); + expected = expected.append(QtNetworkSettings::serverName().toAscii()); expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); - +#endif return expected; } -- cgit v0.12 From 8785117eea4bbaa9ec846d7b8dd51219c41bd570 Mon Sep 17 00:00:00 2001 From: Aleksandar Sasha Babic Date: Fri, 14 Aug 2009 10:02:11 +0200 Subject: Had to change ip and hostname as, at the time, this was only accessible from Nokia network. --- tests/auto/qhostinfo/tst_qhostinfo.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/auto/qhostinfo/tst_qhostinfo.cpp b/tests/auto/qhostinfo/tst_qhostinfo.cpp index 7d43f5a..e129f87 100644 --- a/tests/auto/qhostinfo/tst_qhostinfo.cpp +++ b/tests/auto/qhostinfo/tst_qhostinfo.cpp @@ -313,7 +313,7 @@ void tst_QHostInfo::reverseLookup_data() // ### Use internal DNS instead. Discussed with Andreas. //QTest::newRow("classical.hexago.com") << QString("2001:5c0:0:2::24") << QStringList(QString("classical.hexago.com")) << 0; - QTest::newRow("www.cisco.com") << QString("198.133.219.25") << QStringList(QString("origin-www.cisco.com")) << 0; + QTest::newRow("origin.cisco.com") << QString("12.159.148.94") << QStringList(QString("origin.cisco.com")) << 0; QTest::newRow("bogusexample.doenstexist.org") << QString("1::2::3::4") << QStringList() << 1; } -- cgit v0.12 From 73063d966da614f83ee3a8c66be5e0b6615608c4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 14 Aug 2009 10:04:10 +0200 Subject: Fix WebKit import into src/3rdparty/webkit Exclude platform/wince and platform/graphics/haiku Reviewed-by: Trust me --- util/webkit/mkdist-webkit | 3 +++ 1 file changed, 3 insertions(+) diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 5c80e73..0845744 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -110,6 +110,7 @@ excluded_directories="$excluded_directories WebCore/platform/graphics/win" excluded_directories="$excluded_directories WebCore/platform/graphics/skia" excluded_directories="$excluded_directories WebCore/platform/graphics/chromium" excluded_directories="$excluded_directories WebCore/platform/graphics/wince" +excluded_directories="$excluded_directories WebCore/platform/graphics/haiku" excluded_directories="$excluded_directories WebCore/platform/image-decoders/bmp" excluded_directories="$excluded_directories WebCore/platform/image-decoders/gif" @@ -135,6 +136,8 @@ excluded_directories="$excluded_directories WebCore/accessibility/wx" excluded_directories="$excluded_directories WebCore/storage/wince" excluded_directories="$excluded_directories WebCore/platform/wx" +excluded_directories="$excluded_directories WebCore/platform/wince" + excluded_directories="$excluded_directories WebKit/gtk" excluded_directories="$excluded_directories WebKit/win" excluded_directories="$excluded_directories WebKit/wx" -- cgit v0.12 From 96de7e8d3eec1672b1c414893e0304157e4c3b7d Mon Sep 17 00:00:00 2001 From: Thierry Bastian Date: Fri, 14 Aug 2009 09:49:14 +0200 Subject: QTextFormat: better use QVariant::userType over QVariant::type it was even a bug when checking against QMetaType::Float because Float is a user type so it could never be true --- src/gui/text/qtextformat.cpp | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/gui/text/qtextformat.cpp b/src/gui/text/qtextformat.cpp index 9a2f49b6..8e9b892 100644 --- a/src/gui/text/qtextformat.cpp +++ b/src/gui/text/qtextformat.cpp @@ -267,7 +267,7 @@ private: static uint variantHash(const QVariant &variant) { - switch (variant.type()) { + switch (variant.userType()) { case QVariant::Invalid: return 0; case QVariant::Bool: return variant.toBool(); case QVariant::Int: return variant.toInt(); @@ -852,7 +852,7 @@ bool QTextFormat::boolProperty(int propertyId) const if (!d) return false; const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::Bool) + if (prop.userType() != QVariant::Bool) return false; return prop.toBool(); } @@ -868,7 +868,7 @@ int QTextFormat::intProperty(int propertyId) const if (!d) return 0; const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::Int) + if (prop.userType() != QVariant::Int) return 0; return prop.toInt(); } @@ -885,7 +885,7 @@ qreal QTextFormat::doubleProperty(int propertyId) const if (!d) return 0.; const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::Double && prop.type() != QMetaType::Float) + if (prop.userType() != QVariant::Double && prop.userType() != QMetaType::Float) return 0.; return qVariantValue(prop); } @@ -902,7 +902,7 @@ QString QTextFormat::stringProperty(int propertyId) const if (!d) return QString(); const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::String) + if (prop.userType() != QVariant::String) return QString(); return prop.toString(); } @@ -920,7 +920,7 @@ QColor QTextFormat::colorProperty(int propertyId) const if (!d) return QColor(); const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::Color) + if (prop.userType() != QVariant::Color) return QColor(); return qvariant_cast(prop); } @@ -937,7 +937,7 @@ QPen QTextFormat::penProperty(int propertyId) const if (!d) return QPen(Qt::NoPen); const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::Pen) + if (prop.userType() != QVariant::Pen) return QPen(Qt::NoPen); return qvariant_cast(prop); } @@ -954,7 +954,7 @@ QBrush QTextFormat::brushProperty(int propertyId) const if (!d) return QBrush(Qt::NoBrush); const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::Brush) + if (prop.userType() != QVariant::Brush) return QBrush(Qt::NoBrush); return qvariant_cast(prop); } @@ -984,13 +984,13 @@ QVector QTextFormat::lengthVectorProperty(int propertyId) const if (!d) return vector; const QVariant prop = d->property(propertyId); - if (prop.type() != QVariant::List) + if (prop.userType() != QVariant::List) return vector; QList propertyList = prop.toList(); for (int i=0; i(var)); } @@ -1078,7 +1078,7 @@ int QTextFormat::objectIndex() const if (!d) return -1; const QVariant prop = d->property(ObjectIndex); - if (prop.type() != QVariant::Int) // #### + if (prop.userType() != QVariant::Int) // #### return -1; return prop.toInt(); } @@ -1654,9 +1654,9 @@ void QTextCharFormat::setUnderlineStyle(UnderlineStyle style) QString QTextCharFormat::anchorName() const { QVariant prop = property(AnchorName); - if (prop.type() == QVariant::StringList) + if (prop.userType() == QVariant::StringList) return prop.toStringList().value(0); - else if (prop.type() != QVariant::String) + else if (prop.userType() != QVariant::String) return QString(); return prop.toString(); } @@ -1672,9 +1672,9 @@ QString QTextCharFormat::anchorName() const QStringList QTextCharFormat::anchorNames() const { QVariant prop = property(AnchorName); - if (prop.type() == QVariant::StringList) + if (prop.userType() == QVariant::StringList) return prop.toStringList(); - else if (prop.type() != QVariant::String) + else if (prop.userType() != QVariant::String) return QStringList(); return QStringList(prop.toString()); } -- cgit v0.12 From c73fd7261abb861699022247342dc98a09e8cbac Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Fri, 14 Aug 2009 10:09:19 +0200 Subject: Simplify WebKit import into src/3rdparty/webkit Limit the changelog to WebKit/qt. Reviewed-by: Trust me --- util/webkit/mkdist-webkit | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/webkit/mkdist-webkit b/util/webkit/mkdist-webkit index 0845744..b5c0460 100755 --- a/util/webkit/mkdist-webkit +++ b/util/webkit/mkdist-webkit @@ -336,9 +336,9 @@ EOT if [ -d "$repository/.git" -a -n "$lastImportRevison" ]; then echo >>commitlog.txt - echo "Changes in WebKit since the last update:" >>commitlog.txt + echo "Changes in WebKit/qt since the last update:" >>commitlog.txt echo >>commitlog.txt - git --git-dir=$repository/.git ls-files | egrep "ChangeLog$" | xargs git --git-dir=$repository/.git diff $lastImportRevison $rev -- | sed -n -e "s,^\+\(.*\),\1,p" >>commitlog.txt + git --git-dir=$repository/.git diff $lastImportRevison $rev -- WebKit/qt/ChangeLog | sed -n -e "s,^\+\(.*\),\1,p" >>commitlog.txt fi echo "Changes:" -- cgit v0.12 From 6b1724337bf0e7b47a87a6b65d04e9967cc47db6 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 11:18:47 +0300 Subject: Fixed qdir autotest for Symbian --- tests/auto/qdir/tst_qdir.cpp | 27 ++++++++++++++++++++++----- 1 file changed, 22 insertions(+), 5 deletions(-) diff --git a/tests/auto/qdir/tst_qdir.cpp b/tests/auto/qdir/tst_qdir.cpp index ef31f53..13e8c95 100644 --- a/tests/auto/qdir/tst_qdir.cpp +++ b/tests/auto/qdir/tst_qdir.cpp @@ -60,6 +60,12 @@ #define Q_NO_SYMLINKS #endif +#if defined(Q_OS_SYMBIAN) +// Open C in Symbian doesn't support symbolic links to directories +#define Q_NO_SYMLINKS_TO_DIRS +#endif + + //TESTED_CLASS= //TESTED_FILES= @@ -183,11 +189,20 @@ void tst_QDir::getSetCheck() tst_QDir::tst_QDir() { +#ifdef Q_OS_SYMBIAN + // Can't deploy empty test dir, so create it here + QDir dir(SRCDIR); + dir.mkdir("testData"); +#endif } tst_QDir::~tst_QDir() { - +#ifdef Q_OS_SYMBIAN + // Remove created test dir + QDir dir(SRCDIR); + dir.rmdir("testData"); +#endif } void tst_QDir::construction() @@ -707,21 +722,23 @@ void tst_QDir::entryListSimple() void tst_QDir::entryListWithSymLinks() { #ifndef Q_NO_SYMLINKS +# ifndef Q_NO_SYMLINKS_TO_DIRS QFile::remove("myLinkToDir.lnk"); +# endif QFile::remove("myLinkToFile.lnk"); QFile::remove("testfile.cpp"); QDir dir; dir.mkdir("myDir"); QFile("testfile.cpp").open(QIODevice::WriteOnly); -#if !defined(Q_OS_SYMBIAN) +# ifndef Q_NO_SYMLINKS_TO_DIRS QVERIFY(QFile::link("myDir", "myLinkToDir.lnk")); -#endif +# endif QVERIFY(QFile::link("testfile.cpp", "myLinkToFile.lnk")); { QStringList entryList = QDir().entryList(); QVERIFY(entryList.contains("myDir")); -#if !defined(Q_OS_SYMBIAN) +# ifndef Q_NO_SYMLINKS_TO_DIRS QVERIFY(entryList.contains("myLinkToDir.lnk")); #endif QVERIFY(entryList.contains("myLinkToFile.lnk")); @@ -729,7 +746,7 @@ void tst_QDir::entryListWithSymLinks() { QStringList entryList = QDir().entryList(QDir::Dirs); QVERIFY(entryList.contains("myDir")); -#if !defined(Q_OS_SYMBIAN) +# ifndef Q_NO_SYMLINKS_TO_DIRS QVERIFY(entryList.contains("myLinkToDir.lnk")); #endif #if defined(Q_OS_SYMBIAN) -- cgit v0.12 From 5fe78207f44dbbf5c96560e69493653af55455a7 Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Fri, 14 Aug 2009 10:34:51 +0200 Subject: Partially revert oom safety fixes Turns out it's way too much work to make all the Pixmap backends strongly exception safe. Bumped to "future Qt version" :) --- src/gui/image/qpixmap.cpp | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/src/gui/image/qpixmap.cpp b/src/gui/image/qpixmap.cpp index 93077d7..8259c6f 100644 --- a/src/gui/image/qpixmap.cpp +++ b/src/gui/image/qpixmap.cpp @@ -854,14 +854,10 @@ bool QPixmap::load(const QString &fileName, const char *format, Qt::ImageConvers return false; QPixmap pm; - QT_TRY { - if (data->pixelType() == QPixmapData::BitmapType) - pm = QBitmap::fromImage(image, flags); - else - pm = fromImage(image, flags); - } QT_CATCH (const std::bad_alloc &) { - // swallow bad allocs and leave pm a null pixmap - } + if (data->pixelType() == QPixmapData::BitmapType) + pm = QBitmap::fromImage(image, flags); + else + pm = fromImage(image, flags); if (!pm.isNull()) { *this = pm; QPixmapCache::insert(key, *this); @@ -1993,16 +1989,11 @@ QPixmap QPixmap::fromImage(const QImage &image, Qt::ImageConversionFlags flags) if (image.isNull()) return QPixmap(); - QT_TRY { - QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem(); - QScopedPointer data(gs ? gs->createPixmapData(QPixmapData::PixmapType) - : QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixmapType)); - data->fromImage(image, flags); - return QPixmap(data.take()); - } QT_CATCH(const std::bad_alloc &) { - // we're out of memory - return a null Pixmap - return QPixmap(); - } + QGraphicsSystem* gs = QApplicationPrivate::graphicsSystem(); + QScopedPointer data(gs ? gs->createPixmapData(QPixmapData::PixmapType) + : QGraphicsSystem::createDefaultPixmapData(QPixmapData::PixmapType)); + data->fromImage(image, flags); + return QPixmap(data.take()); } /*! -- cgit v0.12 From 6a380ebcb50573149f723f1e407f5e4bdccae651 Mon Sep 17 00:00:00 2001 From: Miikka Heikkinen Date: Fri, 14 Aug 2009 11:45:25 +0300 Subject: Fixed network-settings.h build for symbian --- tests/auto/network-settings.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/auto/network-settings.h b/tests/auto/network-settings.h index 20d342d..702dabb 100644 --- a/tests/auto/network-settings.h +++ b/tests/auto/network-settings.h @@ -126,7 +126,7 @@ public: return "qt-test-server.wildcard.dev." + serverDomainName(); //return "qttest.wildcard.dev." + serverDomainName(); } - + #ifdef QT_NETWORK_LIB static QHostAddress serverIP() { @@ -140,11 +140,11 @@ public: } return QHostAddress(serverIp.data()); } -#endif +#endif return QHostInfo::fromName(serverName()).addresses().first(); } -#endif - +#endif + static QByteArray expectedReplyIMAP() { #ifdef Q_OS_SYMBIAN @@ -162,8 +162,8 @@ public: QByteArray expected( "* OK [CAPABILITY IMAP4 IMAP4rev1 LITERAL+ ID STARTTLS LOGINDISABLED] " ); expected = expected.append(QtNetworkSettings::serverName().toAscii()); expected = expected.append(" Cyrus IMAP4 v2.3.11-Mandriva-RPM-2.3.11-6mdv2008.1 server ready\r\n"); -#endif return expected; +#endif } static QByteArray expectedReplySSL() -- cgit v0.12 From a790e258d2ecd8e217d79d201f7e646bd13b1ce0 Mon Sep 17 00:00:00 2001 From: mread Date: Fri, 14 Aug 2009 09:50:45 +0100 Subject: Changed QCoeFepInputContext::ReportAknEdStateEvent so that it actually forwards the event and doesn't just send a fixed one. --- src/gui/inputmethod/qcoefepinputcontext_s60.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp index d4f8341..833e000 100644 --- a/src/gui/inputmethod/qcoefepinputcontext_s60.cpp +++ b/src/gui/inputmethod/qcoefepinputcontext_s60.cpp @@ -102,7 +102,7 @@ void QCoeFepInputContext::reset() void QCoeFepInputContext::ReportAknEdStateEvent(MAknEdStateObserver::EAknEdwinStateEvent aEventType) { - QT_TRAP_THROWING(m_fepState->ReportAknEdStateEventL(QT_EAknCursorPositionChanged)); + QT_TRAP_THROWING(m_fepState->ReportAknEdStateEventL(aEventType)); } void QCoeFepInputContext::update() -- cgit v0.12 From 9042d6bbcda61f2234f17704a14389e3f399b131 Mon Sep 17 00:00:00 2001 From: Janne Anttila Date: Fri, 14 Aug 2009 11:54:48 +0300 Subject: Fixed QKeySequence autotest for Symbian. --- tests/auto/qkeysequence/tst_qkeysequence.cpp | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/tests/auto/qkeysequence/tst_qkeysequence.cpp b/tests/auto/qkeysequence/tst_qkeysequence.cpp index ec36075..6deee02 100644 --- a/tests/auto/qkeysequence/tst_qkeysequence.cpp +++ b/tests/auto/qkeysequence/tst_qkeysequence.cpp @@ -311,15 +311,7 @@ void tst_QKeySequence::standardKeys_data() QTest::newRow("zoomOut") << (int)QKeySequence::ZoomOut<< QString("CTRL+-"); QTest::newRow("whatsthis") << (int)QKeySequence::WhatsThis<< QString("SHIFT+F1"); -#ifndef Q_WS_MAC - QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1"); - QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab"); - QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild<< QString("CTRL+SHIFT+BACKTAB"); - QTest::newRow("forward") << (int)QKeySequence::Forward << QString("ALT+RIGHT"); - QTest::newRow("backward") << (int)QKeySequence::Back << QString("ALT+LEFT"); - QTest::newRow("MoveToEndOfBlock") << (int)QKeySequence::MoveToEndOfBlock<< QString(""); //mac only - QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only -#else +#if defined(Q_WS_MAC) QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("Ctrl+?"); QTest::newRow("nextChild") << (int)QKeySequence::NextChild << QString("CTRL+}"); QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild << QString("CTRL+{"); @@ -327,6 +319,17 @@ void tst_QKeySequence::standardKeys_data() QTest::newRow("forward") << (int)QKeySequence::Forward << QString("CTRL+]"); QTest::newRow("backward") << (int)QKeySequence::Back << QString("CTRL+["); QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+DOWN"); //mac only +#elif defined(Q_WS_S60) + QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F2"); + QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only +#else + QTest::newRow("help") << (int)QKeySequence::HelpContents<< QString("F1"); + QTest::newRow("nextChild") << (int)QKeySequence::NextChild<< QString("CTRL+Tab"); + QTest::newRow("previousChild") << (int)QKeySequence::PreviousChild<< QString("CTRL+SHIFT+BACKTAB"); + QTest::newRow("forward") << (int)QKeySequence::Forward << QString("ALT+RIGHT"); + QTest::newRow("backward") << (int)QKeySequence::Back << QString("ALT+LEFT"); + QTest::newRow("MoveToEndOfBlock") << (int)QKeySequence::MoveToEndOfBlock<< QString(""); //mac only + QTest::newRow("SelectEndOfDocument") << (int)QKeySequence::SelectEndOfDocument<< QString("CTRL+SHIFT+END"); //mac only #endif } @@ -343,7 +346,7 @@ void tst_QKeySequence::keyBindings() { QList bindings = QKeySequence::keyBindings(QKeySequence::Copy); QList expected; -#ifdef Q_WS_MAC +#if defined(Q_WS_MAC) || defined (Q_WS_S60) expected << QKeySequence("CTRL+C"); #elif defined Q_WS_X11 expected << QKeySequence("CTRL+C") << QKeySequence("F16") << QKeySequence("CTRL+INSERT"); @@ -505,7 +508,7 @@ void tst_QKeySequence::translated() #ifdef Q_WS_MAC QSKIP("No need to translate modifiers on Mac OS X", SkipAll); #elif defined(Q_OS_WINCE) || defined(Q_OS_SYMBIAN) - QSKIP("No need to translate modifiers on WinCE", SkipAll); + QSKIP("No need to translate modifiers on WinCE or Symbian", SkipAll); #endif qApp->installTranslator(ourTranslator); -- cgit v0.12 From d00e02bcd814402ac97f3fa033c541e07f3f9549 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Meril=C3=A4?= Date: Fri, 14 Aug 2009 12:42:10 +0300 Subject: S60Style: Draw non-initialized icons as enabled. --- src/gui/styles/qs60style.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 50eb2e1..1210316 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -2783,7 +2783,7 @@ QIcon QS60Style::standardIconImplementation(StandardPixmap standardIcon, QS60StyleEnums::SkinParts part; QS60StylePrivate::SkinElementFlags adjustedFlags; if (option) - adjustedFlags = (option->state & State_Enabled) ? + adjustedFlags = (option->state & State_Enabled || option->state == 0) ? QS60StylePrivate::SF_StateEnabled : QS60StylePrivate::SF_StateDisabled; -- cgit v0.12 From 6c8ed1862908d2152946e806a329462a5678282c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sami=20Meril=C3=A4?= Date: Fri, 14 Aug 2009 12:59:00 +0300 Subject: S60Style: Draw QFrames in default cases --- src/gui/styles/qs60style.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/gui/styles/qs60style.cpp b/src/gui/styles/qs60style.cpp index 1210316..421ba78 100644 --- a/src/gui/styles/qs60style.cpp +++ b/src/gui/styles/qs60style.cpp @@ -1871,6 +1871,8 @@ void QS60Style::drawControl(ControlElement element, const QStyleOption *option, //todo: update to horizontal table graphic QS60StylePrivate::drawSkinElement(QS60StylePrivate::SE_TableHeaderItem, painter, option->rect, flags | QS60StylePrivate::SF_PointWest); } + } else if (qobject_cast(widget)) { + QCommonStyle::drawControl(element, option, painter, widget); } if (option->state & State_HasFocus) drawPrimitive(PE_FrameFocusRect, option, painter, widget); -- cgit v0.12 From 8d87d877f96a1b59cb410287a21206ca218af7dc Mon Sep 17 00:00:00 2001 From: Harald Fernengel Date: Fri, 14 Aug 2009 11:52:10 +0200 Subject: Deleted freetype 2.3.6 --- src/3rdparty/freetype/ChangeLog | 3368 ---- src/3rdparty/freetype/ChangeLog.20 | 2613 --- src/3rdparty/freetype/ChangeLog.21 | 9439 ----------- src/3rdparty/freetype/ChangeLog.22 | 2837 ---- src/3rdparty/freetype/Jamfile | 203 - src/3rdparty/freetype/Jamrules | 71 - src/3rdparty/freetype/Makefile | 34 - src/3rdparty/freetype/README | 64 - src/3rdparty/freetype/README.CVS | 50 - src/3rdparty/freetype/autogen.sh | 61 - src/3rdparty/freetype/builds/amiga/README | 110 - .../amiga/include/freetype/config/ftconfig.h | 55 - .../amiga/include/freetype/config/ftmodule.h | 160 - src/3rdparty/freetype/builds/amiga/makefile | 284 - src/3rdparty/freetype/builds/amiga/makefile.os4 | 287 - src/3rdparty/freetype/builds/amiga/smakefile | 291 - .../freetype/builds/amiga/src/base/ftdebug.c | 279 - .../freetype/builds/amiga/src/base/ftsystem.c | 522 - src/3rdparty/freetype/builds/ansi/ansi-def.mk | 74 - src/3rdparty/freetype/builds/ansi/ansi.mk | 21 - src/3rdparty/freetype/builds/atari/ATARI.H | 16 - src/3rdparty/freetype/builds/atari/FNames.SIC | 37 - src/3rdparty/freetype/builds/atari/FREETYPE.PRJ | 32 - src/3rdparty/freetype/builds/atari/README.TXT | 51 - src/3rdparty/freetype/builds/beos/beos-def.mk | 76 - src/3rdparty/freetype/builds/beos/beos.mk | 19 - src/3rdparty/freetype/builds/beos/detect.mk | 41 - src/3rdparty/freetype/builds/compiler/ansi-cc.mk | 80 - src/3rdparty/freetype/builds/compiler/bcc-dev.mk | 78 - src/3rdparty/freetype/builds/compiler/bcc.mk | 78 - src/3rdparty/freetype/builds/compiler/emx.mk | 77 - src/3rdparty/freetype/builds/compiler/gcc-dev.mk | 95 - src/3rdparty/freetype/builds/compiler/gcc.mk | 77 - src/3rdparty/freetype/builds/compiler/intelc.mk | 85 - src/3rdparty/freetype/builds/compiler/unix-lcc.mk | 83 - src/3rdparty/freetype/builds/compiler/visualage.mk | 76 - src/3rdparty/freetype/builds/compiler/visualc.mk | 82 - src/3rdparty/freetype/builds/compiler/watcom.mk | 81 - src/3rdparty/freetype/builds/compiler/win-lcc.mk | 81 - src/3rdparty/freetype/builds/detect.mk | 154 - src/3rdparty/freetype/builds/dos/detect.mk | 142 - src/3rdparty/freetype/builds/dos/dos-def.mk | 45 - src/3rdparty/freetype/builds/dos/dos-emx.mk | 21 - src/3rdparty/freetype/builds/dos/dos-gcc.mk | 21 - src/3rdparty/freetype/builds/dos/dos-wat.mk | 20 - src/3rdparty/freetype/builds/exports.mk | 76 - src/3rdparty/freetype/builds/freetype.mk | 361 - src/3rdparty/freetype/builds/link_dos.mk | 42 - src/3rdparty/freetype/builds/link_std.mk | 42 - .../freetype/builds/mac/FreeType.m68k_cfm.make.txt | 202 - .../freetype/builds/mac/FreeType.m68k_far.make.txt | 201 - .../builds/mac/FreeType.ppc_carbon.make.txt | 202 - .../builds/mac/FreeType.ppc_classic.make.txt | 203 - src/3rdparty/freetype/builds/mac/README | 403 - src/3rdparty/freetype/builds/mac/ascii2mpw.py | 24 - src/3rdparty/freetype/builds/mac/ftlib.prj.xml | 1194 -- src/3rdparty/freetype/builds/mac/ftmac.c | 1600 -- src/3rdparty/freetype/builds/modules.mk | 79 - src/3rdparty/freetype/builds/newline | 1 - src/3rdparty/freetype/builds/os2/detect.mk | 73 - src/3rdparty/freetype/builds/os2/os2-def.mk | 44 - src/3rdparty/freetype/builds/os2/os2-dev.mk | 30 - src/3rdparty/freetype/builds/os2/os2-gcc.mk | 26 - src/3rdparty/freetype/builds/symbian/bld.inf | 66 - src/3rdparty/freetype/builds/symbian/freetype.mmp | 136 - src/3rdparty/freetype/builds/toplevel.mk | 245 - src/3rdparty/freetype/builds/unix/aclocal.m4 | 7912 ---------- src/3rdparty/freetype/builds/unix/config.guess | 1526 -- src/3rdparty/freetype/builds/unix/config.sub | 1669 -- src/3rdparty/freetype/builds/unix/configure | 15767 ------------------- src/3rdparty/freetype/builds/unix/configure.ac | 540 - src/3rdparty/freetype/builds/unix/configure.raw | 540 - src/3rdparty/freetype/builds/unix/detect.mk | 91 - .../freetype/builds/unix/freetype-config.in | 157 - src/3rdparty/freetype/builds/unix/freetype2.in | 11 - src/3rdparty/freetype/builds/unix/freetype2.m4 | 192 - src/3rdparty/freetype/builds/unix/ft-munmap.m4 | 32 - src/3rdparty/freetype/builds/unix/ft2unix.h | 61 - src/3rdparty/freetype/builds/unix/ftconfig.h | 262 - src/3rdparty/freetype/builds/unix/ftconfig.in | 349 - src/3rdparty/freetype/builds/unix/ftsystem.c | 421 - src/3rdparty/freetype/builds/unix/install-sh | 519 - src/3rdparty/freetype/builds/unix/install.mk | 97 - src/3rdparty/freetype/builds/unix/ltmain.sh | 7874 --------- src/3rdparty/freetype/builds/unix/mkinstalldirs | 161 - src/3rdparty/freetype/builds/unix/unix-cc.in | 113 - src/3rdparty/freetype/builds/unix/unix-def.in | 81 - src/3rdparty/freetype/builds/unix/unix-dev.mk | 26 - src/3rdparty/freetype/builds/unix/unix-lcc.mk | 24 - src/3rdparty/freetype/builds/unix/unix.mk | 62 - src/3rdparty/freetype/builds/unix/unixddef.mk | 45 - src/3rdparty/freetype/builds/vms/ftconfig.h | 338 - src/3rdparty/freetype/builds/vms/ftsystem.c | 321 - src/3rdparty/freetype/builds/win32/detect.mk | 183 - src/3rdparty/freetype/builds/win32/ftdebug.c | 248 - .../freetype/builds/win32/visualc/freetype.dsp | 396 - .../freetype/builds/win32/visualc/freetype.dsw | 29 - .../freetype/builds/win32/visualc/freetype.sln | 31 - .../freetype/builds/win32/visualc/freetype.vcproj | 2155 --- .../freetype/builds/win32/visualc/index.html | 37 - .../freetype/builds/win32/visualce/freetype.dsp | 396 - .../freetype/builds/win32/visualce/freetype.dsw | 29 - .../freetype/builds/win32/visualce/freetype.vcproj | 13861 ---------------- .../freetype/builds/win32/visualce/index.html | 47 - src/3rdparty/freetype/builds/win32/w32-bcc.mk | 28 - src/3rdparty/freetype/builds/win32/w32-bccd.mk | 26 - src/3rdparty/freetype/builds/win32/w32-dev.mk | 32 - src/3rdparty/freetype/builds/win32/w32-gcc.mk | 31 - src/3rdparty/freetype/builds/win32/w32-icc.mk | 28 - src/3rdparty/freetype/builds/win32/w32-intl.mk | 28 - src/3rdparty/freetype/builds/win32/w32-lcc.mk | 24 - src/3rdparty/freetype/builds/win32/w32-mingw32.mk | 33 - src/3rdparty/freetype/builds/win32/w32-vcc.mk | 28 - src/3rdparty/freetype/builds/win32/w32-wat.mk | 28 - src/3rdparty/freetype/builds/win32/win32-def.mk | 46 - src/3rdparty/freetype/configure | 100 - src/3rdparty/freetype/devel/ft2build.h | 41 - src/3rdparty/freetype/devel/ftoption.h | 672 - src/3rdparty/freetype/docs/CHANGES | 3148 ---- src/3rdparty/freetype/docs/CUSTOMIZE | 150 - src/3rdparty/freetype/docs/DEBUG | 199 - src/3rdparty/freetype/docs/FTL.TXT | 169 - src/3rdparty/freetype/docs/GPL.TXT | 340 - src/3rdparty/freetype/docs/INSTALL | 89 - src/3rdparty/freetype/docs/INSTALL.ANY | 139 - src/3rdparty/freetype/docs/INSTALL.CROSS | 135 - src/3rdparty/freetype/docs/INSTALL.GNU | 159 - src/3rdparty/freetype/docs/INSTALL.MAC | 32 - src/3rdparty/freetype/docs/INSTALL.UNIX | 96 - src/3rdparty/freetype/docs/INSTALL.VMS | 62 - src/3rdparty/freetype/docs/LICENSE.TXT | 28 - src/3rdparty/freetype/docs/MAKEPP | 5 - src/3rdparty/freetype/docs/PATENTS | 27 - src/3rdparty/freetype/docs/PROBLEMS | 77 - src/3rdparty/freetype/docs/TODO | 40 - src/3rdparty/freetype/docs/TRUETYPE | 40 - src/3rdparty/freetype/docs/UPGRADE.UNIX | 137 - src/3rdparty/freetype/docs/VERSION.DLL | 132 - src/3rdparty/freetype/docs/formats.txt | 154 - src/3rdparty/freetype/docs/raster.txt | 635 - src/3rdparty/freetype/docs/reference/README | 5 - .../docs/reference/ft2-base_interface.html | 3425 ---- .../freetype/docs/reference/ft2-basic_types.html | 1160 -- .../freetype/docs/reference/ft2-bdf_fonts.html | 254 - .../docs/reference/ft2-bitmap_handling.html | 264 - .../docs/reference/ft2-cache_subsystem.html | 1165 -- .../freetype/docs/reference/ft2-cid_fonts.html | 102 - .../freetype/docs/reference/ft2-computations.html | 828 - .../freetype/docs/reference/ft2-font_formats.html | 79 - .../freetype/docs/reference/ft2-gasp_table.html | 137 - .../docs/reference/ft2-glyph_management.html | 633 - .../freetype/docs/reference/ft2-glyph_stroker.html | 924 -- .../docs/reference/ft2-glyph_variants.html | 263 - .../freetype/docs/reference/ft2-gx_validation.html | 352 - src/3rdparty/freetype/docs/reference/ft2-gzip.html | 90 - .../docs/reference/ft2-header_file_macros.html | 816 - .../freetype/docs/reference/ft2-incremental.html | 393 - .../freetype/docs/reference/ft2-index.html | 279 - .../freetype/docs/reference/ft2-lcd_filtering.html | 145 - .../docs/reference/ft2-list_processing.html | 479 - src/3rdparty/freetype/docs/reference/ft2-lzw.html | 90 - .../freetype/docs/reference/ft2-mac_specific.html | 364 - .../docs/reference/ft2-module_management.html | 622 - .../docs/reference/ft2-multiple_masters.html | 507 - .../freetype/docs/reference/ft2-ot_validation.html | 204 - .../docs/reference/ft2-outline_processing.html | 1086 -- .../freetype/docs/reference/ft2-pfr_fonts.html | 202 - .../freetype/docs/reference/ft2-raster.html | 602 - .../freetype/docs/reference/ft2-sfnt_names.html | 186 - .../docs/reference/ft2-sizes_management.html | 160 - .../docs/reference/ft2-system_interface.html | 411 - src/3rdparty/freetype/docs/reference/ft2-toc.html | 203 - .../docs/reference/ft2-truetype_engine.html | 128 - .../docs/reference/ft2-truetype_tables.html | 1213 -- .../freetype/docs/reference/ft2-type1_tables.html | 518 - .../docs/reference/ft2-user_allocation.html | 43 - .../freetype/docs/reference/ft2-version.html | 209 - .../freetype/docs/reference/ft2-winfnt_fonts.html | 274 - src/3rdparty/freetype/docs/release | 166 - .../freetype/include/freetype/config/ftconfig.h | 415 - .../freetype/include/freetype/config/ftheader.h | 768 - .../freetype/include/freetype/config/ftmodule.h | 32 - .../freetype/include/freetype/config/ftoption.h | 671 - .../freetype/include/freetype/config/ftstdlib.h | 180 - src/3rdparty/freetype/include/freetype/freetype.h | 3706 ----- src/3rdparty/freetype/include/freetype/ftbbox.h | 94 - src/3rdparty/freetype/include/freetype/ftbdf.h | 200 - src/3rdparty/freetype/include/freetype/ftbitmap.h | 206 - src/3rdparty/freetype/include/freetype/ftcache.h | 1121 -- .../freetype/include/freetype/ftchapters.h | 102 - src/3rdparty/freetype/include/freetype/ftcid.h | 98 - src/3rdparty/freetype/include/freetype/fterrdef.h | 239 - src/3rdparty/freetype/include/freetype/fterrors.h | 206 - src/3rdparty/freetype/include/freetype/ftgasp.h | 113 - src/3rdparty/freetype/include/freetype/ftglyph.h | 575 - src/3rdparty/freetype/include/freetype/ftgxval.h | 358 - src/3rdparty/freetype/include/freetype/ftgzip.h | 102 - src/3rdparty/freetype/include/freetype/ftimage.h | 1246 -- src/3rdparty/freetype/include/freetype/ftincrem.h | 349 - src/3rdparty/freetype/include/freetype/ftlcdfil.h | 166 - src/3rdparty/freetype/include/freetype/ftlist.h | 273 - src/3rdparty/freetype/include/freetype/ftlzw.h | 99 - src/3rdparty/freetype/include/freetype/ftmac.h | 274 - src/3rdparty/freetype/include/freetype/ftmm.h | 378 - src/3rdparty/freetype/include/freetype/ftmodapi.h | 441 - src/3rdparty/freetype/include/freetype/ftmoderr.h | 155 - src/3rdparty/freetype/include/freetype/ftotval.h | 203 - src/3rdparty/freetype/include/freetype/ftoutln.h | 526 - src/3rdparty/freetype/include/freetype/ftpfr.h | 172 - src/3rdparty/freetype/include/freetype/ftrender.h | 234 - src/3rdparty/freetype/include/freetype/ftsizes.h | 159 - src/3rdparty/freetype/include/freetype/ftsnames.h | 170 - src/3rdparty/freetype/include/freetype/ftstroke.h | 716 - src/3rdparty/freetype/include/freetype/ftsynth.h | 73 - src/3rdparty/freetype/include/freetype/ftsystem.h | 346 - src/3rdparty/freetype/include/freetype/fttrigon.h | 350 - src/3rdparty/freetype/include/freetype/fttypes.h | 587 - src/3rdparty/freetype/include/freetype/ftwinfnt.h | 274 - src/3rdparty/freetype/include/freetype/ftxf86.h | 80 - .../freetype/include/freetype/internal/autohint.h | 205 - .../freetype/include/freetype/internal/ftcalc.h | 178 - .../freetype/include/freetype/internal/ftdebug.h | 250 - .../freetype/include/freetype/internal/ftdriver.h | 248 - .../freetype/include/freetype/internal/ftgloadr.h | 168 - .../freetype/include/freetype/internal/ftmemory.h | 368 - .../freetype/include/freetype/internal/ftobjs.h | 875 - .../freetype/include/freetype/internal/ftrfork.h | 196 - .../freetype/include/freetype/internal/ftserv.h | 328 - .../freetype/include/freetype/internal/ftstream.h | 539 - .../freetype/include/freetype/internal/fttrace.h | 134 - .../freetype/include/freetype/internal/ftvalid.h | 150 - .../freetype/include/freetype/internal/internal.h | 50 - .../freetype/include/freetype/internal/pcftypes.h | 56 - .../freetype/include/freetype/internal/psaux.h | 871 - .../freetype/include/freetype/internal/pshints.h | 687 - .../include/freetype/internal/services/svbdf.h | 57 - .../include/freetype/internal/services/svcid.h | 49 - .../include/freetype/internal/services/svgldict.h | 60 - .../include/freetype/internal/services/svgxval.h | 72 - .../include/freetype/internal/services/svkern.h | 51 - .../include/freetype/internal/services/svmm.h | 79 - .../include/freetype/internal/services/svotval.h | 55 - .../include/freetype/internal/services/svpfr.h | 66 - .../include/freetype/internal/services/svpostnm.h | 58 - .../include/freetype/internal/services/svpscmap.h | 129 - .../include/freetype/internal/services/svpsinfo.h | 60 - .../include/freetype/internal/services/svsfnt.h | 80 - .../include/freetype/internal/services/svttcmap.h | 78 - .../include/freetype/internal/services/svtteng.h | 53 - .../include/freetype/internal/services/svttglyf.h | 48 - .../include/freetype/internal/services/svwinfnt.h | 50 - .../include/freetype/internal/services/svxf86nm.h | 55 - .../freetype/include/freetype/internal/sfnt.h | 762 - .../freetype/include/freetype/internal/t1types.h | 252 - .../freetype/include/freetype/internal/tttypes.h | 1543 -- src/3rdparty/freetype/include/freetype/t1tables.h | 504 - src/3rdparty/freetype/include/freetype/ttnameid.h | 1146 -- src/3rdparty/freetype/include/freetype/tttables.h | 756 - src/3rdparty/freetype/include/freetype/tttags.h | 100 - src/3rdparty/freetype/include/freetype/ttunpat.h | 59 - src/3rdparty/freetype/include/ft2build.h | 39 - src/3rdparty/freetype/modules.cfg | 245 - src/3rdparty/freetype/objs/README | 2 - src/3rdparty/freetype/src/Jamfile | 25 - src/3rdparty/freetype/src/autofit/Jamfile | 39 - src/3rdparty/freetype/src/autofit/afangles.c | 292 - src/3rdparty/freetype/src/autofit/afangles.h | 7 - src/3rdparty/freetype/src/autofit/afcjk.c | 1508 -- src/3rdparty/freetype/src/autofit/afcjk.h | 58 - src/3rdparty/freetype/src/autofit/afdummy.c | 62 - src/3rdparty/freetype/src/autofit/afdummy.h | 43 - src/3rdparty/freetype/src/autofit/aferrors.h | 40 - src/3rdparty/freetype/src/autofit/afglobal.c | 289 - src/3rdparty/freetype/src/autofit/afglobal.h | 67 - src/3rdparty/freetype/src/autofit/afhints.c | 1264 -- src/3rdparty/freetype/src/autofit/afhints.h | 333 - src/3rdparty/freetype/src/autofit/afindic.c | 134 - src/3rdparty/freetype/src/autofit/afindic.h | 41 - src/3rdparty/freetype/src/autofit/aflatin.c | 2168 --- src/3rdparty/freetype/src/autofit/aflatin.h | 209 - src/3rdparty/freetype/src/autofit/aflatin2.c | 2286 --- src/3rdparty/freetype/src/autofit/aflatin2.h | 40 - src/3rdparty/freetype/src/autofit/afloader.c | 535 - src/3rdparty/freetype/src/autofit/afloader.h | 73 - src/3rdparty/freetype/src/autofit/afmodule.c | 97 - src/3rdparty/freetype/src/autofit/afmodule.h | 37 - src/3rdparty/freetype/src/autofit/aftypes.h | 349 - src/3rdparty/freetype/src/autofit/afwarp.c | 338 - src/3rdparty/freetype/src/autofit/afwarp.h | 64 - src/3rdparty/freetype/src/autofit/autofit.c | 40 - src/3rdparty/freetype/src/autofit/module.mk | 23 - src/3rdparty/freetype/src/autofit/rules.mk | 78 - src/3rdparty/freetype/src/base/Jamfile | 50 - src/3rdparty/freetype/src/base/ftapi.c | 121 - src/3rdparty/freetype/src/base/ftbase.c | 38 - src/3rdparty/freetype/src/base/ftbbox.c | 659 - src/3rdparty/freetype/src/base/ftbdf.c | 88 - src/3rdparty/freetype/src/base/ftbitmap.c | 630 - src/3rdparty/freetype/src/base/ftcalc.c | 873 - src/3rdparty/freetype/src/base/ftcid.c | 63 - src/3rdparty/freetype/src/base/ftdbgmem.c | 998 -- src/3rdparty/freetype/src/base/ftdebug.c | 246 - src/3rdparty/freetype/src/base/ftgasp.c | 61 - src/3rdparty/freetype/src/base/ftgloadr.c | 394 - src/3rdparty/freetype/src/base/ftglyph.c | 688 - src/3rdparty/freetype/src/base/ftgxval.c | 129 - src/3rdparty/freetype/src/base/ftinit.c | 163 - src/3rdparty/freetype/src/base/ftlcdfil.c | 351 - src/3rdparty/freetype/src/base/ftmac.c | 1130 -- src/3rdparty/freetype/src/base/ftmm.c | 202 - src/3rdparty/freetype/src/base/ftnames.c | 94 - src/3rdparty/freetype/src/base/ftobjs.c | 4198 ----- src/3rdparty/freetype/src/base/ftotval.c | 83 - src/3rdparty/freetype/src/base/ftoutln.c | 1090 -- src/3rdparty/freetype/src/base/ftpatent.c | 281 - src/3rdparty/freetype/src/base/ftpfr.c | 132 - src/3rdparty/freetype/src/base/ftrfork.c | 811 - src/3rdparty/freetype/src/base/ftstream.c | 845 - src/3rdparty/freetype/src/base/ftstroke.c | 2010 --- src/3rdparty/freetype/src/base/ftsynth.c | 159 - src/3rdparty/freetype/src/base/ftsystem.c | 301 - src/3rdparty/freetype/src/base/fttrigon.c | 546 - src/3rdparty/freetype/src/base/fttype1.c | 94 - src/3rdparty/freetype/src/base/ftutil.c | 501 - src/3rdparty/freetype/src/base/ftwinfnt.c | 51 - src/3rdparty/freetype/src/base/ftxf86.c | 40 - src/3rdparty/freetype/src/base/rules.mk | 90 - src/3rdparty/freetype/src/bdf/Jamfile | 29 - src/3rdparty/freetype/src/bdf/README | 148 - src/3rdparty/freetype/src/bdf/bdf.c | 34 - src/3rdparty/freetype/src/bdf/bdf.h | 295 - src/3rdparty/freetype/src/bdf/bdfdrivr.c | 850 - src/3rdparty/freetype/src/bdf/bdfdrivr.h | 76 - src/3rdparty/freetype/src/bdf/bdferror.h | 44 - src/3rdparty/freetype/src/bdf/bdflib.c | 2472 --- src/3rdparty/freetype/src/bdf/module.mk | 34 - src/3rdparty/freetype/src/bdf/rules.mk | 80 - src/3rdparty/freetype/src/cache/Jamfile | 43 - src/3rdparty/freetype/src/cache/ftcache.c | 31 - src/3rdparty/freetype/src/cache/ftcbasic.c | 811 - src/3rdparty/freetype/src/cache/ftccache.c | 592 - src/3rdparty/freetype/src/cache/ftccache.h | 317 - src/3rdparty/freetype/src/cache/ftccback.h | 90 - src/3rdparty/freetype/src/cache/ftccmap.c | 413 - src/3rdparty/freetype/src/cache/ftcerror.h | 40 - src/3rdparty/freetype/src/cache/ftcglyph.c | 211 - src/3rdparty/freetype/src/cache/ftcglyph.h | 322 - src/3rdparty/freetype/src/cache/ftcimage.c | 163 - src/3rdparty/freetype/src/cache/ftcimage.h | 107 - src/3rdparty/freetype/src/cache/ftcmanag.c | 732 - src/3rdparty/freetype/src/cache/ftcmanag.h | 175 - src/3rdparty/freetype/src/cache/ftcmru.c | 357 - src/3rdparty/freetype/src/cache/ftcmru.h | 247 - src/3rdparty/freetype/src/cache/ftcsbits.c | 401 - src/3rdparty/freetype/src/cache/ftcsbits.h | 98 - src/3rdparty/freetype/src/cache/rules.mk | 78 - src/3rdparty/freetype/src/cff/Jamfile | 29 - src/3rdparty/freetype/src/cff/cff.c | 29 - src/3rdparty/freetype/src/cff/cffcmap.c | 224 - src/3rdparty/freetype/src/cff/cffcmap.h | 69 - src/3rdparty/freetype/src/cff/cffdrivr.c | 585 - src/3rdparty/freetype/src/cff/cffdrivr.h | 39 - src/3rdparty/freetype/src/cff/cfferrs.h | 41 - src/3rdparty/freetype/src/cff/cffgload.c | 2701 ---- src/3rdparty/freetype/src/cff/cffgload.h | 202 - src/3rdparty/freetype/src/cff/cffload.c | 1605 -- src/3rdparty/freetype/src/cff/cffload.h | 79 - src/3rdparty/freetype/src/cff/cffobjs.c | 962 -- src/3rdparty/freetype/src/cff/cffobjs.h | 181 - src/3rdparty/freetype/src/cff/cffparse.c | 843 - src/3rdparty/freetype/src/cff/cffparse.h | 69 - src/3rdparty/freetype/src/cff/cfftoken.h | 97 - src/3rdparty/freetype/src/cff/cfftypes.h | 274 - src/3rdparty/freetype/src/cff/module.mk | 23 - src/3rdparty/freetype/src/cff/rules.mk | 72 - src/3rdparty/freetype/src/cid/Jamfile | 29 - src/3rdparty/freetype/src/cid/ciderrs.h | 40 - src/3rdparty/freetype/src/cid/cidgload.c | 433 - src/3rdparty/freetype/src/cid/cidgload.h | 51 - src/3rdparty/freetype/src/cid/cidload.c | 644 - src/3rdparty/freetype/src/cid/cidload.h | 53 - src/3rdparty/freetype/src/cid/cidobjs.c | 480 - src/3rdparty/freetype/src/cid/cidobjs.h | 154 - src/3rdparty/freetype/src/cid/cidparse.c | 226 - src/3rdparty/freetype/src/cid/cidparse.h | 123 - src/3rdparty/freetype/src/cid/cidriver.c | 198 - src/3rdparty/freetype/src/cid/cidriver.h | 39 - src/3rdparty/freetype/src/cid/cidtoken.h | 103 - src/3rdparty/freetype/src/cid/module.mk | 23 - src/3rdparty/freetype/src/cid/rules.mk | 70 - src/3rdparty/freetype/src/cid/type1cid.c | 29 - src/3rdparty/freetype/src/gxvalid/Jamfile | 33 - src/3rdparty/freetype/src/gxvalid/README | 532 - src/3rdparty/freetype/src/gxvalid/gxvalid.c | 46 - src/3rdparty/freetype/src/gxvalid/gxvalid.h | 107 - src/3rdparty/freetype/src/gxvalid/gxvbsln.c | 333 - src/3rdparty/freetype/src/gxvalid/gxvcommn.c | 1758 --- src/3rdparty/freetype/src/gxvalid/gxvcommn.h | 560 - src/3rdparty/freetype/src/gxvalid/gxverror.h | 51 - src/3rdparty/freetype/src/gxvalid/gxvfeat.c | 344 - src/3rdparty/freetype/src/gxvalid/gxvfeat.h | 172 - src/3rdparty/freetype/src/gxvalid/gxvfgen.c | 482 - src/3rdparty/freetype/src/gxvalid/gxvjust.c | 630 - src/3rdparty/freetype/src/gxvalid/gxvkern.c | 876 -- src/3rdparty/freetype/src/gxvalid/gxvlcar.c | 223 - src/3rdparty/freetype/src/gxvalid/gxvmod.c | 285 - src/3rdparty/freetype/src/gxvalid/gxvmod.h | 46 - src/3rdparty/freetype/src/gxvalid/gxvmort.c | 285 - src/3rdparty/freetype/src/gxvalid/gxvmort.h | 93 - src/3rdparty/freetype/src/gxvalid/gxvmort0.c | 137 - src/3rdparty/freetype/src/gxvalid/gxvmort1.c | 258 - src/3rdparty/freetype/src/gxvalid/gxvmort2.c | 282 - src/3rdparty/freetype/src/gxvalid/gxvmort4.c | 125 - src/3rdparty/freetype/src/gxvalid/gxvmort5.c | 226 - src/3rdparty/freetype/src/gxvalid/gxvmorx.c | 183 - src/3rdparty/freetype/src/gxvalid/gxvmorx.h | 67 - src/3rdparty/freetype/src/gxvalid/gxvmorx0.c | 103 - src/3rdparty/freetype/src/gxvalid/gxvmorx1.c | 274 - src/3rdparty/freetype/src/gxvalid/gxvmorx2.c | 285 - src/3rdparty/freetype/src/gxvalid/gxvmorx4.c | 55 - src/3rdparty/freetype/src/gxvalid/gxvmorx5.c | 217 - src/3rdparty/freetype/src/gxvalid/gxvopbd.c | 217 - src/3rdparty/freetype/src/gxvalid/gxvprop.c | 301 - src/3rdparty/freetype/src/gxvalid/gxvtrak.c | 277 - src/3rdparty/freetype/src/gxvalid/module.mk | 23 - src/3rdparty/freetype/src/gxvalid/rules.mk | 94 - src/3rdparty/freetype/src/gzip/Jamfile | 16 - src/3rdparty/freetype/src/gzip/adler32.c | 48 - src/3rdparty/freetype/src/gzip/ftgzip.c | 682 - src/3rdparty/freetype/src/gzip/infblock.c | 387 - src/3rdparty/freetype/src/gzip/infblock.h | 36 - src/3rdparty/freetype/src/gzip/infcodes.c | 250 - src/3rdparty/freetype/src/gzip/infcodes.h | 31 - src/3rdparty/freetype/src/gzip/inffixed.h | 151 - src/3rdparty/freetype/src/gzip/inflate.c | 273 - src/3rdparty/freetype/src/gzip/inftrees.c | 465 - src/3rdparty/freetype/src/gzip/inftrees.h | 63 - src/3rdparty/freetype/src/gzip/infutil.c | 86 - src/3rdparty/freetype/src/gzip/infutil.h | 98 - src/3rdparty/freetype/src/gzip/rules.mk | 75 - src/3rdparty/freetype/src/gzip/zconf.h | 278 - src/3rdparty/freetype/src/gzip/zlib.h | 830 - src/3rdparty/freetype/src/gzip/zutil.c | 181 - src/3rdparty/freetype/src/gzip/zutil.h | 215 - src/3rdparty/freetype/src/lzw/Jamfile | 16 - src/3rdparty/freetype/src/lzw/ftlzw.c | 413 - src/3rdparty/freetype/src/lzw/ftzopen.c | 398 - src/3rdparty/freetype/src/lzw/ftzopen.h | 171 - src/3rdparty/freetype/src/lzw/rules.mk | 70 - src/3rdparty/freetype/src/otvalid/Jamfile | 29 - src/3rdparty/freetype/src/otvalid/module.mk | 23 - src/3rdparty/freetype/src/otvalid/otvalid.c | 31 - src/3rdparty/freetype/src/otvalid/otvalid.h | 77 - src/3rdparty/freetype/src/otvalid/otvbase.c | 318 - src/3rdparty/freetype/src/otvalid/otvcommn.c | 1086 -- src/3rdparty/freetype/src/otvalid/otvcommn.h | 437 - src/3rdparty/freetype/src/otvalid/otverror.h | 43 - src/3rdparty/freetype/src/otvalid/otvgdef.c | 219 - src/3rdparty/freetype/src/otvalid/otvgpos.c | 1013 -- src/3rdparty/freetype/src/otvalid/otvgpos.h | 36 - src/3rdparty/freetype/src/otvalid/otvgsub.c | 584 - src/3rdparty/freetype/src/otvalid/otvjstf.c | 258 - src/3rdparty/freetype/src/otvalid/otvmath.c | 450 - src/3rdparty/freetype/src/otvalid/otvmod.c | 267 - src/3rdparty/freetype/src/otvalid/otvmod.h | 39 - src/3rdparty/freetype/src/otvalid/rules.mk | 78 - src/3rdparty/freetype/src/pcf/Jamfile | 29 - src/3rdparty/freetype/src/pcf/README | 114 - src/3rdparty/freetype/src/pcf/module.mk | 34 - src/3rdparty/freetype/src/pcf/pcf.c | 36 - src/3rdparty/freetype/src/pcf/pcf.h | 237 - src/3rdparty/freetype/src/pcf/pcfdrivr.c | 674 - src/3rdparty/freetype/src/pcf/pcfdrivr.h | 44 - src/3rdparty/freetype/src/pcf/pcferror.h | 40 - src/3rdparty/freetype/src/pcf/pcfread.c | 1267 -- src/3rdparty/freetype/src/pcf/pcfread.h | 45 - src/3rdparty/freetype/src/pcf/pcfutil.c | 104 - src/3rdparty/freetype/src/pcf/pcfutil.h | 55 - src/3rdparty/freetype/src/pcf/rules.mk | 80 - src/3rdparty/freetype/src/pfr/Jamfile | 29 - src/3rdparty/freetype/src/pfr/module.mk | 23 - src/3rdparty/freetype/src/pfr/pfr.c | 29 - src/3rdparty/freetype/src/pfr/pfrcmap.c | 167 - src/3rdparty/freetype/src/pfr/pfrcmap.h | 46 - src/3rdparty/freetype/src/pfr/pfrdrivr.c | 207 - src/3rdparty/freetype/src/pfr/pfrdrivr.h | 39 - src/3rdparty/freetype/src/pfr/pfrerror.h | 40 - src/3rdparty/freetype/src/pfr/pfrgload.c | 828 - src/3rdparty/freetype/src/pfr/pfrgload.h | 49 - src/3rdparty/freetype/src/pfr/pfrload.c | 938 -- src/3rdparty/freetype/src/pfr/pfrload.h | 118 - src/3rdparty/freetype/src/pfr/pfrobjs.c | 576 - src/3rdparty/freetype/src/pfr/pfrobjs.h | 96 - src/3rdparty/freetype/src/pfr/pfrsbit.c | 680 - src/3rdparty/freetype/src/pfr/pfrsbit.h | 36 - src/3rdparty/freetype/src/pfr/pfrtypes.h | 362 - src/3rdparty/freetype/src/pfr/rules.mk | 73 - src/3rdparty/freetype/src/psaux/Jamfile | 31 - src/3rdparty/freetype/src/psaux/afmparse.c | 960 -- src/3rdparty/freetype/src/psaux/afmparse.h | 87 - src/3rdparty/freetype/src/psaux/module.mk | 23 - src/3rdparty/freetype/src/psaux/psaux.c | 34 - src/3rdparty/freetype/src/psaux/psauxerr.h | 41 - src/3rdparty/freetype/src/psaux/psauxmod.c | 139 - src/3rdparty/freetype/src/psaux/psauxmod.h | 38 - src/3rdparty/freetype/src/psaux/psconv.c | 474 - src/3rdparty/freetype/src/psaux/psconv.h | 71 - src/3rdparty/freetype/src/psaux/psobjs.c | 1692 -- src/3rdparty/freetype/src/psaux/psobjs.h | 212 - src/3rdparty/freetype/src/psaux/rules.mk | 73 - src/3rdparty/freetype/src/psaux/t1cmap.c | 341 - src/3rdparty/freetype/src/psaux/t1cmap.h | 105 - src/3rdparty/freetype/src/psaux/t1decode.c | 1475 -- src/3rdparty/freetype/src/psaux/t1decode.h | 64 - src/3rdparty/freetype/src/pshinter/Jamfile | 29 - src/3rdparty/freetype/src/pshinter/module.mk | 23 - src/3rdparty/freetype/src/pshinter/pshalgo.c | 2302 --- src/3rdparty/freetype/src/pshinter/pshalgo.h | 255 - src/3rdparty/freetype/src/pshinter/pshglob.c | 750 - src/3rdparty/freetype/src/pshinter/pshglob.h | 196 - src/3rdparty/freetype/src/pshinter/pshinter.c | 28 - src/3rdparty/freetype/src/pshinter/pshmod.c | 121 - src/3rdparty/freetype/src/pshinter/pshmod.h | 39 - src/3rdparty/freetype/src/pshinter/pshnterr.h | 40 - src/3rdparty/freetype/src/pshinter/pshrec.c | 1215 -- src/3rdparty/freetype/src/pshinter/pshrec.h | 176 - src/3rdparty/freetype/src/pshinter/rules.mk | 72 - src/3rdparty/freetype/src/psnames/Jamfile | 29 - src/3rdparty/freetype/src/psnames/module.mk | 23 - src/3rdparty/freetype/src/psnames/psmodule.c | 565 - src/3rdparty/freetype/src/psnames/psmodule.h | 38 - src/3rdparty/freetype/src/psnames/psnamerr.h | 41 - src/3rdparty/freetype/src/psnames/psnames.c | 25 - src/3rdparty/freetype/src/psnames/pstables.h | 4090 ----- src/3rdparty/freetype/src/psnames/rules.mk | 70 - src/3rdparty/freetype/src/raster/Jamfile | 29 - src/3rdparty/freetype/src/raster/ftmisc.h | 83 - src/3rdparty/freetype/src/raster/ftraster.c | 3382 ---- src/3rdparty/freetype/src/raster/ftraster.h | 46 - src/3rdparty/freetype/src/raster/ftrend1.c | 273 - src/3rdparty/freetype/src/raster/ftrend1.h | 44 - src/3rdparty/freetype/src/raster/module.mk | 23 - src/3rdparty/freetype/src/raster/raster.c | 26 - src/3rdparty/freetype/src/raster/rasterrs.h | 41 - src/3rdparty/freetype/src/raster/rules.mk | 69 - src/3rdparty/freetype/src/sfnt/Jamfile | 29 - src/3rdparty/freetype/src/sfnt/module.mk | 23 - src/3rdparty/freetype/src/sfnt/rules.mk | 76 - src/3rdparty/freetype/src/sfnt/sfdriver.c | 618 - src/3rdparty/freetype/src/sfnt/sfdriver.h | 38 - src/3rdparty/freetype/src/sfnt/sferrors.h | 41 - src/3rdparty/freetype/src/sfnt/sfnt.c | 41 - src/3rdparty/freetype/src/sfnt/sfobjs.c | 1116 -- src/3rdparty/freetype/src/sfnt/sfobjs.h | 54 - src/3rdparty/freetype/src/sfnt/ttbdf.c | 250 - src/3rdparty/freetype/src/sfnt/ttbdf.h | 46 - src/3rdparty/freetype/src/sfnt/ttcmap.c | 3123 ---- src/3rdparty/freetype/src/sfnt/ttcmap.h | 85 - src/3rdparty/freetype/src/sfnt/ttkern.c | 292 - src/3rdparty/freetype/src/sfnt/ttkern.h | 52 - src/3rdparty/freetype/src/sfnt/ttload.c | 1185 -- src/3rdparty/freetype/src/sfnt/ttload.h | 112 - src/3rdparty/freetype/src/sfnt/ttmtx.c | 466 - src/3rdparty/freetype/src/sfnt/ttmtx.h | 55 - src/3rdparty/freetype/src/sfnt/ttpost.c | 521 - src/3rdparty/freetype/src/sfnt/ttpost.h | 46 - src/3rdparty/freetype/src/sfnt/ttsbit.c | 1502 -- src/3rdparty/freetype/src/sfnt/ttsbit.h | 79 - src/3rdparty/freetype/src/sfnt/ttsbit0.c | 996 -- src/3rdparty/freetype/src/smooth/Jamfile | 29 - src/3rdparty/freetype/src/smooth/ftgrays.c | 1986 --- src/3rdparty/freetype/src/smooth/ftgrays.h | 57 - src/3rdparty/freetype/src/smooth/ftsmerrs.h | 41 - src/3rdparty/freetype/src/smooth/ftsmooth.c | 467 - src/3rdparty/freetype/src/smooth/ftsmooth.h | 49 - src/3rdparty/freetype/src/smooth/module.mk | 27 - src/3rdparty/freetype/src/smooth/rules.mk | 69 - src/3rdparty/freetype/src/smooth/smooth.c | 26 - src/3rdparty/freetype/src/tools/Jamfile | 5 - src/3rdparty/freetype/src/tools/apinames.c | 443 - src/3rdparty/freetype/src/tools/cordic.py | 79 - .../freetype/src/tools/docmaker/content.py | 582 - .../freetype/src/tools/docmaker/docbeauty.py | 113 - .../freetype/src/tools/docmaker/docmaker.py | 106 - .../freetype/src/tools/docmaker/formatter.py | 188 - .../freetype/src/tools/docmaker/sources.py | 347 - src/3rdparty/freetype/src/tools/docmaker/tohtml.py | 527 - src/3rdparty/freetype/src/tools/docmaker/utils.py | 132 - src/3rdparty/freetype/src/tools/ftrandom/Makefile | 35 - src/3rdparty/freetype/src/tools/ftrandom/README | 48 - .../freetype/src/tools/ftrandom/ftrandom.c | 659 - src/3rdparty/freetype/src/tools/glnames.py | 5282 ------- src/3rdparty/freetype/src/tools/test_afm.c | 157 - src/3rdparty/freetype/src/tools/test_bbox.c | 160 - src/3rdparty/freetype/src/tools/test_trig.c | 236 - src/3rdparty/freetype/src/truetype/Jamfile | 29 - src/3rdparty/freetype/src/truetype/module.mk | 23 - src/3rdparty/freetype/src/truetype/rules.mk | 72 - src/3rdparty/freetype/src/truetype/truetype.c | 36 - src/3rdparty/freetype/src/truetype/ttdriver.c | 418 - src/3rdparty/freetype/src/truetype/ttdriver.h | 38 - src/3rdparty/freetype/src/truetype/tterrors.h | 40 - src/3rdparty/freetype/src/truetype/ttgload.c | 1976 --- src/3rdparty/freetype/src/truetype/ttgload.h | 49 - src/3rdparty/freetype/src/truetype/ttgxvar.c | 1539 -- src/3rdparty/freetype/src/truetype/ttgxvar.h | 182 - src/3rdparty/freetype/src/truetype/ttinterp.c | 7837 --------- src/3rdparty/freetype/src/truetype/ttinterp.h | 311 - src/3rdparty/freetype/src/truetype/ttobjs.c | 943 -- src/3rdparty/freetype/src/truetype/ttobjs.h | 459 - src/3rdparty/freetype/src/truetype/ttpload.c | 523 - src/3rdparty/freetype/src/truetype/ttpload.h | 75 - src/3rdparty/freetype/src/type1/Jamfile | 29 - src/3rdparty/freetype/src/type1/module.mk | 23 - src/3rdparty/freetype/src/type1/rules.mk | 73 - src/3rdparty/freetype/src/type1/t1afm.c | 385 - src/3rdparty/freetype/src/type1/t1afm.h | 54 - src/3rdparty/freetype/src/type1/t1driver.c | 313 - src/3rdparty/freetype/src/type1/t1driver.h | 38 - src/3rdparty/freetype/src/type1/t1errors.h | 40 - src/3rdparty/freetype/src/type1/t1gload.c | 422 - src/3rdparty/freetype/src/type1/t1gload.h | 46 - src/3rdparty/freetype/src/type1/t1load.c | 2233 --- src/3rdparty/freetype/src/type1/t1load.h | 102 - src/3rdparty/freetype/src/type1/t1objs.c | 568 - src/3rdparty/freetype/src/type1/t1objs.h | 171 - src/3rdparty/freetype/src/type1/t1parse.c | 484 - src/3rdparty/freetype/src/type1/t1parse.h | 135 - src/3rdparty/freetype/src/type1/t1tokens.h | 134 - src/3rdparty/freetype/src/type1/type1.c | 33 - src/3rdparty/freetype/src/type42/Jamfile | 29 - src/3rdparty/freetype/src/type42/module.mk | 23 - src/3rdparty/freetype/src/type42/rules.mk | 69 - src/3rdparty/freetype/src/type42/t42drivr.c | 232 - src/3rdparty/freetype/src/type42/t42drivr.h | 38 - src/3rdparty/freetype/src/type42/t42error.h | 40 - src/3rdparty/freetype/src/type42/t42objs.c | 647 - src/3rdparty/freetype/src/type42/t42objs.h | 124 - src/3rdparty/freetype/src/type42/t42parse.c | 1167 -- src/3rdparty/freetype/src/type42/t42parse.h | 90 - src/3rdparty/freetype/src/type42/t42types.h | 54 - src/3rdparty/freetype/src/type42/type42.c | 25 - src/3rdparty/freetype/src/winfonts/Jamfile | 16 - src/3rdparty/freetype/src/winfonts/fnterrs.h | 41 - src/3rdparty/freetype/src/winfonts/module.mk | 23 - src/3rdparty/freetype/src/winfonts/rules.mk | 65 - src/3rdparty/freetype/src/winfonts/winfnt.c | 1130 -- src/3rdparty/freetype/src/winfonts/winfnt.h | 167 - src/3rdparty/freetype/version.sed | 5 - src/3rdparty/freetype/vms_make.com | 1286 -- 650 files changed, 282668 deletions(-) delete mode 100644 src/3rdparty/freetype/ChangeLog delete mode 100644 src/3rdparty/freetype/ChangeLog.20 delete mode 100644 src/3rdparty/freetype/ChangeLog.21 delete mode 100644 src/3rdparty/freetype/ChangeLog.22 delete mode 100644 src/3rdparty/freetype/Jamfile delete mode 100644 src/3rdparty/freetype/Jamrules delete mode 100644 src/3rdparty/freetype/Makefile delete mode 100644 src/3rdparty/freetype/README delete mode 100644 src/3rdparty/freetype/README.CVS delete mode 100644 src/3rdparty/freetype/autogen.sh delete mode 100644 src/3rdparty/freetype/builds/amiga/README delete mode 100644 src/3rdparty/freetype/builds/amiga/include/freetype/config/ftconfig.h delete mode 100644 src/3rdparty/freetype/builds/amiga/include/freetype/config/ftmodule.h delete mode 100644 src/3rdparty/freetype/builds/amiga/makefile delete mode 100644 src/3rdparty/freetype/builds/amiga/makefile.os4 delete mode 100644 src/3rdparty/freetype/builds/amiga/smakefile delete mode 100644 src/3rdparty/freetype/builds/amiga/src/base/ftdebug.c delete mode 100644 src/3rdparty/freetype/builds/amiga/src/base/ftsystem.c delete mode 100644 src/3rdparty/freetype/builds/ansi/ansi-def.mk delete mode 100644 src/3rdparty/freetype/builds/ansi/ansi.mk delete mode 100644 src/3rdparty/freetype/builds/atari/ATARI.H delete mode 100644 src/3rdparty/freetype/builds/atari/FNames.SIC delete mode 100644 src/3rdparty/freetype/builds/atari/FREETYPE.PRJ delete mode 100644 src/3rdparty/freetype/builds/atari/README.TXT delete mode 100644 src/3rdparty/freetype/builds/beos/beos-def.mk delete mode 100644 src/3rdparty/freetype/builds/beos/beos.mk delete mode 100644 src/3rdparty/freetype/builds/beos/detect.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/ansi-cc.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/bcc-dev.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/bcc.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/emx.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/gcc-dev.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/gcc.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/intelc.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/unix-lcc.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/visualage.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/visualc.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/watcom.mk delete mode 100644 src/3rdparty/freetype/builds/compiler/win-lcc.mk delete mode 100644 src/3rdparty/freetype/builds/detect.mk delete mode 100644 src/3rdparty/freetype/builds/dos/detect.mk delete mode 100644 src/3rdparty/freetype/builds/dos/dos-def.mk delete mode 100644 src/3rdparty/freetype/builds/dos/dos-emx.mk delete mode 100644 src/3rdparty/freetype/builds/dos/dos-gcc.mk delete mode 100644 src/3rdparty/freetype/builds/dos/dos-wat.mk delete mode 100644 src/3rdparty/freetype/builds/exports.mk delete mode 100644 src/3rdparty/freetype/builds/freetype.mk delete mode 100644 src/3rdparty/freetype/builds/link_dos.mk delete mode 100644 src/3rdparty/freetype/builds/link_std.mk delete mode 100644 src/3rdparty/freetype/builds/mac/FreeType.m68k_cfm.make.txt delete mode 100644 src/3rdparty/freetype/builds/mac/FreeType.m68k_far.make.txt delete mode 100644 src/3rdparty/freetype/builds/mac/FreeType.ppc_carbon.make.txt delete mode 100644 src/3rdparty/freetype/builds/mac/FreeType.ppc_classic.make.txt delete mode 100644 src/3rdparty/freetype/builds/mac/README delete mode 100755 src/3rdparty/freetype/builds/mac/ascii2mpw.py delete mode 100644 src/3rdparty/freetype/builds/mac/ftlib.prj.xml delete mode 100644 src/3rdparty/freetype/builds/mac/ftmac.c delete mode 100644 src/3rdparty/freetype/builds/modules.mk delete mode 100644 src/3rdparty/freetype/builds/newline delete mode 100644 src/3rdparty/freetype/builds/os2/detect.mk delete mode 100644 src/3rdparty/freetype/builds/os2/os2-def.mk delete mode 100644 src/3rdparty/freetype/builds/os2/os2-dev.mk delete mode 100644 src/3rdparty/freetype/builds/os2/os2-gcc.mk delete mode 100644 src/3rdparty/freetype/builds/symbian/bld.inf delete mode 100644 src/3rdparty/freetype/builds/symbian/freetype.mmp delete mode 100644 src/3rdparty/freetype/builds/toplevel.mk delete mode 100644 src/3rdparty/freetype/builds/unix/aclocal.m4 delete mode 100755 src/3rdparty/freetype/builds/unix/config.guess delete mode 100755 src/3rdparty/freetype/builds/unix/config.sub delete mode 100755 src/3rdparty/freetype/builds/unix/configure delete mode 100644 src/3rdparty/freetype/builds/unix/configure.ac delete mode 100644 src/3rdparty/freetype/builds/unix/configure.raw delete mode 100644 src/3rdparty/freetype/builds/unix/detect.mk delete mode 100644 src/3rdparty/freetype/builds/unix/freetype-config.in delete mode 100644 src/3rdparty/freetype/builds/unix/freetype2.in delete mode 100644 src/3rdparty/freetype/builds/unix/freetype2.m4 delete mode 100644 src/3rdparty/freetype/builds/unix/ft-munmap.m4 delete mode 100644 src/3rdparty/freetype/builds/unix/ft2unix.h delete mode 100644 src/3rdparty/freetype/builds/unix/ftconfig.h delete mode 100644 src/3rdparty/freetype/builds/unix/ftconfig.in delete mode 100644 src/3rdparty/freetype/builds/unix/ftsystem.c delete mode 100755 src/3rdparty/freetype/builds/unix/install-sh delete mode 100644 src/3rdparty/freetype/builds/unix/install.mk delete mode 100755 src/3rdparty/freetype/builds/unix/ltmain.sh delete mode 100755 src/3rdparty/freetype/builds/unix/mkinstalldirs delete mode 100644 src/3rdparty/freetype/builds/unix/unix-cc.in delete mode 100644 src/3rdparty/freetype/builds/unix/unix-def.in delete mode 100644 src/3rdparty/freetype/builds/unix/unix-dev.mk delete mode 100644 src/3rdparty/freetype/builds/unix/unix-lcc.mk delete mode 100644 src/3rdparty/freetype/builds/unix/unix.mk delete mode 100644 src/3rdparty/freetype/builds/unix/unixddef.mk delete mode 100644 src/3rdparty/freetype/builds/vms/ftconfig.h delete mode 100644 src/3rdparty/freetype/builds/vms/ftsystem.c delete mode 100644 src/3rdparty/freetype/builds/win32/detect.mk delete mode 100644 src/3rdparty/freetype/builds/win32/ftdebug.c delete mode 100644 src/3rdparty/freetype/builds/win32/visualc/freetype.dsp delete mode 100644 src/3rdparty/freetype/builds/win32/visualc/freetype.dsw delete mode 100644 src/3rdparty/freetype/builds/win32/visualc/freetype.sln delete mode 100644 src/3rdparty/freetype/builds/win32/visualc/freetype.vcproj delete mode 100644 src/3rdparty/freetype/builds/win32/visualc/index.html delete mode 100644 src/3rdparty/freetype/builds/win32/visualce/freetype.dsp delete mode 100644 src/3rdparty/freetype/builds/win32/visualce/freetype.dsw delete mode 100644 src/3rdparty/freetype/builds/win32/visualce/freetype.vcproj delete mode 100644 src/3rdparty/freetype/builds/win32/visualce/index.html delete mode 100644 src/3rdparty/freetype/builds/win32/w32-bcc.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-bccd.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-dev.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-gcc.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-icc.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-intl.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-lcc.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-mingw32.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-vcc.mk delete mode 100644 src/3rdparty/freetype/builds/win32/w32-wat.mk delete mode 100644 src/3rdparty/freetype/builds/win32/win32-def.mk delete mode 100755 src/3rdparty/freetype/configure delete mode 100644 src/3rdparty/freetype/devel/ft2build.h delete mode 100644 src/3rdparty/freetype/devel/ftoption.h delete mode 100644 src/3rdparty/freetype/docs/CHANGES delete mode 100644 src/3rdparty/freetype/docs/CUSTOMIZE delete mode 100644 src/3rdparty/freetype/docs/DEBUG delete mode 100644 src/3rdparty/freetype/docs/FTL.TXT delete mode 100644 src/3rdparty/freetype/docs/GPL.TXT delete mode 100644 src/3rdparty/freetype/docs/INSTALL delete mode 100644 src/3rdparty/freetype/docs/INSTALL.ANY delete mode 100644 src/3rdparty/freetype/docs/INSTALL.CROSS delete mode 100644 src/3rdparty/freetype/docs/INSTALL.GNU delete mode 100644 src/3rdparty/freetype/docs/INSTALL.MAC delete mode 100644 src/3rdparty/freetype/docs/INSTALL.UNIX delete mode 100644 src/3rdparty/freetype/docs/INSTALL.VMS delete mode 100644 src/3rdparty/freetype/docs/LICENSE.TXT delete mode 100644 src/3rdparty/freetype/docs/MAKEPP delete mode 100644 src/3rdparty/freetype/docs/PATENTS delete mode 100644 src/3rdparty/freetype/docs/PROBLEMS delete mode 100644 src/3rdparty/freetype/docs/TODO delete mode 100644 src/3rdparty/freetype/docs/TRUETYPE delete mode 100644 src/3rdparty/freetype/docs/UPGRADE.UNIX delete mode 100644 src/3rdparty/freetype/docs/VERSION.DLL delete mode 100644 src/3rdparty/freetype/docs/formats.txt delete mode 100644 src/3rdparty/freetype/docs/raster.txt delete mode 100644 src/3rdparty/freetype/docs/reference/README delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-base_interface.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-basic_types.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-bdf_fonts.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-bitmap_handling.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-cache_subsystem.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-cid_fonts.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-computations.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-font_formats.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-gasp_table.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-glyph_management.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-glyph_stroker.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-glyph_variants.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-gx_validation.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-gzip.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-header_file_macros.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-incremental.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-index.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-lcd_filtering.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-list_processing.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-lzw.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-mac_specific.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-module_management.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-multiple_masters.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-ot_validation.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-outline_processing.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-pfr_fonts.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-raster.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-sfnt_names.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-sizes_management.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-system_interface.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-toc.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-truetype_engine.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-truetype_tables.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-type1_tables.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-user_allocation.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-version.html delete mode 100644 src/3rdparty/freetype/docs/reference/ft2-winfnt_fonts.html delete mode 100644 src/3rdparty/freetype/docs/release delete mode 100644 src/3rdparty/freetype/include/freetype/config/ftconfig.h delete mode 100644 src/3rdparty/freetype/include/freetype/config/ftheader.h delete mode 100644 src/3rdparty/freetype/include/freetype/config/ftmodule.h delete mode 100644 src/3rdparty/freetype/include/freetype/config/ftoption.h delete mode 100644 src/3rdparty/freetype/include/freetype/config/ftstdlib.h delete mode 100644 src/3rdparty/freetype/include/freetype/freetype.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftbbox.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftbdf.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftbitmap.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftcache.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftchapters.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftcid.h delete mode 100644 src/3rdparty/freetype/include/freetype/fterrdef.h delete mode 100644 src/3rdparty/freetype/include/freetype/fterrors.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftgasp.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftglyph.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftgxval.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftgzip.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftimage.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftincrem.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftlcdfil.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftlist.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftlzw.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftmac.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftmm.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftmodapi.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftmoderr.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftotval.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftoutln.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftpfr.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftrender.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftsizes.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftsnames.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftstroke.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftsynth.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftsystem.h delete mode 100644 src/3rdparty/freetype/include/freetype/fttrigon.h delete mode 100644 src/3rdparty/freetype/include/freetype/fttypes.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftwinfnt.h delete mode 100644 src/3rdparty/freetype/include/freetype/ftxf86.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/autohint.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftcalc.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftdebug.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftdriver.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftgloadr.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftmemory.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftobjs.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftrfork.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftserv.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftstream.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/fttrace.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/ftvalid.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/internal.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/pcftypes.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/psaux.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/pshints.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svbdf.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svcid.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svgldict.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svgxval.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svkern.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svmm.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svotval.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svpfr.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svpostnm.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svpscmap.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svpsinfo.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svsfnt.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svttcmap.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svtteng.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svttglyf.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svwinfnt.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/services/svxf86nm.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/sfnt.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/t1types.h delete mode 100644 src/3rdparty/freetype/include/freetype/internal/tttypes.h delete mode 100644 src/3rdparty/freetype/include/freetype/t1tables.h delete mode 100644 src/3rdparty/freetype/include/freetype/ttnameid.h delete mode 100644 src/3rdparty/freetype/include/freetype/tttables.h delete mode 100644 src/3rdparty/freetype/include/freetype/tttags.h delete mode 100644 src/3rdparty/freetype/include/freetype/ttunpat.h delete mode 100644 src/3rdparty/freetype/include/ft2build.h delete mode 100644 src/3rdparty/freetype/modules.cfg delete mode 100644 src/3rdparty/freetype/objs/README delete mode 100644 src/3rdparty/freetype/src/Jamfile delete mode 100644 src/3rdparty/freetype/src/autofit/Jamfile delete mode 100644 src/3rdparty/freetype/src/autofit/afangles.c delete mode 100644 src/3rdparty/freetype/src/autofit/afangles.h delete mode 100644 src/3rdparty/freetype/src/autofit/afcjk.c delete mode 100644 src/3rdparty/freetype/src/autofit/afcjk.h delete mode 100644 src/3rdparty/freetype/src/autofit/afdummy.c delete mode 100644 src/3rdparty/freetype/src/autofit/afdummy.h delete mode 100644 src/3rdparty/freetype/src/autofit/aferrors.h delete mode 100644 src/3rdparty/freetype/src/autofit/afglobal.c delete mode 100644 src/3rdparty/freetype/src/autofit/afglobal.h delete mode 100644 src/3rdparty/freetype/src/autofit/afhints.c delete mode 100644 src/3rdparty/freetype/src/autofit/afhints.h delete mode 100644 src/3rdparty/freetype/src/autofit/afindic.c delete mode 100644 src/3rdparty/freetype/src/autofit/afindic.h delete mode 100644 src/3rdparty/freetype/src/autofit/aflatin.c delete mode 100644 src/3rdparty/freetype/src/autofit/aflatin.h delete mode 100644 src/3rdparty/freetype/src/autofit/aflatin2.c delete mode 100644 src/3rdparty/freetype/src/autofit/aflatin2.h delete mode 100644 src/3rdparty/freetype/src/autofit/afloader.c delete mode 100644 src/3rdparty/freetype/src/autofit/afloader.h delete mode 100644 src/3rdparty/freetype/src/autofit/afmodule.c delete mode 100644 src/3rdparty/freetype/src/autofit/afmodule.h delete mode 100644 src/3rdparty/freetype/src/autofit/aftypes.h delete mode 100644 src/3rdparty/freetype/src/autofit/afwarp.c delete mode 100644 src/3rdparty/freetype/src/autofit/afwarp.h delete mode 100644 src/3rdparty/freetype/src/autofit/autofit.c delete mode 100644 src/3rdparty/freetype/src/autofit/module.mk delete mode 100644 src/3rdparty/freetype/src/autofit/rules.mk delete mode 100644 src/3rdparty/freetype/src/base/Jamfile delete mode 100644 src/3rdparty/freetype/src/base/ftapi.c delete mode 100644 src/3rdparty/freetype/src/base/ftbase.c delete mode 100644 src/3rdparty/freetype/src/base/ftbbox.c delete mode 100644 src/3rdparty/freetype/src/base/ftbdf.c delete mode 100644 src/3rdparty/freetype/src/base/ftbitmap.c delete mode 100644 src/3rdparty/freetype/src/base/ftcalc.c delete mode 100644 src/3rdparty/freetype/src/base/ftcid.c delete mode 100644 src/3rdparty/freetype/src/base/ftdbgmem.c delete mode 100644 src/3rdparty/freetype/src/base/ftdebug.c delete mode 100644 src/3rdparty/freetype/src/base/ftgasp.c delete mode 100644 src/3rdparty/freetype/src/base/ftgloadr.c delete mode 100644 src/3rdparty/freetype/src/base/ftglyph.c delete mode 100644 src/3rdparty/freetype/src/base/ftgxval.c delete mode 100644 src/3rdparty/freetype/src/base/ftinit.c delete mode 100644 src/3rdparty/freetype/src/base/ftlcdfil.c delete mode 100644 src/3rdparty/freetype/src/base/ftmac.c delete mode 100644 src/3rdparty/freetype/src/base/ftmm.c delete mode 100644 src/3rdparty/freetype/src/base/ftnames.c delete mode 100644 src/3rdparty/freetype/src/base/ftobjs.c delete mode 100644 src/3rdparty/freetype/src/base/ftotval.c delete mode 100644 src/3rdparty/freetype/src/base/ftoutln.c delete mode 100644 src/3rdparty/freetype/src/base/ftpatent.c delete mode 100644 src/3rdparty/freetype/src/base/ftpfr.c delete mode 100644 src/3rdparty/freetype/src/base/ftrfork.c delete mode 100644 src/3rdparty/freetype/src/base/ftstream.c delete mode 100644 src/3rdparty/freetype/src/base/ftstroke.c delete mode 100644 src/3rdparty/freetype/src/base/ftsynth.c delete mode 100644 src/3rdparty/freetype/src/base/ftsystem.c delete mode 100644 src/3rdparty/freetype/src/base/fttrigon.c delete mode 100644 src/3rdparty/freetype/src/base/fttype1.c delete mode 100644 src/3rdparty/freetype/src/base/ftutil.c delete mode 100644 src/3rdparty/freetype/src/base/ftwinfnt.c delete mode 100644 src/3rdparty/freetype/src/base/ftxf86.c delete mode 100644 src/3rdparty/freetype/src/base/rules.mk delete mode 100644 src/3rdparty/freetype/src/bdf/Jamfile delete mode 100644 src/3rdparty/freetype/src/bdf/README delete mode 100644 src/3rdparty/freetype/src/bdf/bdf.c delete mode 100644 src/3rdparty/freetype/src/bdf/bdf.h delete mode 100644 src/3rdparty/freetype/src/bdf/bdfdrivr.c delete mode 100644 src/3rdparty/freetype/src/bdf/bdfdrivr.h delete mode 100644 src/3rdparty/freetype/src/bdf/bdferror.h delete mode 100644 src/3rdparty/freetype/src/bdf/bdflib.c delete mode 100644 src/3rdparty/freetype/src/bdf/module.mk delete mode 100644 src/3rdparty/freetype/src/bdf/rules.mk delete mode 100644 src/3rdparty/freetype/src/cache/Jamfile delete mode 100644 src/3rdparty/freetype/src/cache/ftcache.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcbasic.c delete mode 100644 src/3rdparty/freetype/src/cache/ftccache.c delete mode 100644 src/3rdparty/freetype/src/cache/ftccache.h delete mode 100644 src/3rdparty/freetype/src/cache/ftccback.h delete mode 100644 src/3rdparty/freetype/src/cache/ftccmap.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcerror.h delete mode 100644 src/3rdparty/freetype/src/cache/ftcglyph.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcglyph.h delete mode 100644 src/3rdparty/freetype/src/cache/ftcimage.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcimage.h delete mode 100644 src/3rdparty/freetype/src/cache/ftcmanag.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcmanag.h delete mode 100644 src/3rdparty/freetype/src/cache/ftcmru.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcmru.h delete mode 100644 src/3rdparty/freetype/src/cache/ftcsbits.c delete mode 100644 src/3rdparty/freetype/src/cache/ftcsbits.h delete mode 100644 src/3rdparty/freetype/src/cache/rules.mk delete mode 100644 src/3rdparty/freetype/src/cff/Jamfile delete mode 100644 src/3rdparty/freetype/src/cff/cff.c delete mode 100644 src/3rdparty/freetype/src/cff/cffcmap.c delete mode 100644 src/3rdparty/freetype/src/cff/cffcmap.h delete mode 100644 src/3rdparty/freetype/src/cff/cffdrivr.c delete mode 100644 src/3rdparty/freetype/src/cff/cffdrivr.h delete mode 100644 src/3rdparty/freetype/src/cff/cfferrs.h delete mode 100644 src/3rdparty/freetype/src/cff/cffgload.c delete mode 100644 src/3rdparty/freetype/src/cff/cffgload.h delete mode 100644 src/3rdparty/freetype/src/cff/cffload.c delete mode 100644 src/3rdparty/freetype/src/cff/cffload.h delete mode 100644 src/3rdparty/freetype/src/cff/cffobjs.c delete mode 100644 src/3rdparty/freetype/src/cff/cffobjs.h delete mode 100644 src/3rdparty/freetype/src/cff/cffparse.c delete mode 100644 src/3rdparty/freetype/src/cff/cffparse.h delete mode 100644 src/3rdparty/freetype/src/cff/cfftoken.h delete mode 100644 src/3rdparty/freetype/src/cff/cfftypes.h delete mode 100644 src/3rdparty/freetype/src/cff/module.mk delete mode 100644 src/3rdparty/freetype/src/cff/rules.mk delete mode 100644 src/3rdparty/freetype/src/cid/Jamfile delete mode 100644 src/3rdparty/freetype/src/cid/ciderrs.h delete mode 100644 src/3rdparty/freetype/src/cid/cidgload.c delete mode 100644 src/3rdparty/freetype/src/cid/cidgload.h delete mode 100644 src/3rdparty/freetype/src/cid/cidload.c delete mode 100644 src/3rdparty/freetype/src/cid/cidload.h delete mode 100644 src/3rdparty/freetype/src/cid/cidobjs.c delete mode 100644 src/3rdparty/freetype/src/cid/cidobjs.h delete mode 100644 src/3rdparty/freetype/src/cid/cidparse.c delete mode 100644 src/3rdparty/freetype/src/cid/cidparse.h delete mode 100644 src/3rdparty/freetype/src/cid/cidriver.c delete mode 100644 src/3rdparty/freetype/src/cid/cidriver.h delete mode 100644 src/3rdparty/freetype/src/cid/cidtoken.h delete mode 100644 src/3rdparty/freetype/src/cid/module.mk delete mode 100644 src/3rdparty/freetype/src/cid/rules.mk delete mode 100644 src/3rdparty/freetype/src/cid/type1cid.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/Jamfile delete mode 100644 src/3rdparty/freetype/src/gxvalid/README delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvalid.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvalid.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvbsln.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvcommn.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvcommn.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxverror.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvfeat.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvfeat.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvfgen.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvjust.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvkern.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvlcar.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmod.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmod.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort0.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort1.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort2.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort4.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmort5.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx.h delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx0.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx1.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx2.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx4.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvmorx5.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvopbd.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvprop.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/gxvtrak.c delete mode 100644 src/3rdparty/freetype/src/gxvalid/module.mk delete mode 100644 src/3rdparty/freetype/src/gxvalid/rules.mk delete mode 100644 src/3rdparty/freetype/src/gzip/Jamfile delete mode 100644 src/3rdparty/freetype/src/gzip/adler32.c delete mode 100644 src/3rdparty/freetype/src/gzip/ftgzip.c delete mode 100644 src/3rdparty/freetype/src/gzip/infblock.c delete mode 100644 src/3rdparty/freetype/src/gzip/infblock.h delete mode 100644 src/3rdparty/freetype/src/gzip/infcodes.c delete mode 100644 src/3rdparty/freetype/src/gzip/infcodes.h delete mode 100644 src/3rdparty/freetype/src/gzip/inffixed.h delete mode 100644 src/3rdparty/freetype/src/gzip/inflate.c delete mode 100644 src/3rdparty/freetype/src/gzip/inftrees.c delete mode 100644 src/3rdparty/freetype/src/gzip/inftrees.h delete mode 100644 src/3rdparty/freetype/src/gzip/infutil.c delete mode 100644 src/3rdparty/freetype/src/gzip/infutil.h delete mode 100644 src/3rdparty/freetype/src/gzip/rules.mk delete mode 100644 src/3rdparty/freetype/src/gzip/zconf.h delete mode 100644 src/3rdparty/freetype/src/gzip/zlib.h delete mode 100644 src/3rdparty/freetype/src/gzip/zutil.c delete mode 100644 src/3rdparty/freetype/src/gzip/zutil.h delete mode 100644 src/3rdparty/freetype/src/lzw/Jamfile delete mode 100644 src/3rdparty/freetype/src/lzw/ftlzw.c delete mode 100644 src/3rdparty/freetype/src/lzw/ftzopen.c delete mode 100644 src/3rdparty/freetype/src/lzw/ftzopen.h delete mode 100644 src/3rdparty/freetype/src/lzw/rules.mk delete mode 100644 src/3rdparty/freetype/src/otvalid/Jamfile delete mode 100644 src/3rdparty/freetype/src/otvalid/module.mk delete mode 100644 src/3rdparty/freetype/src/otvalid/otvalid.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvalid.h delete mode 100644 src/3rdparty/freetype/src/otvalid/otvbase.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvcommn.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvcommn.h delete mode 100644 src/3rdparty/freetype/src/otvalid/otverror.h delete mode 100644 src/3rdparty/freetype/src/otvalid/otvgdef.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvgpos.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvgpos.h delete mode 100644 src/3rdparty/freetype/src/otvalid/otvgsub.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvjstf.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvmath.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvmod.c delete mode 100644 src/3rdparty/freetype/src/otvalid/otvmod.h delete mode 100644 src/3rdparty/freetype/src/otvalid/rules.mk delete mode 100644 src/3rdparty/freetype/src/pcf/Jamfile delete mode 100644 src/3rdparty/freetype/src/pcf/README delete mode 100644 src/3rdparty/freetype/src/pcf/module.mk delete mode 100644 src/3rdparty/freetype/src/pcf/pcf.c delete mode 100644 src/3rdparty/freetype/src/pcf/pcf.h delete mode 100644 src/3rdparty/freetype/src/pcf/pcfdrivr.c delete mode 100644 src/3rdparty/freetype/src/pcf/pcfdrivr.h delete mode 100644 src/3rdparty/freetype/src/pcf/pcferror.h delete mode 100644 src/3rdparty/freetype/src/pcf/pcfread.c delete mode 100644 src/3rdparty/freetype/src/pcf/pcfread.h delete mode 100644 src/3rdparty/freetype/src/pcf/pcfutil.c delete mode 100644 src/3rdparty/freetype/src/pcf/pcfutil.h delete mode 100644 src/3rdparty/freetype/src/pcf/rules.mk delete mode 100644 src/3rdparty/freetype/src/pfr/Jamfile delete mode 100644 src/3rdparty/freetype/src/pfr/module.mk delete mode 100644 src/3rdparty/freetype/src/pfr/pfr.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrcmap.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrcmap.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrdrivr.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrdrivr.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrerror.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrgload.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrgload.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrload.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrload.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrobjs.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrobjs.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrsbit.c delete mode 100644 src/3rdparty/freetype/src/pfr/pfrsbit.h delete mode 100644 src/3rdparty/freetype/src/pfr/pfrtypes.h delete mode 100644 src/3rdparty/freetype/src/pfr/rules.mk delete mode 100644 src/3rdparty/freetype/src/psaux/Jamfile delete mode 100644 src/3rdparty/freetype/src/psaux/afmparse.c delete mode 100644 src/3rdparty/freetype/src/psaux/afmparse.h delete mode 100644 src/3rdparty/freetype/src/psaux/module.mk delete mode 100644 src/3rdparty/freetype/src/psaux/psaux.c delete mode 100644 src/3rdparty/freetype/src/psaux/psauxerr.h delete mode 100644 src/3rdparty/freetype/src/psaux/psauxmod.c delete mode 100644 src/3rdparty/freetype/src/psaux/psauxmod.h delete mode 100644 src/3rdparty/freetype/src/psaux/psconv.c delete mode 100644 src/3rdparty/freetype/src/psaux/psconv.h delete mode 100644 src/3rdparty/freetype/src/psaux/psobjs.c delete mode 100644 src/3rdparty/freetype/src/psaux/psobjs.h delete mode 100644 src/3rdparty/freetype/src/psaux/rules.mk delete mode 100644 src/3rdparty/freetype/src/psaux/t1cmap.c delete mode 100644 src/3rdparty/freetype/src/psaux/t1cmap.h delete mode 100644 src/3rdparty/freetype/src/psaux/t1decode.c delete mode 100644 src/3rdparty/freetype/src/psaux/t1decode.h delete mode 100644 src/3rdparty/freetype/src/pshinter/Jamfile delete mode 100644 src/3rdparty/freetype/src/pshinter/module.mk delete mode 100644 src/3rdparty/freetype/src/pshinter/pshalgo.c delete mode 100644 src/3rdparty/freetype/src/pshinter/pshalgo.h delete mode 100644 src/3rdparty/freetype/src/pshinter/pshglob.c delete mode 100644 src/3rdparty/freetype/src/pshinter/pshglob.h delete mode 100644 src/3rdparty/freetype/src/pshinter/pshinter.c delete mode 100644 src/3rdparty/freetype/src/pshinter/pshmod.c delete mode 100644 src/3rdparty/freetype/src/pshinter/pshmod.h delete mode 100644 src/3rdparty/freetype/src/pshinter/pshnterr.h delete mode 100644 src/3rdparty/freetype/src/pshinter/pshrec.c delete mode 100644 src/3rdparty/freetype/src/pshinter/pshrec.h delete mode 100644 src/3rdparty/freetype/src/pshinter/rules.mk delete mode 100644 src/3rdparty/freetype/src/psnames/Jamfile delete mode 100644 src/3rdparty/freetype/src/psnames/module.mk delete mode 100644 src/3rdparty/freetype/src/psnames/psmodule.c delete mode 100644 src/3rdparty/freetype/src/psnames/psmodule.h delete mode 100644 src/3rdparty/freetype/src/psnames/psnamerr.h delete mode 100644 src/3rdparty/freetype/src/psnames/psnames.c delete mode 100644 src/3rdparty/freetype/src/psnames/pstables.h delete mode 100644 src/3rdparty/freetype/src/psnames/rules.mk delete mode 100644 src/3rdparty/freetype/src/raster/Jamfile delete mode 100644 src/3rdparty/freetype/src/raster/ftmisc.h delete mode 100644 src/3rdparty/freetype/src/raster/ftraster.c delete mode 100644 src/3rdparty/freetype/src/raster/ftraster.h delete mode 100644 src/3rdparty/freetype/src/raster/ftrend1.c delete mode 100644 src/3rdparty/freetype/src/raster/ftrend1.h delete mode 100644 src/3rdparty/freetype/src/raster/module.mk delete mode 100644 src/3rdparty/freetype/src/raster/raster.c delete mode 100644 src/3rdparty/freetype/src/raster/rasterrs.h delete mode 100644 src/3rdparty/freetype/src/raster/rules.mk delete mode 100644 src/3rdparty/freetype/src/sfnt/Jamfile delete mode 100644 src/3rdparty/freetype/src/sfnt/module.mk delete mode 100644 src/3rdparty/freetype/src/sfnt/rules.mk delete mode 100644 src/3rdparty/freetype/src/sfnt/sfdriver.c delete mode 100644 src/3rdparty/freetype/src/sfnt/sfdriver.h delete mode 100644 src/3rdparty/freetype/src/sfnt/sferrors.h delete mode 100644 src/3rdparty/freetype/src/sfnt/sfnt.c delete mode 100644 src/3rdparty/freetype/src/sfnt/sfobjs.c delete mode 100644 src/3rdparty/freetype/src/sfnt/sfobjs.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttbdf.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttbdf.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttcmap.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttcmap.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttkern.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttkern.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttload.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttload.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttmtx.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttmtx.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttpost.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttpost.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttsbit.c delete mode 100644 src/3rdparty/freetype/src/sfnt/ttsbit.h delete mode 100644 src/3rdparty/freetype/src/sfnt/ttsbit0.c delete mode 100644 src/3rdparty/freetype/src/smooth/Jamfile delete mode 100644 src/3rdparty/freetype/src/smooth/ftgrays.c delete mode 100644 src/3rdparty/freetype/src/smooth/ftgrays.h delete mode 100644 src/3rdparty/freetype/src/smooth/ftsmerrs.h delete mode 100644 src/3rdparty/freetype/src/smooth/ftsmooth.c delete mode 100644 src/3rdparty/freetype/src/smooth/ftsmooth.h delete mode 100644 src/3rdparty/freetype/src/smooth/module.mk delete mode 100644 src/3rdparty/freetype/src/smooth/rules.mk delete mode 100644 src/3rdparty/freetype/src/smooth/smooth.c delete mode 100644 src/3rdparty/freetype/src/tools/Jamfile delete mode 100644 src/3rdparty/freetype/src/tools/apinames.c delete mode 100644 src/3rdparty/freetype/src/tools/cordic.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/content.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/docbeauty.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/docmaker.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/formatter.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/sources.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/tohtml.py delete mode 100644 src/3rdparty/freetype/src/tools/docmaker/utils.py delete mode 100644 src/3rdparty/freetype/src/tools/ftrandom/Makefile delete mode 100644 src/3rdparty/freetype/src/tools/ftrandom/README delete mode 100644 src/3rdparty/freetype/src/tools/ftrandom/ftrandom.c delete mode 100644 src/3rdparty/freetype/src/tools/glnames.py delete mode 100644 src/3rdparty/freetype/src/tools/test_afm.c delete mode 100644 src/3rdparty/freetype/src/tools/test_bbox.c delete mode 100644 src/3rdparty/freetype/src/tools/test_trig.c delete mode 100644 src/3rdparty/freetype/src/truetype/Jamfile delete mode 100644 src/3rdparty/freetype/src/truetype/module.mk delete mode 100644 src/3rdparty/freetype/src/truetype/rules.mk delete mode 100644 src/3rdparty/freetype/src/truetype/truetype.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttdriver.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttdriver.h delete mode 100644 src/3rdparty/freetype/src/truetype/tterrors.h delete mode 100644 src/3rdparty/freetype/src/truetype/ttgload.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttgload.h delete mode 100644 src/3rdparty/freetype/src/truetype/ttgxvar.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttgxvar.h delete mode 100644 src/3rdparty/freetype/src/truetype/ttinterp.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttinterp.h delete mode 100644 src/3rdparty/freetype/src/truetype/ttobjs.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttobjs.h delete mode 100644 src/3rdparty/freetype/src/truetype/ttpload.c delete mode 100644 src/3rdparty/freetype/src/truetype/ttpload.h delete mode 100644 src/3rdparty/freetype/src/type1/Jamfile delete mode 100644 src/3rdparty/freetype/src/type1/module.mk delete mode 100644 src/3rdparty/freetype/src/type1/rules.mk delete mode 100644 src/3rdparty/freetype/src/type1/t1afm.c delete mode 100644 src/3rdparty/freetype/src/type1/t1afm.h delete mode 100644 src/3rdparty/freetype/src/type1/t1driver.c delete mode 100644 src/3rdparty/freetype/src/type1/t1driver.h delete mode 100644 src/3rdparty/freetype/src/type1/t1errors.h delete mode 100644 src/3rdparty/freetype/src/type1/t1gload.c delete mode 100644 src/3rdparty/freetype/src/type1/t1gload.h delete mode 100644 src/3rdparty/freetype/src/type1/t1load.c delete mode 100644 src/3rdparty/freetype/src/type1/t1load.h delete mode 100644 src/3rdparty/freetype/src/type1/t1objs.c delete mode 100644 src/3rdparty/freetype/src/type1/t1objs.h delete mode 100644 src/3rdparty/freetype/src/type1/t1parse.c delete mode 100644 src/3rdparty/freetype/src/type1/t1parse.h delete mode 100644 src/3rdparty/freetype/src/type1/t1tokens.h delete mode 100644 src/3rdparty/freetype/src/type1/type1.c delete mode 100644 src/3rdparty/freetype/src/type42/Jamfile delete mode 100644 src/3rdparty/freetype/src/type42/module.mk delete mode 100644 src/3rdparty/freetype/src/type42/rules.mk delete mode 100644 src/3rdparty/freetype/src/type42/t42drivr.c delete mode 100644 src/3rdparty/freetype/src/type42/t42drivr.h delete mode 100644 src/3rdparty/freetype/src/type42/t42error.h delete mode 100644 src/3rdparty/freetype/src/type42/t42objs.c delete mode 100644 src/3rdparty/freetype/src/type42/t42objs.h delete mode 100644 src/3rdparty/freetype/src/type42/t42parse.c delete mode 100644 src/3rdparty/freetype/src/type42/t42parse.h delete mode 100644 src/3rdparty/freetype/src/type42/t42types.h delete mode 100644 src/3rdparty/freetype/src/type42/type42.c delete mode 100644 src/3rdparty/freetype/src/winfonts/Jamfile delete mode 100644 src/3rdparty/freetype/src/winfonts/fnterrs.h delete mode 100644 src/3rdparty/freetype/src/winfonts/module.mk delete mode 100644 src/3rdparty/freetype/src/winfonts/rules.mk delete mode 100644 src/3rdparty/freetype/src/winfonts/winfnt.c delete mode 100644 src/3rdparty/freetype/src/winfonts/winfnt.h delete mode 100644 src/3rdparty/freetype/version.sed delete mode 100644 src/3rdparty/freetype/vms_make.com diff --git a/src/3rdparty/freetype/ChangeLog b/src/3rdparty/freetype/ChangeLog deleted file mode 100644 index 8096136..0000000 --- a/src/3rdparty/freetype/ChangeLog +++ /dev/null @@ -1,3368 +0,0 @@ -2008-06-10 Werner Lemberg - - * Version 2.3.6 released. - ========================= - - - Tag sources with `VER-2-3-6'. - - * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump - version number to 2.3.6. - - * README, Jamfile (RefDoc), builds/win32/visualc/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualce/index.html, - builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj: s/2.3.5/2.3.6/, s/235/236/. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 6. - - * builds/unix/configure.raw (version_info): Set to 9:17:3. - - - * include/freetype/internal/psaux.h (T1_BuilderRec): Remove `scale_x' - and `scale_y'. - * src/cff/cffgload.h (CFF_Builder): Remove `scale_x' and `scale_y'. - - - * src/cff/cffparse.c: Include FT_INTERNAL_DEBUG_H. - * src/cff/cffobjs.h: Include FT_INTERNAL_POSTSCRIPT_HINTS_H. - -2008-06-10 Werner Lemberg - - * src/base/ftobjs.c (open_face): Check `clazz->init_face' and - `clazz->done_face'. - -2008-06-09 VaDiM - - Support debugging on WinCE. From Savannah patch #6536; this fixes - bug #23497. - - * builds/win32/ftdebug.c (OutputDebugStringEx): New function/macro - as a replacement for OutputDebugStringA (which WinCE doesn't have). - Update all callers. - (ft_debug_init) [_WIN32_CE]: WinCE apparently doesn't have - environment variables. - -2008-06-09 Werner Lemberg - - * README.CVS: Updated. - - * builds/unix/configure.raw, builds/unix/freetype-config.in: Updated - for newer versions of autoconf and friends. - -2008-06-08 Werner Lemberg - - * src/type1/t1parse.h (T1_ParserRec): Make `base_len' and - `private_len' unsigned. - - * src/type1/t1parse.c (read_pfb_tag): Make `asize' unsigned and read - it as such. - (T1_New_Parser, T1_Get_Private_Dict): Make `size' unsigned. - - - * src/base/ftstream.c (FT_Stream_Skip): Reject negative values. - - - * src/type1/t1load.c (parse_blend_design_positions): Check `n_axis' - for sane value. - Fix typo. - - - * src/psaux/psobjs.c (ps_table_add): Check `idx' correctly. - - - * src/truetype/ttinterp (Ins_SHC): Use BOUNDS() to check - `last_point'. - - - * src/sfnt/ttload.c (tt_face_load_max_profile): Limit - `maxTwilightPoints'. - -2008-06-06 Werner Lemberg - - * src/truetype/ttinterp.c (Ins_IP): Handle case `org_dist == 0' - correctly. This fixes glyphs `t' and `h' of Arial Narrow at 12ppem. - -2008-06-03 Werner Lemberg - - * include/freetype/ftcache.h (FTC_FaceID): Change type back to - FT_Pointer. Reported by Ian Britten . - -2008-06-02 Werner Lemberg - - Emit header info for defined FreeType objects in reference. - - * src/tools/docmaker/content.py (re_header_macro): New regexp. - (ContentProcessor::__init__): Initialize new dictionary `headers'. - (DocBlock::__init__): Collect macro header definitions. - - * src/tools/docmaker/tohtml.py (header_location_header, - header_location_footer): New strings. - (HtmlFormatter::__init__): Pass `headers' dictionary. - (HtmlFormatter::print_html_field): Don't emit paragraph tags. - (HtmlFormatter::print_html_field_list): Emit empty paragraph. - (HtmlFormatter::block_enter): Emit header info. - -2008-06-01 Werner Lemberg - - * include/freetype/config/ftheader.h (FT_UNPATENTED_HINTING_H, - FT_INCREMENTAL_H): Added. - -2008-05-28 Werner Lemberg - - * src/tools/docmaker/sources.py (SourceBlock::__init__): While - looking for markup tags, return immediately as soon a single one is - found. - -2008-05-28 Werner Lemberg - - * src/truetype/ttinterp.c (Ins_MD): The MD instruction also uses - original, unscaled input values. Confirmed by Greg Hitchcock from - Microsoft. - -2008-05-27 Werner Lemberg - - * src/tools/docmaker/tohtml.py (block_footer_start, - block_footer_middle): Beautify output. - -2008-05-25 Werner Lemberg - - * src/raster/ftraster.c (fc_black_render): Return 0 when we are - trying to render into a zero-width/height bitmap, not an error code. - - * src/truetype/ttgload.c (load_truetype_glyph): Move initialization - of the graphics state for subglyphs to... - (TT_Hint_Glyph): This function. - Hinting instructions for a composite glyph apparently refer to the - just hinted subglyphs, not the unhinted, unscaled outline. This - seems to fix Savannah bugs #20973 and (at least partially) #23310. - -2008-05-20 suzuki toshiya - - * src/base/ftmac.c (FT_New_Face_From_Suitcase): Check if valid - `aface' is returned by FT_New_Face_From_FOND(). The patch was - proposed by an anonymous reporter of Savannah bug #23204. - -2008-05-18 Werner Lemberg - - * src/pshinter/pshalgo.c (ps_hints_apply): Reset scale values after - correction for pixel boundary. Without this patch, the effect can - be cumulative under certain circumstances, making glyphs taller and - taller after each call. This fixes Savannah bug #19976. - -2008-05-18 Werner Lemberg - - * src/base/ftdebug.c (FT_Message, FT_Panic): Send output to stderr. - This fixes Savannah bug #23280. - - * docs/CHANGES: Updated. - -2008-05-18 David Turner - - * src/psnames/psmodule.c (ft_wgl_extra_unicodes, - ft_wgl_extra_glyph_names, ft_wgl_extra_glyph_name_offsets, - ps_check_wgl_name, ps_check_wgl_unicode): Use `static' to make - declarations non-global. - - * src/type1/t1load.c: Add missing comment. - -2008-05-17 Sam Hocevar - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Handle zero-contour - glyphs correctly. Patch from Savannah bug #23277. - -2008-05-16 Werner Lemberg - - * docs/CHANGES: Updated. - -2008-05-16 Sergey Tolstov - - Improve support for WGL4 encoded fonts. - - * src/psnames/psmodule.c (WGL_EXTRA_LIST_SIZE): New macro. - (ft_wgl_extra_unicodes, ft_wgl_extra_glyph_names, - ft_wgl_extra_glyph_name_offsets): New arrays. - (ps_check_wgl_name, ps_check_wgl_unicode): New functions. - (ps_unicodes_init): Use them to add additional Unicode mappings. - -2008-05-15 Werner Lemberg - - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - : `closepath' without a path is a no-op, not an error - (cf. the PS reference manual). - - Reported by Martin McBride. - -2008-05-15 Werner Lemberg - - * builds/toplevel.mk (CONFIG_GUESS, CONFIG_SUB): Updated. - -2008-05-15 Werner Lemberg - - * src/type1/t1load.c (parse_subrs): Accept fonts with a subrs array - which contains a single but empty entry. This is technically - invalid (since it must end with `return'), but... - - Reported by Martin McBride. - -2008-05-14 Werner Lemberg - - Finish fix of scaling bug of CID-keyed CFF subfonts. - - * include/freetype/internal/ftcalc.h, src/base/ftcalc.c - (FT_Matrix_Multiply_Scaled, FT_Vector_Transform_Scaled): New - functions. - - * src/cff/cffobjs.h (CFF_Internal): New struct. It is used to - provide global hinting data for both the top-font and all subfonts - (with proper scaling). - - * src/cff/cffobjs.c (cff_make_private_dict): New function, using - code from `cff_size_init'. - (cff_size_init, cff_size_done, cff_size_select, cff_size_request): - Use CFF_Internal and handle subfonts. - (cff_face_init): Handle top-dict and subfont matrices correctly; - apply some heuristic in case of unlikely matrix concatenation - results. This has been discussed with people from Adobe (thanks - goes mainly to David Lemon) who confirm that the CFF specs are fuzzy - and not correct. - - * src/cff/cffgload.h (cff_decoder_prepare): Add `size' argument. - - * src/cff/cffgload.c (cff_builder_init): Updated. - (cff_decoder_prepare): Handle hints globals for subfonts. - Update all callers. - (cff_slot_load): Handling scaling of subfonts properly. - - * src/cff/cffparse.c (cff_parse_fixed_dynamic): New function. - (cff_parse_font_matrix): Use it. - - * src/cff/cfftypes.h (CFF_FontDictRec): Make `units_per_em' - FT_ULong. - - * docs/CHANGES: Document it. - -2008-05-13 Werner Lemberg - - * src/winfonts/winfnt.c (fnt_face_get_dll_font, FNT_Face_Init): - Handle case `face_index < 0'. - * docs/CHANGES: Document it. - -2008-05-04 Werner Lemberg - - First steps to fix the scaling bug of CID-keyed CFF subfonts, - reported by Ding Li on 2008/03/28 on freetype-devel. - - * src/base/cff/cffparse.c (power_tens): New array. - (cff_parse_real): Rewritten to introduce a fourth parameter which - returns the `scaling' of the real number so that we have no - precision loss. This is not used yet. - Update all callers. - (cff_parse_fixed_thousand): Replace with... - (cff_parse_fixed_scaled): This function. Update all callers. - -2008-05-03 Werner Lemberg - - * src/base/ftobjs.c (FT_Load_Glyph): Call the auto-hinter without - transformation since it recursively calls FT_Load_Glyph. This fixes - Savannah bug #23143. - -2008-04-26 Werner Lemberg - - * include/freetype/internal/psaux.h (T1_BuilderRec): Mark `scale_x' - and `scale_y' as obsolete since they aren't used. - * src/psaux/psobjs.c (t1_builder_init): Updated. - - * src/cff/cffgload.h (CFF_Builder): Mark `scale_x' and `scale_y' as - obsolete since they aren't used. - * src/cff/cffgload.c (cff_builder_init): Updated. - -2008-04-14 Werner Lemberg - - * src/pcf/pcfdrivr.c (PCF_Face_Init): Protect call to - `FT_Stream_OpenLZW' with `FT_CONFIG_OPTION_USE_LZ'. From Savannah - bug #22909. - -2008-04-13 Werner Lemberg - - * src/psaux/psconv.c (PS_Conv_ToFixed): Increase precision if - integer part is zero. - -2008-04-01 Werner Lemberg - - Fix compilation with g++ 4.1 (with both `single' and `multi' - targets). - - * src/base/ftobjs.c (FT_Open_Face): Don't define a variable in block - which is crossed by a `goto'. - - * src/otvalid/otvalid.h (otv_MATH_validate): Add prototype. - -2008-03-31 Werner Lemberg - - Fix support for subsetted CID-keyed CFFs. - - * include/freetype/freetype.h (FT_FACE_FLAG_CID_KEYED, - FT_IS_CID_KEYED): New macros. - - * src/cff/cffobjs.c (cff_face_init): Set number of glyphs to the - maximum CID value in CID-keyed CFFs. - Handle FT_FACE_FLAG_CID_KEYED flag. - - * docs/CHANGES: Document it. - - - Fix CFF font matrix calculation and improve precision. - - * src/cff/cffparse.c (cff_parse_real): Increase precision if integer - part is zero. - (cff_parse_font_matrix): Simplify computation of `units_per_em'; - this prevents overflow also. - - - Support FT_Get_CID_Registry_Ordering_Supplement for PS CID fonts. - - * src/cid/cidriver.c: Include FT_SERVICE_CID_H. - (cid_get_ros): New function. - (cid_service_cid_info): New service structure. - (cid_services): Register it. - -2008-03-23 Werner Lemberg - - Adjustments for Visual C++ 8.0, as reported by Rainer Deyke. - - * builds/compiler/visualc.mk (CFLAGS): Remove /W5. - (ANSIFLAGS): Add _CRT_SECURE_NO_DEPRECATE. - -2008-03-21 Laurence Darby - - * src/type1/t1objs.c (T1_Face_Init): Use `/Weight'. Patch from - Savannah bug #22675. - -2008-03-13 Derek Clegg - - * src/truetype/ttgxvar.c (TT_Get_MM_Var): Fix named style loop. - Patch from Savannah bug #22541. - -2008-03-03 Masatoshi Kimura - - * src/sfnt/ttcmap.c (tt_cmap14_char_map_nondef_binary, - tt_cmap14_find_variant): Return correct value. - (tt_cmap14_variant_chars): Fix check for `di'. - -2008-02-29 Wermer Lemberg - - * docs/CHANGES: Updated. - -2008-02-29 Wolf - - Add build support for symbian platform. From Savannah bug #22440. - - * builds/symbian/*: New files. - -2008-02-21 suzuki toshiya - - * src/base/ftmac.c (parse_fond): Fix a bug of PostScript font name - synthesis. For any face of a specified FOND, always the name for - the first face was used. Except of a FOND that refers multiple - Type1 font files, wrong synthesized font names are not used at all, - so this is an invisible bug. A few limit checks are added too. - - * builds/mac/ftmac.c: Ditto. - -2008-02-21 suzuki toshiya - - * builds/unix/configure.raw: Split compiler option to link Carbon - frameworks to one option for CoreServices framework and another - option for ApplicationServices framework. The split options can be - managed by GNU libtool to avoid unrequired duplication when FreeType - is linked with other applications. Suggested by Daniel Macks, - Savannah bug #22366. - -2008-02-18 Victor Stinner - - * src/truetype/ttinterp.c (Ins_IUP): Check number of points. Fix - from Savannah bug #22356. - -2008-02-17 Jonathan Blow - - * src/autofit/afloader.c (af_loader_load_g, af_loader_load_glyph): - Check for valid callback pointers. - -2008-02-15 suzuki toshiya - - * src/base/ftmac.c (FT_New_Face_From_SFNT): Check the sfnt resource - handle by its value instead of ResError(), fix provided by Deron - Kazmaier. According to the Resource Manager Reference, - GetResource(), Get1Resource(), GetNamedResource(), - Get1NamedResource() and RGetResource() set noErr but return NULL - handle when they can not find the requested resource. These - functions never return undefined values, so it is sufficient to - check if the handle is not NULL. - - * builds/mac/ftmac.c (FT_New_Face_From_SFNT): Ditto. - -2008-02-14 suzuki toshiya - - * src/base/ftbase.c: is replaced by "ftmac.c" as other - inclusion styles. Now it always includes src/base/ftmac.c; - builds/mac/ftmac.c is never included in any configuration. - - * builds/unix/configure.raw: Print warning if configure is executed - with options to specify Carbon functionalities explicitly. - - * docs/INSTALL.MAC: Note that legacy builds/mac/ftmac.c is not - included automatically and manual replacement is required. - -2008-02-11 Werner Lemberg - - * builds/modules.mk (CLOSE_MODULE, REMOVE_MODULE), builds/detect.mk - (dos_setup), builds/freetype.mk (clean_project_dos, - distclean_project_dos): Don't use \ but $(SEP). Reported by Duncan - Murdoch. - -2008-01-18 Sylvain Pasche - - * src/base/ftlcdfil.c (_ft_lcd_filter_legacy): Updated comment to - mention intra-pixel algorithm. - - * include/freetype/freetype.h (FT_Render_Mode): Mention that - FT_Library_SetLcdFilter can be used to reduce fringes. - -2008-01-16 Werner Lemberg - - * src/raster/ftraster.c (ft_black_render): Check `outline' before - using it. Reported by Allan Yang. - -2008-01-12 Werner Lemberg - - * src/raster/ftraster.c (FT_CONFIG_OPTION_5_GRAY_LEVELS): Remove. - -2008-01-12 Allan Yang, Jian Hua - SH - - * src/raster/ftraster.c (ft_black_init) - [FT_RASTER_OPTION_ANTI_ALIASING]: Fix compilation. - -2008-01-10 Werner Lemberg - - * src/truetype/ttgload.c (load_truetype_glyph): Handle the case - where the number of contours in a simple glyph is zero (and which - does contain an entry in the `glyf' table). This fixes Savannah bug - #21990. - -2008-01-04 suzuki toshiya - - Formatting suggested by Sean McBride. - - * builds/mac/ftmac.c: Formatting (tab expanded). - * src/autofit/afindic.c: Ditto. - * src/base/ftcid.c: Ditto. - * src/base/ftmac.c: Ditto. - -2007-12-30 Werner Lemberg - - * src/smooth/ftgrays.c (gray_raster_render): Check `outline' - correctly. - -2007-12-21 suzuki toshiya - - Improvement of POSIX resource-fork accessor to load unsorted - references in a resource. In HelveLTMM (resource-fork PostScript - Type1 font bundled with Mac OS X since 10.3.x), the appearance order - of PFB chunks is not sorted; sorting the chunks by reference IDs is - required. - - * include/freetype/internal/ftrfork.h (FT_RFork_Ref): New structure - type to store a pair of reference ID and offset to the chunk. - - * src/base/ftrfork.c (ft_raccess_sort_ref_by_id): New function to - sort FT_RFork_Ref by their reference IDs. - - (FT_Raccess_Get_DataOffsets): Returns an array of offsets that is - sorted by reference ID. - -2007-12-14 Werner Lemberg - - * src/cff/cffparse.c (cff_parse_real): Don't apply `power_ten' - division too early; otherwise the most significant digit(s) of the - final result are lost as the value is truncated to an integer. This - fixes Savannah bug #21794 (where the patch has been posted too). - -2007-12-06 Fix <4d876b82@gmail.com> - - Pass options from one configure script to another as-is (not - expanded). This is needed for options like - --includedir='${prefix}/include'. - - * builds/unix/detect.mk, configure: Prevent argument expansion in - call to the (real) `configure' script. - -2007-12-06 Werner Lemberg - - * src/truetype/ttgload.c (load_truetype_glyph): Fix compilation if - TT_USE_BYTECODE_INTERPRETER isn't defined. - -2007-12-06 Werner Lemberg - - There exist CFFs which contain opcodes for the Type 1 operators - `hsbw' and `closepath' which are both invalid in Type 2 charstrings. - However, it doesn't harm to support them. - - * src/cff/cffgload.c (CFF_Operator): Add `cff_op_hsbw' and - `cff_op_closepath.' - (cff_argument_counts): Ditto. - - (cff_decoder_parse_charstrings): Handle Type 1 opcodes 9 (closepath) - and 13 (hsbw) which are invalid in Type 2 charstrings. - -2007-12-06 suzuki toshiya - - * src/base/ftrfork.c (raccess_guess_darwin_newvfs): New function to - support new pathname syntax `..namedfork/rsrc' to access a resource - fork on Mac OS X. The legacy syntax `/rsrc' does not work on - case-sensitive HFS+. - (raccess_guess_darwin_hfsplus): Fix a bug in the calculation of - buffer size to store a pathname. - * include/freetype/internal/ftrfork.h: Increment the number of - resource fork guessing rule. - -2007-12-06 suzuki toshiya - - * builds/unix/configure.raw: Improve the compile tests to search - Carbon functions. - * builds/mac/ftmac.c: Import fixes for Carbon incompatibilities - proposed by Sean McBride from src/base/ftmac.c (see 2007-11-16). - -2007-12-06 suzuki toshiya - - The documents and comments for Mac OS X are improved by Sean - McBride. - - * src/base/ftmac.c: Fix a comment. - * include/freetype/ftmac.h: Ditto. - * docs/INSTALL.MAC: Improve English and add comment on lowest - system version specified by MACOSX_DEPLOYMENT_TARGET. - -2007-12-04 Werner Lemberg - - * src/cff/cffload.c (cff_subfont_load): Don't use logical OR to - concatenate error codes. - * src/sfnt/ttsbit.c (Load_SBit_Range): Ditto. - -2007-12-04 Graham Asher - - * src/truetype/ttobjs.c (tt_face_init): Don't use logical OR to - concatenate error codes. - -2007-12-04 Sean McBride - - * src/pfr/pfrgload.c (pfr_glyph_load_compound): Remove compiler - warning. - -2007-11-20 suzuki toshiya - - Fix MacOS legacy font support by Masatake Yamato on Mac OS X. It is - not working since 2.3.5. In FT_Open_New(), if FT_New_Stream() - cannot mmap() the specified file and cannot seek to head of the - specified file, it returns NULL stream and FT_Open_New() returns the - error immediately. On MacOS, most legacy MacOS fonts fall into such - a scenario because their data forks are zero-sized and cannot be - sought. To proceed to guessing of resource fork fonts, the - functions for legacy MacOS font must properly handle the NULL stream - returned by FT_New_Stream(). - - * src/base/ftobjs.c (IsMacBinary): Return error - FT_Err_Invalid_Stream_Operation immediately when NULL stream is - passed. - (FT_Open_Face): Even when FT_New_Stream() returns an error, proceed - to fallback. Originally, legacy MacOS font is tested in the cases - of FT_Err_Invalid_Stream_Operation (occurs when data fork is empty) - or FT_Err_Unknown_File_Format (occurs when AppleSingle header or - .dfont header is combined). Now the case of - FT_Err_Cannot_Open_Stream is included. - - * src/base/ftrfork.c (FT_Raccess_Guess): When passed stream is NULL, - skip FT_Stream_Seek(), which seeks to the head of stream, and - proceed to unit testing of raccess_guess_XXX(). FT_Stream_Seek() - for a NULL stream causes a Bus error on Mac OS X. - (raccess_guess_apple_double): Return FT_Err_Cannot_Open_Stream - immediately if passed stream is NULL. - (raccess_guess_apple_single): Ditto. - -2007-11-16 suzuki toshiya - - Fix for Carbon incompatibilities since Mac OS X 10.5, - proposed by Sean McBride. - - * doc/INSTALL.MAC: Comment on MACOSX_DEPLOYMENT_TARGET. - - * include/freetype/ftmac.h: Deprecate FT_New_Face_From_FOND and - FT_GetFilePath_From_Mac_ATS_Name. Since Mac OS X 10.5, calling - Carbon functions from a forked process is classified as unsafe - by Apple. All Carbon-dependent functions should be deprecated. - - * src/base/ftmac.c: Use essential header files - and instead of - all-in-one header file . - - Include and replace HFS_MAXPATHLEN by Apple - genuine macro PATH_MAX. - - Add fallback macro for kATSOptionFlagsUnRestrictedScope which - is not found in Mac OS X 10.0. - - Multi-character constants ('POST', 'sfnt' etc) are replaced by - 64bit constants calculated by FT_MAKE_TAG() macro. - - For the index in the segment of resource fork, new portable - type ResourceIndex is introduced for better compatibility. - This type is since Mac OS X 10.5, so it is defined as short - when built on older platforms. - - (FT_ATSFontGetFileReference): If build target is only the systems - 10.5 and newer, it calls Apple genuine ATSFontGetFileReference(). - - (FT_GetFile_From_Mac_ATS_Name): Return an error if system is 10.5 - and newer or 64bit platform, because legacy type FSSpec type is - removed completely. - - (FT_New_Face_From_FSSpec): Ditto. - -2007-11-01 Werner Lemberg - - * src/sfnt/sfobjs.c (sfnt_done_face): Check `sfnt' everywhere. This - fixes Savannah bug #21485. - -2007-10-29 Daniel Svoboda - - * src/winfonts/winfnt.c (FNT_Face_Init): Check first that the driver - can handle the font at all, then check `face_index'. Otherwise, the - driver might return the wrong error code. This fixes Savannah bug - #21468. - -2007-10-21 Werner Lemberg - - * src/sfnt/sfobjs.c (sfnt_load_face): Support bit 9 and prepare - support for bit 8 of the `fsSelection' field in the `OS/2' table. - MS is already using this; hopefully, this becomes part of OpenType - 1.5. - Prepare also support for `name' IDs 21 (WWS_FAMILY) and 22 - (WWS_SUBFAMILY). - -2007-10-20 Werner Lemberg - - * src/tools/docmaker/tohtml.py (html_header_2): Fix typo. - Add `td.left' element to CSS. - (toc_section_enter): Use it. - -2007-10-18 David Turner - - * include/freetype/freetype.h, src/base/ftobjs.c: Rename API - functions related to cmap type 14 support to the - `FT_Object_ActionName' scheme: - - FT_Get_Char_Variant_index -> FT_Face_GetCharVariantIndex - FT_Get_Char_Variant_IsDefault -> FT_Face_GetCharVariantIsDefault - FT_Get_Variant_Selectors -> FT_Face_GetVariantSelectors - FT_Get_Variants_Of_Char -> FT_Face_GetVariantsOfChar - FT_Get_Chars_Of_Variant -> FT_Face_GetCharsOfVariant - - Update documentation accordingly. - - * src/sfnt/ttcmap.c: Stronger cmap 14 validation. - Make the code a little more consistent with FreeType coding - conventions and modify the cmap14 functions that returned a newly - allocated array to use a persistent vector from the TT_CMap14 object - instead. - - (TT_CMap14Rec): Provide array and auxiliary data for result. - (tt_cmap14_done, tt_cmap14_ensure): New functions. - - (tt_cmap14_init, tt_cmap14_validate, tt_cmap14_char_map_def_binary, - tt_cmap14_char_map_nondef_binary, tt_cmap14_find_variant, - tt_cmap14_char_var_index, tt_cmap14_variants, - tt_cmap14_char_variants, tt_cmap14_def_char_count, - tt_cmap14_get_def_chars, tt_cmap14_get_nondef_chars, - tt_cmap14_variant_chars, tt_cmap14_class_rec): Updated and improved. - -2007-10-15 George Williams - - Add support for cmap type 14. - - * devel/ftoption.h, include/freetype/config/ftoption.h - (TT_CONFIG_CMAP_FORMAT_14): New macro. - - * include/freetype/internal/ftobjs.h (FT_CMap_CharVarIndexFunc, - FT_CMap_CharVarIsDefaultFunc, FT_CMap_VariantListFunc, - FT_CMap_CharVariantListFunc, FT_CMap_VariantCharListFunc): New - support function prototypes. - (FT_CMap_ClassRec): Add them. - Update all users. - - * include/freetype/ttnameid.h (TT_APPLE_ID_VARIANT_SELECTOR): New - macro. - - * include/freetype/freetype.h (FT_Get_Char_Variant_Index, - FT_Get_Char_Variant_IsDefault, FT_Get_Variant_Selectors, - FT_Get_Variants_Of_Char, FT_Get_Chars_Of_Variant): New API - functions. - - * src/base/ftobjs.c (find_variant_selector_charmap): New auxiliary - function. - (FT_Set_Charmap): Disallow cmaps of type 14. - (FT_Get_Char_Variant_Index, FT_Get_Char_Variant_IsDefault, - FT_Get_Variant_Selectors, FT_Get_Variants_Of_Char, - FT_Get_Chars_Of_Variant): New API functions. - - * src/sfnt/ttcmap.c (TT_PEEK_UINT24, TT_NEXT_UINT24): New macros. - - (TT_CMap14Rec, tt_cmap14_init, tt_cmap14_validate, - tt_cmap14_char_index, tt_cmap14_char_next, tt_cmap14_get_info, - tt_cmap14_char_map_def_binary, tt_cmap14_char_map_nondef_binary, - tt_cmap14_find_variant, tt_cmap14_char_var_index, - tt_cmap14_char_var_isdefault, tt_cmap14_variants, - tt_cmap14_char_variants, tt_cmap14_def_char_count, - tt_cmap14_get_def_chars, tt_cmap14_get_nondef_chars, - tt_cmap14_variant_chars, tt_cmap14_class_rec): New functions and - structures for cmap 14 support. - (tt_cmap_classes): Register tt_cmap14_class_rec. - (tt_face_build_cmaps): One more error message. - - * docs/CHANGES: Mention cmap 14 support. - -2007-10-01 Werner Lemberg - - * src/base/ftobjs.c (find_unicode_charmap): If search for a UCS-4 - charmap fails, do the loop again while searching a UCS-2 charmap. - This favours MS charmaps over Apple ones. - -2007-08-29 suzuki toshiya - - * src/base/ftmac.c: Introduction of abstract `short' data types, - ResFileRefNum and ResID. These types were introduced for Copland, - then backported to MPW. The variables exchanged with FileManager - QuickDraw frameworks are redefined by these data types. Patch was - proposed by Sean McBride. - * builds/mac/ftmac.c: Ditto. - -2007-08-18 Werner Lemberg - - * src/otvalid/otvcmmn.c (otv_x_y_ux_sy): Skip context glyphs. Found - by Imran Yousaf. Fixes Savannah bug #20773. - - (otv_Lookup_validate): Correct handling of LookupType. Found by - Imran Yousaf. Fixes Savannah bug #20782. - -2007-08-17 George Williams - - * src/otvalid/otvgsub.c (otv_SingleSubst_validate): Fix handling of - SingleSubstFormat1. - -2007-08-11 suzuki toshiya - - * builds/unix/configure.raw: Fix a bug which sets CC_BUILD by - ${build-gcc} (unchecked) instead of by ${build}-gcc (checked). - Found by Ryan Hill. - -2007-08-11 George Williams - - * src/otvalid/otvcommn.c, src/otvalid/otvcommn.h - (otv_Coverage_validate): Add fourth argument to pass an expected - count value. Update all users. - Check glyph IDs. - (otv_ClassDef_validate): Check `StartGlyph'. - - * src/otvalid/otvgsub.c (otv_SingleSubst_validate): More glyph ID - checks. - - * src/otvalid/otvmath.c (otv_MathConstants_validate): There are only - 56 constants. - (otv_GlyphAssembly_validate, otv_MathGlyphConstruction_validate): - Check glyph IDs. - -2007-08-08 Werner Lemberg - - * src/otvalid/otvbase.c, src/otvalid/otvcommn.c, - src/otvalid/otvgdef.c, src/otvalid/otvgpos.c, src/otvalid/otvgsub.c, - src/otvalid/otvjstf.c: s/FT_INVALID_DATA/FT_INVALID_FORMAT/ where - appropriate. Reported by George. - - * include/freetype/internal/fttrace.h: Define `trace_otvmath'. - - * src/otvalid/rules.mk (OTV_DRV_SRC): Add otvmath.c. - - * docs/CHANGES: Updated. - -2007-08-08 George Williams - - Add `MATH' validating support to otvalid module. - - * include/freetype/tttags.h (TTAG_MATH): New macro. - * include/freetype/ftotval.h (FT_VALIDATE_MATH): New macro. - (FT_VALIDATE_OT): Updated. - - * src/otvalid/otmath.c: New file. - - * src/otvalid/otvalid.c: Include otvmath.c. - * src/otvalid/otvmod.c (otv_validate): Handle `MATH' table. - -2007-08-04 Werner Lemberg - - * builds/unix/configure.raw: Add call to AC_LIBTOOL_WIN32_DLL. - Fixes Savannah bug #20686. - -2007-08-03 Werner Lemberg - - * src/psnames/psmodule.c: Fix usage of - FT_CONFIG_OPTION_POSTSCRIPT_NAMES macro. Reported by Graham Asher. - -2007-07-31 suzuki toshiya - - * src/base/ftmac.c (open_face_from_buffer): The argument - `driver_name' is typed as `const char*' to match with the - callers in FT_New_Face_From_LWFN and FT_New_Face_From_SFNT. - This is same with open_face_from_buffer in src/base/ftobjs.c. - Found and fixed by Sean McBride. - -2007-07-28 Werner Lemberg - - * src/raster/ftraster.c (count_table): Make it conditional. - * src/base/ftobjs.c (FT_New_Library): Check FT_RENDER_POOL_SIZE with - a preprocessor statement. - -2007-07-27 Werner Lemberg - - * src/base/ftoutln.c (FT_Outline_Translate): Check `outline' before - first usage. From Savannah patch #6115. - -2007-07-16 Werner Lemberg - - * docs/CHANGES: Updated. - -2007-07-16 Derek Clegg - - Add new service for getting the ROS from a CID font. - - * include/freetype/config/ftheader.h (FT_CID_H): New macro. - * include/freetype/ftcid.h: New file. - - * include/freetype/internal/ftserv.h (FT_SERVIVE_CID_H): New macro. - * include/freetype/internal/services/svcid.h: New file. - - * src/base/ftcid.c: New file. - - * src/cff/cffdrivr.c: Include FT_SERVICE_CID_H. - (cff_get_ros): New function. - (cff_service_cid_info): New service structure. - (cff_services): Register it. - - * src/cff/cffload.c (cff_font_done): Free registry and ordering. - - * src/cff/cfftypes.h (CFF_FontRec): Add `registry' and `ordering'. - - * modules.cfg (BASE_EXTENSIONS): Add ftcid.c. - -2007-07-11 Derek Clegg - - Add support for postscript name service to CFF driver. - - * src/cff/cffdrivr.c: Include FT_SERVICE_POSTSCRIPT_NAME_H. - (cff_get_ps_name): New function. - (cff_service_ps_name): New service structure. - (cff_services): Register it. - -2007-07-07 Werner Lemberg - - * src/base/ftglyph.c (FT_Glyph_Copy): Fix initialization of - `target'. Reported by Sean McBride. - -2007-07-06 Werner Lemberg - - * src/pfr/pfrcmap.c: Include pfrerror.h. - - * src/autofit/afindic.c: Add some external declarations to pacify - `make multi' compilation. - - * src/cid/cidgload.c (cid_load_glyph): Pacify compiler. - - * src/cff/cffdrivr.c (cff_ps_get_font_info), src/cff/cffobjs.c - (cff_strcpy), include/freetype/internal/ftmemory.h (FT_MEM_STRDUP), - src/autofit/aflatin.c (af_latin_hints_compute_edges), - src/autofit/afcjk.c (af_cjk_hints_compute_edges), src/sfnt/ttmtx.c - (tt_face_get_metrics), src/base/ftobjs.c (open_face) - [FT_CONFIG_OPTION_INCREMENTAL]: Fix compilation with C++ compiler. - - * docs/release: Mention test compilation targets. - -2007-07-04 Werner Lemberg - - * docs/PROBLEMS: Mention that some PS based fonts can't be - handled correctly by FreeType. - - * src/truetype/ttgload.c (load_truetype_glyph): Always allow a - recursion depth of 1. This was the maximum value in TrueType 1.0, - and some older fonts don't set this field correctly. - - * src/gxvalid/gxvmort1.c - (gxv_mort_subtable_type1_substTable_validate): Fix tracing message. - -2007-07-03 Werner Lemberg - - * src/autofit/aflatin.c (af_latin_metrics_init_blues): Initialize - `round' to pacify compiler. - -2007-07-02 Werner Lemberg - - - * Version 2.3.5 released. - ========================= - - - Tag sources with `VER-2-3-5'. - - * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump - version number to 2.3.5. - - * README, Jamfile (RefDoc), builds/win32/visualc/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, - builds/win32/visualce/index.html, - builds/win32/visualce/freetype.dsp, - builds/win32/visualce/freetype.vcproj: s/2.3.4/2.3.5/, s/234/235/. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 5. - - * builds/unix/configure.raw (version_info): Set to 9:16:3. - -2007-07-01 David Turner - - * include/freetype/freetype.h, src/base/ftpatent.c - (FT_Face_SetUnpatentedHinting): New function to dynamically change - the setting after a face is created. - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Fix a small bug - that created distortions in the bytecode interpreter results. - -2007-06-30 David Turner - - * src/truetype/ttinterp.c (Ins_IUP): Add missing variable - initialization. - - * src/autofit/aflatin.c (af_latin_metric_init_blues): Get rid of an - infinite loop in the case of degenerate fonts. - -2007-06-26 Rahul Bhalerao - - Add autofit module for Indic scripts. This currently just reuses - the CJK-specific functions. - - * include/freetype/config/ftoption.h (AF_CONFIG_OPTION_INDIC): New - macro. - * devel/ftoption.h: Synchronize with - include/freetype/config/ftoption.h. - - * src/autofit/afindic.c, src/autofit/afindic.h: New files. - - * src/autofit/afglobal.c, src/autofit/aftypes.h, - src/autofit/autofit.c: Updated. - - * src/autofit/Jamfile (_sources), * src/autofit/rules.mk - (AUTOF_DRV_SRC): Updated. - -2007-06-23 David Turner - - * src/truetype/ttgload.c (TT_Load_Simple): Fix change from - 2007-06-16 that prevented the TrueType module from loading most - glyphs. - -2007-06-20 Werner Lemberg - - * src/cff/cffgload.c (cff_slot_load): Fix logic of 2007-05-28 - change. - -2007-06-19 Werner Lemberg - - * src/type1/t1load.c (parse_encoding): Handle one more error. - -2007-06-19 Dmitry Timoshkov - - * src/winfonts/winfnt.c (fnt_face_get_dll_font): Return error - FNT_Err_Invalid_File_Format if file format was recognized but - the file doesn't contain any FNT(NE) or RT_FONT(PE) resources. - Add verbose debug logs to make it easier to debug failing load - attempts. - (FNT_Face_Init): A single FNT font can't contain more than 1 face, - so return an error if requested face index is > 0. - Do not do further attempt to load fonts if a previous attempt has - failed but returned error FNT_Err_Invalid_File_Format, i.e., the - file format has been recognized but no fonts found in the file. - -2007-07-19 suzuki toshiya - - * src/base/ftmac.c: Apply patches proposed by Sean McBride. - (FT_GetFile_From_Mac_Name): Insert FT_UNUSED macros to fix - the compiler warnings against unused arguments. - (FT_ATSFontGetFileReference): Ditto. - (FT_GetFile_From_Mac_ATS_Name): Ditto. - (FT_New_Face_From_FSSpec): Ditto. - (lookup_lwfn_by_fond): Fix wrong comment. - Replace `const StringPtr' by more appropriate type - `ConstStr255Param'. - FSRefMakePathPath always returns UTF8 POSIX pathname in - Mach-O, thus HFS pathname support is dropped. - (count_faces): Remove HLock and HUnlock which is not - required on Mac OS X anymore. - (FT_New_Face_From_SFNT): Ditto. - (FT_New_Face_From_FOND): Ditto. - * builds/mac/ftmac.c: Synchronize to src/base/ftmac.c, - except of HFS pathname support and HLock/HUnlock. - They are required on classic CFM environment. - -2007-06-18 Werner Lemberg - - * src/psaux/psobjs.c (ps_parser_skip_PS_token): Remove incorrect - assertion. - (ps_parser_to_bytes): Fix error message. - - * src/type42/t42objs.c (T42_Open_Face): Handle one more error. - * src/type42/t42parse.c (t42_parse_sfnts): s/alloc/allocated/. - Don't allow mixed binary and hex strings. - Handle string_size == 0 and string_buf == 0. - (t42_parse_encoding): Handle one more error. - -2007-06-18 Werner Lemberg - - * src/psaux/psobjs.c (ps_tofixedarray, ps_tocoordarray): Fix exit - logic. - (ps_parser_load_field) : Skip delimiters - correctly. - (ps_parser_load_field_table): Use `fields->array_max' instead of - T1_MAX_TABLE_ELEMENTS to limit the number of arguments. - - * src/cff/cffgload.c (cff_decoder_prepare): Fix change from - 2007-06-06. - -2007-06-17 Werner Lemberg - - * src/tools/ftrandom.c (font_size): New global variable. - (TestFace): Use it. - (main): Handle new option `--size' to set `font_size'. - (Usage): Updated. - - * src/winfonts/winfnt.c (fnt_face_get_dll_font): Exit in case of - invalid font. - (FNT_Load_Glyph): Protect against invalid bitmap width. - -2007-06-16 David Turner - - * src/smooth/ftgrays.c (gray_find_cell, gray_set_cell, gray_hline): - Prevent integer overflows when rendering very large outlines. - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check the - well-formedness of the contours array when loading a glyph. - - * src/truetype/ttinterp.c (TT_Load_Context): Initialize `zp0', `zp1', - and `zp2'. - (Ins_IP): Check argument ranges to reject bogus operations properly. - (IUP_WorkerRec): Add `max_points' member. - (_iup_worker_interpolate): Check argument ranges. - (Ins_IUP): Ignore empty outlines. - -2007-06-16 Dmitry Timoshkov - - * src/winfonts/winfnt.h: Add necessary structures for PE resource - parsing. - (WinPE32_HeaderRec): New structure. - (WinPE32_SectionRec): New structure. - (WinPE_RsrcDirRec): New structure. - (WinPE_RsrcDirEntryRec): New structure. - (WinPE_RsrcDataEntryRec): New structure. - (FNT_FontRec): Remove unused `size_shift' field. - - * src/winfonts/winfnt.c (fnt_face_get_dll_font): Add support for - loading bitmap .fon files in PE format. - -2007-06-15 Dmitry Timoshkov - - * builds/win32/ftdebug.c: Unify debug level handling with other - platforms. - -2007-06-14 Dmitry Timoshkov - - * builds/win32/ftdebug.c (FT_Message): Send debug output to the - console as well as to the debugger. - -2007-06-14 Werner Lemberg - - * src/autofit/aflatin.c (af_latin_uniranges): Expand structure to - cover all ranges which could possibly be handled by the aflatin - module (since the default fallback for unknown ranges is now the - afcjk module). It might be necessary to fine-tune this further by - splitting off modules for Greek, Cyrillic, or other blocks. - -2007-06-11 David Turner - - * src/autofit/aflatin.c (af_latin_hints_link_segments): Fix - incorrect segment linking computation. This was the root cause of - Savannah bug #19565. - - - * src/autofit/* [FT_OPTION_AUTOFIT2]: Some very experimental changes - to improve the Latin auto-hinter. Note that the new code is - disabled by default since it is not stabilized yet. - - * src/autofit/aflatin2.c, src/autofit/aflatin2.h: New files - (disabled currently). - - * src/autofit/afhints.c: Remove dead code. - (af_axis_hints_new_edge): Add argument to handle segment directions. - (af_edge_flags_to_string): New function. - (af_glyph_hints_dump_segments, af_glyph_hints_dump_edges): Handle - option flags. - (af_glyph_hints_reload): Add argument to handle inflections. - Simplify. - (af_direction_compute): Fine tuning. - (af_glyph_hints_align_edge_points): Fix logic. - (af_glyph_hints_align_strong_points): Do linear search for small - edge counts. - (af_glyph_hints_align_weak_points): Skip any touched neighbors. - (af_iup_shift): Handle zero `delta'. - - * src/autofit/afhints.h: Updated. - (AF_SORT_SEGMENTS): New macro (disabled). - (AF_AxisHintsRec) [AF_SORT_SEGMENTS]: New member `mid_segments'. - - * src/autofit/afglobal.c (af_face_globals_get_metrics): Add - argument to pass option flags for handling scripts. - * src/autofit/afglobal.h: Updated. - - * src/autofit/afcjk.c: Updated. - * src/autofit/aflatin.c: Updated. - (af_latin_metrics_scale_dim): Don't reduce scale by 2%. - - (af_latin_hints_compute_segments) [AF_HINT_METRICS]: Remove dead code. - (af_latin_hints_compute_edges) [AF_HINT_METRICS]: Remove dead code. - Don't set `edge->dir' - (af_latin_hint_edges): Add more logging. - - * src/autofit/afloader.c: Updated. - -2007-06-11 Werner Lemberg - - * docs/CHANGES: Document FT_Face_CheckTrueTypePatents. - -2007-06-10 David Turner - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Slight speed-up to - the TrueType glyph loader. - - * include/freetype/config/ftoption.h: Clarify documentation - regarding unpatented hinting. - - - Add new `FT_Face_CheckTrueTypePatents' API. - - * include/freetype/freetype.h (FT_Face_CheckTrueTypePatents): New - declaration. - - * include/freetype/internal/services/svttglyf.h, - src/base/ftpatent.c: New files. - - * include/freetype/internal/ftserv.h (FT_SERVICE_TRUETYPE_GLYF_H): - New macro. - - * src/truetype/ttdriver.c: Include FT_SERVICE_TRUETYPE_GLYF_H and - `ttpload.h'. - (tt_service_truetype_glyf): New service structure. - (tt_services): Register it. - - * modules.cfg (BASE_EXTENSIONS), src/base/Jamfile (_sources): Add - `ftpatent.c'. - -2007-06-08 Werner Lemberg - - * src/sfnt/sfobjs.c (sfnt_load_face): Undo change from 2007-04-28. - Fonts without a cmap must be handled correctly by FreeType (anything - else would be a bug). - - - * src/psaux/t1decode.c (t1_decoder_parse_charstrings) - [FT_DEBUG_LEVEL_TRACE]: Improve tracing message. - -2007-06-07 Werner Lemberg - - * src/sfnt/ttsbit0.c (tt_sbit_decoder_init, - tt_sbit_decoder_load_image): Protect against integer overflows. - - - * src/pfr/pfrgload.c (pfr_glyph_load_simple): More bounding checks - for `x_control' and `y_control'. - -2007-06-06 Werner Lemberg - - * src/base/ftoutln.c (FT_Outline_Decompose): Check `last'. - - - * src/pfr/pfrcmap.c (pfr_cmap_init): Convert assertion into normal - FreeType error. - - - * src/winfonts/winfnt.c (fnt_face_get_dll_font): Do a rough check of - `font_count'. - - - * src/type1/t1load.c (parse_font_matrix): Check `temp_scale'. - - - * src/cff/cffgload.c (cff_decoder_prepare): Change return type to - `FT_Error'. - Check `fd_index'. - (cff_slot_load): Updated. - * src/cff/cffgload.h: Updated. - -2007-06-05 Werner Lemberg - - * src/pfr/pfrgload.c (pfr_glyph_done): Comment out unused code. - (pfr_glyph_load_simple): Convert assertion into normal FreeType - error. - Check `idx'. - (pfr_glyph_load_compound, pfr_glyph_curve_to, pfr_glyph_line_to): - Convert assertion into normal FreeType error. - - * src/pfr/pfrtypes.h (PFR_GlyphRec): Comment out unused code. - - - * src/winfonts/winfnt.c (FNT_Face_Init): Check `family_size'. - - - * src/psaux/psobjs.c (ps_tocoordarray, ps_tofixedarray): Return -1 - in case of parsing error. - (ps_parser_load_field): Updated. - - * src/type1/t1load.c (parse_font_matrix): Updated. - -2007-06-04 Werner Lemberg - - * src/cid/cidgload.c (cid_load_glyph): Check `fd_select'. - - * src/tools/ftrandom/Makefile: Depend on `libfreetype.a'. - -2007-06-03 Werner Lemberg - - * src/tools/ftrandom/*: Add the `ftrandom' test program written by - George Williams (with some modifications). - -2007-06-03 Werner Lemberg - - * src/base/ftobjs.c (destroy_charmaps), src/type1/t1objs.c - (T1_Face_Done), src/winfonts/winfnt.c (FNT_Face_Done): Check for - face == NULL. Suggested by Graham Asher. - -2007-06-03 Ismail Dönmez - - * src/base/ftobjs.c (FT_Request_Metrics): Fix compiler warning. - -2007-06-02 Werner Lemberg - - * include/freetype/fterrdef.h (FT_Err_Corrupted_Font_Header, - FT_Err_Corrupted_Font_Glyphs): New error codes for BDF files. - - * src/bdf/bdflib.c (bdf_load_font): Use them. - - * src/bdf/bdflib.c (_bdf_parse_start): Check `FONT' better. - -2007-06-01 Werner Lemberg - - * src/base/ftobjs.c (FT_Request_Metrics), src/cache/ftccmap.c - (FTC_CMapCache_Lookup): Remove unused code. - -2007-06-01 Sean McBride - - * src/truetype/ttinterp.c (Null_Vector, NULL_Vector): Removed, - unused. - -2007-06-01 Werner Lemberg - - * src/cid/cidparse.c (cid_parser_new): Don't continue second search - pass for `StartData' if an error has occurred. - Exit properly if no `StartData' has been seen at all. - - * builds/unix/ftsystem.c (FT_Stream_Open): Don't use ULONG_MAX but - LONG_MAX to avoid compiler warning. Suggested by Sean McBride. - -2007-05-30 Werner Lemberg - - * src/type1/t1load.c (parse_subrs, parse_charstrings): Protect - against too small binary data strings. - - * src/bdf/bdflib.c (_bdf_parse_glyphs): Check `STARTCHAR' better. - -2007-05-28 David Turner - - * src/cff/cffgload.c (cff_slot_load): Do not apply the identity - transformation. This significantly reduces the loading time of CFF - glyphs. - - * docs/CHANGES: Updated. - - * src/autofit/afglobal.c (AF_SCRIPT_LIST_DEFAULT): Change default - hinting script to CJK, since it works well with more scripts than - latin. Thanks to Rahul Bhalerao for pointing - this out! - -2007-05-25 Werner Lemberg - - * docs/CHANGES: Updated. - -2007-05-24 Werner Lemberg - - * src/truetype/ttobjs.h (tt_size_ready_bytecode): Move declaration - into TT_USE_BYTECODE_INTERPRETER preprocessor block. - -2007-05-24 Graham Asher - - * src/truetype/ttobjs.c (tt_size_ready_bytecode) - [!TT_USE_BYTECODE_INTERPRETER]: Removed. Unused. - -2007-05-22 David Turner - - * src/truetype/ttgload.c (load_truetype_glyph): Fix last change to - avoid crashes in case the bytecode interpreter is not used. - - - Avoid heap blowup with very large .Z font files. This fixes - Savannah bug #19910. - - * src/lzw/ftzopen.h (FT_LzwStateRec): Remove `in_cursor', - `in_limit', `pad', `pad_bits', and `in_buff' members. - Add `buf_tab', `buf_offset', `buf_size', `buf_clear', and - `buf_total' members. - - * src/lzw/ftzopen.c (ft_lzwstate_get_code): Rewritten. It now takes - only one argument. - (ft_lzwstate_refill, ft_lzwstate_reset, ft_lzwstate_io): Updated. - -2007-05-20 Ismail Dönmez - - * src/pshinter/pshrec.c (ps_mask_table_set_bits): Add `const'. - (ps_dimension_set_mask_bits): Remove `const'. - -2007-05-19 Werner Lemberg - - * src/sfnt/ttmtx.c (tt_face_get_metrics) - [!FT_CONFIG_OPTION_OLD_INTERNALS]: Another type-punning fix. - -2007-05-19 Derek Clegg - - Savannah patch #5929. - - * include/freetype/tttables.h, src/base/ftobjcs.c - (FT_Get_CMap_Format): New function. - - * include/freetype/internal/services/svttcmap.c (TT_CMapInfo): Add - `format' member. - * src/sfnt/ttcmap.c (tt_cmap{0,2,4,6,8,10,12}_get_info): Set - cmap_info->format. - -2007-05-19 Werner Lemberg - - * src/truetype/ttgload.c (load_truetype_glyph): Save graphics state - before handling subglyphs so that it can be reinitialized each time. - This fixes Savannah bug #19859. - -2007-05-16 Werner Lemberg - - * src/cache/ftccache.c (ftc_node_mru_link, ftc_node_mru_unlink), - src/cache/ftccache.h (FTC_CACHE_LOOKUP_CMP), src/cache/ftcglyph.h - (FTC_GCACHE_LOOKUP_CMP), src/pshinter/pshmod.c (ps_hinter_init), - src/sfnt/ttmtx.c (tt_face_load_hmtx, tt_face_load_hhea, - tt_face_get_metrics): Fix type-punning issues. - -2007-05-15 David Turner - - * include/freetype/config/ftstdlib.h, - include/freetype/internal/ftobjs.h: As suggested by Graham Asher, - ensure that ft_isalnum, ft_isdigit, etc., use hard-coded values - instead on relying on the locale-dependent functions provided by - . - -2007-05-15 Graham Asher - - * src/autofit/afcjk.c (af_cjk_hints_compute_edges): Remove unused - variable. - * src/autofit/afloader.c (af_loader_load_g): Ditto. - - * src/base/ftobjs.c (ft_validator_error): Use `ft_jmp_buf'. - (open_face_from_buffer): Initialize `stream'. - (FT_Request_Metrics): Remove unused variable. - Remove redundant `break' statements. - (FT_Get_Track_Kerning): Remove unused variable. - - * src/psaux/afmparse.c (afm_parse_track_kern, afm_parse_kern_pairs, - afm_parse_kern_data): Remove redundant - `break' statements. - (afm_parser_parse): Ditto. - Don't use uninitialized variables. - - * src/psnames/psmodule.c (VARIANT_BIT): Define as unsigned long. - Use `|' operator instead of `^' to set it. - Update all users. - - * src/sfnt/ttcmap.c (tt_face_build_cmaps): Use `ft_jmp_buf'. - * src/sfnt/ttkern.c (tt_face_load_kern): Remove unused variable. - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Remove redundant - comparison. - (TT_Process_Simple_Glyph): Use FT_UInt for `n_points' and `i'. - (TT_Load_Glyph): Remove unused variable. - -2007-05-13 Derek Clegg - - * src/base/ftobjs.c (FT_New_Library): Only allocate rendering pool - if FT_RENDER_POOL_SIZE is > 0. From Savannah patch #5928. - -2007-05-11 David Turner - - * src/cache/ftbasic.c, include/freetype/ftcache.h - (FTC_ImageCache_LookupScaler, FTC_SBit_Cache_LookupScaler): Two new - functions that allow us to look up glyphs using an FTC_Scaler object - to specify the size, making it possible to use fractional pixel - sizes. - - * src/truetype/ttobjs.c (tt_size_ready_bytecode): Set - `size->cvt_ready'. Reported by Boris Letocha. - -2007-05-09 Graham Asher - - * src/truetype/ttinterp.c (Ins_IP), src/autofit/aflatin.c - (af_latin_metrics_scale_dim): Fix compiler warnings. - -2007-05-06 Werner Lemberg - - * builds/win32/visualce/freetype.sln: Removed, as requested by - Vincent. - -2007-05-04 Vincent RICHOMME - - * builds/win32/visualce/*: Add Visual C++ project files for Pocket - PC targets. - - * docs/CHANGES: Document them. - -2007-05-04 - - * builds/unix/ftsystem.c (FT_Stream_Open): Handle return value 0 of - mmap (which might happen on some RTOS). From Savannah patch #5909. - -2007-05-03 Werner Lemberg - - * src/base/ftobjs.c (FT_Set_Char_Size): Simplify code. - * include/freetype/freetype.h (FT_Set_Char_Size): Update - documentation. - -2007-04-28 Victor Stinner - - * src/sfnt/sfobjs.c (sfnt_load_face): Check error code after loading - `cmap'. - -2007-04-27 Werner Lemberg - - * src/truetype/ttgload.c (TT_Load_Simple_Glyph): Check for negative - number of points in contours. Problem reported by Victor Stinner - . - (TT_Process_Simple_Glyph): Synchronize variable types. - -2007-04-26 Werner Lemberg - - * src/base/ftglyph.c (FT_Glyph_Copy): Always set second argument to - zero in case of error. This fixes Savannah bug #19689. - -2007-04-25 Boris Letocha - - * src/truetype/ttobjs.c: Fix a typo that created a speed regression - in the TrueType bytecode loader. - -2007-04-10 Martin Horak - - * src/sfnt/sfobjs.c (sfnt_load_face) [FT_CONFIG_OPTION_INCREMENTAL]: - Ignore `hhea' table. This fixes Savannah bug #19261. - -2007-04-09 Werner Lemberg - - - * Version 2.3.4 released. - ========================= - - - Tag sources with `VER-2-3-4'. - - * docs/CHANGES, docs/VERSION.DLL: Update documentation and bump - version number to 2.3.4. - - * README, Jamfile (RefDoc), builds/win32/visualc/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj: s/2.3.3/2.3.4/, s/233/234/. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 4. - - * builds/unix/configure.raw (version_info): Set to 9:15:3. - -2007-04-09 Martin Horak - - * src/truetype/ttgload.c (load_truetype_glyph): Save and restore - memory stream to avoid a crash with the incremental memory - interface (Savannah bug #19260). - -2007-04-06 David Turner - - * src/base/ftbimap.c (ft_bitmap_assure_buffer): Fix buffer-overwrite bug - (Savannah bug #19536). - -2007-04-04 Werner Lemberg - - - * Version 2.3.3 released. - ========================= - - - Tag sources with `VER-2-3-3'. - - * docs/CHANGES: Mention CVE-2007-1351. - -2007-04-03 David Turner - - * src/base/ftobjs.c (FT_Set_Char_Size): As suggested by James Cloos, - if one of the resolution values is 0, treat it as if it were the - same as the other value. - -2007-04-02 David Turner - - Add special code to detect `extra-light' fonts and do not snap their - stem widths too much to avoid bizarre hinting effects. - - * src/autofit/aflatin.h (AF_LatinAxisRec): Add `standard_width' and - `extra_light' members. - - * src/autofit/aflatin.c (af_latin_metrics_init_widths): Initialize - them. - (af_latin_metrics_scale_dim): Set `extra_light'. - (af_latin_compute_stem_width): Use `extra_light'. - -2007-03-28 David Turner - - * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Fix zero-ing of the - padding. - -2007-03-28 Werner Lemberg - - * src/bdf/bdflib.c (setsbit, sbitset): Handle values >= 128 - gracefully. - (_bdf_set_default_spacing): Increase `name' buffer size to 256 and - issue an error for longer names. This fixes CVE-2007-1351. - (_bdf_parse_glyphs): Limit allowed number of glyphs in font to the - number of code points in Unicode. - - * builds/win32/visualc/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, README: s/2.3.2/2.3.3/, - s/232/233/. - - * docs/CHANGES: Mention ftdiff. - -2007-03-26 David Turner - - * src/truetype/ttinterp.c [FIX_BYTECODE]: Remove it and - corresponding code. - (Ins_MD): Last regression fix. - - * src/autofit/aflatin.c (af_latin_metrics_init_blues): Fix blues - computations in order to ignore single-point contours. These are - never rasterized and correspond in certain fonts to mark-attach - points that are very far from the glyph's real outline, ruining the - computation. - - * src/autofit/afloader.c (af_loader_load_g): In the case of - monospaced fonts, always set `rsb_delta' and `lsb_delta' to 0. - Otherwise code that uses them will most certainly ruin the fixed - advance property. - - * docs/CHANGES, docs/VERSION.DLL, README, Jamfile (RefDoc): Update - documentation and bump version number to 2.3.3. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 3. - - * builds/unix/configure.raw (version_info): Set to 9:14:3. - -2007-03-26 suzuki toshiya - - * builds/unix/ftconfig.in: Disable Carbon framework dependency on - 64bit ABI on Mac OS X 10.4.x (ppc & i386). Found by Sean McBride. - * builds/vms/ftconfig.h: Ditto. - * include/freetype/config/ftconfig.h: Ditto. - -2007-03-22 suzuki toshiya - - * builds/unix/ftsystem.c (FT_Stream_Open): Temporary fix to prevent - 32bit unsigned long overflow by 64bit filesize on LP64 platform, as - proposed by Sean McBride: - http://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html - -2007-03-22 suzuki toshiya - - * builds/unix/ftconfig.in: Suppress SGI compiler's warning against - setjmp, proposed by Sean McBride: - http://lists.gnu.org/archive/html/freetype-devel/2007-03/msg00032.html - -2007-03-19 suzuki toshiya - - * builds/unix/configure.raw: Dequote `OS_INLINE' in comment of - conftest.c, to avoid unexpected shell evaluation. Possibly it is a - bug or undocumented behaviour of autoconf. - -2007-03-18 David Turner - - * src/truetype/ttinterp.c (Ins_MDRP): Another bytecode regression - fix; testing still needed. - - * src/truetype/ttinterp.c (Ins_MD): Another bytecode regression fix. - -2007-03-17 David Turner - - * src/truetype/ttinterp.c (Ins_IP): Fix wrong handling of the - (undocumented) twilight zone special case. - -2007-03-09 Werner Lemberg - - - * Version 2.3.2 released. - ========================= - - - Tag sources with `VER-2-3-2'. - - * builds/win32/visualc/index.html, - builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, README: s/2.3.1/2.3.2/, - s/231/232/. - -2007-03-08 David Turner - - * docs/CHANGES, docs/VERSION.DLL: Updated for upcoming release. - - * builds/unix/configure.raw (version_info): Set to 9:13:3. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 2. - - * README, Jamfile (RefDoc): s/2.3.1/2.3.2/. - - * src/base/ftutil.c (ft_mem_strcpyn): Fix a bug that prevented the - function to work properly, over-writing user-provided buffers in - some cases. Reported by James Cloos . - - -2007-03-05 Werner Lemberg - - * include/freetype/config/ftstdlib.h (ft_strstr): New wrapper - macro for `strstr'. - - * src/truetype/ttobjs.c (tt_face_init): Use ft_strstr for scanning - `trick_names', as suggested by Ivan Nincic. - -2007-03-05 David Turner - - * src/base/ftinit.c (FT_Init_FreeType): Fix a small memory leak in - case FT_Init_FreeType fails for some reason. Problem reported by - Maximilian Schwerin . - - * src/truetype/ttobs.c (tt_size_init_bytecode): Clear the `x_ppem' - and `y_ppem' fields of the `TT_Size.metrics' structure, not those of - `TT_Size.root.metrics'. Problem reported by Daniel Glöckner - . - - * src/type1/t1afm.c (T1_Read_PFM): Read kerning values as 16-bit - signed values, not unsigned ones. Problem reported by Johannes - Walther . - -2007-02-21 David Turner - - * src/pshinter/pshalgo.c (psh_hint_align): Fix a bug in the hinting - of small and ghost stems in the Postscript interpreter. - -2007-02-20 suzuki toshiya - - * src/base/ftmac.c (FT_GetFileRef_From_Mac_ATS_Name): Fix memory - leak, patch by "Jjgod Jiang" . - * builds/mac/ftmac.c (FT_GetFileRef_From_Mac_ATS_Name): Ditto. - -2007-02-16 Werner Lemberg - - * src/truetype/ttinterp.c (Ins_MD): Remove unused variable. - * src/autofit/aflatin.c (af_latin_hints_link_segments): Ditto. - -2007-02-14 David Turner - - It seems that the following changes fix most of the known - interpreter problems with my fonts, but more testing is needed, - though. - - * src/truetype/ttinterp.c (FIX_BYTECODE): Activate. - (TT_MulFix14): Rewrite. - (Ins_MD, Ins_MDRP, Ins_IP) [FIX_BYTECODE]: Improved and updated. - (Ins_MIRP): Ditto. - -2007-02-12 Werner Lemberg - - * src/truetype/ttinterp.c (Project_x, Project_y): Remove compiler - warnings. - - * src/pcf/pcfread.c (pcf_interpret_style), src/bdf/bdfdrivr.c - (bdf_interpret_style): Ditto. - -2007-02-12 David Turner - - Simplify projection and dual-projection code interface. - - * src/truetype/ttinterp.h (TT_Project_Func): Use `FT_Pos', not - FT_Vector' as argument type. - * src/truetype/ttinterp.c (CUR_Func_project, CUR_Func_dualproj): - Updated. - (CUR_fast_project, CUR_fast_dualproj): New macros. - (Project, Dual_Project, Project_x, Project_y): Updated. - (Ins_GC, Ins_SCFS, Ins_MDAP, Ins_MIAP, Ins_IP): Use new `fast' - macros. - - - * src/autofit/afloader.c (af_loader_load_g): Improve spacing - adjustments for the non-light auto-hinted modes. Gets rid of - `inter-letter spacing is too wide' problems. - - * src/autofit/aflatin.c (af_latin_hints_link_segments, - af_latin_hints_compute_edges): Slight optimization of the segment - linker and better handling of serif segments to get rid of broken - `9' in Arial at 9pt (96dpi). - - - Introduce new string functions and the corresponding macros to get - rid of various uses of strcpy and other `evil' functions, as well as - to simplify a few things. - - * include/freetype/internal/ftmemory.h (ft_mem_strdup, ft_mem_dup, - ft_mem_strcpyn): New declarations. - (FT_MEM_STRDUP, FT_STRDUP, FT_MEM_DUP, FT_DUP, FT_STRCPYN): New - macros. - * src/base/ftutil.c (ft_mem_dup, ft_mem_strdup, ft_mem_strcpyn): New - functions. - - * src/bfd/bfddrivr.c (bdf_interpret_style, BDF_Face_Init), - src/bdf/bdflib.c (_bdf_add_property), src/pcf/pcfread.c - (pcf_get_properties, pcf_interpret_style, pcf_load_font), - src/cff/cffdrivr.c (cff_get_glyph_name), src/cff/cffload.c - (cff_index_get_sid_string), src/cff/cffobjs.c (cff_strcpy), - src/sfnt/sfdriver.c (sfnt_get_glyph_name), src/type1/t1driver.c - (t1_get_glyph_name), src/type42/t42drivr.c (t42_get_glyph_name, - t42_get_name_index): Use new functions and simplify code. - - * builds/mac/ftmac.c (FT_FSPathMakeSpec): Don't use FT_MIN. - -2007-02-11 Werner Lemberg - - * src/autofit/afloader.c (af_loader_load_g): Don't change width for - non-spacing glyphs. - -2007-02-07 Tom Parker - - * src/cff/cffdrivr.c (cff_get_name_index): Protect against NULL - pointer. - -2007-02-05 suzuki toshiya - - * include/freetype/ftmac.h (FT_DEPRECATED_ATTRIBUTE): - Introduce __attribute((deprecated))__ to warn functions - which use non-ANSI data types in its interfaces. - (FT_GetFile_From_Mac_Name): Deprecated, using FSSpec. - (FT_GetFile_From_Mac_ATS_Name): Deprecated, using FSSpec. - (FT_New_Face_From_FSSpec): Deprecated, using FSSpec. - (FT_New_Face_From_FSRef): Deprecated, using FSRef. - - * src/base/ftmac.c: Predefine FT_DEPRECATED_ATTRIBUTE as void - to avoid warning in building FreeType. - * builds/mac/ftmac.c: Ditto. - -2007-02-05 suzuki toshiya - - * src/base/ftbase.c: Fix to use builds/mac/ftmac.c, if configured - `--with-fsspec' etc. Replace #include "ftmac.c" with - #include . - -2007-02-05 suzuki toshiya - - * include/freetype/ftmac.h (FT_GetFilePath_From_Mac_ATS_Name): - Introduced as replacement of FT_GetFile_From_Mac_ATS_Name. - * src/base/ftmac.c (FT_GetFilePath_From_Mac_ATS_Name): Ditto. - (FT_GetFile_From_Mac_ATS_Name): Rewritten as wrapper of - FT_GetFilePath_From_Mac_ATS_Name. - * builds/mac/ftmac.c: Ditto. - -2007-02-05 suzuki toshiya - - * include/freetype/ftmac.h: Fixed wrong comment: FSSpec of - FT_GetFile_From_Mac_Name, FT_GetFile_From_Mac_ATS_Name are - for passing to FT_New_Face_From_FSSpec. - -2007-02-05 suzuki toshiya - - * builds/unix/configure.raw: Check whether Mac OS X system headers - can be built under ANSI C mode. - - * src/base/ftmac.c (OS_INLINE): Redefine OS_INLINE by a version - compatible to ANSI C in case system headers are ANSI C incompatible. - * builds/mac/ftmac.c (OS_INLINE): Ditto. - -2007-02-01 Werner Lemberg - - * include/freetype/ttnameid.h (TT_MS_LANGID_DZONGHKA_BHUTAN): - Explain why applications shouldn't use it. Found by Alexei. - -2007-02-01 Alexei Podtelezhnikov - - * builds/unix/freetype2.m4 (AC_CHECK_FT2): Fix spelling of warning - message. - - * src/gxvalid/gxvmort1.c - (gxv_mort_subtable_type1_substTable_validate): Fix debugging - message. - -2007-01-31 Werner Lemberg - - - * Version 2.3.1 released. - ========================= - - - Tag sources with `VER-2-3-1-FINAL'. - - * builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj: s/230/231/. - * builds/win32/visualc/index.html: s/221/231/. - - * vms_make.com: Add `ftgasp'. - -2007-01-30 David Turner - - Tag sources with VER-2-3-1 to prepare release. - - * include/freetype/freetype.h (FREETYPE_PATCH): Set to 1. - - * docs/VERSION.DLL, docs/release, README, Jamfile (RefDoc): - s/2.3.0/2.3.1/. - - * builds/unix/configure.raw (version_info): Set to 9:12:3. - - - * src/autofit/aftypes.h (AF_USE_WARPER), src/autofit/afloader.c - (af_loader_load_g): Disable the warper (i.e., the light hinting - improvements) to make a 2.3.1 bugfix release before introducing a - new feature. This should give us more time to tune and improve the - warper for the next release. - - * docs/CHANGES: Update accordingly. - -2007-01-25 David Turner - - For light auto-hinting, improve glyph advance widths and resurrect - normal/full hinting to its normal quality. - - * src/autofit/afhints.h (AF_GlyphHintsRec): New members `xmin_delta' - and `xmax_delta'. - * src/autofit/afhints.c (af_glyph_hints_reload): Reset `xmin_delta' - and `xmax_delta'. - - * src/autofit/afloader.c (af_loader_load_g) : Replace - preprocessor conditional with if-clause, handling both light and - normal mode. - - * src/autofit/afwarp.c (AF_WarpScore): Fine-tune again. - (af_warper_compute): Handle `xmin_delta' and `xmax_delta'. - -2007-01-25 Werner Lemberg - - * docs/release: Updated -- Savannah uses a new uploading scheme. - -2007-01-25 David Turner - - * src/cff/cffload.c (cff_index_get_pointers): Improve previous fix. - - * src/cff/cffgload.c (cff_decoder_parse_charstrings) - : Fix sanity check for empty - functions. - - * docs/CHANGES: Document light auto-hinting improvement. - -2007-01-25 Werner Lemberg - - * src/cff/cffload.c (cff_index_get_pointers): Handle last entry - correctly in a sanity check. Since this function is only used to - load local and global functions, any charstring that called the last - local/global function would fail otherwise. This fixes Savannah bug - #18867. - - * docs/CHANGES: Document it. - -2007-01-23 David Turner - - * src/truetype/ttobjs.c (tt_size_ready_bytecode): Fix typo that - prevented compilation when disabling both the unpatented and the - bytecode interpreter in the TrueType font driver. - - - Fix and enable the warper to improve `light' hinting mode. This is - not necessarily a final version, but it seems to work well. - - * src/autofit/aflatin.c (af_latin_hints_init) [AF_USE_WARPER]: - Disable code. - (af_latin_hints_apply) [AF_USE_WARPER]: Handle FT_RENDER_MODE_LIGHT. - * src/autofit/aftypes.h: Activate AF_USE_WARPER. - - * src/autofit/afwarp.c (AF_WarpScore): Tune table. - (af_warper_compute_line_best): Fix array size of `scores'. - (af_warper_compute): Better handling of border cases. - * src/autofit/afwarp.h (AF_WarperRec): Remove unused members `X1' - and `X2'. - -2007-01-21 Werner Lemberg - - * ChangeLog: Split off older entries into... - * ChangeLog.22: This new file. - -2007-01-21 Werner Lemberg - - * docs/CHANGES: Document SHZ fix. - -2007-01-21 George Williams - - * src/truetype/ttinterp.c (Ins_SHZ): SHZ doesn't move phantom - points. - -2007-01-21 Werner Lemberg - - * src/sfnt/ttmtx.c (tt_face_get_metrics) - [!FT_CONFIG_OPTION_OLD_INTERNALS]: Fix limit check. - -2007-01-17 Werner Lemberg - - - * Version 2.3.0 released. - ========================= - - - Tag sources with `VER-2-3-0-FINAL'. - -2007-01-17 Werner Lemberg - - * docs/release: Updated. - -2007-01-16 David Turner - - * src/autofit/aflatin.c (af_latin_hints_compute_segments), - src/cff/cffdriver.c (cff_ps_get_font_info), src/truetype/ttobjs.c - (tt_face_init), src/truetype/ttinterp.c (Ins_SHC): Fix compiler - warnings. - -2007-01-15 Detlef Würkner - - * builds/amiga/makefile, builds/amiga/makefile.os4, - builds/amiga/smakefile: Add `ftgasp.c' and `ftlcdfil.c'. - - * builds/amiga/include/freetype/config/ftconfig.h: Synchronize. - -2007-01-14 Detlef Würkner - - Fix various compiler warnings. - - * src/truetype/ttdriver.c (tt_size_select), src/cff/cffobjs.h, - src/cff/cffobjs.c (cff_size_request), src/type42/t42objs.h: - s/index/strike_index/. - * src/base/ftobjs.c (FT_Match_Size): s/index/size_index/. - - * src/gxvalid/gxvmorx5.c - (gxv_morx_subtable_type5_InsertList_validate): s/index/table_index/. - - * src/truetype/ttinterp.c (Compute_Point_Displacement), - src/pcf/pcfread.c (pcf_seek_to_table_type): Avoid possibly - uninitialized variables. - -2007-01-13 suzuki toshiya - - * docs/CHANGES, docs/INSTALL.MAC: Improvements. - -2007-01-13 Werner Lemberg - - * src/type1/t1afm.c (T1_Read_Metrics): MS Windows allows PFM - versions up to 0x3FF without complaining. - -2007-01-13 Derek Clegg - - Add FT_Get_PS_Font_Info interface to CFF driver. - - * src/cff/cfftypes.h: Include FT_TYPE1_TABLES_H. - (CFF_FontRec): Add `font_info' field. - - * src/cff/cffload.c: Include FT_TYPE1_TABLES_H. - (cff_font_done): Free font->font_info if necessary. - - * src/cff/cffdrvr.c (cff_ps_get_font_info): New function. - (cff_service_ps_info): Register cff_ps_get_font_info. - -2007-01-13 Werner Lemberg - - * src/base/ftoutln.c (FT_Outline_Get_Orientation): Fix compilation - with C++ compiler. - - * src/autofit/afhints.c (af_glyph_hints_dump_segments, - af_glyph_hints_dump_edges): Ditto. - - * src/base/rules.mk (BASE_SRC): Remove ftgasp.c (it's already in - `modules.cfg'). - - * src/sfnt/ttsbit0.h: Remove. - - * src/sfnt/rules.mk (SFNT_DRV_SRC): Don't include ttsbit0.c. - -2007-01-12 David Turner - - * src/base/ftbitmap.c (ft_bitmap_assure_buffer): Fix memory stomping - bug in the bitmap emboldener if the pitch of the source bitmap is - much larger than its width. - - * src/truetype/ttinterp.c (Update_Max): Fix aliasing-related - compilation warning. - -2007-01-12 Werner Lemberg - - * builds/unix/install-sh, builds/unix/mkinstalldirs: Updated from - `automake' CVS module from sources.redhat.com. - -2007-01-11 Werner Lemberg - - * src/type1/t1load.c (is_space): Removed. - (parse_encoding, parse_charstrings): Use IS_PS_DELIM. - (parse_charstrings): Use IS_PS_TOKEN. - - - * autogen.sh: Avoid bash specific syntax. - -2007-01-11 David Turner - - * docs/CHANGES: Small update. - - * builds/unix/configure.raw (version_info): Set to 9:11:3. - - * src/base/ftobjs.c (IsMacResource): Fix a small bug that caused a - crash with some Mac OS X .dfont files. Submitted by Masatake - Yamato. - - * autogen.sh: Small fix to get it working on Mac OS X properly: - The issue is that GNU libtool is called `glibtool' on this platform, - and we must call `glibtoolize', since `libtoolize' doesn't exist. - -2007-01-10 David Turner - - * all-sources: Tag all sources with VER-2-3-0-RC1 and - VER-2-3-0. - - * Jamfile (RefDoc), README, builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj, docs/VERSION.DLL: Update - version number to 2.3.0. - - * include/freetype/freetype.h (FREETYPE_MINOR): Set to 3. - (FREETYPE_PATCH): Set to 0. - - * include/freetype/ftchapters.h, include/freetype/ftgasp.h, - include/freetype/ftlcdfil.h: Update reference documentation with - GASP support and LCD filtering sections. - - * src/pshinter/pshalgo.c (psh_glyph_compute_inflections): Fix a typo - which created an endless loop with some malformed font files. - -2007-01-10 Derek Clegg - - * src/type1/t1load.c (T1_Get_MM_Var): Always return fixed point - values. - -2007-01-08 David Turner - - * docs/CHANGES: Updated. - - * include/freetype/ftgasp.h, src/base/ftgasp.c: New files which add - a new API `FT_Get_Gasp' to return entries of the `gasp' table - corresponding to a given character pixel size. - - * src/sfnt/ttload.c (tt_face_load_gasp): Add version check for the - `gasp' table, in order to avoid potential problems with later - versions. - - * include/freetype/config/ftheader.h (FT_GASP_H): New macro for - . - - * src/base/rules.mk (BASE_SRC), src/base/Jamfile (_sources), - modules.cfg (BASE_EXTENSIONS), builds/win32/visualc/freetype.dsp, - builds/win32/visualc/freetype.vcproj: Add src/base/ftgasp.c to the - default build. - -2007-01-07 Werner Lemberg - - * src/cid/cidparse.c (cid_parser_new): Improve error message for - Type 11 fonts. - Scan for `/sfnts' token. - -2007-01-07 Werner Lemberg - - * src/cid/cidparse.c (cid_parser_new): Reject Type 11 fonts. - -2007-01-06 Werner Lemberg - - * src/cff/cffload.c (cff_index_init): Remove unused variable. - (cff_index_read_offset): s/perror/errorp/ to avoid global shadowing. - -2007-01-04 David Turner - - * src/pfr/pfrobjs.c (pfr_face_init): Detect non-scalable fonts - correctly. This fixes Savannah bug #17876. - - - Do not allocate interpreter-specific tables in memory if we are not - going to load glyphs with the bytecode interpreter anyway. - - * src/truetype/ttgload.c (tt_loader_init): Load execution context - only if glyph is hinted. - Updated. - * src/truetype/ttobjs.h (TT_SizeRec): Add members `bytecode_ready' - and `cvs_ready'. - Add `tt_size_ready_bytecode' declaration. - * src/truetype/ttobjs.c (tt_size_done_bytecode, - tt_size_init_bytecode, tt_size_ready_bytecode): New functions. - (tt_size_init): Move most code into `tt_size_init_bytecode'. - (tt_size_done): Move most code into `tt_size_done_bytecode'. - (tt_size_reset): Move some code to `tt_size_ready_bytecode'. - - - Don't extract the metrics table from the SFNT font file. Instead, - reparse it on each glyph load. The runtime difference is not - noticeable, and it can save a lot of heap memory when memory-mapped - files are not used. - - * include/freetype/internal/tttypes.h (TT_FaceRec): Add members - `horz_metrics_offset' and `vert_metrics_ofset'. - * src/sfnt/ttmtx.c (tt_face_load_hmtx, tt_face_get_metrics): - Updated. - - - * src/sfnt/ttcmap.c (tt_cmap4_validate): Slight optimization. - - - Do not load the CFF index offsets into memory, since this wastes a - *lot* of heap memory with large Asian CFF fonts. There is no - significant performance loss. - - * src/cff/cffload.h: Add `cff_charset_cid_to_gindex' declaration. - * src/cff/cfftypes.h (CFF_IndexRec): Add fields `start' and - `data_size'. - (CFF_CharsetRec): Add field `num_glyphs'. - - * src/cff/cffload.c (cff_index_read_offset, cff_index_load_offsets, - cff_charset_cid_to_gindex): New functions. - (cff_new_index): Renamed to... - (cff_index_init): This. Update all callers. - Updated -- some code has been moved to `cff_index_load_offsets'. - (cff_done_index): Renamed to... - (cff_index_done): This. Update all callers. - (cff_index_get_pointers, cff_index_access_element): Updated to use - stream offsets. - (cff_charset_compute_cids): Set `num_glyphs' field. - (cff_encoding_load): Updated. - - * src/cff/cffgload.c (cff_slot_load): Updated. - -2007-01-04 David Turner - - * docs/INSTALL.UNIX: Simplify some parts, add reference to - autogen.sh and pointer to README.CVS. - - * README.CVS: Add common problem description and solution - when running autogen.sh. - - * docs/INSTALL: Add reference to MacOS X. - - * docs/MAKEPP, docs/INSTALL.MAC: New documentation files. - - * docs/TODO: Remove obsolete items. - - * src/raster/ftraster.c: (TRaster_Instance): Replace it with... - (TWorker): This. - Remove `count_table' and `memory'. - Make `grays' a pointer. - (TRaster): New structure. - (count_table): New static array. - (RAS_ARGS, RAS_ARG, RAS_VARS, RAS_VAR, FT_UNUSED_RASTER, cur_ras, - Vertical_Gray_Sweep_Step, ft_black_new, ft_black_done, - ft_black_set_mode, ft_black_render): Updated. - (ft_black_init): Don't initialize `count_table'. - (ft_black_reset): Use the render pool. This saves about 6KB of - heap space for each FT_Library instance. - - * src/smooth/ftgrays.c (TRaster): Replaced with... - (TWorker): This. - Remove `memory'. - (TRaster): New structure. - - (RAS_ARG_, RAS_ARG, RAS_VAR_, RAS_VAR, ras, gray_render_line, - gray_move_to, gray_line_to, gray_conic_to, gray_cubic_to, - gray_render_span, gray_raster_render): Updated. - (gray_raster_reset): Use the render pool. This saves about 6KB of - heap space for each FT_Library instance. - - * src/sfnt/sfobjs.c, src/sfnt/ttkern.c, src/sfnt/ttkern.h, - src/sfnt/ttmtx.c, src/sfnt/ttsbit.c, src/sfnt/ttsbit.h, - src/truetype/ttpload.c, include/freetype/config/ftoption.h: Remove - FT_OPTIMIZE_MEMORY macro (and code for !FT_OPTIMIZE_MEMORY) since - the optimization is no longer experimental. - - * src/pshinter/pshalgo.c (psh_glyph_interpolate_normal_points): - Remove a typo that results in no hinting and a memory leak with some - large Asian CFF fonts. - - * src/base/ftobjs.c (FT_Done_Library): Remove a subtle memory leak - which happens when FT_Done_Library is called with still opened - CFF_Faces in it. We need to close all faces before destroying the - modules, or else some bad things (memory leaks) may happen. - -2007-01-02 Werner Lemberg - - * src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): - Remove compiler warning. - -2007-01-02 David Turner - - * src/sfnt/sfobjs.c: Add documentation comment. - -2006-12-31 Masatake YAMATO - - * src/gxvalid/gxvkern.c (gxv_kern_subtable_fmt0_pairs_validate): New - function. - Check uniqueness of the gid pairs. - (gxv_kern_subtable_fmt0_validate): Move some code to - `gxv_kern_subtable_fmt0_pairs_validate'. - -2006-12-22 David Turner - - * src/autofit/aflatin.c, src/truetype/ttgload.c: Remove compiler - warnings. - - * builds/win32/visualc/freetype.vcproj: Add _CRT_SECURE_NO_DEPRECATE - to avoid deprecation warnings with Visual C++ 8. - -2006-12-16 Anders Kaseorg - - * src/base/ftlcdfil.c (FT_Library_SetLcdFilter) - [FT_FORCE_LIGHT_LCD_FILTER]: Fix typo. - -2006-12-15 suzuki toshiya - - * include/freetype/internal/services/svotval.h: Add `volatile' to - sync with the modification by Jens Claudius on 2006-08-22; cf. - http://cvs.savannah.gnu.org/viewcvs/freetype/freetype2/src/otvalid/otvmod.c?r1=1.4&r2=1.5 - -2006-12-15 suzuki toshiya