Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

9 files changed, 16 insertions, 16 deletions

diff --git a/interfaces/khexedit/byteseditinterface.h b/interfaces/khexedit/byteseditinterface.h
index 06749c4fe..bfeaa43e5 100644
--- a/interfaces/khexedit/byteseditinterface.h
+++ b/interfaces/khexedit/byteseditinterface.h
@@ -206,7 +206,7 @@ inline BytesEditInterface *bytesEditInterface( T *t )
   * � if( Clipboard )
   * � {
   * � � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
-  * � � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
+  * � � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) );
   * � }
   * }
   * \endcode
diff --git a/interfaces/khexedit/clipboardinterface.h b/interfaces/khexedit/clipboardinterface.h
index ca69baf8c..ec77b1a48 100644
--- a/interfaces/khexedit/clipboardinterface.h
+++ b/interfaces/khexedit/clipboardinterface.h
@@ -35,7 +35,7 @@ namespace KHE
  * if( Clipboard )
  * {
  * � // Yes, use BytesEditWidget, not Clipboard, because that's the TQObject, indeed hacky...
- * � connect( BytesEditWidget, TQT_SIGNAL(copyAvailable(bool)), this, TQT_SLOT(offerCopy(bool)) );
+ * � connect( BytesEditWidget, TQ_SIGNAL(copyAvailable(bool)), this, TQ_SLOT(offerCopy(bool)) );
  * }
  * \endcode 
  *
diff --git a/interfaces/kregexpeditor/kregexpeditorinterface.h b/interfaces/kregexpeditor/kregexpeditorinterface.h
index c58ab7dc9..fbdc22de6 100644
--- a/interfaces/kregexpeditor/kregexpeditorinterface.h
+++ b/interfaces/kregexpeditor/kregexpeditorinterface.h
@@ -41,7 +41,7 @@
  *
  * Note: signals and slots must be connected to the editorDialog object, not to the editor object:
  * \code
- * connect( editorDialog, TQT_SIGNAL( canUndo( bool ) ), undoBut, TQT_SLOT( setEnabled( bool ) ) );
+ * connect( editorDialog, TQ_SIGNAL( canUndo( bool ) ), undoBut, TQ_SLOT( setEnabled( bool ) ) );
  * \endcode
  *
  * If you want to create an instance of the editor widget, i.e. not the
diff --git a/interfaces/tdeimproxy/library/tdeimproxy.cpp b/interfaces/tdeimproxy/library/tdeimproxy.cpp
index fb2db0eb4..022737ed4 100644
--- a/interfaces/tdeimproxy/library/tdeimproxy.cpp
+++ b/interfaces/tdeimproxy/library/tdeimproxy.cpp
@@ -181,8 +181,8 @@ KIMProxy::KIMProxy( DCOPClient* dc ) : DCOPObject( "KIMProxyIface" ), TQObject()
 
 	d->dc = dc;
 	m_initialized = false;
-	connect( d->dc, TQT_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQT_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
-	connect( d->dc, TQT_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQT_SLOT( registeredToDCOP( const TQCString& ) ) );
+	connect( d->dc, TQ_SIGNAL( applicationRemoved( const TQCString& ) ) , this, TQ_SLOT( unregisteredFromDCOP( const TQCString& ) ) );
+	connect( d->dc, TQ_SIGNAL( applicationRegistered( const TQCString& ) ) , this, TQ_SLOT( registeredToDCOP( const TQCString& ) ) );
 	d->dc->setNotifications( true );
 
 	d->presence_strings.append( "Unknown" );
diff --git a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
index 72f870c7e..be0f92111 100644
--- a/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
+++ b/interfaces/tdemediaplayer/tdefileaudiopreview/tdefileaudiopreview.cpp
@@ -93,7 +93,7 @@ KFileAudioPreview::KFileAudioPreview( TQWidget *parent, const char *name )
     m_autoPlay = new TQCheckBox( i18n("Play &automatically"), box );
     TDEConfigGroup config( TDEGlobal::config(), ConfigGroup );
     m_autoPlay->setChecked( config.readBoolEntry( "Autoplay sounds", true ) );
-    connect( m_autoPlay, TQT_SIGNAL(toggled(bool)), TQT_SLOT(toggleAuto(bool)) );
+    connect( m_autoPlay, TQ_SIGNAL(toggled(bool)), TQ_SLOT(toggleAuto(bool)) );
 }
 
 KFileAudioPreview::~KFileAudioPreview()
diff --git a/interfaces/tdescript/sample/shellscript.cpp b/interfaces/tdescript/sample/shellscript.cpp
index 766613551..64cf89bb8 100644
--- a/interfaces/tdescript/sample/shellscript.cpp
+++ b/interfaces/tdescript/sample/shellscript.cpp
@@ -31,9 +31,9 @@ K_EXPORT_COMPONENT_FACTORY( libshellscript, ShellScriptFactory( "ShellScript" )
 ShellScript::ShellScript(KScriptClientInterface *parent, const char *, const TQStringList & ) : ScriptClientInterface(parent)
 {
 	m_script =  new TDEProcess();
-	connect ( m_script, TQT_SIGNAL(processExited(TDEProcess *)), TQT_SLOT(Exit(TDEProcess *)));
-	connect ( m_script, TQT_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQT_SLOT(stdOut(TDEProcess *, char *, int )));
-	connect ( m_script, TQT_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQT_SLOT(stdErr(TDEProcess *, char *, int )));
+	connect ( m_script, TQ_SIGNAL(processExited(TDEProcess *)), TQ_SLOT(Exit(TDEProcess *)));
+	connect ( m_script, TQ_SIGNAL(receivedStdout(TDEProcess *, char *, int)), TQ_SLOT(stdOut(TDEProcess *, char *, int )));
+	connect ( m_script, TQ_SIGNAL(receivedStderr(TDEProcess *, char *, int)), TQ_SLOT(stdErr(TDEProcess *, char *, int )));
 	// Connect feedback signals and slots
 	//kdDebug() << "Building new script engine" << endl;
 }
diff --git a/interfaces/tdescript/scriptloader.cpp b/interfaces/tdescript/scriptloader.cpp
index c21f1f794..62bd33605 100644
--- a/interfaces/tdescript/scriptloader.cpp
+++ b/interfaces/tdescript/scriptloader.cpp
@@ -40,7 +40,7 @@ ScriptLoader::ScriptLoader(TDEMainWindow *parent) : TQObject (parent)
 	m_theAction = new TDESelectAction ( i18n("TDE Scripts"),
 		0,
 		this,
-		TQT_SLOT(runAction()),
+		TQ_SLOT(runAction()),
 		m_parent->actionCollection(),
 		"scripts");
 }
diff --git a/interfaces/terminal/kde_terminal_interface.h b/interfaces/terminal/kde_terminal_interface.h
index 406fdf1ec..b0f2b9d5f 100644
--- a/interfaces/terminal/kde_terminal_interface.h
+++ b/interfaces/terminal/kde_terminal_interface.h
@@ -78,8 +78,8 @@ class TQStrList;
  *  // or connect to one of the signals.  Connect to the Part object,
  *  // not to the TerminalInterface, since the latter is no TQObject,
  *  // and as such cannot have signals..:
- *  //    connect( p, TQT_SIGNAL( processExited( int ) ),
- *  //             this, TQT_SLOT( shellExited( int ) ) );
+ *  //    connect( p, TQ_SIGNAL( processExited( int ) ),
+ *  //             this, TQ_SLOT( shellExited( int ) ) );
  *  // etc.
  *
  * \endcode
diff --git a/interfaces/terminal/test/main.cpp b/interfaces/terminal/test/main.cpp
index 07e31bead..f0d51b259 100644
--- a/interfaces/terminal/test/main.cpp
+++ b/interfaces/terminal/test/main.cpp
@@ -26,8 +26,8 @@ Win::Win()
 //     l.append( "python" );
 //     t->startProgram( TQString::fromUtf8( "/usr/bin/python" ), l );
 
-    connect( p, TQT_SIGNAL( processExited( int ) ),
-             this, TQT_SLOT( pythonExited( int ) ) );
+    connect( p, TQ_SIGNAL( processExited( int ) ),
+             this, TQ_SLOT( pythonExited( int ) ) );
 }
 
 
@@ -48,8 +48,8 @@ void Win::pythonExited()
     std::cerr << "hee, " << p << std::endl;
     std::cerr << ( ::tqt_cast<TerminalInterface>(p) ) << std::endl;
     // KMessageBox::sorry( this, TQString::fromUtf8( "Exited, status was %1" ).arg( status ) );
-    disconnect(p, TQT_SIGNAL( processExited() ),
-            this, TQT_SLOT( pythonExited() ));
+    disconnect(p, TQ_SIGNAL( processExited() ),
+            this, TQ_SLOT( pythonExited() ));
     TerminalInterface* t = ::tqt_cast<TerminalInterface*>( p );
     TQStrList l;
     l.append( "echo" );