Changeset 561 for trunk/src/qt3support/widgets/q3dockarea.cpp

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/qt3support/widgets/q3dockarea.cpp (modified) (6 diffs)

trunk/src/qt3support/widgets/q3dockarea.cpp

@@ -2 +2 @@
 **
 ** Copyright (C) 2009 Nokia Corporation and/or its subsidiary(-ies).
-** Contact: Qt Software Information ([email protected])
+** All rights reserved.
+** Contact: Nokia Corporation ([email protected])
 **
 ** This file is part of the Qt3Support 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 
+** @nokia.com.
 ** $QT_END_LICENSE$
 **
@@ -474 +474 @@
 
     QMainWindow contains four Q3DockAreas which you can use for your
-    Q3ToolBars and Q3DockWindows, so in most situations you do not need
-    to use the Q3DockArea class directly. Although QMainWindow contains
-    support for its own dock areas it isn't convenient for adding new
-    Q3DockAreas. If you need to create your own dock areas we suggest
-    that you create a subclass of QWidget and add your Q3DockAreas to
-    your subclass.
+    Q3ToolBars and Q3DockWindows, so in most situations you do not
+    need to use the Q3DockArea class directly. Although QMainWindow
+    contains support for its own dock areas, you can't add new ones.
+    You also can't add a Q3DockArea to your own subclass of QWidget.
+    It won't be shown.
 
     \img qmainwindow-qdockareas.png QMainWindow's Q3DockAreas
 
     \target lines
-    \e Lines. Q3DockArea uses the concept of lines. A line is a
-    horizontal region which may contain dock windows side-by-side. A
-    dock area may have room for more than one line. When dock windows
-    are docked into a dock area they are usually added at the right
-    hand side of the top-most line that has room (unless manually
-    placed by the user). When users move dock windows they may leave
-    empty lines or gaps in non-empty lines. Qt::Dock windows can be lined
-    up to minimize wasted space using the lineUp() function.
+    \section1 Lines.
+
+    Q3DockArea uses the concept of lines. A line is a horizontal
+    region which may contain dock windows side-by-side. A dock area
+    may have room for more than one line. When dock windows are docked
+    into a dock area they are usually added at the right hand side of
+    the top-most line that has room (unless manually placed by the
+    user). When users move dock windows they may leave empty lines or
+    gaps in non-empty lines. Qt::Dock windows can be lined up to
+    minimize wasted space using the lineUp() function.
 
     The Q3DockArea class maintains a position list of all its child
@@ -1019 +1020 @@
             dw->setNewLine(false);
     }
+
     layout->activate();
 }
@@ -1138 +1140 @@
     if (accept)
         forbiddenWidgets.removeAll(dw);
-    else if (forbiddenWidgets.contains(dw))
+    else if (forbiddenWidgets.contains(dw))
         forbiddenWidgets.append(dw);
 }