Replace various strings '#define'd in tqtinterface

Signed-off-by: Michele Calgaro <[email protected]>

1 files changed, 19 insertions, 19 deletions

diff --git a/tdeui/tdetoolbar.cpp b/tdeui/tdetoolbar.cpp
index 9cfd2948f..039c483d8 100644
--- a/tdeui/tdetoolbar.cpp
+++ b/tdeui/tdetoolbar.cpp
@@ -195,7 +195,7 @@ TQSizePolicy TDEToolBarSeparator::sizePolicy() const
 
 TDEToolBar::TDEToolBar( TQWidget *parent, const char *name, bool honorStyle, bool readConfig )
     : TQToolBar( TQString::fromLatin1( name ),
-      tqt_dynamic_cast<TQMainWindow*>(parent),
+      dynamic_cast<TQMainWindow*>(parent),
       parent, false,
       name ? name : "mainToolBar")
 {
@@ -432,7 +432,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id )
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(*it);
+    KAnimWidget *aw = dynamic_cast<KAnimWidget *>(*it);
     if ( aw )
         return aw;
     TQObjectList *l = queryList( "KAnimWidget" );
@@ -442,7 +442,7 @@ KAnimWidget *TDEToolBar::animatedWidget( int id )
     }
 
     for ( TQObject *o = l->first(); o; o = l->next() ) {
-        KAnimWidget *aw = tqt_dynamic_cast<KAnimWidget *>(o);
+        KAnimWidget *aw = dynamic_cast<KAnimWidget *>(o);
         if ( aw )
         {
             delete l;
@@ -615,7 +615,7 @@ KComboBox * TDEToolBar::getCombo(int id)
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<KComboBox *>( *it );
+    return dynamic_cast<KComboBox *>( *it );
 }
 
 
@@ -624,7 +624,7 @@ KLineEdit * TDEToolBar::getLined (int id)
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<KLineEdit *>( *it );
+    return dynamic_cast<KLineEdit *>( *it );
 }
 
 
@@ -633,7 +633,7 @@ TDEToolBarButton * TDEToolBar::getButton (int id)
     Id2WidgetMap::Iterator it = id2widget.find( id );
     if ( it == id2widget.end() )
         return 0;
-    return tqt_dynamic_cast<TDEToolBarButton *>( *it );
+    return dynamic_cast<TDEToolBarButton *>( *it );
 }
 
 
@@ -947,7 +947,7 @@ void TDEToolBar::setFlat (bool flag)
     else
         mainWindow()->moveDockWindow( this, DockTop );
     // And remember to save the new look later
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
@@ -1093,7 +1093,7 @@ void TDEToolBar::saveSettings(TDEConfig *config, const TQString &_configGroup)
     // reappear at the same position the next time.
     // The whole set of indexes has to be saved.
     //kdDebug(220) << name() << "                writing index " << index << endl;
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     // don't save if there's only one toolbar
 
     // Don't use kmw->toolBarIterator() because you might
@@ -1204,7 +1204,7 @@ void TDEToolBar::mousePressEvent ( TQMouseEvent *m )
                 else
                     return; // assume this was an action handled elsewhere, no need for setSettingsDirty()
             }
-            TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mw);
+            TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mw);
             if ( kmw )
                 kmw->setSettingsDirty();
         }
@@ -1238,17 +1238,17 @@ void TDEToolBar::rebuildLayout()
     for ( TQWidget *w = widgets.first(); w; w = widgets.next() ) {
         if ( w == rightAligned )
             continue;
-        TDEToolBarSeparator *ktbs = tqt_dynamic_cast<TDEToolBarSeparator *>(w);
+        TDEToolBarSeparator *ktbs = dynamic_cast<TDEToolBarSeparator *>(w);
         if ( ktbs && !ktbs->showLine() ) {
             l->addSpacing( orientation() == TQt::Vertical ? w->sizeHint().height() : w->sizeHint().width() );
             w->hide();
             continue;
         }
-        if ( tqt_dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu?
+        if ( dynamic_cast<TQPopupMenu *>(w) ) // w is a QPopupMenu?
             continue;
         l->addWidget( w );
         w->show();
-        if ((orientation() == TQt::Horizontal) && tqt_dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
+        if ((orientation() == TQt::Horizontal) && dynamic_cast<TQLineEdit *>(w)) // w is TQLineEdit ?
             l->addSpacing(2); // A little bit extra spacing behind it.
     }
     if ( rightAligned ) {
@@ -1270,14 +1270,14 @@ void TDEToolBar::rebuildLayout()
 void TDEToolBar::childEvent( TQChildEvent *e )
 {
     if ( e->child()->isWidgetType() ) {
-        TQWidget * w = tqt_dynamic_cast<TQWidget *>(e->child());
+        TQWidget * w = dynamic_cast<TQWidget *>(e->child());
         if (!w || !(::qstrcmp( "qt_dockwidget_internal", w->name())))
         {
            TQToolBar::childEvent( e );
            return;
         }
         if ( e->type() == TQEvent::ChildInserted ) {
-            if ( !tqt_dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
+            if ( !dynamic_cast<TQPopupMenu *>(w)) { // e->child() is not a QPopupMenu
                 // prevent items that have been explicitly inserted by insert*() from
                 // being inserted again
                 if ( !widget2id.contains( w ) )
@@ -1367,7 +1367,7 @@ TQSize TDEToolBar::sizeHint() const
 
           minSize = minSize.expandedTo(TQSize(0, sh.height()));
           minSize += TQSize(sh.width()+1, 0);
-          if (tqt_dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ?
+          if (dynamic_cast<TQLineEdit *>(w)) // w is a TQLineEdit ?
              minSize += TQSize(2, 0); // A little bit extra spacing behind it.
        }
 
@@ -1478,7 +1478,7 @@ void TDEToolBar::slotAppearanceChanged()
     applyAppearanceSettings(TDEGlobal::config(), TQString::null, true /* lose local settings */ );
 
     // And remember to save the new look later
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
@@ -1750,7 +1750,7 @@ void TDEToolBar::toolBarPosChanged( TQToolBar *tb )
     if ( d->oldPos == DockMinimized )
         rebuildLayout();
     d->oldPos = (TQMainWindow::ToolBarDock)barPos();
-    TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+    TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
     if ( kmw )
         kmw->setSettingsDirty();
 }
@@ -2139,7 +2139,7 @@ void TDEToolBar::slotContextAboutToShow()
   // and ToolBarHandler::setupActions() deletes it, so better not keep it around.
   // So we currently plug/unplug the last two actions of the menu.
   // Another way would be to keep around the actions and plug them all into a (new each time) popupmenu.
-  TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+  TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
   if ( kmw ) {
       kmw->setupToolbarMenuActions();
       // Only allow hiding a toolbar if the action is also plugged somewhere else (e.g. menubar)
@@ -2219,7 +2219,7 @@ void TDEToolBar::slotContextAboutToHide()
 {
   // We have to unplug whatever slotContextAboutToShow plugged into the menu.
   // Unplug the toolbar menu action
-  TDEMainWindow *kmw = tqt_dynamic_cast<TDEMainWindow *>(mainWindow());
+  TDEMainWindow *kmw = dynamic_cast<TDEMainWindow *>(mainWindow());
   if ( kmw && kmw->toolBarMenuAction() )
     if ( kmw->toolBarMenuAction()->containerCount() > 1 )
       kmw->toolBarMenuAction()->unplug(context);