summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/kernel/qaccel.cpp2
-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/qdoctwindow.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
14 files changed, 25 insertions, 25 deletions
diff --git a/src/kernel/qaccel.cpp b/src/kernel/qaccel.cpp
index cf64c82..53814dc 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 "qdoctwindow.h"
+#include "qdockwindow.h"
#include "qsignalslotimp.h"
/*!
\class QAccel qaccel.h
diff --git a/src/kernel/qt.h b/src/kernel/qt.h
index faa13fe..2145d8c 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 "qdoctwindow.h"
+#include "qdockwindow.h"
#include "qcommonstyle.h"
#include "qnetworkprotocol.h"
#include <qeuckrcodec.h>
diff --git a/src/styles/qmotifstyle.cpp b/src/styles/qmotifstyle.cpp
index 698b307..d6a1644 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 "qdoctwindow.h"
+#include "qdockwindow.h"
#include "qdockarea.h"
#include "qprogressbar.h"
#include "qimage.h"
diff --git a/src/styles/qwindowsstyle.cpp b/src/styles/qwindowsstyle.cpp
index b5d0931..4e6e586 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 "qdoctwindow.h"
+#include "qdockwindow.h"
#include "qobjectlist.h"
#include "qmenubar.h"
diff --git a/src/tools/qwinexport.cpp b/src/tools/qwinexport.cpp
index 3594e30..99126c9 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 <qdoctwindow.h>
+#include <qdockwindow.h>
diff --git a/src/widgets/qdockarea.h b/src/widgets/qdockarea.h
index de23dc6..c780d3c 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 "qdoctwindow.h"
+#include "qdockwindow.h"
#include "qlayout.h"
#include "qvaluelist.h"
#include "qguardedptr.h"
diff --git a/src/widgets/qdoctwindow.cpp b/src/widgets/qdoctwindow.cpp
index 0f80a92..8646ec9 100644
--- a/src/widgets/qdoctwindow.cpp
+++ b/src/widgets/qdoctwindow.cpp
@@ -38,7 +38,7 @@
**
**********************************************************************/
-#include "qdoctwindow.h"
+#include "qdockwindow.h"
#ifndef QT_NO_MAINWINDOW
#include "qdesktopwidget.h"
@@ -702,7 +702,7 @@ void QDockWindowTitleBar::mouseDoubleClickEvent( QMouseEvent * )
}
/*!
- \class QDockWindow qdoctwindow.h
+ \class QDockWindow qdockwindow.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 qdoctwindow.png A QDockWindow
+ \img qdockwindow.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 "qdoctwindow.moc"
+#include "qdockwindow.moc"
#endif //QT_NO_MAINWINDOW
diff --git a/src/widgets/qmainwindow.cpp b/src/widgets/qmainwindow.cpp
index 1b9cd8f..7ad2781 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 doctwindows is known to
+ \warning 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.
diff --git a/src/widgets/qt_widgets.pri b/src/widgets/qt_widgets.pri
index 41bd6de..a4917e9 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/qdoctwindow.h \
+ $$WIDGETS_H/qdockwindow.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/qdoctwindow.cpp \
+ $$WIDGETS_CPP/qdockwindow.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 d01103c..edd8fe2 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 qdoctwindow.cpp. This header file may change
+// of qworkspace.cpp and qdockwindow.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 f33371a..22d4d5d 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 qdoctwindow.png Toolbar (dock window)
+ \img qdockwindow.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 81ca538..f07c1a8 100644
--- a/src/widgets/qtoolbar.h
+++ b/src/widgets/qtoolbar.h
@@ -42,7 +42,7 @@
#define QTOOLBAR_H
#ifndef QT_H
-#include "qdoctwindow.h"
+#include "qdockwindow.h"
#endif // QT_H
#ifndef QT_NO_TOOLBAR
diff --git a/src/widgets/qtoolbutton.cpp b/src/widgets/qtoolbutton.cpp
index 72faaa7..f11b613 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 qdoctwindow.png Toolbar with Toolbuttons \caption A floating
+ \img qdockwindow.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 8b94a32..b6699e8 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 "qdoctwindow.h"
+#include "qdockwindow.h"
#include "qtoolbar.h"
#define BUTTON_WIDTH 16
@@ -245,7 +245,7 @@ public:
// toplevel mdi fu
QWorkspace::WindowMode wmode;
QGuardedPtr<QMainWindow> mainwindow;
- QPtrList<QDockWindow> doctwindows, newdocks;
+ QPtrList<QDockWindow> dockwindows, 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->doctwindows ); it.current(); ++it)
+ for(QPtrListIterator<QDockWindow> it( d->dockwindows ); 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->doctwindows );
+ QPtrListIterator<QDockWindow> it( d->dockwindows );
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->doctwindows.remove(o));
+ while(d->dockwindows.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->doctwindows.find((*dw_it)) != -1)
+ if(d->dockwindows.find((*dw_it)) != -1)
continue;
handleUndock((*dw_it));
- d->doctwindows.append((*dw_it));
+ d->dockwindows.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->doctwindows.find(w) == -1) {
+ if(d->newdocks.find(w) == -1 && d->dockwindows.find(w) == -1) {
if(::qt_cast<QToolBar*>(w))
d->newdocks.prepend(w);
else
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-04 01:42:10 +0000