From 33d3ec06354d07cbb6164eb1c8adbd89c9ecefdd Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sun, 17 Jul 2011 19:19:26 -0500
Subject: Revert "Rename tqsize* to size*"

This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.
---
 tqtinterface/qt4/src/widgets/tqdockarea.cpp | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'tqtinterface/qt4/src/widgets/tqdockarea.cpp')

diff --git a/tqtinterface/qt4/src/widgets/tqdockarea.cpp b/tqtinterface/qt4/src/widgets/tqdockarea.cpp
index f9cf2fc..5aed489 100644
--- a/tqtinterface/qt4/src/widgets/tqdockarea.cpp
+++ b/tqtinterface/qt4/src/widgets/tqdockarea.cpp
@@ -120,7 +120,7 @@ TQLayoutIterator TQDockAreaLayout::iterator()
     return 0;
 }
 
-TQSize TQDockAreaLayout::sizeHint() const
+TQSize TQDockAreaLayout::tqsizeHint() const
 {
     if ( !dockWindows || !dockWindows->first() )
 	return TQSize( 0, 0 );
@@ -215,9 +215,9 @@ static int space_left( const TQRect &r, int pos, Qt::Orientation o )
 static int dock_extent( TQDockWindow *w, Qt::Orientation o, int maxsize )
 {
     if ( o == Qt::Horizontal )
-	return TQMIN( maxsize, TQMAX( w->sizeHint().width(), w->fixedExtent().width() ) );
+	return TQMIN( maxsize, TQMAX( w->tqsizeHint().width(), w->fixedExtent().width() ) );
     else
-	return TQMIN( maxsize, TQMAX( w->sizeHint().height(), w->fixedExtent().height() ) );
+	return TQMIN( maxsize, TQMAX( w->tqsizeHint().height(), w->fixedExtent().height() ) );
 }
 
 static int dock_strut( TQDockWindow *w, Qt::Orientation o )
@@ -226,12 +226,12 @@ static int dock_strut( TQDockWindow *w, Qt::Orientation o )
 	int wid;
 	if ( ( wid = w->fixedExtent().width() ) != -1 )
 	    return TQMAX( wid, TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) );
-	return TQMAX( w->sizeHint().width(), TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) );
+	return TQMAX( w->tqsizeHint().width(), TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() ) );
     } else {
 	int hei;
 	if ( ( hei = w->fixedExtent().height() ) != -1 )
 	    return TQMAX( hei, TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) );
-	return TQMAX( w->sizeHint().height(), TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) );
+	return TQMAX( w->tqsizeHint().height(), TQMAX( w->tqminimumSizeHint().height(), w->tqminimumSize().height() ) );
     }
 }
 
@@ -261,14 +261,14 @@ static void shrink_extend( TQDockWindow *dw, int &dockExtend, int /*spaceLeft*/,
 	if ( !tb )
 	    mw = dw->minimumWidth();
 	else
-	    mw = dw->sizeHint().width();
+	    mw = dw->tqsizeHint().width();
 	dockExtend = mw;
     } else {
 	int mh = 0;
 	if ( !tb )
 	    mh = dw->minimumHeight();
 	else
-	    mh = dw->sizeHint().height();
+	    mh = dw->tqsizeHint().height();
 	dockExtend = mh;
     }
 }
@@ -886,9 +886,9 @@ void TQDockArea::moveDockWindow( TQDockWindow *w, const TQPoint &p, const TQRect
 
     if ( mse != -10 && w->isResizeEnabled() ) {
 	if ( orientation() != Qt::Horizontal )
-	    w->setFixedExtentWidth( TQMIN( TQMAX( w->minimumWidth(), mse ), w->sizeHint().width() ) );
+	    w->setFixedExtentWidth( TQMIN( TQMAX( w->minimumWidth(), mse ), w->tqsizeHint().width() ) );
 	else
-	    w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->sizeHint().height() ) );
+	    w->setFixedExtentHeight( TQMIN( TQMAX( w->minimumHeight(), mse ), w->tqsizeHint().height() ) );
     }
 
     updateLayout();
@@ -1171,13 +1171,13 @@ int TQDockArea::maxSpace( int hint, TQDockWindow *dw )
 	if ( !tb )
 	    min = TQMAX( w->tqminimumSize().width(), w->tqminimumSizeHint().width() );
 	else
-	    min = w->sizeHint().width();
+	    min = w->tqsizeHint().width();
     } else {
 	w->setFixedExtentHeight( -1 );
 	if ( !tb )
 	    min = TQMAX( w->tqminimumSize().height(), w->tqminimumSizeHint().height() );
 	else
-	    min = w->sizeHint().height();
+	    min = w->tqsizeHint().height();
     }
 
     int diff = hint - ( orientation() == Qt::Horizontal ? dw->width() : dw->height() );
-- 
cgit v1.2.3