From a62982d5054f34acfecb55f019b7f2d0a4b5988d Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Wed, 31 Aug 2011 19:26:01 +0000
Subject: Fix kompare signal/slot problem

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1250621 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kompare/komparepart/kompare_part.cpp | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

(limited to 'kompare/komparepart/kompare_part.cpp')

diff --git a/kompare/komparepart/kompare_part.cpp b/kompare/komparepart/kompare_part.cpp
index 1339a203..3c110857 100644
--- a/kompare/komparepart/kompare_part.cpp
+++ b/kompare/komparepart/kompare_part.cpp
@@ -76,8 +76,8 @@ 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::tqStatus )),
-	         this, TQT_SLOT(slotSettqStatus( Kompare::tqStatus )) );
+	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 )),
@@ -208,7 +208,7 @@ bool KomparePart::openDiff( const KURL& url )
 		result = m_modelList->openDiff( m_info.localSource );
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 	else
 	{
@@ -232,7 +232,7 @@ bool KomparePart::openDiff( const TQString& diffOutput )
 		m_modelList->show();
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 
 	return value;
@@ -308,7 +308,7 @@ void KomparePart::compare( const KURL& source, const KURL& destination )
 		m_modelList->compare( m_info.localSource, m_info.localDestination );
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 }
 
@@ -329,7 +329,7 @@ void KomparePart::compareFiles( const KURL& sourceFile, const KURL& destinationF
 		m_modelList->compareFiles( m_info.localSource, m_info.localDestination );
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 }
 
@@ -350,7 +350,7 @@ void KomparePart::compareDirs( const KURL& sourceDirectory, const KURL& destinat
 		m_modelList->compareDirs( m_info.localSource, m_info.localDestination );
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 }
 
@@ -359,7 +359,7 @@ void KomparePart::compare3Files( const KURL& /*originalFile*/, const KURL& /*cha
 	// FIXME: actually implement this some day :)
 	updateActions();
 	updateCaption();
-	updatetqStatus();
+	updateStatus();
 }
 
 void KomparePart::openFileAndDiff( const KURL& file, const KURL& diffFile )
@@ -378,7 +378,7 @@ void KomparePart::openFileAndDiff( const KURL& file, const KURL& diffFile )
 		m_modelList->openFileAndDiff( m_info.localSource, m_info.localDestination );
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 }
 
@@ -398,7 +398,7 @@ void KomparePart::openDirAndDiff ( const KURL& dir,  const KURL& diffFile )
 		m_modelList->openDirAndDiff( m_info.localSource, m_info.localDestination );
 		updateActions();
 		updateCaption();
-		updatetqStatus();
+		updateStatus();
 	}
 }
 
@@ -415,7 +415,7 @@ bool KomparePart::saveAll()
 	bool result = m_modelList->saveAll();
 	updateActions();
 	updateCaption();
-	updatetqStatus();
+	updateStatus();
 	return result;
 }
 
@@ -484,7 +484,7 @@ KAboutData *KomparePart::createAboutData()
     return about;
 }
 
-void KomparePart::slotSettqStatus( enum Kompare::tqStatus status )
+void KomparePart::slotSetStatus( enum Kompare::Status status )
 {
 	updateActions();
 
@@ -496,10 +496,10 @@ void KomparePart::slotSettqStatus( enum Kompare::tqStatus status )
 		emit setStatusBarText( i18n( "Parsing diff output..." ) );
 		break;
 	case Kompare::FinishedParsing:
-		updatetqStatus();
+		updateStatus();
 		break;
 	case Kompare::FinishedWritingDiff:
-		updatetqStatus();
+		updateStatus();
 		emit diffURLChanged();
 		break;
 	default:
@@ -532,7 +532,7 @@ void KomparePart::updateCaption()
 	emit setWindowCaption( text );
 }
 
-void KomparePart::updatetqStatus()
+void KomparePart::updateStatus()
 {
 	TQString source = m_info.source.prettyURL();
 	TQString destination = m_info.destination.prettyURL();
@@ -608,7 +608,7 @@ void KomparePart::slotSwap()
 
 	// Update window caption and statusbar text
 	updateCaption();
-	updatetqStatus();
+	updateStatus();
 
 	m_modelList->swap();
 }
-- 
cgit v1.2.1