1 files changed, 42 insertions, 42 deletions

diff --git a/kommander/editor/hierarchyview.cpp b/kommander/editor/hierarchyview.cpp
index df8beeb5..b6113d37 100644
--- a/kommander/editor/hierarchyview.cpp
+++ b/kommander/editor/hierarchyview.cpp
@@ -193,18 +193,18 @@ HierarchyList::HierarchyList( TQWidget *parent, FormWindow *fw, bool doConnects
     p.setColor( TQColorGroup::Base, TQColor( *backColor2 ) );
     (void)*selectedBack; // hack
     setPalette( p );
-    disconnect( header(), TQT_SIGNAL( sectionClicked( int ) ),
-    this, TQT_SLOT( changeSortColumn( int ) ) );
+    disconnect( header(), TQ_SIGNAL( sectionClicked( int ) ),
+    this, TQ_SLOT( changeSortColumn( int ) ) );
     setSorting( -1 );
     setHScrollBarMode( AlwaysOff );
     setVScrollBarMode( AlwaysOn );
     if ( doConnects ) {
-  connect( this, TQT_SIGNAL( clicked( TQListViewItem * ) ),
-     this, TQT_SLOT( objectClicked( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( returnPressed( TQListViewItem * ) ),
-     this, TQT_SLOT( objectClicked( TQListViewItem * ) ) );
-  connect( this, TQT_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ),
-     this, TQT_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) );
+  connect( this, TQ_SIGNAL( clicked( TQListViewItem * ) ),
+     this, TQ_SLOT( objectClicked( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( returnPressed( TQListViewItem * ) ),
+     this, TQ_SLOT( objectClicked( TQListViewItem * ) ) );
+  connect( this, TQ_SIGNAL( contextMenuRequested( TQListViewItem *, const TQPoint&, int ) ),
+     this, TQ_SLOT( showRMBMenu( TQListViewItem *, const TQPoint & ) ) );
     }
     deselect = true;
     setColumnWidthMode( 1, Manual );
@@ -250,21 +250,21 @@ void HierarchyList::objectClicked( TQListViewItem *i )
     if ( formWindow == w ) {
   if ( deselect )
       formWindow->clearSelection( false );
-  formWindow->emitShowProperties( TQT_TQOBJECT(formWindow) );
+  formWindow->emitShowProperties( formWindow );
   return;
     }
 
     if ( !formWindow->widgets()->find( w ) ) {
-  if ( w->parent() && w->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) &&
+  if ( w->parent() && w->parent()->inherits( "TQWidgetStack" ) &&
        w->parent()->parent() &&
-       ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ||
-         w->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) ) {
-      if ( w->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+       ( w->parent()->parent()->inherits( "TQTabWidget" ) ||
+         w->parent()->parent()->inherits( "TQWizard" ) ) ) {
+      if ( w->parent()->parent()->inherits( "TQTabWidget" ) )
     ( (TQTabWidget*)w->parent()->parent() )->showPage( w );
       else
         ( (QDesignerWizard*)w->parent()->parent() )->setCurrentPage( ( (QDesignerWizard*)w->parent()->parent() )->pageNum( w ) );
       w = (TQWidget*)w->parent()->parent();
-      formWindow->emitUpdateProperties( TQT_TQOBJECT(formWindow->currentWidget()) );
+      formWindow->emitUpdateProperties( formWindow->currentWidget() );
   } else {
       return;
   }
@@ -273,7 +273,7 @@ void HierarchyList::objectClicked( TQListViewItem *i )
     if ( deselect )
   formWindow->clearSelection( false );
     if ( w->isVisibleTo( formWindow ) )
-  formWindow->selectWidget( TQT_TQOBJECT(w), true );
+  formWindow->selectWidget( w, true );
 }
 
 TQWidget *HierarchyList::findWidget( TQListViewItem *i )
@@ -345,7 +345,7 @@ void HierarchyList::setup()
     }
 #endif
     if ( w )
-  insertObject( TQT_TQOBJECT(w), 0 );
+  insertObject( w, 0 );
 }
 
 void HierarchyList::setOpen( TQListViewItem *i, bool b )
@@ -356,8 +356,8 @@ void HierarchyList::setOpen( TQListViewItem *i, bool b )
 void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 {
     bool fakeMainWindow = false;
-    if ( o && o->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) ) {
-  TQObject *cw = TQT_TQOBJECT(( (TQMainWindow*)o )->centralWidget());
+    if ( o && o->inherits( "TQMainWindow" ) ) {
+  TQObject *cw = ( (TQMainWindow*)o )->centralWidget();
   if ( cw ) {
       o = cw;
       fakeMainWindow = true;
@@ -365,7 +365,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
     }
     TQListViewItem *item = 0;
     TQString className = WidgetFactory::classNameOf( o );
-    if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING ) ) {
+    if ( o->inherits( "TQLayoutWidget" ) ) {
   switch ( WidgetFactory::layoutType( (TQWidget*)o ) ) {
   case WidgetFactory::HBox:
       className = "HBox";
@@ -387,23 +387,23 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
 #endif
 
     TQString name = o->name();
-    if ( o->parent() && o->parent()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) &&
+    if ( o->parent() && o->parent()->inherits( "TQWidgetStack" ) &&
    o->parent()->parent() ) {
-  if ( o->parent()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+  if ( o->parent()->parent()->inherits( "TQTabWidget" ) )
       name = ( (TQTabWidget*)o->parent()->parent() )->tabLabel( (TQWidget*)o );
-  else if ( o->parent()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+  else if ( o->parent()->parent()->inherits( "TQWizard" ) )
       name = ( (TQWizard*)o->parent()->parent() )->title( (TQWidget*)o );
     }
 
     TQToolBox *tb;
     if ( o->parent() && o->parent()->parent() &&
-     (tb = ::tqqt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
+     (tb = ::tqt_cast<TQToolBox*>(o->parent()->parent()->parent())) )
     name = tb->itemLabel( tb->indexOf((TQWidget*)o) );
 
 
     if ( fakeMainWindow ) {
   name = o->parent()->name();
-  className = TQMAINWINDOW_OBJECT_NAME_STRING;
+  className = "TQMainWindow";
     }
 
     if ( !parent )
@@ -412,7 +412,7 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
   item = new HierarchyItem( HierarchyItem::Widget, parent, name, className, dbInfo );
     if ( !parent )
   item->setPixmap( 0, PixmapChooser::loadPixmap( "form.xpm", PixmapChooser::Mini ) );
-    else if ( o->inherits( TQLAYOUTWIDGET_OBJECT_NAME_STRING) )
+    else if ( o->inherits( "TQLayoutWidget") )
   item->setPixmap( 0, PixmapChooser::loadPixmap( "layout.xpm", PixmapChooser::Small ) );
     else
   item->setPixmap( 0, WidgetDatabase::iconSet( WidgetDatabase::idFromClassName( WidgetFactory::classNameOf( o ) ) ).
@@ -429,16 +429,16 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
       continue;
   if (  !formWindow->widgets()->find( (TQWidget*)it.current() ) ) {
       if ( it.current()->parent() &&
-     ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ||
-       it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) &&
-     it.current()->inherits( TQWIDGETSTACK_OBJECT_NAME_STRING ) ) {
+     ( it.current()->parent()->inherits( "TQTabWidget" ) ||
+       it.current()->parent()->inherits( "TQWizard" ) ) &&
+     it.current()->inherits( "TQWidgetStack" ) ) {
     TQObject *obj = it.current();
-    TQObjectList *l2 = obj->queryList( TQWIDGET_OBJECT_NAME_STRING, 0, true, false );
+    TQObjectList *l2 = obj->queryList( "TQWidget", 0, true, false );
     QDesignerTabWidget *tw = 0;
     QDesignerWizard *dw = 0;
-    if ( it.current()->parent()->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) )
+    if ( it.current()->parent()->inherits( "TQTabWidget" ) )
         tw = (QDesignerTabWidget*)it.current()->parent();
-    if ( it.current()->parent()->inherits( TQWIZARD_OBJECT_NAME_STRING ) )
+    if ( it.current()->parent()->inherits( "TQWizard" ) )
       dw = (QDesignerWizard*)it.current()->parent();
     TQWidgetStack *stack = (TQWidgetStack*)obj;
     for ( obj = l2->last(); obj; obj = l2->prev() ) {
@@ -449,12 +449,12 @@ void HierarchyList::insertObject( TQObject *o, TQListViewItem *parent )
         insertObject( obj, item );
     }
     delete l2;
-      } else if ( ::tqqt_cast<TQToolBox*>(it.current()->parent()) ) {
-            if ( !::tqqt_cast<TQScrollView*>(it.current()) )
+      } else if ( ::tqt_cast<TQToolBox*>(it.current()->parent()) ) {
+            if ( !::tqt_cast<TQScrollView*>(it.current()) )
             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;
   }
@@ -495,15 +495,15 @@ void HierarchyList::showRMBMenu( TQListViewItem *i, const TQPoint & p )
   return;
 
     if ( w->isVisibleTo( formWindow ) ) {
-  if ( !w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) && !w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+  if ( !w->inherits( "TQTabWidget" ) && !w->inherits( "TQWizard" ) ) {
       if ( !normalMenu )
     normalMenu = formWindow->mainWindow()->setupNormalHierarchyMenu( this );
       normalMenu->popup( p );
   } else {
       if ( !tabWidgetMenu )
     tabWidgetMenu =
-        formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQT_SLOT( addTabPage() ),
-                        TQT_SLOT( removeTabPage() ) );
+        formWindow->mainWindow()->setupTabWidgetHierarchyMenu( this, TQ_SLOT( addTabPage() ),
+                        TQ_SLOT( removeTabPage() ) );
       tabWidgetMenu->popup( p );
   }
     }
@@ -514,13 +514,13 @@ void HierarchyList::addTabPage()
     TQWidget *w = current();
     if ( !w )
   return;
-    if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+    if ( w->inherits( "TQTabWidget" ) ) {
   TQTabWidget *tw = (TQTabWidget*)w;
   AddTabPageCommand *cmd = new AddTabPageCommand( i18n("Add Page to %1" ).arg( tw->name() ), formWindow,
               tw, "Tab" );
   formWindow->commandHistory()->addCommand( cmd );
   cmd->execute();
-    } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+    } else if ( w->inherits( "TQWizard" ) ) {
   TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
   AddWizardPageCommand *cmd = new AddWizardPageCommand( i18n("Add Page to %1" ).arg( wiz->name() ), formWindow,
                     wiz, "Page" );
@@ -534,7 +534,7 @@ void HierarchyList::removeTabPage()
     TQWidget *w = current();
     if ( !w )
   return;
-    if ( w->inherits( TQTABWIDGET_OBJECT_NAME_STRING ) ) {
+    if ( w->inherits( "TQTabWidget" ) ) {
   TQTabWidget *tw = (TQTabWidget*)w;
   if ( tw->currentPage() ) {
       QDesignerTabWidget *dtw = (QDesignerTabWidget*)tw;
@@ -544,7 +544,7 @@ void HierarchyList::removeTabPage()
       formWindow->commandHistory()->addCommand( cmd );
       cmd->execute();
   }
-    } else if ( w->inherits( TQWIZARD_OBJECT_NAME_STRING ) ) {
+    } else if ( w->inherits( "TQWizard" ) ) {
   TQWizard *wiz = (TQWizard*)formWindow->mainContainer();
   if ( wiz->currentPage() ) {
       QDesignerWizard *dw = (QDesignerWizard*)wiz;
@@ -677,7 +677,7 @@ void HierarchyView::widgetsRemoved( const TQWidgetList & )
 void HierarchyView::namePropertyChanged( TQWidget *w, const TQVariant & )
 {
     TQWidget *w2 = w;
-    if ( w->inherits( TQMAINWINDOW_OBJECT_NAME_STRING ) )
+    if ( w->inherits( "TQMainWindow" ) )
   w2 = ( (TQMainWindow*)w )->centralWidget();
     listview->changeNameOf( w2, w->name() );
 }