Use new TQ_METHOD, TQ_SIGNAL, TQ_SLOT defines

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

14 files changed, 174 insertions, 174 deletions

diff --git a/kompare/kompare_shell.cpp b/kompare/kompare_shell.cpp
index 46dbfb9a..277afbc6 100644
--- a/kompare/kompare_shell.cpp
+++ b/kompare/kompare_shell.cpp
@@ -140,21 +140,21 @@ KompareShell::KompareShell()
 	}
 
 	// Hook up the inter part communication
-	connect( m_viewPart, TQT_SIGNAL( modelsChanged(const Diff2::DiffModelList*) ),
-	         m_navTreePart, TQT_SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) );
+	connect( m_viewPart, TQ_SIGNAL( modelsChanged(const Diff2::DiffModelList*) ),
+	         m_navTreePart, TQ_SLOT( slotModelsChanged( const Diff2::DiffModelList*) ) );
 
-	connect( m_viewPart, TQT_SIGNAL( kompareInfo(Kompare::Info*) ),
-	         m_navTreePart, TQT_SLOT( slotKompareInfo(Kompare::Info*) ) );
+	connect( m_viewPart, TQ_SIGNAL( kompareInfo(Kompare::Info*) ),
+	         m_navTreePart, TQ_SLOT( slotKompareInfo(Kompare::Info*) ) );
 
-	connect( m_navTreePart, TQT_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ),
-	         m_viewPart, TQT_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) );
-	connect( m_viewPart, TQT_SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ),
-	         m_navTreePart, TQT_SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) );
+	connect( m_navTreePart, TQ_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ),
+	         m_viewPart, TQ_SIGNAL( selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*) ) );
+	connect( m_viewPart, TQ_SIGNAL( setSelection(const Diff2::DiffModel*, const Diff2::Difference*) ),
+	         m_navTreePart, TQ_SLOT( slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*) ) );
 
-	connect( m_navTreePart, TQT_SIGNAL( selectionChanged(const Diff2::Difference*) ),
-	         m_viewPart, TQT_SIGNAL( selectionChanged(const Diff2::Difference*) ) );
-	connect( m_viewPart, TQT_SIGNAL( setSelection(const Diff2::Difference*) ),
-	         m_navTreePart, TQT_SLOT( slotSetSelection(const Diff2::Difference*) ) );
+	connect( m_navTreePart, TQ_SIGNAL( selectionChanged(const Diff2::Difference*) ),
+	         m_viewPart, TQ_SIGNAL( selectionChanged(const Diff2::Difference*) ) );
+	connect( m_viewPart, TQ_SIGNAL( setSelection(const Diff2::Difference*) ),
+	         m_navTreePart, TQ_SLOT( slotSetSelection(const Diff2::Difference*) ) );
 
 	// This is the interpart interface, it is signal and slot based so no "real" nterface here
 	// All you have to do is connect the parts from your application.
@@ -162,18 +162,18 @@ KompareShell::KompareShell()
 	// from the method with the same name in KompareModelList.
 
 	// There is currently no applying possible from the navtreepart to the viewpart
-	connect( m_viewPart, TQT_SIGNAL(applyDifference(bool)),
-	         m_navTreePart, TQT_SLOT(slotApplyDifference(bool)) );
-	connect( m_viewPart, TQT_SIGNAL(applyAllDifferences(bool)),
-	         m_navTreePart, TQT_SLOT(slotApplyAllDifferences(bool)) );
-	connect( m_viewPart, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)),
-	         m_navTreePart, TQT_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) );
+	connect( m_viewPart, TQ_SIGNAL(applyDifference(bool)),
+	         m_navTreePart, TQ_SLOT(slotApplyDifference(bool)) );
+	connect( m_viewPart, TQ_SIGNAL(applyAllDifferences(bool)),
+	         m_navTreePart, TQ_SLOT(slotApplyAllDifferences(bool)) );
+	connect( m_viewPart, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)),
+	         m_navTreePart, TQ_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) );
 
 	// Hook up the KomparePart -> KompareShell communication
-	connect( m_viewPart, TQT_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ),
-	         this, TQT_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
-	connect( m_viewPart, TQT_SIGNAL( setStatusBarText(const TQString&) ),
-	         this, TQT_SLOT( slotSetStatusBarText(const TQString&) ) );
+	connect( m_viewPart, TQ_SIGNAL( setStatusBarModelInfo( int, int, int, int, int ) ),
+	         this, TQ_SLOT( slotUpdateStatusBar( int, int, int, int, int ) ) );
+	connect( m_viewPart, TQ_SIGNAL( setStatusBarText(const TQString&) ),
+	         this, TQ_SLOT( slotSetStatusBarText(const TQString&) ) );
 
 	// Read basic main-view settings, and set to autosave
 	setAutoSaveSettings( "General Options" );
@@ -229,26 +229,26 @@ void KompareShell::blend( const KURL& url1, const KURL& diff )
 
 void KompareShell::setupActions()
 {
-	TDEAction* open = KStdAction::open(this, TQT_SLOT(slotFileOpen()), actionCollection());
+	TDEAction* open = KStdAction::open(this, TQ_SLOT(slotFileOpen()), actionCollection());
 	open->setText( i18n( "&Open Diff..." ) );
 	new TDEAction( i18n("&Compare Files..."), "document-open", TQt::CTRL + TQt::Key_C,
-	              this, TQT_SLOT(slotFileCompareFiles()),
+	              this, TQ_SLOT(slotFileCompareFiles()),
 	              actionCollection(), "file_compare_files" );
 	new TDEAction( i18n("&Blend URL with Diff..."), "fileblend", TQt::CTRL + TQt::Key_B,
-	              this, TQT_SLOT(slotFileBlendURLAndDiff()),
+	              this, TQ_SLOT(slotFileBlendURLAndDiff()),
 	              actionCollection(), "file_blend_url" );
-	KStdAction::quit( this, TQT_SLOT( slotFileClose() ), actionCollection() );
+	KStdAction::quit( this, TQ_SLOT( slotFileClose() ), actionCollection() );
 
 #if TDE_VERSION >= TDE_MAKE_VERSION(3,1,90)
 	createStandardStatusBarAction();
 #endif
 	setStandardToolBarMenuEnabled(true);
-	m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQT_SLOT(slotShowTextView()),
+	m_showTextView = new TDEToggleAction( i18n("Show T&ext View"), 0, this, TQ_SLOT(slotShowTextView()),
 	                                  actionCollection(), "options_show_text_view" );
         m_showTextView->setCheckedState(i18n("Hide T&ext View"));
 
-	KStdAction::keyBindings(this, TQT_SLOT(optionsConfigureKeys()), actionCollection());
-	KStdAction::configureToolbars(this, TQT_SLOT(optionsConfigureToolbars()), actionCollection());
+	KStdAction::keyBindings(this, TQ_SLOT(optionsConfigureKeys()), actionCollection());
+	KStdAction::configureToolbars(this, TQ_SLOT(optionsConfigureToolbars()), actionCollection());
 }
 
 void KompareShell::setupStatusBar()
@@ -445,8 +445,8 @@ void KompareShell::slotShowTextView()
 			m_textView = m_textViewPart->createView( this, 0 );
 			m_textViewWidget->setWidget( m_textView );
 			m_textEditIface = editInterface( m_textViewPart );
-			connect( m_viewPart, TQT_SIGNAL(diffString(const TQString&)),
-			         this, TQT_SLOT(slotSetDiffString(const TQString&)) );
+			connect( m_viewPart, TQ_SIGNAL(diffString(const TQString&)),
+			         this, TQ_SLOT(slotSetDiffString(const TQString&)) );
 		}
 	}
 
@@ -475,7 +475,7 @@ void KompareShell::optionsConfigureToolbars()
 	saveMainWindowSettings( TDEGlobal::config(), autoSaveGroup() );
 	// use the standard toolbar editor
 	KEditToolbar dlg(factory());
-	connect(&dlg,TQT_SIGNAL(newToolbarConfig()),this,TQT_SLOT(newToolbarConfig()));
+	connect(&dlg,TQ_SIGNAL(newToolbarConfig()),this,TQ_SLOT(newToolbarConfig()));
 	dlg.exec();
 }
 
diff --git a/kompare/komparenavtreepart/komparenavtreepart.cpp b/kompare/komparenavtreepart/komparenavtreepart.cpp
index 1613897e..b9f1703e 100644
--- a/kompare/komparenavtreepart/komparenavtreepart.cpp
+++ b/kompare/komparenavtreepart/komparenavtreepart.cpp
@@ -82,14 +82,14 @@ KompareNavTreePart::KompareNavTreePart( TQWidget* parent, const char* name )
 	m_changesList->setRootIsDecorated( false );
 	m_changesList->setSorting( 0, true );
 
-	connect( m_srcDirTree, TQT_SIGNAL(selectionChanged( TQListViewItem* )),
-	         this, TQT_SLOT(slotSrcDirTreeSelectionChanged( TQListViewItem* )) );
-	connect( m_destDirTree, TQT_SIGNAL(selectionChanged( TQListViewItem* )),
-	         this, TQT_SLOT(slotDestDirTreeSelectionChanged( TQListViewItem* )) );
-	connect( m_fileList, TQT_SIGNAL(selectionChanged( TQListViewItem* )),
-	         this, TQT_SLOT(slotFileListSelectionChanged( TQListViewItem* )) );
-	connect( m_changesList, TQT_SIGNAL(selectionChanged( TQListViewItem* )),
-	         this, TQT_SLOT(slotChangesListSelectionChanged( TQListViewItem* )) );
+	connect( m_srcDirTree, TQ_SIGNAL(selectionChanged( TQListViewItem* )),
+	         this, TQ_SLOT(slotSrcDirTreeSelectionChanged( TQListViewItem* )) );
+	connect( m_destDirTree, TQ_SIGNAL(selectionChanged( TQListViewItem* )),
+	         this, TQ_SLOT(slotDestDirTreeSelectionChanged( TQListViewItem* )) );
+	connect( m_fileList, TQ_SIGNAL(selectionChanged( TQListViewItem* )),
+	         this, TQ_SLOT(slotFileListSelectionChanged( TQListViewItem* )) );
+	connect( m_changesList, TQ_SIGNAL(selectionChanged( TQListViewItem* )),
+	         this, TQ_SLOT(slotChangesListSelectionChanged( TQListViewItem* )) );
 }
 
 KompareNavTreePart::~KompareNavTreePart()
diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 7cc62ef8..bffcc72a 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -76,64 +76,64 @@ KomparePart::KomparePart( TQWidget *parentWidget, const char *widgetName,
 
 	// This creates the "Model creator" and connects the signals and slots
 	m_modelList = new Diff2::KompareModelList( m_diffSettings, m_info, this, "komparemodellist" );
-	connect( m_modelList, TQT_SIGNAL(status( Kompare::Status )),
-	         this, TQT_SLOT(slotSetStatus( Kompare::Status )) );
-	connect( m_modelList, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )),
-	         this, TQT_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) );
-	connect( m_modelList, TQT_SIGNAL(error( TQString )),
-	         this, TQT_SLOT(slotShowError( TQString )) );
-	connect( m_modelList, TQT_SIGNAL(applyAllDifferences( bool )),
-	         this, TQT_SLOT(updateActions()) );
-	connect( m_modelList, TQT_SIGNAL(applyDifference( bool )),
-	         this, TQT_SLOT(updateActions()) );
-	connect( m_modelList, TQT_SIGNAL(applyAllDifferences( bool )),
-	         this, TQT_SIGNAL(appliedChanged()) );
-	connect( m_modelList, TQT_SIGNAL(applyDifference( bool )),
-	         this, TQT_SIGNAL(appliedChanged()) );
-
-	connect( m_modelList, TQT_SIGNAL( setModified( bool ) ),
-	         this, TQT_SLOT( slotSetModified( bool ) ) );
+	connect( m_modelList, TQ_SIGNAL(status( Kompare::Status )),
+	         this, TQ_SLOT(slotSetStatus( Kompare::Status )) );
+	connect( m_modelList, TQ_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )),
+	         this, TQ_SIGNAL(setStatusBarModelInfo( int, int, int, int, int )) );
+	connect( m_modelList, TQ_SIGNAL(error( TQString )),
+	         this, TQ_SLOT(slotShowError( TQString )) );
+	connect( m_modelList, TQ_SIGNAL(applyAllDifferences( bool )),
+	         this, TQ_SLOT(updateActions()) );
+	connect( m_modelList, TQ_SIGNAL(applyDifference( bool )),
+	         this, TQ_SLOT(updateActions()) );
+	connect( m_modelList, TQ_SIGNAL(applyAllDifferences( bool )),
+	         this, TQ_SIGNAL(appliedChanged()) );
+	connect( m_modelList, TQ_SIGNAL(applyDifference( bool )),
+	         this, TQ_SIGNAL(appliedChanged()) );
+
+	connect( m_modelList, TQ_SIGNAL( setModified( bool ) ),
+	         this, TQ_SLOT( slotSetModified( bool ) ) );
 
 	// This is the stuff to connect the "interface" of the kompare part to the model inside
-	connect( m_modelList, TQT_SIGNAL(modelsChanged(const Diff2::DiffModelList*)),
-	         this, TQT_SIGNAL(modelsChanged(const Diff2::DiffModelList*)) );
-
-	connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)),
-	         this, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)) );
-	connect( this, TQT_SIGNAL(selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)),
-	         m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)) );
-
-	connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::Difference*)),
-	         this, TQT_SIGNAL(setSelection(const Diff2::Difference*)) );
-	connect( this, TQT_SIGNAL(selectionChanged(const Diff2::Difference*)),
-	         m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*)) );
-
-	connect( m_modelList, TQT_SIGNAL(applyDifference(bool)),
-	         this, TQT_SIGNAL(applyDifference(bool)) );
-	connect( m_modelList, TQT_SIGNAL(applyAllDifferences(bool)),
-	         this, TQT_SIGNAL(applyAllDifferences(bool)) );
-	connect( m_modelList, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)),
-	         this, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)) );
+	connect( m_modelList, TQ_SIGNAL(modelsChanged(const Diff2::DiffModelList*)),
+	         this, TQ_SIGNAL(modelsChanged(const Diff2::DiffModelList*)) );
+
+	connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)),
+	         this, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)) );
+	connect( this, TQ_SIGNAL(selectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)),
+	         m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::DiffModel*, const Diff2::Difference*)) );
+
+	connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::Difference*)),
+	         this, TQ_SIGNAL(setSelection(const Diff2::Difference*)) );
+	connect( this, TQ_SIGNAL(selectionChanged(const Diff2::Difference*)),
+	         m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*)) );
+
+	connect( m_modelList, TQ_SIGNAL(applyDifference(bool)),
+	         this, TQ_SIGNAL(applyDifference(bool)) );
+	connect( m_modelList, TQ_SIGNAL(applyAllDifferences(bool)),
+	         this, TQ_SIGNAL(applyAllDifferences(bool)) );
+	connect( m_modelList, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)),
+	         this, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)) );
 
 	// This creates the splitterwidget and connects the signals and slots
 	m_splitter = new KompareSplitter ( m_viewSettings, parentWidget, widgetName );
 
-	connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)),
-	         m_splitter,  TQT_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) );
-//	connect( m_splitter,  TQT_SIGNAL(selectionChanged(const Diff2::Difference*, const Diff2::Difference*)),
-//	         m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*, const Diff2::Difference*)) );
-	connect( m_modelList, TQT_SIGNAL(setSelection(const Diff2::Difference*)),
-	         m_splitter,  TQT_SLOT(slotSetSelection(const Diff2::Difference*)) );
-	connect( m_splitter,  TQT_SIGNAL(selectionChanged(const Diff2::Difference*)),
-	         m_modelList, TQT_SLOT(slotSelectionChanged(const Diff2::Difference*)) );
-
-	connect( m_modelList, TQT_SIGNAL(applyDifference(bool)),
-	         m_splitter, TQT_SLOT(slotApplyDifference(bool)) );
-	connect( m_modelList, TQT_SIGNAL(applyAllDifferences(bool)),
-	         m_splitter, TQT_SLOT(slotApplyAllDifferences(bool)) );
-	connect( m_modelList, TQT_SIGNAL(applyDifference(const Diff2::Difference*, bool)),
-	         m_splitter, TQT_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) );
-	connect( this, TQT_SIGNAL(configChanged()), m_splitter, TQT_SIGNAL(configChanged()) );
+	connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::DiffModel*, const Diff2::Difference*)),
+	         m_splitter,  TQ_SLOT(slotSetSelection(const Diff2::DiffModel*, const Diff2::Difference*)) );
+//	connect( m_splitter,  TQ_SIGNAL(selectionChanged(const Diff2::Difference*, const Diff2::Difference*)),
+//	         m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*, const Diff2::Difference*)) );
+	connect( m_modelList, TQ_SIGNAL(setSelection(const Diff2::Difference*)),
+	         m_splitter,  TQ_SLOT(slotSetSelection(const Diff2::Difference*)) );
+	connect( m_splitter,  TQ_SIGNAL(selectionChanged(const Diff2::Difference*)),
+	         m_modelList, TQ_SLOT(slotSelectionChanged(const Diff2::Difference*)) );
+
+	connect( m_modelList, TQ_SIGNAL(applyDifference(bool)),
+	         m_splitter, TQ_SLOT(slotApplyDifference(bool)) );
+	connect( m_modelList, TQ_SIGNAL(applyAllDifferences(bool)),
+	         m_splitter, TQ_SLOT(slotApplyAllDifferences(bool)) );
+	connect( m_modelList, TQ_SIGNAL(applyDifference(const Diff2::Difference*, bool)),
+	         m_splitter, TQ_SLOT(slotApplyDifference(const Diff2::Difference*, bool)) );
+	connect( this, TQ_SIGNAL(configChanged()), m_splitter, TQ_SIGNAL(configChanged()) );
 
 	// notify the part that this is our internal widget
 	setWidget( m_splitter->parentWidget() );
@@ -163,19 +163,19 @@ void KomparePart::setupActions()
 	// create our actions
 
 	m_saveAll         = new TDEAction( i18n("Save &All"), "save_all", 0,
-	                                 this, TQT_SLOT(saveAll()),
+	                                 this, TQ_SLOT(saveAll()),
 	                                 actionCollection(), "file_save_all" );
 	m_saveDiff        = new TDEAction( i18n("Save .&diff..."), 0,
-	                                 this, TQT_SLOT(saveDiff()),
+	                                 this, TQ_SLOT(saveDiff()),
 	                                 actionCollection(), "file_save_diff" );
 	m_swap            = new TDEAction( i18n( "Swap Source with Destination" ), 0,
-	                                 this, TQT_SLOT(slotSwap()),
+	                                 this, TQ_SLOT(slotSwap()),
 	                                 actionCollection(), "file_swap" );
 	m_diffStats       = new TDEAction( i18n( "Show Statistics" ), 0,
-	                                 this, TQT_SLOT(slotShowDiffstats()),
+	                                 this, TQ_SLOT(slotShowDiffstats()),
 	                                 actionCollection(), "file_diffstats" );
 
-	KStdAction::preferences(this, TQT_SLOT(optionsPreferences()), actionCollection());
+	KStdAction::preferences(this, TQ_SLOT(optionsPreferences()), actionCollection());
 }
 
 void KomparePart::updateActions()
@@ -742,7 +742,7 @@ void KomparePart::optionsPreferences()
 	// show preferences
 	KomparePrefDlg* pref = new KomparePrefDlg( m_viewSettings, m_diffSettings );
 
-	connect( pref, TQT_SIGNAL(applyClicked()), this, TQT_SIGNAL(configChanged()) );
+	connect( pref, TQ_SIGNAL(applyClicked()), this, TQ_SIGNAL(configChanged()) );
 
 	if ( pref->exec() )
 		emit configChanged();
diff --git a/kompare/komparepart/kompareconnectwidget.cpp b/kompare/komparepart/kompareconnectwidget.cpp
index 35b40f2e..b15849e4 100644
--- a/kompare/komparepart/kompareconnectwidget.cpp
+++ b/kompare/komparepart/kompareconnectwidget.cpp
@@ -109,7 +109,7 @@ KompareConnectWidget::KompareConnectWidget( KompareListView* left, KompareListVi
 	m_selectedModel( 0 ),
 	m_selectedDifference( 0 )
 {
-//	connect( m_settings, TQT_SIGNAL( settingsChanged() ), this, TQT_SLOT( slotDelayedRepaint() ) );
+//	connect( m_settings, TQ_SIGNAL( settingsChanged() ), this, TQ_SLOT( slotDelayedRepaint() ) );
 	setBackgroundMode( NoBackground );
 	setSizePolicy( TQSizePolicy( TQSizePolicy::Fixed, TQSizePolicy::Minimum ) );
 	setFocusProxy( parent->parentWidget() );
@@ -139,7 +139,7 @@ void KompareConnectWidget::slotSetSelection( const DiffModel* model, const Diffe
 
 void KompareConnectWidget::slotDelayedRepaint()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT( repaint() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( repaint() ) );
 }
 
 void KompareConnectWidget::slotSetSelection( const Difference* diff )
diff --git a/kompare/komparepart/komparelistview.cpp b/kompare/komparepart/komparelistview.cpp
index 63ac3787..cf40b8e5 100644
--- a/kompare/komparepart/komparelistview.cpp
+++ b/kompare/komparepart/komparelistview.cpp
@@ -68,12 +68,12 @@ KompareListViewFrame::KompareListViewFrame( bool isSource,
 	m_layout.addWidget(bottomLine);
 	m_layout.addWidget(&m_view);
 
-	connect( &m_view, TQT_SIGNAL(differenceClicked(const Diff2::Difference*)),
-	         parent, TQT_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
+	connect( &m_view, TQ_SIGNAL(differenceClicked(const Diff2::Difference*)),
+	         parent, TQ_SLOT(slotDifferenceClicked(const Diff2::Difference*)) );
 
-	connect( parent, TQT_SIGNAL(scrollViewsToId(int)), &m_view, TQT_SLOT(scrollToId(int)) );
-	connect( parent, TQT_SIGNAL(setXOffset(int)), &m_view, TQT_SLOT(setXOffset(int)) );
-	connect( &m_view, TQT_SIGNAL(resized()), parent, TQT_SLOT(slotUpdateScrollBars()) );
+	connect( parent, TQ_SIGNAL(scrollViewsToId(int)), &m_view, TQ_SLOT(scrollToId(int)) );
+	connect( parent, TQ_SIGNAL(setXOffset(int)), &m_view, TQ_SLOT(setXOffset(int)) );
+	connect( &m_view, TQ_SIGNAL(resized()), parent, TQ_SLOT(slotUpdateScrollBars()) );
 }
 
 void KompareListViewFrame::slotSetModel( const DiffModel* model )
diff --git a/kompare/komparepart/komparesaveoptionswidget.cpp b/kompare/komparepart/komparesaveoptionswidget.cpp
index 95a641cb..84d2ba51 100644
--- a/kompare/komparepart/komparesaveoptionswidget.cpp
+++ b/kompare/komparepart/komparesaveoptionswidget.cpp
@@ -58,23 +58,23 @@ KompareSaveOptionsWidget::KompareSaveOptionsWidget( TQString source, TQString de
 		m_directoryRequester->setURL( root.url() );
 	}
 
-	connect( m_SmallerChangesCB,   TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_LargeFilesCB,       TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_IgnoreCaseCB,       TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_ExpandTabsCB,       TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_IgnoreEmptyLinesCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_IgnoreWhiteSpaceCB, TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_FunctionNamesCB,    TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_RecursiveCB,        TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_NewFilesCB,         TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_ContextRB,          TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_EdRB,               TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_NormalRB,           TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_RCSRB,              TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_UnifiedRB,          TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_SideBySideRB,       TQT_SIGNAL(toggled(bool)), TQT_SLOT(updateCommandLine()) );
-	connect( m_ContextLinesSB,     TQT_SIGNAL(valueChanged(int)), TQT_SLOT(updateCommandLine()) );
-	connect( m_directoryRequester, TQT_SIGNAL(textChanged(const TQString&)), TQT_SLOT(updateCommandLine()) );
+	connect( m_SmallerChangesCB,   TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_LargeFilesCB,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_IgnoreCaseCB,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_ExpandTabsCB,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_IgnoreEmptyLinesCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_IgnoreWhiteSpaceCB, TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_FunctionNamesCB,    TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_RecursiveCB,        TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_NewFilesCB,         TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_ContextRB,          TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_EdRB,               TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_NormalRB,           TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_RCSRB,              TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_UnifiedRB,          TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_SideBySideRB,       TQ_SIGNAL(toggled(bool)), TQ_SLOT(updateCommandLine()) );
+	connect( m_ContextLinesSB,     TQ_SIGNAL(valueChanged(int)), TQ_SLOT(updateCommandLine()) );
+	connect( m_directoryRequester, TQ_SIGNAL(textChanged(const TQString&)), TQ_SLOT(updateCommandLine()) );
 
 	loadOptions();
 }
diff --git a/kompare/komparepart/komparesplitter.cpp b/kompare/komparepart/komparesplitter.cpp
index 6300837e..64f3d518 100644
--- a/kompare/komparepart/komparesplitter.cpp
+++ b/kompare/komparepart/komparesplitter.cpp
@@ -66,19 +66,19 @@ KompareSplitter::KompareSplitter( ViewSettings *settings, TQWidget * parent,
 	setOpaqueResize( true );
 	setFocusPolicy( TQWidget::WheelFocus );
 
-	connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotConfigChanged()) );
-	connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotDelayedRepaintHandles()) );
-	connect( this, TQT_SIGNAL(configChanged()), TQT_SLOT(slotDelayedUpdateScrollBars()) );
+	connect( this, TQ_SIGNAL(configChanged()), TQ_SLOT(slotConfigChanged()) );
+	connect( this, TQ_SIGNAL(configChanged()), TQ_SLOT(slotDelayedRepaintHandles()) );
+	connect( this, TQ_SIGNAL(configChanged()), TQ_SLOT(slotDelayedUpdateScrollBars()) );
 	
 	// scrolling
-	connect( m_vScroll, TQT_SIGNAL(valueChanged(int)), TQT_SLOT(scrollToId(int)) );
-	connect( m_vScroll, TQT_SIGNAL(sliderMoved(int)),  TQT_SLOT(scrollToId(int)) );
-	connect( m_hScroll, TQT_SIGNAL(valueChanged(int)), TQT_SIGNAL(setXOffset(int)) );
-	connect( m_hScroll, TQT_SIGNAL(sliderMoved(int)),  TQT_SIGNAL(setXOffset(int)) );
+	connect( m_vScroll, TQ_SIGNAL(valueChanged(int)), TQ_SLOT(scrollToId(int)) );
+	connect( m_vScroll, TQ_SIGNAL(sliderMoved(int)),  TQ_SLOT(scrollToId(int)) );
+	connect( m_hScroll, TQ_SIGNAL(valueChanged(int)), TQ_SIGNAL(setXOffset(int)) );
+	connect( m_hScroll, TQ_SIGNAL(sliderMoved(int)),  TQ_SIGNAL(setXOffset(int)) );
 
 	m_scrollTimer=new TQTimer();
 	restartTimer = false;
-	connect (m_scrollTimer, TQT_SIGNAL(timeout()), TQT_SLOT(timerTimeout()) );
+	connect (m_scrollTimer, TQ_SIGNAL(timeout()), TQ_SLOT(timerTimeout()) );
 
 	// we need to receive childEvents now so that d->list is ready for when
 	// slotSetSelection(...) arrives
@@ -502,7 +502,7 @@ void KompareSplitter::scrollToId( int id )
 
 void KompareSplitter::slotDelayedUpdateScrollBars()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateScrollBars() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateScrollBars() ) );
 }
 
 void KompareSplitter::slotUpdateScrollBars()
@@ -543,7 +543,7 @@ void KompareSplitter::slotUpdateScrollBars()
 
 void KompareSplitter::slotDelayedUpdateVScrollValue()
 {
-	TQTimer::singleShot( 0, this, TQT_SLOT( slotUpdateVScrollValue() ) );
+	TQTimer::singleShot( 0, this, TQ_SLOT( slotUpdateVScrollValue() ) );
 }
 
 void KompareSplitter::slotUpdateVScrollValue()
diff --git a/kompare/kompareurldialog.cpp b/kompare/kompareurldialog.cpp
index 363179ee..8957913b 100644
--- a/kompare/kompareurldialog.cpp
+++ b/kompare/kompareurldialog.cpp
@@ -60,10 +60,10 @@ KompareURLDialog::KompareURLDialog( TQWidget *parent, const char *name )
 
 	enableButtonSeparator( true );
 
-	connect( m_filesPage->firstURLRequester(), TQT_SIGNAL( textChanged( const TQString& ) ),
-	         this, TQT_SLOT( slotEnableOk() ) );
-	connect( m_filesPage->secondURLRequester(), TQT_SIGNAL( textChanged( const TQString& ) ),
-	         this, TQT_SLOT( slotEnableOk() ) );
+	connect( m_filesPage->firstURLRequester(), TQ_SIGNAL( textChanged( const TQString& ) ),
+	         this, TQ_SLOT( slotEnableOk() ) );
+	connect( m_filesPage->secondURLRequester(), TQ_SIGNAL( textChanged( const TQString& ) ),
+	         this, TQ_SLOT( slotEnableOk() ) );
 
 	slotEnableOk();
 }
diff --git a/kompare/libdialogpages/diffpage.cpp b/kompare/libdialogpages/diffpage.cpp
index 1e43bf82..3373cce8 100644
--- a/kompare/libdialogpages/diffpage.cpp
+++ b/kompare/libdialogpages/diffpage.cpp
@@ -294,7 +294,7 @@ void DiffPage::addOptionsTab()
 		TQButton* ignoreRegExpEditButton = new TQPushButton( i18n( "&Edit..." ), page, "regexp_editor_button" );
 		TQToolTip::add( ignoreRegExpEditButton, i18n( "Clicking this will open a regular expression dialog where\nyou can graphically create regular expressions." ) );
 		groupLayout->addWidget( ignoreRegExpEditButton );
-		connect( ignoreRegExpEditButton, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotShowRegExpEditor() ) );
+		connect( ignoreRegExpEditButton, TQ_SIGNAL( clicked() ), this, TQ_SLOT( slotShowRegExpEditor() ) );
 	}
 
 	TQVButtonGroup* moreOptionButtonGroup = new TQVButtonGroup( i18n( "Whitespace" ), page );
@@ -333,7 +333,7 @@ void DiffPage::addExcludeTab()
 	layout->addWidget( excludeFilePatternGroupBox );
 
 
-	connect( m_excludeFilePatternCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFilePatternToggled(bool)));
+	connect( m_excludeFilePatternCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExcludeFilePatternToggled(bool)));
 
 	TQHGroupBox* excludeFileNameGroupBox = new TQHGroupBox( i18n( "File with Filenames to Exclude" ), page );
 	m_excludeFileCheckBox     = new TQCheckBox( "", excludeFileNameGroupBox );
@@ -344,7 +344,7 @@ void DiffPage::addExcludeTab()
 	TQToolTip::add( m_excludeFileURLRequester, i18n( "Any file you select in the dialog that pops up when you click it will be put in the dialog to the left of this button." ) );
 	layout->addWidget( excludeFileNameGroupBox );
 
-	connect( m_excludeFileCheckBox, TQT_SIGNAL(toggled(bool)), this, TQT_SLOT(slotExcludeFileToggled(bool)));
+	connect( m_excludeFileCheckBox, TQ_SIGNAL(toggled(bool)), this, TQ_SLOT(slotExcludeFileToggled(bool)));
 
 	layout->addStretch( 1 );
 	page->setMinimumSize( sizeHintForWidget( page ) );
diff --git a/kompare/libdialogpages/filespage.cpp b/kompare/libdialogpages/filespage.cpp
index c8819b24..34661708 100644
--- a/kompare/libdialogpages/filespage.cpp
+++ b/kompare/libdialogpages/filespage.cpp
@@ -47,8 +47,8 @@ FilesPage::FilesPage( TQWidget* parent ) : PageBase( parent ), m_URLChanged( fal
 	m_secondURLComboBox = new KURLComboBox( KURLComboBox::Both, true, m_secondGB, "DestURLComboBox" );
 	m_secondURLRequester = new KURLRequester( m_secondURLComboBox, m_secondGB );
 
-	connect( m_firstURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setSecondURL( const TQString & ) ) );
-	connect( m_secondURLRequester, TQT_SIGNAL( urlSelected( const TQString & ) ), TQT_SLOT( setFirstURL( const TQString & ) ) );
+	connect( m_firstURLRequester, TQ_SIGNAL( urlSelected( const TQString & ) ), TQ_SLOT( setSecondURL( const TQString & ) ) );
+	connect( m_secondURLRequester, TQ_SIGNAL( urlSelected( const TQString & ) ), TQ_SLOT( setFirstURL( const TQString & ) ) );
 
 	m_thirdGB = new TQGroupBox( 1, TQt::Vertical, i18n( "Encoding" ), page );
 	m_encodingComboBox = new TQComboBox( false, m_thirdGB, "encoding_combobox" );
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 ) );