Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
(cherry picked from commit ba3b5b77e1a430dc7197df20872ba46ce2fb6fa7)

1 files changed, 19 insertions, 19 deletions

diff --git a/tdeui/khelpmenu.cpp b/tdeui/khelpmenu.cpp
index 676afcfad..ad923b90e 100644
--- a/tdeui/khelpmenu.cpp
+++ b/tdeui/khelpmenu.cpp
@@ -89,13 +89,13 @@ KHelpMenu::KHelpMenu( TQWidget *parent, const TDEAboutData *aboutData,
 
   if (actions)
   {
-    KStdAction::helpContents(this, TQT_SLOT(appHelpActivated()), actions);
+    KStdAction::helpContents(this, TQ_SLOT(appHelpActivated()), actions);
     if (showWhatsThis)
-      KStdAction::whatsThis(this, TQT_SLOT(contextHelpActivated()), actions);
-    KStdAction::reportBug(this, TQT_SLOT(reportBug()), actions);
-    KStdAction::aboutApp(this, TQT_SLOT(aboutApplication()), actions);
-    KStdAction::aboutKDE(this, TQT_SLOT(aboutKDE()), actions);
-    KStdAction::switchApplicationLanguage(this, TQT_SLOT(switchApplicationLanguage()), actions);
+      KStdAction::whatsThis(this, TQ_SLOT(contextHelpActivated()), actions);
+    KStdAction::reportBug(this, TQ_SLOT(reportBug()), actions);
+    KStdAction::aboutApp(this, TQ_SLOT(aboutApplication()), actions);
+    KStdAction::aboutKDE(this, TQ_SLOT(aboutKDE()), actions);
+    KStdAction::switchApplicationLanguage(this, TQ_SLOT(switchApplicationLanguage()), actions);
   }
 }
 
@@ -122,14 +122,14 @@ TDEPopupMenu* KHelpMenu::menu()
     TQString appName = (aboutData)? aboutData->programName() : TQString::fromLatin1(tqApp->name());
 
     mMenu = new TDEPopupMenu();
-    connect( mMenu, TQT_SIGNAL(destroyed()), this, TQT_SLOT(menuDestroyed()));
+    connect( mMenu, TQ_SIGNAL(destroyed()), this, TQ_SLOT(menuDestroyed()));
 
     bool need_separator = false;
     if (kapp->authorizeTDEAction("help_contents"))
     {
       mMenu->insertItem( BarIcon( "contents", TDEIcon::SizeSmall),
                      TQString(i18n( "%1 &Handbook" ).arg( appName)) ,menuHelpContents );
-      mMenu->connectItem( menuHelpContents, this, TQT_SLOT(appHelpActivated()) );
+      mMenu->connectItem( menuHelpContents, this, TQ_SLOT(appHelpActivated()) );
       mMenu->setAccel( TDEStdAccel::shortcut(TDEStdAccel::Help), menuHelpContents );
       need_separator = true;
     }
@@ -138,7 +138,7 @@ TDEPopupMenu* KHelpMenu::menu()
     {
       TQToolButton* wtb = TQWhatsThis::whatsThisButton(0);
       mMenu->insertItem( wtb->iconSet(),i18n( "What's &This" ), menuWhatsThis);
-      mMenu->connectItem( menuWhatsThis, this, TQT_SLOT(contextHelpActivated()) );
+      mMenu->connectItem( menuWhatsThis, this, TQ_SLOT(contextHelpActivated()) );
       delete wtb;
       mMenu->setAccel( SHIFT + Key_F1, menuWhatsThis );
       need_separator = true;
@@ -149,7 +149,7 @@ TDEPopupMenu* KHelpMenu::menu()
       if (need_separator)
         mMenu->insertSeparator();
       mMenu->insertItem( SmallIcon("bug"), i18n( "&Report Bug/Request Enhancement..." ), menuReportBug );
-      mMenu->connectItem( menuReportBug, this, TQT_SLOT(reportBug()) );
+      mMenu->connectItem( menuReportBug, this, TQ_SLOT(reportBug()) );
       need_separator = true;
     }
 
@@ -158,7 +158,7 @@ TDEPopupMenu* KHelpMenu::menu()
       if (need_separator)
         mMenu->insertSeparator();
       mMenu->insertItem( SmallIcon("locale"), i18n( "Switch application &language..." ), menuSwitchLanguage );
-      mMenu->connectItem( menuSwitchLanguage, this, TQT_SLOT(switchApplicationLanguage()) );
+      mMenu->connectItem( menuSwitchLanguage, this, TQ_SLOT(switchApplicationLanguage()) );
       need_separator = true;
     }
     
@@ -169,13 +169,13 @@ TDEPopupMenu* KHelpMenu::menu()
     {
       mMenu->insertItem( kapp->miniIcon(),
         TQString(i18n( "&About %1" ).arg(appName)), menuAboutApp );
-      mMenu->connectItem( menuAboutApp, this, TQT_SLOT( aboutApplication() ) );
+      mMenu->connectItem( menuAboutApp, this, TQ_SLOT( aboutApplication() ) );
     }
     
     if (kapp->authorizeTDEAction("help_about_kde"))
     {
       mMenu->insertItem( SmallIcon("about_kde"), i18n( "About &TDE" ), menuAboutKDE );
-      mMenu->connectItem( menuAboutKDE, this, TQT_SLOT( aboutKDE() ) );
+      mMenu->connectItem( menuAboutKDE, this, TQ_SLOT( aboutKDE() ) );
     }
   }
 
@@ -197,7 +197,7 @@ void KHelpMenu::aboutApplication()
     if( !mAboutApp )
     {
       mAboutApp = new TDEAboutApplication( d->mAboutData, mParent, "about", false );
-      connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+      connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
     }
     mAboutApp->show();
   }
@@ -213,7 +213,7 @@ void KHelpMenu::aboutApplication()
 				   KDialogBase::Yes, KDialogBase::Yes,
 				   KDialogBase::Yes, mParent, "about",
 				   false, true, KStdGuiItem::ok() );
-      connect( mAboutApp, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+      connect( mAboutApp, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
 
       TQHBox *hbox = new TQHBox( mAboutApp );
       mAboutApp->setMainWidget( hbox );
@@ -239,7 +239,7 @@ void KHelpMenu::aboutKDE()
   if( !mAboutKDE )
   {
     mAboutKDE = new TDEAboutKDE( mParent, "aboutkde", false );
-    connect( mAboutKDE, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+    connect( mAboutKDE, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
   }
   mAboutKDE->show();
 }
@@ -250,7 +250,7 @@ void KHelpMenu::reportBug()
   if( !mBugReport )
   {
     mBugReport = new KBugReport( mParent, false, d->mAboutData );
-    connect( mBugReport, TQT_SIGNAL(finished()),this,TQT_SLOT( dialogFinished()) );
+    connect( mBugReport, TQ_SIGNAL(finished()),this,TQ_SLOT( dialogFinished()) );
   }
   mBugReport->show();
 }
@@ -260,7 +260,7 @@ void KHelpMenu::switchApplicationLanguage()
   if ( !d->mSwitchApplicationLanguage )
   {
     d->mSwitchApplicationLanguage = new KSwitchLanguageDialog( mParent, "switchlanguagedialog", false );
-    connect( d->mSwitchApplicationLanguage, TQT_SIGNAL(finished()), this, TQT_SLOT( dialogFinished()) );
+    connect( d->mSwitchApplicationLanguage, TQ_SIGNAL(finished()), this, TQ_SLOT( dialogFinished()) );
   }
   d->mSwitchApplicationLanguage->show();
 }
@@ -268,7 +268,7 @@ void KHelpMenu::switchApplicationLanguage()
 
 void KHelpMenu::dialogFinished()
 {
-  TQTimer::singleShot( 0, this, TQT_SLOT(timerExpired()) );
+  TQTimer::singleShot( 0, this, TQ_SLOT(timerExpired()) );
 }