From ba18a0dd03be4c063d27deab4cd864a189ea705a Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Tue, 8 Nov 2011 00:08:40 -0600
Subject: Fix accidental conversion of dockwin

---
 src/workspace/qworkspace.cpp | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/workspace')

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
-- 
cgit v1.2.3