Rename old tq methods that no longer need a unique name

1 files changed, 16 insertions, 16 deletions

diff --git a/kexi/plugins/forms/widgets/kexidbcombobox.cpp b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
index 81c66ba6..231003cf 100644
--- a/kexi/plugins/forms/widgets/kexidbcombobox.cpp
+++ b/kexi/plugins/forms/widgets/kexidbcombobox.cpp
@@ -59,7 +59,7 @@ class KexiDBComboBox::Private
 
 	KexiComboBoxPopup *popup;
 	KComboBox *paintedCombo; //!< fake combo used only to pass it as 'this' for TQStyle (because styles use <static_cast>)
-	TQSize tqsizeHint; //!< A cache for KexiDBComboBox::tqsizeHint(), 
+	TQSize sizeHint; //!< A cache for KexiDBComboBox::sizeHint(), 
 	                //!< rebuilt by KexiDBComboBox::fontChange() and KexiDBComboBox::styleChange()
 	KexiDB::QueryColumnInfo* visibleColumnInfo;
 	TQPtrDict<char> *subWidgetsWithDisabledEvents; //! used to collect subwidget and its tqchildren (if isEditable is false)
@@ -146,7 +146,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 
 //! @todo support reverse tqlayout
 //bool reverse = TQApplication::reverseLayout();
-	tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
+	tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, d->paintedCombo /*this*/, rect(), cg,
 		flags, (uint)TQStyle::SC_All, 
 		(d->buttonPressed ? TQStyle::SC_ComboBoxArrow : TQStyle::SC_None )
 	);
@@ -159,7 +159,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 		if ( hasFocus() ) {
 			if (0==qstrcmp(tqstyle().name(), "windows")) //a hack
 				p.fillRect( editorGeometry, cg.brush( TQColorGroup::Highlight ) );
-			TQRect r( TQStyle::tqvisualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
+			TQRect r( TQStyle::visualRect( tqstyle().subRect( TQStyle::SR_ComboBoxFocusRect, d->paintedCombo ), this ) );
 			r = TQRect(r.left()-1, r.top()-1, r.width()+2, r.height()+2); //enlare by 1 pixel each side to avoid covering by the subwidget
 			tqstyle().tqdrawPrimitive( TQStyle::PE_FocusRect, &p, 
 				r, cg, flags | TQStyle::Style_FocusAtBorder, TQStyleOption(cg.highlight()));
@@ -170,7 +170,7 @@ void KexiDBComboBox::paintEvent( TQPaintEvent * )
 
 TQRect KexiDBComboBox::editorGeometry() const
 {
-	TQRect r( TQStyle::tqvisualRect(
+	TQRect r( TQStyle::visualRect(
 		tqstyle().querySubControlMetrics(TQStyle::CC_ComboBox, d->paintedCombo,
 		TQStyle::SC_ComboBoxEditField), d->paintedCombo ) );
 	
@@ -211,20 +211,20 @@ void KexiDBComboBox::createEditor()
 void KexiDBComboBox::setLabelPosition(LabelPosition position)
 {
 	if(m_subwidget) {
-		if (-1 != m_subwidget->tqmetaObject()->findProperty("frameShape", true))
+		if (-1 != m_subwidget->metaObject()->findProperty("frameShape", true))
 			m_subwidget->setProperty("frameShape", TQVariant((int)TQFrame::NoFrame));
 		m_subwidget->setGeometry( editorGeometry() );
 	}
 //		KexiSubwidgetInterface *subwidgetInterface = dynamic_cast<KexiSubwidgetInterface*>((TQWidget*)m_subwidget);
 		// update size policy
 //		if (subwidgetInterface && subwidgetInterface->subwidgetStretchRequired(this)) {
-			TQSizePolicy sizePolicy( this->tqsizePolicy() );
+			TQSizePolicy sizePolicy( this->sizePolicy() );
 			if(position == Left)
 				sizePolicy.setHorData( TQSizePolicy::Minimum );
 			else
 				sizePolicy.setVerData( TQSizePolicy::Minimum );
-			//m_subwidget->tqsetSizePolicy(sizePolicy);
-			tqsetSizePolicy(sizePolicy);
+			//m_subwidget->setSizePolicy(sizePolicy);
+			setSizePolicy(sizePolicy);
 		//}
 //	}
 }
@@ -233,7 +233,7 @@ TQRect KexiDBComboBox::buttonGeometry() const
 {
 	TQRect arrowRect( 
 		tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, d->paintedCombo, TQStyle::SC_ComboBoxArrow) );
-	arrowRect = TQStyle::tqvisualRect(arrowRect, d->paintedCombo);
+	arrowRect = TQStyle::visualRect(arrowRect, d->paintedCombo);
 	arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) ); // a fix for Motif style
 	return arrowRect;
 }
@@ -490,29 +490,29 @@ int KexiDBComboBox::popupWidthHint() const
 
 void KexiDBComboBox::fontChange( const TQFont & oldFont )
 {
-	d->tqsizeHint = TQSize(); //force rebuild the cache
+	d->sizeHint = TQSize(); //force rebuild the cache
 	KexiDBAutoField::fontChange(oldFont);
 }
 
 void KexiDBComboBox::styleChange( TQStyle& oldStyle )
 {
 	KexiDBAutoField::styleChange( oldStyle );
-	d->tqsizeHint = TQSize(); //force rebuild the cache
+	d->sizeHint = TQSize(); //force rebuild the cache
 	if (m_subwidget)
 		m_subwidget->setGeometry( editorGeometry() );
 }
 
-TQSize KexiDBComboBox::tqsizeHint() const
+TQSize KexiDBComboBox::sizeHint() const
 {
-	if ( isVisible() && d->tqsizeHint.isValid() )
-		return d->tqsizeHint;
+	if ( isVisible() && d->sizeHint.isValid() )
+		return d->sizeHint;
 
 	const int maxWidth = 7 * fontMetrics().width(TQChar('x')) + 18;
 	const int maxHeight = TQMAX( fontMetrics().lineSpacing(), 14 ) + 2;
-	d->tqsizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
+	d->sizeHint = (tqstyle().tqsizeFromContents(TQStyle::CT_ComboBox, d->paintedCombo,
 		TQSize(maxWidth, maxHeight)).expandedTo(TQApplication::globalStrut()));
 
-	return d->tqsizeHint;
+	return d->sizeHint;
 }
 
 void KexiDBComboBox::editRequested()