Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt

6 files changed, 18 insertions, 15 deletions

diff --git a/src/corelib/tools/qbytearraymatcher.h b/src/corelib/tools/qbytearraymatcher.h
index 633e92c..970cbcc 100644
--- a/src/corelib/tools/qbytearraymatcher.h
+++ b/src/corelib/tools/qbytearraymatcher.h
@@ -70,7 +70,7 @@ public:
     inline QByteArray pattern() const
     {
         if (q_pattern.isNull())
-            return QByteArray((const char*)p.p, p.l);
+            return QByteArray(reinterpret_cast<const char*>(p.p), p.l);
         return q_pattern;
     }
 
diff --git a/src/corelib/tools/qlocale.cpp b/src/corelib/tools/qlocale.cpp
index a2154a9..66e3921 100644
--- a/src/corelib/tools/qlocale.cpp
+++ b/src/corelib/tools/qlocale.cpp
@@ -1589,7 +1589,7 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
        defaults to the default locale (see setDefault()).
     \endlist
 
-    The "C" locale is identical to \l{English}/\l{UnitedStates}.
+    The "C" locale is identical in behavior to \l{English}/\l{UnitedStates}.
 
     Use language() and country() to determine the actual language and
     country values used.
@@ -1632,7 +1632,7 @@ QDataStream &operator>>(QDataStream &ds, QLocale &l)
 
     This enumerated type is used to specify a language.
 
-    \value C The "C" locale is English/UnitedStates.
+    \value C The "C" locale is identical in behavior to English/UnitedStates.
     \value Abkhazian
     \value Afan
     \value Afar
diff --git a/src/corelib/tools/qrect.cpp b/src/corelib/tools/qrect.cpp
index 3930a0d..5602170 100644
--- a/src/corelib/tools/qrect.cpp
+++ b/src/corelib/tools/qrect.cpp
@@ -901,7 +901,7 @@ void QRect::moveCenter(const QPoint &p)
 /*!
     \fn bool QRect::contains(const QPoint &point, bool proper) const
 
-    Returns true if the the given \a point is inside or on the edge of
+    Returns true if the given \a point is inside or on the edge of
     the rectangle, otherwise returns false. If \a proper is true, this
     function only returns true if the given \a point is \e inside the
     rectangle (i.e., not on the edge).
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index f1b35ee..ad2d9f2 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -238,6 +238,7 @@ namespace QtSharedPointer {
         template <class X> friend class ExternalRefCount;
         template <class X> friend class QWeakPointer;
         template <class X, class Y> friend QSharedPointer<X> qSharedPointerCastHelper(const QSharedPointer<Y> &src, X *);
+        template <class X, class Y> friend QSharedPointer<X> qSharedPointerDynamicCastHelper(const QSharedPointer<Y> &src, X *);
         template <class X, class Y> friend QSharedPointer<X> qSharedPointerConstCastHelper(const QSharedPointer<Y> &src, X *);
         template <class X, class Y> friend QSharedPointer<X> QtSharedPointer::qStrongRefFromWeakHelper(const QWeakPointer<Y> &src, X *);
 #endif
@@ -509,6 +510,14 @@ namespace QtSharedPointer {
         return result;
     }
     template <class X, class T>
+    Q_INLINE_TEMPLATE QSharedPointer<X> qSharedPointerDynamicCastHelper(const QSharedPointer<T> &src, X *)
+    {
+        QSharedPointer<X> result;
+        register T *ptr = src.data();
+        result.internalSet(src.d, dynamic_cast<X *>(ptr));
+        return result;
+    }
+    template <class X, class T>
     Q_INLINE_TEMPLATE QSharedPointer<X> qSharedPointerConstCastHelper(const QSharedPointer<T> &src, X *)
     {
         QSharedPointer<X> result;
@@ -544,9 +553,7 @@ template <class X, class T>
 Q_INLINE_TEMPLATE QSharedPointer<X> qSharedPointerDynamicCast(const QSharedPointer<T> &src)
 {
     X *x = 0;
-    if (QtSharedPointer::qVerifyDynamicCast(src.data(), x))
-        return QtSharedPointer::qSharedPointerCastHelper(src, x);
-    return QSharedPointer<X>();
+    return QtSharedPointer::qSharedPointerDynamicCastHelper(src, x);
 }
 template <class X, class T>
 Q_INLINE_TEMPLATE QSharedPointer<X> qSharedPointerDynamicCast(const QWeakPointer<T> &src)
@@ -558,17 +565,13 @@ template <class X, class T>
 Q_INLINE_TEMPLATE QSharedPointer<X> qSharedPointerConstCast(const QSharedPointer<T> &src)
 {
     X *x = 0;
-    if (QtSharedPointer::qVerifyConstCast(src.data(), x))
-        return QtSharedPointer::qSharedPointerConstCastHelper(src, x);
-    return QSharedPointer<X>();
+    return QtSharedPointer::qSharedPointerConstCastHelper(src, x);
 }
 template <class X, class T>
 Q_INLINE_TEMPLATE QSharedPointer<X> qSharedPointerConstCast(const QWeakPointer<T> &src)
 {
     X *x = 0;
-    if (QtSharedPointer::qVerifyConstCast(src.data(), x))
-        return QtSharedPointer::qSharedPointerCastHelper(src, x);
-    return QSharedPointer<X>();
+    return QtSharedPointer::qSharedPointerConstCastHelper(src, x);
 }
 
 template <class X, class T>
diff --git a/src/corelib/tools/qsize.cpp b/src/corelib/tools/qsize.cpp
index 76a5484..bbf6c2a 100644
--- a/src/corelib/tools/qsize.cpp
+++ b/src/corelib/tools/qsize.cpp
@@ -781,7 +781,7 @@ void QSizeF::scale(const QSizeF &s, Qt::AspectRatioMode mode)
     \fn QDataStream &operator<<(QDataStream &stream, const QSizeF &size)
     \relates QSizeF
 
-    Writes the the given \a size to the given \a stream and returns a
+    Writes the given \a size to the given \a stream and returns a
     reference to the stream.
 
     \sa {Format of the QDataStream Operators}
diff --git a/src/corelib/tools/qstringlist.cpp b/src/corelib/tools/qstringlist.cpp
index 386321f1..e22f122 100644
--- a/src/corelib/tools/qstringlist.cpp
+++ b/src/corelib/tools/qstringlist.cpp
@@ -397,7 +397,7 @@ void QtPrivate::QStringList_replaceInStrings(QStringList *that, const QRegExp &r
     \fn QString QStringList::join(const QString &separator) const
 
     Joins all the string list's strings into a single string with each
-    element separated by the the given \a separator (which can be an
+    element separated by the given \a separator (which can be an
     empty string).
 
     \sa QString::split()