summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--doc/classchart.doc2
-rw-r--r--doc/html/annotated.html2
-rw-r--r--doc/html/application.html2
-rw-r--r--doc/html/classchart.html2
-rw-r--r--doc/html/classes.html2
-rw-r--r--doc/html/functions.html66
-rw-r--r--doc/html/headers.html2
-rw-r--r--doc/html/hierarchy.html2
-rw-r--r--doc/html/index90
-rw-r--r--doc/html/keyfeatures30.html2
-rw-r--r--doc/html/mainclasses.html2
-rw-r--r--doc/html/porting.html10
-rw-r--r--doc/html/propertydocs64
-rw-r--r--doc/html/propertyindex20
-rw-r--r--doc/html/qdockarea-h.html2
-rw-r--r--doc/html/qdockarea.html32
-rw-r--r--doc/html/qdockwindow-h.html10
-rw-r--r--doc/html/qdockwindow-members.html80
-rw-r--r--doc/html/qdockwindow.html48
-rw-r--r--doc/html/qframe.html2
-rw-r--r--doc/html/qmainwindow.html48
-rw-r--r--doc/html/qstyle.html14
-rw-r--r--doc/html/qt.dcf96
-rw-r--r--doc/html/qtoolbar-h.html2
-rw-r--r--doc/html/qtoolbar-members.html74
-rw-r--r--doc/html/qtoolbar.html20
-rw-r--r--doc/html/qtoolbutton.html2
-rw-r--r--doc/html/titleindex6
-rw-r--r--doc/man/man3/QDockWindow.3qt2
-rw-r--r--doc/man/man3/qdockwindow.3qt6
-rw-r--r--doc/man/man3/qmainwindow.3qt2
-rw-r--r--src/kernel/qaccel.cpp2
-rw-r--r--src/kernel/qapplication_x11.cpp8
-rw-r--r--src/kernel/qt.h2
-rw-r--r--src/styles/qmotifstyle.cpp2
-rw-r--r--src/styles/qwindowsstyle.cpp2
-rw-r--r--src/tools/qwinexport.cpp2
-rw-r--r--src/widgets/qdockarea.h2
-rw-r--r--src/widgets/qdockwindow.cpp8
-rw-r--r--src/widgets/qmainwindow.cpp2
-rw-r--r--src/widgets/qt_widgets.pri4
-rw-r--r--src/widgets/qtitlebar_p.h2
-rw-r--r--src/widgets/qtoolbar.cpp2
-rw-r--r--src/widgets/qtoolbar.h2
-rw-r--r--src/widgets/qtoolbutton.cpp2
-rw-r--r--src/workspace/qworkspace.cpp16
-rw-r--r--tools/assistant/mainwindow.ui2
-rw-r--r--tools/designer/designer/mainwindow.cpp2
-rw-r--r--tools/linguist/linguist/msgedit.cpp2
-rw-r--r--tools/linguist/linguist/trwindow.cpp2
50 files changed, 390 insertions, 390 deletions
diff --git a/doc/classchart.doc b/doc/classchart.doc
index 59862ce..c6816a5 100644
--- a/doc/classchart.doc
+++ b/doc/classchart.doc
@@ -200,7 +200,7 @@
<area shape="rect" coords="554,487,655,505" href="qprogressbar.html">
<area shape="rect" coords="554,505,657,521" href="qlcdnumber.html">
<area shape="rect" coords="554,521,657,540" href="qwidgetstack.html">
-<area shape="rect" coords="558,541,655,559" href="qdockwindow.html">
+<area shape="rect" coords="558,541,655,559" href="qdoctwindow.html">
<area shape="rect" coords="551,559,650,576" href="qtoolbar.html">
<area shape="rect" coords="551,576,661,595" href="qiconviewitem.html">
<area shape="rect" coords="554,595,661,610" href="qlistviewitem.html">
diff --git a/doc/html/annotated.html b/doc/html/annotated.html
index a911283..45b754f 100644
--- a/doc/html/annotated.html
+++ b/doc/html/annotated.html
@@ -125,7 +125,7 @@ body { background: #ffffff; color: black; }
<tr bgcolor=#f0f0f0><td><b><a href="qdirectpainter.html">QDirectPainter</a></b><td>Direct access to the video hardware
<tr bgcolor=#f0f0f0><td><b><a href="qdns.html">QDns</a></b><td>Asynchronous DNS lookups
<tr bgcolor=#f0f0f0><td><b><a href="qdockarea.html">QDockArea</a></b><td>Manages and lays out QDockWindows
-<tr bgcolor=#f0f0f0><td><b><a href="qdockwindow.html">QDockWindow</a></b><td>Widget which can be docked inside a QDockArea or floated as a top level window on the desktop
+<tr bgcolor=#f0f0f0><td><b><a href="qdoctwindow.html">QDockWindow</a></b><td>Widget which can be docked inside a QDockArea or floated as a top level window on the desktop
<tr bgcolor=#f0f0f0><td><b><a href="qdomattr.html">QDomAttr</a></b><td>Represents one attribute of a QDomElement
<tr bgcolor=#f0f0f0><td><b><a href="qdomcdatasection.html">QDomCDATASection</a></b><td>Represents an XML CDATA section
<tr bgcolor=#f0f0f0><td><b><a href="qdomcharacterdata.html">QDomCharacterData</a></b><td>Represents a generic string in the DOM
diff --git a/doc/html/application.html b/doc/html/application.html
index 836a0bc..bd7f11d 100644
--- a/doc/html/application.html
+++ b/doc/html/application.html
@@ -41,7 +41,7 @@ a statusbar, etc.
<tr bgcolor=#f0f0f0><td><b><a href="qactiongroup.html">QActionGroup</a></b><td>Groups actions together
<tr bgcolor=#f0f0f0><td><b><a href="qapplication.html">QApplication</a></b><td>Manages the GUI application's control flow and main settings
<tr bgcolor=#f0f0f0><td><b><a href="qdockarea.html">QDockArea</a></b><td>Manages and lays out QDockWindows
-<tr bgcolor=#f0f0f0><td><b><a href="qdockwindow.html">QDockWindow</a></b><td>Widget which can be docked inside a QDockArea or floated as a top level window on the desktop
+<tr bgcolor=#f0f0f0><td><b><a href="qdoctwindow.html">QDockWindow</a></b><td>Widget which can be docked inside a QDockArea or floated as a top level window on the desktop
<tr bgcolor=#f0f0f0><td><b><a href="qeventloop.html">QEventLoop</a></b><td>Manages the event queue
<tr bgcolor=#f0f0f0><td><b><a href="qmainwindow.html">QMainWindow</a></b><td>Main application window, with a menu bar, dock windows (e.g. for toolbars), and a status bar
<tr bgcolor=#f0f0f0><td><b><a href="qmenubar.html">QMenuBar</a></b><td>Horizontal menu bar
diff --git a/doc/html/classchart.html b/doc/html/classchart.html
index fbeabcd..0ffedf4 100644
--- a/doc/html/classchart.html
+++ b/doc/html/classchart.html
@@ -190,7 +190,7 @@ body { background: #ffffff; color: black; }
<area shape="rect" coords="554,487,655,505" href="qprogressbar.html">
<area shape="rect" coords="554,505,657,521" href="qlcdnumber.html">
<area shape="rect" coords="554,521,657,540" href="qwidgetstack.html">
-<area shape="rect" coords="558,541,655,559" href="qdockwindow.html">
+<area shape="rect" coords="558,541,655,559" href="qdoctwindow.html">
<area shape="rect" coords="551,559,650,576" href="qtoolbar.html">
<area shape="rect" coords="551,576,661,595" href="qiconviewitem.html">
<area shape="rect" coords="554,595,661,610" href="qlistviewitem.html">
diff --git a/doc/html/classes.html b/doc/html/classes.html
index b6827c8..a5c4aba 100644
--- a/doc/html/classes.html
+++ b/doc/html/classes.html
@@ -106,7 +106,7 @@ classes, see <a href="mainclasses.html">Qt's Main Classes</a>.
<td align="right">
<td><a href="qapplication.html">QApplication</a>
<td align="right">
-<td><a href="qdockwindow.html">QDockWindow</a>
+<td><a href="qdoctwindow.html">QDockWindow</a>
<td align="right">
<td><a href="qimageformat.html">QImageFormat</a>
<td align="right">
diff --git a/doc/html/functions.html b/doc/html/functions.html
index a780320..4a47b52 100644
--- a/doc/html/functions.html
+++ b/doc/html/functions.html
@@ -163,7 +163,7 @@ abort:
<a href="qapplication.html#applicationFilePath">QApplication</a><li>applyButtonPressed:
<a href="qtabdialog.html#applyButtonPressed">QTabDialog</a><li>appropriate:
<a href="qmainwindow.html#appropriate">QMainWindow</a> <a href="qwizard.html#appropriate">QWizard</a><li>area:
- <a href="qdockwindow.html#area">QDockWindow</a><li>areaPoints:
+ <a href="qdoctwindow.html#area">QDockWindow</a><li>areaPoints:
<a href="qcanvaspolygon.html#areaPoints">QCanvasPolygon</a> <a href="qcanvaspolygonalitem.html#areaPoints">QCanvasPolygonalItem</a><li>areaPointsAdvanced:
<a href="qcanvaspolygonalitem.html#areaPointsAdvanced">QCanvasPolygonalItem</a><li>arg:
<a href="qnpinstance.html#arg">QNPInstance</a> <a href="qnetworkoperation.html#arg">QNetworkOperation</a> <a href="qstring.html#arg">QString</a><li>argc:
@@ -295,7 +295,7 @@ back:
<a href="qsize.html#boundedTo">QSize</a><li>boundingRect:
<a href="qcanvasitem.html#boundingRect">QCanvasItem</a> <a href="qcanvaspolygonalitem.html#boundingRect">QCanvasPolygonalItem</a> <a href="qcanvassprite.html#boundingRect">QCanvasSprite</a> <a href="qcanvastext.html#boundingRect">QCanvasText</a> <a href="qfontmetrics.html#boundingRect">QFontMetrics</a> <a href="qpainter.html#boundingRect">QPainter</a> <a href="qpicture.html#boundingRect">QPicture</a> <a href="qpointarray.html#boundingRect">QPointArray</a> <a href="qregion.html#boundingRect">QRegion</a><li>boundingRectAdvanced:
<a href="qcanvasitem.html#boundingRectAdvanced">QCanvasItem</a><li>boxLayout:
- <a href="qdockwindow.html#boxLayout">QDockWindow</a><li>brightText:
+ <a href="qdoctwindow.html#boxLayout">QDockWindow</a><li>brightText:
<a href="qcolorgroup.html#brightText">QColorGroup</a><li>brush:
<a href="qcanvaspolygonalitem.html#brush">QCanvasPolygonalItem</a> <a href="qcolorgroup.html#brush">QColorGroup</a> <a href="qpainter.html#brush">QPainter</a> <a href="qpalette.html#brush">QPalette</a><li>brushOrigin:
<a href="qpainter.html#brushOrigin">QPainter</a><li>bsearch:
@@ -432,7 +432,7 @@ c:
<a href="qhttp.html#closeConnection">QHttp</a><li>closeEvent:
<a href="qwidget.html#closeEvent">QWidget</a><li>closeKeyboard:
<a href="qwsserver.html#closeKeyboard">QWSServer</a><li>closeMode:
- <a href="qdockwindow.html#closeMode">QDockWindow</a><li>closeMouse:
+ <a href="qdoctwindow.html#closeMode">QDockWindow</a><li>closeMouse:
<a href="qwsserver.html#closeMouse">QWSServer</a><li>closeStdin:
<a href="qprocess.html#closeStdin">QProcess</a><li>closed:
<a href="qcanvasspline.html#closed">QCanvasSpline</a><li>closingDown:
@@ -762,7 +762,7 @@ dark:
<a href="qtextedit.html#doKeyboardAction">QTextEdit</a><li>doLayout:
<a href="qlistbox.html#doLayout">QListBox</a><li>docName:
<a href="qprinter.html#docName">QPrinter</a><li>dock:
- <a href="qdockwindow.html#dock">QDockWindow</a><li>dockWindowList:
+ <a href="qdoctwindow.html#dock">QDockWindow</a><li>dockWindowList:
<a href="qdockarea.html#dockWindowList">QDockArea</a><li>dockWindowPositionChanged:
<a href="qmainwindow.html#dockWindowPositionChanged">QMainWindow</a><li>dockWindows:
<a href="qmainwindow.html#dockWindows">QMainWindow</a><li>dockWindowsMovable:
@@ -980,7 +980,7 @@ falseText:
<a href="qiconview.html#firstItem">QIconView</a> <a href="qlistbox.html#firstItem">QListBox</a><li>firstRecordAvailable:
<a href="qdatabrowser.html#firstRecordAvailable">QDataBrowser</a><li>fix:
<a href="qdateedit.html#fix">QDateEdit</a><li>fixedExtent:
- <a href="qdockwindow.html#fixedExtent">QDockWindow</a><li>fixedPitch:
+ <a href="qdoctwindow.html#fixedExtent">QDockWindow</a><li>fixedPitch:
<a href="qfont.html#fixedPitch">QFont</a> <a href="qfontinfo.html#fixedPitch">QFontInfo</a><li>fixup:
<a href="qvalidator.html#fixup">QValidator</a><li>flags:
<a href="qiodevice.html#flags">QIODevice</a> <a href="qtextstream.html#flags">QTextStream</a><li>flavor:
@@ -1325,7 +1325,7 @@ icon:
<a href="qgroupbox.html#isCheckable">QGroupBox</a> <a href="qpopupmenu.html#isCheckable">QPopupMenu</a><li>isChecked:
<a href="qcheckbox.html#isChecked">QCheckBox</a> <a href="qchecktableitem.html#isChecked">QCheckTableItem</a> <a href="qgroupbox.html#isChecked">QGroupBox</a> <a href="qradiobutton.html#isChecked">QRadioButton</a><li>isClickEnabled:
<a href="qheader.html#isClickEnabled">QHeader</a><li>isCloseEnabled:
- <a href="qdockwindow.html#isCloseEnabled">QDockWindow</a><li>isColumnHidden:
+ <a href="qdoctwindow.html#isCloseEnabled">QDockWindow</a><li>isColumnHidden:
<a href="qtable.html#isColumnHidden">QTable</a><li>isColumnReadOnly:
<a href="qtable.html#isColumnReadOnly">QTable</a><li>isColumnSelected:
<a href="qtable.html#isColumnSelected">QTable</a><li>isColumnStretchable:
@@ -1383,7 +1383,7 @@ icon:
<a href="qimage.html#isGrayscale">QImage</a><li>isHidden:
<a href="qfileinfo.html#isHidden">QFileInfo</a> <a href="qwidget.html#isHidden">QWidget</a><li>isHorizontalSliderPressed:
<a href="qscrollview.html#isHorizontalSliderPressed">QScrollView</a><li>isHorizontallyStretchable:
- <a href="qdockwindow.html#isHorizontallyStretchable">QDockWindow</a><li>isIPv4Address:
+ <a href="qdoctwindow.html#isHorizontallyStretchable">QDockWindow</a><li>isIPv4Address:
<a href="qhostaddress.html#isIPv4Address">QHostAddress</a><li>isIPv6Address:
<a href="qhostaddress.html#isIPv6Address">QHostAddress</a><li>isIdentity:
<a href="qwmatrix.html#isIdentity">QWMatrix</a><li>isInactive:
@@ -1405,7 +1405,7 @@ icon:
<a href="qwidget.html#isMinimized">QWidget</a><li>isModal:
<a href="qdialog.html#isModal">QDialog</a> <a href="qwidget.html#isModal">QWidget</a><li>isModified:
<a href="qlineedit.html#isModified">QLineEdit</a> <a href="qtextedit.html#isModified">QTextEdit</a><li>isMovingEnabled:
- <a href="qdockwindow.html#isMovingEnabled">QDockWindow</a> <a href="qheader.html#isMovingEnabled">QHeader</a><li>isNotation:
+ <a href="qdoctwindow.html#isMovingEnabled">QDockWindow</a> <a href="qheader.html#isMovingEnabled">QHeader</a><li>isNotation:
<a href="qdomnode.html#isNotation">QDomNode</a> <a href="qdomnotation.html#isNotation">QDomNotation</a><li>isNull:
<a href="qaxbase.html#isNull">QAxBase</a> <a href="qcstring.html#isNull">QCString</a> <a href="qchar.html#isNull">QChar</a> <a href="qdate.html#isNull">QDate</a> <a href="qdatetime.html#isNull">QDateTime</a> <a href="qdomimplementation.html#isNull">QDomImplementation</a> <a href="qdomnode.html#isNull">QDomNode</a> <a href="qguardedptr.html#isNull">QGuardedPtr</a> <a href="qhostaddress.html#isNull">QHostAddress</a> <a href="qiconset.html#isNull">QIconSet</a> <a href="qimage.html#isNull">QImage</a> <a href="qmemarray.html#isNull">QMemArray</a> <a href="qmovie.html#isNull">QMovie</a> <a href="qpicture.html#isNull">QPicture</a> <a href="qpixmap.html#isNull">QPixmap</a> <a href="qpoint.html#isNull">QPoint</a> <a href="qptrvector.html#isNull">QPtrVector</a> <a href="qrect.html#isNull">QRect</a> <a href="qregion.html#isNull">QRegion</a> <a href="qsize.html#isNull">QSize</a> <a href="qsqlcursor.html#isNull">QSqlCursor</a> <a href="qsqlfield.html#isNull">QSqlField</a> <a href="qsqlquery.html#isNull">QSqlQuery</a> <a href="qsqlrecord.html#isNull">QSqlRecord</a> <a href="qsqlresult.html#isNull">QSqlResult</a> <a href="qstring.html#isNull">QString</a> <a href="qtime.html#isNull">QTime</a> <a href="quuid.html#isNull">QUuid</a> <a href="qvariant.html#isNull">QVariant</a><li>isNumber:
<a href="qchar.html#isNumber">QChar</a><li>isOn:
@@ -1435,7 +1435,7 @@ icon:
<a href="qiconview.html#isRenaming">QIconView</a> <a href="qlistview.html#isRenaming">QListView</a><li>isReplaceable:
<a href="qtableitem.html#isReplaceable">QTableItem</a><li>isRequired:
<a href="qsqlfieldinfo.html#isRequired">QSqlFieldInfo</a><li>isResizeEnabled:
- <a href="qdockwindow.html#isResizeEnabled">QDockWindow</a> <a href="qheader.html#isResizeEnabled">QHeader</a><li>isRoot:
+ <a href="qdoctwindow.html#isResizeEnabled">QDockWindow</a> <a href="qheader.html#isResizeEnabled">QHeader</a><li>isRoot:
<a href="qdir.html#isRoot">QDir</a><li>isRowHidden:
<a href="qtable.html#isRowHidden">QTable</a><li>isRowReadOnly:
<a href="qtable.html#isRowReadOnly">QTable</a><li>isRowSelected:
@@ -1459,7 +1459,7 @@ icon:
<a href="qfontdatabase.html#isSmoothlyScalable">QFontDatabase</a><li>isSpace:
<a href="qchar.html#isSpace">QChar</a><li>isStretchEnabled:
<a href="qheader.html#isStretchEnabled">QHeader</a><li>isStretchable:
- <a href="qdockwindow.html#isStretchable">QDockWindow</a><li>isSupported:
+ <a href="qdoctwindow.html#isStretchable">QDockWindow</a><li>isSupported:
<a href="qdomnode.html#isSupported">QDomNode</a><li>isSymLink:
<a href="qfileinfo.html#isSymLink">QFileInfo</a> <a href="qurlinfo.html#isSymLink">QUrlInfo</a><li>isSymbol:
<a href="qchar.html#isSymbol">QChar</a><li>isSynchronous:
@@ -1479,7 +1479,7 @@ icon:
<a href="qwidget.html#isUpdatesEnabled">QWidget</a><li>isValid:
<a href="qaccessibleinterface.html#isValid">QAccessibleInterface</a> <a href="qaxscriptengine.html#isValid">QAxScriptEngine</a> <a href="qcanvaspixmaparray.html#isValid">QCanvasPixmapArray</a> <a href="qcanvaspolygonalitem.html#isValid">QCanvasPolygonalItem</a> <a href="qcolor.html#isValid">QColor</a> <a href="qdate.html#isValid">QDate</a> <a href="qdatetime.html#isValid">QDateTime</a> <a href="qglcontext.html#isValid">QGLContext</a> <a href="qglwidget.html#isValid">QGLWidget</a> <a href="qhttpheader.html#isValid">QHttpHeader</a> <a href="qrect.html#isValid">QRect</a> <a href="qregexp.html#isValid">QRegExp</a> <a href="qsize.html#isValid">QSize</a> <a href="qsocketdevice.html#isValid">QSocketDevice</a> <a href="qsqlquery.html#isValid">QSqlQuery</a> <a href="qsqlresult.html#isValid">QSqlResult</a> <a href="qtime.html#isValid">QTime</a> <a href="qurl.html#isValid">QUrl</a> <a href="qurlinfo.html#isValid">QUrlInfo</a> <a href="qvariant.html#isValid">QVariant</a><li>isVerticalSliderPressed:
<a href="qscrollview.html#isVerticalSliderPressed">QScrollView</a><li>isVerticallyStretchable:
- <a href="qdockwindow.html#isVerticallyStretchable">QDockWindow</a><li>isVirtualDesktop:
+ <a href="qdoctwindow.html#isVerticallyStretchable">QDockWindow</a><li>isVirtualDesktop:
<a href="qdesktopwidget.html#isVirtualDesktop">QDesktopWidget</a><li>isVisible:
<a href="qaction.html#isVisible">QAction</a> <a href="qcanvasitem.html#isVisible">QCanvasItem</a> <a href="qlistviewitem.html#isVisible">QListViewItem</a> <a href="qwswindow.html#isVisible">QWSWindow</a> <a href="qwidget.html#isVisible">QWidget</a><li>isVisibleTo:
<a href="qwidget.html#isVisibleTo">QWidget</a><li>isWidgetType:
@@ -1788,7 +1788,7 @@ name:
<a href="qserversocket.html#newConnection">QServerSocket</a><li>newInstance:
<a href="qnplugin.html#newInstance">QNPlugin</a><li>newItem:
<a href="qptrcollection.html#newItem">QPtrCollection</a><li>newLine:
- <a href="qdockwindow.html#newLine">QDockWindow</a> <a href="qmultilineedit.html#newLine">QMultiLineEdit</a><li>newPage:
+ <a href="qdoctwindow.html#newLine">QDockWindow</a> <a href="qmultilineedit.html#newLine">QMultiLineEdit</a><li>newPage:
<a href="qprinter.html#newPage">QPrinter</a><li>newStream:
<a href="qnpinstance.html#newStream">QNPInstance</a><li>newStreamCreated:
<a href="qnpinstance.html#newStreamCreated">QNPInstance</a><li>newWindow:
@@ -1839,7 +1839,7 @@ name:
object:
<a href="qaccessibleobject.html#object">QAccessibleObject</a> <a href="qaxaggregated.html#object">QAxAggregated</a><li>objectTrees:
<a href="qobject.html#objectTrees">QObject</a><li>offset:
- <a href="qdirectpainter.html#offset">QDirectPainter</a> <a href="qdockwindow.html#offset">QDockWindow</a> <a href="qheader.html#offset">QHeader</a> <a href="qimage.html#offset">QImage</a><li>offsetX:
+ <a href="qdirectpainter.html#offset">QDirectPainter</a> <a href="qdoctwindow.html#offset">QDockWindow</a> <a href="qheader.html#offset">QHeader</a> <a href="qimage.html#offset">QImage</a><li>offsetX:
<a href="qcanvaspixmap.html#offsetX">QCanvasPixmap</a><li>offsetY:
<a href="qcanvaspixmap.html#offsetY">QCanvasPixmap</a><li>ok:
<a href="qserversocket.html#ok">QServerSocket</a><li>okRename:
@@ -1852,7 +1852,7 @@ object:
<a href="qiconview.html#onItem">QIconView</a> <a href="qlistbox.html#onItem">QListBox</a> <a href="qlistview.html#onItem">QListView</a><li>onViewport:
<a href="qiconview.html#onViewport">QIconView</a> <a href="qlistbox.html#onViewport">QListBox</a> <a href="qlistview.html#onViewport">QListView</a><li>opType:
<a href="qscreen.html#opType">QScreen</a><li>opaqueMoving:
- <a href="qdockwindow.html#opaqueMoving">QDockWindow</a> <a href="qmainwindow.html#opaqueMoving">QMainWindow</a><li>opaqueResize:
+ <a href="qdoctwindow.html#opaqueMoving">QDockWindow</a> <a href="qmainwindow.html#opaqueMoving">QMainWindow</a><li>opaqueResize:
<a href="qsplitter.html#opaqueResize">QSplitter</a><li>open:
<a href="qfile.html#open">QFile</a> <a href="qiodevice.html#open">QIODevice</a> <a href="qsocket.html#open">QSocket</a> <a href="qsqldatabase.html#open">QSqlDatabase</a> <a href="qsqldriver.html#open">QSqlDriver</a><li>openAssistant:
<a href="qassistantclient.html#openAssistant">QAssistantClient</a><li>openKeyboard:
@@ -1908,8 +1908,8 @@ object:
<a href="qbitarray.html#operator~">QBitArray</a><li>optimization:
<a href="qpixmap.html#optimization">QPixmap</a><li>order:
<a href="qdateedit.html#order">QDateEdit</a><li>orientation:
- <a href="qdialog.html#orientation">QDialog</a> <a href="qdockarea.html#orientation">QDockArea</a> <a href="qdockwindow.html#orientation">QDockWindow</a> <a href="qgroupbox.html#orientation">QGroupBox</a> <a href="qheader.html#orientation">QHeader</a> <a href="qprinter.html#orientation">QPrinter</a> <a href="qscrollbar.html#orientation">QScrollBar</a> <a href="qslider.html#orientation">QSlider</a> <a href="qsplitter.html#orientation">QSplitter</a> <a href="qwheelevent.html#orientation">QWheelEvent</a><li>orientationChanged:
- <a href="qdockwindow.html#orientationChanged">QDockWindow</a><li>origin:
+ <a href="qdialog.html#orientation">QDialog</a> <a href="qdockarea.html#orientation">QDockArea</a> <a href="qdoctwindow.html#orientation">QDockWindow</a> <a href="qgroupbox.html#orientation">QGroupBox</a> <a href="qheader.html#orientation">QHeader</a> <a href="qprinter.html#orientation">QPrinter</a> <a href="qscrollbar.html#orientation">QScrollBar</a> <a href="qslider.html#orientation">QSlider</a> <a href="qsplitter.html#orientation">QSplitter</a> <a href="qwheelevent.html#orientation">QWheelEvent</a><li>orientationChanged:
+ <a href="qdoctwindow.html#orientationChanged">QDockWindow</a><li>origin:
<a href="qgridlayout.html#origin">QGridLayout</a><li>outputFileName:
<a href="qprinter.html#outputFileName">QPrinter</a><li>outputFormatList:
<a href="qimage.html#outputFormatList">QImage</a><li>outputFormats:
@@ -1999,8 +1999,8 @@ packImage:
<a href="qscreen.html#pixmapOffsetAlignment">QScreen</a><li>pixmapRect:
<a href="qiconviewitem.html#pixmapRect">QIconViewItem</a><li>pixmapSizeChanged:
<a href="qmainwindow.html#pixmapSizeChanged">QMainWindow</a><li>place:
- <a href="qdockwindow.html#place">QDockWindow</a><li>placeChanged:
- <a href="qdockwindow.html#placeChanged">QDockWindow</a><li>placeCursor:
+ <a href="qdoctwindow.html#place">QDockWindow</a><li>placeChanged:
+ <a href="qdoctwindow.html#placeChanged">QDockWindow</a><li>placeCursor:
<a href="qtextedit.html#placeCursor">QTextEdit</a><li>plane:
<a href="qglformat.html#plane">QGLFormat</a><li>play:
<a href="qpicture.html#play">QPicture</a> <a href="qsound.html#play">QSound</a><li>point:
@@ -2528,7 +2528,7 @@ sRect:
<a href="qpainter.html#setClipRect">QPainter</a><li>setClipRegion:
<a href="qpainter.html#setClipRegion">QPainter</a><li>setClipping:
<a href="qpainter.html#setClipping">QPainter</a><li>setCloseMode:
- <a href="qdockwindow.html#setCloseMode">QDockWindow</a><li>setCodec:
+ <a href="qdoctwindow.html#setCloseMode">QDockWindow</a><li>setCodec:
<a href="qtextstream.html#setCodec">QTextStream</a><li>setCodecForCStrings:
<a href="qtextcodec.html#setCodecForCStrings">QTextCodec</a><li>setCodecForLocale:
<a href="qtextcodec.html#setCodecForLocale">QTextCodec</a><li>setCodecForTr:
@@ -2679,8 +2679,8 @@ sRect:
<a href="qdatabrowser.html#setFilter">QDataBrowser</a> <a href="qdatatable.html#setFilter">QDataTable</a> <a href="qdir.html#setFilter">QDir</a> <a href="qfiledialog.html#setFilter">QFileDialog</a> <a href="qsqlcursor.html#setFilter">QSqlCursor</a><li>setFilters:
<a href="qfiledialog.html#setFilters">QFileDialog</a><li>setFinishEnabled:
<a href="qwizard.html#setFinishEnabled">QWizard</a><li>setFixedExtentHeight:
- <a href="qdockwindow.html#setFixedExtentHeight">QDockWindow</a><li>setFixedExtentWidth:
- <a href="qdockwindow.html#setFixedExtentWidth">QDockWindow</a><li>setFixedHeight:
+ <a href="qdoctwindow.html#setFixedExtentHeight">QDockWindow</a><li>setFixedExtentWidth:
+ <a href="qdoctwindow.html#setFixedExtentWidth">QDockWindow</a><li>setFixedHeight:
<a href="qwidget.html#setFixedHeight">QWidget</a><li>setFixedPitch:
<a href="qfont.html#setFixedPitch">QFont</a><li>setFixedSize:
<a href="qwidget.html#setFixedSize">QWidget</a><li>setFixedWidth:
@@ -2732,7 +2732,7 @@ sRect:
<a href="qwidget.html#setHidden">QWidget</a><li>setHorData:
<a href="qsizepolicy.html#setHorData">QSizePolicy</a><li>setHorStretch:
<a href="qsizepolicy.html#setHorStretch">QSizePolicy</a><li>setHorizontallyStretchable:
- <a href="qdockwindow.html#setHorizontallyStretchable">QDockWindow</a><li>setHost:
+ <a href="qdoctwindow.html#setHorizontallyStretchable">QDockWindow</a><li>setHost:
<a href="qhttp.html#setHost">QHttp</a> <a href="qurl.html#setHost">QUrl</a><li>setHostName:
<a href="qsqldatabase.html#setHostName">QSqlDatabase</a><li>setHour:
<a href="qtimeedit.html#setHour">QTimeEdit</a><li>setHsv:
@@ -2838,14 +2838,14 @@ sRect:
<a href="qdateedit.html#setMonth">QDateEdit</a><li>setMouseTracking:
<a href="qwidget.html#setMouseTracking">QWidget</a><li>setMovie:
<a href="qlabel.html#setMovie">QLabel</a><li>setMovingEnabled:
- <a href="qdockwindow.html#setMovingEnabled">QDockWindow</a> <a href="qheader.html#setMovingEnabled">QHeader</a><li>setMultiLinesEnabled:
+ <a href="qdoctwindow.html#setMovingEnabled">QDockWindow</a> <a href="qheader.html#setMovingEnabled">QHeader</a><li>setMultiLinesEnabled:
<a href="qlistviewitem.html#setMultiLinesEnabled">QListViewItem</a><li>setName:
<a href="qfile.html#setName">QFile</a> <a href="qobject.html#setName">QObject</a> <a href="qsqlcursor.html#setName">QSqlCursor</a> <a href="qsqlfield.html#setName">QSqlField</a> <a href="qsqlindex.html#setName">QSqlIndex</a> <a href="qurlinfo.html#setName">QUrlInfo</a><li>setNameFilter:
<a href="qdir.html#setNameFilter">QDir</a> <a href="qurloperator.html#setNameFilter">QUrlOperator</a><li>setNamedColor:
<a href="qcolor.html#setNamedColor">QColor</a><li>setNamedItem:
<a href="qdomnamednodemap.html#setNamedItem">QDomNamedNodeMap</a><li>setNamedItemNS:
<a href="qdomnamednodemap.html#setNamedItemNS">QDomNamedNodeMap</a><li>setNewLine:
- <a href="qdockwindow.html#setNewLine">QDockWindow</a><li>setNextEnabled:
+ <a href="qdoctwindow.html#setNewLine">QDockWindow</a><li>setNextEnabled:
<a href="qwizard.html#setNextEnabled">QWizard</a><li>setNoChange:
<a href="qcheckbox.html#setNoChange">QCheckBox</a><li>setNodeValue:
<a href="qdomnode.html#setNodeValue">QDomNode</a><li>setNotchTarget:
@@ -2861,10 +2861,10 @@ sRect:
<a href="qgridview.html#setNumRows">QGridView</a> <a href="qtable.html#setNumRows">QTable</a><li>setNumber:
<a href="qsqlerror.html#setNumber">QSqlError</a><li>setOctMode:
<a href="qlcdnumber.html#setOctMode">QLCDNumber</a><li>setOffset:
- <a href="qcanvaspixmap.html#setOffset">QCanvasPixmap</a> <a href="qdockwindow.html#setOffset">QDockWindow</a> <a href="qheader.html#setOffset">QHeader</a> <a href="qimage.html#setOffset">QImage</a><li>setOkButton:
+ <a href="qcanvaspixmap.html#setOffset">QCanvasPixmap</a> <a href="qdoctwindow.html#setOffset">QDockWindow</a> <a href="qheader.html#setOffset">QHeader</a> <a href="qimage.html#setOffset">QImage</a><li>setOkButton:
<a href="qtabdialog.html#setOkButton">QTabDialog</a><li>setOn:
<a href="qaction.html#setOn">QAction</a> <a href="qbutton.html#setOn">QButton</a> <a href="qchecklistitem.html#setOn">QCheckListItem</a> <a href="qpushbutton.html#setOn">QPushButton</a> <a href="qtoolbutton.html#setOn">QToolButton</a><li>setOpaqueMoving:
- <a href="qdockwindow.html#setOpaqueMoving">QDockWindow</a> <a href="qmainwindow.html#setOpaqueMoving">QMainWindow</a><li>setOpaqueResize:
+ <a href="qdoctwindow.html#setOpaqueMoving">QDockWindow</a> <a href="qmainwindow.html#setOpaqueMoving">QMainWindow</a><li>setOpaqueResize:
<a href="qsplitter.html#setOpaqueResize">QSplitter</a><li>setOpen:
<a href="qlistview.html#setOpen">QListView</a> <a href="qlistviewitem.html#setOpen">QListViewItem</a> <a href="qsqldriver.html#setOpen">QSqlDriver</a><li>setOpenError:
<a href="qsqldriver.html#setOpenError">QSqlDriver</a><li>setOptimization:
@@ -2872,7 +2872,7 @@ sRect:
<a href="qglformat.html#setOption">QGLFormat</a><li>setOptionEnabled:
<a href="qprinter.html#setOptionEnabled">QPrinter</a><li>setOrder:
<a href="qdateedit.html#setOrder">QDateEdit</a><li>setOrientation:
- <a href="qdialog.html#setOrientation">QDialog</a> <a href="qdockwindow.html#setOrientation">QDockWindow</a> <a href="qgroupbox.html#setOrientation">QGroupBox</a> <a href="qheader.html#setOrientation">QHeader</a> <a href="qprinter.html#setOrientation">QPrinter</a> <a href="qscrollbar.html#setOrientation">QScrollBar</a> <a href="qslider.html#setOrientation">QSlider</a> <a href="qsplitter.html#setOrientation">QSplitter</a><li>setOrigin:
+ <a href="qdialog.html#setOrientation">QDialog</a> <a href="qdoctwindow.html#setOrientation">QDockWindow</a> <a href="qgroupbox.html#setOrientation">QGroupBox</a> <a href="qheader.html#setOrientation">QHeader</a> <a href="qprinter.html#setOrientation">QPrinter</a> <a href="qscrollbar.html#setOrientation">QScrollBar</a> <a href="qslider.html#setOrientation">QSlider</a> <a href="qsplitter.html#setOrientation">QSplitter</a><li>setOrigin:
<a href="qgridlayout.html#setOrigin">QGridLayout</a><li>setOutputFileName:
<a href="qprinter.html#setOutputFileName">QPrinter</a><li>setOutputToFile:
<a href="qprinter.html#setOutputToFile">QPrinter</a><li>setOverlay:
@@ -2950,7 +2950,7 @@ sRect:
<a href="qiconviewitem.html#setRenameEnabled">QIconViewItem</a> <a href="qlistviewitem.html#setRenameEnabled">QListViewItem</a><li>setReplaceable:
<a href="qtableitem.html#setReplaceable">QTableItem</a><li>setRequest:
<a href="qhttprequestheader.html#setRequest">QHttpRequestHeader</a><li>setResizeEnabled:
- <a href="qdockwindow.html#setResizeEnabled">QDockWindow</a> <a href="qheader.html#setResizeEnabled">QHeader</a><li>setResizeMode:
+ <a href="qdoctwindow.html#setResizeEnabled">QDockWindow</a> <a href="qheader.html#setResizeEnabled">QHeader</a><li>setResizeMode:
<a href="qiconview.html#setResizeMode">QIconView</a> <a href="qlayout.html#setResizeMode">QLayout</a> <a href="qlistview.html#setResizeMode">QListView</a> <a href="qsplitter.html#setResizeMode">QSplitter</a><li>setResizePolicy:
<a href="qscrollview.html#setResizePolicy">QScrollView</a><li>setResolution:
<a href="qprinter.html#setResolution">QPrinter</a><li>setRestartCommand:
@@ -3118,7 +3118,7 @@ sRect:
<a href="qsizepolicy.html#setVerStretch">QSizePolicy</a><li>setVersion:
<a href="qdatastream.html#setVersion">QDataStream</a><li>setVerticalAlignment:
<a href="qstylesheetitem.html#setVerticalAlignment">QStyleSheetItem</a> <a href="qtextedit.html#setVerticalAlignment">QTextEdit</a><li>setVerticallyStretchable:
- <a href="qdockwindow.html#setVerticallyStretchable">QDockWindow</a><li>setViewMode:
+ <a href="qdoctwindow.html#setVerticallyStretchable">QDockWindow</a><li>setViewMode:
<a href="qfiledialog.html#setViewMode">QFileDialog</a><li>setViewXForm:
<a href="qpainter.html#setViewXForm">QPainter</a><li>setViewport:
<a href="qpainter.html#setViewport">QPainter</a><li>setVisible:
@@ -3129,7 +3129,7 @@ sRect:
<a href="qaccel.html#setWhatsThis">QAccel</a> <a href="qaction.html#setWhatsThis">QAction</a> <a href="qmenudata.html#setWhatsThis">QMenuData</a> <a href="qmenudata.html#setWhatsThis">QPopupMenu</a><li>setWheelScrollLines:
<a href="qapplication.html#setWheelScrollLines">QApplication</a><li>setWhiteSpaceMode:
<a href="qstylesheetitem.html#setWhiteSpaceMode">QStyleSheetItem</a><li>setWidget:
- <a href="qdockwindow.html#setWidget">QDockWindow</a><li>setWidgetSizePolicy:
+ <a href="qdoctwindow.html#setWidget">QDockWindow</a><li>setWidgetSizePolicy:
<a href="qmacstyle.html#setWidgetSizePolicy">QMacStyle</a><li>setWidth:
<a href="qpen.html#setWidth">QPen</a> <a href="qrect.html#setWidth">QRect</a> <a href="qsimplerichtext.html#setWidth">QSimpleRichText</a> <a href="qsize.html#setWidth">QSize</a><li>setWildcard:
<a href="qregexp.html#setWildcard">QRegExp</a><li>setWinPageSize:
@@ -3500,7 +3500,7 @@ ucs2:
<a href="qlineedit.html#undo">QLineEdit</a> <a href="qtextedit.html#undo">QTextEdit</a><li>undoAvailable:
<a href="qtextedit.html#undoAvailable">QTextEdit</a><li>undoDepth:
<a href="qtextedit.html#undoDepth">QTextEdit</a><li>undock:
- <a href="qdockwindow.html#undock">QDockWindow</a><li>ungetch:
+ <a href="qdoctwindow.html#undock">QDockWindow</a><li>ungetch:
<a href="qfile.html#ungetch">QFile</a> <a href="qiodevice.html#ungetch">QIODevice</a> <a href="qsocket.html#ungetch">QSocket</a><li>unicode:
<a href="qchar.html#unicode">QChar</a> <a href="qstring.html#unicode">QString</a><li>unicodeUriToUri:
<a href="quridrag.html#unicodeUriToUri">QUriDrag</a><li>uniqueId:
@@ -3584,7 +3584,7 @@ vScrollBarMode:
<a href="qscrollview.html#viewportResizeEvent">QScrollView</a><li>viewportSize:
<a href="qscrollview.html#viewportSize">QScrollView</a><li>viewportToContents:
<a href="qscrollview.html#viewportToContents">QScrollView</a><li>visibilityChanged:
- <a href="qdockwindow.html#visibilityChanged">QDockWindow</a><li>visibleHeight:
+ <a href="qdoctwindow.html#visibilityChanged">QDockWindow</a><li>visibleHeight:
<a href="qscrollview.html#visibleHeight">QScrollView</a><li>visibleWidget:
<a href="qwidgetstack.html#visibleWidget">QWidgetStack</a><li>visibleWidth:
<a href="qscrollview.html#visibleWidth">QScrollView</a><li>visualRect:
@@ -3605,7 +3605,7 @@ wait:
<a href="qwidget.html#wheelEvent">QWidget</a><li>wheelScrollLines:
<a href="qapplication.html#wheelScrollLines">QApplication</a><li>whiteSpaceMode:
<a href="qstylesheetitem.html#whiteSpaceMode">QStyleSheetItem</a><li>widget:
- <a href="qaxaggregated.html#widget">QAxAggregated</a> <a href="qdockwindow.html#widget">QDockWindow</a> <a href="qlayoutitem.html#widget">QLayoutItem</a> <a href="qnpinstance.html#widget">QNPInstance</a> <a href="qsqlform.html#widget">QSqlForm</a> <a href="qstyleoption.html#widget">QStyleOption</a> <a href="qwidgetitem.html#widget">QWidgetItem</a> <a href="qwidgetstack.html#widget">QWidgetStack</a><li>widgetAt:
+ <a href="qaxaggregated.html#widget">QAxAggregated</a> <a href="qdoctwindow.html#widget">QDockWindow</a> <a href="qlayoutitem.html#widget">QLayoutItem</a> <a href="qnpinstance.html#widget">QNPInstance</a> <a href="qsqlform.html#widget">QSqlForm</a> <a href="qstyleoption.html#widget">QStyleOption</a> <a href="qwidgetitem.html#widget">QWidgetItem</a> <a href="qwidgetstack.html#widget">QWidgetStack</a><li>widgetAt:
<a href="qapplication.html#widgetAt">QApplication</a><li>widgetSizePolicy:
<a href="qmacstyle.html#widgetSizePolicy">QMacStyle</a><li>widgetToField:
<a href="qsqlform.html#widgetToField">QSqlForm</a><li>widgets:
diff --git a/doc/html/headers.html b/doc/html/headers.html
index a34eed8..87f0d85 100644
--- a/doc/html/headers.html
+++ b/doc/html/headers.html
@@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
<li><a href="qdirectpainter_qws-h.html">qdirectpainter_qws.h</a>
<li><a href="qdns-h.html">qdns.h</a>
<li><a href="qdockarea-h.html">qdockarea.h</a>
-<li><a href="qdockwindow-h.html">qdockwindow.h</a>
+<li><a href="qdoctwindow-h.html">qdoctwindow.h</a>
<li><a href="qdom-h.html">qdom.h</a>
<li><a href="qdragobject-h.html">qdragobject.h</a>
<li><a href="qdrawutil-h.html">qdrawutil.h</a>
diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html
index 79c0db3..07b8b6e 100644
--- a/doc/html/hierarchy.html
+++ b/doc/html/hierarchy.html
@@ -440,7 +440,7 @@ classes in the Qt API.
<li><a href="qdockarea.html">QDockArea</a>
<li><a href="qframe.html">QFrame</a>
<ul>
-<li><a href="qdockwindow.html">QDockWindow</a>
+<li><a href="qdoctwindow.html">QDockWindow</a>
<ul>
<li><a href="qtoolbar.html">QToolBar</a>
</ul>
diff --git a/doc/html/index b/doc/html/index
index cc7ca30..b00c0e9 100644
--- a/doc/html/index
+++ b/doc/html/index
@@ -1705,51 +1705,51 @@
"QDockArea::removeDockWindow" qdockarea.html#removeDockWindow
"QDockArea::setAcceptDockWindow" qdockarea.html#setAcceptDockWindow
"QDockArea::~QDockArea" qdockarea.html#~QDockArea
-"QDockWindow" qdockwindow.html
-"QDockWindow::CloseMode" qdockwindow.html#CloseMode
-"QDockWindow::Place" qdockwindow.html#Place
-"QDockWindow::area" qdockwindow.html#area
-"QDockWindow::boxLayout" qdockwindow.html#boxLayout
-"QDockWindow::closeMode" qdockwindow.html#closeMode
-"QDockWindow::closeMode" qdockwindow.html#closeMode-prop
-"QDockWindow::dock" qdockwindow.html#dock
-"QDockWindow::fixedExtent" qdockwindow.html#fixedExtent
-"QDockWindow::horizontallyStretchable" qdockwindow.html#horizontallyStretchable-prop
-"QDockWindow::isCloseEnabled" qdockwindow.html#isCloseEnabled
-"QDockWindow::isHorizontallyStretchable" qdockwindow.html#isHorizontallyStretchable
-"QDockWindow::isMovingEnabled" qdockwindow.html#isMovingEnabled
-"QDockWindow::isResizeEnabled" qdockwindow.html#isResizeEnabled
-"QDockWindow::isStretchable" qdockwindow.html#isStretchable
-"QDockWindow::isVerticallyStretchable" qdockwindow.html#isVerticallyStretchable
-"QDockWindow::movingEnabled" qdockwindow.html#movingEnabled-prop
-"QDockWindow::newLine" qdockwindow.html#newLine
-"QDockWindow::newLine" qdockwindow.html#newLine-prop
-"QDockWindow::offset" qdockwindow.html#offset
-"QDockWindow::offset" qdockwindow.html#offset-prop
-"QDockWindow::opaqueMoving" qdockwindow.html#opaqueMoving
-"QDockWindow::opaqueMoving" qdockwindow.html#opaqueMoving-prop
-"QDockWindow::orientation" qdockwindow.html#orientation
-"QDockWindow::orientationChanged" qdockwindow.html#orientationChanged
-"QDockWindow::place" qdockwindow.html#place
-"QDockWindow::placeChanged" qdockwindow.html#placeChanged
-"QDockWindow::resizeEnabled" qdockwindow.html#resizeEnabled-prop
-"QDockWindow::setCloseMode" qdockwindow.html#setCloseMode
-"QDockWindow::setFixedExtentHeight" qdockwindow.html#setFixedExtentHeight
-"QDockWindow::setFixedExtentWidth" qdockwindow.html#setFixedExtentWidth
-"QDockWindow::setHorizontallyStretchable" qdockwindow.html#setHorizontallyStretchable
-"QDockWindow::setMovingEnabled" qdockwindow.html#setMovingEnabled
-"QDockWindow::setNewLine" qdockwindow.html#setNewLine
-"QDockWindow::setOffset" qdockwindow.html#setOffset
-"QDockWindow::setOpaqueMoving" qdockwindow.html#setOpaqueMoving
-"QDockWindow::setOrientation" qdockwindow.html#setOrientation
-"QDockWindow::setResizeEnabled" qdockwindow.html#setResizeEnabled
-"QDockWindow::setVerticallyStretchable" qdockwindow.html#setVerticallyStretchable
-"QDockWindow::setWidget" qdockwindow.html#setWidget
-"QDockWindow::stretchable" qdockwindow.html#stretchable-prop
-"QDockWindow::undock" qdockwindow.html#undock
-"QDockWindow::verticallyStretchable" qdockwindow.html#verticallyStretchable-prop
-"QDockWindow::visibilityChanged" qdockwindow.html#visibilityChanged
-"QDockWindow::widget" qdockwindow.html#widget
+"QDockWindow" qdoctwindow.html
+"QDockWindow::CloseMode" qdoctwindow.html#CloseMode
+"QDockWindow::Place" qdoctwindow.html#Place
+"QDockWindow::area" qdoctwindow.html#area
+"QDockWindow::boxLayout" qdoctwindow.html#boxLayout
+"QDockWindow::closeMode" qdoctwindow.html#closeMode
+"QDockWindow::closeMode" qdoctwindow.html#closeMode-prop
+"QDockWindow::dock" qdoctwindow.html#dock
+"QDockWindow::fixedExtent" qdoctwindow.html#fixedExtent
+"QDockWindow::horizontallyStretchable" qdoctwindow.html#horizontallyStretchable-prop
+"QDockWindow::isCloseEnabled" qdoctwindow.html#isCloseEnabled
+"QDockWindow::isHorizontallyStretchable" qdoctwindow.html#isHorizontallyStretchable
+"QDockWindow::isMovingEnabled" qdoctwindow.html#isMovingEnabled
+"QDockWindow::isResizeEnabled" qdoctwindow.html#isResizeEnabled
+"QDockWindow::isStretchable" qdoctwindow.html#isStretchable
+"QDockWindow::isVerticallyStretchable" qdoctwindow.html#isVerticallyStretchable
+"QDockWindow::movingEnabled" qdoctwindow.html#movingEnabled-prop
+"QDockWindow::newLine" qdoctwindow.html#newLine
+"QDockWindow::newLine" qdoctwindow.html#newLine-prop
+"QDockWindow::offset" qdoctwindow.html#offset
+"QDockWindow::offset" qdoctwindow.html#offset-prop
+"QDockWindow::opaqueMoving" qdoctwindow.html#opaqueMoving
+"QDockWindow::opaqueMoving" qdoctwindow.html#opaqueMoving-prop
+"QDockWindow::orientation" qdoctwindow.html#orientation
+"QDockWindow::orientationChanged" qdoctwindow.html#orientationChanged
+"QDockWindow::place" qdoctwindow.html#place
+"QDockWindow::placeChanged" qdoctwindow.html#placeChanged
+"QDockWindow::resizeEnabled" qdoctwindow.html#resizeEnabled-prop
+"QDockWindow::setCloseMode" qdoctwindow.html#setCloseMode
+"QDockWindow::setFixedExtentHeight" qdoctwindow.html#setFixedExtentHeight
+"QDockWindow::setFixedExtentWidth" qdoctwindow.html#setFixedExtentWidth
+"QDockWindow::setHorizontallyStretchable" qdoctwindow.html#setHorizontallyStretchable
+"QDockWindow::setMovingEnabled" qdoctwindow.html#setMovingEnabled
+"QDockWindow::setNewLine" qdoctwindow.html#setNewLine
+"QDockWindow::setOffset" qdoctwindow.html#setOffset
+"QDockWindow::setOpaqueMoving" qdoctwindow.html#setOpaqueMoving
+"QDockWindow::setOrientation" qdoctwindow.html#setOrientation
+"QDockWindow::setResizeEnabled" qdoctwindow.html#setResizeEnabled
+"QDockWindow::setVerticallyStretchable" qdoctwindow.html#setVerticallyStretchable
+"QDockWindow::setWidget" qdoctwindow.html#setWidget
+"QDockWindow::stretchable" qdoctwindow.html#stretchable-prop
+"QDockWindow::undock" qdoctwindow.html#undock
+"QDockWindow::verticallyStretchable" qdoctwindow.html#verticallyStretchable-prop
+"QDockWindow::visibilityChanged" qdoctwindow.html#visibilityChanged
+"QDockWindow::widget" qdoctwindow.html#widget
"QDomAttr" qdomattr.html
"QDomAttr::isAttr" qdomattr.html#isAttr
"QDomAttr::name" qdomattr.html#name
diff --git a/doc/html/keyfeatures30.html b/doc/html/keyfeatures30.html
index 8a2258f..18d3239 100644
--- a/doc/html/keyfeatures30.html
+++ b/doc/html/keyfeatures30.html
@@ -53,7 +53,7 @@ Arabic and Hebrew) and also provides improved support for Asian
languages.
<p> Many new classes have been added to the Qt Library. Amongst them are
classes that provide a docking architecture
-(<a href="qdockarea.html">QDockArea</a>/<a href="qdockwindow.html">QDockWindow</a>), a powerful rich text editor
+(<a href="qdockarea.html">QDockArea</a>/<a href="qdoctwindow.html">QDockWindow</a>), a powerful rich text editor
(<a href="qtextedit.html">QTextEdit</a>), a class to store and access application settings
(<a href="qsettings.html">QSettings</a>) and a class to create and communicate with processes
(<a href="qprocess.html">QProcess</a>).
diff --git a/doc/html/mainclasses.html b/doc/html/mainclasses.html
index 50404cc..a36c4f3 100644
--- a/doc/html/mainclasses.html
+++ b/doc/html/mainclasses.html
@@ -248,7 +248,7 @@ classes), see <a href="classes.html">Qt's Classes</a>.
<td><a href="qworkspace.html">QWorkspace</a>
<tr>
<td align="right">
-<td><a href="qdockwindow.html">QDockWindow</a>
+<td><a href="qdoctwindow.html">QDockWindow</a>
<td align="right">
<td><a href="qmap.html">QMap</a>
<td align="right">
diff --git a/doc/html/porting.html b/doc/html/porting.html
index 5d9d3c7..dfb74c1 100644
--- a/doc/html/porting.html
+++ b/doc/html/porting.html
@@ -287,10 +287,10 @@ new code.
<li> <a href="qdate.html#monthName">QDate::monthName</a>( int month )
<li> <a href="qdir.html#encodedEntryList">QDir::encodedEntryList</a>( const <a href="qstring.html">QString</a> &amp; nameFilter, int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const
<li> QDir::encodedEntryList( int filterSpec = DefaultFilter, int sortSpec = DefaultSort ) const
-<li> <a href="qdockwindow.html#isHorizontalStretchable">QDockWindow::isHorizontalStretchable</a>() const
-<li> <a href="qdockwindow.html#isVerticalStretchable">QDockWindow::isVerticalStretchable</a>() const
-<li> <a href="qdockwindow.html#setHorizontalStretchable">QDockWindow::setHorizontalStretchable</a>( bool b )
-<li> <a href="qdockwindow.html#setVerticalStretchable">QDockWindow::setVerticalStretchable</a>( bool b )
+<li> <a href="qdoctwindow.html#isHorizontalStretchable">QDockWindow::isHorizontalStretchable</a>() const
+<li> <a href="qdoctwindow.html#isVerticalStretchable">QDockWindow::isVerticalStretchable</a>() const
+<li> <a href="qdoctwindow.html#setHorizontalStretchable">QDockWindow::setHorizontalStretchable</a>( bool b )
+<li> <a href="qdoctwindow.html#setVerticalStretchable">QDockWindow::setVerticalStretchable</a>( bool b )
<li> <a href="qfont.html#defaultFont">QFont::defaultFont</a>()
<li> <a href="qfont.html#setDefaultFont">QFont::setDefaultFont</a>( const <a href="qfont.html">QFont</a> &amp; f )
<li> <a href="qfont.html#setPixelSizeFloat">QFont::setPixelSizeFloat</a>( float pixelSize )
@@ -327,7 +327,7 @@ new code.
<li> <a href="qlistboxitem.html#selected">QListBoxItem::selected</a>() const
<li> <a href="qlistview.html#removeItem">QListView::removeItem</a>( <a href="qlistviewitem.html">QListViewItem</a> *item )
<li> <a href="qlistviewitem.html#removeItem">QListViewItem::removeItem</a>( QListViewItem *item )
-<li> <a href="qmainwindow.html#addToolBar">QMainWindow::addToolBar</a>( <a href="qdockwindow.html">QDockWindow</a> *, Dock = DockTop, bool newLine = FALSE )
+<li> <a href="qmainwindow.html#addToolBar">QMainWindow::addToolBar</a>( <a href="qdoctwindow.html">QDockWindow</a> *, Dock = DockTop, bool newLine = FALSE )
<li> QMainWindow::addToolBar( QDockWindow *, const QString &amp; label, Dock = DockTop, bool newLine = FALSE )
<li> <a href="qmainwindow.html#lineUpToolBars">QMainWindow::lineUpToolBars</a>( bool keepNewLines = FALSE )
<li> <a href="qmainwindow.html#moveToolBar">QMainWindow::moveToolBar</a>( QDockWindow *, Dock = DockTop )
diff --git a/doc/html/propertydocs b/doc/html/propertydocs
index 5c255c3..9d9c528 100644
--- a/doc/html/propertydocs
+++ b/doc/html/propertydocs
@@ -1077,62 +1077,62 @@ constructor.
</property>
<property>
<name>QDockWindow::closeMode</name>
- <doc href="qdockwindow.html#closeMode-prop">
+ <doc href="qdoctwindow.html#closeMode-prop">
&lt;p&gt;This property holds the close mode of a dock window.
&lt;p&gt;Defines when (if ever) the dock window has a close button. The
-choices are &lt;a href="qdockwindow.html#CloseMode-enum"&gt;Never&lt;/a&gt;, &lt;a href="qdockwindow.html#CloseMode-enum"&gt;Docked&lt;/a&gt; (i.e. only when docked), &lt;a href="qdockwindow.html#CloseMode-enum"&gt;Undocked&lt;/a&gt; (only when undocked, i.e. floated) or &lt;a href="qdockwindow.html#CloseMode-enum"&gt;Always&lt;/a&gt;.
-&lt;p&gt; The default is &lt;a href="qdockwindow.html#CloseMode-enum"&gt;Never&lt;/a&gt;.
+choices are &lt;a href="qdoctwindow.html#CloseMode-enum"&gt;Never&lt;/a&gt;, &lt;a href="qdoctwindow.html#CloseMode-enum"&gt;Docked&lt;/a&gt; (i.e. only when docked), &lt;a href="qdoctwindow.html#CloseMode-enum"&gt;Undocked&lt;/a&gt; (only when undocked, i.e. floated) or &lt;a href="qdoctwindow.html#CloseMode-enum"&gt;Always&lt;/a&gt;.
+&lt;p&gt; The default is &lt;a href="qdoctwindow.html#CloseMode-enum"&gt;Never&lt;/a&gt;.
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setCloseMode"&gt;setCloseMode&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#closeMode"&gt;closeMode&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setCloseMode"&gt;setCloseMode&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#closeMode"&gt;closeMode&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::horizontallyStretchable</name>
- <doc href="qdockwindow.html#horizontallyStretchable-prop">
+ <doc href="qdoctwindow.html#horizontallyStretchable-prop">
&lt;p&gt;This property holds whether the dock window is horizontally stretchable.
&lt;p&gt;A dock window is horizontally stretchable if you call
-&lt;a href="qdockwindow.html#setHorizontallyStretchable"&gt;setHorizontallyStretchable&lt;/a&gt;(TRUE) or &lt;a href="qdockwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;(TRUE).
-&lt;p&gt; &lt;p&gt;See also &lt;a href="qdockwindow.html#resizeEnabled-prop"&gt;resizeEnabled&lt;/a&gt;.
+&lt;a href="qdoctwindow.html#setHorizontallyStretchable"&gt;setHorizontallyStretchable&lt;/a&gt;(TRUE) or &lt;a href="qdoctwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;(TRUE).
+&lt;p&gt; &lt;p&gt;See also &lt;a href="qdoctwindow.html#resizeEnabled-prop"&gt;resizeEnabled&lt;/a&gt;.
&lt;p&gt;Bugs and limitations:
&lt;ul&gt;
&lt;li&gt; Strecthability is broken. You must call setResizeEnabled(TRUE) to get
proper behavior and even then QDockWindow does not limit stretchablilty.
&lt;/ul&gt;
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setHorizontallyStretchable"&gt;setHorizontallyStretchable&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#isHorizontallyStretchable"&gt;isHorizontallyStretchable&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setHorizontallyStretchable"&gt;setHorizontallyStretchable&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#isHorizontallyStretchable"&gt;isHorizontallyStretchable&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::movingEnabled</name>
- <doc href="qdockwindow.html#movingEnabled-prop">
+ <doc href="qdoctwindow.html#movingEnabled-prop">
&lt;p&gt;This property holds whether the user can move the dock window within the dock area, move the dock window to another dock area, or float the dock window.
&lt;p&gt;This property is TRUE by default.
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setMovingEnabled"&gt;setMovingEnabled&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#isMovingEnabled"&gt;isMovingEnabled&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setMovingEnabled"&gt;setMovingEnabled&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#isMovingEnabled"&gt;isMovingEnabled&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::newLine</name>
- <doc href="qdockwindow.html#newLine-prop">
+ <doc href="qdoctwindow.html#newLine-prop">
&lt;p&gt;This property holds whether the dock window prefers to start a new line in the dock area.
&lt;p&gt;The default is FALSE, i.e. the dock window doesn't require a new
line in the dock area.
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setNewLine"&gt;setNewLine&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#newLine"&gt;newLine&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setNewLine"&gt;setNewLine&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#newLine"&gt;newLine&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::offset</name>
- <doc href="qdockwindow.html#offset-prop">
+ <doc href="qdoctwindow.html#offset-prop">
&lt;p&gt;This property holds the dock window's preferred offset from the dock area's left edge (top edge for vertical dock areas).
&lt;p&gt;The default is 0.
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setOffset"&gt;setOffset&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#offset"&gt;offset&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setOffset"&gt;setOffset&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#offset"&gt;offset&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::opaqueMoving</name>
- <doc href="qdockwindow.html#opaqueMoving-prop">
+ <doc href="qdoctwindow.html#opaqueMoving-prop">
&lt;p&gt;This property holds whether the dock window will be shown normally whilst it is being moved.
&lt;p&gt;If this property is FALSE, (the default), the dock window will be
represented by an outline rectangle whilst it is being moved.
@@ -1140,54 +1140,54 @@ represented by an outline rectangle whilst it is being moved.
recommend using it at this time. We expect to fix these problems
in a future release.
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setOpaqueMoving"&gt;setOpaqueMoving&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#opaqueMoving"&gt;opaqueMoving&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setOpaqueMoving"&gt;setOpaqueMoving&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#opaqueMoving"&gt;opaqueMoving&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::resizeEnabled</name>
- <doc href="qdockwindow.html#resizeEnabled-prop">
+ <doc href="qdoctwindow.html#resizeEnabled-prop">
&lt;p&gt;This property holds whether the dock window is resizeable.
&lt;p&gt;A resizeable dock window can be resized using splitter-like
handles inside a dock area and like every other top level window
when floating.
&lt;p&gt; A dock window is both horizontally and vertically stretchable if
-you call &lt;a href="qdockwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;(TRUE).
+you call &lt;a href="qdoctwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;(TRUE).
&lt;p&gt; This property is FALSE by default.
-&lt;p&gt; &lt;p&gt;See also &lt;a href="qdockwindow.html#verticallyStretchable-prop"&gt;verticallyStretchable&lt;/a&gt; and &lt;a href="qdockwindow.html#horizontallyStretchable-prop"&gt;horizontallyStretchable&lt;/a&gt;.
+&lt;p&gt; &lt;p&gt;See also &lt;a href="qdoctwindow.html#verticallyStretchable-prop"&gt;verticallyStretchable&lt;/a&gt; and &lt;a href="qdoctwindow.html#horizontallyStretchable-prop"&gt;horizontallyStretchable&lt;/a&gt;.
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#isResizeEnabled"&gt;isResizeEnabled&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#isResizeEnabled"&gt;isResizeEnabled&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::stretchable</name>
- <doc href="qdockwindow.html#stretchable-prop">
-&lt;p&gt;This property holds whether the dock window is stretchable in the current &lt;a href="qdockwindow.html#orientation"&gt;orientation&lt;/a&gt;().
-&lt;p&gt;This property can be set using &lt;a href="qdockwindow.html#setHorizontallyStretchable"&gt;setHorizontallyStretchable&lt;/a&gt;() and
-&lt;a href="qdockwindow.html#setVerticallyStretchable"&gt;setVerticallyStretchable&lt;/a&gt;(), or with &lt;a href="qdockwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;().
-&lt;p&gt; &lt;p&gt;See also &lt;a href="qdockwindow.html#resizeEnabled-prop"&gt;resizeEnabled&lt;/a&gt;.
+ <doc href="qdoctwindow.html#stretchable-prop">
+&lt;p&gt;This property holds whether the dock window is stretchable in the current &lt;a href="qdoctwindow.html#orientation"&gt;orientation&lt;/a&gt;().
+&lt;p&gt;This property can be set using &lt;a href="qdoctwindow.html#setHorizontallyStretchable"&gt;setHorizontallyStretchable&lt;/a&gt;() and
+&lt;a href="qdoctwindow.html#setVerticallyStretchable"&gt;setVerticallyStretchable&lt;/a&gt;(), or with &lt;a href="qdoctwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;().
+&lt;p&gt; &lt;p&gt;See also &lt;a href="qdoctwindow.html#resizeEnabled-prop"&gt;resizeEnabled&lt;/a&gt;.
&lt;p&gt;Bugs and limitations:
&lt;ul&gt;
&lt;li&gt; Strecthability is broken. You must call setResizeEnabled(TRUE) to get
proper behavior and even then QDockWindow does not limit stretchablilty.
&lt;/ul&gt;
-&lt;p&gt;Get this property's value with &lt;a href="qdockwindow.html#isStretchable"&gt;isStretchable&lt;/a&gt;().
+&lt;p&gt;Get this property's value with &lt;a href="qdoctwindow.html#isStretchable"&gt;isStretchable&lt;/a&gt;().
</doc>
</property>
<property>
<name>QDockWindow::verticallyStretchable</name>
- <doc href="qdockwindow.html#verticallyStretchable-prop">
+ <doc href="qdoctwindow.html#verticallyStretchable-prop">
&lt;p&gt;This property holds whether the dock window is vertically stretchable.
&lt;p&gt;A dock window is vertically stretchable if you call
-&lt;a href="qdockwindow.html#setVerticallyStretchable"&gt;setVerticallyStretchable&lt;/a&gt;(TRUE) or &lt;a href="qdockwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;(TRUE).
-&lt;p&gt; &lt;p&gt;See also &lt;a href="qdockwindow.html#resizeEnabled-prop"&gt;resizeEnabled&lt;/a&gt;.
+&lt;a href="qdoctwindow.html#setVerticallyStretchable"&gt;setVerticallyStretchable&lt;/a&gt;(TRUE) or &lt;a href="qdoctwindow.html#setResizeEnabled"&gt;setResizeEnabled&lt;/a&gt;(TRUE).
+&lt;p&gt; &lt;p&gt;See also &lt;a href="qdoctwindow.html#resizeEnabled-prop"&gt;resizeEnabled&lt;/a&gt;.
&lt;p&gt;Bugs and limitations:
&lt;ul&gt;
&lt;li&gt; Strecthability is broken. You must call setResizeEnabled(TRUE) to get
proper behavior and even then QDockWindow does not limit stretchablilty.
&lt;/ul&gt;
-&lt;p&gt;Set this property's value with &lt;a href="qdockwindow.html#setVerticallyStretchable"&gt;setVerticallyStretchable&lt;/a&gt;() and get this property's value with &lt;a href="qdockwindow.html#isVerticallyStretchable"&gt;isVerticallyStretchable&lt;/a&gt;().
+&lt;p&gt;Set this property's value with &lt;a href="qdoctwindow.html#setVerticallyStretchable"&gt;setVerticallyStretchable&lt;/a&gt;() and get this property's value with &lt;a href="qdoctwindow.html#isVerticallyStretchable"&gt;isVerticallyStretchable&lt;/a&gt;().
</doc>
</property>
<property>
@@ -2598,7 +2598,7 @@ be changed with &lt;a href="qmainwindow.html#setOpaqueMoving"&gt;setOpaqueMoving
(i.e. it shows the toolbar as it looks when docked) whilst it is
being moved. If FALSE (the default) they are shown transparently,
(i.e. as an outline rectangle).
-&lt;p&gt; &lt;b&gt;Warning:&lt;/b&gt; Opaque moving of toolbars and dockwindows is known to
+&lt;p&gt; &lt;b&gt;Warning:&lt;/b&gt; Opaque moving of toolbars and doctwindows is known to
have several problems. We recommend avoiding the use of this
feature for the time being. We intend fixing the problems in a
future release.
@@ -2617,7 +2617,7 @@ need. Since most dock windows are not stretchable, this usually
results in an unjustified right edge (or unjustified bottom edge
for a vertical dock area). If enabled, the main window will
right-justify its dock windows.
-&lt;p&gt; &lt;p&gt;See also &lt;a href="qdockwindow.html#setVerticalStretchable"&gt;QDockWindow::setVerticalStretchable&lt;/a&gt;() and &lt;a href="qdockwindow.html#setHorizontalStretchable"&gt;QDockWindow::setHorizontalStretchable&lt;/a&gt;().
+&lt;p&gt; &lt;p&gt;See also &lt;a href="qdoctwindow.html#setVerticalStretchable"&gt;QDockWindow::setVerticalStretchable&lt;/a&gt;() and &lt;a href="qdoctwindow.html#setHorizontalStretchable"&gt;QDockWindow::setHorizontalStretchable&lt;/a&gt;().
&lt;p&gt;Set this property's value with &lt;a href="qmainwindow.html#setRightJustification"&gt;setRightJustification&lt;/a&gt;() and get this property's value with &lt;a href="qmainwindow.html#rightJustification"&gt;rightJustification&lt;/a&gt;().
</doc>
diff --git a/doc/html/propertyindex b/doc/html/propertyindex
index c108faa..0eb5313 100644
--- a/doc/html/propertyindex
+++ b/doc/html/propertyindex
@@ -85,16 +85,16 @@
"QDockArea/empty" qdockarea.html#empty-prop
"QDockArea/handlePosition" qdockarea.html#handlePosition-prop
"QDockArea/orientation" qdockarea.html#orientation-prop
-"QDockWindow/closeMode" qdockwindow.html#closeMode-prop
-"QDockWindow/horizontallyStretchable" qdockwindow.html#horizontallyStretchable-prop
-"QDockWindow/movingEnabled" qdockwindow.html#movingEnabled-prop
-"QDockWindow/newLine" qdockwindow.html#newLine-prop
-"QDockWindow/offset" qdockwindow.html#offset-prop
-"QDockWindow/opaqueMoving" qdockwindow.html#opaqueMoving-prop
-"QDockWindow/place" qdockwindow.html
-"QDockWindow/resizeEnabled" qdockwindow.html#resizeEnabled-prop
-"QDockWindow/stretchable" qdockwindow.html#stretchable-prop
-"QDockWindow/verticallyStretchable" qdockwindow.html#verticallyStretchable-prop
+"QDockWindow/closeMode" qdoctwindow.html#closeMode-prop
+"QDockWindow/horizontallyStretchable" qdoctwindow.html#horizontallyStretchable-prop
+"QDockWindow/movingEnabled" qdoctwindow.html#movingEnabled-prop
+"QDockWindow/newLine" qdoctwindow.html#newLine-prop
+"QDockWindow/offset" qdoctwindow.html#offset-prop
+"QDockWindow/opaqueMoving" qdoctwindow.html#opaqueMoving-prop
+"QDockWindow/place" qdoctwindow.html
+"QDockWindow/resizeEnabled" qdoctwindow.html#resizeEnabled-prop
+"QDockWindow/stretchable" qdoctwindow.html#stretchable-prop
+"QDockWindow/verticallyStretchable" qdoctwindow.html#verticallyStretchable-prop
"QDoubleValidator/bottom" qdoublevalidator.html#bottom-prop
"QDoubleValidator/decimals" qdoublevalidator.html#decimals-prop
"QDoubleValidator/top" qdoublevalidator.html#top-prop
diff --git a/doc/html/qdockarea-h.html b/doc/html/qdockarea-h.html
index 0d40e1e..105e54a 100644
--- a/doc/html/qdockarea-h.html
+++ b/doc/html/qdockarea-h.html
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
#ifndef QT_H
#include "qwidget.h"
#include "qptrlist.h"
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qlayout.h"
#include "qvaluelist.h"
#include "qguardedptr.h"
diff --git a/doc/html/qdockarea.html b/doc/html/qdockarea.html
index b70ea1a..fde9e41 100644
--- a/doc/html/qdockarea.html
+++ b/doc/html/qdockarea.html
@@ -75,12 +75,12 @@ body { background: #ffffff; color: black; }
The QDockArea class manages and lays out QDockWindows.
<p>
<p> A QDockArea is a container which manages a list of
-<a href="qdockwindow.html">QDockWindow</a>s which it lays out within its area. In cooperation
-with the <a href="qdockwindow.html">QDockWindow</a>s it is responsible for the docking and
-undocking of <a href="qdockwindow.html">QDockWindow</a>s and moving them inside the dock
-area. QDockAreas also handle the wrapping of <a href="qdockwindow.html">QDockWindow</a>s to
+<a href="qdoctwindow.html">QDockWindow</a>s which it lays out within its area. In cooperation
+with the <a href="qdoctwindow.html">QDockWindow</a>s it is responsible for the docking and
+undocking of <a href="qdoctwindow.html">QDockWindow</a>s and moving them inside the dock
+area. QDockAreas also handle the wrapping of <a href="qdoctwindow.html">QDockWindow</a>s to
fill the available space as compactly as possible. QDockAreas can
-contain QToolBars since <a href="qtoolbar.html">QToolBar</a> is a <a href="qdockwindow.html">QDockWindow</a> subclass.
+contain QToolBars since <a href="qtoolbar.html">QToolBar</a> is a <a href="qdoctwindow.html">QDockWindow</a> subclass.
<p> <a href="qmainwindow.html">QMainWindow</a> contains four QDockAreas which you can use for your
QToolBars and QDockWindows, so in most situations you do not need
to use the QDockArea class directly. Although QMainWindow contains
@@ -107,8 +107,8 @@ still retains its position since this is where the window will
return if the user double clicks its caption. A dock window's
position can be determined with <a href="#hasDockWindow">hasDockWindow</a>(). The position can
be changed with <a href="#moveDockWindow">moveDockWindow</a>().
-<p> To dock or undock a dock window use <a href="qdockwindow.html#dock">QDockWindow::dock</a>() and
-<a href="qdockwindow.html#undock">QDockWindow::undock</a>() respectively. If you want to control which
+<p> To dock or undock a dock window use <a href="qdoctwindow.html#dock">QDockWindow::dock</a>() and
+<a href="qdoctwindow.html#undock">QDockWindow::undock</a>() respectively. If you want to control which
dock windows can dock in a dock area use <a href="#setAcceptDockWindow">setAcceptDockWindow</a>(). To
see if a dock area contains a particular dock window use
<a href="#hasDockWindow">hasDockWindow</a>(); to see how many dock windows a dock area
@@ -171,14 +171,14 @@ Returns a list of the dock windows in the dock area.
<h3 class=fn><a href="qdockarea.html#HandlePosition-enum">HandlePosition</a> <a name="handlePosition"></a>QDockArea::handlePosition () const
</h3><p>Returns where the dock window splitter handle is placed in the dock area.
See the <a href="qdockarea.html#handlePosition-prop">"handlePosition"</a> property for details.
-<h3 class=fn>bool <a name="hasDockWindow"></a>QDockArea::hasDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, int&nbsp;*&nbsp;index = 0 )
+<h3 class=fn>bool <a name="hasDockWindow"></a>QDockArea::hasDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, int&nbsp;*&nbsp;index = 0 )
</h3>
Returns TRUE if the dock area contains the dock window <em>w</em>;
otherwise returns FALSE. If <em>index</em> is not 0 it will be set as
follows: if the dock area contains the dock window <em>*index</em> is
set to <em>w</em>'s index position; otherwise <em>*index</em> is set to -1.
-<h3 class=fn>bool <a name="isDockWindowAccepted"></a>QDockArea::isDockWindowAccepted ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw )
+<h3 class=fn>bool <a name="isDockWindowAccepted"></a>QDockArea::isDockWindowAccepted ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw )
</h3>
Returns TRUE if dock window <em>dw</em> could be docked into the dock
area; otherwise returns FALSE.
@@ -194,35 +194,35 @@ space. If <em>keepNewLines</em> is TRUE, only space within lines is
cleaned up. If <em>keepNewLines</em> is FALSE the number of lines might
be changed.
-<h3 class=fn>void <a name="moveDockWindow"></a>QDockArea::moveDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, int&nbsp;index = -1 )
+<h3 class=fn>void <a name="moveDockWindow"></a>QDockArea::moveDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, int&nbsp;index = -1 )
</h3>
-Moves the <a href="qdockwindow.html">QDockWindow</a> <em>w</em> within the dock area. If <em>w</em> is not
+Moves the <a href="qdoctwindow.html">QDockWindow</a> <em>w</em> within the dock area. If <em>w</em> is not
already docked in this area, <em>w</em> is docked first. If <em>index</em> is
-1 or larger than the number of docked widgets, <em>w</em> is appended
at the end, otherwise it is inserted at the position <em>index</em>.
-<h3 class=fn>void <a name="moveDockWindow-2"></a>QDockArea::moveDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, const&nbsp;<a href="qpoint.html">QPoint</a>&nbsp;&amp;&nbsp;p, const&nbsp;<a href="qrect.html">QRect</a>&nbsp;&amp;&nbsp;r, bool&nbsp;swap )
+<h3 class=fn>void <a name="moveDockWindow-2"></a>QDockArea::moveDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, const&nbsp;<a href="qpoint.html">QPoint</a>&nbsp;&amp;&nbsp;p, const&nbsp;<a href="qrect.html">QRect</a>&nbsp;&amp;&nbsp;r, bool&nbsp;swap )
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> Moves the dock window <em>w</em> inside the dock area where <em>p</em> is the
new position (in global screen coordinates), <em>r</em> is the suggested
rectangle of the dock window and <em>swap</em> specifies whether or not
the orientation of the docked widget needs to be changed.
-<p> This function is used internally by <a href="qdockwindow.html">QDockWindow</a>. You shouldn't
+<p> This function is used internally by <a href="qdoctwindow.html">QDockWindow</a>. You shouldn't
need to call it yourself.
<h3 class=fn><a href="qt.html#Orientation-enum">Orientation</a> <a name="orientation"></a>QDockArea::orientation () const
</h3><p>Returns the dock area's orientation.
See the <a href="qdockarea.html#orientation-prop">"orientation"</a> property for details.
-<h3 class=fn>void <a name="removeDockWindow"></a>QDockArea::removeDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, bool&nbsp;makeFloating, bool&nbsp;swap, bool&nbsp;fixNewLines = TRUE )
+<h3 class=fn>void <a name="removeDockWindow"></a>QDockArea::removeDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;w, bool&nbsp;makeFloating, bool&nbsp;swap, bool&nbsp;fixNewLines = TRUE )
</h3>
Removes the dock window <em>w</em> from the dock area. If <em>makeFloating</em> is TRUE, <em>w</em> gets floated, and if <em>swap</em> is TRUE,
the orientation of <em>w</em> gets swapped. If <em>fixNewLines</em> is TRUE
(the default) newlines in the area will be fixed.
<p> You should never need to call this function yourself. Use
-<a href="qdockwindow.html#dock">QDockWindow::dock</a>() and <a href="qdockwindow.html#undock">QDockWindow::undock</a>() instead.
+<a href="qdoctwindow.html#dock">QDockWindow::dock</a>() and <a href="qdoctwindow.html#undock">QDockWindow::undock</a>() instead.
-<h3 class=fn>void <a name="setAcceptDockWindow"></a>QDockArea::setAcceptDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, bool&nbsp;accept )
+<h3 class=fn>void <a name="setAcceptDockWindow"></a>QDockArea::setAcceptDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, bool&nbsp;accept )
</h3>
If <em>accept</em> is TRUE, dock window <em>dw</em> can be docked in the dock
area. If <em>accept</em> is FALSE, dock window <em>dw</em> cannot be docked in
diff --git a/doc/html/qdockwindow-h.html b/doc/html/qdockwindow-h.html
index 329ad1c..aac895a 100644
--- a/doc/html/qdockwindow-h.html
+++ b/doc/html/qdockwindow-h.html
@@ -1,9 +1,9 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/qdockwindow.h:1 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/qdoctwindow.h:1 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<title>qdockwindow.h Include File</title>
+<title>qdoctwindow.h Include File</title>
<style type="text/css"><!--
fn { margin-left: 1cm; text-indent: -1cm; }
a:link { color: #004faf; text-decoration: none }
@@ -29,13 +29,13 @@ body { background: #ffffff; color: black; }
| <a href="functions.html">
<font color="#004faf">Functions</font></a>
</td>
-<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>qdockwindow.h</h1>
+<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>qdoctwindow.h</h1>
-<p>This is the verbatim text of the qdockwindow.h include file. It is provided only for illustration; the copyright remains with Trolltech.
+<p>This is the verbatim text of the qdoctwindow.h include file. It is provided only for illustration; the copyright remains with Trolltech.
<hr>
<pre>
/****************************************************************************
-** $Id: qt/qdockwindow.h 3.3.8 edited Jan 11 14:38 $
+** $Id: qt/qdoctwindow.h 3.3.8 edited Jan 11 14:38 $
**
** Definition of the QDockWindow class
**
diff --git a/doc/html/qdockwindow-members.html b/doc/html/qdockwindow-members.html
index cf34fa3..a3d30d9 100644
--- a/doc/html/qdockwindow-members.html
+++ b/doc/html/qdockwindow-members.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/qdockwindow.h:62 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/include/qdoctwindow.h:62 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -32,13 +32,13 @@ body { background: #ffffff; color: black; }
<td align="right" valign="center"><img src="logo32.png" align="right" width="64" height="32" border="0"></td></tr></table><h1 align=center>Complete Member List for QDockWindow</h1>
<p>This is the complete list of member functions for
-<a href="qdockwindow.html">QDockWindow</a>, including inherited members.
+<a href="qdoctwindow.html">QDockWindow</a>, including inherited members.
<ul>
-<li><a href="qdockwindow.html#QDockWindow">QDockWindow</a>()
+<li><a href="qdoctwindow.html#QDockWindow">QDockWindow</a>()
<li><a href="qwidget.html#acceptDrops">acceptDrops</a>()
<li><a href="qwidget.html#adjustSize">adjustSize</a>()
-<li><a href="qdockwindow.html#area">area</a>()
+<li><a href="qdoctwindow.html#area">area</a>()
<li><a href="qwidget.html#autoMask">autoMask</a>()
<li><a href="qwidget.html#backgroundBrush">backgroundBrush</a>()
<li><a href="qwidget.html#backgroundColor">backgroundColor</a>()
@@ -47,7 +47,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#backgroundPixmap">backgroundPixmap</a>()
<li><a href="qwidget.html#baseSize">baseSize</a>()
<li><a href="qobject.html#blockSignals">blockSignals</a>()
-<li><a href="qdockwindow.html#boxLayout">boxLayout</a>()
+<li><a href="qdoctwindow.html#boxLayout">boxLayout</a>()
<li><a href="qwidget.html#caption">caption</a>()
<li><a href="qobject.html#checkConnectArgs">checkConnectArgs</a>()
<li><a href="qobject.html#child">child</a>()
@@ -63,7 +63,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#clipRegion">clipRegion</a>()
<li><a href="qwidget.html#close">close</a>()
<li><a href="qwidget.html#closeEvent">closeEvent</a>()
-<li><a href="qdockwindow.html#closeMode">closeMode</a>()
+<li><a href="qdoctwindow.html#closeMode">closeMode</a>()
<li><a href="qpaintdevice.html#cmd">cmd</a>()
<li><a href="qwidget.html#colorGroup">colorGroup</a>()
<li><a href="qobject.html#connect">connect</a>()
@@ -80,7 +80,7 @@ body { background: #ffffff; color: black; }
<li><a href="qobject.html#destroyed">destroyed</a>()
<li><a href="qobject.html#disconnect">disconnect</a>()
<li><a href="qobject.html#disconnectNotify">disconnectNotify</a>()
-<li><a href="qdockwindow.html#dock">dock</a>()
+<li><a href="qdoctwindow.html#dock">dock</a>()
<li><a href="qwidget.html#dragEnterEvent">dragEnterEvent</a>()
<li><a href="qwidget.html#dragLeaveEvent">dragLeaveEvent</a>()
<li><a href="qwidget.html#dragMoveEvent">dragMoveEvent</a>()
@@ -98,7 +98,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#event">event</a>()
<li><a href="qobject.html#eventFilter">eventFilter</a>()
<li><a href="qwidget.html#find">find</a>()
-<li><a href="qdockwindow.html#fixedExtent">fixedExtent</a>()
+<li><a href="qdoctwindow.html#fixedExtent">fixedExtent</a>()
<li><a href="qwidget.html#focusData">focusData</a>()
<li><a href="qwidget.html#focusInEvent">focusInEvent</a>()
<li><a href="qwidget.html#focusNextPrevChild">focusNextPrevChild</a>()
@@ -143,7 +143,7 @@ body { background: #ffffff; color: black; }
<li><a href="qobject.html#installEventFilter">installEventFilter</a>()
<li><a href="qobject.html#isA">isA</a>()
<li><a href="qwidget.html#isActiveWindow">isActiveWindow</a>()
-<li><a href="qdockwindow.html#isCloseEnabled">isCloseEnabled</a>()
+<li><a href="qdoctwindow.html#isCloseEnabled">isCloseEnabled</a>()
<li><a href="qwidget.html#isDesktop">isDesktop</a>()
<li><a href="qwidget.html#isDialog">isDialog</a>()
<li><a href="qwidget.html#isEnabled">isEnabled</a>()
@@ -153,21 +153,21 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#isFocusEnabled">isFocusEnabled</a>()
<li><a href="qwidget.html#isFullScreen">isFullScreen</a>()
<li><a href="qwidget.html#isHidden">isHidden</a>()
-<li><a href="qdockwindow.html#isHorizontalStretchable">isHorizontalStretchable</a>()
-<li><a href="qdockwindow.html#isHorizontallyStretchable">isHorizontallyStretchable</a>()
+<li><a href="qdoctwindow.html#isHorizontalStretchable">isHorizontalStretchable</a>()
+<li><a href="qdoctwindow.html#isHorizontallyStretchable">isHorizontallyStretchable</a>()
<li><a href="qwidget.html#isInputMethodEnabled">isInputMethodEnabled</a>()
<li><a href="qwidget.html#isMaximized">isMaximized</a>()
<li><a href="qwidget.html#isMinimized">isMinimized</a>()
<li><a href="qwidget.html#isModal">isModal</a>()
-<li><a href="qdockwindow.html#isMovingEnabled">isMovingEnabled</a>()
+<li><a href="qdoctwindow.html#isMovingEnabled">isMovingEnabled</a>()
<li><a href="qwidget.html#isPopup">isPopup</a>()
-<li><a href="qdockwindow.html#isResizeEnabled">isResizeEnabled</a>()
+<li><a href="qdoctwindow.html#isResizeEnabled">isResizeEnabled</a>()
<li><a href="qwidget.html#isShown">isShown</a>()
-<li><a href="qdockwindow.html#isStretchable">isStretchable</a>()
+<li><a href="qdoctwindow.html#isStretchable">isStretchable</a>()
<li><a href="qwidget.html#isTopLevel">isTopLevel</a>()
<li><a href="qwidget.html#isUpdatesEnabled">isUpdatesEnabled</a>()
-<li><a href="qdockwindow.html#isVerticalStretchable">isVerticalStretchable</a>()
-<li><a href="qdockwindow.html#isVerticallyStretchable">isVerticallyStretchable</a>()
+<li><a href="qdoctwindow.html#isVerticalStretchable">isVerticalStretchable</a>()
+<li><a href="qdoctwindow.html#isVerticallyStretchable">isVerticallyStretchable</a>()
<li><a href="qwidget.html#isVisible">isVisible</a>()
<li><a href="qwidget.html#isVisibleTo">isVisibleTo</a>()
<li><a href="qwidget.html#isVisibleToTLW">isVisibleToTLW</a>()
@@ -208,13 +208,13 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#move">move</a>()
<li><a href="qwidget.html#moveEvent">moveEvent</a>()
<li><a href="qobject.html#name">name</a>()
-<li><a href="qdockwindow.html#newLine">newLine</a>()
+<li><a href="qdoctwindow.html#newLine">newLine</a>()
<li><a href="qobject.html#normalizeSignalSlot">normalizeSignalSlot</a>()
<li><a href="qobject.html#objectTrees">objectTrees</a>()
-<li><a href="qdockwindow.html#offset">offset</a>()
-<li><a href="qdockwindow.html#opaqueMoving">opaqueMoving</a>()
-<li><a href="qdockwindow.html#orientation">orientation</a>()
-<li><a href="qdockwindow.html#orientationChanged">orientationChanged</a>()
+<li><a href="qdoctwindow.html#offset">offset</a>()
+<li><a href="qdoctwindow.html#opaqueMoving">opaqueMoving</a>()
+<li><a href="qdoctwindow.html#orientation">orientation</a>()
+<li><a href="qdoctwindow.html#orientationChanged">orientationChanged</a>()
<li><a href="qwidget.html#ownCursor">ownCursor</a>()
<li><a href="qwidget.html#ownFont">ownFont</a>()
<li><a href="qwidget.html#ownPalette">ownPalette</a>()
@@ -227,8 +227,8 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#paletteForegroundColor">paletteForegroundColor</a>()
<li><a href="qobject.html#parent">parent</a>()
<li><a href="qwidget.html#parentWidget">parentWidget</a>()
-<li><a href="qdockwindow.html#place">place</a>()
-<li><a href="qdockwindow.html#placeChanged">placeChanged</a>()
+<li><a href="qdoctwindow.html#place">place</a>()
+<li><a href="qdoctwindow.html#placeChanged">placeChanged</a>()
<li><a href="qwidget.html#polish">polish</a>()
<li><a href="qwidget.html#pos">pos</a>()
<li><a href="qobject.html#property">property</a>()
@@ -257,14 +257,14 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#setBackgroundPixmap">setBackgroundPixmap</a>()
<li><a href="qwidget.html#setBaseSize">setBaseSize</a>()
<li><a href="qwidget.html#setCaption">setCaption</a>()
-<li><a href="qdockwindow.html#setCloseMode">setCloseMode</a>()
+<li><a href="qdoctwindow.html#setCloseMode">setCloseMode</a>()
<li><a href="qwidget.html#setCursor">setCursor</a>()
<li><a href="qwidget.html#setDisabled">setDisabled</a>()
<li><a href="qwidget.html#setEnabled">setEnabled</a>()
<li><a href="qwidget.html#setEraseColor">setEraseColor</a>()
<li><a href="qwidget.html#setErasePixmap">setErasePixmap</a>()
-<li><a href="qdockwindow.html#setFixedExtentHeight">setFixedExtentHeight</a>()
-<li><a href="qdockwindow.html#setFixedExtentWidth">setFixedExtentWidth</a>()
+<li><a href="qdoctwindow.html#setFixedExtentHeight">setFixedExtentHeight</a>()
+<li><a href="qdoctwindow.html#setFixedExtentWidth">setFixedExtentWidth</a>()
<li><a href="qwidget.html#setFixedHeight">setFixedHeight</a>()
<li><a href="qwidget.html#setFixedSize">setFixedSize</a>()
<li><a href="qwidget.html#setFixedWidth">setFixedWidth</a>()
@@ -278,8 +278,8 @@ body { background: #ffffff; color: black; }
<li><a href="qframe.html#setFrameStyle">setFrameStyle</a>()
<li><a href="qwidget.html#setGeometry">setGeometry</a>()
<li><a href="qwidget.html#setHidden">setHidden</a>()
-<li><a href="qdockwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>()
-<li><a href="qdockwindow.html#setHorizontallyStretchable">setHorizontallyStretchable</a>()
+<li><a href="qdoctwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>()
+<li><a href="qdoctwindow.html#setHorizontallyStretchable">setHorizontallyStretchable</a>()
<li><a href="qwidget.html#setIcon">setIcon</a>()
<li><a href="qwidget.html#setIconText">setIconText</a>()
<li><a href="qwidget.html#setInputMethodEnabled">setInputMethodEnabled</a>()
@@ -296,28 +296,28 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#setMinimumSize">setMinimumSize</a>()
<li><a href="qwidget.html#setMinimumWidth">setMinimumWidth</a>()
<li><a href="qwidget.html#setMouseTracking">setMouseTracking</a>()
-<li><a href="qdockwindow.html#setMovingEnabled">setMovingEnabled</a>()
+<li><a href="qdoctwindow.html#setMovingEnabled">setMovingEnabled</a>()
<li><a href="qobject.html#setName">setName</a>()
-<li><a href="qdockwindow.html#setNewLine">setNewLine</a>()
-<li><a href="qdockwindow.html#setOffset">setOffset</a>()
-<li><a href="qdockwindow.html#setOpaqueMoving">setOpaqueMoving</a>()
-<li><a href="qdockwindow.html#setOrientation">setOrientation</a>()
+<li><a href="qdoctwindow.html#setNewLine">setNewLine</a>()
+<li><a href="qdoctwindow.html#setOffset">setOffset</a>()
+<li><a href="qdoctwindow.html#setOpaqueMoving">setOpaqueMoving</a>()
+<li><a href="qdoctwindow.html#setOrientation">setOrientation</a>()
<li><a href="qwidget.html#setPalette">setPalette</a>()
<li><a href="qwidget.html#setPaletteBackgroundColor">setPaletteBackgroundColor</a>()
<li><a href="qwidget.html#setPaletteBackgroundPixmap">setPaletteBackgroundPixmap</a>()
<li><a href="qwidget.html#setPaletteForegroundColor">setPaletteForegroundColor</a>()
<li><a href="qobject.html#setProperty">setProperty</a>()
-<li><a href="qdockwindow.html#setResizeEnabled">setResizeEnabled</a>()
+<li><a href="qdoctwindow.html#setResizeEnabled">setResizeEnabled</a>()
<li><a href="qwidget.html#setShown">setShown</a>()
<li><a href="qwidget.html#setSizeIncrement">setSizeIncrement</a>()
<li><a href="qwidget.html#setSizePolicy">setSizePolicy</a>()
<li><a href="qwidget.html#setStyle">setStyle</a>()
<li><a href="qwidget.html#setTabOrder">setTabOrder</a>()
<li><a href="qwidget.html#setUpdatesEnabled">setUpdatesEnabled</a>()
-<li><a href="qdockwindow.html#setVerticalStretchable">setVerticalStretchable</a>()
-<li><a href="qdockwindow.html#setVerticallyStretchable">setVerticallyStretchable</a>()
+<li><a href="qdoctwindow.html#setVerticalStretchable">setVerticalStretchable</a>()
+<li><a href="qdoctwindow.html#setVerticallyStretchable">setVerticallyStretchable</a>()
<li><a href="qwidget.html#setWFlags">setWFlags</a>()
-<li><a href="qdockwindow.html#setWidget">setWidget</a>()
+<li><a href="qdoctwindow.html#setWidget">setWidget</a>()
<li><a href="qwidget.html#setWindowOpacity">setWindowOpacity</a>()
<li><a href="qwidget.html#setWindowState">setWindowState</a>()
<li><a href="qwidget.html#show">show</a>()
@@ -341,17 +341,17 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#topLevelWidget">topLevelWidget</a>()
<li><a href="qobject.html#tr">tr</a>()
<li><a href="qobject.html#trUtf8">trUtf8</a>()
-<li><a href="qdockwindow.html#undock">undock</a>()
+<li><a href="qdoctwindow.html#undock">undock</a>()
<li><a href="qwidget.html#unsetCursor">unsetCursor</a>()
<li><a href="qwidget.html#unsetFont">unsetFont</a>()
<li><a href="qwidget.html#unsetPalette">unsetPalette</a>()
<li><a href="qwidget.html#update">update</a>()
<li><a href="qwidget.html#updateGeometry">updateGeometry</a>()
<li><a href="qwidget.html#updateMask">updateMask</a>()
-<li><a href="qdockwindow.html#visibilityChanged">visibilityChanged</a>()
+<li><a href="qdoctwindow.html#visibilityChanged">visibilityChanged</a>()
<li><a href="qwidget.html#visibleRect">visibleRect</a>()
<li><a href="qwidget.html#wheelEvent">wheelEvent</a>()
-<li><a href="qdockwindow.html#widget">widget</a>()
+<li><a href="qdoctwindow.html#widget">widget</a>()
<li><a href="qwidget.html#width">width</a>()
<li><a href="qwidget.html#winEvent">winEvent</a>()
<li><a href="qwidget.html#winId">winId</a>()
diff --git a/doc/html/qdockwindow.html b/doc/html/qdockwindow.html
index 80a657f..091f4a0 100644
--- a/doc/html/qdockwindow.html
+++ b/doc/html/qdockwindow.html
@@ -1,5 +1,5 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/widgets/qdockwindow.cpp:701 -->
+<!-- /home/espenr/tmp/qt-3.3.8-espenr-2499/qt-x11-free-3.3.8/src/widgets/qdoctwindow.cpp:701 -->
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
@@ -35,10 +35,10 @@ body { background: #ffffff; color: black; }
inside a QDockArea or floated as a top level window on the
desktop.
<a href="#details">More...</a>
-<p><tt>#include &lt;<a href="qdockwindow-h.html">qdockwindow.h</a>&gt;</tt>
+<p><tt>#include &lt;<a href="qdoctwindow-h.html">qdoctwindow.h</a>&gt;</tt>
<p>Inherits <a href="qframe.html">QFrame</a>.
<p>Inherited by <a href="qtoolbar.html">QToolBar</a>.
-<p><a href="qdockwindow-members.html">List of all member functions.</a>
+<p><a href="qdoctwindow-members.html">List of all member functions.</a>
<h2>Public Members</h2>
<ul>
<li class=fn>enum <a href="#Place-enum"><b>Place</b></a> { InDock, OutsideDock }</li>
@@ -116,7 +116,7 @@ functionality provided for dock windows is available with the same
API for toolbars.
<p> <center><img src="qmainwindow-qdockareas.png" alt="QDockWindows in a QDockArea"></center> <blockquote><p align="center"><em> Two QDockWindows (<a href="qtoolbar.html">QToolBar</a>s) in a <a href="qdockarea.html">QDockArea</a>
</em></p>
-</blockquote><p> <center><img src="qdockwindow.png" alt="A QDockWindow"></center> <blockquote><p align="center"><em> A Floating QDockWindow
+</blockquote><p> <center><img src="qdoctwindow.png" alt="A QDockWindow"></center> <blockquote><p align="center"><em> A Floating QDockWindow
</em></p>
</blockquote><p> If the user drags the dock window into the dock area the dock
window will be docked. If the user drags the dock area outside any
@@ -214,7 +214,7 @@ floating.
<li><tt>QDockWindow::OutsideDock</tt> - Floating as a top level window on the desktop.
</ul>
<hr><h2>Member Function Documentation</h2>
-<h3 class=fn><a name="QDockWindow"></a>QDockWindow::QDockWindow ( <a href="qdockwindow.html#Place-enum">Place</a>&nbsp;p = InDock, <a href="qwidget.html">QWidget</a>&nbsp;*&nbsp;parent = 0, const&nbsp;char&nbsp;*&nbsp;name = 0, WFlags&nbsp;f = 0 )
+<h3 class=fn><a name="QDockWindow"></a>QDockWindow::QDockWindow ( <a href="qdoctwindow.html#Place-enum">Place</a>&nbsp;p = InDock, <a href="qwidget.html">QWidget</a>&nbsp;*&nbsp;parent = 0, const&nbsp;char&nbsp;*&nbsp;name = 0, WFlags&nbsp;f = 0 )
</h3>
Constructs a QDockWindow with parent <em>parent</em>, called <em>name</em> and
with widget flags <em>f</em>.
@@ -250,7 +250,7 @@ using the box layout's <a href="qboxlayout.html#addWidget">QBoxLayout::addWidget
<h3 class=fn>int <a name="closeMode"></a>QDockWindow::closeMode () const
</h3><p>Returns the close mode of a dock window.
-See the <a href="qdockwindow.html#closeMode-prop">"closeMode"</a> property for details.
+See the <a href="qdoctwindow.html#closeMode-prop">"closeMode"</a> property for details.
<h3 class=fn>void <a name="dock"></a>QDockWindow::dock ()<tt> [virtual slot]</tt>
</h3>
Docks the dock window into the last dock area in which it was
@@ -283,16 +283,16 @@ and its <a href="#CloseMode-enum">CloseMode</a>.
<p>
<h3 class=fn>bool <a name="isHorizontallyStretchable"></a>QDockWindow::isHorizontallyStretchable () const
</h3><p>Returns TRUE if the dock window is horizontally stretchable; otherwise returns FALSE.
-See the <a href="qdockwindow.html#horizontallyStretchable-prop">"horizontallyStretchable"</a> property for details.
+See the <a href="qdoctwindow.html#horizontallyStretchable-prop">"horizontallyStretchable"</a> property for details.
<h3 class=fn>bool <a name="isMovingEnabled"></a>QDockWindow::isMovingEnabled () const
</h3><p>Returns TRUE if the user can move the dock window within the dock area, move the dock window to another dock area, or float the dock window; otherwise returns FALSE.
-See the <a href="qdockwindow.html#movingEnabled-prop">"movingEnabled"</a> property for details.
+See the <a href="qdoctwindow.html#movingEnabled-prop">"movingEnabled"</a> property for details.
<h3 class=fn>bool <a name="isResizeEnabled"></a>QDockWindow::isResizeEnabled () const
</h3><p>Returns TRUE if the dock window is resizeable; otherwise returns FALSE.
-See the <a href="qdockwindow.html#resizeEnabled-prop">"resizeEnabled"</a> property for details.
+See the <a href="qdoctwindow.html#resizeEnabled-prop">"resizeEnabled"</a> property for details.
<h3 class=fn>bool <a name="isStretchable"></a>QDockWindow::isStretchable () const
</h3><p>Returns TRUE if the dock window is stretchable in the current <a href="#orientation">orientation</a>(); otherwise returns FALSE.
-See the <a href="qdockwindow.html#stretchable-prop">"stretchable"</a> property for details.
+See the <a href="qdoctwindow.html#stretchable-prop">"stretchable"</a> property for details.
<h3 class=fn>bool <a name="isVerticalStretchable"></a>QDockWindow::isVerticalStretchable () const
</h3>
@@ -300,16 +300,16 @@ See the <a href="qdockwindow.html#stretchable-prop">"stretchable"</a> property f
<p>
<h3 class=fn>bool <a name="isVerticallyStretchable"></a>QDockWindow::isVerticallyStretchable () const
</h3><p>Returns TRUE if the dock window is vertically stretchable; otherwise returns FALSE.
-See the <a href="qdockwindow.html#verticallyStretchable-prop">"verticallyStretchable"</a> property for details.
+See the <a href="qdoctwindow.html#verticallyStretchable-prop">"verticallyStretchable"</a> property for details.
<h3 class=fn>bool <a name="newLine"></a>QDockWindow::newLine () const
</h3><p>Returns TRUE if the dock window prefers to start a new line in the dock area; otherwise returns FALSE.
-See the <a href="qdockwindow.html#newLine-prop">"newLine"</a> property for details.
+See the <a href="qdoctwindow.html#newLine-prop">"newLine"</a> property for details.
<h3 class=fn>int <a name="offset"></a>QDockWindow::offset () const
</h3><p>Returns the dock window's preferred offset from the dock area's left edge (top edge for vertical dock areas).
-See the <a href="qdockwindow.html#offset-prop">"offset"</a> property for details.
+See the <a href="qdoctwindow.html#offset-prop">"offset"</a> property for details.
<h3 class=fn>bool <a name="opaqueMoving"></a>QDockWindow::opaqueMoving () const
</h3><p>Returns TRUE if the dock window will be shown normally whilst it is being moved; otherwise returns FALSE.
-See the <a href="qdockwindow.html#opaqueMoving-prop">"opaqueMoving"</a> property for details.
+See the <a href="qdoctwindow.html#opaqueMoving-prop">"opaqueMoving"</a> property for details.
<h3 class=fn><a href="qt.html#Orientation-enum">Qt::Orientation</a> <a name="orientation"></a>QDockWindow::orientation () const
</h3>
Returns the orientation of the dock window.
@@ -321,14 +321,14 @@ Returns the orientation of the dock window.
<p> This signal is emitted when the orientation of the dock window is
changed. The new orientation is <em>o</em>.
-<h3 class=fn><a href="qdockwindow.html#Place-enum">Place</a> <a name="place"></a>QDockWindow::place () const
+<h3 class=fn><a href="qdoctwindow.html#Place-enum">Place</a> <a name="place"></a>QDockWindow::place () const
</h3>
<p> This function returns where the dock window is placed. This is
either <a href="#Place-enum">InDock</a> or <a href="#Place-enum">OutsideDock</a>.
<p> <p>See also <a href="qdockarea.html#moveDockWindow">QDockArea::moveDockWindow</a>(), <a href="qdockarea.html#removeDockWindow">QDockArea::removeDockWindow</a>(), <a href="qmainwindow.html#moveDockWindow">QMainWindow::moveDockWindow</a>(), and <a href="qmainwindow.html#removeDockWindow">QMainWindow::removeDockWindow</a>().
-<h3 class=fn>void <a name="placeChanged"></a>QDockWindow::placeChanged ( <a href="qdockwindow.html#Place-enum">QDockWindow::Place</a>&nbsp;p )<tt> [signal]</tt>
+<h3 class=fn>void <a name="placeChanged"></a>QDockWindow::placeChanged ( <a href="qdoctwindow.html#Place-enum">QDockWindow::Place</a>&nbsp;p )<tt> [signal]</tt>
</h3>
<p> This signal is emitted when the dock window is docked (<em>p</em> is <a href="#Place-enum">InDock</a>), undocked (<em>p</em> is <a href="#Place-enum">OutsideDock</a>) or moved inside the
@@ -337,7 +337,7 @@ the dock area.
<h3 class=fn>void <a name="setCloseMode"></a>QDockWindow::setCloseMode ( int&nbsp;m )<tt> [virtual]</tt>
</h3><p>Sets the close mode of a dock window to <em>m</em>.
-See the <a href="qdockwindow.html#closeMode-prop">"closeMode"</a> property for details.
+See the <a href="qdoctwindow.html#closeMode-prop">"closeMode"</a> property for details.
<h3 class=fn>void <a name="setFixedExtentHeight"></a>QDockWindow::setFixedExtentHeight ( int&nbsp;h )<tt> [virtual]</tt>
</h3>
Sets the dock window's preferred height for its fixed extent
@@ -357,19 +357,19 @@ to <em>w</em>.
<p>
<h3 class=fn>void <a name="setHorizontallyStretchable"></a>QDockWindow::setHorizontallyStretchable ( bool&nbsp;b )<tt> [virtual]</tt>
</h3><p>Sets whether the dock window is horizontally stretchable to <em>b</em>.
-See the <a href="qdockwindow.html#horizontallyStretchable-prop">"horizontallyStretchable"</a> property for details.
+See the <a href="qdoctwindow.html#horizontallyStretchable-prop">"horizontallyStretchable"</a> property for details.
<h3 class=fn>void <a name="setMovingEnabled"></a>QDockWindow::setMovingEnabled ( bool&nbsp;b )<tt> [virtual]</tt>
</h3><p>Sets whether the user can move the dock window within the dock area, move the dock window to another dock area, or float the dock window to <em>b</em>.
-See the <a href="qdockwindow.html#movingEnabled-prop">"movingEnabled"</a> property for details.
+See the <a href="qdoctwindow.html#movingEnabled-prop">"movingEnabled"</a> property for details.
<h3 class=fn>void <a name="setNewLine"></a>QDockWindow::setNewLine ( bool&nbsp;b )<tt> [virtual]</tt>
</h3><p>Sets whether the dock window prefers to start a new line in the dock area to <em>b</em>.
-See the <a href="qdockwindow.html#newLine-prop">"newLine"</a> property for details.
+See the <a href="qdoctwindow.html#newLine-prop">"newLine"</a> property for details.
<h3 class=fn>void <a name="setOffset"></a>QDockWindow::setOffset ( int&nbsp;o )<tt> [virtual]</tt>
</h3><p>Sets the dock window's preferred offset from the dock area's left edge (top edge for vertical dock areas) to <em>o</em>.
-See the <a href="qdockwindow.html#offset-prop">"offset"</a> property for details.
+See the <a href="qdoctwindow.html#offset-prop">"offset"</a> property for details.
<h3 class=fn>void <a name="setOpaqueMoving"></a>QDockWindow::setOpaqueMoving ( bool&nbsp;b )<tt> [virtual]</tt>
</h3><p>Sets whether the dock window will be shown normally whilst it is being moved to <em>b</em>.
-See the <a href="qdockwindow.html#opaqueMoving-prop">"opaqueMoving"</a> property for details.
+See the <a href="qdoctwindow.html#opaqueMoving-prop">"opaqueMoving"</a> property for details.
<h3 class=fn>void <a name="setOrientation"></a>QDockWindow::setOrientation ( <a href="qt.html#Orientation-enum">Orientation</a>&nbsp;o )<tt> [virtual slot]</tt>
</h3>
Sets the orientation of the dock window to <em>o</em>. The orientation
@@ -378,7 +378,7 @@ is propagated to the layout <a href="#boxLayout">boxLayout</a>().
<h3 class=fn>void <a name="setResizeEnabled"></a>QDockWindow::setResizeEnabled ( bool&nbsp;b )<tt> [virtual]</tt>
</h3><p>Sets whether the dock window is resizeable to <em>b</em>.
-See the <a href="qdockwindow.html#resizeEnabled-prop">"resizeEnabled"</a> property for details.
+See the <a href="qdoctwindow.html#resizeEnabled-prop">"resizeEnabled"</a> property for details.
<h3 class=fn>void <a name="setVerticalStretchable"></a>QDockWindow::setVerticalStretchable ( bool&nbsp;b )
</h3>
@@ -386,7 +386,7 @@ See the <a href="qdockwindow.html#resizeEnabled-prop">"resizeEnabled"</a> proper
<p>
<h3 class=fn>void <a name="setVerticallyStretchable"></a>QDockWindow::setVerticallyStretchable ( bool&nbsp;b )<tt> [virtual]</tt>
</h3><p>Sets whether the dock window is vertically stretchable to <em>b</em>.
-See the <a href="qdockwindow.html#verticallyStretchable-prop">"verticallyStretchable"</a> property for details.
+See the <a href="qdoctwindow.html#verticallyStretchable-prop">"verticallyStretchable"</a> property for details.
<h3 class=fn>void <a name="setWidget"></a>QDockWindow::setWidget ( <a href="qwidget.html">QWidget</a>&nbsp;*&nbsp;w )<tt> [virtual]</tt>
</h3>
Sets the dock window's main widget to <em>w</em>.
diff --git a/doc/html/qframe.html b/doc/html/qframe.html
index 0afe39e..293d9ac 100644
--- a/doc/html/qframe.html
+++ b/doc/html/qframe.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
<a href="#details">More...</a>
<p><tt>#include &lt;<a href="qframe-h.html">qframe.h</a>&gt;</tt>
<p>Inherits <a href="qwidget.html">QWidget</a>.
-<p>Inherited by <a href="qgroupbox.html">QGroupBox</a>, <a href="qscrollview.html">QScrollView</a>, <a href="qdockwindow.html">QDockWindow</a>, <a href="qgrid.html">QGrid</a>, <a href="qhbox.html">QHBox</a>, <a href="qlabel.html">QLabel</a>, <a href="qlcdnumber.html">QLCDNumber</a>, <a href="qlineedit.html">QLineEdit</a>, <a href="qmenubar.html">QMenuBar</a>, <a href="qpopupmenu.html">QPopupMenu</a>, <a href="qprogressbar.html">QProgressBar</a>, <a href="qsplitter.html">QSplitter</a>, <a href="qtoolbox.html">QToolBox</a>, and <a href="qwidgetstack.html">QWidgetStack</a>.
+<p>Inherited by <a href="qgroupbox.html">QGroupBox</a>, <a href="qscrollview.html">QScrollView</a>, <a href="qdoctwindow.html">QDockWindow</a>, <a href="qgrid.html">QGrid</a>, <a href="qhbox.html">QHBox</a>, <a href="qlabel.html">QLabel</a>, <a href="qlcdnumber.html">QLCDNumber</a>, <a href="qlineedit.html">QLineEdit</a>, <a href="qmenubar.html">QMenuBar</a>, <a href="qpopupmenu.html">QPopupMenu</a>, <a href="qprogressbar.html">QProgressBar</a>, <a href="qsplitter.html">QSplitter</a>, <a href="qtoolbox.html">QToolBox</a>, and <a href="qwidgetstack.html">QWidgetStack</a>.
<p><a href="qframe-members.html">List of all member functions.</a>
<h2>Public Members</h2>
<ul>
diff --git a/doc/html/qmainwindow.html b/doc/html/qmainwindow.html
index cb00d2b..c7b5a2d 100644
--- a/doc/html/qmainwindow.html
+++ b/doc/html/qmainwindow.html
@@ -273,7 +273,7 @@ moving dock windows you can specify their 'edge' (dock area). The
currently available edges are: <a href="qt.html#Dock-enum">Top</a>, <a href="qt.html#Dock-enum">Left</a>, <a href="qt.html#Dock-enum">Right</a>, <a href="qt.html#Dock-enum">Bottom</a>, <a href="qt.html#Dock-enum">Minimized</a> (effectively a 'hidden' dock area) and <a href="qt.html#Dock-enum">TornOff</a> (floating). See <a href="qt.html#Dock-enum">Qt::Dock</a> for an explanation of these
areas. Note that the *ToolBar functions are included for backward
compatibility; all new code should use the *DockWindow functions.
-QToolbar is a subclass of <a href="qdockwindow.html">QDockWindow</a> so all functions that work
+QToolbar is a subclass of <a href="qdoctwindow.html">QDockWindow</a> so all functions that work
with dock windows work on toolbars in the same way.
<p> <a name="dwm"></a>
If the user clicks the close button, then the dock window is
@@ -293,8 +293,8 @@ dock the floating dock window. (See also
<a href="#DockWindows-enum">QMainWindow::DockWindows</a>.)
<p> Some functions change the appearance of a QMainWindow globally:
<ul>
-<li> <a href="qdockwindow.html#setHorizontalStretchable">QDockWindow::setHorizontalStretchable</a>() and
-<a href="qdockwindow.html#setVerticalStretchable">QDockWindow::setVerticalStretchable</a>() are used to make specific dock
+<li> <a href="qdoctwindow.html#setHorizontalStretchable">QDockWindow::setHorizontalStretchable</a>() and
+<a href="qdoctwindow.html#setVerticalStretchable">QDockWindow::setVerticalStretchable</a>() are used to make specific dock
windows or toolbars stretchable.
<li> <a href="#setUsesBigPixmaps">setUsesBigPixmaps</a>() is used to set whether tool buttons should
draw small or large pixmaps (see <a href="qiconset.html">QIconSet</a> for more information).
@@ -385,7 +385,7 @@ add your own dock areas (see <a href="qdockarea.html">QDockArea</a>) to the subc
QMainWindow provides functionality specific to the standard dock
areas it provides.
<p> <img src=qmainwindow-m.png> <img src=qmainwindow-w.png>
-<p> <p>See also <a href="qtoolbar.html">QToolBar</a>, <a href="qdockwindow.html">QDockWindow</a>, <a href="qstatusbar.html">QStatusBar</a>, <a href="qaction.html">QAction</a>, <a href="qmenubar.html">QMenuBar</a>, <a href="qpopupmenu.html">QPopupMenu</a>, <a href="qtooltipgroup.html">QToolTipGroup</a>, <a href="qdialog.html">QDialog</a>, and <a href="application.html">Main Window and Related Classes</a>.
+<p> <p>See also <a href="qtoolbar.html">QToolBar</a>, <a href="qdoctwindow.html">QDockWindow</a>, <a href="qstatusbar.html">QStatusBar</a>, <a href="qaction.html">QAction</a>, <a href="qmenubar.html">QMenuBar</a>, <a href="qpopupmenu.html">QPopupMenu</a>, <a href="qtooltipgroup.html">QToolTipGroup</a>, <a href="qdialog.html">QDialog</a>, and <a href="application.html">Main Window and Related Classes</a>.
<hr><h2>Member Type Documentation</h2>
<h3 class=fn><a name="DockWindows-enum"></a>QMainWindow::DockWindows</h3>
@@ -415,7 +415,7 @@ QMainWindow to be a top level widget then you will need to set <em>f</em> to 0.
</h3>
Destroys the object and frees any allocated resources.
-<h3 class=fn>void <a name="addDockWindow"></a>QMainWindow::addDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge = DockTop, bool&nbsp;newLine = FALSE )<tt> [virtual]</tt>
+<h3 class=fn>void <a name="addDockWindow"></a>QMainWindow::addDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge = DockTop, bool&nbsp;newLine = FALSE )<tt> [virtual]</tt>
</h3>
Adds <em>dockWindow</em> to the <em>edge</em> dock area.
<p> If <em>newLine</em> is FALSE (the default) then the <em>dockWindow</em> is
@@ -427,7 +427,7 @@ top-most) dock window.
<p> If <em>dockWindow</em> is managed by another main window, it is first
removed from that window.
-<h3 class=fn>void <a name="addDockWindow-2"></a>QMainWindow::addDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, const&nbsp;<a href="qstring.html">QString</a>&nbsp;&amp;&nbsp;label, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge = DockTop, bool&nbsp;newLine = FALSE )<tt> [virtual]</tt>
+<h3 class=fn>void <a name="addDockWindow-2"></a>QMainWindow::addDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, const&nbsp;<a href="qstring.html">QString</a>&nbsp;&amp;&nbsp;label, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge = DockTop, bool&nbsp;newLine = FALSE )<tt> [virtual]</tt>
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> Adds <em>dockWindow</em> to the dock area with label <em>label</em>.
@@ -440,17 +440,17 @@ dock window.
<p> If <em>dockWindow</em> is managed by another main window, it is first
removed from that window.
-<h3 class=fn>void <a name="addToolBar"></a>QMainWindow::addToolBar ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*, <a href="qt.html#Dock-enum">Dock</a> = DockTop, bool&nbsp;newLine = FALSE )
+<h3 class=fn>void <a name="addToolBar"></a>QMainWindow::addToolBar ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*, <a href="qt.html#Dock-enum">Dock</a> = DockTop, bool&nbsp;newLine = FALSE )
</h3>
<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
<p>
-<h3 class=fn>void <a name="addToolBar-2"></a>QMainWindow::addToolBar ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*, const&nbsp;<a href="qstring.html">QString</a>&nbsp;&amp;&nbsp;label, <a href="qt.html#Dock-enum">Dock</a> = DockTop, bool&nbsp;newLine = FALSE )
+<h3 class=fn>void <a name="addToolBar-2"></a>QMainWindow::addToolBar ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*, const&nbsp;<a href="qstring.html">QString</a>&nbsp;&amp;&nbsp;label, <a href="qt.html#Dock-enum">Dock</a> = DockTop, bool&nbsp;newLine = FALSE )
</h3>
<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
<p> This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p>
-<h3 class=fn>bool <a name="appropriate"></a>QMainWindow::appropriate ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw ) const
+<h3 class=fn>bool <a name="appropriate"></a>QMainWindow::appropriate ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw ) const
</h3>
Returns TRUE if it is appropriate to include a menu item for the
<em>dw</em> dock window in the dock window menu; otherwise returns
@@ -516,7 +516,7 @@ the item to appear then reimplement isCustomizable() to return
TRUE, and reimplement this function to do whatever you want.
<p> <p>See also <a href="#isCustomizable">isCustomizable</a>().
-<h3 class=fn>void <a name="dockWindowPositionChanged"></a>QMainWindow::dockWindowPositionChanged ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow )<tt> [signal]</tt>
+<h3 class=fn>void <a name="dockWindowPositionChanged"></a>QMainWindow::dockWindowPositionChanged ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow )<tt> [signal]</tt>
</h3>
<p> This signal is emitted when the <em>dockWindow</em> has changed its
@@ -543,7 +543,7 @@ regardless of which dock area they are in or what their state is,
<h3 class=fn>bool <a name="dockWindowsMovable"></a>QMainWindow::dockWindowsMovable () const
</h3><p>Returns TRUE if the dock windows are movable; otherwise returns FALSE.
See the <a href="qmainwindow.html#dockWindowsMovable-prop">"dockWindowsMovable"</a> property for details.
-<h3 class=fn>bool <a name="getLocation"></a>QMainWindow::getLocation ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, <a href="qt.html#Dock-enum">Dock</a>&nbsp;&amp;&nbsp;dock, int&nbsp;&amp;&nbsp;index, bool&nbsp;&amp;&nbsp;nl, int&nbsp;&amp;&nbsp;extraOffset ) const
+<h3 class=fn>bool <a name="getLocation"></a>QMainWindow::getLocation ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, <a href="qt.html#Dock-enum">Dock</a>&nbsp;&amp;&nbsp;dock, int&nbsp;&amp;&nbsp;index, bool&nbsp;&amp;&nbsp;nl, int&nbsp;&amp;&nbsp;extraOffset ) const
</h3>
Finds the location of the dock window <em>dw</em>.
<p> If the <em>dw</em> dock window is found in the main window the function
@@ -558,7 +558,7 @@ is undefined.
<a href="#operator-gt-gt">operator&gt;&gt;</a>() and <a href="#operator-lt-lt">operator&lt;&lt;</a>().
<p> <p>See also <a href="#operator-gt-gt">operator&gt;&gt;</a>() and <a href="#operator-lt-lt">operator&lt;&lt;</a>().
-<h3 class=fn>bool <a name="hasDockWindow"></a>QMainWindow::hasDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw )
+<h3 class=fn>bool <a name="hasDockWindow"></a>QMainWindow::hasDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw )
</h3>
Returns TRUE if <em>dw</em> is a dock window known to the main window;
otherwise returns FALSE.
@@ -586,14 +586,14 @@ This is an overloaded member function, provided for convenience. It behaves esse
user dragged dock windows; otherwise returns FALSE.
<p> <p>See also <a href="#setDockEnabled">setDockEnabled</a>().
-<h3 class=fn>bool <a name="isDockEnabled-3"></a>QMainWindow::isDockEnabled ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;tb, <a href="qt.html#Dock-enum">Dock</a>&nbsp;dock ) const
+<h3 class=fn>bool <a name="isDockEnabled-3"></a>QMainWindow::isDockEnabled ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;tb, <a href="qt.html#Dock-enum">Dock</a>&nbsp;dock ) const
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> Returns TRUE if dock area <em>dock</em> is enabled for the dock window
<em>tb</em>; otherwise returns FALSE.
<p> <p>See also <a href="#setDockEnabled">setDockEnabled</a>().
-<h3 class=fn>bool <a name="isDockEnabled-4"></a>QMainWindow::isDockEnabled ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, <a href="qdockarea.html">QDockArea</a>&nbsp;*&nbsp;area ) const
+<h3 class=fn>bool <a name="isDockEnabled-4"></a>QMainWindow::isDockEnabled ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, <a href="qdockarea.html">QDockArea</a>&nbsp;*&nbsp;area ) const
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> Returns TRUE if dock area <em>area</em> is enabled for the dock window
@@ -644,7 +644,7 @@ Returns the menu bar for this window.
<p> If there isn't one, then <a href="#menuBar">menuBar</a>() creates an empty menu bar.
<p> <p>See also <a href="#statusBar">statusBar</a>().
-<h3 class=fn>void <a name="moveDockWindow"></a>QMainWindow::moveDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge = DockTop )<tt> [virtual]</tt>
+<h3 class=fn>void <a name="moveDockWindow"></a>QMainWindow::moveDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge = DockTop )<tt> [virtual]</tt>
</h3>
Moves <em>dockWindow</em> to the end of the <em>edge</em>.
<p> For vertical edges the end is at the bottom, for horizontal edges
@@ -652,7 +652,7 @@ Moves <em>dockWindow</em> to the end of the <em>edge</em>.
<p> If <em>dockWindow</em> is managed by another main window, it is first
removed from that window.
-<h3 class=fn>void <a name="moveDockWindow-2"></a>QMainWindow::moveDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge, bool&nbsp;nl, int&nbsp;index, int&nbsp;extraOffset = -1 )<tt> [virtual]</tt>
+<h3 class=fn>void <a name="moveDockWindow-2"></a>QMainWindow::moveDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow, <a href="qt.html#Dock-enum">Dock</a>&nbsp;edge, bool&nbsp;nl, int&nbsp;index, int&nbsp;extraOffset = -1 )<tt> [virtual]</tt>
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> Moves <em>dockWindow</em> to position <em>index</em> within the <em>edge</em> dock
@@ -671,12 +671,12 @@ positions the user has dragged them to.)
<p> If <em>dockWindow</em> is managed by another main window, it is first
removed from that window.
-<h3 class=fn>void <a name="moveToolBar"></a>QMainWindow::moveToolBar ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*, <a href="qt.html#Dock-enum">Dock</a> = DockTop )
+<h3 class=fn>void <a name="moveToolBar"></a>QMainWindow::moveToolBar ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*, <a href="qt.html#Dock-enum">Dock</a> = DockTop )
</h3>
<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
<p>
-<h3 class=fn>void <a name="moveToolBar-2"></a>QMainWindow::moveToolBar ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*, <a href="qt.html#Dock-enum">Dock</a>, bool&nbsp;nl, int&nbsp;index, int&nbsp;extraOffset = -1 )
+<h3 class=fn>void <a name="moveToolBar-2"></a>QMainWindow::moveToolBar ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*, <a href="qt.html#Dock-enum">Dock</a>, bool&nbsp;nl, int&nbsp;index, int&nbsp;extraOffset = -1 )
</h3>
<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
<p> This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
@@ -692,13 +692,13 @@ with a value different to the current setting. All widgets that
should respond to such changes, e.g. toolbar buttons, must connect
to this signal.
-<h3 class=fn>void <a name="removeDockWindow"></a>QMainWindow::removeDockWindow ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow )<tt> [virtual]</tt>
+<h3 class=fn>void <a name="removeDockWindow"></a>QMainWindow::removeDockWindow ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dockWindow )<tt> [virtual]</tt>
</h3>
Removes <em>dockWindow</em> from the main window's docking area,
provided <em>dockWindow</em> is non-null and managed by this main
window.
-<h3 class=fn>void <a name="removeToolBar"></a>QMainWindow::removeToolBar ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;* )
+<h3 class=fn>void <a name="removeToolBar"></a>QMainWindow::removeToolBar ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;* )
</h3>
<b>This function is obsolete.</b> It is provided to keep old source working. We strongly advise against using it in new code.
<p>
@@ -711,7 +711,7 @@ Returns the <a href="qt.html#Dock-enum">Right</a> dock area
<h3 class=fn>bool <a name="rightJustification"></a>QMainWindow::rightJustification () const
</h3><p>Returns TRUE if the main window right-justifies its dock windows; otherwise returns FALSE.
See the <a href="qmainwindow.html#rightJustification-prop">"rightJustification"</a> property for details.
-<h3 class=fn>void <a name="setAppropriate"></a>QMainWindow::setAppropriate ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, bool&nbsp;a )<tt> [virtual slot]</tt>
+<h3 class=fn>void <a name="setAppropriate"></a>QMainWindow::setAppropriate ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, bool&nbsp;a )<tt> [virtual slot]</tt>
</h3>
Use this function to control whether or not the <em>dw</em> dock
window's caption should appear as a menu item on the dock window
@@ -737,7 +737,7 @@ If <em>enable</em> is TRUE then users can dock windows in the <em>dock</em>
area. If <em>enable</em> is FALSE users cannot dock windows in the <em>dock</em> dock area.
<p> Users can dock (drag) dock windows into any enabled dock area.
-<h3 class=fn>void <a name="setDockEnabled-2"></a>QMainWindow::setDockEnabled ( <a href="qdockwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, <a href="qt.html#Dock-enum">Dock</a>&nbsp;dock, bool&nbsp;enable )<tt> [virtual]</tt>
+<h3 class=fn>void <a name="setDockEnabled-2"></a>QMainWindow::setDockEnabled ( <a href="qdoctwindow.html">QDockWindow</a>&nbsp;*&nbsp;dw, <a href="qt.html#Dock-enum">Dock</a>&nbsp;dock, bool&nbsp;enable )<tt> [virtual]</tt>
</h3>
This is an overloaded member function, provided for convenience. It behaves essentially like the above function.
<p> If <em>enable</em> is TRUE then users can dock the <em>dw</em> dock window in
@@ -881,7 +881,7 @@ be changed with <a href="#setOpaqueMoving">setOpaqueMoving</a>().
(i.e. it shows the toolbar as it looks when docked) whilst it is
being moved. If FALSE (the default) they are shown transparently,
(i.e. as an outline rectangle).
-<p> <b>Warning:</b> Opaque moving of toolbars and dockwindows is known to
+<p> <b>Warning:</b> Opaque moving of toolbars and doctwindows is known to
have several problems. We recommend avoiding the use of this
feature for the time being. We intend fixing the problems in a
future release.
@@ -896,7 +896,7 @@ need. Since most dock windows are not stretchable, this usually
results in an unjustified right edge (or unjustified bottom edge
for a vertical dock area). If enabled, the main window will
right-justify its dock windows.
-<p> <p>See also <a href="qdockwindow.html#setVerticalStretchable">QDockWindow::setVerticalStretchable</a>() and <a href="qdockwindow.html#setHorizontalStretchable">QDockWindow::setHorizontalStretchable</a>().
+<p> <p>See also <a href="qdoctwindow.html#setVerticalStretchable">QDockWindow::setVerticalStretchable</a>() and <a href="qdoctwindow.html#setHorizontalStretchable">QDockWindow::setHorizontalStretchable</a>().
<p>Set this property's value with <a href="#setRightJustification">setRightJustification</a>() and get this property's value with <a href="#rightJustification">rightJustification</a>().
<h3 class=fn>bool <a name="usesBigPixmaps-prop"></a>usesBigPixmaps</h3>
diff --git a/doc/html/qstyle.html b/doc/html/qstyle.html
index c956e64..788a2c8 100644
--- a/doc/html/qstyle.html
+++ b/doc/html/qstyle.html
@@ -205,7 +205,7 @@ style supports scrolling.
<li><tt>QStyle::CE_MenuBarItem</tt> - a menu item in a <a href="qmenubar.html">QMenuBar</a>.
<li><tt>QStyle::CE_ToolButtonLabel</tt> - a tool button's label.
<li><tt>QStyle::CE_MenuBarEmptyArea</tt> - the empty area of a QMenuBar.
-<li><tt>QStyle::CE_DockWindowEmptyArea</tt> - the empty area of a <a href="qdockwindow.html">QDockWindow</a>.
+<li><tt>QStyle::CE_DockWindowEmptyArea</tt> - the empty area of a <a href="qdoctwindow.html">QDockWindow</a>.
<li><tt>QStyle::CE_ToolBoxTab</tt> - the toolbox's tab area
<li><tt>QStyle::CE_HeaderLabel</tt> - the header's label
<li><tt>QStyle::CE_CustomBase</tt> - base value for custom ControlElements. All values above
@@ -329,7 +329,7 @@ example, a <a href="qradiobutton.html">QRadioButton</a>.
<li><tt>QStyle::PE_ExclusiveIndicatorMask</tt> - bitmap mask for an exclusive indicator.
</ul><p> <ul>
<li><tt>QStyle::PE_DockWindowHandle</tt> - tear off handle for dock windows and
-toolbars, for example <a href="qdockwindow.html">QDockWindow</a>s and <a href="qtoolbar.html">QToolBar</a>s.
+toolbars, for example <a href="qdoctwindow.html">QDockWindow</a>s and <a href="qtoolbar.html">QToolBar</a>s.
<li><tt>QStyle::PE_DockWindowSeparator</tt> - item separator for dock window and
toolbar contents.
<li><tt>QStyle::PE_DockWindowResizeHandle</tt> - resize handle for dock windows.
@@ -534,7 +534,7 @@ example, in a <a href="qworkspace.html">QWorkspace</a>.
<li><tt>QStyle::SP_MessageBoxQuestion</tt> - the 'question' icon.
</ul><p> <ul>
<li><tt>QStyle::SP_DockWindowCloseButton</tt> - close button on dock windows;
-see also <a href="qdockwindow.html">QDockWindow</a>.
+see also <a href="qdoctwindow.html">QDockWindow</a>.
</ul><p> <ul>
<li><tt>QStyle::SP_CustomBase</tt> - base value for custom ControlElements. All
values above this are reserved for custom use. Therefore,
@@ -1092,7 +1092,7 @@ appropriate <em>widget</em> and <em>opt</em> usage:
<tr bgcolor="#d0d0d0"> <td valign="top"><a href="#ContentsType-enum">CT_ToolButton</a> <td valign="top">(const <a href="qtoolbutton.html">QToolButton</a> *) <td valign="top">Unused. <td valign="top">&nbsp;
<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#ContentsType-enum">CT_ComboBox</a> <td valign="top">(const <a href="qcombobox.html">QComboBox</a> *) <td valign="top">Unused. <td valign="top">&nbsp;
<tr bgcolor="#d0d0d0"> <td valign="top"><a href="#ContentsType-enum">CT_Splitter</a> <td valign="top">(const <a href="qsplitter.html">QSplitter</a> *) <td valign="top">Unused. <td valign="top">&nbsp;
-<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#ContentsType-enum">CT_DockWindow</a> <td valign="top">(const <a href="qdockwindow.html">QDockWindow</a> *) <td valign="top">Unused. <td valign="top">&nbsp;
+<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#ContentsType-enum">CT_DockWindow</a> <td valign="top">(const <a href="qdoctwindow.html">QDockWindow</a> *) <td valign="top">Unused. <td valign="top">&nbsp;
<tr bgcolor="#d0d0d0"> <td valign="top"><a href="#ContentsType-enum">CT_ProgressBar</a> <td valign="top">(const <a href="qprogressbar.html">QProgressBar</a> *) <td valign="top">Unused. <td valign="top">&nbsp;
<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#ContentsType-enum">CT_PopupMenuItem</a> <td valign="top">(const <a href="qpopupmenu.html">QPopupMenu</a> *)
<td valign="top"><a href="qstyleoption.html">QStyleOption</a> ( QMenuItem *mi )
@@ -1130,7 +1130,7 @@ appropriate <em>widget</em> casts:
<tr bgcolor="#d0d0d0"> <td valign="top"><a href="#StylePixmap-enum">SP_TitleBarNormalButton</a> <td valign="top">(const <a href="qwidget.html">QWidget</a> *)
<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#StylePixmap-enum">SP_TitleBarShadeButton</a> <td valign="top">(const <a href="qwidget.html">QWidget</a> *)
<tr bgcolor="#d0d0d0"> <td valign="top"><a href="#StylePixmap-enum">SP_TitleBarUnshadeButton</a> <td valign="top">(const <a href="qwidget.html">QWidget</a> *)
-<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#StylePixmap-enum">SP_DockWindowCloseButton</a> <td valign="top">(const <a href="qdockwindow.html">QDockWindow</a> *)
+<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#StylePixmap-enum">SP_DockWindowCloseButton</a> <td valign="top">(const <a href="qdoctwindow.html">QDockWindow</a> *)
</table></center>
<p> <p>See also <a href="#StylePixmap-enum">StylePixmap</a>.
@@ -1159,13 +1159,13 @@ appropriate <em>widget</em> casts:
<tr bgcolor="#d0d0d0"> <td valign="top"><a href="#SubRect-enum">SR_ProgressBarContents</a> <td valign="top">(const <a href="qprogressbar.html">QProgressBar</a> *)
<tr bgcolor="#f0f0f0"> <td valign="top"><a href="#SubRect-enum">SR_ProgressBarLabel</a> <td valign="top">(const <a href="qprogressbar.html">QProgressBar</a> *)
</table></center>
-<p> The tear-off handle (SR_DockWindowHandleRect) for <a href="qdockwindow.html">QDockWindow</a>
+<p> The tear-off handle (SR_DockWindowHandleRect) for <a href="qdoctwindow.html">QDockWindow</a>
is a private class. Use <a href="qwidget.html#parentWidget">QWidget::parentWidget</a>() to access the
QDockWindow:
<p> <pre>
if ( !widget-&gt;parentWidget() )
return;
- const <a href="qdockwindow.html">QDockWindow</a> *dw = (const <a href="qdockwindow.html">QDockWindow</a> *) widget-&gt;parentWidget();
+ const <a href="qdoctwindow.html">QDockWindow</a> *dw = (const <a href="qdoctwindow.html">QDockWindow</a> *) widget-&gt;parentWidget();
</pre>
<p> <p>See also <a href="#SubRect-enum">SubRect</a>.
diff --git a/doc/html/qt.dcf b/doc/html/qt.dcf
index 0882ceb..77d53d3 100644
--- a/doc/html/qt.dcf
+++ b/doc/html/qt.dcf
@@ -1995,54 +1995,54 @@
<section ref="qdockarea-members.html" title="List of All Member Functions"/>
<section ref="qdockarea-h.html" title="Header File"/>
</section>
-<section ref="qdockwindow.html" title="QDockWindow Class Reference">
- <keyword ref="qdockwindow.html">QDockWindow</keyword>
- <keyword ref="qdockwindow.html#CloseMode">CloseMode</keyword>
- <keyword ref="qdockwindow.html#Place">Place</keyword>
- <keyword ref="qdockwindow.html#area">area</keyword>
- <keyword ref="qdockwindow.html#boxLayout">boxLayout</keyword>
- <keyword ref="qdockwindow.html#closeMode">closeMode</keyword>
- <keyword ref="qdockwindow.html#closeMode-prop">closeMode</keyword>
- <keyword ref="qdockwindow.html#dock">dock</keyword>
- <keyword ref="qdockwindow.html#fixedExtent">fixedExtent</keyword>
- <keyword ref="qdockwindow.html#horizontallyStretchable-prop">horizontallyStretchable</keyword>
- <keyword ref="qdockwindow.html#isCloseEnabled">isCloseEnabled</keyword>
- <keyword ref="qdockwindow.html#isHorizontallyStretchable">isHorizontallyStretchable</keyword>
- <keyword ref="qdockwindow.html#isMovingEnabled">isMovingEnabled</keyword>
- <keyword ref="qdockwindow.html#isResizeEnabled">isResizeEnabled</keyword>
- <keyword ref="qdockwindow.html#isStretchable">isStretchable</keyword>
- <keyword ref="qdockwindow.html#isVerticallyStretchable">isVerticallyStretchable</keyword>
- <keyword ref="qdockwindow.html#movingEnabled-prop">movingEnabled</keyword>
- <keyword ref="qdockwindow.html#newLine">newLine</keyword>
- <keyword ref="qdockwindow.html#newLine-prop">newLine</keyword>
- <keyword ref="qdockwindow.html#offset">offset</keyword>
- <keyword ref="qdockwindow.html#offset-prop">offset</keyword>
- <keyword ref="qdockwindow.html#opaqueMoving">opaqueMoving</keyword>
- <keyword ref="qdockwindow.html#opaqueMoving-prop">opaqueMoving</keyword>
- <keyword ref="qdockwindow.html#orientation">orientation</keyword>
- <keyword ref="qdockwindow.html#orientationChanged">orientationChanged</keyword>
- <keyword ref="qdockwindow.html#place">place</keyword>
- <keyword ref="qdockwindow.html#placeChanged">placeChanged</keyword>
- <keyword ref="qdockwindow.html#resizeEnabled-prop">resizeEnabled</keyword>
- <keyword ref="qdockwindow.html#setCloseMode">setCloseMode</keyword>
- <keyword ref="qdockwindow.html#setFixedExtentHeight">setFixedExtentHeight</keyword>
- <keyword ref="qdockwindow.html#setFixedExtentWidth">setFixedExtentWidth</keyword>
- <keyword ref="qdockwindow.html#setHorizontallyStretchable">setHorizontallyStretchable</keyword>
- <keyword ref="qdockwindow.html#setMovingEnabled">setMovingEnabled</keyword>
- <keyword ref="qdockwindow.html#setNewLine">setNewLine</keyword>
- <keyword ref="qdockwindow.html#setOffset">setOffset</keyword>
- <keyword ref="qdockwindow.html#setOpaqueMoving">setOpaqueMoving</keyword>
- <keyword ref="qdockwindow.html#setOrientation">setOrientation</keyword>
- <keyword ref="qdockwindow.html#setResizeEnabled">setResizeEnabled</keyword>
- <keyword ref="qdockwindow.html#setVerticallyStretchable">setVerticallyStretchable</keyword>
- <keyword ref="qdockwindow.html#setWidget">setWidget</keyword>
- <keyword ref="qdockwindow.html#stretchable-prop">stretchable</keyword>
- <keyword ref="qdockwindow.html#undock">undock</keyword>
- <keyword ref="qdockwindow.html#verticallyStretchable-prop">verticallyStretchable</keyword>
- <keyword ref="qdockwindow.html#visibilityChanged">visibilityChanged</keyword>
- <keyword ref="qdockwindow.html#widget">widget</keyword>
- <section ref="qdockwindow-members.html" title="List of All Member Functions"/>
- <section ref="qdockwindow-h.html" title="Header File"/>
+<section ref="qdoctwindow.html" title="QDockWindow Class Reference">
+ <keyword ref="qdoctwindow.html">QDockWindow</keyword>
+ <keyword ref="qdoctwindow.html#CloseMode">CloseMode</keyword>
+ <keyword ref="qdoctwindow.html#Place">Place</keyword>
+ <keyword ref="qdoctwindow.html#area">area</keyword>
+ <keyword ref="qdoctwindow.html#boxLayout">boxLayout</keyword>
+ <keyword ref="qdoctwindow.html#closeMode">closeMode</keyword>
+ <keyword ref="qdoctwindow.html#closeMode-prop">closeMode</keyword>
+ <keyword ref="qdoctwindow.html#dock">dock</keyword>
+ <keyword ref="qdoctwindow.html#fixedExtent">fixedExtent</keyword>
+ <keyword ref="qdoctwindow.html#horizontallyStretchable-prop">horizontallyStretchable</keyword>
+ <keyword ref="qdoctwindow.html#isCloseEnabled">isCloseEnabled</keyword>
+ <keyword ref="qdoctwindow.html#isHorizontallyStretchable">isHorizontallyStretchable</keyword>
+ <keyword ref="qdoctwindow.html#isMovingEnabled">isMovingEnabled</keyword>
+ <keyword ref="qdoctwindow.html#isResizeEnabled">isResizeEnabled</keyword>
+ <keyword ref="qdoctwindow.html#isStretchable">isStretchable</keyword>
+ <keyword ref="qdoctwindow.html#isVerticallyStretchable">isVerticallyStretchable</keyword>
+ <keyword ref="qdoctwindow.html#movingEnabled-prop">movingEnabled</keyword>
+ <keyword ref="qdoctwindow.html#newLine">newLine</keyword>
+ <keyword ref="qdoctwindow.html#newLine-prop">newLine</keyword>
+ <keyword ref="qdoctwindow.html#offset">offset</keyword>
+ <keyword ref="qdoctwindow.html#offset-prop">offset</keyword>
+ <keyword ref="qdoctwindow.html#opaqueMoving">opaqueMoving</keyword>
+ <keyword ref="qdoctwindow.html#opaqueMoving-prop">opaqueMoving</keyword>
+ <keyword ref="qdoctwindow.html#orientation">orientation</keyword>
+ <keyword ref="qdoctwindow.html#orientationChanged">orientationChanged</keyword>
+ <keyword ref="qdoctwindow.html#place">place</keyword>
+ <keyword ref="qdoctwindow.html#placeChanged">placeChanged</keyword>
+ <keyword ref="qdoctwindow.html#resizeEnabled-prop">resizeEnabled</keyword>
+ <keyword ref="qdoctwindow.html#setCloseMode">setCloseMode</keyword>
+ <keyword ref="qdoctwindow.html#setFixedExtentHeight">setFixedExtentHeight</keyword>
+ <keyword ref="qdoctwindow.html#setFixedExtentWidth">setFixedExtentWidth</keyword>
+ <keyword ref="qdoctwindow.html#setHorizontallyStretchable">setHorizontallyStretchable</keyword>
+ <keyword ref="qdoctwindow.html#setMovingEnabled">setMovingEnabled</keyword>
+ <keyword ref="qdoctwindow.html#setNewLine">setNewLine</keyword>
+ <keyword ref="qdoctwindow.html#setOffset">setOffset</keyword>
+ <keyword ref="qdoctwindow.html#setOpaqueMoving">setOpaqueMoving</keyword>
+ <keyword ref="qdoctwindow.html#setOrientation">setOrientation</keyword>
+ <keyword ref="qdoctwindow.html#setResizeEnabled">setResizeEnabled</keyword>
+ <keyword ref="qdoctwindow.html#setVerticallyStretchable">setVerticallyStretchable</keyword>
+ <keyword ref="qdoctwindow.html#setWidget">setWidget</keyword>
+ <keyword ref="qdoctwindow.html#stretchable-prop">stretchable</keyword>
+ <keyword ref="qdoctwindow.html#undock">undock</keyword>
+ <keyword ref="qdoctwindow.html#verticallyStretchable-prop">verticallyStretchable</keyword>
+ <keyword ref="qdoctwindow.html#visibilityChanged">visibilityChanged</keyword>
+ <keyword ref="qdoctwindow.html#widget">widget</keyword>
+ <section ref="qdoctwindow-members.html" title="List of All Member Functions"/>
+ <section ref="qdoctwindow-h.html" title="Header File"/>
</section>
<section ref="qdomattr.html" title="QDomAttr Class Reference">
<keyword ref="qdomattr.html">QDomAttr</keyword>
diff --git a/doc/html/qtoolbar-h.html b/doc/html/qtoolbar-h.html
index 96138d4..7404b90 100644
--- a/doc/html/qtoolbar-h.html
+++ b/doc/html/qtoolbar-h.html
@@ -78,7 +78,7 @@ body { background: #ffffff; color: black; }
#define QTOOLBAR_H
#ifndef QT_H
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#endif // QT_H
#ifndef QT_NO_TOOLBAR
diff --git a/doc/html/qtoolbar-members.html b/doc/html/qtoolbar-members.html
index 796fb5c..30d33bd 100644
--- a/doc/html/qtoolbar-members.html
+++ b/doc/html/qtoolbar-members.html
@@ -39,7 +39,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#acceptDrops">acceptDrops</a>()
<li><a href="qtoolbar.html#addSeparator">addSeparator</a>()
<li><a href="qwidget.html#adjustSize">adjustSize</a>()
-<li><a href="qdockwindow.html#area">area</a>()
+<li><a href="qdoctwindow.html#area">area</a>()
<li><a href="qwidget.html#autoMask">autoMask</a>()
<li><a href="qwidget.html#backgroundBrush">backgroundBrush</a>()
<li><a href="qwidget.html#backgroundColor">backgroundColor</a>()
@@ -48,7 +48,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#backgroundPixmap">backgroundPixmap</a>()
<li><a href="qwidget.html#baseSize">baseSize</a>()
<li><a href="qobject.html#blockSignals">blockSignals</a>()
-<li><a href="qdockwindow.html#boxLayout">boxLayout</a>()
+<li><a href="qdoctwindow.html#boxLayout">boxLayout</a>()
<li><a href="qwidget.html#caption">caption</a>()
<li><a href="qobject.html#checkConnectArgs">checkConnectArgs</a>()
<li><a href="qobject.html#child">child</a>()
@@ -65,7 +65,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#clipRegion">clipRegion</a>()
<li><a href="qwidget.html#close">close</a>()
<li><a href="qwidget.html#closeEvent">closeEvent</a>()
-<li><a href="qdockwindow.html#closeMode">closeMode</a>()
+<li><a href="qdoctwindow.html#closeMode">closeMode</a>()
<li><a href="qpaintdevice.html#cmd">cmd</a>()
<li><a href="qwidget.html#colorGroup">colorGroup</a>()
<li><a href="qobject.html#connect">connect</a>()
@@ -82,7 +82,7 @@ body { background: #ffffff; color: black; }
<li><a href="qobject.html#destroyed">destroyed</a>()
<li><a href="qobject.html#disconnect">disconnect</a>()
<li><a href="qobject.html#disconnectNotify">disconnectNotify</a>()
-<li><a href="qdockwindow.html#dock">dock</a>()
+<li><a href="qdoctwindow.html#dock">dock</a>()
<li><a href="qwidget.html#dragEnterEvent">dragEnterEvent</a>()
<li><a href="qwidget.html#dragLeaveEvent">dragLeaveEvent</a>()
<li><a href="qwidget.html#dragMoveEvent">dragMoveEvent</a>()
@@ -100,7 +100,7 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#event">event</a>()
<li><a href="qobject.html#eventFilter">eventFilter</a>()
<li><a href="qwidget.html#find">find</a>()
-<li><a href="qdockwindow.html#fixedExtent">fixedExtent</a>()
+<li><a href="qdoctwindow.html#fixedExtent">fixedExtent</a>()
<li><a href="qwidget.html#focusData">focusData</a>()
<li><a href="qwidget.html#focusInEvent">focusInEvent</a>()
<li><a href="qwidget.html#focusNextPrevChild">focusNextPrevChild</a>()
@@ -145,7 +145,7 @@ body { background: #ffffff; color: black; }
<li><a href="qobject.html#installEventFilter">installEventFilter</a>()
<li><a href="qobject.html#isA">isA</a>()
<li><a href="qwidget.html#isActiveWindow">isActiveWindow</a>()
-<li><a href="qdockwindow.html#isCloseEnabled">isCloseEnabled</a>()
+<li><a href="qdoctwindow.html#isCloseEnabled">isCloseEnabled</a>()
<li><a href="qwidget.html#isDesktop">isDesktop</a>()
<li><a href="qwidget.html#isDialog">isDialog</a>()
<li><a href="qwidget.html#isEnabled">isEnabled</a>()
@@ -155,21 +155,21 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#isFocusEnabled">isFocusEnabled</a>()
<li><a href="qwidget.html#isFullScreen">isFullScreen</a>()
<li><a href="qwidget.html#isHidden">isHidden</a>()
-<li><a href="qdockwindow.html#isHorizontalStretchable">isHorizontalStretchable</a>()
-<li><a href="qdockwindow.html#isHorizontallyStretchable">isHorizontallyStretchable</a>()
+<li><a href="qdoctwindow.html#isHorizontalStretchable">isHorizontalStretchable</a>()
+<li><a href="qdoctwindow.html#isHorizontallyStretchable">isHorizontallyStretchable</a>()
<li><a href="qwidget.html#isInputMethodEnabled">isInputMethodEnabled</a>()
<li><a href="qwidget.html#isMaximized">isMaximized</a>()
<li><a href="qwidget.html#isMinimized">isMinimized</a>()
<li><a href="qwidget.html#isModal">isModal</a>()
-<li><a href="qdockwindow.html#isMovingEnabled">isMovingEnabled</a>()
+<li><a href="qdoctwindow.html#isMovingEnabled">isMovingEnabled</a>()
<li><a href="qwidget.html#isPopup">isPopup</a>()
-<li><a href="qdockwindow.html#isResizeEnabled">isResizeEnabled</a>()
+<li><a href="qdoctwindow.html#isResizeEnabled">isResizeEnabled</a>()
<li><a href="qwidget.html#isShown">isShown</a>()
-<li><a href="qdockwindow.html#isStretchable">isStretchable</a>()
+<li><a href="qdoctwindow.html#isStretchable">isStretchable</a>()
<li><a href="qwidget.html#isTopLevel">isTopLevel</a>()
<li><a href="qwidget.html#isUpdatesEnabled">isUpdatesEnabled</a>()
-<li><a href="qdockwindow.html#isVerticalStretchable">isVerticalStretchable</a>()
-<li><a href="qdockwindow.html#isVerticallyStretchable">isVerticallyStretchable</a>()
+<li><a href="qdoctwindow.html#isVerticalStretchable">isVerticalStretchable</a>()
+<li><a href="qdoctwindow.html#isVerticallyStretchable">isVerticallyStretchable</a>()
<li><a href="qwidget.html#isVisible">isVisible</a>()
<li><a href="qwidget.html#isVisibleTo">isVisibleTo</a>()
<li><a href="qwidget.html#isVisibleToTLW">isVisibleToTLW</a>()
@@ -212,13 +212,13 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#move">move</a>()
<li><a href="qwidget.html#moveEvent">moveEvent</a>()
<li><a href="qobject.html#name">name</a>()
-<li><a href="qdockwindow.html#newLine">newLine</a>()
+<li><a href="qdoctwindow.html#newLine">newLine</a>()
<li><a href="qobject.html#normalizeSignalSlot">normalizeSignalSlot</a>()
<li><a href="qobject.html#objectTrees">objectTrees</a>()
-<li><a href="qdockwindow.html#offset">offset</a>()
-<li><a href="qdockwindow.html#opaqueMoving">opaqueMoving</a>()
-<li><a href="qdockwindow.html#orientation">orientation</a>()
-<li><a href="qdockwindow.html#orientationChanged">orientationChanged</a>()
+<li><a href="qdoctwindow.html#offset">offset</a>()
+<li><a href="qdoctwindow.html#opaqueMoving">opaqueMoving</a>()
+<li><a href="qdoctwindow.html#orientation">orientation</a>()
+<li><a href="qdoctwindow.html#orientationChanged">orientationChanged</a>()
<li><a href="qwidget.html#ownCursor">ownCursor</a>()
<li><a href="qwidget.html#ownFont">ownFont</a>()
<li><a href="qwidget.html#ownPalette">ownPalette</a>()
@@ -231,8 +231,8 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#paletteForegroundColor">paletteForegroundColor</a>()
<li><a href="qobject.html#parent">parent</a>()
<li><a href="qwidget.html#parentWidget">parentWidget</a>()
-<li><a href="qdockwindow.html#place">place</a>()
-<li><a href="qdockwindow.html#placeChanged">placeChanged</a>()
+<li><a href="qdoctwindow.html#place">place</a>()
+<li><a href="qdoctwindow.html#placeChanged">placeChanged</a>()
<li><a href="qwidget.html#polish">polish</a>()
<li><a href="qwidget.html#pos">pos</a>()
<li><a href="qobject.html#property">property</a>()
@@ -261,14 +261,14 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#setBackgroundPixmap">setBackgroundPixmap</a>()
<li><a href="qwidget.html#setBaseSize">setBaseSize</a>()
<li><a href="qwidget.html#setCaption">setCaption</a>()
-<li><a href="qdockwindow.html#setCloseMode">setCloseMode</a>()
+<li><a href="qdoctwindow.html#setCloseMode">setCloseMode</a>()
<li><a href="qwidget.html#setCursor">setCursor</a>()
<li><a href="qwidget.html#setDisabled">setDisabled</a>()
<li><a href="qwidget.html#setEnabled">setEnabled</a>()
<li><a href="qwidget.html#setEraseColor">setEraseColor</a>()
<li><a href="qwidget.html#setErasePixmap">setErasePixmap</a>()
-<li><a href="qdockwindow.html#setFixedExtentHeight">setFixedExtentHeight</a>()
-<li><a href="qdockwindow.html#setFixedExtentWidth">setFixedExtentWidth</a>()
+<li><a href="qdoctwindow.html#setFixedExtentHeight">setFixedExtentHeight</a>()
+<li><a href="qdoctwindow.html#setFixedExtentWidth">setFixedExtentWidth</a>()
<li><a href="qwidget.html#setFixedHeight">setFixedHeight</a>()
<li><a href="qwidget.html#setFixedSize">setFixedSize</a>()
<li><a href="qwidget.html#setFixedWidth">setFixedWidth</a>()
@@ -282,8 +282,8 @@ body { background: #ffffff; color: black; }
<li><a href="qframe.html#setFrameStyle">setFrameStyle</a>()
<li><a href="qwidget.html#setGeometry">setGeometry</a>()
<li><a href="qwidget.html#setHidden">setHidden</a>()
-<li><a href="qdockwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>()
-<li><a href="qdockwindow.html#setHorizontallyStretchable">setHorizontallyStretchable</a>()
+<li><a href="qdoctwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>()
+<li><a href="qdoctwindow.html#setHorizontallyStretchable">setHorizontallyStretchable</a>()
<li><a href="qwidget.html#setIcon">setIcon</a>()
<li><a href="qwidget.html#setIconText">setIconText</a>()
<li><a href="qwidget.html#setInputMethodEnabled">setInputMethodEnabled</a>()
@@ -301,18 +301,18 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#setMinimumSize">setMinimumSize</a>()
<li><a href="qwidget.html#setMinimumWidth">setMinimumWidth</a>()
<li><a href="qwidget.html#setMouseTracking">setMouseTracking</a>()
-<li><a href="qdockwindow.html#setMovingEnabled">setMovingEnabled</a>()
+<li><a href="qdoctwindow.html#setMovingEnabled">setMovingEnabled</a>()
<li><a href="qobject.html#setName">setName</a>()
-<li><a href="qdockwindow.html#setNewLine">setNewLine</a>()
-<li><a href="qdockwindow.html#setOffset">setOffset</a>()
-<li><a href="qdockwindow.html#setOpaqueMoving">setOpaqueMoving</a>()
-<li><a href="qdockwindow.html#setOrientation">setOrientation</a>()
+<li><a href="qdoctwindow.html#setNewLine">setNewLine</a>()
+<li><a href="qdoctwindow.html#setOffset">setOffset</a>()
+<li><a href="qdoctwindow.html#setOpaqueMoving">setOpaqueMoving</a>()
+<li><a href="qdoctwindow.html#setOrientation">setOrientation</a>()
<li><a href="qwidget.html#setPalette">setPalette</a>()
<li><a href="qwidget.html#setPaletteBackgroundColor">setPaletteBackgroundColor</a>()
<li><a href="qwidget.html#setPaletteBackgroundPixmap">setPaletteBackgroundPixmap</a>()
<li><a href="qwidget.html#setPaletteForegroundColor">setPaletteForegroundColor</a>()
<li><a href="qobject.html#setProperty">setProperty</a>()
-<li><a href="qdockwindow.html#setResizeEnabled">setResizeEnabled</a>()
+<li><a href="qdoctwindow.html#setResizeEnabled">setResizeEnabled</a>()
<li><a href="qwidget.html#setShown">setShown</a>()
<li><a href="qwidget.html#setSizeIncrement">setSizeIncrement</a>()
<li><a href="qwidget.html#setSizePolicy">setSizePolicy</a>()
@@ -320,10 +320,10 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#setStyle">setStyle</a>()
<li><a href="qwidget.html#setTabOrder">setTabOrder</a>()
<li><a href="qwidget.html#setUpdatesEnabled">setUpdatesEnabled</a>()
-<li><a href="qdockwindow.html#setVerticalStretchable">setVerticalStretchable</a>()
-<li><a href="qdockwindow.html#setVerticallyStretchable">setVerticallyStretchable</a>()
+<li><a href="qdoctwindow.html#setVerticalStretchable">setVerticalStretchable</a>()
+<li><a href="qdoctwindow.html#setVerticallyStretchable">setVerticallyStretchable</a>()
<li><a href="qwidget.html#setWFlags">setWFlags</a>()
-<li><a href="qdockwindow.html#setWidget">setWidget</a>()
+<li><a href="qdoctwindow.html#setWidget">setWidget</a>()
<li><a href="qwidget.html#setWindowOpacity">setWindowOpacity</a>()
<li><a href="qwidget.html#setWindowState">setWindowState</a>()
<li><a href="qwidget.html#show">show</a>()
@@ -347,17 +347,17 @@ body { background: #ffffff; color: black; }
<li><a href="qwidget.html#topLevelWidget">topLevelWidget</a>()
<li><a href="qobject.html#tr">tr</a>()
<li><a href="qobject.html#trUtf8">trUtf8</a>()
-<li><a href="qdockwindow.html#undock">undock</a>()
+<li><a href="qdoctwindow.html#undock">undock</a>()
<li><a href="qwidget.html#unsetCursor">unsetCursor</a>()
<li><a href="qwidget.html#unsetFont">unsetFont</a>()
<li><a href="qwidget.html#unsetPalette">unsetPalette</a>()
<li><a href="qwidget.html#update">update</a>()
<li><a href="qwidget.html#updateGeometry">updateGeometry</a>()
<li><a href="qwidget.html#updateMask">updateMask</a>()
-<li><a href="qdockwindow.html#visibilityChanged">visibilityChanged</a>()
+<li><a href="qdoctwindow.html#visibilityChanged">visibilityChanged</a>()
<li><a href="qwidget.html#visibleRect">visibleRect</a>()
<li><a href="qwidget.html#wheelEvent">wheelEvent</a>()
-<li><a href="qdockwindow.html#widget">widget</a>()
+<li><a href="qdoctwindow.html#widget">widget</a>()
<li><a href="qwidget.html#width">width</a>()
<li><a href="qwidget.html#winEvent">winEvent</a>()
<li><a href="qwidget.html#winId">winId</a>()
diff --git a/doc/html/qtoolbar.html b/doc/html/qtoolbar.html
index 0bf8205..b74ab21 100644
--- a/doc/html/qtoolbar.html
+++ b/doc/html/qtoolbar.html
@@ -35,7 +35,7 @@ body { background: #ffffff; color: black; }
widgets such as tool buttons.
<a href="#details">More...</a>
<p><tt>#include &lt;<a href="qtoolbar-h.html">qtoolbar.h</a>&gt;</tt>
-<p>Inherits <a href="qdockwindow.html">QDockWindow</a>.
+<p>Inherits <a href="qdoctwindow.html">QDockWindow</a>.
<p><a href="qtoolbar-members.html">List of all member functions.</a>
<h2>Public Members</h2>
<ul>
@@ -66,7 +66,7 @@ access to frequently used commands or options. Within a
<a href="qmainwindow.html">QMainWindow</a> the user can drag toolbars within and between the
<a href="qdockarea.html">dock areas</a>. Toolbars can also be dragged
out of any dock area to float freely as top-level windows.
-<p> QToolBar is a specialization of <a href="qdockwindow.html">QDockWindow</a>, and so provides all
+<p> QToolBar is a specialization of <a href="qdoctwindow.html">QDockWindow</a>, and so provides all
the functionality of a QDockWindow.
<p> To use QToolBar you simply create a QToolBar as a child of a
QMainWindow, create a number of <a href="qtoolbutton.html">QToolButton</a> widgets (or other
@@ -108,16 +108,16 @@ their textLabel property, other <a href="qbutton.html">QButton</a> subclasses ar
using their text property, and QComboBoxes are represented as submenus,
with the caption text being used in the submenu item.
<p> Usually a toolbar will get precisely the space it needs. However,
-with <a href="qdockwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>(), <a href="qdockwindow.html#setVerticalStretchable">setVerticalStretchable</a>() or
+with <a href="qdoctwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>(), <a href="qdoctwindow.html#setVerticalStretchable">setVerticalStretchable</a>() or
<a href="#setStretchableWidget">setStretchableWidget</a>() you can tell the main window to expand the
toolbar to fill all available space in the specified orientation.
<p> The toolbar arranges its buttons either horizontally or vertically
-(see <a href="qdockwindow.html#orientation">orientation</a>() for details). Generally, <a href="qdockarea.html">QDockArea</a> will set the
+(see <a href="qdoctwindow.html#orientation">orientation</a>() for details). Generally, <a href="qdockarea.html">QDockArea</a> will set the
orientation correctly for you, but you can set it yourself with
-<a href="qdockwindow.html#setOrientation">setOrientation</a>() and track any changes by connecting to the
-<a href="qdockwindow.html#orientationChanged">orientationChanged</a>() signal.
+<a href="qdoctwindow.html#setOrientation">setOrientation</a>() and track any changes by connecting to the
+<a href="qdoctwindow.html#orientationChanged">orientationChanged</a>() signal.
<p> You can use the <a href="#clear">clear</a>() method to remove all items from a toolbar.
-<p> <center><img src="qdockwindow.png" alt="Toolbar (dock window)"></center> <blockquote><p align="center"><em> A floating QToolbar (dock window)
+<p> <center><img src="qdoctwindow.png" alt="Toolbar (dock window)"></center> <blockquote><p align="center"><em> A floating QToolbar (dock window)
</em></p>
</blockquote><p> <p>See also <a href="qtoolbutton.html">QToolButton</a>, <a href="qmainwindow.html">QMainWindow</a>, <a href="http://www.iarchitect.com/visual.htm">Parts of Isys on Visual Design</a>, <a href="guibooks.html#fowler">GUI Design Handbook: Tool Bar</a>, and <a href="application.html">Main Window and Related Classes</a>.
@@ -133,7 +133,7 @@ Constructs an empty horizontal toolbar.
<p> The toolbar is called <em>name</em> and is a child of <em>parent</em> and is
managed by <em>mainWindow</em>. The <em>label</em> and <em>newLine</em> parameters
are passed straight to <a href="qmainwindow.html#addDockWindow">QMainWindow::addDockWindow</a>(). <em>name</em> and
-the widget flags <em>f</em> are passed on to the <a href="qdockwindow.html">QDockWindow</a> constructor.
+the widget flags <em>f</em> are passed on to the <a href="qdoctwindow.html">QDockWindow</a> constructor.
<p> Use this constructor if you want to create torn-off (undocked,
floating) toolbars or toolbars in the <a href="qstatusbar.html">status
bar</a>.
@@ -170,11 +170,11 @@ Sets the widget <em>w</em> to be expanded if this toolbar is requested
to stretch.
<p> The request to stretch might occur because <a href="qmainwindow.html">QMainWindow</a>
right-justifies the dock area the toolbar is in, or because this
-toolbar's <a href="qdockwindow.html#isVerticalStretchable">isVerticalStretchable</a>() or <a href="qdockwindow.html#isHorizontalStretchable">isHorizontalStretchable</a>() is
+toolbar's <a href="qdoctwindow.html#isVerticalStretchable">isVerticalStretchable</a>() or <a href="qdoctwindow.html#isHorizontalStretchable">isHorizontalStretchable</a>() is
set to TRUE.
<p> If you call this function and the toolbar is not yet stretchable,
setStretchable() is called.
-<p> <p>See also <a href="qmainwindow.html#rightJustification-prop">QMainWindow::rightJustification</a>, <a href="qdockwindow.html#setVerticalStretchable">setVerticalStretchable</a>(), and <a href="qdockwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>().
+<p> <p>See also <a href="qmainwindow.html#rightJustification-prop">QMainWindow::rightJustification</a>, <a href="qdoctwindow.html#setVerticalStretchable">setVerticalStretchable</a>(), and <a href="qdoctwindow.html#setHorizontalStretchable">setHorizontalStretchable</a>().
<p>Examples: <a href="fileiconview-example.html#x896">fileiconview/mainwindow.cpp</a> and <a href="helpviewer-example.html#x1034">helpviewer/helpwindow.cpp</a>.
<hr><h2>Property Documentation</h2>
diff --git a/doc/html/qtoolbutton.html b/doc/html/qtoolbutton.html
index 58cba4c..9714b8d 100644
--- a/doc/html/qtoolbutton.html
+++ b/doc/html/qtoolbutton.html
@@ -130,7 +130,7 @@ After pressing and holding the button down for a while, a menu
pops up showing a list of possible pages to jump to. With
QToolButton you can set a popup menu using <a href="#setPopup">setPopup</a>(). The default
delay is 600ms; you can adjust it with <a href="#setPopupDelay">setPopupDelay</a>().
-<p> <center><img src="qdockwindow.png" alt="Toolbar with Toolbuttons &#92;caption A floating"></center> QToolbar with QToolbuttons
+<p> <center><img src="qdoctwindow.png" alt="Toolbar with Toolbuttons &#92;caption A floating"></center> QToolbar with QToolbuttons
<p> <p>See also <a href="qpushbutton.html">QPushButton</a>, <a href="qtoolbar.html">QToolBar</a>, <a href="qmainwindow.html">QMainWindow</a>, <a href="guibooks.html#fowler
">GUI Design Handbook: Push Button</a>, and <a href="basic.html">Basic Widgets</a>.
diff --git a/doc/html/titleindex b/doc/html/titleindex
index 28a1f3a..e411909 100644
--- a/doc/html/titleindex
+++ b/doc/html/titleindex
@@ -346,8 +346,8 @@ QDns Class | qdns.html
QDns Member List | qdns-members.html
QDockArea Class | qdockarea.html
QDockArea Member List | qdockarea-members.html
-QDockWindow Class | qdockwindow.html
-QDockWindow Member List | qdockwindow-members.html
+QDockWindow Class | qdoctwindow.html
+QDockWindow Member List | qdoctwindow-members.html
QDomAttr Class | qdomattr.html
QDomAttr Member List | qdomattr-members.html
QDomCDATASection Class | qdomcdatasection.html
@@ -1225,7 +1225,7 @@ qdir.h Include File | qdir-h.html
qdirectpainter_qws.h Include File | qdirectpainter_qws-h.html
qdns.h Include File | qdns-h.html
qdockarea.h Include File | qdockarea-h.html
-qdockwindow.h Include File | qdockwindow-h.html
+qdoctwindow.h Include File | qdoctwindow-h.html
qdom.h Include File | qdom-h.html
qdragobject.h Include File | qdragobject-h.html
qdrawutil.h Include File | qdrawutil-h.html
diff --git a/doc/man/man3/QDockWindow.3qt b/doc/man/man3/QDockWindow.3qt
index e3c5ab1..0bce500 100644
--- a/doc/man/man3/QDockWindow.3qt
+++ b/doc/man/man3/QDockWindow.3qt
@@ -1 +1 @@
-.so man3/qdockwindow.3qt
+.so man3/qdoctwindow.3qt
diff --git a/doc/man/man3/qdockwindow.3qt b/doc/man/man3/qdockwindow.3qt
index 013f260..9931e8c 100644
--- a/doc/man/man3/qdockwindow.3qt
+++ b/doc/man/man3/qdockwindow.3qt
@@ -9,7 +9,7 @@
.SH NAME
QDockWindow \- Widget which can be docked inside a QDockArea or floated as a top level window on the desktop
.SH SYNOPSIS
-\fC#include <qdockwindow.h>\fR
+\fC#include <qdoctwindow.h>\fR
.PP
Inherits QFrame.
.PP
@@ -445,7 +445,7 @@ Strecthability is broken. You must call setResizeEnabled(TRUE) to get proper beh
Set this property's value with setVerticallyStretchable() and get this property's value with isVerticallyStretchable().
.SH "SEE ALSO"
-.BR http://doc.trolltech.com/qdockwindow.html
+.BR http://doc.trolltech.com/qdoctwindow.html
.BR http://www.trolltech.com/faq/tech.html
.SH COPYRIGHT
Copyright 1992-2007 Trolltech ASA, http://www.trolltech.com. See the
@@ -466,5 +466,5 @@ supported by Trolltech.
.P
If you find errors in this manual page, please report them to
.BR qt-bugs@trolltech.com .
-Please include the name of the manual page (qdockwindow.3qt) and the Qt
+Please include the name of the manual page (qdoctwindow.3qt) and the Qt
version (3.3.8).
diff --git a/doc/man/man3/qmainwindow.3qt b/doc/man/man3/qmainwindow.3qt
index 711f04a..c46bf0d 100644
--- a/doc/man/man3/qmainwindow.3qt
+++ b/doc/man/man3/qmainwindow.3qt
@@ -774,7 +774,7 @@ This property holds whether dock windows are moved opaquely.
.PP
If TRUE the dock windows of the main window are shown opaquely (i.e. it shows the toolbar as it looks when docked) whilst it is being moved. If FALSE (the default) they are shown transparently, (i.e. as an outline rectangle).
.PP
-\fBWarning:\fR Opaque moving of toolbars and dockwindows is known to have several problems. We recommend avoiding the use of this feature for the time being. We intend fixing the problems in a future release.
+\fBWarning:\fR Opaque moving of toolbars and doctwindows is known to have several problems. We recommend avoiding the use of this feature for the time being. We intend fixing the problems in a future release.
.PP
Set this property's value with setOpaqueMoving() and get this property's value with opaqueMoving().
.SH "bool rightJustification"
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index 53814dc..cf64c82 100644
--- a/src/kernel/qaccel.cpp
+++ b/src/kernel/qaccel.cpp
@@ -49,7 +49,7 @@
#include "qwhatsthis.h"
#include "qguardedptr.h"
#include "qstatusbar.h"
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qsignalslotimp.h"
/*!
\class QAccel qaccel.h
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index e72bd63..8eecdb4 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -241,7 +241,7 @@ Q_EXPORT Atom qt_window_role = 0;
Q_EXPORT Atom qt_sm_client_id = 0;
Atom qt_xa_motif_wm_hints = 0;
Atom qt_cde_running = 0;
-Atom qt_kwin_running = 0;
+Atom qt_twin_running = 0;
Atom qt_kwm_running = 0;
Atom qt_gbackground_properties = 0;
Atom qt_x_incr = 0;
@@ -1980,7 +1980,7 @@ void qt_init_internal( int *argcptr, char **argv,
qt_x11_intern_atom( "_NET_WM_PING", &qt_net_wm_ping );
qt_x11_intern_atom( "_MOTIF_WM_HINTS", &qt_xa_motif_wm_hints );
qt_x11_intern_atom( "DTWM_IS_RUNNING", &qt_cde_running );
- qt_x11_intern_atom( "KWIN_RUNNING", &qt_kwin_running );
+ qt_x11_intern_atom( "KWIN_RUNNING", &qt_twin_running );
qt_x11_intern_atom( "KWM_RUNNING", &qt_kwm_running );
qt_x11_intern_atom( "GNOME_BACKGROUND_PROPERTIES", &qt_gbackground_properties );
@@ -2385,11 +2385,11 @@ void QApplication::x11_initialize_style()
unsigned long length, after;
uchar *data;
if ( !app_style &&
- XGetWindowProperty( appDpy, QPaintDevice::x11AppRootWindow(), qt_kwin_running,
+ XGetWindowProperty( appDpy, QPaintDevice::x11AppRootWindow(), qt_twin_running,
0, 1, False, AnyPropertyType, &type, &format, &length,
&after, &data ) == Success && length ) {
if ( data ) XFree( (char *)data );
- // kwin is there. check if KDE's styles are available,
+ // twin is there. check if KDE's styles are available,
// otherwise use windows style
if ( (app_style = QStyleFactory::create("highcolor") ) == 0 )
app_style = QStyleFactory::create("windows");
diff --git a/src/kernel/qt.h b/src/kernel/qt.h
index 2145d8c..faa13fe 100644
--- a/src/kernel/qt.h
+++ b/src/kernel/qt.h
@@ -76,7 +76,7 @@
#include "qgroupbox.h"
#include "qdialog.h"
#include <qdataview.h>
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qcommonstyle.h"
#include "qnetworkprotocol.h"
#include <qeuckrcodec.h>
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index d6a1644..698b307 100644
--- a/src/styles/qmotifstyle.cpp
+++ b/src/styles/qmotifstyle.cpp
@@ -57,7 +57,7 @@
#include "qsplitter.h"
#include "qslider.h"
#include "qcombobox.h"
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qdockarea.h"
#include "qprogressbar.h"
#include "qimage.h"
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index 4e6e586..b5d0931 100644
--- a/src/styles/qwindowsstyle.cpp
+++ b/src/styles/qwindowsstyle.cpp
@@ -62,7 +62,7 @@
#include "qlistview.h"
#include "qbitmap.h"
#include "qcleanuphandler.h"
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qobjectlist.h"
#include "qmenubar.h"
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 99126c9..3594e30 100644
--- a/src/tools/qwinexport.cpp
+++ b/src/tools/qwinexport.cpp
@@ -28,4 +28,4 @@
#include <qvaluelist.h>
#include <qvaluevector.h>
#include <qdockarea.h>
-#include <qdockwindow.h>
+#include <qdoctwindow.h>
diff --git a/src/widgets/qdockarea.h b/src/widgets/qdockarea.h
index c780d3c..de23dc6 100644
--- a/src/widgets/qdockarea.h
+++ b/src/widgets/qdockarea.h
@@ -44,7 +44,7 @@
#ifndef QT_H
#include "qwidget.h"
#include "qptrlist.h"
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qlayout.h"
#include "qvaluelist.h"
#include "qguardedptr.h"
diff --git a/src/widgets/qdockwindow.cpp b/src/widgets/qdockwindow.cpp
index 8646ec9..0f80a92 100644
--- a/src/widgets/qdockwindow.cpp
+++ b/src/widgets/qdockwindow.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#ifndef QT_NO_MAINWINDOW
#include "qdesktopwidget.h"
@@ -702,7 +702,7 @@ void QDockWindowTitleBar::mouseDoubleClickEvent( QMouseEvent * )
}
/*!
- \class QDockWindow qdockwindow.h
+ \class QDockWindow qdoctwindow.h
\brief The QDockWindow class provides a widget which can be docked
inside a QDockArea or floated as a top level window on the
desktop.
@@ -718,7 +718,7 @@ void QDockWindowTitleBar::mouseDoubleClickEvent( QMouseEvent * )
\img qmainwindow-qdockareas.png QDockWindows in a QDockArea
\caption Two QDockWindows (\l{QToolBar}s) in a \l QDockArea
- \img qdockwindow.png A QDockWindow
+ \img qdoctwindow.png A QDockWindow
\caption A Floating QDockWindow
If the user drags the dock window into the dock area the dock
@@ -2118,6 +2118,6 @@ void QDockWindow::contextMenuEvent( QContextMenuEvent *e )
e->ignore();
}
-#include "qdockwindow.moc"
+#include "qdoctwindow.moc"
#endif //QT_NO_MAINWINDOW
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 7ad2781..1b9cd8f 100644
--- a/src/widgets/qmainwindow.cpp
+++ b/src/widgets/qmainwindow.cpp
@@ -2049,7 +2049,7 @@ void QMainWindow::setOpaqueMoving( bool b )
being moved. If FALSE (the default) they are shown transparently,
(i.e. as an outline rectangle).
- \warning Opaque moving of toolbars and dockwindows is known to
+ \warning Opaque moving of toolbars and doctwindows is known to
have several problems. We recommend avoiding the use of this
feature for the time being. We intend fixing the problems in a
future release.
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index a4917e9..41bd6de 100644
--- a/src/widgets/qt_widgets.pri
+++ b/src/widgets/qt_widgets.pri
@@ -11,7 +11,7 @@ widgets {
$$WIDGETS_P/qwidgetresizehandler_p.h \
$$WIDGETS_H/qdial.h \
$$WIDGETS_H/qdockarea.h \
- $$WIDGETS_H/qdockwindow.h \
+ $$WIDGETS_H/qdoctwindow.h \
$$WIDGETS_H/qframe.h \
$$WIDGETS_H/qgrid.h \
$$WIDGETS_H/qgridview.h \
@@ -72,7 +72,7 @@ widgets {
$$WIDGETS_CPP/qwidgetresizehandler.cpp \
$$WIDGETS_CPP/qdial.cpp \
$$WIDGETS_CPP/qdockarea.cpp \
- $$WIDGETS_CPP/qdockwindow.cpp \
+ $$WIDGETS_CPP/qdoctwindow.cpp \
$$WIDGETS_CPP/qframe.cpp \
$$WIDGETS_CPP/qgrid.cpp \
$$WIDGETS_CPP/qgridview.cpp \
diff --git a/src/widgets/qtitlebar_p.h b/src/widgets/qtitlebar_p.h
index edd8fe2..d01103c 100644
--- a/src/widgets/qtitlebar_p.h
+++ b/src/widgets/qtitlebar_p.h
@@ -47,7 +47,7 @@
// -------------
//
// This file is not part of the Qt API. It exists for the convenience
-// of qworkspace.cpp and qdockwindow.cpp. This header file may change
+// of qworkspace.cpp and qdoctwindow.cpp. This header file may change
// from version to version without notice, or even be removed.
//
// We mean it.
diff --git a/src/widgets/qtoolbar.cpp b/src/widgets/qtoolbar.cpp
index 22d4d5d..f33371a 100644
--- a/src/widgets/qtoolbar.cpp
+++ b/src/widgets/qtoolbar.cpp
@@ -284,7 +284,7 @@ void QToolBarSeparator::paintEvent( QPaintEvent * )
You can use the clear() method to remove all items from a toolbar.
- \img qdockwindow.png Toolbar (dock window)
+ \img qdoctwindow.png Toolbar (dock window)
\caption A floating QToolbar (dock window)
\sa QToolButton QMainWindow \link http://www.iarchitect.com/visual.htm Parts of Isys on Visual Design\endlink \link guibooks.html#fowler GUI Design Handbook: Tool Bar\endlink.
diff --git a/src/widgets/qtoolbar.h b/src/widgets/qtoolbar.h
index f07c1a8..81ca538 100644
--- a/src/widgets/qtoolbar.h
+++ b/src/widgets/qtoolbar.h
@@ -42,7 +42,7 @@
#define QTOOLBAR_H
#ifndef QT_H
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#endif // QT_H
#ifndef QT_NO_TOOLBAR
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index f11b613..72faaa7 100644
--- a/src/widgets/qtoolbutton.cpp
+++ b/src/widgets/qtoolbutton.cpp
@@ -116,7 +116,7 @@ public:
QToolButton you can set a popup menu using setPopup(). The default
delay is 600ms; you can adjust it with setPopupDelay().
- \img qdockwindow.png Toolbar with Toolbuttons \caption A floating
+ \img qdoctwindow.png Toolbar with Toolbuttons \caption A floating
QToolbar with QToolbuttons
\sa QPushButton QToolBar QMainWindow \link guibooks.html#fowler
diff --git a/src/workspace/qworkspace.cpp b/src/workspace/qworkspace.cpp
index b6699e8..8b94a32 100644
--- a/src/workspace/qworkspace.cpp
+++ b/src/workspace/qworkspace.cpp
@@ -68,7 +68,7 @@
#include "qdockarea.h"
#include "qstatusbar.h"
#include "qmainwindow.h"
-#include "qdockwindow.h"
+#include "qdoctwindow.h"
#include "qtoolbar.h"
#define BUTTON_WIDTH 16
@@ -245,7 +245,7 @@ public:
// toplevel mdi fu
QWorkspace::WindowMode wmode;
QGuardedPtr<QMainWindow> mainwindow;
- QPtrList<QDockWindow> dockwindows, newdocks;
+ QPtrList<QDockWindow> doctwindows, newdocks;
};
static bool isChildOf( QWidget * child, QWidget * parent )
@@ -589,7 +589,7 @@ void QWorkspace::place( QWidget* w)
widgets.append((*it));
if(d->wmode == TopLevel) {
- for(QPtrListIterator<QDockWindow> it( d->dockwindows ); it.current(); ++it)
+ for(QPtrListIterator<QDockWindow> it( d->doctwindows ); it.current(); ++it)
if ((*it) != w)
widgets.append((*it));
}
@@ -807,7 +807,7 @@ void QWorkspace::handleUndock(QDockWindow *w)
if(!::qt_cast<QToolBar*>(w)) {
struct place_score { int o, x, y; } score = {0, 0, 0};
int left = 1, x = wpos.x(), y = wpos.y();
- QPtrListIterator<QDockWindow> it( d->dockwindows );
+ QPtrListIterator<QDockWindow> it( d->doctwindows );
while(1) {
if(y + w->height() > maxRect.bottom()) {
if(left) {
@@ -854,7 +854,7 @@ void QWorkspace::handleUndock(QDockWindow *w)
if(o && overlap == 1 && w->isVisible() && !o->isVisible()) {
wpos = QPoint(x, y);
possible = 2;
- while(d->dockwindows.remove(o));
+ while(d->doctwindows.remove(o));
d->newdocks.append(o);
if(d->newdocks.count() == 1)
QTimer::singleShot(0, this, SLOT(dockWindowsShow()));
@@ -921,10 +921,10 @@ void QWorkspace::dockWindowsShow()
QPtrList<QDockWindow> lst = d->newdocks;
d->newdocks.clear();
for(QPtrListIterator<QDockWindow> dw_it(lst); (*dw_it); ++dw_it) {
- if(d->dockwindows.find((*dw_it)) != -1)
+ if(d->doctwindows.find((*dw_it)) != -1)
continue;
handleUndock((*dw_it));
- d->dockwindows.append((*dw_it));
+ d->doctwindows.append((*dw_it));
}
}
@@ -1320,7 +1320,7 @@ bool QWorkspace::eventFilter( QObject *o, QEvent * e)
return FALSE;
}
QDockWindow *w = (QDockWindow*)ce->child();
- if(d->newdocks.find(w) == -1 && d->dockwindows.find(w) == -1) {
+ if(d->newdocks.find(w) == -1 && d->doctwindows.find(w) == -1) {
if(::qt_cast<QToolBar*>(w))
d->newdocks.prepend(w);
else
diff --git a/tools/assistant/mainwindow.ui b/tools/assistant/mainwindow.ui
index 5b6ddac..c6cc909 100644
--- a/tools/assistant/mainwindow.ui
+++ b/tools/assistant/mainwindow.ui
@@ -580,7 +580,7 @@
<include location="global" impldecl="in implementation">qsimplerichtext.h</include>
<include location="global" impldecl="in implementation">qfileinfo.h</include>
<include location="global" impldecl="in implementation">qtextstream.h</include>
- <include location="global" impldecl="in implementation">qdockwindow.h</include>
+ <include location="global" impldecl="in implementation">qdoctwindow.h</include>
<include location="global" impldecl="in implementation">stdlib.h</include>
<include location="global" impldecl="in implementation">qmime.h</include>
<include location="local" impldecl="in implementation">helpwindow.h</include>
diff --git a/tools/designer/designer/mainwindow.cpp b/tools/designer/designer/mainwindow.cpp
index 0474b2f..a8f759f 100644
--- a/tools/designer/designer/mainwindow.cpp
+++ b/tools/designer/designer/mainwindow.cpp
@@ -108,7 +108,7 @@
#include <qwizard.h>
#include <qtimer.h>
#include <qlistbox.h>
-#include <qdockwindow.h>
+#include <qdoctwindow.h>
#include <qstylefactory.h>
#include <qvbox.h>
#include <qprocess.h>
diff --git a/tools/linguist/linguist/msgedit.cpp b/tools/linguist/linguist/msgedit.cpp
index 09e60a1..b7a274e 100644
--- a/tools/linguist/linguist/msgedit.cpp
+++ b/tools/linguist/linguist/msgedit.cpp
@@ -58,7 +58,7 @@
#include <qheader.h>
#include <qregexp.h>
#include <qdockarea.h>
-#include <qdockwindow.h>
+#include <qdoctwindow.h>
#include <qscrollview.h>
#include <qfont.h>
#include <qaccel.h>
diff --git a/tools/linguist/linguist/trwindow.cpp b/tools/linguist/linguist/trwindow.cpp
index e8725e5..8b9bb1e 100644
--- a/tools/linguist/linguist/trwindow.cpp
+++ b/tools/linguist/linguist/trwindow.cpp
@@ -52,7 +52,7 @@
#include <qbitmap.h>
#include <qdict.h>
#include <qdockarea.h>
-#include <qdockwindow.h>
+#include <qdoctwindow.h>
#include <qfile.h>
#include <qfiledialog.h>
#include <qfileinfo.h>