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, 16 insertions, 16 deletions

diff --git a/tdeui/tdemainwindow.cpp b/tdeui/tdemainwindow.cpp
index 9905d2991..2a112f196 100644
--- a/tdeui/tdemainwindow.cpp
+++ b/tdeui/tdemainwindow.cpp
@@ -184,7 +184,7 @@ void TDEMainWindow::initTDEMainWindow(const char *name, int cflags)
     mHelpMenu = 0;
     kapp->setTopWidget( this );
     actionCollection()->setWidget( this );
-    connect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown()));
+    connect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
     if( !memberList )
         memberList = new TQPtrList<TDEMainWindow>;
 
@@ -340,8 +340,8 @@ TDEPopupMenu* TDEMainWindow::helpMenu( const TQString &aboutAppText, bool showWh
 
         if ( !mHelpMenu )
             return 0;
-        connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ),
-                 this, TQT_SLOT( showAboutApplication() ) );
+        connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ),
+                 this, TQ_SLOT( showAboutApplication() ) );
     }
 
     return mHelpMenu->menu();
@@ -351,8 +351,8 @@ TDEPopupMenu* TDEMainWindow::customHelpMenu( bool showWhatsThis )
 {
     if( !mHelpMenu ) {
         mHelpMenu = new KHelpMenu( this, TQString::null, showWhatsThis );
-        connect( mHelpMenu, TQT_SIGNAL( showAboutApplication() ),
-                 this, TQT_SLOT( showAboutApplication() ) );
+        connect( mHelpMenu, TQ_SIGNAL( showAboutApplication() ),
+                 this, TQ_SLOT( showAboutApplication() ) );
     }
 
     return mHelpMenu->menu();
@@ -441,7 +441,7 @@ int TDEMainWindow::configureToolbars()
 {
     saveMainWindowSettings(TDEGlobal::config());
     KEditToolbar dlg(actionCollection(), xmlFile(), true, this);
-    connect(&dlg, TQT_SIGNAL(newToolbarConfig()), TQT_SLOT(saveNewToolbarConfig()));
+    connect(&dlg, TQ_SIGNAL(newToolbarConfig()), TQ_SLOT(saveNewToolbarConfig()));
     return dlg.exec();
 }
 
@@ -458,7 +458,7 @@ void TDEMainWindow::setupGUI( int options, const TQString & xmlfile ) {
 void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString & xmlfile ) {
     if( options & Keys ){
         KStdAction::keyBindings(guiFactory(),
-                    TQT_SLOT(configureShortcuts()), actionCollection());
+                    TQ_SLOT(configureShortcuts()), actionCollection());
     }
 
     if( (options & StatusBar) && internalStatusBar() ){
@@ -468,7 +468,7 @@ void TDEMainWindow::setupGUI( TQSize defaultSize, int options, const TQString &
     if( options & ToolBar ){
         setStandardToolBarMenuEnabled( true );
         KStdAction::configureToolbars(this,
-                      TQT_SLOT(configureToolbars() ), actionCollection());
+                      TQ_SLOT(configureToolbars() ), actionCollection());
     }
 
     if( options & Create ){
@@ -659,7 +659,7 @@ void TDEMainWindow::closeEvent ( TQCloseEvent *e )
         if ( !no_query_exit && not_withdrawn <= 0 ) { // last window close accepted?
             if ( queryExit() && !kapp->sessionSaving() && !d->shuttingDown ) { // Yes, Quit app?
                 // don't call queryExit() twice
-                disconnect(kapp, TQT_SIGNAL(shutDown()), this, TQT_SLOT(shuttingDown()));
+                disconnect(kapp, TQ_SIGNAL(shutDown()), this, TQ_SLOT(shuttingDown()));
                 d->shuttingDown = true;
                 kapp->deref();             // ...and quit application.
             }  else {
@@ -804,9 +804,9 @@ bool TDEMainWindow::isStandardToolBarMenuEnabled() const
 
 void TDEMainWindow::createStandardStatusBarAction(){
   if(!d->showStatusBarAction){
-    d->showStatusBarAction = KStdAction::showStatusbar(this, TQT_SLOT(setSettingsDirty()), actionCollection());
+    d->showStatusBarAction = KStdAction::showStatusbar(this, TQ_SLOT(setSettingsDirty()), actionCollection());
     KStatusBar *sb = statusBar(); // Creates statusbar if it doesn't exist already.
-    connect(d->showStatusBarAction, TQT_SIGNAL(toggled(bool)), sb, TQT_SLOT(setShown(bool)));
+    connect(d->showStatusBarAction, TQ_SIGNAL(toggled(bool)), sb, TQ_SLOT(setShown(bool)));
     d->showStatusBarAction->setChecked(sb->isHidden());
   }
 }
@@ -1017,7 +1017,7 @@ void TDEMainWindow::setSettingsDirty()
         if ( !d->settingsTimer )
         {
            d->settingsTimer = new TQTimer( this );
-           connect( d->settingsTimer, TQT_SIGNAL( timeout() ), TQT_SLOT( saveAutoSaveSettings() ) );
+           connect( d->settingsTimer, TQ_SIGNAL( timeout() ), TQ_SLOT( saveAutoSaveSettings() ) );
         }
         d->settingsTimer->start( 500, true );
     }
@@ -1039,10 +1039,10 @@ void TDEMainWindow::setAutoSaveSettings( const TQString & groupName, bool saveWi
     d->autoSaveGroup = groupName;
     d->autoSaveWindowSize = saveWindowSize;
     // Get notified when the user moves a toolbar around
-    disconnect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
-                this, TQT_SLOT( setSettingsDirty() ) );
-    connect( this, TQT_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
-             this, TQT_SLOT( setSettingsDirty() ) );
+    disconnect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
+                this, TQ_SLOT( setSettingsDirty() ) );
+    connect( this, TQ_SIGNAL( dockWindowPositionChanged( TQDockWindow * ) ),
+             this, TQ_SLOT( setSettingsDirty() ) );
 
     // Now read the previously saved settings
     applyMainWindowSettings( TDEGlobal::config(), groupName );