Replaced various '#define' with actual strings - part 6

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>

1 files changed, 16 insertions, 16 deletions

diff --git a/kdevdesigner/designer/propertyeditor.cpp b/kdevdesigner/designer/propertyeditor.cpp
index 68fe21f1..8f7b1071 100644
--- a/kdevdesigner/designer/propertyeditor.cpp
+++ b/kdevdesigner/designer/propertyeditor.cpp
@@ -555,7 +555,7 @@ void PropertyItem::setFocus( TQWidget *w )
 {
     if ( !tqApp->focusWidget() ||
 	 listview->propertyEditor()->formWindow() &&
-	 ( !MainWindow::self->isAFormWindowChild( TQT_TQOBJECT(tqApp->focusWidget()) ) &&
+	 ( !MainWindow::self->isAFormWindowChild( tqApp->focusWidget() ) &&
 	   !tqApp->focusWidget()->inherits( "Editor" ) ) )
 	w->setFocus();
 }
@@ -598,7 +598,7 @@ TQLineEdit *PropertyTextItem::lined()
 
     if ( asciiOnly ) {
 	if ( PropertyItem::name() == "name" ) {
-	    lin->setValidator( new AsciiValidator( TQString(":"), TQT_TQOBJECT(lin), "ascii_validator" ) );
+	    lin->setValidator( new AsciiValidator( TQString(":"), lin, "ascii_validator" ) );
 	    if ( listview->propertyEditor()->formWindow()->isFake() )
 		lin->setEnabled( FALSE );
 	} else {
@@ -606,7 +606,7 @@ TQLineEdit *PropertyTextItem::lined()
 							   "\xa1\xa2\xa3\xa4\xa5\xa6\xa7\xa8\xa9"
 							   "\xaa\xab\xac\xad\xae\xaf\xb1\xb2\xb3"
 							   "\xb4\xb5\xb6\xb7\xb8\xb9\xba\xbb\xbc"
-							   "\xbd\xbe\xbf"), TQT_TQOBJECT(lin), "ascii_validator" ) );
+							   "\xbd\xbe\xbf"), lin, "ascii_validator" ) );
 	}
     } if ( !hasMultiLines ) {
 	lin->hide();
@@ -781,7 +781,7 @@ TQLineEdit *PropertyDoubleItem::lined()
     if ( lin )
 	return lin;
     lin = new TQLineEdit( listview->viewport() );
-    lin->setValidator( new TQDoubleValidator( TQT_TQOBJECT(lin), "double_validator" ) );
+    lin->setValidator( new TQDoubleValidator( lin, "double_validator" ) );
 
     connect( lin, TQT_SIGNAL( returnPressed() ),
 	     this, TQT_SLOT( setValue() ) );
@@ -2026,13 +2026,13 @@ void PropertyDatabaseItem::initChildren()
 	    else if ( lst.count() > 0 )
 		item->setValue( TQStringList( lst[ 0 ] ) );
 	    else if ( withField )
-		item->setValue( TQStringList( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()),
+		item->setValue( TQStringList( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(),
 									 "database" ).toStringList()[ 0 ] ) );
 
 	    if ( lst.count() > 0 && !lst[ 0 ].isEmpty() )
 		item->setCurrentItem( lst[ 0 ] );
 	    else if ( !isChanged() && withField )
-		item->setCurrentItem( MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()),
+		item->setCurrentItem( MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(),
 								  "database" ).toStringList()[ 0 ] );
 	    else
 		item->setCurrentItem( 0 );
@@ -2044,7 +2044,7 @@ void PropertyDatabaseItem::initChildren()
 	    else if ( lst.count() > 1 )
 		item->setValue( TQStringList( lst[ 1 ] ) );
 	    else if ( withField ) {
-		TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList();
+		TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList();
 		if ( fakeLst.count() > 1 )
 		    item->setValue( fakeLst[ 1 ] );
 	    }
@@ -2052,7 +2052,7 @@ void PropertyDatabaseItem::initChildren()
 	    if ( lst.count() > 1 && !lst[ 1 ].isEmpty() )
 		item->setCurrentItem( lst[ 1 ] );
 	    else if ( !isChanged() && withField ) {
-		TQStringList fakeLst = MetaDataBase::fakeProperty( TQT_TQOBJECT(listview->propertyEditor()->formWindow()->mainContainer()), "database" ).toStringList();
+		TQStringList fakeLst = MetaDataBase::fakeProperty( listview->propertyEditor()->formWindow()->mainContainer(), "database" ).toStringList();
 		if ( fakeLst.count() > 1 )
 		    item->setCurrentItem( fakeLst[ 1 ] );
 	        else
@@ -3043,7 +3043,7 @@ void PropertyList::setupProperties()
     TQStringList valueSet;
     bool parentHasLayout =
 	w->isWidgetType() &&
-	!editor->formWindow()->isMainContainer( TQT_TQOBJECT(w) ) && ( (TQWidget*)w )->parentWidget() &&
+	!editor->formWindow()->isMainContainer( w ) && ( (TQWidget*)w )->parentWidget() &&
 	WidgetFactory::layoutType( ( (TQWidget*)w )->parentWidget() ) != WidgetFactory::NoLayout;
     for ( TQPtrListIterator<char> it( lst ); it.current(); ++it ) {
 	const TQMetaProperty* p =
@@ -3074,7 +3074,7 @@ void PropertyList::setupProperties()
 	}
 	unique.insert( TQString::fromLatin1( it.current() ), TRUE );
 	if ( editor->widget()->isWidgetType() &&
-	     editor->formWindow()->isMainContainer( TQT_TQOBJECT(editor->widget()) ) ) {
+	     editor->formWindow()->isMainContainer( editor->widget() ) ) {
 	    if ( qstrcmp( p->name(), "geometry" ) == 0 )
 		continue;
 	} else { // hide some toplevel-only stuff
@@ -3712,11 +3712,11 @@ void PropertyList::setPropertyValue( PropertyItem *i )
 	    else
 		i->setValue( TQVariant( false ) );
 	} else if ( i->name() == "layoutSpacing" ) {
-	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
+	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::spacing( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) )  ));
 	} else if ( i->name() == "layoutMargin" ) {
-	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) ) ));
+	    ( (PropertyLayoutItem*)i )->setValue( MetaDataBase::margin( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) )  ));
 	} else if ( i->name() == "resizeMode" ) {
-	    ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( TQT_TQOBJECT(WidgetFactory::containerOfWidget( TQT_TQWIDGET(editor->widget()) ) )) );
+	    ( (PropertyListItem*)i )->setCurrentItem( MetaDataBase::resizeMode( WidgetFactory::containerOfWidget( static_cast<TQWidget*>(editor->widget()) ) ) );
 	} else if ( i->name() == "toolTip" || i->name() == "whatsThis" || i->name() == "database" || i->name() == "frameworkCode" ) {
 	    i->setValue( MetaDataBase::fakeProperty( editor->widget(), i->name() ) );
 	} else if ( editor->widget()->inherits( "CustomWidget" ) ) {
@@ -3966,7 +3966,7 @@ void EventList::setup()
 						      it.current(), TQString(), TQString() );
 	eventItem->setOpen( TRUE );
 	TQValueList<MetaDataBase::Connection> conns =
-	    MetaDataBase::connections( TQT_TQOBJECT(formWindow), TQT_TQOBJECT(editor->widget()), TQT_TQOBJECT(formWindow->mainContainer()) );
+	    MetaDataBase::connections( formWindow, editor->widget(), formWindow->mainContainer() );
 	HierarchyItem *item = 0;
 	for ( TQValueList<MetaDataBase::Connection>::Iterator cit = conns.begin();
 	      cit != conns.end(); ++cit ) {
@@ -4042,7 +4042,7 @@ void EventList::showRMBMenu( TQListViewItem *i, const TQPoint &pos )
     } else if ( res == DEL_ITEM && i->parent() ) {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
-	conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
+	conn.receiver = formWindow->mainContainer();
 	conn.signal = i->parent()->text( 0 );
 	conn.slot = i->text( 0 );
 	delete i;
@@ -4076,7 +4076,7 @@ void EventList::renamed( TQListViewItem *i )
     } else {
 	MetaDataBase::Connection conn;
 	conn.sender = editor->widget();
-	conn.receiver = TQT_TQOBJECT(formWindow->mainContainer());
+	conn.receiver = formWindow->mainContainer();
 	conn.signal = i->parent()->text( 0 );
 	conn.slot = i->text( 0 );
 	AddConnectionCommand *cmd = new AddConnectionCommand( i18n( "Add Connection" ),