Changeset 561 for trunk/src/gui/widgets/qdockarealayout_p.h

Timestamp:

Feb 11, 2010, 11:19:06 PM (15 years ago)

Author:

Dmitry A. Kuminov

Message:

trunk: Merged in qt 4.6.1 sources.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/gui/widgets/qdockarealayout_p.h (modified) (13 diffs)

trunk/src/gui/widgets/qdockarealayout_p.h

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information (qt-info@nokia.com)
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
 **
 ** This file is part of the QtGui module of the Qt Toolkit.
@@ -21 +22 @@
 ** 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.0, included in the file LGPL_EXCEPTION.txt in this
-** package.
+** 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
@@ -34 +34 @@
 ** met: http://www.gnu.org/copyleft/gpl.html.
 **
-** If you are unsure which license is appropriate for your use, please
-** contact the sales department at qt-sales@nokia.com.
+** If you have questions regarding the use of this file, please contact
+** Nokia at qt-info@nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -104 +104 @@
     QSize sizeHint() const;
     bool expansive(Qt::Orientation o) const;
+    bool hasFixedSize(Qt::Orientation o) const;
 
     QLayoutItem *widgetItem;
@@ -136 +137 @@
     QSize size() const;
 
-    bool insertGap(QList<int> path, QLayoutItem *dockWidgetItem);
-    QLayoutItem *plug(QList<int> path);
-    QLayoutItem *unplug(QList<int> path);
+    bool insertGap(const QList<int> &path, QLayoutItem *dockWidgetItem);
+    QLayoutItem *plug(const QList<int> &path);
+    QLayoutItem *unplug(const QList<int> &path);
     enum TabMode { NoTabs, AllowTabs, ForceTabs };
     QList<int> gapIndex(const QPoint &pos, bool nestingEnabled,
                             TabMode tabMode) const;
-    void remove(QList<int> path);
+    void remove(const QList<int> &path);
     void unnest(int index);
     void split(int index, Qt::Orientation orientation, QLayoutItem *dockWidgetItem);
     void tab(int index, QLayoutItem *dockWidgetItem);
-    QDockAreaLayoutItem &item(QList<int> path);
-    QDockAreaLayoutInfo *info(QList<int> path);
+    QDockAreaLayoutItem &item(const QList<int> &path);
+    QDockAreaLayoutInfo *info(const QList<int> &path);
     QDockAreaLayoutInfo *info(QWidget *widget);
 
@@ -162 +163 @@
     int changeSize(int index, int size, bool below);
     QRect itemRect(int index) const;
-    QRect itemRect(QList<int> path) const;
+    QRect itemRect(const QList<int> &path) const;
     QRect separatorRect(int index) const;
-    QRect separatorRect(QList<int> path) const;
+    QRect separatorRect(const QList<int> &path) const;
 
     void clear();
     bool isEmpty() const;
+    bool hasFixedSize() const;
     QList<int> findSeparator(const QPoint &pos) const;
     int next(int idx) const;
@@ -180 +182 @@
                             const QPoint &mouse) const;
     QRegion separatorRegion() const;
-    int separatorMove(int index, int delta, QVector<QLayoutStruct> *cache);
+    int separatorMove(int index, int delta);
 
     QLayoutItem *itemAt(int *x, int index) const;
@@ -189 +191 @@
 
     int sep;
-    QVector<QWidget*> separatorWidgets;
+    mutable QVector<QWidget*> separatorWidgets;
     QInternal::DockPosition dockPos;
     Qt::Orientation o;
@@ -195 +197 @@
     QMainWindow *mainWindow;
     QList<QDockAreaLayoutItem> item_list;
-
+#ifndef QT_NO_TABBAR
     void updateSeparatorWidgets() const;
     QSet<QWidget*> usedSeparatorWidgets() const;
+#endif //QT_NO_TABBAR
 
 #ifndef QT_NO_TABBAR
@@ -232 +235 @@
     QDockAreaLayoutInfo docks[4];
     int sep; // separator extent
-    QVector<QWidget*> separatorWidgets;
+    bool fallbackToSizeHints; //determines if we should use the sizehint for the dock areas (true until the layout is restored or the central widget is set)
+    mutable QVector<QWidget*> separatorWidgets;
 
     bool isValid() const;
@@ -245 +249 @@
     QList<int> findSeparator(const QPoint &pos) const;
 
-    QDockAreaLayoutItem &item(QList<int> path);
-    QDockAreaLayoutInfo *info(QList<int> path);
-    const QDockAreaLayoutInfo *info(QList<int> path) const;
+    QDockAreaLayoutItem &item(const QList<int> &path);
+    QDockAreaLayoutInfo *info(const QList<int> &path);
+    const QDockAreaLayoutInfo *info(const QList<int> &path) const;
     QDockAreaLayoutInfo *info(QWidget *widget);
-    QRect itemRect(QList<int> path) const;
+    QRect itemRect(const QList<int> &path) const;
     QRect separatorRect(int index) const;
-    QRect separatorRect(QList<int> path) const;
-
-    bool insertGap(QList<int> path, QLayoutItem *dockWidgetItem);
-    QLayoutItem *plug(QList<int> path);
-    QLayoutItem *unplug(QList<int> path);
-    void remove(QList<int> path);
+    QRect separatorRect(const QList<int> &path) const;
+
+    bool insertGap(const QList<int> &path, QLayoutItem *dockWidgetItem);
+    QLayoutItem *plug(const QList<int> &path);
+    QLayoutItem *unplug(const QList<int> &path);
+    void remove(const QList<int> &path);
 
     void fitLayout();
@@ -276 +280 @@
                             const QPoint &mouse) const;
     QRegion separatorRegion() const;
-    int separatorMove(QList<int> separator, const QPoint &origin, const QPoint &dest,
-                        QVector<QLayoutStruct> *cache);
+    int separatorMove(const QList<int> &separator, const QPoint &origin, const QPoint &dest);
+#ifndef QT_NO_TABBAR
     void updateSeparatorWidgets() const;
+#endif //QT_NO_TABBAR
 
     QLayoutItem *itemAt(int *x, int index) const;
@@ -289 +294 @@
                     QVector<QLayoutStruct> *hor_struct_list);
 
-    QRect gapRect(QList<int> path) const;
+    QRect gapRect(const QList<int> &path) const;
 
     void keepSize(QDockWidget *w);
-
+#ifndef QT_NO_TABBAR
     QSet<QTabBar*> usedTabBars() const;
     QSet<QWidget*> usedSeparatorWidgets() const;
+#endif //QT_NO_TABBAR
 };