Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 67 insertions, 67 deletions

diff --git a/kontact/src/iconsidepane.cpp b/kontact/src/iconsidepane.cpp
index 811d42f78..f9a261a92 100644
--- a/kontact/src/iconsidepane.cpp
+++ b/kontact/src/iconsidepane.cpp
@@ -267,16 +267,16 @@ Navigator::Navigator( IconSidePane *parent, const char *name )
 
   setFocusPolicy( TQWidget::NoFocus );
 
-  connect( this, TQT_SIGNAL( selectionChanged( TQListBoxItem* ) ),
-           TQT_SLOT( slotExecuted( TQListBoxItem* ) ) );
-  connect( this, TQT_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ),
-           TQT_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) );
-  connect( this, TQT_SIGNAL( onItem( TQListBoxItem * ) ),
-            TQT_SLOT(  slotMouseOn( TQListBoxItem * ) ) );
-  connect( this, TQT_SIGNAL( onViewport() ), TQT_SLOT(  slotMouseOff() ) );
+  connect( this, TQ_SIGNAL( selectionChanged( TQListBoxItem* ) ),
+           TQ_SLOT( slotExecuted( TQListBoxItem* ) ) );
+  connect( this, TQ_SIGNAL( rightButtonPressed( TQListBoxItem*, const TQPoint& ) ),
+           TQ_SLOT( slotShowRMBMenu( TQListBoxItem*, const TQPoint& ) ) );
+  connect( this, TQ_SIGNAL( onItem( TQListBoxItem * ) ),
+            TQ_SLOT(  slotMouseOn( TQListBoxItem * ) ) );
+  connect( this, TQ_SIGNAL( onViewport() ), TQ_SLOT(  slotMouseOff() ) );
 
   mMapper = new TQSignalMapper( this );
-  connect( mMapper, TQT_SIGNAL( mapped( int ) ), TQT_SLOT( shortCutSelected( int ) ) );
+  connect( mMapper, TQ_SIGNAL( mapped( int ) ), TQ_SLOT( shortCutSelected( int ) ) );
 
   TQToolTip::remove( this );
   if ( !mShowText )
@@ -295,7 +295,7 @@ void Navigator::highlightItem( EntryItem * item )
 
   setPaintActiveItem( mHighlightItem, true );
 
-  TQTimer::singleShot( 2000, this, TQT_SLOT( slotStopHighlight() ) );
+  TQTimer::singleShot( 2000, this, TQ_SLOT( slotStopHighlight() ) );
 }
 
 void Navigator::slotStopHighlight()
@@ -539,8 +539,8 @@ IconSidePane::IconSidePane( Core *core, TQWidget *parent, const char *name )
   : SidePaneBase( core, parent, name )
 {
   mNavigator = new Navigator( this );
-  connect( mNavigator, TQT_SIGNAL( pluginActivated( Kontact::Plugin* ) ),
-           TQT_SIGNAL( pluginSelected( Kontact::Plugin* ) ) );
+  connect( mNavigator, TQ_SIGNAL( pluginActivated( Kontact::Plugin* ) ),
+           TQ_SIGNAL( pluginSelected( Kontact::Plugin* ) ) );
 
   setAcceptDrops( true );
 }
diff --git a/kontact/src/kcmkontact.cpp b/kontact/src/kcmkontact.cpp
index 4e6e44077..b1d0b0399 100644
--- a/kontact/src/kcmkontact.cpp
+++ b/kontact/src/kcmkontact.cpp
@@ -81,8 +81,8 @@ KcmKontact::KcmKontact( TQWidget *parent, const char *name )
   pluginStartupLayout->addWidget( selection->comboBox() );
   selection->comboBox()->setEnabled( false );
 
-  connect( forceStartupPlugin->checkBox(), TQT_SIGNAL( toggled( bool ) ),
-           selection->comboBox(), TQT_SLOT( setEnabled( bool ) ) );
+  connect( forceStartupPlugin->checkBox(), TQ_SIGNAL( toggled( bool ) ),
+           selection->comboBox(), TQ_SLOT( setEnabled( bool ) ) );
   load();
 }
 
@@ -104,7 +104,7 @@ PluginSelection::PluginSelection( TDEConfigSkeleton::ItemString *item, TQWidget
 {
   mItem = item;
   mPluginCombo = new TQComboBox( parent );
-  connect( mPluginCombo, TQT_SIGNAL( activated( int ) ), TQT_SIGNAL( changed() ) );
+  connect( mPluginCombo, TQ_SIGNAL( activated( int ) ), TQ_SIGNAL( changed() ) );
 }
 
 PluginSelection::~PluginSelection()
diff --git a/kontact/src/mainwindow.cpp b/kontact/src/mainwindow.cpp
index 9e79545ce..a354fa417 100644
--- a/kontact/src/mainwindow.cpp
+++ b/kontact/src/mainwindow.cpp
@@ -120,8 +120,8 @@ void MainWindow::initGUI()
   setupActions();
   setHelpMenuEnabled( false );
   KHelpMenu *helpMenu = new KHelpMenu( this, 0, true, actionCollection() );
-  connect( helpMenu, TQT_SIGNAL( showAboutApplication() ),
-           TQT_SLOT( showAboutDialog() ) );
+  connect( helpMenu, TQ_SIGNAL( showAboutApplication() ),
+           TQ_SLOT( showAboutDialog() ) );
 
   TDETrader::OfferList offers = TDETrader::self()->query(
       TQString::fromLatin1( "Kontact/Plugin" ),
@@ -133,7 +133,7 @@ void MainWindow::initGUI()
     (*it)->load();
 
     TDEAction *action = new TDEAction( (*it)->name(), (*it)->icon(), TDEShortcut(),
-                                   this, TQT_SLOT(slotActionTriggered()),
+                                   this, TQ_SLOT(slotActionTriggered()),
                                    actionCollection(), (*it)->pluginName().latin1() );
     action->setName( (*it)->pluginName().latin1() );
     action->setWhatsThis( i18n( "Switch to plugin %1" ).arg( (*it)->name() ) );
@@ -144,8 +144,8 @@ void MainWindow::initGUI()
     }
   }
 
-  KStdAction::keyBindings( this, TQT_SLOT( configureShortcuts() ), actionCollection() );
-  KStdAction::configureToolbars( this, TQT_SLOT( configureToolbars() ), actionCollection() );
+  KStdAction::keyBindings( this, TQ_SLOT( configureShortcuts() ), actionCollection() );
+  KStdAction::configureToolbars( this, TQ_SLOT( configureToolbars() ), actionCollection() );
   setXMLFile( "kontactui.rc" );
 
   setStandardToolBarMenuEnabled( true );
@@ -157,10 +157,10 @@ void MainWindow::initGUI()
   resize( 700, 520 ); // initial size to prevent a scrollbar in sidepane
   setAutoSaveSettings();
 
-  connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ),
-           this, TQT_SLOT( slotLoadProfile( const TQString& ) ) );
-  connect( Kontact::ProfileManager::self(), TQT_SIGNAL( saveToProfileRequested( const TQString& ) ),
-           this, TQT_SLOT( slotSaveToProfile( const TQString& ) ) );
+  connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ),
+           this, TQ_SLOT( slotLoadProfile( const TQString& ) ) );
+  connect( Kontact::ProfileManager::self(), TQ_SIGNAL( saveToProfileRequested( const TQString& ) ),
+           this, TQ_SLOT( slotSaveToProfile( const TQString& ) ) );
 }
 
 
@@ -168,15 +168,15 @@ void MainWindow::initObject()
 {
   // prepare the part manager
   mPartManager = new KParts::PartManager( this );
-  connect( mPartManager, TQT_SIGNAL( activePartChanged( KParts::Part* ) ),
-           this, TQT_SLOT( slotActivePartChanged( KParts::Part* ) ) );
+  connect( mPartManager, TQ_SIGNAL( activePartChanged( KParts::Part* ) ),
+           this, TQ_SLOT( slotActivePartChanged( KParts::Part* ) ) );
 
   if ( mSidePane ) {
     mSidePane->updatePlugins();
   }
 
   KSettings::Dispatcher::self()->registerInstance( instance(), this,
-                                                   TQT_SLOT( updateConfig() ) );
+                                                   TQ_SLOT( updateConfig() ) );
 
   loadSettings();
 
@@ -187,8 +187,8 @@ void MainWindow::initObject()
   // done initializing
   slotShowStatusMsg( TQString() );
 
-  connect( KPIM::BroadcastStatus::instance(), TQT_SIGNAL( statusMsg( const TQString& ) ),
-           this, TQT_SLOT( slotShowStatusMsg( const TQString&  ) ) );
+  connect( KPIM::BroadcastStatus::instance(), TQ_SIGNAL( statusMsg( const TQString& ) ),
+           this, TQ_SLOT( slotShowStatusMsg( const TQString&  ) ) );
 
   // launch commandline specified module if any
   activatePluginModule();
@@ -251,8 +251,8 @@ void MainWindow::initWidgets()
   sizes << 0;
   mSplitter->setSizes(sizes);
 
-  connect( mSidePane, TQT_SIGNAL( pluginSelected( Kontact::Plugin * ) ),
-           TQT_SLOT( selectPlugin( Kontact::Plugin * ) ) );
+  connect( mSidePane, TQ_SIGNAL( pluginSelected( Kontact::Plugin * ) ),
+           TQ_SLOT( selectPlugin( Kontact::Plugin * ) ) );
 
   TQVBox *vBox;
   if ( mSplitter ) {
@@ -323,19 +323,19 @@ void MainWindow::initAboutScreen()
   mIntroPart->view()->setLineWidth( 0 );
 
   connect( mIntroPart->browserExtension(),
-           TQT_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ),
-           TQT_SLOT( slotOpenUrl( const KURL& ) ) );
+           TQ_SIGNAL( openURLRequest( const KURL&, const KParts::URLArgs& ) ),
+           TQ_SLOT( slotOpenUrl( const KURL& ) ) );
 
   connect( mIntroPart->browserExtension(),
-           TQT_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ),
-           TQT_SLOT( slotOpenUrl( const KURL& ) ) );
+           TQ_SIGNAL( createNewWindow( const KURL&, const KParts::URLArgs& ) ),
+           TQ_SLOT( slotOpenUrl( const KURL& ) ) );
 }
 
 void MainWindow::setupActions()
 {
-  KStdAction::quit( this, TQT_SLOT( slotQuit() ), actionCollection() );
+  KStdAction::quit( this, TQ_SLOT( slotQuit() ), actionCollection() );
   mNewActions = new TDEToolBarPopupAction( KGuiItem( i18n( "New" ), "" ),
-                                         TDEStdAccel::shortcut(TDEStdAccel::New), this, TQT_SLOT( slotNewClicked() ),
+                                         TDEStdAccel::shortcut(TDEStdAccel::New), this, TQ_SLOT( slotNewClicked() ),
                                          actionCollection(), "action_new" );
 
   TDEConfig* const cfg = Prefs::self()->config();
@@ -344,18 +344,18 @@ void MainWindow::setupActions()
 
   if ( mSyncActionsEnabled ) {
     mSyncActions = new TDEToolBarPopupAction( KGuiItem( i18n( "Synchronize" ) ),
-                                            TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQT_SLOT( slotSyncClicked() ),
+                                            TDEStdAccel::shortcut(TDEStdAccel::Reload), this, TQ_SLOT( slotSyncClicked() ),
                                             actionCollection(), "action_sync" );
   }
-  new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQT_SLOT( slotPreferences() ),
+  new TDEAction( i18n( "Configure Kontact..." ), "configure", 0, this, TQ_SLOT( slotPreferences() ),
                actionCollection(), "settings_configure_kontact" );
 
-  new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQT_SLOT( slotConfigureProfiles() ),
+  new TDEAction( i18n( "Configure &Profiles..." ), 0, this, TQ_SLOT( slotConfigureProfiles() ),
                actionCollection(), "settings_configure_kontact_profiles" );
 
-  new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQT_SLOT( slotShowIntroduction() ),
+  new TDEAction( i18n( "&Kontact Introduction" ), 0, this, TQ_SLOT( slotShowIntroduction() ),
                actionCollection(), "help_introduction" );
-  new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQT_SLOT( slotShowTip() ),
+  new TDEAction( i18n( "&Tip of the Day" ), 0, this, TQ_SLOT( slotShowTip() ),
                actionCollection(), "help_tipofday" );
 
   KWidgetAction* spacerAction = new KWidgetAction( new TQWidget( this ), "SpacerAction", "", 0, 0, actionCollection(), "navigator_spacer_item" );
@@ -977,8 +977,8 @@ void MainWindow::slotPreferences()
       }
     dlg = new SettingsDialogWrapper( KSettings::Dialog::Configurable, this );
     dlg->addPluginInfos( filteredPlugins );
-    connect( dlg, TQT_SIGNAL( pluginSelectionChanged() ),
-             TQT_SLOT( pluginsChanged() ) );
+    connect( dlg, TQ_SIGNAL( pluginSelectionChanged() ),
+             TQ_SLOT( pluginsChanged() ) );
   }
 
   dlg->show();
@@ -1053,8 +1053,8 @@ void MainWindow::configureToolbars()
   saveMainWindowSettings( TDEGlobal::config(), "MainWindow" );
 
   KEditToolbar edit( factory() );
-  connect( &edit, TQT_SIGNAL( newToolbarConfig() ),
-           this, TQT_SLOT( slotNewToolbarConfig() ) );
+  connect( &edit, TQ_SIGNAL( newToolbarConfig() ),
+           this, TQ_SLOT( slotNewToolbarConfig() ) );
   edit.exec();
 }
 
diff --git a/kontact/src/profiledialog.cpp b/kontact/src/profiledialog.cpp
index e85d90c51..0c9c2a491 100644
--- a/kontact/src/profiledialog.cpp
+++ b/kontact/src/profiledialog.cpp
@@ -53,10 +53,10 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo
     m_list->setRenameable( NameColumn, true );
     m_list->setRenameable( DescriptionColumn, true );
 
-    connect( m_list, TQT_SIGNAL( selectionChanged() ), 
-             this, TQT_SLOT( listSelectionChanged() ) );
-    connect( m_list, TQT_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
-             this, TQT_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) );
+    connect( m_list, TQ_SIGNAL( selectionChanged() ), 
+             this, TQ_SLOT( listSelectionChanged() ) );
+    connect( m_list, TQ_SIGNAL( itemRenamed( TQListViewItem*, const TQString&, int ) ),
+             this, TQ_SLOT( listItemRenamed( TQListViewItem*, const TQString&, int ) ) );
     horizontalLayout->addWidget( m_list );
 
     TQVBoxLayout* buttonLayout = new TQVBoxLayout( horizontalLayout );
@@ -64,49 +64,49 @@ Kontact::ProfileDialog::ProfileDialog( TQWidget* parent, WFlags flags ) : KDialo
 
     m_newProfileButton = new TQPushButton( mainWidget );
     m_newProfileButton->setText( i18n("New Profile") );
-    connect( m_newProfileButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( addNewProfile() ) );
+    connect( m_newProfileButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( addNewProfile() ) );
     buttonLayout->addWidget( m_newProfileButton );
 
     m_deleteProfileButton = new TQPushButton( mainWidget );
     m_deleteProfileButton->setText( i18n("Delete Profile") );
     m_deleteProfileButton->setEnabled( false );
-    connect( m_deleteProfileButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( deleteSelectedProfile() ) );
+    connect( m_deleteProfileButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( deleteSelectedProfile() ) );
     buttonLayout->addWidget( m_deleteProfileButton );
 
     m_saveProfileButton = new TQPushButton( mainWidget );
     m_saveProfileButton->setText( i18n("Save Profile") );
     m_saveProfileButton->setEnabled( false );
-    connect( m_saveProfileButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( saveToSelectedProfile() ) );
+    connect( m_saveProfileButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( saveToSelectedProfile() ) );
     buttonLayout->addWidget( m_saveProfileButton );
 
     buttonLayout->addStretch();
 
     m_importProfileButton = new TQPushButton( mainWidget );
     m_importProfileButton->setText( i18n("Import Profile") );
-    connect( m_importProfileButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( importProfile() ) );
+    connect( m_importProfileButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( importProfile() ) );
     buttonLayout->addWidget( m_importProfileButton );
 
     m_exportProfileButton = new TQPushButton( mainWidget );
     m_exportProfileButton->setText( i18n("Export Profile") );
     m_exportProfileButton->setEnabled( false );
-    connect( m_exportProfileButton, TQT_SIGNAL( clicked() ),
-             this, TQT_SLOT( exportSelectedProfile() ) );
+    connect( m_exportProfileButton, TQ_SIGNAL( clicked() ),
+             this, TQ_SLOT( exportSelectedProfile() ) );
     buttonLayout->addWidget( m_exportProfileButton );
 
     setMainWidget( mainWidget );
 
-    connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileAdded( const TQString& ) ), 
-             this, TQT_SLOT( profileAdded( const TQString& ) ) );
-    connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileRemoved( const TQString& ) ), 
-             this, TQT_SLOT( profileRemoved( const TQString& ) ) );
-    connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileLoaded( const TQString& ) ), 
-             this, TQT_SLOT( profileLoaded( const TQString& ) ) );
-    connect( Kontact::ProfileManager::self(), TQT_SIGNAL( profileUpdated( const TQString& ) ), 
-             this, TQT_SLOT( profileUpdated( const TQString& ) ) );
+    connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileAdded( const TQString& ) ), 
+             this, TQ_SLOT( profileAdded( const TQString& ) ) );
+    connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileRemoved( const TQString& ) ), 
+             this, TQ_SLOT( profileRemoved( const TQString& ) ) );
+    connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileLoaded( const TQString& ) ), 
+             this, TQ_SLOT( profileLoaded( const TQString& ) ) );
+    connect( Kontact::ProfileManager::self(), TQ_SIGNAL( profileUpdated( const TQString& ) ), 
+             this, TQ_SLOT( profileUpdated( const TQString& ) ) );
 
     const TQValueList<Kontact::Profile> profiles = Kontact::ProfileManager::self()->profiles();
     for ( TQValueList<Kontact::Profile>::ConstIterator it = profiles.begin(), end = profiles.end(); it != end; ++it )