Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

Signed-off-by: Michele Calgaro <[email protected]>
(cherry picked from commit a4241b7911d2e0b36edfb02f616b8b282050c0ec)

6 files changed, 25 insertions, 25 deletions

diff --git a/ksplashml/kcmksplash/installer.cpp b/ksplashml/kcmksplash/installer.cpp
index 66b6eb83b..c790000b0 100644
--- a/ksplashml/kcmksplash/installer.cpp
+++ b/ksplashml/kcmksplash/installer.cpp
@@ -36,8 +36,8 @@ ThemeListBox::ThemeListBox(TQWidget *parent)
   : TDEListBox(parent)
 {
    setAcceptDrops(true);
-   connect(this, TQT_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
-           this, TQT_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
+   connect(this, TQ_SIGNAL(mouseButtonPressed(int, TQListBoxItem *, const TQPoint &)),
+           this, TQ_SLOT(slotMouseButtonPressed(int, TQListBoxItem *, const TQPoint &)));
 }
 
 void ThemeListBox::dragEnterEvent(TQDragEnterEvent* event)
@@ -100,21 +100,21 @@ SplashInstaller::SplashInstaller (TQWidget *aParent, const char *aName, bool aIn
 
   mThemesList = new ThemeListBox(this);
   mThemesList->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Expanding );
-  connect(mThemesList, TQT_SIGNAL(highlighted(int)), TQT_SLOT(slotSetTheme(int)));
-  connect(mThemesList, TQT_SIGNAL(filesDropped(const KURL::List&)), TQT_SLOT(slotFilesDropped(const KURL::List&)));
+  connect(mThemesList, TQ_SIGNAL(highlighted(int)), TQ_SLOT(slotSetTheme(int)));
+  connect(mThemesList, TQ_SIGNAL(filesDropped(const KURL::List&)), TQ_SLOT(slotFilesDropped(const KURL::List&)));
   leftbox->addWidget(mThemesList);
 
   mBtnAdd = new KPushButton( i18n("Add..."), this );
   leftbox->addWidget( mBtnAdd );
-  connect(mBtnAdd, TQT_SIGNAL(clicked()), TQT_SLOT(slotAdd()));
+  connect(mBtnAdd, TQ_SIGNAL(clicked()), TQ_SLOT(slotAdd()));
 
   mBtnRemove = new KPushButton( i18n("Remove"), this );
   leftbox->addWidget( mBtnRemove );
-  connect(mBtnRemove, TQT_SIGNAL(clicked()), TQT_SLOT(slotRemove()));
+  connect(mBtnRemove, TQ_SIGNAL(clicked()), TQ_SLOT(slotRemove()));
 
   mBtnTest = new KPushButton( i18n("Test"), this );
   leftbox->addWidget( mBtnTest );
-  connect(mBtnTest, TQT_SIGNAL(clicked()), TQT_SLOT(slotTest()));
+  connect(mBtnTest, TQ_SIGNAL(clicked()), TQ_SLOT(slotTest()));
 
   TQVBoxLayout* rightbox = new TQVBoxLayout( hbox, KDialog::spacingHint() );
   hbox->setStretchFactor( rightbox, 3 );
diff --git a/ksplashml/kcmksplash/main.cpp b/ksplashml/kcmksplash/main.cpp
index f0b5d1f52..4a2f9cf5c 100644
--- a/ksplashml/kcmksplash/main.cpp
+++ b/ksplashml/kcmksplash/main.cpp
@@ -59,7 +59,7 @@ KSplashThemeMgr::KSplashThemeMgr( TQWidget *parent, const char *name, const TQSt
   TQHBoxLayout *box = new TQHBoxLayout(this, 0, 0);
   box->addWidget(mInstaller);
 #endif
-  connect( mInstaller, TQT_SIGNAL(changed(bool)), TQT_SIGNAL(changed(bool)) );
+  connect( mInstaller, TQ_SIGNAL(changed(bool)), TQ_SIGNAL(changed(bool)) );
   TDEAboutData *about = new TDEAboutData( "kcmksplash"
                                       ,I18N_NOOP("TDE splash screen theme manager")
                                       ,"0.1"
diff --git a/ksplashml/themeengine/default/themelegacy.cpp b/ksplashml/themeengine/default/themelegacy.cpp
index c3a0285a8..1c311ed8b 100644
--- a/ksplashml/themeengine/default/themelegacy.cpp
+++ b/ksplashml/themeengine/default/themelegacy.cpp
@@ -71,7 +71,7 @@ ThemeDefault::ThemeDefault( TQWidget *parent, const char *name, const TQStringLi
   if( mIconsFlashing )
   {
     mFlashTimer = new TQTimer( this );
-    connect( mFlashTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(flash()) );
+    connect( mFlashTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(flash()) );
     mFlashPixmap1 = new TQPixmap();
     mFlashPixmap2 = new TQPixmap();
 
diff --git a/ksplashml/themeengine/standard/wndicon.cpp b/ksplashml/themeengine/standard/wndicon.cpp
index 856547895..c6c16170c 100644
--- a/ksplashml/themeengine/standard/wndicon.cpp
+++ b/ksplashml/themeengine/standard/wndicon.cpp
@@ -70,7 +70,7 @@ WndIcon::WndIcon(
   if( mIconJumping )
   {
     TQTimer *t = new TQTimer( this );
-    connect(t, TQT_SIGNAL(timeout()), TQT_SLOT(slotJump()));
+    connect(t, TQ_SIGNAL(timeout()), TQ_SLOT(slotJump()));
     t->start( 50, false );
   }
 }
diff --git a/ksplashml/themeengine/themeengine.cpp b/ksplashml/themeengine/themeengine.cpp
index db12b8493..7458abefd 100644
--- a/ksplashml/themeengine/themeengine.cpp
+++ b/ksplashml/themeengine/themeengine.cpp
@@ -101,7 +101,7 @@ void ThemeEngine::addSplashWindow( TQWidget* w )
         XChangeWindowAttributes( tqt_xdisplay(), w->winId(), CWOverrideRedirect, &attrs );
     }
     d->mSplashWindows.prepend( w->winId());
-    connect( w, TQT_SIGNAL( destroyed( TQObject* )), TQT_SLOT( splashWindowDestroyed( TQObject* )));
+    connect( w, TQ_SIGNAL( destroyed( TQObject* )), TQ_SLOT( splashWindowDestroyed( TQObject* )));
     w->raise();
 }
 
diff --git a/ksplashml/wndmain.cpp b/ksplashml/wndmain.cpp
index 0514b53bc..3c07e5191 100644
--- a/ksplashml/wndmain.cpp
+++ b/ksplashml/wndmain.cpp
@@ -58,23 +58,23 @@ KSplash::KSplash(const char *name)
   if ( config->readBoolEntry( "CloseOnClick", TRUE ) )
     mThemeEngine->installEventFilter( this );
 
-  connect( mThemeEngine, TQT_SIGNAL(destroyed()), this, TQT_SLOT(close()) );
-  connect( this, TQT_SIGNAL(stepsChanged(int)), TQT_SLOT(slotUpdateSteps(int)) );
-  connect( this, TQT_SIGNAL(progressChanged(int)), TQT_SLOT(slotUpdateProgress(int)) );
+  connect( mThemeEngine, TQ_SIGNAL(destroyed()), this, TQ_SLOT(close()) );
+  connect( this, TQ_SIGNAL(stepsChanged(int)), TQ_SLOT(slotUpdateSteps(int)) );
+  connect( this, TQ_SIGNAL(progressChanged(int)), TQ_SLOT(slotUpdateProgress(int)) );
 
   if( mKsTheme->testing() )
   {
     slotUpdateSteps(7);
-    TQTimer::singleShot( 1000, this, TQT_SLOT(slotExec()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(slotExec()));
   }
   else
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()));
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()));
 
   // Make sure we don't stay up forever.
   if (!mKsTheme->managedMode())
   {
     close_timer = new TQTimer( this );
-    connect( close_timer, TQT_SIGNAL( timeout() ), this, TQT_SLOT( close() ) );
+    connect( close_timer, TQ_SIGNAL( timeout() ), this, TQ_SLOT( close() ) );
     close_timer->start( 60000, TRUE );
   }
 }
@@ -133,14 +133,14 @@ void KSplash::slotInsertAction( const TQString& pix, const TQString& msg )
 
 void KSplash::slotExec()
 {
-  TQTimer::singleShot( 200, this, TQT_SLOT(nextIcon()));
+  TQTimer::singleShot( 200, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::nextIcon()
 {
   if( !mCurrentAction || mTimeToGo )
   {
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
     return;
   }
 
@@ -155,12 +155,12 @@ void KSplash::nextIcon()
   }
 
   if( mKsTheme->testing() )
-    TQTimer::singleShot( 1000, this, TQT_SLOT(nextIcon()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(nextIcon()));
 }
 
 void KSplash::initDcop()
 {
-  disconnect( kapp->dcopClient(), TQT_SIGNAL( attachFailed(const TQString&) ), kapp, TQT_SLOT( dcopFailure(const TQString&) ) );
+  disconnect( kapp->dcopClient(), TQ_SIGNAL( attachFailed(const TQString&) ), kapp, TQ_SLOT( dcopFailure(const TQString&) ) );
 
   if ( kapp->dcopClient()->isAttached() )
     return;
@@ -174,7 +174,7 @@ void KSplash::initDcop()
   }
   else
   {
-    TQTimer::singleShot( 100, this, TQT_SLOT(initDcop()) );
+    TQTimer::singleShot( 100, this, TQ_SLOT(initDcop()) );
   }
 }
 
@@ -247,7 +247,7 @@ void KSplash::upAndRunning( TQString s )
     //if(!mSessMgrCalled) emit nextIcon();
     mTimeToGo = true;
     close_timer->stop();
-    TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
   }
   else
   {
@@ -307,7 +307,7 @@ void KSplash::setStartupItemCount( int count )
 void KSplash::startupComplete()
 {
   mTimeToGo = true;
-  TQTimer::singleShot( 1000, this, TQT_SLOT(close()));
+  TQTimer::singleShot( 1000, this, TQ_SLOT(close()));
 }
 
 void KSplash::close()
@@ -426,7 +426,7 @@ bool KSplash::eventFilter( TQObject *o, TQEvent *e )
 {
   if ( ( e->type() == TQEvent::MouseButtonRelease ) && ( o == mThemeEngine ) )
   {
-    TQTimer::singleShot( 0, this, TQT_SLOT(close()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(close()));
     return TRUE;
   }
   else