summaryrefslogtreecommitdiffstats
path: root/kdevdesigner/designer/hierarchyview.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kdevdesigner/designer/hierarchyview.cpp')
-rw-r--r--kdevdesigner/designer/hierarchyview.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/kdevdesigner/designer/hierarchyview.cpp b/kdevdesigner/designer/hierarchyview.cpp
index 11531834..f5193421 100644
--- a/kdevdesigner/designer/hierarchyview.cpp
+++ b/kdevdesigner/designer/hierarchyview.cpp
@@ -252,7 +252,7 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i )
if ( formWindow == o ) {
if ( deselect )
formWindow->clearSelection( FALSE );
- formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) );
+ formWindow->emitShowProperties( formWindow );
return 0;
}
if ( o->isWidgetType() ) {
@@ -261,20 +261,20 @@ TQObject *HierarchyList::handleObjectClick( TQListViewItem *i )
if ( ::tqt_cast<TQWidgetStack*>(w->parent()) ) {
if (::tqt_cast<TQTabWidget*>(w->parent()->parent()) ) {
((TQTabWidget*)w->parent()->parent())->showPage( w );
- o = TQT_TQOBJECT((TQWidget*)w->parent()->parent());
- formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
+ o = (TQWidget*)w->parent()->parent();
+ formWindow->emitUpdateProperties( formWindow->currentWidget() );
} else if ( ::tqt_cast<TQWizard*>(w->parent()->parent()) ) {
((QDesignerWizard*)w->parent()->parent())->
setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) );
- o = TQT_TQOBJECT((TQWidget*)w->parent()->parent());
- formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
+ o = (TQWidget*)w->parent()->parent();
+ formWindow->emitUpdateProperties( formWindow->currentWidget() );
} else {
( (TQWidgetStack*)w->parent() )->raiseWidget( w );
if ( (TQWidgetStack*)w->parent()->isA( "QDesignerWidgetStack" ) )
( (QDesignerWidgetStack*)w->parent() )->updateButtons();
}
} else if ( ::tqt_cast<TQMenuBar*>(w) || ::tqt_cast<TQDockWindow*>(w) ) {
- formWindow->setActiveObject( TQT_TQOBJECT(w) );
+ formWindow->setActiveObject( w );
} else if ( ::tqt_cast<TQPopupMenu*>(w) ) {
return 0; // ### we could try to find our menu bar and change the currentMenu to our index
} else {
@@ -303,7 +303,7 @@ void HierarchyList::objectDoubleClicked( TQListViewItem *i )
if ( !w->parentWidget() ||
WidgetFactory::layoutType( w->parentWidget() ) == WidgetFactory::NoLayout )
w->raise();
- formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
+ formWindow->selectWidget( w, TRUE );
}
}
@@ -314,7 +314,7 @@ void HierarchyList::objectClicked( TQListViewItem *i )
return;
if ( o->isWidgetType() && ( (TQWidget*)o )->isVisibleTo( formWindow ) ) {
TQWidget *w = (TQWidget*)o;
- formWindow->selectWidget( TQT_TQOBJECT(w), TRUE );
+ formWindow->selectWidget( w, TRUE );
}
}
@@ -388,7 +388,7 @@ void HierarchyList::setup()
if ( !widgetStacks )
widgetStacks = new TQPtrList<TQWidgetStack>;
if ( w )
- insertObject( TQT_TQOBJECT(w), 0 );
+ insertObject( w, 0 );
widgetStacks->clear();
}
@@ -403,7 +403,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
return;
bool fakeMainWindow = FALSE;
if ( ::tqt_cast<TQMainWindow*>(o) ) {
- TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+ TQObject *cw = ( (TQMainWindow*)o )->centralWidget();
if ( cw ) {
o = cw;
fakeMainWindow = TRUE;
@@ -510,7 +510,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
continue;
TQToolBox *tb = (TQToolBox*)it.current()->parent();
for ( int i = tb->count() - 1; i >= 0; --i )
- insertObject( TQT_TQOBJECT(tb->item( i )), item );
+ insertObject( tb->item( i ), item );
}
continue;
}
@@ -544,7 +544,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
if ( da->supportsMenu() )
insertObject( da, item );
else
- insertObject( TQT_TQOBJECT(da->widget()), item );
+ insertObject( da->widget(), item );
} else if ( ::tqt_cast<QDesignerActionGroup*>(a) ) {
insertObject( a, item );
}
@@ -558,7 +558,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
if ( da->supportsMenu() )
insertObject( da, item );
else
- insertObject( TQT_TQOBJECT(da->widget()), item );
+ insertObject( da->widget(), item );
} else if ( ::tqt_cast<QDesignerActionGroup*>(obj) ) {
insertObject( obj, item );
}
@@ -569,7 +569,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
MenuBarEditorItem *md = mb->item( i );
if ( !md || !md->menu() )
continue;
- insertObject( TQT_TQOBJECT(md->menu()), item );
+ insertObject( md->menu(), item );
}
}
}
@@ -762,7 +762,7 @@ void FormDefinitionView::setupVariables()
itemVarPubl = new HierarchyItem( HierarchyItem::VarPublic, itemVar, 0, i18n( "public" ),
TQString(), TQString() );
- TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( TQT_TQOBJECT(formWindow) );
+ TQValueList<MetaDataBase::Variable> varList = MetaDataBase::variables( formWindow );
TQValueList<MetaDataBase::Variable>::Iterator it = --( varList.end() );
if ( !varList.isEmpty() && itemVar ) {
for (;;) {
@@ -852,7 +852,7 @@ void FormDefinitionView::refresh()
itemPublic = new HierarchyItem( HierarchyItem::SlotPublic, itemSlots, 0, i18n( "public" ),
TQString(), TQString() );
- TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( TQT_TQOBJECT(formWindow) );
+ TQValueList<MetaDataBase::Function> functionList = MetaDataBase::functionList( formWindow );
TQValueList<MetaDataBase::Function>::Iterator it = --( functionList.end() );
if ( !functionList.isEmpty() && itemFunct ) {
for (;;) {
@@ -1197,7 +1197,7 @@ void FormDefinitionView::save( TQListViewItem *p, TQListViewItem *i )
varName = varName.simplifyWhiteSpace();
if ( varName[(int)varName.length() - 1] != ';' )
varName += ";";
- if ( MetaDataBase::hasVariable( TQT_TQOBJECT(formWindow), varName ) ) {
+ if ( MetaDataBase::hasVariable( formWindow, varName ) ) {
TQMessageBox::information( this, i18n( "Edit Variables" ),
i18n( "This variable has already been declared." ) );
} else {
@@ -1268,7 +1268,7 @@ HierarchyView::HierarchyView( TQWidget *parent )
ClassBrowser cb( ciface->createClassBrowser( this ), ciface );
addTab( cb.lv, i18n( "Class Declarations" ) );
setTabToolTip( cb.lv, i18n( "List of all classes and its declarations of the current source file" ) );
- ciface->onClick( TQT_TQOBJECT(this), TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) );
+ ciface->onClick( this, TQT_SLOT( jumpTo( const TQString &, const TQString &, int ) ) );
classBrowsers->insert( *it, cb );
setTabEnabled( cb.lv, FALSE );
}
@@ -1307,7 +1307,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o )
if ( fw == formwindow ) {
if ( fw ) {
if ( !fake )
- listview->setCurrent( TQT_TQOBJECT(o) );
+ listview->setCurrent( o );
else
listview->clear();
if ( MainWindow::self->qWorkspace()->activeWindow() == fw )
@@ -1330,7 +1330,7 @@ void HierarchyView::setFormWindow( FormWindow *fw, TQObject *o )
fView->setFormWindow( fw );
if ( !fake ) {
listview->setup();
- listview->setCurrent( TQT_TQOBJECT(o) );
+ listview->setCurrent( o );
}
fView->setup();
@@ -1367,8 +1367,8 @@ void HierarchyView::showClassesTimeout()
if ( !se->object() )
return;
if ( se->formWindow() && se->formWindow()->project()->isCpp() ) {
- setFormWindow( se->formWindow(), TQT_TQOBJECT(se->formWindow()->currentWidget()) );
- MainWindow::self->propertyeditor()->setWidget( TQT_TQOBJECT(se->formWindow()->currentWidget()),
+ setFormWindow( se->formWindow(), se->formWindow()->currentWidget() );
+ MainWindow::self->propertyeditor()->setWidget( se->formWindow()->currentWidget(),
se->formWindow() );
return;
}
@@ -1447,7 +1447,7 @@ void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
TQWidget *w2 = w;
if ( ::tqt_cast<TQMainWindow*>(w) )
w2 = ( (TQMainWindow*)w )->centralWidget();
- listview->changeNameOf( TQT_TQOBJECT(w2), w->name() );
+ listview->changeNameOf( w2, w->name() );
}
@@ -1455,7 +1455,7 @@ void HierarchyView::databasePropertyChanged( TQWidget *w, const TQStringList& in
{
#ifndef TQT_NO_SQL
TQString i = info.join( "." );
- listview->changeDatabaseOf( TQT_TQOBJECT(w), i );
+ listview->changeDatabaseOf( w, i );
#endif
}