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

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

1 files changed, 24 insertions, 24 deletions

diff --git a/kdevdesigner/designer/designerappiface.cpp b/kdevdesigner/designer/designerappiface.cpp
index 4a223cef..5befa1e4 100644
--- a/kdevdesigner/designer/designerappiface.cpp
+++ b/kdevdesigner/designer/designerappiface.cpp
@@ -146,7 +146,7 @@ bool DesignerInterfaceImpl::singleProjectMode() const
 void DesignerInterfaceImpl::showError( TQWidget *widget,
 				       int line, const TQString &message )
 {
-    mainWindow->showErrorMessage( TQT_TQOBJECT(widget), line, message );
+    mainWindow->showErrorMessage( widget, line, message );
 }
 
 void DesignerInterfaceImpl::runFinished()
@@ -156,12 +156,12 @@ void DesignerInterfaceImpl::runFinished()
 
 void DesignerInterfaceImpl::showStackFrame( TQWidget *w, int line )
 {
-    mainWindow->showStackFrame( TQT_TQOBJECT(w), line );
+    mainWindow->showStackFrame( w, line );
 }
 
 void DesignerInterfaceImpl::showDebugStep( TQWidget *w, int line )
 {
-    mainWindow->showDebugStep( TQT_TQOBJECT(w), line );
+    mainWindow->showDebugStep( w, line );
 }
 
 void DesignerInterfaceImpl::runProjectPrecondition()
@@ -335,7 +335,7 @@ void DesignerProjectImpl::breakPoints( TQMap<TQString, TQValueList<uint> > &bps
     for ( TQPtrListIterator<FormFile> forms = project->formFiles();
 	  forms.current(); ++forms ) {
 	if ( forms.current()->formWindow() )
-	    bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( TQT_TQOBJECT(forms.current()->formWindow()) ) );
+	    bps.insert( TQString( forms.current()->formWindow()->name() ) + " <Form>", MetaDataBase::breakPoints( forms.current()->formWindow() ) );
     }
 }
 
@@ -360,7 +360,7 @@ void DesignerProjectImpl::clearAllBreakpoints() const
     for ( TQPtrListIterator<FormFile> forms = project->formFiles();
 	  forms.current(); ++forms ) {
 	if ( forms.current()->formWindow() )
-	    MetaDataBase::setBreakPoints( TQT_TQOBJECT(forms.current()->formWindow()), empty );
+	    MetaDataBase::setBreakPoints( forms.current()->formWindow(), empty );
 	MainWindow::self->resetBreakPoints();
     }
 }
@@ -535,7 +535,7 @@ void DesignerPixmapCollectionImpl::addPixmap( const TQPixmap &p, const TQString
     pixCollection->addPixmap( pix, force );
     FormWindow *fw = MainWindow::self->formWindow();
     if ( fw )
-	MetaDataBase::setPixmapKey( TQT_TQOBJECT(fw), p.serialNumber(), name );
+	MetaDataBase::setPixmapKey( fw, p.serialNumber(), name );
 }
 
 TQPixmap DesignerPixmapCollectionImpl::pixmap( const TQString &name ) const
@@ -586,7 +586,7 @@ TQWidget *DesignerFormWindowImpl::create( const char *className, TQWidget *paren
 {
     TQWidget *w = WidgetFactory::create( WidgetDatabase::idFromClassName( className ), parent, name );
     formWindow->insertWidget( w, TRUE );
-    formWindow->killAccels( TQT_TQOBJECT(formWindow->mainContainer()) );
+    formWindow->killAccels( formWindow->mainContainer() );
     return w;
 }
 
@@ -674,7 +674,7 @@ void DesignerFormWindowImpl::breakLayout()
 
 void DesignerFormWindowImpl::selectWidget( TQWidget * w )
 {
-    formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
+    formWindow->selectWidget( w, TRUE );
 }
 
 void DesignerFormWindowImpl::selectAll()
@@ -755,14 +755,14 @@ void DesignerFormWindowImpl::preview() const
 
 void DesignerFormWindowImpl::addConnection( TQObject *sender, const char *signal, TQObject *receiver, const char *slot )
 {
-    MetaDataBase::addConnection( TQT_TQOBJECT(formWindow), sender, signal, receiver, slot );
+    MetaDataBase::addConnection( formWindow, sender, signal, receiver, slot );
 }
 
 void DesignerFormWindowImpl::addFunction( const TQCString &function, const TQString &specifier,
 					  const TQString &access, const TQString &type,
 					  const TQString &language, const TQString &returnType )
 {
-    MetaDataBase::addFunction( TQT_TQOBJECT(formWindow), function, specifier, access, type, language, returnType );
+    MetaDataBase::addFunction( formWindow, function, specifier, access, type, language, returnType );
     formWindow->mainWindow()->functionsChanged();
 }
 
@@ -804,7 +804,7 @@ void DesignerFormWindowImpl::setColumnFields( TQObject *o, const TQMap<TQString,
 
 TQStringList DesignerFormWindowImpl::implementationIncludes() const
 {
-    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
+    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow );
     TQStringList lst;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -825,7 +825,7 @@ TQStringList DesignerFormWindowImpl::implementationIncludes() const
 
 TQStringList DesignerFormWindowImpl::declarationIncludes() const
 {
-    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
+    TQValueList<MetaDataBase::Include> includes = MetaDataBase::includes( formWindow );
     TQStringList lst;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = includes.begin(); it != includes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -846,7 +846,7 @@ TQStringList DesignerFormWindowImpl::declarationIncludes() const
 
 void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst )
 {
-    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
+    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow );
     TQValueList<MetaDataBase::Include> includes;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -882,13 +882,13 @@ void DesignerFormWindowImpl::setImplementationIncludes( const TQStringList &lst
 	    includes << inc;
 	}
     }
-    MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes );
+    MetaDataBase::setIncludes( formWindow, includes );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst )
 {
-    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( TQT_TQOBJECT(formWindow) );
+    TQValueList<MetaDataBase::Include> oldIncludes = MetaDataBase::includes( formWindow );
     TQValueList<MetaDataBase::Include> includes;
     for ( TQValueList<MetaDataBase::Include>::Iterator it = oldIncludes.begin(); it != oldIncludes.end(); ++it ) {
 	MetaDataBase::Include inc = *it;
@@ -924,29 +924,29 @@ void DesignerFormWindowImpl::setDeclarationIncludes( const TQStringList &lst )
 	    includes << inc;
 	}
     }
-    MetaDataBase::setIncludes( TQT_TQOBJECT(formWindow), includes );
+    MetaDataBase::setIncludes( formWindow, includes );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 TQStringList DesignerFormWindowImpl::forwardDeclarations() const
 {
-    return MetaDataBase::forwards( TQT_TQOBJECT(formWindow) );
+    return MetaDataBase::forwards( formWindow );
 }
 
 void DesignerFormWindowImpl::setForwardDeclarations( const TQStringList &lst )
 {
-    MetaDataBase::setForwards( TQT_TQOBJECT(formWindow), lst );
+    MetaDataBase::setForwards( formWindow, lst );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
 TQStringList DesignerFormWindowImpl::signalList() const
 {
-    return MetaDataBase::signalList( TQT_TQOBJECT(formWindow) );
+    return MetaDataBase::signalList( formWindow );
 }
 
 void DesignerFormWindowImpl::setSignalList( const TQStringList &lst )
 {
-    MetaDataBase::setSignalList( TQT_TQOBJECT(formWindow), lst );
+    MetaDataBase::setSignalList( formWindow, lst );
     formWindow->mainWindow()->objectHierarchy()->formDefinitionView()->setup();
 }
 
@@ -963,16 +963,16 @@ void DesignerFormWindowImpl::addMenu( const TQString &text, const TQString &name
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     PopupMenuEditor *popup = new PopupMenuEditor( formWindow, mw );
     TQString n = name;
-    formWindow->unify(  TQT_TQOBJECT(popup), n, TRUE );
+    formWindow->unify(  popup, n, TRUE );
     popup->setName( n );
     MenuBarEditor *mb = (MenuBarEditor *)mw->child( 0, "MenuBarEditor" );
     if ( !mb ) {
 	mb = new MenuBarEditor( formWindow, mw );
 	mb->setName( "MenuBar" );
-	MetaDataBase::addEntry( TQT_TQOBJECT(mb) );
+	MetaDataBase::addEntry( mb );
     }
     mb->insertItem( text, popup );
-    MetaDataBase::addEntry( TQT_TQOBJECT(popup) );
+    MetaDataBase::addEntry( popup );
 }
 
 void DesignerFormWindowImpl::addMenuAction( const TQString &menu, TQAction *a )
@@ -1009,7 +1009,7 @@ void DesignerFormWindowImpl::addToolBar( const TQString &text, const TQString &n
     TQMainWindow *mw = (TQMainWindow*)formWindow->mainContainer();
     TQToolBar *tb = new QDesignerToolBar( mw );
     TQString n = name;
-    formWindow->unify(  TQT_TQOBJECT(tb), n, TRUE );
+    formWindow->unify(  tb, n, TRUE );
     tb->setName( n );
     mw->addToolBar( tb, text );
 }