Changeset 561 for trunk/src/gui/text/qfont.cpp

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/text/qfont.cpp (modified) (40 diffs)

trunk/src/gui/text/qfont.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.
+** In addition, as a special exception, Nokia gives you certain additional
+** rights.  These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
 **
 ** GNU General Public License Usage
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -76 +76 @@
 #include "qfontengine_qpf_p.h"
 #endif
+#endif
+#ifdef Q_OS_SYMBIAN
+#include "qt_s60_p.h"
 #endif
 
@@ -180 +183 @@
         screen = subScreens.at(0);
     dpi = qRound(screen->width() / (screen->physicalWidth() / qreal(25.4)));
+#elif defined(Q_OS_SYMBIAN)
+    dpi = S60->defaultDpiX;
 #endif // Q_WS_X11
 
@@ -212 +217 @@
         screen = subScreens.at(0);
     dpi = qRound(screen->height() / (screen->physicalHeight() / qreal(25.4)));
+#elif defined(Q_OS_SYMBIAN)
+    dpi = S60->defaultDpiY;
 #endif // Q_WS_X11
 
@@ -227 +234 @@
       capital(0), letterSpacingIsAbsolute(false), scFont(0)
 {
-    ref = 1;
 #ifdef Q_WS_X11
     if (QX11Info::display())
@@ -247 +253 @@
       scFont(other.scFont)
 {
-    ref = 1;
 #ifdef Q_WS_WIN
     hdc = other.hdc;
@@ -324 +329 @@
     else
         font.setPixelSize((font.pixelSize() * 7 + 5) / 10);
-    scFont = font.d;
+    scFont = font.d.data();
     if (scFont != this)
         scFont->ref.ref();
@@ -425 +430 @@
     \brief The QFont class specifies a font used for drawing text.
 
-    \ingroup multimedia
+    \ingroup painting
     \ingroup appearance
     \ingroup shared
-    \ingroup text
-    \mainclass
+    \ingroup richtext-processing
+
 
     When you create a QFont object you specify various attributes that
@@ -735 +740 @@
         d->screen = screen;
     } else {
-        d = font.d;
-        d->ref.ref();
+        d = font.d.data();
     }
 #ifdef Q_WS_WIN
@@ -748 +752 @@
 */
 QFont::QFont(QFontPrivate *data)
-    : resolve_mask(QFont::AllPropertiesResolved)
-{
-    d = data;
-    d->ref.ref();
+    : d(data), resolve_mask(QFont::AllPropertiesResolved)
+{
 }
 
@@ -763 +765 @@
             d->engineData->ref.deref();
         d->engineData = 0;
-        if (d->scFont && d->scFont != d)
+        if (d->scFont && d->scFont != d.data())
             d->scFont->ref.deref();
         d->scFont = 0;
@@ -769 +771 @@
     }
 
-    qAtomicDetach(d);
+    d.detach();
 }
 
@@ -778 +780 @@
 */
 QFont::QFont()
-    :d(QApplication::font().d), resolve_mask(0)
-{
-    d->ref.ref();
+    : d(QApplication::font().d.data()), resolve_mask(0)
+{
 }
 
@@ -787 +788 @@
     pointSize, \a weight and \a italic settings.
 
-    If \a pointSize is <= 0, it is set to 12.
+    If \a pointSize is zero or negative, the point size of the font
+    is set to a system-dependent default value. Generally, this is
+    12 points, except on Symbian where it is 7 points.
 
     The \a family name may optionally also include a foundry name,
@@ -800 +803 @@
 */
 QFont::QFont(const QString &family, int pointSize, int weight, bool italic)
-    :d(new QFontPrivate)
-{
-    resolve_mask = QFont::FamilyResolved;
-
+    : d(new QFontPrivate()), resolve_mask(QFont::FamilyResolved)
+{
     if (pointSize <= 0) {
+#ifdef Q_OS_SYMBIAN
+        pointSize = 7;
+#else
         pointSize = 12;
+#endif
     } else {
         resolve_mask |= QFont::SizeResolved;
@@ -827 +832 @@
 */
 QFont::QFont(const QFont &font)
-{
-    d = font.d;
-    d->ref.ref();
-    resolve_mask = font.resolve_mask;
+    : d(font.d.data()), resolve_mask(font.resolve_mask)
+{
 }
 
@@ -838 +841 @@
 QFont::~QFont()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
@@ -847 +848 @@
 QFont &QFont::operator=(const QFont &font)
 {
-    qAtomicAssign(d, font.d);
+    d = font.d.data();
     resolve_mask = font.resolve_mask;
     return *this;
@@ -907 +908 @@
 void QFont::setPointSize(int pointSize)
 {
-    Q_ASSERT_X (pointSize > 0, "QFont::setPointSize", "point size must be greater than 0");
+    if (pointSize <= 0) {
+        qWarning("QFont::setPointSize: Point size <= 0 (%d), must be greater than 0", pointSize);
+        return;
+    }
 
     detach();
@@ -926 +930 @@
 void QFont::setPointSizeF(qreal pointSize)
 {
-    Q_ASSERT_X(pointSize > 0.0, "QFont::setPointSizeF", "point size must be greater than 0");
+    if (pointSize <= 0) {
+        qWarning("QFont::setPointSizeF: Point size <= 0 (%f), must be greater than 0", pointSize);
+        return;
+    }
 
     detach();
@@ -1623 +1630 @@
                 && f.d->overline  == d->overline
                 && f.d->strikeOut == d->strikeOut
-                && f.d->kerning == d->kerning));
+                && f.d->kerning == d->kerning
+                && f.d->capital == d->capital));
 }
 
@@ -1655 +1663 @@
     if (r1.addStyle != r2.addStyle) return r1.addStyle < r2.addStyle;
 #endif // Q_WS_X11
+    if (f.d->capital != d->capital) return f.d->capital < d->capital;
 
     int f1attrs = (f.d->underline << 3) + (f.d->overline << 2) + (f.d->strikeOut<<1) + f.d->kerning;
@@ -1724 +1733 @@
     QFont font(*this);
     font.detach();
-    font.d->resolve(resolve_mask, other.d);
+    font.d->resolve(resolve_mask, other.d.data());
 
     return font;
@@ -1788 +1797 @@
 {
     // default substitutions
-    static const char *initTbl[] = {
+    static const char * const initTbl[] = {
 
 #if defined(Q_WS_X11)
@@ -1820 +1829 @@
 }
 
-
 /*!
     Returns the first family name to be used whenever \a familyName is
@@ -1907 +1915 @@
     }
 }
+
+/*! \fn void QFont::initialize()
+  \internal
+
+  Internal function that initializes the font system.  The font cache
+  and font dict do not alloc the keys. The key is a QString which is
+  shared between QFontPrivate and QXFontName.
+*/
+
+/*! \fn void QFont::cleanup()
+  \internal
+
+  Internal function that cleans up the font system.
+*/
 
 // ### mark: should be called removeSubstitutions()
@@ -2163 +2185 @@
     s << (quint8) 0
       << (quint8) font.d->request.weight
-      << get_font_bits(s.version(), font.d);
+      << get_font_bits(s.version(), font.d.data());
     if (s.version() >= QDataStream::Qt_4_3)
         s << (quint16)font.d->request.stretch;
     if (s.version() >= QDataStream::Qt_4_4)
-        s << get_extended_font_bits(font.d);
+        s << get_extended_font_bits(font.d.data());
     if (s.version() >= QDataStream::Qt_4_5) {
         s << font.d->letterSpacing.value();
@@ -2186 +2208 @@
 QDataStream &operator>>(QDataStream &s, QFont &font)
 {
-    if (!font.d->ref.deref())
-        delete font.d;
-
     font.d = new QFontPrivate;
     font.resolve_mask = QFont::AllPropertiesResolved;
@@ -2230 +2249 @@
     font.d->request.weight = weight;
 
-    set_font_bits(s.version(), bits, font.d);
+    set_font_bits(s.version(), bits, font.d.data());
 
     if (s.version() >= QDataStream::Qt_4_3) {
@@ -2241 +2260 @@
         quint8 extendedBits;
         s >> extendedBits;
-        set_extended_font_bits(extendedBits, font.d);
+        set_extended_font_bits(extendedBits, font.d.data());
     }
     if (s.version() >= QDataStream::Qt_4_5) {
@@ -2267 +2286 @@
     \brief The QFontInfo class provides general information about fonts.
 
-    \ingroup multimedia
+    \ingroup appearance
     \ingroup shared
-    \ingroup text
 
     The QFontInfo class provides the same access functions as QFont,
@@ -2323 +2341 @@
 */
 QFontInfo::QFontInfo(const QFont &font)
-    : d(font.d)
-{ d->ref.ref(); }
+    : d(font.d.data())
+{
+}
 
 /*!
@@ -2330 +2349 @@
 */
 QFontInfo::QFontInfo(const QFontInfo &fi)
-    : d(fi.d)
-{ d->ref.ref(); }
+    : d(fi.d.data())
+{
+}
 
 /*!
@@ -2338 +2358 @@
 QFontInfo::~QFontInfo()
 {
-    if (!d->ref.deref())
-        delete d;
 }
 
@@ -2347 +2365 @@
 QFontInfo &QFontInfo::operator=(const QFontInfo &fi)
 {
-    qAtomicAssign(d, fi.d);
+    d = fi.d.data();
     return *this;
 }
@@ -2596 +2614 @@
 void QFontCache::cleanup()
 {
-    theFontCache()->setLocalData(0);
+    QThreadStorage<QFontCache *> *cache = 0;
+    QT_TRY {
+        cache = theFontCache();
+    } QT_CATCH (const std::bad_alloc &) {
+        // no cache - just ignore
+    }
+    if (cache && cache->hasLocalData())
+        cache->setLocalData(0);
 }
 #endif // QT_NO_THREAD
@@ -2609 +2634 @@
 {
     {
-        EngineDataCache::Iterator it = engineDataCache.begin(),
-                                 end = engineDataCache.end();
+        EngineDataCache::ConstIterator it = engineDataCache.constBegin(),
+                                 end = engineDataCache.constEnd();
         while (it != end) {
             if (it.value()->ref == 0)
@@ -2620 +2645 @@
         }
     }
-    EngineCache::Iterator it = engineCache.begin(),
-                         end = engineCache.end();
+    EngineCache::ConstIterator it = engineCache.constBegin(),
+                         end = engineCache.constEnd();
     while (it != end) {
         if (--it.value().data->cache_count == 0) {
             if (it.value().data->ref == 0) {
-                FC_DEBUG("QFontCache::~QFontCache: deleting engine %p key=(%d / %g %d %d %d %d)",
+                FC_DEBUG("QFontCache::~QFontCache: deleting engine %p key=(%d / %g %g %d %d %d)",
                          it.value().data, it.key().script, it.key().def.pointSize,
                          it.key().def.pixelSize, it.key().def.weight, it.key().def.style,