Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

46 files changed, 310 insertions, 310 deletions

diff --git a/tdecore/kaudioplayer.h b/tdecore/kaudioplayer.h
index 6e011e246..ce26a1e9a 100644
--- a/tdecore/kaudioplayer.h
+++ b/tdecore/kaudioplayer.h
@@ -48,7 +48,7 @@ class KAudioPlayerPrivate;
  *
  * \code
  *   KAudioPlayer player("/var/share/foo.wav");
- *   connect(&button, TQT_SIGNAL(clicked()), &player, TQT_SLOT(play()));
+ *   connect(&button, TQ_SIGNAL(clicked()), &player, TQ_SLOT(play()));
  * \endcode
  *
  */
diff --git a/tdecore/kcheckaccelerators.cpp b/tdecore/kcheckaccelerators.cpp
index fd722a964..93ed7f86a 100644
--- a/tdecore/kcheckaccelerators.cpp
+++ b/tdecore/kcheckaccelerators.cpp
@@ -89,7 +89,7 @@ KCheckAccelerators::KCheckAccelerators( TQObject* parent )
     }
     alwaysShow = TDEGlobal::config()->readBoolEntry( "AlwaysShowCheckAccelerators", false );
     autoCheck = TDEGlobal::config()->readBoolEntry( "AutoCheckAccelerators", true );
-    connect( &autoCheckTimer, TQT_SIGNAL( timeout()), TQT_SLOT( autoCheckSlot()));
+    connect( &autoCheckTimer, TQ_SIGNAL( timeout()), TQ_SLOT( autoCheckSlot()));
 }
 
 bool KCheckAccelerators::eventFilter( TQObject * , TQEvent * e)
@@ -153,11 +153,11 @@ void KCheckAccelerators::createDialog(TQWidget *actWin, bool automatic)
     TQCheckBox* disableAutoCheck = NULL;
     if( automatic )  {
         disableAutoCheck = new TQCheckBox( i18n( "&Disable automatic checking" ), drklash );
-        connect(disableAutoCheck, TQT_SIGNAL(toggled(bool)), TQT_SLOT(slotDisableCheck(bool)));
+        connect(disableAutoCheck, TQ_SIGNAL(toggled(bool)), TQ_SLOT(slotDisableCheck(bool)));
     }
     TQPushButton* btnClose = new TQPushButton( i18n( "&Close" ), drklash );
     btnClose->setDefault( true );
-    connect( btnClose, TQT_SIGNAL( clicked() ), drklash, TQT_SLOT( close() ) );
+    connect( btnClose, TQ_SIGNAL( clicked() ), drklash, TQ_SLOT( close() ) );
     if (disableAutoCheck)
         disableAutoCheck->setFocus();
     else
diff --git a/tdecore/kclipboard.cpp b/tdecore/kclipboard.cpp
index 5937a3392..3aa6b9fa7 100644
--- a/tdecore/kclipboard.cpp
+++ b/tdecore/kclipboard.cpp
@@ -126,11 +126,11 @@ void TDEClipboardSynchronizer::setupSignals()
     TQClipboard *clip = TQApplication::clipboard();
     disconnect( clip, NULL, this, NULL );
     if( s_sync )
-        connect( clip, TQT_SIGNAL( selectionChanged() ),
-                 TQT_SLOT( slotSelectionChanged() ));
+        connect( clip, TQ_SIGNAL( selectionChanged() ),
+                 TQ_SLOT( slotSelectionChanged() ));
     if( s_reverse_sync )
-        connect( clip, TQT_SIGNAL( dataChanged() ),
-                 TQT_SLOT( slotClipboardChanged() ));
+        connect( clip, TQ_SIGNAL( dataChanged() ),
+                 TQ_SLOT( slotClipboardChanged() ));
 }
 
 void TDEClipboardSynchronizer::slotSelectionChanged()
diff --git a/tdecore/kextsock.cpp b/tdecore/kextsock.cpp
index 2e10f873e..f78464287 100644
--- a/tdecore/kextsock.cpp
+++ b/tdecore/kextsock.cpp
@@ -639,7 +639,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
   if (d->qsnIn == NULL)
     {
       d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read);
-      TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead()));
+      TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead()));
       d->qsnIn->setEnabled(true);
     }
 
@@ -687,7 +687,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
       if (d->qsnOut == NULL)
 	{
 	  d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write);
-	  TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite()));
+	  TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite()));
 	  // if the class is being created now, there's nothing to write yet
 	  // so socketActivityWrite() will get called once and disable
 	  // the notifier
@@ -702,7 +702,7 @@ bool KExtendedSocket::setBufferSize(int rsize, int wsize)
   if (d->emitWrite && d->qsnOut == NULL)
     {
       d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write);
-      TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite()));
+      TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite()));
     }
 
   return true;
@@ -783,8 +783,8 @@ int KExtendedSocket::startAsyncLookup()
       d->resRemote.setFlags(flags);
       d->resRemote.setFamily(familyMask);
       d->resRemote.setSocketType(socktype);
-      TQObject::connect(&d->resRemote, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(dnsResultsReady()));
+      TQObject::connect(&d->resRemote, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(dnsResultsReady()));
 
       if (!d->resRemote.start())
 	{
@@ -800,8 +800,8 @@ int KExtendedSocket::startAsyncLookup()
       d->resLocal.setFlags(flags);
       d->resLocal.setFamily(familyMask);
       d->resLocal.setSocketType(socktype);
-      TQObject::connect(&d->resLocal, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(dnsResultsReady()));
+      TQObject::connect(&d->resLocal, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(dnsResultsReady()));
 
       if (!d->resLocal.start())
 	{
@@ -896,7 +896,7 @@ int KExtendedSocket::listen(int N)
     {
       d->status = listening;
       d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read);
-      TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead()));
+      TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead()));
     }
   return retval == -1 ? -1 : 0;
 }
@@ -1218,7 +1218,7 @@ int KExtendedSocket::startAsyncConnect()
   // signal lookupFinished to do connection
   if (d->status < lookupDone)
     {
-      TQObject::connect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot()));
+      TQObject::connect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot()));
       if (d->status < lookupInProgress)
 	return startAsyncLookup();
       else
@@ -1909,9 +1909,9 @@ void KExtendedSocket::connectionEvent()
 	  // error here is either EWOULDBLOCK or EINPROGRESS
 	  // so, it is a good condition
 	  d->qsnIn = new TQSocketNotifier(sockfd, TQSocketNotifier::Read);
-	  TQObject::connect(d->qsnIn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityRead()));
+	  TQObject::connect(d->qsnIn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityRead()));
 	  d->qsnOut = new TQSocketNotifier(sockfd, TQSocketNotifier::Write);
-	  TQObject::connect(d->qsnOut, TQT_SIGNAL(activated(int)), this, TQT_SLOT(socketActivityWrite()));
+	  TQObject::connect(d->qsnOut, TQ_SIGNAL(activated(int)), this, TQ_SLOT(socketActivityWrite()));
 
 	  // ok, let the Qt event loop do the selecting for us
 	  return;
@@ -1969,7 +1969,7 @@ void KExtendedSocket::dnsResultsReady()
 
 void KExtendedSocket::startAsyncConnectSlot()
 {
-  TQObject::disconnect(this, TQT_SIGNAL(lookupFinished(int)), this, TQT_SLOT(startAsyncConnectSlot()));
+  TQObject::disconnect(this, TQ_SIGNAL(lookupFinished(int)), this, TQ_SLOT(startAsyncConnectSlot()));
 
   if (d->status == lookupDone)
     startAsyncConnect();
diff --git a/tdecore/kglobalaccel.h b/tdecore/kglobalaccel.h
index a11568bd0..22dedd513 100644
--- a/tdecore/kglobalaccel.h
+++ b/tdecore/kglobalaccel.h
@@ -76,7 +76,7 @@ class TDECORE_EXPORT TDEGlobalAccel : public TQObject
 	 * insert( "Do Something", i18n("Do Something"),
 	 *   i18n("This action allows you to do something really great with this program to "
 	 *        "the currently open document."),
-	 *   ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQT_SLOT(slotDoSomething()) );
+	 *   ALT+CTRL+Key_Q, KKey::QtWIN+CTRL+Key_Q, this, TQ_SLOT(slotDoSomething()) );
 	 *\endcode
 	 *
 	 * @param sAction The internal name of the action.
diff --git a/tdecore/kglobalaccel_win.cpp b/tdecore/kglobalaccel_win.cpp
index 09c216b99..8b9d0f0a3 100644
--- a/tdecore/kglobalaccel_win.cpp
+++ b/tdecore/kglobalaccel_win.cpp
@@ -283,9 +283,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
                 if( !recursion_block ) {
                         recursion_block = true;
 		        TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) );
-		        connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) );
+		        connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) );
 		        pMenu->exec( TQPoint( 0, 0 ) );
-		        disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+		        disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 		        delete pMenu;
                         recursion_block = false;
                 }
diff --git a/tdecore/kglobalaccel_x11.cpp b/tdecore/kglobalaccel_x11.cpp
index 819b05293..da77403ca 100644
--- a/tdecore/kglobalaccel_x11.cpp
+++ b/tdecore/kglobalaccel_x11.cpp
@@ -90,7 +90,7 @@ TDEGlobalAccelPrivate::TDEGlobalAccelPrivate()
         all_accels->append( this );
 	m_sConfigGroup = "Global Shortcuts";
 	kapp->installX11EventFilter( this );
-	connect(kapp, TQT_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQT_SLOT(fakeKeyPressed(unsigned int)));
+	connect(kapp, TQ_SIGNAL(coreFakeKeyPress(unsigned int)), this, TQ_SLOT(fakeKeyPressed(unsigned int)));
 }
 
 TDEGlobalAccelPrivate::~TDEGlobalAccelPrivate()
@@ -313,9 +313,9 @@ void TDEGlobalAccelPrivate::fakeKeyPressed(unsigned int keyCode) {
                 if( !recursion_block ) {
                         recursion_block = true;
 		        TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) );
-		        connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) );
+		        connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) );
 		        pMenu->exec( TQPoint( 0, 0 ) );
-		        disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+		        disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 		        delete pMenu;
                         recursion_block = false;
                 }
@@ -392,9 +392,9 @@ bool TDEGlobalAccelPrivate::x11KeyPress( const XEvent *pEvent )
                 if( !recursion_block ) {
                         recursion_block = true;
 		        TQPopupMenu* pMenu = createPopupMenu( 0, KKeySequence(key) );
-		        connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)) );
+		        connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)) );
 		        pMenu->exec( TQPoint( 0, 0 ) );
-		        disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated(int)));
+		        disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated(int)));
 		        delete pMenu;
                         recursion_block = false;
                 }
diff --git a/tdecore/kiconloader.cpp b/tdecore/kiconloader.cpp
index f687fab9c..f6e267a86 100644
--- a/tdecore/kiconloader.cpp
+++ b/tdecore/kiconloader.cpp
@@ -157,7 +157,7 @@ TDEIconLoader::TDEIconLoader(const TQString& _appname, TDEStandardDirs *_dirs)
 
     if (kapp) {
         kapp->addKipcEventMask(KIPC::IconChanged);
-        TQObject::connect(kapp, TQT_SIGNAL(updateIconLoaders()), d, TQT_SLOT(reconfigure()));
+        TQObject::connect(kapp, TQ_SIGNAL(updateIconLoaders()), d, TQ_SLOT(reconfigure()));
     }
 
     init( _appname, _dirs );
diff --git a/tdecore/klibloader.cpp b/tdecore/klibloader.cpp
index f3e7a82ae..68dc72668 100644
--- a/tdecore/klibloader.cpp
+++ b/tdecore/klibloader.cpp
@@ -121,8 +121,8 @@ KLibrary::~KLibrary()
 	    for ( ; it.current() ; ++it )
 		{
 		    kdDebug(150) << "Factory still has object " << it.current() << " " << it.current()->name () << " Library = " << m_libname << endl;
-		    disconnect( it.current(), TQT_SIGNAL( destroyed() ),
-				this, TQT_SLOT( slotObjectDestroyed() ) );
+		    disconnect( it.current(), TQ_SIGNAL( destroyed() ),
+				this, TQ_SLOT( slotObjectDestroyed() ) );
 		}
 	    m_objs.setAutoDelete(true);
 	    m_objs.clear();
@@ -172,8 +172,8 @@ KLibFactory* KLibrary::factory()
         return 0;
     }
 
-    connect( m_factory, TQT_SIGNAL( objectCreated( TQObject * ) ),
-             this, TQT_SLOT( slotObjectCreated( TQObject * ) ) );
+    connect( m_factory, TQ_SIGNAL( objectCreated( TQObject * ) ),
+             this, TQ_SLOT( slotObjectCreated( TQObject * ) ) );
 
     return m_factory;
 }
@@ -214,8 +214,8 @@ void KLibrary::slotObjectCreated( TQObject *obj )
   if ( m_objs.containsRef( obj ) )
       return; // we know this object already
 
-  connect( obj, TQT_SIGNAL( destroyed() ),
-           this, TQT_SLOT( slotObjectDestroyed() ) );
+  connect( obj, TQ_SIGNAL( destroyed() ),
+           this, TQ_SLOT( slotObjectDestroyed() ) );
 
   m_objs.append( obj );
 }
@@ -232,8 +232,8 @@ void KLibrary::slotObjectDestroyed()
     if ( !m_timer )
     {
       m_timer = new TQTimer( this, "klibrary_shutdown_timer" );
-      connect( m_timer, TQT_SIGNAL( timeout() ),
-               this, TQT_SLOT( slotTimeout() ) );
+      connect( m_timer, TQ_SIGNAL( timeout() ),
+               this, TQ_SLOT( slotTimeout() ) );
     }
 
     // as long as it's not stable make the timeout short, for debugging
@@ -447,8 +447,8 @@ KLibrary* KLibLoader::library( const char *name )
     }
     m_libs.insert( name, wrap );
 
-    connect( wrap->lib, TQT_SIGNAL( destroyed() ),
-             this, TQT_SLOT( slotLibraryDestroyed() ) );
+    connect( wrap->lib, TQ_SIGNAL( destroyed() ),
+             this, TQ_SLOT( slotLibraryDestroyed() ) );
 
     return wrap->lib;
 }
@@ -470,8 +470,8 @@ void KLibLoader::unloadLibrary( const char *libname )
 
   m_libs.remove( libname );
 
-  disconnect( wrap->lib, TQT_SIGNAL( destroyed() ),
-              this, TQT_SLOT( slotLibraryDestroyed() ) );
+  disconnect( wrap->lib, TQ_SIGNAL( destroyed() ),
+              this, TQ_SLOT( slotLibraryDestroyed() ) );
   close_pending( wrap );
 }
 
@@ -511,8 +511,8 @@ void KLibLoader::close_pending(KLibWrapPrivate *wrap)
   for (; it.current(); ++it) {
     wrap = it.current();
     if (wrap->lib) {
-      disconnect( wrap->lib, TQT_SIGNAL( destroyed() ),
-                  this, TQT_SLOT( slotLibraryDestroyed() ) );
+      disconnect( wrap->lib, TQ_SIGNAL( destroyed() ),
+                  this, TQ_SLOT( slotLibraryDestroyed() ) );
       KLibrary* to_delete = wrap->lib;
       wrap->lib = 0L; // unset first, because KLibrary dtor can cause
       delete to_delete; // recursive call to close_pending()
diff --git a/tdecore/kprocctrl.cpp b/tdecore/kprocctrl.cpp
index 76ad0b167..720778d4e 100644
--- a/tdecore/kprocctrl.cpp
+++ b/tdecore/kprocctrl.cpp
@@ -71,8 +71,8 @@ TDEProcessController::TDEProcessController()
 
   notifier = new TQSocketNotifier( fd[0], TQSocketNotifier::Read );
   notifier->setEnabled( true );
-  TQObject::connect( notifier, TQT_SIGNAL(activated(int)),
-                    TQT_SLOT(slotDoHousekeeping()));
+  TQObject::connect( notifier, TQ_SIGNAL(activated(int)),
+                    TQ_SLOT(slotDoHousekeeping()));
 }
 
 TDEProcessController::~TDEProcessController()
diff --git a/tdecore/kprocess.cpp b/tdecore/kprocess.cpp
index b899c637f..85e7620a4 100644
--- a/tdecore/kprocess.cpp
+++ b/tdecore/kprocess.cpp
@@ -959,15 +959,15 @@ int TDEProcess::commSetupDoneP()
     innot =  new TQSocketNotifier(in[1], TQSocketNotifier::Write, this);
     TQ_CHECK_PTR(innot);
     innot->setEnabled(false); // will be enabled when data has to be sent
-    TQObject::connect(innot, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotSendData(int)));
+    TQObject::connect(innot, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotSendData(int)));
   }
 
   if (communication & Stdout) {
     outnot = new TQSocketNotifier(out[0], TQSocketNotifier::Read, this);
     TQ_CHECK_PTR(outnot);
-    TQObject::connect(outnot, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotChildOutput(int)));
+    TQObject::connect(outnot, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotChildOutput(int)));
     if (communication & NoRead)
         suspend();
   }
@@ -975,8 +975,8 @@ int TDEProcess::commSetupDoneP()
   if (communication & Stderr) {
     errnot = new TQSocketNotifier(err[0], TQSocketNotifier::Read, this );
     TQ_CHECK_PTR(errnot);
-    TQObject::connect(errnot, TQT_SIGNAL(activated(int)),
-                     this, TQT_SLOT(slotChildError(int)));
+    TQObject::connect(errnot, TQ_SIGNAL(activated(int)),
+                     this, TQ_SLOT(slotChildError(int)));
   }
 
   return 1;
diff --git a/tdecore/kprocess.h b/tdecore/kprocess.h
index e7414874e..3e6250486 100644
--- a/tdecore/kprocess.h
+++ b/tdecore/kprocess.h
@@ -96,8 +96,8 @@ class KPty;
  *
  *   *proc << "my_executable";
  *   *proc << "These" << "are" << "the" << "command" << "line" << "args";
- *   TQApplication::connect(proc, TQT_SIGNAL(processExited(TDEProcess *)),
- *                         pointer_to_my_object, TQT_SLOT(my_objects_slot(TDEProcess *)));
+ *   TQApplication::connect(proc, TQ_SIGNAL(processExited(TDEProcess *)),
+ *                         pointer_to_my_object, TQ_SLOT(my_objects_slot(TDEProcess *)));
  *   proc->start();
  * \endcode
  *
diff --git a/tdecore/kprocio.cpp b/tdecore/kprocio.cpp
index 7157662df..aac14a09e 100644
--- a/tdecore/kprocio.cpp
+++ b/tdecore/kprocio.cpp
@@ -67,14 +67,14 @@ KProcIO::resetAll ()
   rbi=0;
   readsignalon=writeready=true;
 
-  disconnect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
-	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
+  disconnect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
 
-  disconnect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
-	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
+  disconnect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
 
-  disconnect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
-	   this, TQT_SLOT (sent (TDEProcess *)));
+  disconnect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQ_SLOT (sent (TDEProcess *)));
 
   outbuffer.clear();
 
@@ -87,17 +87,17 @@ void KProcIO::setComm (Communication comm)
 
 bool KProcIO::start (RunMode runmode, bool includeStderr)
 {
-  connect (this, TQT_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
-	   this, TQT_SLOT (received (TDEProcess *, char *, int)));
+  connect (this, TQ_SIGNAL (receivedStdout (TDEProcess *, char *, int)),
+	   this, TQ_SLOT (received (TDEProcess *, char *, int)));
   
   if (includeStderr)
   {
-     connect (this, TQT_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
-              this, TQT_SLOT (received (TDEProcess *, char *, int)));
+     connect (this, TQ_SIGNAL (receivedStderr (TDEProcess *, char *, int)),
+              this, TQ_SLOT (received (TDEProcess *, char *, int)));
   }
 
-  connect (this, TQT_SIGNAL (wroteStdin(TDEProcess *)),
-	   this, TQT_SLOT (sent (TDEProcess *)));
+  connect (this, TQ_SIGNAL (wroteStdin(TDEProcess *)),
+	   this, TQ_SLOT (sent (TDEProcess *)));
            
   return TDEProcess::start (runmode, d->comm);
 }
diff --git a/tdecore/ksimpledirwatch.cpp b/tdecore/ksimpledirwatch.cpp
index a5bab80ce..205af6baf 100644
--- a/tdecore/ksimpledirwatch.cpp
+++ b/tdecore/ksimpledirwatch.cpp
@@ -213,7 +213,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
   : rescan_timer(0, "KSimpleDirWatchPrivate::rescan_timer")
 {
   timer = new TQTimer(this, "KSimpleDirWatchPrivate::timer");
-  connect (timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan()));
+  connect (timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan()));
   freq = 3600000; // 1 hour as upper bound
   statEntries = 0;
   delayRemove = false;
@@ -227,7 +227,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
 
   // used for FAM and DNOTIFY
   rescan_all = false;
-  connect(&rescan_timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(slotRescan()));
+  connect(&rescan_timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(slotRescan()));
 
 #ifdef HAVE_FAM
   // It's possible that FAM server can't be started
@@ -236,8 +236,8 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
     use_fam=true;
     sn = new TQSocketNotifier( FAMCONNECTION_GETFD(&fc),
 			      TQSocketNotifier::Read, this);
-    connect( sn, TQT_SIGNAL(activated(int)),
- 	     this, TQT_SLOT(famEventReceived()) );
+    connect( sn, TQ_SIGNAL(activated(int)),
+ 	     this, TQ_SLOT(famEventReceived()) );
   }
   else {
     kdDebug(7001) << "Can't use FAM (fam daemon not running?)" << endl;
@@ -273,7 +273,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
     fcntl(m_inotify_fd, F_SETFD, FD_CLOEXEC);
 
     mSn = new TQSocketNotifier( m_inotify_fd, TQSocketNotifier::Read, this );
-    connect( mSn, TQT_SIGNAL(activated( int )), this, TQT_SLOT( slotActivated() ) );
+    connect( mSn, TQ_SIGNAL(activated( int )), this, TQ_SLOT( slotActivated() ) );
   }
 #endif
 
@@ -307,7 +307,7 @@ KSimpleDirWatchPrivate::KSimpleDirWatchPrivate()
     fcntl(mPipe[0], F_SETFL, O_NONBLOCK | fcntl(mPipe[0], F_GETFL));
     fcntl(mPipe[1], F_SETFL, O_NONBLOCK | fcntl(mPipe[1], F_GETFL));
     mSn = new TQSocketNotifier( mPipe[0], TQSocketNotifier::Read, this);
-    connect(mSn, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotActivated()));
+    connect(mSn, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotActivated()));
     // Install the signal handler only once
     if ( dnotify_signal == 0 )
     {
@@ -1372,7 +1372,7 @@ void KSimpleDirWatchPrivate::slotRescan()
   if ( timerRunning )
     timer->start(freq);
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed()));
 }
 
 bool KSimpleDirWatchPrivate::isNoisyFile( const char * filename )
@@ -1421,7 +1421,7 @@ void KSimpleDirWatchPrivate::famEventReceived()
       checkFAMEvent(&fe);
   }
 
-  TQTimer::singleShot(0, this, TQT_SLOT(slotRemoveDelayed()));
+  TQTimer::singleShot(0, this, TQ_SLOT(slotRemoveDelayed()));
 }
 
 void KSimpleDirWatchPrivate::checkFAMEvent(FAMEvent* fe)
diff --git a/tdecore/ksock.cpp b/tdecore/ksock.cpp
index 3f4886b8a..8de28f476 100644
--- a/tdecore/ksock.cpp
+++ b/tdecore/ksock.cpp
@@ -140,7 +140,7 @@ void TDESocket::enableRead( bool _state )
 	  if ( !d->readNotifier  )
 		{
 		  d->readNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Read );
-		  TQObject::connect( d->readNotifier, TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotRead(int) ) );
+		  TQObject::connect( d->readNotifier, TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotRead(int) ) );
 		}
 	  else
 	    d->readNotifier->setEnabled( true );
@@ -156,8 +156,8 @@ void TDESocket::enableWrite( bool _state )
 	  if ( !d->writeNotifier )
 		{
 		  d->writeNotifier = new TQSocketNotifier( sock, TQSocketNotifier::Write );
-		  TQObject::connect( d->writeNotifier, TQT_SIGNAL( activated(int) ), this,
-							TQT_SLOT( slotWrite(int) ) );
+		  TQObject::connect( d->writeNotifier, TQ_SIGNAL( activated(int) ), this,
+							TQ_SLOT( slotWrite(int) ) );
 		}
 	  else
 	    d->writeNotifier->setEnabled( true );
@@ -357,7 +357,7 @@ bool TDEServerSocket::bindAndListen(bool suppressFailureMessages)
 
   sock = d->ks->fd();
 
-  connect( d->ks->readNotifier(), TQT_SIGNAL( activated(int) ), this, TQT_SLOT( slotAccept(int) ) );
+  connect( d->ks->readNotifier(), TQ_SIGNAL( activated(int) ), this, TQ_SLOT( slotAccept(int) ) );
   return true;
 }
 
diff --git a/tdecore/kuniqueapplication.cpp b/tdecore/kuniqueapplication.cpp
index 8dd6185d0..5e0b1cdff 100644
--- a/tdecore/kuniqueapplication.cpp
+++ b/tdecore/kuniqueapplication.cpp
@@ -324,11 +324,11 @@ KUniqueApplication::KUniqueApplication(bool allowStyles, bool GUIenabled, bool c
 
   if (s_nofork) {
     // Can't call newInstance directly from the constructor since it's virtual...
-    TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) );
   }
   else {
     // Force to handle DCOP requests (newInstance call)
-    TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed()));
   }
 }
 
@@ -345,11 +345,11 @@ KUniqueApplication::KUniqueApplication(Display *display, TQt::HANDLE visual,
 
   if (s_nofork) {
     // Can't call newInstance directly from the constructor since it's virtual...
-    TQTimer::singleShot( 0, this, TQT_SLOT(newInstanceNoFork()) );
+    TQTimer::singleShot( 0, this, TQ_SLOT(newInstanceNoFork()) );
   }
   else {
     // Force to handle DCOP requests (newInstance call)
-    TQTimer::singleShot( 0, this, TQT_SLOT(processDelayed()));
+    TQTimer::singleShot( 0, this, TQ_SLOT(processDelayed()));
   }
 }
 #endif
@@ -380,7 +380,7 @@ void KUniqueApplication::newInstanceNoFork()
   if (dcopClient()->isSuspended())
   {
     // Try again later.
-    TQTimer::singleShot( 200, this, TQT_SLOT(newInstanceNoFork()) );
+    TQTimer::singleShot( 200, this, TQ_SLOT(newInstanceNoFork()) );
     return;
   }
   
@@ -421,7 +421,7 @@ KUniqueApplication::delayRequest(const TQCString &fun, const TQByteArray &data)
   d->requestList.append(request);
   if (!d->processingRequest)
   {
-     TQTimer::singleShot(0, this, TQT_SLOT(processDelayed()));
+     TQTimer::singleShot(0, this, TQ_SLOT(processDelayed()));
   }
 }
 
@@ -431,7 +431,7 @@ KUniqueApplication::processDelayed()
   if (dcopClient()->isSuspended())
   {
     // Try again later.
-    TQTimer::singleShot( 200, this, TQT_SLOT(processDelayed()));
+    TQTimer::singleShot( 200, this, TQ_SLOT(processDelayed()));
     return;
   }
   d->processingRequest = true;
diff --git a/tdecore/network/kbufferedsocket.cpp b/tdecore/network/kbufferedsocket.cpp
index 51e3db002..08f899c8a 100644
--- a/tdecore/network/kbufferedsocket.cpp
+++ b/tdecore/network/kbufferedsocket.cpp
@@ -208,7 +208,7 @@ void TDEBufferedSocket::enableRead(bool enable)
   if (enable && state() != Connected && d->input && !d->input->isEmpty())
     // this means the buffer is still dirty
     // allow the signal to be emitted
-    TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity()));
+    TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity()));
 }
 
 void TDEBufferedSocket::enableWrite(bool enable)
@@ -358,7 +358,7 @@ void TDEBufferedSocket::slotReadActivity()
 	{
 	  // buffer isn't empty
 	  // keep emitting signals till it is
-	  TQTimer::singleShot(0, this, TQT_SLOT(slotReadActivity()));
+	  TQTimer::singleShot(0, this, TQ_SLOT(slotReadActivity()));
 	  emit readyRead();
 	}
     }
diff --git a/tdecore/network/kclientsocketbase.cpp b/tdecore/network/kclientsocketbase.cpp
index 48cbbc644..25eb34d8e 100644
--- a/tdecore/network/kclientsocketbase.cpp
+++ b/tdecore/network/kclientsocketbase.cpp
@@ -144,10 +144,10 @@ bool KClientSocketBase::lookup()
 
       // don't restart the lookups if they had succeeded and
       // the input values weren't changed
-      TQObject::connect(&d->peerResolver, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(lookupFinishedSlot()));
-      TQObject::connect(&d->localResolver, TQT_SIGNAL(finished(KResolverResults)), 
-		       this, TQT_SLOT(lookupFinishedSlot()));
+      TQObject::connect(&d->peerResolver, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(lookupFinishedSlot()));
+      TQObject::connect(&d->localResolver, TQ_SIGNAL(finished(KResolverResults)), 
+		       this, TQ_SLOT(lookupFinishedSlot()));
 
       if (d->localResolver.status() <= 0)
 	d->localResolver.start();
@@ -164,7 +164,7 @@ bool KClientSocketBase::lookup()
 	  if (blocking())
 	    lookupFinishedSlot();
 	  else
-	    TQTimer::singleShot(0, this, TQT_SLOT(lookupFinishedSlot()));
+	    TQTimer::singleShot(0, this, TQ_SLOT(lookupFinishedSlot()));
 	}
       else
 	{
@@ -427,8 +427,8 @@ void KClientSocketBase::lookupFinishedSlot()
   if (d->peerResolver.isRunning() || d->localResolver.isRunning() || state() != HostLookup)
     return;
 
-  TQObject::disconnect(&d->peerResolver, 0L, this, TQT_SLOT(lookupFinishedSlot()));
-  TQObject::disconnect(&d->localResolver, 0L, this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::disconnect(&d->peerResolver, 0L, this, TQ_SLOT(lookupFinishedSlot()));
+  TQObject::disconnect(&d->localResolver, 0L, this, TQ_SLOT(lookupFinishedSlot()));
   if (d->peerResolver.status() < 0 || d->localResolver.status() < 0)
     {
       setState(Idle);		// backtrack
@@ -453,7 +453,7 @@ void KClientSocketBase::stateChanging(SocketState newState)
       if (n)
 	{
 	  n->setEnabled(d->enableRead);
-	  TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity()));
+	  TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity()));
 	}
       else
 	return;
@@ -462,7 +462,7 @@ void KClientSocketBase::stateChanging(SocketState newState)
       if (n)
 	{
 	  n->setEnabled(d->enableWrite);
-	  TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity()));
+	  TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity()));
 	}
       else
 	return;
diff --git a/tdecore/network/kdatagramsocket.cpp b/tdecore/network/kdatagramsocket.cpp
index 97562c687..5fa631560 100644
--- a/tdecore/network/kdatagramsocket.cpp
+++ b/tdecore/network/kdatagramsocket.cpp
@@ -52,11 +52,11 @@ KDatagramSocket::KDatagramSocket(TQObject* parent, const char *name)
 
   localResolver().setFlags(KResolver::Passive);
 
-  //  TQObject::connect(localResolver(), TQT_SIGNAL(finished(KResolverResults)),
-  //		   this, TQT_SLOT(lookupFinishedLocal()));
-  TQObject::connect(&peerResolver(), TQT_SIGNAL(finished(KResolverResults)),
-  		   this, TQT_SLOT(lookupFinishedPeer()));
-  TQObject::connect(this, TQT_SIGNAL(hostFound()), this, TQT_SLOT(lookupFinishedLocal()));
+  //  TQObject::connect(localResolver(), TQ_SIGNAL(finished(KResolverResults)),
+  //		   this, TQ_SLOT(lookupFinishedLocal()));
+  TQObject::connect(&peerResolver(), TQ_SIGNAL(finished(KResolverResults)),
+  		   this, TQ_SLOT(lookupFinishedPeer()));
+  TQObject::connect(this, TQ_SIGNAL(hostFound()), this, TQ_SLOT(lookupFinishedLocal()));
 }
 
 KDatagramSocket::~KDatagramSocket()
@@ -265,7 +265,7 @@ void KDatagramSocket::setupSignals()
   if (n)
     {
       n->setEnabled(emitsReadyRead());
-      TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotReadActivity()));
+      TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotReadActivity()));
     }
   else
     return;
@@ -274,7 +274,7 @@ void KDatagramSocket::setupSignals()
   if (n)
     {
       n->setEnabled(emitsReadyWrite());
-      TQObject::connect(n, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotWriteActivity()));
+      TQObject::connect(n, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotWriteActivity()));
     }
   else
     return;
diff --git a/tdecore/network/kresolver.cpp b/tdecore/network/kresolver.cpp
index 17ab2f068..f80b9209e 100644
--- a/tdecore/network/kresolver.cpp
+++ b/tdecore/network/kresolver.cpp
@@ -604,7 +604,7 @@ bool KResolver::resolveAsync(TQObject* userObj, const char *userSlot,
 			     int flags, int families)
 {
   KResolver* qres = new KResolver(host, service, tqApp, "asynchronous KResolver");
-  TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)), userObj, userSlot);
+  TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)), userObj, userSlot);
   qres->setFlags(flags);
   qres->setFamily(families);
   qres->d->deleteWhenDone = true; // this is the only difference from the example code
diff --git a/tdecore/network/kresolver.h b/tdecore/network/kresolver.h
index fd0636417..51e605704 100644
--- a/tdecore/network/kresolver.h
+++ b/tdecore/network/kresolver.h
@@ -759,7 +759,7 @@ public:
    *
    * \code
    *   KResolver* qres = new KResolver(host, service);
-   *   TQObject::connect(qres, TQT_SIGNAL(finished(KResolverResults)),
+   *   TQObject::connect(qres, TQ_SIGNAL(finished(KResolverResults)),
    *			  userObj, userSlot);
    *   qres->setFlags(flags);
    *   qres->setFamily(families);
@@ -768,7 +768,7 @@ public:
    *
    * You should use it like this in your code:
    * \code
-   *   KResolver::resolveAsync(myObj, TQT_SLOT(mySlot(KResolverResults)), host, service);
+   *   KResolver::resolveAsync(myObj, TQ_SLOT(mySlot(KResolverResults)), host, service);
    * \endcode
    *
    * @param userObj		the object whose slot @p userSlot we will connect
diff --git a/tdecore/network/kserversocket.cpp b/tdecore/network/kserversocket.cpp
index 94532de19..0cfba8fa5 100644
--- a/tdecore/network/kserversocket.cpp
+++ b/tdecore/network/kserversocket.cpp
@@ -61,15 +61,15 @@ public:
 TDEServerSocket::TDEServerSocket(TQObject* parent, const char *name)
   : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
-  TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
-		   this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), 
+		   this, TQ_SLOT(lookupFinishedSlot()));
 }
 
 TDEServerSocket::TDEServerSocket(const TQString& service, TQObject* parent, const char *name)
   : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
-  TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
-		   this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), 
+		   this, TQ_SLOT(lookupFinishedSlot()));
   d->resolver.setServiceName(service);
 }
 
@@ -77,8 +77,8 @@ TDEServerSocket::TDEServerSocket(const TQString& node, const TQString& service,
 			     TQObject* parent, const char* name)
   : TQObject(parent, name), d(new TDEServerSocketPrivate)
 {
-  TQObject::connect(&d->resolver, TQT_SIGNAL(finished(KResolverResults)), 
-		   this, TQT_SLOT(lookupFinishedSlot()));
+  TQObject::connect(&d->resolver, TQ_SIGNAL(finished(KResolverResults)), 
+		   this, TQ_SLOT(lookupFinishedSlot()));
   setAddress(node, service);
 }
 
@@ -403,8 +403,8 @@ bool TDEServerSocket::doListen()
     }
   
   // set up ready accept signal
-  TQObject::connect(socketDevice()->readNotifier(), TQT_SIGNAL(activated(int)),
-		   this, TQT_SIGNAL(readyAccept()));
+  TQObject::connect(socketDevice()->readNotifier(), TQ_SIGNAL(activated(int)),
+		   this, TQ_SIGNAL(readyAccept()));
   d->state = TDEServerSocketPrivate::Listening;
   return true;
 }
diff --git a/tdecore/network/kserversocket.h b/tdecore/network/kserversocket.h
index 1455dcb08..637dc92d0 100644
--- a/tdecore/network/kserversocket.h
+++ b/tdecore/network/kserversocket.h
@@ -50,8 +50,8 @@ class TDEServerSocketPrivate;
  * \code
  *   TQString service = "http";
  *   TDEServerSocket *ss = new TDEServerSocket(service);
- *   connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
- *   connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+ *   connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
+ *   connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
  *   ss->listen();
  * \endcode
  * 
@@ -84,8 +84,8 @@ class TDEServerSocketPrivate;
  *   if( !found ) {
  *     // Couldn't connect to any port.
  *   } else {
- *     connect(ss, TQT_SIGNAL(readyAccept()), this, TQT_SLOT(slotReadyAccept()));
- *     connect(ss, TQT_SIGNAL(gotError(int)), this, TQT_SLOT(slotSocketError(int)));
+ *     connect(ss, TQ_SIGNAL(readyAccept()), this, TQ_SLOT(slotReadyAccept()));
+ *     connect(ss, TQ_SIGNAL(gotError(int)), this, TQ_SLOT(slotSocketError(int)));
  *     ss->listen();
  *   }
  * \endcode
diff --git a/tdecore/network/ksrvresolverworker.cpp b/tdecore/network/ksrvresolverworker.cpp
index 8f918977e..568e0d22b 100644
--- a/tdecore/network/ksrvresolverworker.cpp
+++ b/tdecore/network/ksrvresolverworker.cpp
@@ -226,7 +226,7 @@ bool KSrvResolverWorker::postprocess()
 void KSrvResolverWorker::customEvent(TQCustomEvent*)
 {
   dns = new TQDns(TQString::fromLatin1(encodedName), TQDns::Srv);
-  TQObject::connect(dns, TQT_SIGNAL(resultsReady()), this, TQT_SLOT(dnsResultsReady()));
+  TQObject::connect(dns, TQ_SIGNAL(resultsReady()), this, TQ_SLOT(dnsResultsReady()));
 }
 
 void KSrvResolverWorker::dnsResultsReady()
diff --git a/tdecore/network/kstreamsocket.cpp b/tdecore/network/kstreamsocket.cpp
index 6ba8dfe8b..a36f8cc78 100644
--- a/tdecore/network/kstreamsocket.cpp
+++ b/tdecore/network/kstreamsocket.cpp
@@ -61,7 +61,7 @@ KStreamSocket::KStreamSocket(const TQString& node, const TQString& service,
 
   setSocketOptions(socketOptions() & ~Blocking);
 
-  TQObject::connect(&d->timer, TQT_SIGNAL(timeout()), this, TQT_SLOT(timeoutSlot()));
+  TQObject::connect(&d->timer, TQ_SIGNAL(timeout()), this, TQ_SLOT(timeoutSlot()));
 }
 
 KStreamSocket::~KStreamSocket()
@@ -130,7 +130,7 @@ bool KStreamSocket::connect(const TQString& node, const TQString& service)
       // connection hasn't started yet
       if (!blocking())
 	{
-	  TQObject::connect(this, TQT_SIGNAL(hostFound()), TQT_SLOT(hostFoundSlot()));
+	  TQObject::connect(this, TQ_SIGNAL(hostFound()), TQ_SLOT(hostFoundSlot()));
 	  return lookup();
 	}
 
@@ -196,10 +196,10 @@ bool KStreamSocket::connect(const KResolverEntry& entry)
 
 void KStreamSocket::hostFoundSlot()
 {
-  TQObject::disconnect(this, TQT_SLOT(hostFoundSlot()));
+  TQObject::disconnect(this, TQ_SLOT(hostFoundSlot()));
   if (timeout() > 0)
     d->timer.start(timeout(), true);
-  TQTimer::singleShot(0, this, TQT_SLOT(connectionEvent()));
+  TQTimer::singleShot(0, this, TQ_SLOT(connectionEvent()));
 }
 
 void KStreamSocket::connectionEvent()
@@ -267,13 +267,13 @@ void KStreamSocket::connectionEvent()
 	  if (socketDevice()->error() == InProgress)
 	    {
 	      TQSocketNotifier *n = socketDevice()->readNotifier();
-	      TQObject::connect(n, TQT_SIGNAL(activated(int)),
-			       this, TQT_SLOT(connectionEvent()));
+	      TQObject::connect(n, TQ_SIGNAL(activated(int)),
+			       this, TQ_SLOT(connectionEvent()));
 	      n->setEnabled(true);
 
 	      n = socketDevice()->writeNotifier();
-	      TQObject::connect(n, TQT_SIGNAL(activated(int)),
-			       this, TQT_SLOT(connectionEvent()));
+	      TQObject::connect(n, TQ_SIGNAL(activated(int)),
+			       this, TQ_SLOT(connectionEvent()));
 	      n->setEnabled(true);
 
 	      return;		// wait for activity
@@ -350,8 +350,8 @@ bool KStreamSocket::bindLocallyFor(const KResolverEntry& peer)
 
 void KStreamSocket::connectionSucceeded(const KResolverEntry& peer)
 {
-  TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQT_SLOT(connectionEvent()));
-  TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQT_SLOT(connectionEvent()));
+  TQObject::disconnect(socketDevice()->readNotifier(), 0, this, TQ_SLOT(connectionEvent()));
+  TQObject::disconnect(socketDevice()->writeNotifier(), 0, this, TQ_SLOT(connectionEvent()));
 
   resetError();
   setFlags(IO_Sequential | IO_Raw | IO_ReadWrite | IO_Open | IO_Async);
diff --git a/tdecore/network/kstreamsocket.h b/tdecore/network/kstreamsocket.h
index 72d176fa3..a7557d585 100644
--- a/tdecore/network/kstreamsocket.h
+++ b/tdecore/network/kstreamsocket.h
@@ -70,14 +70,14 @@ class KStreamSocketPrivate;
  *    : socket(hostname, port)
  *  {
  *    // connect signals to our slots
- *    TQObject::connect(&socket, TQT_SIGNAL(connected(const KResolverEntry&)),
- *                     this, TQT_SLOT(slotSocketConnected()));
- *    TQObject::connect(&socket, TQT_SIGNAL(gotError(int)),
- *                     this, TQT_SLOT(slotSocketError(int)));
- *    TQObject::connect(&socket, TQT_SIGNAL(readyRead()),
- *                     this, TQT_SLOT(slotSocketReadyToRead()));
- *    TQObject::connect(&socket, TQT_SIGNAL(readyWrite()),
- *                     this, TQT_SLOT(slotSocketReadyToWrite()));
+ *    TQObject::connect(&socket, TQ_SIGNAL(connected(const KResolverEntry&)),
+ *                     this, TQ_SLOT(slotSocketConnected()));
+ *    TQObject::connect(&socket, TQ_SIGNAL(gotError(int)),
+ *                     this, TQ_SLOT(slotSocketError(int)));
+ *    TQObject::connect(&socket, TQ_SIGNAL(readyRead()),
+ *                     this, TQ_SLOT(slotSocketReadyToRead()));
+ *    TQObject::connect(&socket, TQ_SIGNAL(readyWrite()),
+ *                     this, TQ_SLOT(slotSocketReadyToWrite()));
  *
  *    // set non-blocking mode in order to work asynchronously
  *    socket.setBlocking(false);
diff --git a/tdecore/tdeaccel.cpp b/tdecore/tdeaccel.cpp
index 58499f7e4..fa8cccc56 100644
--- a/tdecore/tdeaccel.cpp
+++ b/tdecore/tdeaccel.cpp
@@ -170,7 +170,7 @@ TDEAccelPrivate::TDEAccelPrivate( TDEAccel* pParent, TQWidget* pWatch )
 	m_pAccel = pParent;
 	m_pWatch = pWatch;
 	m_bAutoUpdate = true;
-	connect( (TQAccel*)m_pAccel, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotKeyPressed(int)) );
+	connect( (TQAccel*)m_pAccel, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotKeyPressed(int)) );
 
 #ifdef Q_WS_X11 //only makes sense if TDEAccelEventHandler is working
 	if( m_pWatch )
@@ -240,7 +240,7 @@ bool TDEAccelPrivate::connectKey( TDEAccelAction& action, const KKeyServer::Key&
 #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 		((TQAccel*)m_pAccel)->connectItem( nID, action.objSlotPtr(), action.methodSlotPtr() );
 #else
-		((TQAccel*)m_pAccel)->connectItem( nID, this, TQT_SLOT(slotKeyPressed(int)));
+		((TQAccel*)m_pAccel)->connectItem( nID, this, TQ_SLOT(slotKeyPressed(int)));
 #endif
 		if( !action.isEnabled() )
 			((TQAccel*)m_pAccel)->setItemEnabled( nID, false );
@@ -318,9 +318,9 @@ void TDEAccelPrivate::slotKeyPressed( int id )
 			int iAction = pMenu->idAt(1);
 			slotMenuActivated( iAction );
 		} else {
-			connect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) );
+			connect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) );
 			pMenu->exec( m_pWatch->mapToGlobal( TQPoint( 0, 0 ) ) );
-			disconnect( pMenu, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotMenuActivated(int)) );
+			disconnect( pMenu, TQ_SIGNAL(activated(int)), this, TQ_SLOT(slotMenuActivated(int)) );
 		}
 		delete pMenu;
 	}
@@ -336,9 +336,9 @@ void TDEAccelPrivate::slotMenuActivated( int iAction )
 	TDEAccelAction* pAction = actions().actionPtr( iAction );
 #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 	if( pAction ) {
-		connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+		connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 		emit menuItemActivated();
-		disconnect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+		disconnect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 	}
 #else
 	emitActivatedSignal( pAction );
@@ -364,10 +364,10 @@ bool TDEAccelPrivate::eventFilter( TQObject* /*pWatched*/, TQEvent* pEvent )
 						continue;
 #ifdef Q_WS_WIN /** @todo TEMP: new implementation (commit #424926) didn't work */
 					TQGuardedPtr<TDEAccelPrivate> me = this;
-					connect( this, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+					connect( this, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 					emit menuItemActivated();
 					if (me) {
-						disconnect( me, TQT_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
+						disconnect( me, TQ_SIGNAL(menuItemActivated()), pAction->objSlotPtr(), pAction->methodSlotPtr() );
 					}
 #else
 					emitActivatedSignal( pAction );
@@ -391,18 +391,18 @@ void TDEAccelPrivate::emitActivatedSignal( TDEAccelAction* pAction )
 		TQGuardedPtr<TDEAccelPrivate> me = this;
 		TQRegExp reg( "([ ]*TDEAccelAction.*)" );
 		if( reg.search( pAction->methodSlotPtr()) >= 0 ) {
-			connect( this, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
+			connect( this, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)),
 				pAction->objSlotPtr(), pAction->methodSlotPtr() );
 			emit menuItemActivated( pAction );
 			if (me)
-				disconnect( me, TQT_SIGNAL(menuItemActivated(TDEAccelAction*)),
+				disconnect( me, TQ_SIGNAL(menuItemActivated(TDEAccelAction*)),
 					pAction->objSlotPtr(), pAction->methodSlotPtr() );
 		} else {
-			connect( this, TQT_SIGNAL(menuItemActivated()),
+			connect( this, TQ_SIGNAL(menuItemActivated()),
 				pAction->objSlotPtr(), pAction->methodSlotPtr() );
 			emit menuItemActivated();
 			if (me)
-				disconnect( me, TQT_SIGNAL(menuItemActivated()),
+				disconnect( me, TQ_SIGNAL(menuItemActivated()),
 					pAction->objSlotPtr(), pAction->methodSlotPtr() );
 
 		}
diff --git a/tdecore/tdeaccel.h b/tdecore/tdeaccel.h
index 8c806ad3f..dd0c03aad 100644
--- a/tdecore/tdeaccel.h
+++ b/tdecore/tdeaccel.h
@@ -74,9 +74,9 @@ class TDEAccelPrivate;
  * // Insert an action "Scroll Up" which is associated with the "Up" key:
  * pAccel->insert( "Scroll Up", i18n("Scroll up"),
  *                       i18n("Scroll up the current document by one line."),
- *                       TQt::Key_Up, this, TQT_SLOT(slotScrollUp()) );
+ *                       TQt::Key_Up, this, TQ_SLOT(slotScrollUp()) );
  * // Insert an standard acclerator action.
- * pAccel->insert( TDEStdAccel::Print, this, TQT_SLOT(slotPrint()) );
+ * pAccel->insert( TDEStdAccel::Print, this, TQ_SLOT(slotPrint()) );
  *
  * // Update the shortcuts by read any user-defined settings from the
  * // application's config file.
@@ -159,7 +159,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 * insert( "Do Something", i18n("Do Something"),
 	 *   i18n("This action allows you to do something really great with this program to "
 	 *        "the currently open document."),
-	 *   ALT+Key_D, this, TQT_SLOT(slotDoSomething()) );
+	 *   ALT+Key_D, this, TQ_SLOT(slotDoSomething()) );
 	 *\endcode
 	 *
 	 * @param sAction The internal name of the action.
@@ -191,7 +191,7 @@ class TDECORE_EXPORT TDEAccel : public TQAccel
 	 *
 	 * Usage:
 	 * \code
-	 * insert( i18n("Do Something"), ALT+Key_D, this, TQT_SLOT(slotDoSomething()) );
+	 * insert( i18n("Do Something"), ALT+Key_D, this, TQ_SLOT(slotDoSomething()) );
 	 * \endcode
 	 *
 	 * @param psAction The name AND label of the action.
diff --git a/tdecore/tdeaccelbase.h b/tdecore/tdeaccelbase.h
index ecd0ce358..7a2955b66 100644
--- a/tdecore/tdeaccelbase.h
+++ b/tdecore/tdeaccelbase.h
@@ -79,11 +79,11 @@ class TQWidget;
  * a->insertItem( i18n("Scroll Up"), "Scroll Up", "Up" );
  * // Insert an action "Scroll Down" which is not associated with any key:
  * a->insertItem( i18n("Scroll Down"), "Scroll Down", 0);
- * a->connectItem( "Scroll up", myWindow, TQT_SLOT( scrollUp() ) );
+ * a->connectItem( "Scroll up", myWindow, TQ_SLOT( scrollUp() ) );
  * // a->insertStdItem( TDEStdAccel::Print ); //not necessary, since it
  *	// is done automatially with the
  *	// connect below!
- * a->connectItem(TDEStdAccel::Print, myWindow, TQT_SLOT( printDoc() ) );
+ * a->connectItem(TDEStdAccel::Print, myWindow, TQ_SLOT( printDoc() ) );
  *
  * a->readSettings();
  *\endcode
@@ -93,12 +93,12 @@ class TQWidget;
  *
  * \code
  * int id;
- * id = popup->insertItem("&Print",this, TQT_SLOT(printDoc()));
+ * id = popup->insertItem("&Print",this, TQ_SLOT(printDoc()));
  * a->changeMenuAccel(popup, id, TDEStdAccel::Print );
  * \endcode
  *
  * If you want a somewhat "exotic" name for your standard print action, like
- *   id = popup->insertItem(i18n("Print &Document"),this, TQT_SLOT(printDoc()));
+ *   id = popup->insertItem(i18n("Print &Document"),this, TQ_SLOT(printDoc()));
  * it might be a good idea to insert the standard action before as
  *          a->insertStdItem( TDEStdAccel::Print, i18n("Print Document") )
  * as well, so that the user can easily find the corresponding function.
@@ -107,7 +107,7 @@ class TQWidget;
  * in a menu could be done with
  *
  * \code
- *    id = popup->insertItem(i18n"Scroll &up",this, TQT_SLOT(scrollUp()));
+ *    id = popup->insertItem(i18n"Scroll &up",this, TQ_SLOT(scrollUp()));
  *    a->changeMenuAccel(popup, id, "Scroll Up" );
  * \endcode
  *
diff --git a/tdecore/tdeaccelmanager.cpp b/tdecore/tdeaccelmanager.cpp
index e7cfb10eb..ea0b034fd 100644
--- a/tdecore/tdeaccelmanager.cpp
+++ b/tdecore/tdeaccelmanager.cpp
@@ -734,7 +734,7 @@ TDEPopupAccelManager::TDEPopupAccelManager(TQPopupMenu *popup)
   : TQObject(popup), m_popup(popup), m_count(-1)
 {
     aboutToShow(); // do one check and then connect to show
-    connect(popup, TQT_SIGNAL(aboutToShow()), TQT_SLOT(aboutToShow()));
+    connect(popup, TQ_SIGNAL(aboutToShow()), TQ_SLOT(aboutToShow()));
 }
 
 
@@ -840,7 +840,7 @@ QWidgetStackAccelManager::QWidgetStackAccelManager(TQWidgetStack *stack)
   : TQObject(stack), m_stack(stack)
 {
     aboutToShow(stack->visibleWidget()); // do one check and then connect to show
-    connect(stack, TQT_SIGNAL(aboutToShow(TQWidget *)), TQT_SLOT(aboutToShow(TQWidget *)));
+    connect(stack, TQ_SIGNAL(aboutToShow(TQWidget *)), TQ_SLOT(aboutToShow(TQWidget *)));
 }
 
 bool QWidgetStackAccelManager::eventFilter ( TQObject * watched, TQEvent * e )
diff --git a/tdecore/tdeapplication.cpp b/tdecore/tdeapplication.cpp
index 810942e21..fd1cffc9f 100644
--- a/tdecore/tdeapplication.cpp
+++ b/tdecore/tdeapplication.cpp
@@ -522,7 +522,7 @@ void TDEApplication::installX11EventFilter( TQWidget* filter )
         return;
     if (!x11Filter)
         x11Filter = new TQPtrList<TQWidget>;
-    connect ( filter, TQT_SIGNAL( destroyed() ), this, TQT_SLOT( x11FilterDestroyed() ) );
+    connect ( filter, TQ_SIGNAL( destroyed() ), this, TQ_SLOT( x11FilterDestroyed() ) );
     x11Filter->append( filter );
 }
 
@@ -636,7 +636,7 @@ bool TDEApplication::notify(TQObject *receiver, TQEvent *event)
             if( d->app_started_timer == NULL )
             {
                 d->app_started_timer = new TQTimer( this, "app_started_timer" );
-                connect( d->app_started_timer, TQT_SIGNAL( timeout()), TQT_SLOT( checkAppStartedSlot()));
+                connect( d->app_started_timer, TQ_SIGNAL( timeout()), TQ_SLOT( checkAppStartedSlot()));
             }
             if( !d->app_started_timer->isActive())
                 d->app_started_timer->start( 0, true );
@@ -1065,7 +1065,7 @@ void TDEApplication::init(bool GUIenabled)
     d->oldXIOErrorHandler = XSetIOErrorHandler( kde_xio_errhandler );
 #endif
 
-    connect( this, TQT_SIGNAL( aboutToQuit() ), this, TQT_SIGNAL( shutDown() ) );
+    connect( this, TQ_SIGNAL( aboutToQuit() ), this, TQ_SIGNAL( shutDown() ) );
 
 #ifdef Q_WS_X11 //FIXME(E)
     display = desktop()->x11Display();
@@ -1196,10 +1196,10 @@ DCOPClient *TDEApplication::dcopClient()
     s_DCOPClient->setServerAddress( args->getOption("dcopserver"));
   }
   if( kapp ) {
-    connect(s_DCOPClient, TQT_SIGNAL(attachFailed(const TQString &)),
-            kapp, TQT_SLOT(dcopFailure(const TQString &)));
-    connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ),
-            kapp, TQT_SLOT(dcopBlockUserInput(bool)) );
+    connect(s_DCOPClient, TQ_SIGNAL(attachFailed(const TQString &)),
+            kapp, TQ_SLOT(dcopFailure(const TQString &)));
+    connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ),
+            kapp, TQ_SLOT(dcopBlockUserInput(bool)) );
   }
   else
     s_dcopClientNeedsPostInit = true;
@@ -1213,8 +1213,8 @@ void TDEApplication::dcopClientPostInit()
   if( s_dcopClientNeedsPostInit )
     {
     s_dcopClientNeedsPostInit = false;
-    connect(s_DCOPClient, TQT_SIGNAL(blockUserInput(bool) ),
-            TQT_SLOT(dcopBlockUserInput(bool)) );
+    connect(s_DCOPClient, TQ_SIGNAL(blockUserInput(bool) ),
+            TQ_SLOT(dcopBlockUserInput(bool)) );
     s_DCOPClient->bindToApp(); // Make sure we get events from the DCOPClient.
     }
 }
@@ -3021,27 +3021,27 @@ void TDEApplication::invokeBrowser( const TQString &url, const TQCString& startu
 
 void TDEApplication::cut()
 {
-  invokeEditSlot( TQT_SLOT( cut() ) );
+  invokeEditSlot( TQ_SLOT( cut() ) );
 }
 
 void TDEApplication::copy()
 {
-  invokeEditSlot( TQT_SLOT( copy() ) );
+  invokeEditSlot( TQ_SLOT( copy() ) );
 }
 
 void TDEApplication::paste()
 {
-  invokeEditSlot( TQT_SLOT( paste() ) );
+  invokeEditSlot( TQ_SLOT( paste() ) );
 }
 
 void TDEApplication::clear()
 {
-  invokeEditSlot( TQT_SLOT( clear() ) );
+  invokeEditSlot( TQ_SLOT( clear() ) );
 }
 
 void TDEApplication::selectAll()
 {
-  invokeEditSlot( TQT_SLOT( selectAll() ) );
+  invokeEditSlot( TQ_SLOT( selectAll() ) );
 }
 
 void TDEApplication::broadcastKeyCode(unsigned int keyCode)
diff --git a/tdecore/tdeapplication.h b/tdecore/tdeapplication.h
index ee2b482a6..8e5e53ec8 100644
--- a/tdecore/tdeapplication.h
+++ b/tdecore/tdeapplication.h
@@ -621,7 +621,7 @@ public slots:
    * If the widget with focus provides a cut() slot, call that slot.  Thus for a
    * simple application cut can be implemented as:
    * \code
-   * KStdAction::cut( kapp, TQT_SLOT( cut() ), actionCollection() );
+   * KStdAction::cut( kapp, TQ_SLOT( cut() ), actionCollection() );
    * \endcode
    */
   void cut();
@@ -630,7 +630,7 @@ public slots:
    * If the widget with focus provides a copy() slot, call that slot.  Thus for a
    * simple application copy can be implemented as:
    * \code
-   * KStdAction::copy( kapp, TQT_SLOT( copy() ), actionCollection() );
+   * KStdAction::copy( kapp, TQ_SLOT( copy() ), actionCollection() );
    * \endcode
    */
   void copy();
@@ -639,7 +639,7 @@ public slots:
    * If the widget with focus provides a paste() slot, call that slot.  Thus for a
    * simple application copy can be implemented as:
    * \code
-   * KStdAction::paste( kapp, TQT_SLOT( paste() ), actionCollection() );
+   * KStdAction::paste( kapp, TQ_SLOT( paste() ), actionCollection() );
    * \endcode
    */
   void paste();
@@ -648,7 +648,7 @@ public slots:
    * If the widget with focus provides a clear() slot, call that slot.  Thus for a
    * simple application clear() can be implemented as:
    * \code
-   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQT_SLOT( clear() ), actionCollection(), "clear" );
+   * new TDEAction( i18n( "Clear" ), "edit-clear", 0, kapp, TQ_SLOT( clear() ), actionCollection(), "clear" );
    * \endcode
    *
    * Note that for some widgets, this may not provide the intended bahavior.  For
@@ -675,7 +675,7 @@ public slots:
    * If the widget with focus provides a selectAll() slot, call that slot.  Thus for a
    * simple application select all can be implemented as:
    * \code
-   * KStdAction::selectAll( kapp, TQT_SLOT( selectAll() ), actionCollection() );
+   * KStdAction::selectAll( kapp, TQ_SLOT( selectAll() ), actionCollection() );
    * \endcode
    */
   void selectAll();
@@ -1287,7 +1287,7 @@ protected:
    * This method is used internally to determine which edit slots are implemented
    * by the widget that has the focus, and to invoke those slots if available.
    *
-   * @param slot is the slot as returned using the TQT_SLOT() macro, for example TQT_SLOT( cut() )
+   * @param slot is the slot as returned using the TQ_SLOT() macro, for example TQ_SLOT( cut() )
    *
    * This method can be used in TDEApplication subclasses to implement application wide
    * edit actions not supported by the TDEApplication class.  For example (in your subclass):
@@ -1295,7 +1295,7 @@ protected:
    * \code
    * void MyApplication::deselect()
    * {
-   *   invokeEditSlot( TQT_SLOT( deselect() ) );
+   *   invokeEditSlot( TQ_SLOT( deselect() ) );
    * }
    * \endcode
    *
@@ -1303,7 +1303,7 @@ protected:
    * focused widget if it provides this slot.  You can combine this with TDEAction with:
    *
    * \code
-   * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQT_SLOT( cut() ), actionCollection() );
+   * KStdAction::deselect( static_cast<MyApplication *>( kapp ), TQ_SLOT( cut() ), actionCollection() );
    * \endcode
    *
    * @see cut()
diff --git a/tdecore/tdeconfigdialogmanager.cpp b/tdecore/tdeconfigdialogmanager.cpp
index f53ce3a30..7b23f43b8 100644
--- a/tdecore/tdeconfigdialogmanager.cpp
+++ b/tdecore/tdeconfigdialogmanager.cpp
@@ -69,52 +69,52 @@ void TDEConfigDialogManager::init(bool trackChanges)
   if(trackChanges)
   {
     // QT
-    changedMap.insert("TQButton", TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert("TQCheckBox", TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert("TQPushButton", TQT_SIGNAL(stateChanged(int)));
-    changedMap.insert("TQRadioButton", TQT_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQButton", TQ_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQCheckBox", TQ_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQPushButton", TQ_SIGNAL(stateChanged(int)));
+    changedMap.insert("TQRadioButton", TQ_SIGNAL(stateChanged(int)));
     // We can only store one thing, so you can't have
     // a ButtonGroup that is checkable.
-    changedMap.insert("TQButtonGroup", TQT_SIGNAL(clicked(int)));
-    changedMap.insert("TQGroupBox", TQT_SIGNAL(toggled(bool)));
-    changedMap.insert("TQComboBox", TQT_SIGNAL(activated (int)));
+    changedMap.insert("TQButtonGroup", TQ_SIGNAL(clicked(int)));
+    changedMap.insert("TQGroupBox", TQ_SIGNAL(toggled(bool)));
+    changedMap.insert("TQComboBox", TQ_SIGNAL(activated (int)));
     //qsqlproperty map doesn't store the text, but the value!
-    //changedMap.insert("TQComboBox", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert("TQDateEdit", TQT_SIGNAL(valueChanged(const TQDate &)));
-    changedMap.insert("TQDateTimeEdit", TQT_SIGNAL(valueChanged(const TQDateTime &)));
-    changedMap.insert("TQDial", TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert("TQLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert("TQSlider", TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert("TQSpinBox", TQT_SIGNAL(valueChanged(int)));
-    changedMap.insert("TQTimeEdit", TQT_SIGNAL(valueChanged(const TQTime &)));
-    changedMap.insert("TQTextEdit", TQT_SIGNAL(textChanged()));
-    changedMap.insert("TQTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &)));
-    changedMap.insert("TQMultiLineEdit", TQT_SIGNAL(textChanged()));
-    changedMap.insert("TQListBox", TQT_SIGNAL(selectionChanged()));
-    changedMap.insert("TQTabWidget", TQT_SIGNAL(currentChanged(TQWidget *)));
+    //changedMap.insert("TQComboBox", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert("TQDateEdit", TQ_SIGNAL(valueChanged(const TQDate &)));
+    changedMap.insert("TQDateTimeEdit", TQ_SIGNAL(valueChanged(const TQDateTime &)));
+    changedMap.insert("TQDial", TQ_SIGNAL(valueChanged (int)));
+    changedMap.insert("TQLineEdit", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert("TQSlider", TQ_SIGNAL(valueChanged(int)));
+    changedMap.insert("TQSpinBox", TQ_SIGNAL(valueChanged(int)));
+    changedMap.insert("TQTimeEdit", TQ_SIGNAL(valueChanged(const TQTime &)));
+    changedMap.insert("TQTextEdit", TQ_SIGNAL(textChanged()));
+    changedMap.insert("TQTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &)));
+    changedMap.insert("TQMultiLineEdit", TQ_SIGNAL(textChanged()));
+    changedMap.insert("TQListBox", TQ_SIGNAL(selectionChanged()));
+    changedMap.insert("TQTabWidget", TQ_SIGNAL(currentChanged(TQWidget *)));
 
     // KDE
-    changedMap.insert( "KComboBox", TQT_SIGNAL(activated (int)));
-    changedMap.insert( "TDEFontCombo", TQT_SIGNAL(activated (int)));
-    changedMap.insert( "TDEFontRequester", TQT_SIGNAL(fontSelected(const TQFont &)));
-    changedMap.insert( "TDEFontChooser",  TQT_SIGNAL(fontSelected(const TQFont &)));
-    changedMap.insert( "KHistoryCombo", TQT_SIGNAL(activated (int)));
-
-    changedMap.insert( "KColorButton", TQT_SIGNAL(changed(const TQColor &)));
-    changedMap.insert( "KDatePicker", TQT_SIGNAL(dateSelected (TQDate)));
-    changedMap.insert( "KDateWidget", TQT_SIGNAL(changed (TQDate)));
-    changedMap.insert( "KDateTimeWidget", TQT_SIGNAL(valueChanged (const TQDateTime &)));
-    changedMap.insert( "KEditListBox", TQT_SIGNAL(changed()));
-    changedMap.insert( "TDEListBox", TQT_SIGNAL(selectionChanged()));
-    changedMap.insert( "KLineEdit", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert( "KPasswordEdit", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert( "KRestrictedLine", TQT_SIGNAL(textChanged(const TQString &)));
-    changedMap.insert( "KTextBrowser", TQT_SIGNAL(sourceChanged(const TQString &)));
-    changedMap.insert( "KTextEdit", TQT_SIGNAL(textChanged()));
-    changedMap.insert( "KURLRequester",  TQT_SIGNAL(textChanged (const TQString& )));
-    changedMap.insert( "KIntNumInput", TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert( "KIntSpinBox", TQT_SIGNAL(valueChanged (int)));
-    changedMap.insert( "KDoubleNumInput", TQT_SIGNAL(valueChanged (double)));
+    changedMap.insert( "KComboBox", TQ_SIGNAL(activated (int)));
+    changedMap.insert( "TDEFontCombo", TQ_SIGNAL(activated (int)));
+    changedMap.insert( "TDEFontRequester", TQ_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( "TDEFontChooser",  TQ_SIGNAL(fontSelected(const TQFont &)));
+    changedMap.insert( "KHistoryCombo", TQ_SIGNAL(activated (int)));
+
+    changedMap.insert( "KColorButton", TQ_SIGNAL(changed(const TQColor &)));
+    changedMap.insert( "KDatePicker", TQ_SIGNAL(dateSelected (TQDate)));
+    changedMap.insert( "KDateWidget", TQ_SIGNAL(changed (TQDate)));
+    changedMap.insert( "KDateTimeWidget", TQ_SIGNAL(valueChanged (const TQDateTime &)));
+    changedMap.insert( "KEditListBox", TQ_SIGNAL(changed()));
+    changedMap.insert( "TDEListBox", TQ_SIGNAL(selectionChanged()));
+    changedMap.insert( "KLineEdit", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert( "KPasswordEdit", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert( "KRestrictedLine", TQ_SIGNAL(textChanged(const TQString &)));
+    changedMap.insert( "KTextBrowser", TQ_SIGNAL(sourceChanged(const TQString &)));
+    changedMap.insert( "KTextEdit", TQ_SIGNAL(textChanged()));
+    changedMap.insert( "KURLRequester",  TQ_SIGNAL(textChanged (const TQString& )));
+    changedMap.insert( "KIntNumInput", TQ_SIGNAL(valueChanged (int)));
+    changedMap.insert( "KIntSpinBox", TQ_SIGNAL(valueChanged (int)));
+    changedMap.insert( "KDoubleNumInput", TQ_SIGNAL(valueChanged (double)));
   }
 
   // Go through all of the children of the widgets and find all known widgets
@@ -199,7 +199,7 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
         else
         {
           connect(childWidget, *changedIt,
-                  this, TQT_SIGNAL(widgetModified()));
+                  this, TQ_SIGNAL(widgetModified()));
 
           TQGroupBox *gb = dynamic_cast<TQGroupBox *>(childWidget);
           if (!gb)
@@ -209,8 +209,8 @@ bool TDEConfigDialogManager::parseChildren(const TQWidget *widget, bool trackCha
 
           TQComboBox *cb = dynamic_cast<TQComboBox *>(childWidget);
           if (cb && cb->editable())
-            connect(cb, TQT_SIGNAL(textChanged(const TQString &)),
-                    this, TQT_SIGNAL(widgetModified()));
+            connect(cb, TQ_SIGNAL(textChanged(const TQString &)),
+                    this, TQ_SIGNAL(widgetModified()));
         }
       }
       else
@@ -291,7 +291,7 @@ void TDEConfigDialogManager::updateWidgets()
   blockSignals(bSignalsBlocked);
 
   if (changed)
-    TQTimer::singleShot(0, this, TQT_SIGNAL(widgetModified()));
+    TQTimer::singleShot(0, this, TQ_SIGNAL(widgetModified()));
 }
 
 void TDEConfigDialogManager::updateWidgetsDefault()
diff --git a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
index 3e8ef6daa..754fd31b8 100644
--- a/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
+++ b/tdecore/tdehw/networkbackends/network-manager/network-manager.cpp
@@ -1259,23 +1259,23 @@ TDENetworkConnectionManager_BackendNM::TDENetworkConnectionManager_BackendNM(TDE
 	}
 
 	// Connect global signals
-	connect(d->m_networkManagerProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessGlobalStateChanged(TQ_UINT32)));
+	connect(d->m_networkManagerProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessGlobalStateChanged(TQ_UINT32)));
 
 	// Connect VPN signals
 	if (d->m_vpnProxy) {
-		connect(d->m_vpnProxy, SIGNAL(StateChanged(TQ_UINT32)), d, SLOT(internalProcessVPNStateChanged(TQ_UINT32)));
-		connect(d->m_vpnProxy, SIGNAL(LoginBanner(const TQString&)), d, SLOT(internalProcessVPNLoginBanner(const TQString&)));
-		connect(d->m_vpnProxy, SIGNAL(Failure(TQ_UINT32)), d, SLOT(internalProcessVPNFailure(TQ_UINT32)));
+		connect(d->m_vpnProxy, TQ_SIGNAL(StateChanged(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNStateChanged(TQ_UINT32)));
+		connect(d->m_vpnProxy, TQ_SIGNAL(LoginBanner(const TQString&)), d, TQ_SLOT(internalProcessVPNLoginBanner(const TQString&)));
+		connect(d->m_vpnProxy, TQ_SIGNAL(Failure(TQ_UINT32)), d, TQ_SLOT(internalProcessVPNFailure(TQ_UINT32)));
 	}
 
 	// Connect local signals
 	if (d->m_networkDeviceProxy) {
-		connect(d->m_networkDeviceProxy, SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)));
+		connect(d->m_networkDeviceProxy, TQ_SIGNAL(StateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)), d, TQ_SLOT(internalProcessDeviceStateChanged(TQ_UINT32, TQ_UINT32, TQ_UINT32)));
 	}
 	if (d->m_wiFiDeviceProxy) {
-		connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&)));
-		connect(d->m_wiFiDeviceProxy, SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&)));
-		connect(d->m_wiFiDeviceProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
+		connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointAdded(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointAdded(const TQT_DBusObjectPath&)));
+		connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(AccessPointRemoved(const TQT_DBusObjectPath&)), d, TQ_SLOT(internalProcessWiFiAccessPointRemoved(const TQT_DBusObjectPath&)));
+		connect(d->m_wiFiDeviceProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), d, TQ_SLOT(internalProcessWiFiPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
 	}
 
 	// Create public lists
@@ -1510,7 +1510,7 @@ void TDENetworkConnectionManager_BackendNMPrivate::internalProcessWiFiAccessPoin
 			// Set up monitoring object
 			DBus::AccessPointProxy* apProxy = new DBus::AccessPointProxy(NM_DBUS_SERVICE, dbuspath);
 			apProxy->setConnection(TQT_DBusConnection::systemBus());
-			connect(apProxy, SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
+			connect(apProxy, TQ_SIGNAL(PropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)), this, TQ_SLOT(internalProcessAPPropertiesChanged(const TQMap<TQString, TQT_DBusVariant>&)));
 			m_accessPointProxyList[dbuspath] = (apProxy);
 
 			// Notify client applications
@@ -1599,7 +1599,7 @@ TDENetworkConnectionType::TDENetworkConnectionType TDENetworkConnectionManager_B
 	// Obtain connection settings from the path specified
 	DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, dbusPath);
 	connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-	connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+	connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
 	int asyncCallID;
 	ret = connectionSettings.GetSettingsAsync(asyncCallID, error);
 	if (ret && error.isValid()) {
@@ -1928,8 +1928,8 @@ void TDENetworkConnectionManager_BackendNM::loadConnectionInformation() {
 				// Obtain connection settings from the path specified
 				DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, (*it));
 				connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-				connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
-				connect(&connectionSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError)));
+				connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+				connect(&connectionSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processConnectionSettingsAsyncError(int, const TQT_DBusError)));
 				int asyncCallID;
 				ret = connectionSettings.GetSettingsAsync(asyncCallID, error);
 				if (ret && error.isValid()) {
@@ -3055,7 +3055,7 @@ bool TDENetworkConnectionManager_BackendNM::loadConnectionSecretsForGroup(TQStri
 		// Obtain connection secrets from the path specified
 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-		connect(&connectionSettings, SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+		connect(&connectionSettings, TQ_SIGNAL(GetSecretsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
 		int asyncCallID;
 		ret = connectionSettings.GetSecretsAsync(asyncCallID, group, error);
 		if (ret && error.isValid()) {
@@ -3260,7 +3260,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
 		// Obtain connection settings from the path specified
 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-		connect(&connectionSettings, SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
+		connect(&connectionSettings, TQ_SIGNAL(GetSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)), d, TQ_SLOT(processConnectionSettingsAsyncReply(int, const TQT_DBusDataMap<TQString>&)));
 		int asyncCallID;
 		ret = connectionSettings.GetSettingsAsync(asyncCallID, error);
 		if (ret && error.isValid()) {
@@ -4492,7 +4492,7 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
 		// Save connection settings to the path specified
 		DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 		connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-		connect(&connectionSettings, SIGNAL(UpdateAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int)));
+		connect(&connectionSettings, TQ_SIGNAL(UpdateAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int)));
 		int asyncCallID;
 		ret = connectionSettings.UpdateAsync(asyncCallID, connectionSettingsMap, error);
 		if (ret && error.isValid()) {
@@ -4526,8 +4526,8 @@ bool TDENetworkConnectionManager_BackendNM::saveConnection(TDENetworkConnection*
 		printf("[network-manager comm debug] Creating new connection\n"); fflush(stdout);
 #endif // DEBUG_NETWORK_MANAGER_COMMUNICATIONS
 		// Create new connection
-		connect(d->m_networkManagerSettings, SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
-		connect(d->m_networkManagerSettings, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
+		connect(d->m_networkManagerSettings, TQ_SIGNAL(AddConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
+		connect(d->m_networkManagerSettings, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
 		int asyncCallID;
 		ret = d->m_networkManagerSettings->AddConnectionAsync(asyncCallID, connectionSettingsMap, error);
 		if (ret && error.isValid()) {
@@ -4580,7 +4580,7 @@ bool TDENetworkConnectionManager_BackendNM::deleteConnection(TQString uuid) {
 			// Obtain connection secrets from the path specified
 			DBus::ConnectionSettingsInterface connectionSettings(NM_DBUS_SERVICE, existingConnection);
 			connectionSettings.setConnection(TQT_DBusConnection::systemBus());
-			connect(&connectionSettings, SIGNAL(DeleteAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int)));
+			connect(&connectionSettings, TQ_SIGNAL(DeleteAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int)));
 			int asyncCallID;
 			ret = connectionSettings.DeleteAsync(asyncCallID, error);
 			if (ret && error.isValid()) {
@@ -4804,8 +4804,8 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
 			return checkConnectionStatus(uuid);
 #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS
 #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING
-			connect(d->m_networkManagerProxy, SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
-			connect(d->m_networkManagerProxy, SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
+			connect(d->m_networkManagerProxy, TQ_SIGNAL(ActivateConnectionAsyncReply(int, const TQT_DBusObjectPath&)), d, TQ_SLOT(processAddConnectionAsyncReply(int, const TQT_DBusObjectPath&)));
+			connect(d->m_networkManagerProxy, TQ_SIGNAL(AsyncErrorResponseDetected(int, const TQT_DBusError)), d, TQ_SLOT(processAddConnectionAsyncError(int, const TQT_DBusError)));
 #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING
 			int asyncCallID;
 			ret = d->m_networkManagerProxy->ActivateConnectionAsync(asyncCallID, existingConnection, TQT_DBusObjectPath(d->m_dbusDeviceString.ascii()), TQT_DBusObjectPath("/"), error);
@@ -5000,7 +5000,7 @@ TDENetworkConnectionStatus::TDENetworkConnectionStatus TDENetworkConnectionManag
 			return checkConnectionStatus(uuid);
 #else // USE_ASYNC_DBUS_CONNECTION_COMMAND_CALLS
 #ifdef WAIT_FOR_OPERATION_BEFORE_RETURNING
-			connect(d->m_networkManagerProxy, SIGNAL(DeactivateConnectionAsyncReply(int)), d, SLOT(processConnectionSettingsUpdateAsyncReply(int)));
+			connect(d->m_networkManagerProxy, TQ_SIGNAL(DeactivateConnectionAsyncReply(int)), d, TQ_SLOT(processConnectionSettingsUpdateAsyncReply(int)));
 #endif // WAIT_FOR_OPERATION_BEFORE_RETURNING
 			int asyncCallID;
 			ret = d->m_networkManagerProxy->DeactivateConnectionAsync(asyncCallID, existingConnection, error);
@@ -5441,7 +5441,7 @@ TDENetworkConnectionManager_BackendNMPrivate::TDENetworkConnectionManager_Backen
 	// Set up global signal handler
 	m_dbusSignalConnection = new TQT_DBusConnection(TQT_DBusConnection::systemBus());
 	m_dbusSignalReceiver = new TDENetworkConnectionManager_BackendNM_DBusSignalReceiver(this);
-	m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQT_SLOT(dbusSignal(const TQT_DBusMessage&)));
+	m_dbusSignalConnection->connect(m_dbusSignalReceiver, TQ_SLOT(dbusSignal(const TQT_DBusMessage&)));
 }
 
 TDENetworkConnectionManager_BackendNMPrivate::~TDENetworkConnectionManager_BackendNMPrivate() {
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp
index c593d2ab6..4d9eeaab3 100644
--- a/tdecore/tdehw/tdecryptographiccarddevice.cpp
+++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp
@@ -509,9 +509,9 @@ void TDECryptographicCardDevice::enableCardMonitoring(bool enable) {
 
 		m_watcherObject->cardDevice = this;
 		m_watcherObject->moveToThread(m_watcherThread);
-		TQObject::connect(m_watcherObject, SIGNAL(statusChanged(TQString,TQString)), this, SLOT(cardStatusChanged(TQString,TQString)));
-		TQObject::connect(m_watcherObject, SIGNAL(pinRequested(TQString)), this, SLOT(workerRequestedPin(TQString)));
-		TQTimer::singleShot(0, m_watcherObject, SLOT(run()));
+		TQObject::connect(m_watcherObject, TQ_SIGNAL(statusChanged(TQString,TQString)), this, TQ_SLOT(cardStatusChanged(TQString,TQString)));
+		TQObject::connect(m_watcherObject, TQ_SIGNAL(pinRequested(TQString)), this, TQ_SLOT(workerRequestedPin(TQString)));
+		TQTimer::singleShot(0, m_watcherObject, TQ_SLOT(run()));
 
 		m_watcherThread->start();
 	}
diff --git a/tdecore/tdehw/tdeeventdevice.cpp b/tdecore/tdehw/tdeeventdevice.cpp
index c528a42db..3223e80e7 100644
--- a/tdecore/tdehw/tdeeventdevice.cpp
+++ b/tdecore/tdehw/tdeeventdevice.cpp
@@ -349,7 +349,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) {
 		if (eventType() != TDEEventDeviceType::Unknown) {
 			if (m_fd >= 0) {
 				m_eventNotifier = new TQSocketNotifier(m_fd, TQSocketNotifier::Read, this);
-				connect( m_eventNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(eventReceived()) );
+				connect( m_eventNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(eventReceived()) );
 				m_monitorActive = true;
 			}
 		}
@@ -357,7 +357,7 @@ void TDEEventDevice::internalStartMonitoring(TDEHardwareDevices* hwmanager) {
 			// get initial state of switches
 			internalReadProvidedSwitches();
 			internalReadActiveSwitches();
-			connect( this, TQT_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQT_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) );
+			connect( this, TQ_SIGNAL(keyPressed(unsigned int, TDEEventDevice*)), hwmanager, TQ_SLOT(processEventDeviceKeyPressed(unsigned int, TDEEventDevice*)) );
 		}
 	}
 }
@@ -387,9 +387,9 @@ void TDEEventDevice::processActiveSwitches() {
 }
 
 void TDEEventDevice::connectNotify( const char* signal ) {
-	if( !m_monitorActive && qstrcmp( signal, TQT_SIGNAL(switchChanged())) == 0 ) {
+	if( !m_monitorActive && qstrcmp( signal, TQ_SIGNAL(switchChanged())) == 0 ) {
 		m_watchTimer = new TQTimer(this);
-		connect( m_watchTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processActiveSwitches()) );
+		connect( m_watchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processActiveSwitches()) );
 		m_watchTimer->start( 2500, false );
 		m_monitorActive = true;
 
diff --git a/tdecore/tdehw/tdehardwaredevices.cpp b/tdecore/tdehw/tdehardwaredevices.cpp
index 39f57451b..f54b1e138 100644
--- a/tdecore/tdehw/tdehardwaredevices.cpp
+++ b/tdecore/tdehw/tdehardwaredevices.cpp
@@ -155,7 +155,7 @@ TDEHardwareDevices::TDEHardwareDevices() {
 		int udevmonitorfd = udev_monitor_get_fd(m_udevMonitorStruct);
 		if (udevmonitorfd >= 0) {
 			m_devScanNotifier = new TQSocketNotifier(udevmonitorfd, TQSocketNotifier::Read, this);
-			connect( m_devScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processHotPluggedHardware()) );
+			connect( m_devScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processHotPluggedHardware()) );
 		}
 
 		// Read in the current mount table
@@ -177,7 +177,7 @@ TDEHardwareDevices::TDEHardwareDevices() {
 		m_procMountsFd = open("/proc/mounts", O_RDONLY, 0);
 		if (m_procMountsFd >= 0) {
 			m_mountScanNotifier = new TQSocketNotifier(m_procMountsFd, TQSocketNotifier::Exception, this);
-			connect( m_mountScanNotifier, TQT_SIGNAL(activated(int)), this, TQT_SLOT(processModifiedMounts()) );
+			connect( m_mountScanNotifier, TQ_SIGNAL(activated(int)), this, TQ_SLOT(processModifiedMounts()) );
 		}
 
 		// Read in the current cpu information
@@ -199,20 +199,20 @@ TDEHardwareDevices::TDEHardwareDevices() {
 		// Monitor for changed cpu information
 		// Watched directories are set up during the initial CPU scan
 		m_cpuWatch = new KSimpleDirWatch(this);
-		connect( m_cpuWatch, TQT_SIGNAL(dirty(const TQString &)), this, TQT_SLOT(processModifiedCPUs()) );
+		connect( m_cpuWatch, TQ_SIGNAL(dirty(const TQString &)), this, TQ_SLOT(processModifiedCPUs()) );
 #else
 		m_cpuWatchTimer = new TQTimer(this);
-		connect( m_cpuWatchTimer, SIGNAL(timeout()), this, SLOT(processModifiedCPUs()) );
+		connect( m_cpuWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processModifiedCPUs()) );
 #endif
 
 		// Some devices do not receive update signals from udev
 		// These devices must be polled, and a good polling interval is 1 second
 		m_deviceWatchTimer = new TQTimer(this);
-		connect( m_deviceWatchTimer, SIGNAL(timeout()), this, SLOT(processStatelessDevices()) );
+		connect( m_deviceWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processStatelessDevices()) );
 
 		// Special case for battery and power supply polling (longer delay, 5 seconds)
 		m_batteryWatchTimer = new TQTimer(this);
-		connect( m_batteryWatchTimer, SIGNAL(timeout()), this, SLOT(processBatteryDevices()) );
+		connect( m_batteryWatchTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processBatteryDevices()) );
 
 		// Update internal device information.
 		queryHardwareInformation();
diff --git a/tdecore/tdehw/tdenetworkconnections.cpp b/tdecore/tdehw/tdenetworkconnections.cpp
index 0b6405ea3..b2ae276a8 100644
--- a/tdecore/tdehw/tdenetworkconnections.cpp
+++ b/tdecore/tdehw/tdenetworkconnections.cpp
@@ -707,7 +707,7 @@ TDEWiFiConnection::~TDEWiFiConnection() {
 
 TDENetworkConnectionManager::TDENetworkConnectionManager(TDENetworkDevice *networkDevice) : TQObject(), m_connectionList(NULL), m_hwNeighborList(NULL), m_networkDevice(networkDevice), m_prevConnectionStatus(TDENetworkGlobalManagerFlags::Unknown) {
 	m_emissionTimer = new TQTimer();
-	connect(m_emissionTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(emitQueuedSignals()));
+	connect(m_emissionTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(emitQueuedSignals()));
 	if (!m_emissionTimer->isActive()) m_emissionTimer->start(0, true);
 }
 
@@ -962,9 +962,9 @@ TDEGlobalNetworkManager::TDEGlobalNetworkManager() : m_internalConnectionManager
 	m_internalConnectionManager = new TDENetworkConnectionManager_BackendNM(NULL);
 #endif // WITH_NETWORK_MANAGER_BACKEND
 	if (m_internalConnectionManager) {
-		connect(m_internalConnectionManager, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
-		connect(m_internalConnectionManager, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
-		connect(m_internalConnectionManager, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)));
+		connect(m_internalConnectionManager, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)), this, TQ_SIGNAL(networkConnectionStateChanged(TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags, TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags)));
+		connect(m_internalConnectionManager, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, TQ_SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
+		connect(m_internalConnectionManager, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)), this, TQ_SIGNAL(networkManagementEvent(TDENetworkGlobalEventType::TDENetworkGlobalEventType)));
 	}
 }
 
diff --git a/tdecore/tdeshortcut.h b/tdecore/tdeshortcut.h
index 407d558a8..69fb3c82c 100644
--- a/tdecore/tdeshortcut.h
+++ b/tdecore/tdeshortcut.h
@@ -528,7 +528,7 @@ class TDECORE_EXPORT KKeySequence
 * the below code binds the escape key to the close action.
 *
 * \code
-*  TDEAction *closeAction = KStdAction::close( this, TQT_SLOT( close() ), actionCollection() );
+*  TDEAction *closeAction = KStdAction::close( this, TQ_SLOT( close() ), actionCollection() );
 *  TDEShortcut closeShortcut = closeAction->shortcut();
 *  closeShortcut.append( KKey(Key_Escape));
 *  closeAction->setShortcut(closeShortcut);
diff --git a/tdecore/tdestartupinfo.cpp b/tdecore/tdestartupinfo.cpp
index 99fdefa73..edcb27831 100644
--- a/tdecore/tdestartupinfo.cpp
+++ b/tdecore/tdestartupinfo.cpp
@@ -134,15 +134,15 @@ void TDEStartupInfo::init( int flags_P )
     if( !( d->flags & DisableKWinModule ))
         {
         d->wm_module = new KWinModule( this );
-        connect( d->wm_module, TQT_SIGNAL( windowAdded( WId )), TQT_SLOT( slot_window_added( WId )));
-        connect( d->wm_module, TQT_SIGNAL( systemTrayWindowAdded( WId )), TQT_SLOT( slot_window_added( WId )));
+        connect( d->wm_module, TQ_SIGNAL( windowAdded( WId )), TQ_SLOT( slot_window_added( WId )));
+        connect( d->wm_module, TQ_SIGNAL( systemTrayWindowAdded( WId )), TQ_SLOT( slot_window_added( WId )));
         }
     else
         d->wm_module = NULL;
-    connect( &d->msgs, TQT_SIGNAL( gotMessage( const TQString& )), TQT_SLOT( got_message( const TQString& )));
+    connect( &d->msgs, TQ_SIGNAL( gotMessage( const TQString& )), TQ_SLOT( got_message( const TQString& )));
 #endif
     d->cleanup = new TQTimer( this, "cleanup" );
-    connect( d->cleanup, TQT_SIGNAL( timeout()), TQT_SLOT( startups_cleanup()));
+    connect( d->cleanup, TQ_SIGNAL( timeout()), TQ_SLOT( startups_cleanup()));
     }
 
 TDEStartupInfo::~TDEStartupInfo()
@@ -815,7 +815,7 @@ void TDEStartupInfo::setTimeout( unsigned int secs_P )
     {
     timeout = secs_P;
  // schedule removing entries that are older than the new timeout
-    TQTimer::singleShot( 0, this, TQT_SLOT( startups_cleanup_no_age()));
+    TQTimer::singleShot( 0, this, TQ_SLOT( startups_cleanup_no_age()));
     }
 
 void TDEStartupInfo::startups_cleanup_no_age()
diff --git a/tdecore/tests/kipctest.cpp b/tdecore/tests/kipctest.cpp
index d1a678ac9..72101d8b1 100644
--- a/tdecore/tests/kipctest.cpp
+++ b/tdecore/tests/kipctest.cpp
@@ -8,12 +8,12 @@
 MyObject::MyObject()
     : TQObject(0L, "testobj")
 {
-    connect(kapp, TQT_SIGNAL(tdedisplayPaletteChanged()), TQT_SLOT(slotPaletteChanged()));
-    connect(kapp, TQT_SIGNAL(tdedisplayFontChanged()), TQT_SLOT(slotFontChanged()));
-    connect(kapp, TQT_SIGNAL(tdedisplayStyleChanged()), TQT_SLOT(slotStyleChanged()));
-    connect(kapp, TQT_SIGNAL(backgroundChanged(int)), TQT_SLOT(slotBackgroundChanged(int)));
-    connect(kapp, TQT_SIGNAL(appearanceChanged()), TQT_SLOT(slotAppearanceChanged()));
-    connect(kapp, TQT_SIGNAL(kipcMessage(int,int)), TQT_SLOT(slotMessage(int,int)));
+    connect(kapp, TQ_SIGNAL(tdedisplayPaletteChanged()), TQ_SLOT(slotPaletteChanged()));
+    connect(kapp, TQ_SIGNAL(tdedisplayFontChanged()), TQ_SLOT(slotFontChanged()));
+    connect(kapp, TQ_SIGNAL(tdedisplayStyleChanged()), TQ_SLOT(slotStyleChanged()));
+    connect(kapp, TQ_SIGNAL(backgroundChanged(int)), TQ_SLOT(slotBackgroundChanged(int)));
+    connect(kapp, TQ_SIGNAL(appearanceChanged()), TQ_SLOT(slotAppearanceChanged()));
+    connect(kapp, TQ_SIGNAL(kipcMessage(int,int)), TQ_SLOT(slotMessage(int,int)));
 }
 
 int main(int argc, char **argv)
diff --git a/tdecore/tests/kipctest.h b/tdecore/tests/kipctest.h
index 1f71843f6..d4c3d538d 100644
--- a/tdecore/tests/kipctest.h
+++ b/tdecore/tests/kipctest.h
@@ -10,12 +10,12 @@ public:
     MyObject();
 
 public slots:
-    void slotPaletteChanged() { printf("SIGNAL: Palette changed\n"); }
-    void slotStyleChanged() { printf("SIGNAL: Style changed\n"); }
-    void slotFontChanged() { printf("SIGNAL: Font changed\n"); }
-    void slotBackgroundChanged(int i) { printf("SIGNAL: Background %d changed\n", i); }
-    void slotAppearanceChanged() { printf("SIGNAL: Appearance changed\n"); }
-    void slotMessage(int id, int arg) { printf("SIGNAL: user message: %d,%d\n", id, arg); }
+    void slotPaletteChanged() { printf("TQ_SIGNAL: Palette changed\n"); }
+    void slotStyleChanged() { printf("TQ_SIGNAL: Style changed\n"); }
+    void slotFontChanged() { printf("TQ_SIGNAL: Font changed\n"); }
+    void slotBackgroundChanged(int i) { printf("TQ_SIGNAL: Background %d changed\n", i); }
+    void slotAppearanceChanged() { printf("TQ_SIGNAL: Appearance changed\n"); }
+    void slotMessage(int id, int arg) { printf("TQ_SIGNAL: user message: %d,%d\n", id, arg); }
 };
 
 #endif
diff --git a/tdecore/tests/kprocesstest.cpp b/tdecore/tests/kprocesstest.cpp
index d8d86d988..b7908ec6e 100644
--- a/tdecore/tests/kprocesstest.cpp
+++ b/tdecore/tests/kprocesstest.cpp
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
  //
 
  p1 << "kghostview";
- TQObject::connect(&p1, TQT_SIGNAL(processExited(TDEProcess *)),  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p1, TQ_SIGNAL(processExited(TDEProcess *)),  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
  
  printf("starting kghostview blocking (close to continue)\n");
  p1.start(TDEProcess::Block);
@@ -62,7 +62,7 @@ int main(int argc, char *argv[])
  printf("Starting konsole with /bin/tcsh as shell (close to continue)\n");
  p2 << "konsole" << "-e" << "/bin/tcsh";
  p2.setWorkingDirectory("/tmp");
- TQObject::connect(&p2, TQT_SIGNAL(processExited(TDEProcess *)),  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p2, TQ_SIGNAL(processExited(TDEProcess *)),  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
  p2.start(TDEProcess::Block);
 
  //
@@ -70,13 +70,13 @@ int main(int argc, char *argv[])
  //
 
  p3 << "ls" << "-l";
- TQObject::connect(&p3, TQT_SIGNAL(processExited(TDEProcess *)), 
-		  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p3, TQ_SIGNAL(processExited(TDEProcess *)), 
+		  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
 
- TQObject::connect(&p3, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
- TQObject::connect(&p3, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p3, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p3, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
 
  p3.start(TDEProcess::NotifyOnExit, TDEProcess::AllOutput);
  
@@ -93,16 +93,16 @@ int main(int argc, char *argv[])
  //
 
  p4 << "sort";
- TQObject::connect(&p4, TQT_SIGNAL(processExited(TDEProcess *)), 
-		  &dummy, TQT_SLOT(printMessage(TDEProcess *)));
+ TQObject::connect(&p4, TQ_SIGNAL(processExited(TDEProcess *)), 
+		  &dummy, TQ_SLOT(printMessage(TDEProcess *)));
 
- TQObject::connect(&p4, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
- TQObject::connect(&p4, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
-		  &dummy, TQT_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p4, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
+ TQObject::connect(&p4, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)),
+		  &dummy, TQ_SLOT(gotOutput(TDEProcess *, char *, int)));
 
- TQObject::connect(&p4, TQT_SIGNAL(wroteStdin(TDEProcess *)),
-		  &dummy, TQT_SLOT(outputDone(TDEProcess *)));
+ TQObject::connect(&p4, TQ_SIGNAL(wroteStdin(TDEProcess *)),
+		  &dummy, TQ_SLOT(outputDone(TDEProcess *)));
 
  p4.start(TDEProcess::NotifyOnExit, TDEProcess::All);
  printf("after p4.start");
diff --git a/tdecore/tests/kprociotest.cpp b/tdecore/tests/kprociotest.cpp
index f7e895345..e7165092c 100644
--- a/tdecore/tests/kprociotest.cpp
+++ b/tdecore/tests/kprociotest.cpp
@@ -41,8 +41,8 @@ int main(int argc, char *argv[])
  
  p << "rev";
  
- p.connect(&p, TQT_SIGNAL(processExited(TDEProcess*)), &dummy, TQT_SLOT(printMessage(TDEProcess*)));
- p.connect(&p, TQT_SIGNAL(readReady(KProcIO*)), &dummy, TQT_SLOT(gotOutput(KProcIO*)));
+ p.connect(&p, TQ_SIGNAL(processExited(TDEProcess*)), &dummy, TQ_SLOT(printMessage(TDEProcess*)));
+ p.connect(&p, TQ_SIGNAL(readReady(KProcIO*)), &dummy, TQ_SLOT(gotOutput(KProcIO*)));
 
  bool b;
 
diff --git a/tdecore/tests/tdeconfigtestgui.cpp b/tdecore/tests/tdeconfigtestgui.cpp
index f5ea428c0..c785aa3b3 100644
--- a/tdecore/tests/tdeconfigtestgui.cpp
+++ b/tdecore/tests/tdeconfigtestgui.cpp
@@ -76,8 +76,8 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
 
   pAppFileEdit = new TQLineEdit( this, "appconfigedit" );
   pAppFileEdit->setGeometry( 240, 20, 160, 20 );
-  connect( pAppFileEdit, TQT_SIGNAL(returnPressed()),
-	   TQT_SLOT(appConfigEditReturnPressed()));
+  connect( pAppFileEdit, TQ_SIGNAL(returnPressed()),
+	   TQ_SLOT(appConfigEditReturnPressed()));
 
   // Label and edit for the group
   pGroupLabel = new TQLabel( this, "grouplabel" );
@@ -86,14 +86,14 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
 
   pGroupEdit = new TQLineEdit( this, "groupedit" );
   pGroupEdit->setGeometry( 120, 60, 100, 20 );
-  connect( pGroupEdit, TQT_SIGNAL(returnPressed()),
-	   TQT_SLOT(groupEditReturnPressed()));
+  connect( pGroupEdit, TQ_SIGNAL(returnPressed()),
+	   TQ_SLOT(groupEditReturnPressed()));
 
   // Edit and label for the key/value pair
   pKeyEdit = new TQLineEdit( this, "keyedit" );
   pKeyEdit->setGeometry( 20, 100, 80, 20 );
-  connect( pKeyEdit, TQT_SIGNAL( returnPressed()),
-	   TQT_SLOT(keyEditReturnPressed()));
+  connect( pKeyEdit, TQ_SIGNAL( returnPressed()),
+	   TQ_SLOT(keyEditReturnPressed()));
 
   pEqualsLabel = new TQLabel( this, "equalslabel" );
   pEqualsLabel->setGeometry( 105, 100, 20, 20 );
@@ -106,7 +106,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
   pWriteButton = new TQPushButton( this, "writebutton" );
   pWriteButton->setGeometry( 20,140, 80, 20 );
   pWriteButton->setText( "Write entry" );
-  connect( pWriteButton, TQT_SIGNAL(clicked()), TQT_SLOT( writeButtonClicked() ) );
+  connect( pWriteButton, TQ_SIGNAL(clicked()), TQ_SLOT( writeButtonClicked() ) );
 
   // Labels for the info line
   pInfoLabel1 = new TQLabel( this, "infolabel1" );
@@ -121,7 +121,7 @@ TDEConfigTestView::TDEConfigTestView( TQWidget *parent, const char *name )
   pQuitButton = new TQPushButton( this, "quitbutton" );
   pQuitButton->setText( "Quit" );
   pQuitButton->setGeometry( 340, 60, 60, 60 );
-  connect( pQuitButton, TQT_SIGNAL(clicked()), tqApp, TQT_SLOT(quit()) );
+  connect( pQuitButton, TQ_SIGNAL(clicked()), tqApp, TQ_SLOT(quit()) );
 
   // create a default TDEConfig object in order to be able to start right away
   pConfig = new TDEConfig( TQString::null );
diff --git a/tdecore/twinmodule.cpp b/tdecore/twinmodule.cpp
index a37370e58..7eafa34d7 100644
--- a/tdecore/twinmodule.cpp
+++ b/tdecore/twinmodule.cpp
@@ -445,7 +445,7 @@ TQRect KWinModule::workArea( const TQValueList<WId>& exclude, int desktop ) cons
 
 void KWinModule::connectNotify( const char* signal )
 {
-    if( !d->strutSignalConnected && qstrcmp( signal, TQT_SIGNAL(strutChanged())) == 0 )
+    if( !d->strutSignalConnected && qstrcmp( signal, TQ_SIGNAL(strutChanged())) == 0 )
         d->strutSignalConnected = true;
     TQObject::connectNotify( signal );
 }