Revert "Rename tqsize* to size*"

This reverts commit e33879600503bacc0b4ef090f7f79ab80bb6b0da.

1 files changed, 19 insertions, 19 deletions

diff --git a/tqtinterface/qt4/src/table/tqtable.cpp b/tqtinterface/qt4/src/table/tqtable.cpp
index 6ef5b4f..d87914f 100644
--- a/tqtinterface/qt4/src/table/tqtable.cpp
+++ b/tqtinterface/qt4/src/table/tqtable.cpp
@@ -786,7 +786,7 @@ TQTable::viewport() as tqparent.
 
 If you reimplement this function you'll almost certainly need to
 reimplement setContentFromEditor(), and may need to reimplement
-sizeHint().
+tqsizeHint().
 
 \quotefile table/statistics/statistics.cpp
 \skipto createEditor
@@ -960,11 +960,11 @@ TQString TQTableItem::key() const
     function.
 */
 
-TQSize TQTableItem::sizeHint() const
+TQSize TQTableItem::tqsizeHint() const
 {
     TQSize strutSize = TQApplication::globalStrut();
     if ( edType == Always && table()->cellWidget( rw, cl ) )
-	return table()->cellWidget( rw, cl )->sizeHint().expandedTo( strutSize );
+	return table()->cellWidget( rw, cl )->tqsizeHint().expandedTo( strutSize );
 
     TQSize s;
     int x = 0;
@@ -1461,11 +1461,11 @@ int TQComboTableItem::rtti() const
 
 /*! \reimp */
 
-TQSize TQComboTableItem::sizeHint() const
+TQSize TQComboTableItem::tqsizeHint() const
 {
     fakeCombo->insertItem( currentText() );
     fakeCombo->setCurrentItem( fakeCombo->count() - 1 );
-    TQSize sh = fakeCombo->sizeHint();
+    TQSize sh = fakeCombo->tqsizeHint();
     fakeCombo->removeItem( fakeCombo->count() - 1 );
     return sh.expandedTo( TQApplication::globalStrut() );
 }
@@ -1647,12 +1647,12 @@ int TQCheckTableItem::rtti() const
 
 /*! \reimp */
 
-TQSize TQCheckTableItem::sizeHint() const
+TQSize TQCheckTableItem::tqsizeHint() const
 {
     TQSize sz = TQSize( table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorWidth ),
 		      table()->tqstyle().tqpixelMetric( TQStyle::PM_IndicatorHeight ) );
     sz.setWidth( sz.width() + 6 );
-    TQSize sh( TQTableItem::sizeHint() );
+    TQSize sh( TQTableItem::tqsizeHint() );
     return TQSize( sh.width() + sz.width(), TQMAX( sh.height(), sz.height() ) ).
 	expandedTo( TQApplication::globalStrut() );
 }
@@ -4329,7 +4329,7 @@ void TQTable::focusOutEvent( TQFocusEvent* tqfe )
 /*! \reimp
 */
 
-TQSize TQTable::sizeHint() const
+TQSize TQTable::tqsizeHint() const
 {
     if ( cachedSizeHint().isValid() )
 	return cachedSizeHint();
@@ -4342,7 +4342,7 @@ TQSize TQTable::sizeHint() const
 	sh = TQSize( tableSize().width() + VERTICALMARGIN + 5,
 		    tableSize().height() + topMargin() + 5 );
     } else {
-    	sh = TQScrollView::sizeHint();
+    	sh = TQScrollView::tqsizeHint();
     	if ( !topHeader->isHidden() )
 		sh.setHeight( sh.height() + topHeader->height() );
     	if ( !leftHeader->isHidden() )
@@ -4927,7 +4927,7 @@ void TQTable::setNumRows( int r )
 	}
     }
 
-    fontChange(font()); // tqinvalidate the sizeHintCache
+    fontChange(font()); // tqinvalidate the tqsizeHintCache
 
     TQPtrVector<TQTableItem> tmp;
     TQPtrVector<TableWidget> tmp2;
@@ -4976,7 +4976,7 @@ void TQTable::setNumCols( int c )
 	}
     }
 
-    fontChange(font()); // tqinvalidate the sizeHintCache
+    fontChange(font()); // tqinvalidate the tqsizeHintCache
 
     TQPtrVector<TQTableItem> tmp;
     TQPtrVector<TableWidget> tmp2;
@@ -5824,12 +5824,12 @@ void TQTable::adjustColumn( int col )
 	if ( !itm ) {
 	    TQWidget *widget = cellWidget( i, col );
 	    if ( widget )
-		w = TQMAX( w, widget->sizeHint().width() );
+		w = TQMAX( w, widget->tqsizeHint().width() );
 	} else {
 	    if ( itm->colSpan() > 1 )
-		w = TQMAX( w, itm->sizeHint().width() / itm->colSpan() );
+		w = TQMAX( w, itm->tqsizeHint().width() / itm->colSpan() );
 	    else
-		w = TQMAX( w, itm->sizeHint().width() );
+		w = TQMAX( w, itm->tqsizeHint().width() );
 	}
     }
     w = TQMAX( w, TQApplication::globalStrut().width() );
@@ -5854,12 +5854,12 @@ void TQTable::adjustRow( int row )
 	if ( !itm ) {
 	    TQWidget *widget = cellWidget( row, i );
 	    if ( widget )
-		h = TQMAX( h, widget->sizeHint().height() );
+		h = TQMAX( h, widget->tqsizeHint().height() );
 	} else {
 	    if ( itm->rowSpan() > 1 )
-		h = TQMAX( h, itm->sizeHint().height() / itm->rowSpan() );
+		h = TQMAX( h, itm->tqsizeHint().height() / itm->rowSpan() );
 	    else
-		h = TQMAX( h, itm->sizeHint().height() );
+		h = TQMAX( h, itm->tqsizeHint().height() );
 	}
     }
     h = TQMAX( h, TQApplication::globalStrut().height() );
@@ -6905,11 +6905,11 @@ void TQTableHeader::sectionLabelChanged( int section )
 
     // this does not really belong here
     if ( orientation() == Qt::Horizontal ) {
-	int h = sizeHint().height();
+	int h = tqsizeHint().height();
 	if ( h != height() && mayOverwriteMargin(table->topMargin(), h) )
 	    table->setTopMargin( h );
     } else {
-	int w = sizeHint().width();
+	int w = tqsizeHint().width();
 	if ( w != width() && mayOverwriteMargin( ( TQApplication::reverseLayout() ? table->rightMargin() : table->leftMargin() ), w) )
 	    table->setLeftMargin( w );
     }