Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

1 files changed, 51 insertions, 51 deletions

diff --git a/tdeui/tdeactionclasses.cpp b/tdeui/tdeactionclasses.cpp
index 3fff45564..ad9c4d102 100644
--- a/tdeui/tdeactionclasses.cpp
+++ b/tdeui/tdeactionclasses.cpp
@@ -507,7 +507,7 @@ void TDESelectAction::setupMenu() const
     for( uint id = 0; it != d->m_list.end(); ++it, ++id ) {
         TQString text = *it;
         if ( !text.isEmpty() )
-            d->m_menu->insertItem( d->makeMenuText( text ), this, TQT_SLOT( slotActivated( int ) ), 0, id );
+            d->m_menu->insertItem( d->makeMenuText( text ), this, TQ_SLOT( slotActivated( int ) ), 0, id );
         else
             d->m_menu->insertSeparator();
     }
@@ -661,7 +661,7 @@ int TDESelectAction::plug( TQWidget *widget, int index )
         menu->TQMenuData::setWhatsThis( id, wth );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -670,8 +670,8 @@ int TDESelectAction::plug( TQWidget *widget, int index )
     TDEToolBar* bar = static_cast<TDEToolBar*>( widget );
     int id_ = TDEAction::getToolButtonID();
     bar->insertCombo( comboItems(), id_, isEditable(),
-                      TQT_SIGNAL( activated( const TQString & ) ), this,
-                      TQT_SLOT( slotActivated( const TQString & ) ), isEnabled(),
+                      TQ_SIGNAL( activated( const TQString & ) ), this,
+                      TQ_SLOT( slotActivated( const TQString & ) ), isEnabled(),
                       toolTip(), -1, index );
 
     TQComboBox *cb = bar->getCombo( id_ );
@@ -691,7 +691,7 @@ int TDESelectAction::plug( TQWidget *widget, int index )
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     updateCurrentItem( containerCount() - 1 );
 
@@ -713,7 +713,7 @@ int TDESelectAction::plug( TQWidget *widget, int index )
         menu->TQMenuData::setWhatsThis( id, wth );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -771,7 +771,7 @@ void TDESelectAction::slotActivated( int id )
   setCurrentItem( id );
   // Delay this. Especially useful when the slot connected to activated() will re-create
   // the menu, e.g. in the recent files action. This prevents a crash.
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) );
 }
 
 void TDESelectAction::slotActivated( const TQString &text )
@@ -793,7 +793,7 @@ void TDESelectAction::slotActivated( const TQString &text )
       setCurrentItem( comboItems().findIndex( text ) );
   // Delay this. Especially useful when the slot connected to activated() will re-create
   // the menu, e.g. in the recent files action. This prevents a crash.
-  TQTimer::singleShot( 0, this, TQT_SLOT( slotActivated() ) );
+  TQTimer::singleShot( 0, this, TQ_SLOT( slotActivated() ) );
 }
 
 void TDESelectAction::slotActivated()
@@ -858,7 +858,7 @@ TDEListAction::TDEListAction( const TQString& text, const TDEShortcut& cut,
 {
   d = new TDEListActionPrivate;
   if ( receiver )
-    connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot );
 }
 
 TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix,
@@ -885,7 +885,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQIconSet& pix,
 {
   d = new TDEListActionPrivate;
   if ( receiver )
-    connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot );
 }
 
 TDEListAction::TDEListAction( const TQString& text, const TQString& pix,
@@ -896,7 +896,7 @@ TDEListAction::TDEListAction( const TQString& text, const TQString& pix,
 {
   d = new TDEListActionPrivate;
   if ( receiver )
-    connect( this, TQT_SIGNAL( activated( int ) ), receiver, slot );
+    connect( this, TQ_SIGNAL( activated( int ) ), receiver, slot );
 }
 
 TDEListAction::TDEListAction( TQObject* parent, const char* name )
@@ -970,7 +970,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
   init();
 
   if ( receiver )
-    connect( this,     TQT_SIGNAL(urlSelected(const KURL&)),
+    connect( this,     TQ_SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
@@ -1015,7 +1015,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
   init();
 
   if ( receiver )
-    connect( this,     TQT_SIGNAL(urlSelected(const KURL&)),
+    connect( this,     TQ_SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
@@ -1034,7 +1034,7 @@ TDERecentFilesAction::TDERecentFilesAction( const TQString& text,
   init();
 
   if ( receiver )
-    connect( this,     TQT_SIGNAL(urlSelected(const KURL&)),
+    connect( this,     TQ_SIGNAL(urlSelected(const KURL&)),
              receiver, slot );
 }
 
@@ -1052,10 +1052,10 @@ void TDERecentFilesAction::init()
 {
   TDERecentFilesAction *that = const_cast<TDERecentFilesAction*>(this);
   that->d->m_popup = new TDEPopupMenu;
-  connect(d->m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
-  connect(d->m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
-  connect( this, TQT_SIGNAL( activated( const TQString& ) ),
-           this, TQT_SLOT( itemSelected( const TQString& ) ) );
+  connect(d->m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow()));
+  connect(d->m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
+  connect( this, TQ_SIGNAL( activated( const TQString& ) ),
+           this, TQ_SLOT( itemSelected( const TQString& ) ) );
 
   setMenuAccelsEnabled( false );
 }
@@ -1284,13 +1284,13 @@ int TDERecentFilesAction::plug( TQWidget *widget, int index )
     else
         instance = TDEGlobal::instance();
 
-    bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                       TQT_SLOT( slotClicked() ), isEnabled(), plainText(),
+    bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                       TQ_SLOT( slotClicked() ), isEnabled(), plainText(),
                        index, instance );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     bar->setDelayedPopup( id_, d->m_popup, true);
 
@@ -1531,15 +1531,15 @@ int TDEFontAction::plug( TQWidget *w, int index )
     TDEToolBar* bar = static_cast<TDEToolBar*>( w );
     int id_ = TDEAction::getToolButtonID();
     TDEFontCombo *cb = new TDEFontCombo( items(), bar );
-    connect( cb, TQT_SIGNAL( activated( const TQString & ) ),
-             TQT_SLOT( slotActivated( const TQString & ) ) );
+    connect( cb, TQ_SIGNAL( activated( const TQString & ) ),
+             TQ_SLOT( slotActivated( const TQString & ) ) );
     cb->setEnabled( isEnabled() );
     bar->insertWidget( id_, comboWidth(), cb, index );
     cb->setMinimumWidth( cb->sizeHint().width() );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     updateCurrentItem( containerCount() - 1 );
 
@@ -1809,7 +1809,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
       menu->setItemEnabled( id, false );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if ( m_parentCollection )
       m_parentCollection->connectHighlight( menu, this );
@@ -1823,8 +1823,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
     int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() )
-      bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( clicked() ), this,
-                         TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( clicked() ), this,
+                         TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                          index );
     else
     {
@@ -1835,8 +1835,8 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
       else
         instance = TDEGlobal::instance();
 
-      bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                         TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+      bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                         TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                          index, instance );
     }
 
@@ -1845,7 +1845,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
     if (!whatsThis().isEmpty())
       TQWhatsThis::add( bar->getButton(id_), whatsThis() );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if (delayed()) {
         bar->setDelayedPopup( id_, popupMenu(), stickyMenu() );
@@ -1870,7 +1870,7 @@ int TDEActionMenu::plug( TQWidget* widget, int index )
         bar->setItemEnabled( id, false );
 
     addContainer( bar, id );
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -1950,8 +1950,8 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
     int id_ = TDEAction::getToolButtonID();
 
     if ( icon().isEmpty() && !iconSet().isNull() ) {
-        bar->insertButton( iconSet().pixmap(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
-                           TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
+        bar->insertButton( iconSet().pixmap(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
+                           TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
                            isEnabled(), plainText(),
                            index );
     } else {
@@ -1961,15 +1961,15 @@ int TDEToolBarPopupAction::plug( TQWidget *widget, int index )
         else
             instance = TDEGlobal::instance();
 
-        bar->insertButton( icon(), id_, TQT_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
-                           TQT_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
+        bar->insertButton( icon(), id_, TQ_SIGNAL( buttonClicked(int, TQt::ButtonState) ), this,
+                           TQ_SLOT( slotButtonClicked(int, TQt::ButtonState) ),
                            isEnabled(), plainText(),
                            index, instance );
     }
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     if (delayed()) {
         bar->setDelayedPopup( id_, popupMenu(), stickyMenu() );
@@ -2036,9 +2036,9 @@ int TDEToggleToolBarAction::plug( TQWidget* w, int index )
 
   if( m_toolBar ) {
     setChecked( m_toolBar->isVisible() );
-    connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SLOT(setChecked(bool)) );
+    connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SLOT(setChecked(bool)) );
     // Also emit toggled when the toolbar's visibility changes (see comment in header)
-    connect( m_toolBar, TQT_SIGNAL(visibilityChanged(bool)), this, TQT_SIGNAL(toggled(bool)) );
+    connect( m_toolBar, TQ_SIGNAL(visibilityChanged(bool)), this, TQ_SIGNAL(toggled(bool)) );
   } else {
     setEnabled( false );
   }
@@ -2122,7 +2122,7 @@ KWidgetAction::KWidgetAction( TQWidget* widget,
   , m_widget( widget )
   , m_autoSized( false )
 {
-  connect( this, TQT_SIGNAL(enabled(bool)), widget, TQT_SLOT(setEnabled(bool)) );
+  connect( this, TQ_SIGNAL(enabled(bool)), widget, TQ_SLOT(setEnabled(bool)) );
 }
 
 KWidgetAction::~KWidgetAction()
@@ -2173,8 +2173,8 @@ int KWidgetAction::plug( TQWidget* w, int index )
   TQWhatsThis::add( m_widget, whatsThis() );
   addContainer( toolBar, id );
 
-  connect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) );
-  connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+  connect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) );
+  connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
   return containerCount() - 1;
 }
@@ -2187,7 +2187,7 @@ void KWidgetAction::unplug( TQWidget *w )
   TDEToolBar* toolBar = (TDEToolBar*)m_widget->parent();
   if ( toolBar == w )
   {
-      disconnect( toolBar, TQT_SIGNAL( toolbarDestroyed() ), this, TQT_SLOT( slotToolbarDestroyed() ) );
+      disconnect( toolBar, TQ_SIGNAL( toolbarDestroyed() ), this, TQ_SLOT( slotToolbarDestroyed() ) );
       m_widget->reparent( 0L, TQPoint(), false /*showIt*/ );
   }
   TDEAction::unplug( w );
@@ -2224,7 +2224,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index )
     int id = menu->insertSeparator( index );
 
     addContainer( menu, id );
-    connect( menu, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menu, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -2236,7 +2236,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index )
 
     addContainer( menuBar, id );
 
-    connect( menuBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( menuBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -2248,7 +2248,7 @@ int TDEActionSeparator::plug( TQWidget *widget, int index )
 
     addContainer( toolBar, id );
 
-    connect( toolBar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( toolBar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     return containerCount() - 1;
   }
@@ -2265,8 +2265,8 @@ TDEPasteTextAction::TDEPasteTextAction( const TQString& text,
   : TDEAction( text, icon, cut, receiver, slot, parent, name )
 {
   m_popup = new TDEPopupMenu;
-  connect(m_popup, TQT_SIGNAL(aboutToShow()), this, TQT_SLOT(menuAboutToShow()));
-  connect(m_popup, TQT_SIGNAL(activated(int)), this, TQT_SLOT(menuItemActivated(int)));
+  connect(m_popup, TQ_SIGNAL(aboutToShow()), this, TQ_SLOT(menuAboutToShow()));
+  connect(m_popup, TQ_SIGNAL(activated(int)), this, TQ_SLOT(menuItemActivated(int)));
   m_popup->setCheckable(true);
   m_mixedMode = true;
 }
@@ -2297,13 +2297,13 @@ int TDEPasteTextAction::plug( TQWidget *widget, int index )
     else
         instance = TDEGlobal::instance();
 
-    bar->insertButton( icon(), id_, TQT_SIGNAL( clicked() ), this,
-                       TQT_SLOT( slotActivated() ), isEnabled(), plainText(),
+    bar->insertButton( icon(), id_, TQ_SIGNAL( clicked() ), this,
+                       TQ_SLOT( slotActivated() ), isEnabled(), plainText(),
                        index, instance );
 
     addContainer( bar, id_ );
 
-    connect( bar, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( slotDestroyed() ) );
+    connect( bar, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( slotDestroyed() ) );
 
     bar->setDelayedPopup( id_, m_popup, true );
 
@@ -2357,7 +2357,7 @@ void TDEPasteTextAction::menuItemActivated( int id)
       if (reply.isValid())
         kdDebug(129) << "Clipboard: " << TQString(tqApp->clipboard()->text(TQClipboard::Clipboard)) << endl;
     }
-    TQTimer::singleShot(20, this, TQT_SLOT(slotActivated()));
+    TQTimer::singleShot(20, this, TQ_SLOT(slotActivated()));
 }
 
 void TDEPasteTextAction::slotActivated()