Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/oslo-staging-2

12 files changed, 38 insertions, 38 deletions

diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h
index 28ac377..6bcc95b 100644
--- a/src/corelib/global/qglobal.h
+++ b/src/corelib/global/qglobal.h
@@ -2041,8 +2041,7 @@ enum { /* TYPEINFO flags */
     Q_DUMMY_TYPE = 0x4
 };
 
-#define Q_DECLARE_TYPEINFO_TEMPLATE(TYPE, FLAGS, TEMPLATE_ARG) \
-template <TEMPLATE_ARG> \
+#define Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS) \
 class QTypeInfo<TYPE > \
 { \
 public: \
@@ -2057,7 +2056,8 @@ public: \
 }
 
 #define Q_DECLARE_TYPEINFO(TYPE, FLAGS) \
-Q_DECLARE_TYPEINFO_TEMPLATE(TYPE, FLAGS,  )
+template<> \
+Q_DECLARE_TYPEINFO_BODY(TYPE, FLAGS)
 
 
 template <typename T>
diff --git a/src/corelib/tools/qsharedpointer_impl.h b/src/corelib/tools/qsharedpointer_impl.h
index 9e40bd5..2329470 100644
--- a/src/corelib/tools/qsharedpointer_impl.h
+++ b/src/corelib/tools/qsharedpointer_impl.h
@@ -844,8 +844,8 @@ qobject_cast(const QWeakPointer<T> &src)
 #endif
 
 
-Q_DECLARE_TYPEINFO_TEMPLATE(QWeakPointer<T>, Q_MOVABLE_TYPE, typename T);
-Q_DECLARE_TYPEINFO_TEMPLATE(QSharedPointer<T>, Q_MOVABLE_TYPE, typename T);
+template<typename T> Q_DECLARE_TYPEINFO_BODY(QWeakPointer<T>, Q_MOVABLE_TYPE);
+template<typename T> Q_DECLARE_TYPEINFO_BODY(QSharedPointer<T>, Q_MOVABLE_TYPE);
 
 
 QT_END_NAMESPACE
diff --git a/src/gui/graphicsview/qgraphicsgridlayout.h b/src/gui/graphicsview/qgraphicsgridlayout.h
index 6580a02..ddfb447 100644
--- a/src/gui/graphicsview/qgraphicsgridlayout.h
+++ b/src/gui/graphicsview/qgraphicsgridlayout.h
@@ -109,7 +109,7 @@ public:
     int columnCount() const;
 
     QGraphicsLayoutItem *itemAt(int row, int column) const;
-    
+
     // inherited from QGraphicsLayout
     int count() const;
     QGraphicsLayoutItem *itemAt(int index) const;
diff --git a/src/gui/graphicsview/qgraphicsitem.cpp b/src/gui/graphicsview/qgraphicsitem.cpp
index b867345..d1f6eb3 100644
--- a/src/gui/graphicsview/qgraphicsitem.cpp
+++ b/src/gui/graphicsview/qgraphicsitem.cpp
@@ -7618,9 +7618,9 @@ int QGraphicsItemPrivate::children_count(QDeclarativeListProperty<QGraphicsObjec
 QGraphicsObject *QGraphicsItemPrivate::children_at(QDeclarativeListProperty<QGraphicsObject> *list, int index)
 {
     QGraphicsItemPrivate *d = QGraphicsItemPrivate::get(static_cast<QGraphicsObject *>(list->object));
-    if (index >= 0 && index < d->children.count()) 
+    if (index >= 0 && index < d->children.count())
         return d->children.at(index)->toGraphicsObject();
-    else 
+    else
         return 0;
 }
 
diff --git a/src/gui/graphicsview/qgraphicsitemanimation.cpp b/src/gui/graphicsview/qgraphicsitemanimation.cpp
index 9cb9a8d..9689616 100644
--- a/src/gui/graphicsview/qgraphicsitemanimation.cpp
+++ b/src/gui/graphicsview/qgraphicsitemanimation.cpp
@@ -49,20 +49,20 @@
 
     The QGraphicsItemAnimation class animates a QGraphicsItem. You can
     schedule changes to the item's transformation matrix at
-    specified steps. The QGraphicsItemAnimation class has a 
-    current step value. When this value changes the transformations 
-    scheduled at that step are performed. The current step of the 
+    specified steps. The QGraphicsItemAnimation class has a
+    current step value. When this value changes the transformations
+    scheduled at that step are performed. The current step of the
     animation is set with the \c setStep() function.
 
     QGraphicsItemAnimation will do a simple linear interpolation
-    between the nearest adjacent scheduled changes to calculate the 
+    between the nearest adjacent scheduled changes to calculate the
     matrix. For instance, if you set the position of an item at values
     0.0 and 1.0, the animation will show the item moving in a straight
-    line between these positions. The same is true for scaling and 
+    line between these positions. The same is true for scaling and
     rotation.
 
     It is usual to use the class with a QTimeLine. The timeline's
-    \l{QTimeLine::}{valueChanged()} signal is then connected to the 
+    \l{QTimeLine::}{valueChanged()} signal is then connected to the
     \c setStep() slot. For example, you can set up an item for rotation
     by calling \c setRotationAt() for different step values.
     The animations timeline is set with the setTimeLine() function.
@@ -286,7 +286,7 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::posList() const
     QList<QPair<qreal, QPointF> > list;
     for (int i = 0; i < d->xPosition.size(); ++i)
         list << QPair<qreal, QPointF>(d->xPosition.at(i).step, QPointF(d->xPosition.at(i).value, d->yPosition.at(i).value));
-    
+
     return list;
 }
 
@@ -343,7 +343,7 @@ QList<QPair<qreal, qreal> > QGraphicsItemAnimation::rotationList() const
     QList<QPair<qreal, qreal> > list;
     for (int i = 0; i < d->rotation.size(); ++i)
         list << QPair<qreal, qreal>(d->rotation.at(i).step, d->rotation.at(i).value);
-    
+
     return list;
 }
 
@@ -395,7 +395,7 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::translationList() const
     QList<QPair<qreal, QPointF> > list;
     for (int i = 0; i < d->xTranslation.size(); ++i)
         list << QPair<qreal, QPointF>(d->xTranslation.at(i).step, QPointF(d->xTranslation.at(i).value, d->yTranslation.at(i).value));
-    
+
     return list;
 }
 
@@ -447,7 +447,7 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::scaleList() const
     QList<QPair<qreal, QPointF> > list;
     for (int i = 0; i < d->horizontalScale.size(); ++i)
         list << QPair<qreal, QPointF>(d->horizontalScale.at(i).step, QPointF(d->horizontalScale.at(i).value, d->verticalScale.at(i).value));
-    
+
     return list;
 }
 
@@ -499,7 +499,7 @@ QList<QPair<qreal, QPointF> > QGraphicsItemAnimation::shearList() const
     QList<QPair<qreal, QPointF> > list;
     for (int i = 0; i < d->horizontalShear.size(); ++i)
         list << QPair<qreal, QPointF>(d->horizontalShear.at(i).step, QPointF(d->horizontalShear.at(i).value, d->verticalShear.at(i).value));
-    
+
     return list;
 }
 
diff --git a/src/gui/graphicsview/qgraphicslayout.cpp b/src/gui/graphicsview/qgraphicslayout.cpp
index 86b4589..91f386f 100644
--- a/src/gui/graphicsview/qgraphicslayout.cpp
+++ b/src/gui/graphicsview/qgraphicslayout.cpp
@@ -145,7 +145,7 @@ QT_BEGIN_NAMESPACE
 
 /*!
     Contructs a QGraphicsLayout object.
-    
+
     \a parent is passed to QGraphicsLayoutItem's constructor and the
     QGraphicsLayoutItem's isLayout argument is set to \e true.
 
@@ -259,7 +259,7 @@ void QGraphicsLayout::activate()
         return;
 
     d->activateRecursive(this);
-    
+
     // we don't call activate on a sublayout, but somebody might.
     // Therefore, we walk to the parentitem of the toplevel layout.
     QGraphicsLayoutItem *parentItem = this;
@@ -270,7 +270,7 @@ void QGraphicsLayout::activate()
     Q_ASSERT(!parentItem->isLayout());
 
     setGeometry(parentItem->contentsRect());    // relayout children
-    
+
     // ### bug, should be parentItem ?
     parentLayoutItem()->updateGeometry();            // bubble up; will set activated to false
     // ### too many resizes? maybe we should walk up the chain to the
@@ -307,7 +307,7 @@ void QGraphicsLayout::invalidate()
         // does not call the base implementation? In addition, updateGeometry()
         // does more than we need.
         layoutItem->d_func()->sizeHintCacheDirty = true;
-        layoutItem = layoutItem->parentLayoutItem();        
+        layoutItem = layoutItem->parentLayoutItem();
     }
     if (layoutItem)
         layoutItem->d_func()->sizeHintCacheDirty = true;
@@ -347,7 +347,7 @@ void QGraphicsLayout::updateGeometry()
     widget. QGraphicsLayout uses this event handler to listen for layout
     related events such as geometry changes, layout changes or layout
     direction changes.
-    
+
     \a e is a pointer to the event.
 
     You can reimplement this event handler to track similar events for your
diff --git a/src/gui/graphicsview/qgraphicslayout_p.cpp b/src/gui/graphicsview/qgraphicslayout_p.cpp
index 88652ec..163fc65 100644
--- a/src/gui/graphicsview/qgraphicslayout_p.cpp
+++ b/src/gui/graphicsview/qgraphicslayout_p.cpp
@@ -136,13 +136,13 @@ static bool removeLayoutItemFromLayout(QGraphicsLayout *lay, QGraphicsLayoutItem
 /*!
     \internal
 
-    This function is called from subclasses to add a layout item \a layoutItem 
+    This function is called from subclasses to add a layout item \a layoutItem
     to a layout.
 
     It takes care of automatically reparenting graphics items, if needed.
 
     If \a layoutItem is a  is already in a layout, it will remove it  from that layout.
-    
+
 */
 void QGraphicsLayoutPrivate::addChildLayoutItem(QGraphicsLayoutItem *layoutItem)
 {
@@ -150,14 +150,14 @@ void QGraphicsLayoutPrivate::addChildLayoutItem(QGraphicsLayoutItem *layoutItem)
     if (QGraphicsLayoutItem *maybeLayout = layoutItem->parentLayoutItem()) {
         if (maybeLayout->isLayout())
             removeLayoutItemFromLayout(static_cast<QGraphicsLayout*>(maybeLayout), layoutItem);
-    }    
+    }
     layoutItem->setParentLayoutItem(q);
     if (layoutItem->isLayout()) {
         if (QGraphicsItem *parItem = parentItem()) {
             static_cast<QGraphicsLayout*>(layoutItem)->d_func()->reparentChildItems(parItem);
         }
     } else {
-        if (QGraphicsItem *item = layoutItem->graphicsItem()) {        
+        if (QGraphicsItem *item = layoutItem->graphicsItem()) {
             QGraphicsItem *newParent = parentItem();
             QGraphicsItem *oldParent = item->parentItem();
             if (oldParent == newParent || !newParent)
@@ -182,7 +182,7 @@ void QGraphicsLayoutPrivate::activateRecursive(QGraphicsLayoutItem *item)
         QGraphicsLayout *layout = static_cast<QGraphicsLayout *>(item);
         if (layout->d_func()->activated)
             layout->invalidate();
-        
+
         for (int i = layout->count() - 1; i >= 0; --i) {
             QGraphicsLayoutItem *childItem = layout->itemAt(i);
             if (childItem)
@@ -194,5 +194,5 @@ void QGraphicsLayoutPrivate::activateRecursive(QGraphicsLayoutItem *item)
 
 
 QT_END_NAMESPACE
-        
+
 #endif //QT_NO_GRAPHICSVIEW
diff --git a/src/gui/graphicsview/qgraphicslayout_p.h b/src/gui/graphicsview/qgraphicslayout_p.h
index 3083555..5c8e706 100644
--- a/src/gui/graphicsview/qgraphicslayout_p.h
+++ b/src/gui/graphicsview/qgraphicslayout_p.h
@@ -84,7 +84,7 @@ class QLayoutStyleInfo
 public:
     inline QLayoutStyleInfo() { invalidate(); }
     inline QLayoutStyleInfo(QStyle *style, QWidget *widget)
-        : m_valid(true), m_style(style), m_widget(widget) 
+        : m_valid(true), m_style(style), m_widget(widget)
     {
         Q_ASSERT(style);
         if (widget) //###
@@ -112,7 +112,7 @@ public:
         return m_defaultSpacing[o - 1];
     }
 
-    inline qreal perItemSpacing(QSizePolicy::ControlType control1, 
+    inline qreal perItemSpacing(QSizePolicy::ControlType control1,
                                   QSizePolicy::ControlType control2,
                                   Qt::Orientation orientation) const
     {
@@ -132,7 +132,7 @@ class Q_AUTOTEST_EXPORT QGraphicsLayoutPrivate : public QGraphicsLayoutItemPriva
     Q_DECLARE_PUBLIC(QGraphicsLayout)
 
 public:
-    QGraphicsLayoutPrivate() : QGraphicsLayoutItemPrivate(0, true), left(-1.0), top(-1.0), right(-1.0), bottom(-1.0), 
+    QGraphicsLayoutPrivate() : QGraphicsLayoutItemPrivate(0, true), left(-1.0), top(-1.0), right(-1.0), bottom(-1.0),
         activated(true) { }
 
     void reparentChildItems(QGraphicsItem *newParent);
@@ -148,7 +148,7 @@ public:
 
 
 QT_END_NAMESPACE
-        
+
 #endif //QT_NO_GRAPHICSVIEW
 
 #endif
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.cpp b/src/gui/graphicsview/qgraphicslayoutitem.cpp
index 5a7f1af..f4d77f0 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.cpp
+++ b/src/gui/graphicsview/qgraphicslayoutitem.cpp
@@ -648,7 +648,7 @@ void QGraphicsLayoutItem::setMaximumHeight(qreal height)
     is equivalent to the item's position in parent coordinates).
 
     You must reimplement this function in a subclass of QGraphicsLayoutItem to
-    receive geometry updates. The layout will call this function when it does a 
+    receive geometry updates. The layout will call this function when it does a
     rearrangement.
 
     If \a rect is outside of the bounds of minimumSize and maximumSize, it
diff --git a/src/gui/graphicsview/qgraphicslayoutitem.h b/src/gui/graphicsview/qgraphicslayoutitem.h
index f707c62..cb894a4 100644
--- a/src/gui/graphicsview/qgraphicslayoutitem.h
+++ b/src/gui/graphicsview/qgraphicslayoutitem.h
@@ -118,7 +118,7 @@ protected:
 private:
     QSizeF *effectiveSizeHints(const QSizeF &constraint) const;
     Q_DECLARE_PRIVATE(QGraphicsLayoutItem)
-    
+
     friend class QGraphicsLayout;
 };
 
diff --git a/src/gui/graphicsview/qgraphicsview.cpp b/src/gui/graphicsview/qgraphicsview.cpp
index a83b528..8076a21 100644
--- a/src/gui/graphicsview/qgraphicsview.cpp
+++ b/src/gui/graphicsview/qgraphicsview.cpp
@@ -3703,7 +3703,7 @@ void QGraphicsView::drawForeground(QPainter *painter, const QRectF &rect)
 }
 
 /*!
-    \obsolete 
+    \obsolete
 
     Draws the items \a items in the scene using \a painter, after the
     background and before the foreground are drawn. \a numItems is the number
diff --git a/src/gui/graphicsview/qgraphicswidget_p.cpp b/src/gui/graphicsview/qgraphicswidget_p.cpp
index 28070da..d503cff 100644
--- a/src/gui/graphicsview/qgraphicswidget_p.cpp
+++ b/src/gui/graphicsview/qgraphicswidget_p.cpp
@@ -761,7 +761,7 @@ void QGraphicsWidgetPrivate::fixFocusChainBeforeReparenting(QGraphicsWidget *new
 
     QGraphicsWidget *firstOld = 0;
     bool wasPreviousNew = true;
-    
+
     while (w != q) {
         bool isCurrentNew = q->isAncestorOf(w);
         if (isCurrentNew) {