diff options
author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
---|---|---|
committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 08:54:45 +0200 |
commit | b62bd0584a7872b6917917009b707785b3abd077 (patch) | |
tree | 9981f274712c098cabbff0c4667672a3934e5393 /src/gui/graphicsview/qgraphicslayoutitem_p.h | |
parent | 5e10745dca1d10025404a9f268f03ae697fb10cc (diff) | |
parent | 97baad65f65783d2b5ff938f6217aec9434f2e5f (diff) |
Merge branch 'refactor'
Conflicts:
mkspecs/qws/linux-lsb-g++/qmake.conf
src/gui/image/qpixmap_mac.cpp
src/gui/painting/qpaintengine_x11.cpp
src/gui/painting/qtessellator.cpp
src/gui/text/qfontengine_qws.cpp
src/gui/text/qfontengine_x11.cpp
src/gui/widgets/qlinecontrol.cpp
src/opengl/qgl.h
src/opengl/qgl_x11egl.cpp
src/plugins/plugins.pro
Change-Id: If52dcd55cd55f2983a756c2f843967702b60a310
Diffstat (limited to 'src/gui/graphicsview/qgraphicslayoutitem_p.h')
-rw-r--r-- | src/gui/graphicsview/qgraphicslayoutitem_p.h | 103 |
1 files changed, 0 insertions, 103 deletions
diff --git a/src/gui/graphicsview/qgraphicslayoutitem_p.h b/src/gui/graphicsview/qgraphicslayoutitem_p.h deleted file mode 100644 index c44dd81d29..0000000000 --- a/src/gui/graphicsview/qgraphicslayoutitem_p.h +++ /dev/null @@ -1,103 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the QtGui module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** 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.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 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. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#ifndef QGRAPHICSLAYOUTITEM_P_H -#define QGRAPHICSLAYOUTITEM_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of other Qt classes. This header file may change from version to -// version without notice, or even be removed. -// -// We mean it. -// - -#include <QtCore/QSizeF> -#include <QtGui/QSizePolicy> - -QT_BEGIN_NAMESPACE - -class QGraphicsLayoutItem; -class Q_AUTOTEST_EXPORT QGraphicsLayoutItemPrivate -{ - Q_DECLARE_PUBLIC(QGraphicsLayoutItem) -public: - virtual ~QGraphicsLayoutItemPrivate(); - QGraphicsLayoutItemPrivate(QGraphicsLayoutItem *parent, bool isLayout); - static QGraphicsLayoutItemPrivate *get(QGraphicsLayoutItem *q) { return q->d_func();} - static const QGraphicsLayoutItemPrivate *get(const QGraphicsLayoutItem *q) { return q->d_func();} - - void init(); - QSizeF *effectiveSizeHints(const QSizeF &constraint) const; - QGraphicsItem *parentItem() const; - void ensureUserSizeHints(); - void setSize(Qt::SizeHint which, const QSizeF &size); - enum SizeComponent { Width, Height }; - void setSizeComponent(Qt::SizeHint which, SizeComponent component, qreal value); - - bool hasHeightForWidth() const; - bool hasWidthForHeight() const; - - QSizePolicy sizePolicy; - QGraphicsLayoutItem *parent; - - QSizeF *userSizeHints; - mutable QSizeF cachedSizeHints[Qt::NSizeHints]; - mutable QSizeF cachedConstraint; - mutable QSizeF cachedSizeHintsWithConstraints[Qt::NSizeHints]; - - mutable quint32 sizeHintCacheDirty : 1; - mutable quint32 sizeHintWithConstraintCacheDirty : 1; - quint32 isLayout : 1; - quint32 ownedByLayout : 1; - - QGraphicsLayoutItem *q_ptr; - QRectF geom; - QGraphicsItem *graphicsItem; -}; - -QT_END_NAMESPACE - -#endif //QGRAPHICSLAYOUTITEM_P_H - |