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/kernel/qlayout_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/kernel/qlayout_p.h')
-rw-r--r-- | src/gui/kernel/qlayout_p.h | 101 |
1 files changed, 0 insertions, 101 deletions
diff --git a/src/gui/kernel/qlayout_p.h b/src/gui/kernel/qlayout_p.h deleted file mode 100644 index 9e8d9cd355..0000000000 --- a/src/gui/kernel/qlayout_p.h +++ /dev/null @@ -1,101 +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 QLAYOUT_P_H -#define QLAYOUT_P_H - -// -// W A R N I N G -// ------------- -// -// This file is not part of the Qt API. It exists for the convenience -// of qlayout*.cpp, and qabstractlayout.cpp. This header -// file may change from version to version without notice, or even be removed. -// -// We mean it. -// - -#include "private/qobject_p.h" -#include "qstyle.h" -#include "qsizepolicy.h" - -QT_BEGIN_NAMESPACE - -class QWidgetItem; -class QSpacerItem; - -class Q_GUI_EXPORT QLayoutPrivate : public QObjectPrivate -{ - Q_DECLARE_PUBLIC(QLayout) - -public: - typedef QWidgetItem * (*QWidgetItemFactoryMethod)(const QLayout *layout, QWidget *widget); - typedef QSpacerItem * (*QSpacerItemFactoryMethod)(const QLayout *layout, int w, int h, QSizePolicy::Policy hPolicy, QSizePolicy::Policy); - - QLayoutPrivate(); - - void getMargin(int *result, int userMargin, QStyle::PixelMetric pm) const; - void doResize(const QSize &); - void reparentChildWidgets(QWidget *mw); - - static QWidgetItem *createWidgetItem(const QLayout *layout, QWidget *widget); - static QSpacerItem *createSpacerItem(const QLayout *layout, int w, int h, QSizePolicy::Policy hPolicy = QSizePolicy::Minimum, QSizePolicy::Policy vPolicy = QSizePolicy::Minimum); - - static QWidgetItemFactoryMethod widgetItemFactoryMethod; - static QSpacerItemFactoryMethod spacerItemFactoryMethod; - - int insideSpacing; - int userLeftMargin; - int userTopMargin; - int userRightMargin; - int userBottomMargin; - uint topLevel : 1; - uint enabled : 1; - uint activated : 1; - uint autoNewChild : 1; - QLayout::SizeConstraint constraint; - QRect rect; - QWidget *menubar; -}; - -QT_END_NAMESPACE - -#endif // QLAYOUT_P_H |