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/tqsplitter.cpp | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

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

diff --git a/tqtinterface/qt4/src/widgets/tqsplitter.cpp b/tqtinterface/qt4/src/widgets/tqsplitter.cpp
index 78b9f90..2750a45 100644
--- a/tqtinterface/qt4/src/widgets/tqsplitter.cpp
+++ b/tqtinterface/qt4/src/widgets/tqsplitter.cpp
@@ -63,7 +63,7 @@ public:
 
     bool opaque() const { return s->opaqueResize(); }
 
-    TQSize sizeHint() const;
+    TQSize tqsizeHint() const;
 
     int id() const { return myId; } // d->list.at(id())->wid == this
     void setId( int i ) { myId = i; }
@@ -126,10 +126,10 @@ TQSplitterHandle::TQSplitterHandle( Qt::Orientation o, TQSplitter *tqparent,
     setOrientation( o );
 }
 
-TQSize TQSplitterHandle::sizeHint() const
+TQSize TQSplitterHandle::tqsizeHint() const
 {
     int hw = s->handleWidth();
-    return parentWidget()->tqstyle().sizeFromContents( TQStyle::CT_Splitter, s,
+    return parentWidget()->tqstyle().tqsizeFromContents( TQStyle::CT_Splitter, s,
 						     TQSize(hw, hw) )
 				  .expandedTo( TQApplication::globalStrut() );
 }
@@ -197,7 +197,7 @@ public:
 TQCOORD TQSplitterLayoutStruct::getSizer( Qt::Orientation orient )
 {
     if ( sizer == -1 ) {
-	TQSize s = wid->sizeHint();
+	TQSize s = wid->tqsizeHint();
 	if ( !s.isValid() || wid->testWState(WState_Resized) )
 	    s = wid->size();
 	sizer = ( orient == Qt::Horizontal ) ? s.width() : s.height();
@@ -339,7 +339,7 @@ void TQSplitter::setOrientation( Qt::Orientation o )
 	return;
 
     if ( !testWState( TQt::WState_OwnSizePolicy ) ) {
-	TQSizePolicy sp = sizePolicy();
+	TQSizePolicy sp = tqsizePolicy();
 	sp.transpose();
 	tqsetSizePolicy( sp );
 	clearWState( TQt::WState_OwnSizePolicy );
@@ -435,7 +435,7 @@ TQSplitterLayoutStruct *TQSplitter::addWidget( TQWidget *w, bool prepend )
 	s->wid = newHandle;
 	newHandle->setId( d->list.count() );
 	s->isHandle = TRUE;
-	s->sizer = pick( newHandle->sizeHint() );
+	s->sizer = pick( newHandle->tqsizeHint() );
 	if ( prepend )
 	    d->list.prepend( s );
 	else
@@ -852,14 +852,14 @@ void TQSplitter::doResize()
 	    if ( s->wid->isHidden() || isCollapsed(s->wid) ) {
 		a[i].tqmaximumSize = 0;
 	    } else if ( s->isHandle ) {
-		a[i].sizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
+		a[i].tqsizeHint = a[i].tqminimumSize = a[i].tqmaximumSize = s->sizer;
 		a[i].empty = FALSE;
 	    } else {
 		int mode = s->resizeMode;
 		int stretch = 1;
 
 		if ( mode == DefaultResizeMode ) {
-		    TQSizePolicy p = s->wid->sizePolicy();
+		    TQSizePolicy p = s->wid->tqsizePolicy();
 		    int sizePolicyStretch =
 			    pick( TQSize(p.horStretch(), p.verStretch()) );
 		    if ( sizePolicyStretch > 0 ) {
@@ -890,11 +890,11 @@ void TQSplitter::doResize()
 			stretch *= s->getSizer( orient );
 		    // TQMIN(): ad hoc work-around for tqlayout engine limitation
 		    a[i].stretch = TQMIN( stretch, 8192 );
-		    a[i].sizeHint = a[i].tqminimumSize;
+		    a[i].tqsizeHint = a[i].tqminimumSize;
 		} else if ( mode == KeepSize ) {
-		    a[i].sizeHint = s->getSizer( orient );
+		    a[i].tqsizeHint = s->getSizer( orient );
 		} else { // mode == FollowSizeHint
-		    a[i].sizeHint = pick( s->wid->sizeHint() );
+		    a[i].tqsizeHint = pick( s->wid->tqsizeHint() );
 		}
 	    }
 	}
@@ -1109,7 +1109,7 @@ void TQSplitter::recalcId()
 /*!
     \reimp
 */
-TQSize TQSplitter::sizeHint() const
+TQSize TQSplitter::tqsizeHint() const
 {
     constPolish();
     int l = 0;
@@ -1121,7 +1121,7 @@ TQSize TQSplitter::sizeHint() const
 	while( (o = it.current()) != 0 ) {
 	    ++it;
 	    if ( o->isWidgetType() && !((TQWidget*)o)->isHidden() ) {
-		TQSize s = ((TQWidget*)o)->sizeHint();
+		TQSize s = ((TQWidget*)o)->tqsizeHint();
 		if ( s.isValid() ) {
 		    l += pick( s );
 		    t = TQMAX( t, trans( s ) );
-- 
cgit v1.2.3