1 files changed, 24 insertions, 24 deletions

diff --git a/kdevdesigner/designer/formsettingsimpl.cpp b/kdevdesigner/designer/formsettingsimpl.cpp
index e29ea157..f3de8578 100644
--- a/kdevdesigner/designer/formsettingsimpl.cpp
+++ b/kdevdesigner/designer/formsettingsimpl.cpp
@@ -41,10 +41,10 @@
 #include <tqcheckbox.h>
 
 FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
-    : FormSettingsBase( parent, 0, TRUE ), formwindow( fw )
+    : FormSettingsBase( parent, 0, true ), formwindow( fw )
 {
-    connect( buttonHelp, TQT_SIGNAL( clicked() ), MainWindow::self, TQT_SLOT( showDialogHelp() ) );
-    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( TQT_TQOBJECT(fw) );
+    connect( buttonHelp, TQ_SIGNAL( clicked() ), MainWindow::self, TQ_SLOT( showDialogHelp() ) );
+    MetaDataBase::MetaInfo info = MetaDataBase::metaInfo( fw );
     if ( info.classNameChanged && !info.className.isEmpty() )
 	editClassName->setText( info.className );
     else
@@ -52,21 +52,21 @@ FormSettings::FormSettings( TQWidget *parent, FormWindow *fw )
     editComment->setText( info.comment );
     editAuthor->setText( info.author );
 
-    editClassName->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editClassName) ) );
-    editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editPixmapFunction) ) );
+    editClassName->setValidator( new AsciiValidator( TQString( ":" ), editClassName ) );
+    editPixmapFunction->setValidator( new AsciiValidator( TQString( ":" ), editPixmapFunction ) );
 
     if ( formwindow->savePixmapInline() )
-	radioPixmapInline->setChecked( TRUE );
+	radioPixmapInline->setChecked( true );
     else if ( formwindow->savePixmapInProject() )
-	radioProjectImageFile->setChecked( TRUE );
+	radioProjectImageFile->setChecked( true );
     else
-	radioPixmapFunction->setChecked( TRUE );
+	radioPixmapFunction->setChecked( true );
     editPixmapFunction->setText( formwindow->pixmapLoaderFunction() );
     radioProjectImageFile->setEnabled( !fw->project()->isDummy() );
     spinSpacing->setValue( formwindow->layoutDefaultSpacing() );
     spinMargin->setValue( formwindow->layoutDefaultMargin() );
-    editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editSpacingFunction) ) );
-    editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), TQT_TQOBJECT(editMarginFunction) ) ); 
+    editSpacingFunction->setValidator( new AsciiValidator( TQString( ":" ), editSpacingFunction ) );
+    editMarginFunction->setValidator( new AsciiValidator( TQString( ":" ), editMarginFunction ) ); 
     checkLayoutFunctions->setChecked( formwindow->hasLayoutFunctions() );
     editSpacingFunction->setText( formwindow->spacingFunction() );
     editMarginFunction->setText( formwindow->marginFunction() );
@@ -79,34 +79,34 @@ void FormSettings::okClicked()
     info.classNameChanged = info.className != TQString( formwindow->name() );
     info.comment = editComment->text();
     info.author = editAuthor->text();
-    MetaDataBase::setMetaInfo( TQT_TQOBJECT(formwindow), info );
+    MetaDataBase::setMetaInfo( formwindow, info );
 
-    formwindow->commandHistory()->setModified( TRUE );
+    formwindow->commandHistory()->setModified( true );
 
     if ( formwindow->savePixmapInline() ) {
-	MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) );
-	MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) );
+	MetaDataBase::clearPixmapArguments( formwindow );
+	MetaDataBase::clearPixmapKeys( formwindow );
     } else if ( formwindow->savePixmapInProject() ) {
-	MetaDataBase::clearPixmapArguments( TQT_TQOBJECT(formwindow) );
+	MetaDataBase::clearPixmapArguments( formwindow );
     } else {
-	MetaDataBase::clearPixmapKeys( TQT_TQOBJECT(formwindow) );
+	MetaDataBase::clearPixmapKeys( formwindow );
     }
 
     if ( radioPixmapInline->isChecked() ) {
-	formwindow->setSavePixmapInline( TRUE );
-	formwindow->setSavePixmapInProject( FALSE );
+	formwindow->setSavePixmapInline( true );
+	formwindow->setSavePixmapInProject( false );
     } else if ( radioProjectImageFile->isChecked() ){
-	formwindow->setSavePixmapInline( FALSE );
-	formwindow->setSavePixmapInProject( TRUE );
+	formwindow->setSavePixmapInline( false );
+	formwindow->setSavePixmapInProject( true );
     } else {
-	formwindow->setSavePixmapInline( FALSE );
-	formwindow->setSavePixmapInProject( FALSE );
+	formwindow->setSavePixmapInline( false );
+	formwindow->setSavePixmapInProject( false );
     }
     
     if ( checkLayoutFunctions->isChecked() )
-	formwindow->hasLayoutFunctions( TRUE );
+	formwindow->hasLayoutFunctions( true );
     else
-	formwindow->hasLayoutFunctions( FALSE );
+	formwindow->hasLayoutFunctions( false );
 
     formwindow->setPixmapLoaderFunction( editPixmapFunction->text() );
     formwindow->setLayoutDefaultSpacing( spinSpacing->value() );