Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

4 files changed, 33 insertions, 33 deletions

diff --git a/kompare/libdiff2/cvsdiffparser.cpp b/kompare/libdiff2/cvsdiffparser.cpp
index 47c79a0f..4a092a42 100644
--- a/kompare/libdiff2/cvsdiffparser.cpp
+++ b/kompare/libdiff2/cvsdiffparser.cpp
@@ -99,7 +99,7 @@ bool CVSDiffParser::parseNormalDiffHeader()
 			kdDebug(8101) << "Matched string Header = " << m_normalDiffHeader.cap( 0 ) << endl;
 
 			m_currentModel = new DiffModel();
-			TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
+			TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) );
 			m_currentModel->setSourceFile          ( m_normalDiffHeader.cap( 1 ) );
 			m_currentModel->setDestinationFile     ( m_normalDiffHeader.cap( 1 ) );
 
@@ -120,7 +120,7 @@ bool CVSDiffParser::parseNormalDiffHeader()
 		// Set this to the first line again and hope it is a single file diff
 		m_diffIterator = m_diffLines.begin();
 		m_currentModel = new DiffModel();
-		TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
+		TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) );
 		m_singleFileDiff = true;
 	}
 
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index 7691536c..558f80c6 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -59,33 +59,33 @@ KompareModelList::KompareModelList( DiffSettings* diffSettings, struct Kompare::
 	m_textCodec( 0 )
 {
 	m_applyDifference    = new TDEAction( i18n("&Apply Difference"), "1rightarrow", TQt::Key_Space,
-	                                 this, TQT_SLOT(slotActionApplyDifference()),
+	                                 this, TQ_SLOT(slotActionApplyDifference()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_apply" );
 	m_unApplyDifference  = new TDEAction( i18n("Un&apply Difference"), "1leftarrow", TQt::Key_BackSpace,
-	                                 this, TQT_SLOT(slotActionUnApplyDifference()),
+	                                 this, TQ_SLOT(slotActionUnApplyDifference()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_unapply" );
 	m_applyAll           = new TDEAction( i18n("App&ly All"), "2rightarrow", TQt::CTRL + TQt::Key_A,
-	                                 this, TQT_SLOT(slotActionApplyAllDifferences()),
+	                                 this, TQ_SLOT(slotActionApplyAllDifferences()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_applyall" );
 	m_unapplyAll         = new TDEAction( i18n("&Unapply All"), "2leftarrow", TQt::CTRL + TQt::Key_U,
-	                                 this, TQT_SLOT(slotActionUnapplyAllDifferences()),
+	                                 this, TQ_SLOT(slotActionUnapplyAllDifferences()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_unapplyall" );
 	m_previousFile       = new TDEAction( i18n("P&revious File"), "2uparrow", TQt::CTRL + TQt::Key_PageUp,
-	                                 this, TQT_SLOT(slotPreviousModel()),
+	                                 this, TQ_SLOT(slotPreviousModel()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_previousfile" );
 	m_nextFile           = new TDEAction( i18n("N&ext File"), "2downarrow", TQt::CTRL + TQt::Key_PageDown,
-	                                 this, TQT_SLOT(slotNextModel()),
+	                                 this, TQ_SLOT(slotNextModel()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_nextfile" );
 	m_previousDifference = new TDEAction( i18n("&Previous Difference"), "1uparrow", TQt::CTRL + TQt::Key_Up,
-	                                 this, TQT_SLOT(slotPreviousDifference()),
+	                                 this, TQ_SLOT(slotPreviousDifference()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_previous" );
 	m_nextDifference     = new TDEAction( i18n("&Next Difference"), "1downarrow", TQt::CTRL + TQt::Key_Down,
-	                                 this, TQT_SLOT(slotNextDifference()),
+	                                 this, TQ_SLOT(slotNextDifference()),
 	                                 (( KomparePart* )parent)->actionCollection(), "difference_next" );
 	m_previousDifference->setEnabled( false );
 	m_nextDifference->setEnabled( false );
 
-	m_save = KStdAction::save( this, TQT_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() );
+	m_save = KStdAction::save( this, TQ_SLOT(slotSaveDestination()), ((KomparePart*)parent)->actionCollection() );
 	m_save->setEnabled( false );
 
 	updateModelListActions();
@@ -183,16 +183,16 @@ bool KompareModelList::compareFiles( const TQString& source, const TQString& des
 //	m_fileWatch->addFile( m_source );
 //	m_fileWatch->addFile( m_destination );
 
-//	connect( m_fileWatch, TQT_SIGNAL( dirty( const TQString& ) ), this, TQT_SLOT( slotFileChanged( const TQString& ) ) );
-//	connect( m_fileWatch, TQT_SIGNAL( created( const TQString& ) ), this, TQT_SLOT( slotFileChanged( const TQString& ) ) );
-//	connect( m_fileWatch, TQT_SIGNAL( deleted( const TQString& ) ), this, TQT_SLOT( slotFileChanged( const TQString& ) ) );
+//	connect( m_fileWatch, TQ_SIGNAL( dirty( const TQString& ) ), this, TQ_SLOT( slotFileChanged( const TQString& ) ) );
+//	connect( m_fileWatch, TQ_SIGNAL( created( const TQString& ) ), this, TQ_SLOT( slotFileChanged( const TQString& ) ) );
+//	connect( m_fileWatch, TQ_SIGNAL( deleted( const TQString& ) ), this, TQ_SLOT( slotFileChanged( const TQString& ) ) );
 
 //	m_fileWatch->startScan();
 	m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_source, m_destination );
 	m_diffProcess->setEncoding( m_encoding );
 
-	connect( m_diffProcess, TQT_SIGNAL(diffHasFinished( bool )),
-	         this, TQT_SLOT(slotDiffProcessFinished( bool )) );
+	connect( m_diffProcess, TQ_SIGNAL(diffHasFinished( bool )),
+	         this, TQ_SLOT(slotDiffProcessFinished( bool )) );
 
 	emit status( Kompare::RunningDiff );
 	m_diffProcess->start();
@@ -212,16 +212,16 @@ bool KompareModelList::compareDirs( const TQString& source, const TQString& dest
 //	m_dirWatch->addDir( m_source, true, true );
 //	m_dirWatch->addDir( m_destination, true, true );
 
-//	connect( m_dirWatch, TQT_SIGNAL( dirty  ( const TQString& ) ), this, TQT_SLOT( slotDirectoryChanged( const TQString& ) ) );
-//	connect( m_dirWatch, TQT_SIGNAL( created( const TQString& ) ), this, TQT_SLOT( slotDirectoryChanged( const TQString& ) ) );
-//	connect( m_dirWatch, TQT_SIGNAL( deleted( const TQString& ) ), this, TQT_SLOT( slotDirectoryChanged( const TQString& ) ) );
+//	connect( m_dirWatch, TQ_SIGNAL( dirty  ( const TQString& ) ), this, TQ_SLOT( slotDirectoryChanged( const TQString& ) ) );
+//	connect( m_dirWatch, TQ_SIGNAL( created( const TQString& ) ), this, TQ_SLOT( slotDirectoryChanged( const TQString& ) ) );
+//	connect( m_dirWatch, TQ_SIGNAL( deleted( const TQString& ) ), this, TQ_SLOT( slotDirectoryChanged( const TQString& ) ) );
 
 //	m_dirWatch->startScan();
 	m_diffProcess = new KompareProcess( m_diffSettings, Kompare::Custom, m_source, m_destination );
 	m_diffProcess->setEncoding( m_encoding );
 
-	connect( m_diffProcess, TQT_SIGNAL(diffHasFinished( bool )),
-	         this, TQT_SLOT(slotDiffProcessFinished( bool )) );
+	connect( m_diffProcess, TQ_SIGNAL(diffHasFinished( bool )),
+	         this, TQ_SLOT(slotDiffProcessFinished( bool )) );
 
 	emit status( Kompare::RunningDiff );
 	m_diffProcess->start();
@@ -589,8 +589,8 @@ bool KompareModelList::saveDiff( const TQString& url, TQString directory, DiffSe
 	m_diffProcess = new KompareProcess( diffSettings, Kompare::Custom, m_source, m_destination, directory );
 	m_diffProcess->setEncoding( m_encoding );
 
-	connect( m_diffProcess, TQT_SIGNAL(diffHasFinished( bool )),
-	         this, TQT_SLOT(slotWriteDiffOutput( bool )) );
+	connect( m_diffProcess, TQ_SIGNAL(diffHasFinished( bool )),
+	         this, TQ_SLOT(slotWriteDiffOutput( bool )) );
 
 	emit status( Kompare::RunningDiff );
 	return m_diffProcess->start();
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp
index 08913d7c..f8515748 100644
--- a/kompare/libdiff2/kompareprocess.cpp
+++ b/kompare/libdiff2/kompareprocess.cpp
@@ -39,14 +39,14 @@ KompareProcess::KompareProcess( DiffSettings* diffSettings, enum Kompare::DiffMo
 	setUseShell( true );
 
 	// connect the stdout and stderr signals
-	connect( this, TQT_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
-	         TQT_SLOT  ( slotReceivedStdout( TDEProcess*, char*, int ) ) );
-	connect( this, TQT_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
-	         TQT_SLOT  ( slotReceivedStderr( TDEProcess*, char*, int ) ) );
+	connect( this, TQ_SIGNAL( receivedStdout( TDEProcess*, char*, int ) ),
+	         TQ_SLOT  ( slotReceivedStdout( TDEProcess*, char*, int ) ) );
+	connect( this, TQ_SIGNAL( receivedStderr( TDEProcess*, char*, int ) ),
+	         TQ_SLOT  ( slotReceivedStderr( TDEProcess*, char*, int ) ) );
 
 	// connect the signal that indicates that the proces has exited
-	connect( this, TQT_SIGNAL( processExited( TDEProcess* ) ),
-	         TQT_SLOT  ( slotProcessExited( TDEProcess* ) ) );
+	connect( this, TQ_SIGNAL( processExited( TDEProcess* ) ),
+	         TQ_SLOT  ( slotProcessExited( TDEProcess* ) ) );
 
 	*this << "LANG=C";
 
diff --git a/kompare/libdiff2/parserbase.cpp b/kompare/libdiff2/parserbase.cpp
index 8a503019..42ac5c8c 100644
--- a/kompare/libdiff2/parserbase.cpp
+++ b/kompare/libdiff2/parserbase.cpp
@@ -122,7 +122,7 @@ bool ParserBase::parseContextDiffHeader()
 //			kdDebug(8101) << "Matched string Header2 = " << m_contextDiffHeader2.cap( 0 ) << endl;
 
 			m_currentModel = new DiffModel( m_contextDiffHeader1.cap( 1 ), m_contextDiffHeader2.cap( 1 ) );
-			TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
+			TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) );
 			m_currentModel->setSourceTimestamp     ( m_contextDiffHeader1.cap( 2 ) );
 			m_currentModel->setSourceRevision      ( m_contextDiffHeader1.cap( 4 ) );
 			m_currentModel->setDestinationTimestamp( m_contextDiffHeader2.cap( 2 ) );
@@ -164,7 +164,7 @@ bool ParserBase::parseNormalDiffHeader()
 //			kdDebug(8101) << "Matched string Header = " << m_normalDiffHeader.cap( 0 ) << endl;
 
 			m_currentModel = new DiffModel();
-			TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
+			TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) );
 			m_currentModel->setSourceFile          ( m_normalDiffHeader.cap( 1 ) );
 			m_currentModel->setDestinationFile     ( m_normalDiffHeader.cap( 2 ) );
 
@@ -185,7 +185,7 @@ bool ParserBase::parseNormalDiffHeader()
 		// Set this to the first line again and hope it is a single file diff
 		m_diffIterator = m_diffLines.begin();
 		m_currentModel = new DiffModel();
-		TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
+		TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) );
 		m_singleFileDiff = true;
 	}
 
@@ -215,7 +215,7 @@ bool ParserBase::parseUnifiedDiffHeader()
 		if ( m_diffIterator != m_diffLines.end() && m_unifiedDiffHeader2.exactMatch( *m_diffIterator ) )
 		{
 			m_currentModel = new DiffModel( m_unifiedDiffHeader1.cap( 1 ), m_unifiedDiffHeader2.cap( 1 ) );
-			TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
+			TQObject::connect( m_currentModel, TQ_SIGNAL( setModified( bool ) ), m_list, TQ_SLOT( slotSetModified( bool ) ) );
 			m_currentModel->setSourceTimestamp( m_unifiedDiffHeader1.cap( 2 ) );
 			m_currentModel->setSourceRevision( m_unifiedDiffHeader1.cap( 4 ) );
 			m_currentModel->setDestinationTimestamp( m_unifiedDiffHeader2.cap( 2 ) );