1 files changed, 18 insertions, 18 deletions

diff --git a/kdevdesigner/designer/mainwindow.cpp b/kdevdesigner/designer/mainwindow.cpp
index dbc2b932..e337efb6 100644
--- a/kdevdesigner/designer/mainwindow.cpp
+++ b/kdevdesigner/designer/mainwindow.cpp
@@ -537,7 +537,7 @@ int MainWindow::currentTool() const
 {
     if ( !actionCurrentTool )
 	return POINTER_TOOL;
-    return TQString::tqfromLatin1(actionCurrentTool->name()).toInt();
+    return TQString::fromLatin1(actionCurrentTool->name()).toInt();
 }
 
 void MainWindow::runProjectPrecondition()
@@ -735,14 +735,14 @@ void MainWindow::previewForm( const TQString & style )
 
 void MainWindow::helpContents()
 {
-    TQWidget *tqfocusWidget = tqApp->tqfocusWidget();
+    TQWidget *focusWidget = tqApp->focusWidget();
     bool showClassDocu = TRUE;
-    while ( tqfocusWidget ) {
-	if ( tqfocusWidget->isA( "PropertyList" ) ) {
+    while ( focusWidget ) {
+	if ( focusWidget->isA( "PropertyList" ) ) {
 	    showClassDocu = FALSE;
 	    break;
 	}
-	tqfocusWidget = tqfocusWidget->parentWidget();
+	focusWidget = focusWidget->parentWidget();
     }
 
     TQString source = "designer-manual.html";
@@ -767,7 +767,7 @@ void MainWindow::helpContents()
 
     if ( propertyEditor->widget() && !showClassDocu ) {
 	if ( !propertyEditor->currentProperty().isEmpty() ) {
-	    TQMetaObject* mo = propertyEditor->tqmetaObjectOfCurrentProperty();
+	    TQMetaObject* mo = propertyEditor->metaObjectOfCurrentProperty();
 	    TQString s;
 	    TQString cp = propertyEditor->currentProperty();
 	    if ( cp == "layoutMargin" ) {
@@ -783,7 +783,7 @@ void MainWindow::helpContents()
 		    source = propertyDocumentation[ "TQObject/name" ];
 	    } else {
 		while ( mo && !propertyDocumentation.contains( ( s = TQString( mo->className() ) + "/" + cp ) ) )
-		    mo = mo->tqsuperClass();
+		    mo = mo->superClass();
 		if ( mo )
 		    source = "p:" + propertyDocumentation[s];
 	    }
@@ -1554,18 +1554,18 @@ void MainWindow::popupWidgetMenu( const TQPoint &gp, FormWindow * /*fw*/, TQWidg
 
 void MainWindow::setupRMBProperties( TQValueList<uint> &ids, TQMap<TQString, int> &props, TQWidget *w )
 {
-    const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
     if ( text && qstrcmp( text->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	text = 0;
-    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+    const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
     if ( title && qstrcmp( title->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	title = 0;
     const TQMetaProperty* pagetitle =
-	w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pageTitle", TRUE ), TRUE );
+	w->metaObject()->property( w->metaObject()->findProperty( "pageTitle", TRUE ), TRUE );
     if ( pagetitle && qstrcmp( pagetitle->type(), TQSTRING_OBJECT_NAME_STRING) != 0 )
 	pagetitle = 0;
     const TQMetaProperty* pixmap =
-	w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "pixmap", TRUE ), TRUE );
+	w->metaObject()->property( w->metaObject()->findProperty( "pixmap", TRUE ), TRUE );
     if ( pixmap && qstrcmp( pixmap->type(), TQPIXMAP_OBJECT_NAME_STRING) != 0 )
 	pixmap = 0;
 
@@ -2211,8 +2211,8 @@ void MainWindow::writeConfig()
 	l << w->className;
 	l << w->includeFile;
 	l << TQString::number( (int)w->includePolicy );
-	l << TQString::number( w->tqsizeHint.width() );
-	l << TQString::number( w->tqsizeHint.height() );
+	l << TQString::number( w->sizeHint.width() );
+	l << TQString::number( w->sizeHint.height() );
 	l << TQString::number( w->lstSignals.count() );
 	for ( TQValueList<TQCString>::ConstIterator it = w->lstSignals.begin(); it != w->lstSignals.end(); ++it )
 	    l << TQString( fixArgs( *it ) );
@@ -2351,8 +2351,8 @@ void MainWindow::readConfig()
 	w->className = l[ 0 ];
 	w->includeFile = l[ 1 ];
 	w->includePolicy = (MetaDataBase::CustomWidget::IncludePolicy)l[ 2 ].toInt();
-	w->tqsizeHint.setWidth( l[ 3 ].toInt() );
-	w->tqsizeHint.setHeight( l[ 4 ].toInt() );
+	w->sizeHint.setWidth( l[ 3 ].toInt() );
+	w->sizeHint.setHeight( l[ 4 ].toInt() );
 	uint c = 5;
 	if ( l.count() > c ) {
 	    int numSignals = l[ c ].toInt();
@@ -2617,8 +2617,8 @@ bool MainWindow::openEditor( TQWidget *w, FormWindow *f )
 	return TRUE;
     }
 
-    const TQMetaProperty* text = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "text", TRUE ), TRUE );
-    const TQMetaProperty* title = w->tqmetaObject()->property( w->tqmetaObject()->findProperty( "title", TRUE ), TRUE );
+    const TQMetaProperty* text = w->metaObject()->property( w->metaObject()->findProperty( "text", TRUE ), TRUE );
+    const TQMetaProperty* title = w->metaObject()->property( w->metaObject()->findProperty( "title", TRUE ), TRUE );
     if ( text && text->designable(w) ) {
 	bool ok = FALSE;
 	bool oldDoWrap = FALSE;
@@ -2856,7 +2856,7 @@ void MainWindow::checkTempFiles()
 void MainWindow::showDialogHelp()
 {
     TQWidget *w = (TQWidget*)sender();
-    w = w->tqtopLevelWidget();
+    w = w->topLevelWidget();
 
     TQString link = documentationPath() + "/designer-manual-13.html#";