From ba18a0dd03be4c063d27deab4cd864a189ea705a Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 8 Nov 2011 00:08:40 -0600 Subject: [PATCH] Fix accidental conversion of dockwin --- doc/classchart.doc | 2 +- doc/html/annotated.html | 2 +- doc/html/application.html | 2 +- doc/html/classchart.html | 2 +- doc/html/classes.html | 2 +- doc/html/functions.html | 66 +++++++++--------- doc/html/headers.html | 2 +- doc/html/hierarchy.html | 2 +- doc/html/index | 90 ++++++++++++------------ doc/html/keyfeatures30.html | 2 +- doc/html/mainclasses.html | 2 +- doc/html/porting.html | 10 +-- doc/html/propertydocs | 64 ++++++++--------- doc/html/propertyindex | 20 +++--- doc/html/qdockarea-h.html | 2 +- doc/html/qdockarea.html | 32 ++++----- doc/html/qdoctwindow-h.html | 10 +-- doc/html/qdoctwindow-members.html | 80 ++++++++++----------- doc/html/qdoctwindow.html | 48 ++++++------- doc/html/qframe.html | 2 +- doc/html/qmainwindow.html | 48 ++++++------- doc/html/qstyle.html | 14 ++-- doc/html/qt.dcf | 96 +++++++++++++------------- doc/html/qtoolbar-h.html | 2 +- doc/html/qtoolbar-members.html | 74 ++++++++++---------- doc/html/qtoolbar.html | 20 +++--- doc/html/qtoolbutton.html | 2 +- doc/html/titleindex | 6 +- doc/man/man3/QDockWindow.3qt | 2 +- doc/man/man3/qdoctwindow.3qt | 6 +- doc/man/man3/qmainwindow.3qt | 2 +- src/kernel/qaccel.cpp | 2 +- src/kernel/qt.h | 2 +- src/styles/qmotifstyle.cpp | 2 +- src/styles/qwindowsstyle.cpp | 2 +- src/tools/qwinexport.cpp | 2 +- src/widgets/qdockarea.h | 2 +- src/widgets/qdoctwindow.cpp | 8 +-- src/widgets/qmainwindow.cpp | 2 +- src/widgets/qt_widgets.pri | 4 +- src/widgets/qtitlebar_p.h | 2 +- src/widgets/qtoolbar.cpp | 2 +- src/widgets/qtoolbar.h | 2 +- src/widgets/qtoolbutton.cpp | 2 +- src/workspace/qworkspace.cpp | 16 ++--- tools/assistant/mainwindow.ui | 2 +- tools/designer/designer/mainwindow.cpp | 2 +- tools/linguist/linguist/msgedit.cpp | 2 +- tools/linguist/linguist/trwindow.cpp | 2 +- 49 files changed, 386 insertions(+), 386 deletions(-) diff --git a/doc/classchart.doc b/doc/classchart.doc index c6816a5..59862ce 100644 --- a/doc/classchart.doc +++ b/doc/classchart.doc @@ -200,7 +200,7 @@ - + diff --git a/doc/html/annotated.html b/doc/html/annotated.html index 45b754f..a911283 100644 --- a/doc/html/annotated.html +++ b/doc/html/annotated.html @@ -125,7 +125,7 @@ body { background: #ffffff; color: black; } QDirectPainterDirect access to the video hardware QDnsAsynchronous DNS lookups QDockAreaManages and lays out QDockWindows -QDockWindowWidget which can be docked inside a QDockArea or floated as a top level window on the desktop +QDockWindowWidget which can be docked inside a QDockArea or floated as a top level window on the desktop QDomAttrRepresents one attribute of a QDomElement QDomCDATASectionRepresents an XML CDATA section QDomCharacterDataRepresents a generic string in the DOM diff --git a/doc/html/application.html b/doc/html/application.html index bd7f11d..836a0bc 100644 --- a/doc/html/application.html +++ b/doc/html/application.html @@ -41,7 +41,7 @@ a statusbar, etc. QActionGroupGroups actions together QApplicationManages the GUI application's control flow and main settings QDockAreaManages and lays out QDockWindows -QDockWindowWidget which can be docked inside a QDockArea or floated as a top level window on the desktop +QDockWindowWidget which can be docked inside a QDockArea or floated as a top level window on the desktop QEventLoopManages the event queue QMainWindowMain application window, with a menu bar, dock windows (e.g. for toolbars), and a status bar QMenuBarHorizontal menu bar diff --git a/doc/html/classchart.html b/doc/html/classchart.html index 0ffedf4..fbeabcd 100644 --- a/doc/html/classchart.html +++ b/doc/html/classchart.html @@ -190,7 +190,7 @@ body { background: #ffffff; color: black; } - + diff --git a/doc/html/classes.html b/doc/html/classes.html index a5c4aba..b6827c8 100644 --- a/doc/html/classes.html +++ b/doc/html/classes.html @@ -106,7 +106,7 @@ classes, see Qt's Main Classes. QApplication -QDockWindow +QDockWindow QImageFormat diff --git a/doc/html/functions.html b/doc/html/functions.html index 4a47b52..a780320 100644 --- a/doc/html/functions.html +++ b/doc/html/functions.html @@ -163,7 +163,7 @@ abort: QApplication
  • applyButtonPressed: QTabDialog
  • appropriate: QMainWindow QWizard
  • area: - QDockWindow
  • areaPoints: + QDockWindow
  • areaPoints: QCanvasPolygon QCanvasPolygonalItem
  • areaPointsAdvanced: QCanvasPolygonalItem
  • arg: QNPInstance QNetworkOperation QString
  • argc: @@ -295,7 +295,7 @@ back: QSize
  • boundingRect: QCanvasItem QCanvasPolygonalItem QCanvasSprite QCanvasText QFontMetrics QPainter QPicture QPointArray QRegion
  • boundingRectAdvanced: QCanvasItem
  • boxLayout: - QDockWindow
  • brightText: + QDockWindow
  • brightText: QColorGroup
  • brush: QCanvasPolygonalItem QColorGroup QPainter QPalette
  • brushOrigin: QPainter
  • bsearch: @@ -432,7 +432,7 @@ c: QHttp
  • closeEvent: QWidget
  • closeKeyboard: QWSServer
  • closeMode: - QDockWindow
  • closeMouse: + QDockWindow
  • closeMouse: QWSServer
  • closeStdin: QProcess
  • closed: QCanvasSpline
  • closingDown: @@ -762,7 +762,7 @@ dark: QTextEdit
  • doLayout: QListBox
  • docName: QPrinter
  • dock: - QDockWindow
  • dockWindowList: + QDockWindow
  • dockWindowList: QDockArea
  • dockWindowPositionChanged: QMainWindow
  • dockWindows: QMainWindow
  • dockWindowsMovable: @@ -980,7 +980,7 @@ falseText: QIconView QListBox
  • firstRecordAvailable: QDataBrowser
  • fix: QDateEdit
  • fixedExtent: - QDockWindow
  • fixedPitch: + QDockWindow
  • fixedPitch: QFont QFontInfo
  • fixup: QValidator
  • flags: QIODevice QTextStream
  • flavor: @@ -1325,7 +1325,7 @@ icon: QGroupBox QPopupMenu
  • isChecked: QCheckBox QCheckTableItem QGroupBox QRadioButton
  • isClickEnabled: QHeader
  • isCloseEnabled: - QDockWindow
  • isColumnHidden: + QDockWindow
  • isColumnHidden: QTable
  • isColumnReadOnly: QTable
  • isColumnSelected: QTable
  • isColumnStretchable: @@ -1383,7 +1383,7 @@ icon: QImage
  • isHidden: QFileInfo QWidget
  • isHorizontalSliderPressed: QScrollView
  • isHorizontallyStretchable: - QDockWindow
  • isIPv4Address: + QDockWindow
  • isIPv4Address: QHostAddress
  • isIPv6Address: QHostAddress
  • isIdentity: QWMatrix
  • isInactive: @@ -1405,7 +1405,7 @@ icon: QWidget
  • isModal: QDialog QWidget
  • isModified: QLineEdit QTextEdit
  • isMovingEnabled: - QDockWindow QHeader
  • isNotation: + QDockWindow QHeader
  • isNotation: QDomNode QDomNotation
  • isNull: QAxBase QCString QChar QDate QDateTime QDomImplementation QDomNode QGuardedPtr QHostAddress QIconSet QImage QMemArray QMovie QPicture QPixmap QPoint QPtrVector QRect QRegion QSize QSqlCursor QSqlField QSqlQuery QSqlRecord QSqlResult QString QTime QUuid QVariant
  • isNumber: QChar
  • isOn: @@ -1435,7 +1435,7 @@ icon: QIconView QListView
  • isReplaceable: QTableItem
  • isRequired: QSqlFieldInfo
  • isResizeEnabled: - QDockWindow QHeader
  • isRoot: + QDockWindow QHeader
  • isRoot: QDir
  • isRowHidden: QTable
  • isRowReadOnly: QTable
  • isRowSelected: @@ -1459,7 +1459,7 @@ icon: QFontDatabase
  • isSpace: QChar
  • isStretchEnabled: QHeader
  • isStretchable: - QDockWindow
  • isSupported: + QDockWindow
  • isSupported: QDomNode
  • isSymLink: QFileInfo QUrlInfo
  • isSymbol: QChar
  • isSynchronous: @@ -1479,7 +1479,7 @@ icon: QWidget
  • isValid: QAccessibleInterface QAxScriptEngine QCanvasPixmapArray QCanvasPolygonalItem QColor QDate QDateTime QGLContext QGLWidget QHttpHeader QRect QRegExp QSize QSocketDevice QSqlQuery QSqlResult QTime QUrl QUrlInfo QVariant
  • isVerticalSliderPressed: QScrollView
  • isVerticallyStretchable: - QDockWindow
  • isVirtualDesktop: + QDockWindow
  • isVirtualDesktop: QDesktopWidget
  • isVisible: QAction QCanvasItem QListViewItem QWSWindow QWidget
  • isVisibleTo: QWidget
  • isWidgetType: @@ -1788,7 +1788,7 @@ name: QServerSocket
  • newInstance: QNPlugin
  • newItem: QPtrCollection
  • newLine: - QDockWindow QMultiLineEdit
  • newPage: + QDockWindow QMultiLineEdit
  • newPage: QPrinter
  • newStream: QNPInstance
  • newStreamCreated: QNPInstance
  • newWindow: @@ -1839,7 +1839,7 @@ name: object: QAccessibleObject QAxAggregated
  • objectTrees: QObject
  • offset: - QDirectPainter QDockWindow QHeader QImage
  • offsetX: + QDirectPainter QDockWindow QHeader QImage
  • offsetX: QCanvasPixmap
  • offsetY: QCanvasPixmap
  • ok: QServerSocket
  • okRename: @@ -1852,7 +1852,7 @@ object: QIconView QListBox QListView
  • onViewport: QIconView QListBox QListView
  • opType: QScreen
  • opaqueMoving: - QDockWindow QMainWindow
  • opaqueResize: + QDockWindow QMainWindow
  • opaqueResize: QSplitter
  • open: QFile QIODevice QSocket QSqlDatabase QSqlDriver
  • openAssistant: QAssistantClient
  • openKeyboard: @@ -1908,8 +1908,8 @@ object: QBitArray
  • optimization: QPixmap
  • order: QDateEdit
  • orientation: - QDialog QDockArea QDockWindow QGroupBox QHeader QPrinter QScrollBar QSlider QSplitter QWheelEvent
  • orientationChanged: - QDockWindow
  • origin: + QDialog QDockArea QDockWindow QGroupBox QHeader QPrinter QScrollBar QSlider QSplitter QWheelEvent
  • orientationChanged: + QDockWindow
  • origin: QGridLayout
  • outputFileName: QPrinter
  • outputFormatList: QImage
  • outputFormats: @@ -1999,8 +1999,8 @@ packImage: QScreen
  • pixmapRect: QIconViewItem
  • pixmapSizeChanged: QMainWindow
  • place: - QDockWindow
  • placeChanged: - QDockWindow
  • placeCursor: + QDockWindow
  • placeChanged: + QDockWindow
  • placeCursor: QTextEdit
  • plane: QGLFormat
  • play: QPicture QSound
  • point: @@ -2528,7 +2528,7 @@ sRect: QPainter
  • setClipRegion: QPainter
  • setClipping: QPainter
  • setCloseMode: - QDockWindow
  • setCodec: + QDockWindow
  • setCodec: QTextStream
  • setCodecForCStrings: QTextCodec
  • setCodecForLocale: QTextCodec
  • setCodecForTr: @@ -2679,8 +2679,8 @@ sRect: QDataBrowser QDataTable QDir QFileDialog QSqlCursor
  • setFilters: QFileDialog
  • setFinishEnabled: QWizard
  • setFixedExtentHeight: - QDockWindow
  • setFixedExtentWidth: - QDockWindow
  • setFixedHeight: + QDockWindow
  • setFixedExtentWidth: + QDockWindow
  • setFixedHeight: QWidget
  • setFixedPitch: QFont
  • setFixedSize: QWidget
  • setFixedWidth: @@ -2732,7 +2732,7 @@ sRect: QWidget
  • setHorData: QSizePolicy
  • setHorStretch: QSizePolicy
  • setHorizontallyStretchable: - QDockWindow
  • setHost: + QDockWindow
  • setHost: QHttp QUrl
  • setHostName: QSqlDatabase
  • setHour: QTimeEdit
  • setHsv: @@ -2838,14 +2838,14 @@ sRect: QDateEdit
  • setMouseTracking: QWidget
  • setMovie: QLabel
  • setMovingEnabled: - QDockWindow QHeader
  • setMultiLinesEnabled: + QDockWindow QHeader
  • setMultiLinesEnabled: QListViewItem
  • setName: QFile QObject QSqlCursor QSqlField QSqlIndex QUrlInfo
  • setNameFilter: QDir QUrlOperator
  • setNamedColor: QColor
  • setNamedItem: QDomNamedNodeMap
  • setNamedItemNS: QDomNamedNodeMap
  • setNewLine: - QDockWindow
  • setNextEnabled: + QDockWindow
  • setNextEnabled: QWizard
  • setNoChange: QCheckBox
  • setNodeValue: QDomNode
  • setNotchTarget: @@ -2861,10 +2861,10 @@ sRect: QGridView QTable
  • setNumber: QSqlError
  • setOctMode: QLCDNumber
  • setOffset: - QCanvasPixmap QDockWindow QHeader QImage
  • setOkButton: + QCanvasPixmap QDockWindow QHeader QImage
  • setOkButton: QTabDialog
  • setOn: QAction QButton QCheckListItem QPushButton QToolButton
  • setOpaqueMoving: - QDockWindow QMainWindow
  • setOpaqueResize: + QDockWindow QMainWindow
  • setOpaqueResize: QSplitter
  • setOpen: QListView QListViewItem QSqlDriver
  • setOpenError: QSqlDriver
  • setOptimization: @@ -2872,7 +2872,7 @@ sRect: QGLFormat
  • setOptionEnabled: QPrinter
  • setOrder: QDateEdit
  • setOrientation: - QDialog QDockWindow QGroupBox QHeader QPrinter QScrollBar QSlider QSplitter
  • setOrigin: + QDialog QDockWindow QGroupBox QHeader QPrinter QScrollBar QSlider QSplitter
  • setOrigin: QGridLayout
  • setOutputFileName: QPrinter
  • setOutputToFile: QPrinter
  • setOverlay: @@ -2950,7 +2950,7 @@ sRect: QIconViewItem QListViewItem
  • setReplaceable: QTableItem
  • setRequest: QHttpRequestHeader
  • setResizeEnabled: - QDockWindow QHeader
  • setResizeMode: + QDockWindow QHeader
  • setResizeMode: QIconView QLayout QListView QSplitter
  • setResizePolicy: QScrollView
  • setResolution: QPrinter
  • setRestartCommand: @@ -3118,7 +3118,7 @@ sRect: QSizePolicy
  • setVersion: QDataStream
  • setVerticalAlignment: QStyleSheetItem QTextEdit
  • setVerticallyStretchable: - QDockWindow
  • setViewMode: + QDockWindow
  • setViewMode: QFileDialog
  • setViewXForm: QPainter
  • setViewport: QPainter
  • setVisible: @@ -3129,7 +3129,7 @@ sRect: QAccel QAction QMenuData QPopupMenu
  • setWheelScrollLines: QApplication
  • setWhiteSpaceMode: QStyleSheetItem
  • setWidget: - QDockWindow
  • setWidgetSizePolicy: + QDockWindow
  • setWidgetSizePolicy: QMacStyle
  • setWidth: QPen QRect QSimpleRichText QSize
  • setWildcard: QRegExp
  • setWinPageSize: @@ -3500,7 +3500,7 @@ ucs2: QLineEdit QTextEdit
  • undoAvailable: QTextEdit
  • undoDepth: QTextEdit
  • undock: - QDockWindow
  • ungetch: + QDockWindow
  • ungetch: QFile QIODevice QSocket
  • unicode: QChar QString
  • unicodeUriToUri: QUriDrag
  • uniqueId: @@ -3584,7 +3584,7 @@ vScrollBarMode: QScrollView
  • viewportSize: QScrollView
  • viewportToContents: QScrollView
  • visibilityChanged: - QDockWindow
  • visibleHeight: + QDockWindow
  • visibleHeight: QScrollView
  • visibleWidget: QWidgetStack
  • visibleWidth: QScrollView
  • visualRect: @@ -3605,7 +3605,7 @@ wait: QWidget
  • wheelScrollLines: QApplication
  • whiteSpaceMode: QStyleSheetItem
  • widget: - QAxAggregated QDockWindow QLayoutItem QNPInstance QSqlForm QStyleOption QWidgetItem QWidgetStack
  • widgetAt: + QAxAggregated QDockWindow QLayoutItem QNPInstance QSqlForm QStyleOption QWidgetItem QWidgetStack
  • widgetAt: QApplication
  • widgetSizePolicy: QMacStyle
  • widgetToField: QSqlForm
  • widgets: diff --git a/doc/html/headers.html b/doc/html/headers.html index 87f0d85..a34eed8 100644 --- a/doc/html/headers.html +++ b/doc/html/headers.html @@ -84,7 +84,7 @@ body { background: #ffffff; color: black; }
  • qdirectpainter_qws.h
  • qdns.h
  • qdockarea.h -
  • qdoctwindow.h +
  • qdockwindow.h
  • qdom.h
  • qdragobject.h
  • qdrawutil.h diff --git a/doc/html/hierarchy.html b/doc/html/hierarchy.html index 07b8b6e..79c0db3 100644 --- a/doc/html/hierarchy.html +++ b/doc/html/hierarchy.html @@ -440,7 +440,7 @@ classes in the Qt API.
  • QDockArea
  • QFrame