1 files changed, 23 insertions, 86 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h
index fe4bac12bc..e45e18c484 100644
--- a/src/widgets/graphicsview/qgraphicsitem_p.h
+++ b/src/widgets/graphicsview/qgraphicsitem_p.h
@@ -1,31 +1,37 @@
 /****************************************************************************
 **
-** Copyright (C) 2015 The Qt Company Ltd.
-** Contact: http://www.qt.io/licensing/
+** Copyright (C) 2016 The Qt Company Ltd.
+** Contact: https://www.qt.io/licensing/
 **
 ** This file is part of the QtWidgets module of the Qt Toolkit.
 **
-** $QT_BEGIN_LICENSE:LGPL21$
+** $QT_BEGIN_LICENSE:LGPL$
 ** Commercial License Usage
 ** Licensees holding valid commercial Qt licenses may use this file in
 ** accordance with the commercial license agreement provided with the
 ** Software or, alternatively, in accordance with the terms contained in
 ** a written agreement between you and The Qt Company. For licensing terms
-** and conditions see http://www.qt.io/terms-conditions. For further
-** information use the contact form at http://www.qt.io/contact-us.
+** and conditions see https://www.qt.io/terms-conditions. For further
+** information use the contact form at https://www.qt.io/contact-us.
 **
 ** 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 or version 3 as published by the Free
-** Software Foundation and appearing in the file LICENSE.LGPLv21 and
-** LICENSE.LGPLv3 included in the packaging of this file. Please review the
-** following information to ensure the GNU Lesser General Public License
-** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
-** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+** General Public License version 3 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL3 included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 3 requirements
+** will be met: https://www.gnu.org/licenses/lgpl-3.0.html.
 **
-** As a special exception, The Qt Company gives you certain additional
-** rights. These rights are described in The Qt Company LGPL Exception
-** version 1.1, 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 2.0 or (at your option) the GNU General
+** Public license version 3 or any later version approved by the KDE Free
+** Qt Foundation. The licenses are as published by the Free Software
+** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3
+** included in the packaging of this file. Please review the following
+** information to ensure the GNU General Public License requirements will
+** be met: https://www.gnu.org/licenses/gpl-2.0.html and
+** https://www.gnu.org/licenses/gpl-3.0.html.
 **
 ** $QT_END_LICENSE$
 **
@@ -168,77 +174,8 @@ public:
         AncestorContainsChildren = 0x10
     };
 
-    inline QGraphicsItemPrivate()
-        : z(0),
-        opacity(1.),
-        scene(0),
-        parent(0),
-        transformData(0),
-        graphicsEffect(0),
-        index(-1),
-        siblingIndex(-1),
-        itemDepth(-1),
-        focusProxy(0),
-        subFocusItem(0),
-        focusScopeItem(0),
-        imHints(Qt::ImhNone),
-        panelModality(QGraphicsItem::NonModal),
-        acceptedMouseButtons(0x1f),
-        visible(1),
-        explicitlyHidden(0),
-        enabled(1),
-        explicitlyDisabled(0),
-        selected(0),
-        acceptsHover(0),
-        acceptDrops(0),
-        isMemberOfGroup(0),
-        handlesChildEvents(0),
-        itemDiscovered(0),
-        hasCursor(0),
-        ancestorFlags(0),
-        cacheMode(0),
-        hasBoundingRegionGranularity(0),
-        isWidget(0),
-        dirty(0),
-        dirtyChildren(0),
-        localCollisionHack(0),
-        inSetPosHelper(0),
-        needSortChildren(0),
-        allChildrenDirty(0),
-        fullUpdatePending(0),
-        flags(0),
-        paintedViewBoundingRectsNeedRepaint(0),
-        dirtySceneTransform(1),
-        geometryChanged(1),
-        inDestructor(0),
-        isObject(0),
-        ignoreVisible(0),
-        ignoreOpacity(0),
-        acceptTouchEvents(0),
-        acceptedTouchBeginEvent(0),
-        filtersDescendantEvents(0),
-        sceneTransformTranslateOnly(0),
-        notifyBoundingRectChanged(0),
-        notifyInvalidated(0),
-        mouseSetsFocus(1),
-        explicitActivate(0),
-        wantsActive(0),
-        holesInSiblingIndex(0),
-        sequentialOrdering(1),
-        updateDueToGraphicsEffect(0),
-        scenePosDescendants(0),
-        pendingPolish(0),
-        mayHaveChildWithGraphicsEffect(0),
-        isDeclarativeItem(0),
-        sendParentChangeNotification(0),
-        dirtyChildrenBoundingRect(1),
-        globalStackingOrder(-1),
-        q_ptr(0)
-    {
-    }
-
-    inline virtual ~QGraphicsItemPrivate()
-    { }
+    QGraphicsItemPrivate();
+    virtual ~QGraphicsItemPrivate();
 
     static const QGraphicsItemPrivate *get(const QGraphicsItem *item)
     {
@@ -354,7 +291,7 @@ public:
 
     struct ExtraStruct {
         ExtraStruct() {} // for QVector, don't use
-        ExtraStruct(Extra type, QVariant value)
+        ExtraStruct(Extra type, const QVariant &value)
             : type(type), value(value)
         { }