Rename old tq methods that no longer need a unique name

1 files changed, 40 insertions, 40 deletions

diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 01a2bb9f..37bbc596 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -413,8 +413,8 @@ void PropertyItem::createResetButton()
     resetButton = new TQPushButton( hbox );
     setupStyle( resetButton );
     resetButton->setPixmap( DesignerResetPix );
-    resetButton->setFixedWidth( resetButton->tqsizeHint().width() );
-    hbox->tqlayout()->tqsetAlignment( TQt::AlignRight );
+    resetButton->setFixedWidth( resetButton->sizeHint().width() );
+    hbox->tqlayout()->setAlignment( TQt::AlignRight );
     listview->addChild( hbox );
     hbox->hide();
     TQObject::connect( resetButton, TQT_SIGNAL( clicked() ),
@@ -441,13 +441,13 @@ void PropertyItem::updateResetButtonState()
 void PropertyItem::placeEditor( TQWidget *w )
 {
     createResetButton();
-    TQRect r = listview->tqitemRect( this );
+    TQRect r = listview->itemRect( this );
     if ( !r.size().isValid() ) {
 	listview->ensureItemVisible( this );
 #if defined(TQ_WS_WIN)
 	listview->repaintContents( FALSE );
 #endif
-	r = listview->tqitemRect( this );
+	r = listview->itemRect( this );
     }
     r.setX( listview->header()->sectionPos( 1 ) );
     r.setWidth( listview->header()->sectionSize( 1 ) - 1 );
@@ -455,7 +455,7 @@ void PropertyItem::placeEditor( TQWidget *w )
     r = TQRect( listview->viewportToContents( r.topLeft() ), r.size() );
     w->resize( r.size() );
     listview->moveChild( w, r.x(), r.y() );
-    resetButton->parentWidget()->resize( resetButton->tqsizeHint().width() + 10, r.height() );
+    resetButton->parentWidget()->resize( resetButton->sizeHint().width() + 10, r.height() );
     listview->moveChild( resetButton->parentWidget(), r.x() + r.width() - 8, r.y() );
     resetButton->setFixedHeight( TQMAX( 0, r.height() - 3 ) );
 }
@@ -553,10 +553,10 @@ TQString PropertyItem::currentItemFromObject() const
 
 void PropertyItem::setFocus( TQWidget *w )
 {
-    if ( !tqApp->tqfocusWidget() ||
+    if ( !tqApp->focusWidget() ||
 	 listview->propertyEditor()->formWindow() &&
-	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->tqfocusWidget()) ) &&
-	   !tqApp->tqfocusWidget()->inherits( "Editor" ) ) )
+	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+	   !tqApp->focusWidget()->inherits( "Editor" ) ) )
 	w->setFocus();
 }
 
@@ -1635,8 +1635,8 @@ PropertyPixmapItem::PropertyPixmapItem( PropertyList *l, PropertyItem *after, Pr
     box = new TQHBox( listview->viewport() );
     box->hide();
     pixPrev = new TQLabel( box );
-    pixPrev->tqsetSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
-    pixPrev->setBackgroundColor( pixPrev->tqcolorGroup().color( TQColorGroup::Base ) );
+    pixPrev->setSizePolicy( TQSizePolicy( TQSizePolicy::Ignored, TQSizePolicy::Minimum ) );
+    pixPrev->setBackgroundColor( pixPrev->colorGroup().color( TQColorGroup::Base ) );
     button = new TQPushButton( "...", box );
     setupStyle( button );
     button->setFixedWidth( 20 );
@@ -1714,8 +1714,8 @@ void PropertyPixmapItem::drawCustomContents( TQPainter *p, const TQRect &r )
 
     if ( !pix.isNull() ) {
 	p->save();
-	p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
-				       (int)(p->tqworldMatrix().dy() + r.y()) ),
+	p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+				       (int)(p->worldMatrix().dy() + r.y()) ),
 			       r.size() ) );
 	p->drawPixmap( r.x(), r.y() + ( r.height() - pix.height() ) / 2, pix );
 	p->restore();
@@ -2311,7 +2311,7 @@ void PropertyPaletteItem::getPalette()
 	w = ( (TQScrollView*)w )->viewport();
     TQPalette pal = PaletteEditor::getPalette( &ok, val.toPalette(),
 #if defined(TQT_NON_COMMERCIAL)
-					      w->backgroundMode(), listview->tqtopLevelWidget(),
+					      w->backgroundMode(), listview->topLevelWidget(),
 #else
 					      w->backgroundMode(), listview,
 #endif
@@ -2331,8 +2331,8 @@ void PropertyPaletteItem::drawCustomContents( TQPainter *p, const TQRect &r )
 {
     TQPalette pal( value().toPalette() );
     p->save();
-    p->setClipRect( TQRect( TQPoint( (int)(p->tqworldMatrix().dx() + r.x()),
-				   (int)(p->tqworldMatrix().dy() + r.y()) ),
+    p->setClipRect( TQRect( TQPoint( (int)(p->worldMatrix().dx() + r.x()),
+				   (int)(p->worldMatrix().dy() + r.y()) ),
 			   r.size() ) );
     TQRect r2( r );
     r2.setX( r2.x() + 2 );
@@ -2678,7 +2678,7 @@ void EnumBox::popupClosed()
 void EnumBox::paintEvent( TQPaintEvent * )
 {
     TQPainter p( this );
-    const TQColorGroup & g = tqcolorGroup();
+    const TQColorGroup & g = colorGroup();
     p.setPen(g.text());
 
     TQStyle::SFlags flags = TQStyle::Style_Default;
@@ -2692,7 +2692,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
 		&g.brush( TQColorGroup::Button ) );
 	return;
     }
-    tqstyle().tqdrawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
+    tqstyle().drawComplexControl( TQStyle::CC_ComboBox, &p, this, rect(), g,
 				    flags, TQStyle::SC_All,
 				    (arrowDown ?
 				     TQStyle::SC_ComboBoxArrow :
@@ -2700,7 +2700,7 @@ void EnumBox::paintEvent( TQPaintEvent * )
 
     TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 	    TQStyle::SC_ComboBoxEditField );
-    re = TQStyle::tqvisualRect(re, this);
+    re = TQStyle::visualRect(re, this);
     p.setClipRect( re );
 
     if ( !str.isNull() ) {
@@ -2744,7 +2744,7 @@ void EnumBox::mousePressEvent( TQMouseEvent *e )
 
     TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this,
 						      TQStyle::SC_ComboBoxArrow);
-    arrowRect = TQStyle::tqvisualRect(arrowRect, this);
+    arrowRect = TQStyle::visualRect(arrowRect, this);
 
     arrowRect.setHeight( TQMAX(  height() - (2 * arrowRect.y()), arrowRect.height() ) );
 
@@ -3040,7 +3040,7 @@ void PropertyList::setupProperties()
     if ( !editor->widget() )
 	return;
     bool allProperties = !::tqqt_cast<Spacer*>(editor->widget());
-    TQStrList lst = editor->widget()->tqmetaObject()->propertyNames( allProperties );
+    TQStrList lst = editor->widget()->metaObject()->propertyNames( allProperties );
     PropertyItem *item = 0;
     TQMap<TQString, bool> unique;
     TQObject *w = editor->widget();
@@ -3051,11 +3051,11 @@ void PropertyList::setupProperties()
 	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
 	const TQMetaProperty* p =
-	    editor->widget()->tqmetaObject()->
-	    property( editor->widget()->tqmetaObject()->findProperty( it.current(), allProperties), allProperties );
+	    editor->widget()->metaObject()->
+	    property( editor->widget()->metaObject()->findProperty( it.current(), allProperties), allProperties );
 	if ( !p )
 	    continue;
-	if ( unique.contains( TQString::tqfromLatin1( it.current() ) ) )
+	if ( unique.contains( TQString::fromLatin1( it.current() ) ) )
 	    continue;
 	if ( ::tqqt_cast<QDesignerToolBar*>(editor->widget()) ||
 	     ::tqqt_cast<MenuBarEditor*>(editor->widget()) ) {
@@ -3071,12 +3071,12 @@ void PropertyList::setupProperties()
 		continue;
 	    if ( qstrcmp( p->name(), "sizePolicy" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
 		continue;
-	    if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+	    if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
 		continue;
 	}
-	unique.insert( TQString::tqfromLatin1( it.current() ), TRUE );
+	unique.insert( TQString::fromLatin1( it.current() ), TRUE );
 	if ( editor->widget()->isWidgetType() &&
 	     editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 0 )
@@ -3107,9 +3107,9 @@ void PropertyList::setupProperties()
 		    continue;
 		if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "tqminimumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "minimumSize" ) == 0 )
 		    continue;
-		if ( qstrcmp( p->name(), "tqmaximumSize" ) == 0 )
+		if ( qstrcmp( p->name(), "maximumSize" ) == 0 )
 		    continue;
 		if ( qstrcmp( p->name(), "enabled" ) == 0 )
 		    continue;
@@ -3692,21 +3692,21 @@ static void clearAlignList( TQStrList &l )
 void PropertyList::setPropertyValue( PropertyItem *i )
 {
     const TQMetaProperty *p =
-	editor->widget()->tqmetaObject()->
-	property( editor->widget()->tqmetaObject()->findProperty( i->name(), TRUE), TRUE );
+	editor->widget()->metaObject()->
+	property( editor->widget()->metaObject()->findProperty( i->name(), TRUE), TRUE );
     if ( !p ) {
 	if ( i->name() == "hAlign" ) {
 	    int align = editor->widget()->property( "tqalignment" ).toInt();
-	    p = editor->widget()->tqmetaObject()->
-		property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+	    p = editor->widget()->metaObject()->
+		property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE );
 	    align &= ~AlignVertical_Mask;
 	    TQStrList l = p->valueToKeys( align );
 	    clearAlignList( l );
 	    ( (PropertyListItem*)i )->setCurrentItem( l.last() );
 	} else if ( i->name() == "vAlign" ) {
 	    int align = editor->widget()->property( "tqalignment" ).toInt();
-	    p = editor->widget()->tqmetaObject()->
-		property( editor->widget()->tqmetaObject()->findProperty( "tqalignment", TRUE ), TRUE );
+	    p = editor->widget()->metaObject()->
+		property( editor->widget()->metaObject()->findProperty( "tqalignment", TRUE ), TRUE );
 	    align &= ~AlignHorizontal_Mask;
 	    ( (PropertyListItem*)i )->setCurrentItem( p->valueToKeys( align ).last() );
 	} else if ( i->name() == "wordwrap" ) {
@@ -3864,7 +3864,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
     if ( ( (PropertyItem*)i )->propertyParent() )
 	i = ( (PropertyItem*)i )->propertyParent();
 
-    const TQMetaObject *mo = editor->widget()->tqmetaObject();
+    const TQMetaObject *mo = editor->widget()->metaObject();
     TQString prop = ( (PropertyItem*)i )->name();
     while ( mo ) {
 	TQString s;
@@ -3873,7 +3873,7 @@ TQString PropertyList::whatsThisText( TQListViewItem *i )
 	if ( ( it = propertyDocs.find( s ) ) != propertyDocs.end() ) {
 	    return *it;
 	}
-	mo = mo->tqsuperClass();
+	mo = mo->superClass();
     }
 
     return i18n( "<p><b>TQWidget::%1</b></p><p>There is no documentation available for this property.</p>" ).tqarg( prop );
@@ -4274,21 +4274,21 @@ TQString PropertyEditor::classOfCurrentProperty() const
 	return TQString();
     TQObject *o = wid;
     TQString curr = currentProperty();
-    TQMetaObject *mo = o->tqmetaObject();
+    TQMetaObject *mo = o->metaObject();
     while ( mo ) {
 	TQStrList props = mo->propertyNames( FALSE );
 	if ( props.find( curr.latin1() ) != -1 )
 	    return mo->className();
-	mo = mo->tqsuperClass();
+	mo = mo->superClass();
     }
     return TQString();
 }
 
-TQMetaObject* PropertyEditor::tqmetaObjectOfCurrentProperty() const
+TQMetaObject* PropertyEditor::metaObjectOfCurrentProperty() const
 {
     if ( !wid )
 	return 0;
-    return wid->tqmetaObject();
+    return wid->metaObject();
 }
 
 void PropertyEditor::resetFocus()