From 4ae0c208b66e0f7954e194384464fe2d0a2c56dd Mon Sep 17 00:00:00 2001
From: tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>
Date: Sat, 31 Jul 2010 19:51:49 +0000
Subject: Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
---
 kompare/libdiff2/diffmodel.cpp | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

(limited to 'kompare/libdiff2/diffmodel.cpp')

diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 54c33457..1b3822b0 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -17,8 +17,8 @@
 **
 ***************************************************************************/
 
-#include <qregexp.h>
-#include <qvaluelist.h>
+#include <tqregexp.h>
+#include <tqvaluelist.h>
 
 #include <kdebug.h>
 #include <klocale.h>
@@ -30,7 +30,7 @@
 using namespace Diff2;
 
 /**  */
-DiffModel::DiffModel( const QString& source, const QString& destination ) :
+DiffModel::DiffModel( const TQString& source, const TQString& destination ) :
 	m_source( source ),
 	m_destination( destination ),
 	m_sourcePath( "" ),
@@ -146,19 +146,19 @@ int DiffModel::localeAwareCompareSource( const DiffModel& model )
 	return result;
 }
 
-QString DiffModel::recreateDiff() const
+TQString DiffModel::recreateDiff() const
 {
 	// For now we'll always return a diff in the diff format
-	QString diff;
+	TQString diff;
 
 	// recreate header
-	QString tab = QString::fromLatin1( "\t" );
-	QString nl  = QString::fromLatin1( "\n" );
-	diff += QString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp );
+	TQString tab = TQString::fromLatin1( "\t" );
+	TQString nl  = TQString::fromLatin1( "\n" );
+	diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp );
 	if ( !m_sourceRevision.isEmpty() )
 		diff += tab + m_sourceRevision;
 	diff += nl;
-	diff += QString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp );
+	diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp );
 	if ( !m_destinationRevision.isEmpty() )
 		diff += tab + m_destinationRevision;
 	diff += nl;
@@ -262,54 +262,54 @@ Difference* DiffModel::nextDifference()
 	return m_selectedDifference;
 }
 
-const QString DiffModel::sourceFile() const
+const TQString DiffModel::sourceFile() const
 {
 	return m_sourceFile;
 }
 
-const QString DiffModel::destinationFile() const
+const TQString DiffModel::destinationFile() const
 {
 	return m_destinationFile;
 }
 
-const QString DiffModel::sourcePath() const
+const TQString DiffModel::sourcePath() const
 {
 	return m_sourcePath;
 }
 
-const QString DiffModel::destinationPath() const
+const TQString DiffModel::destinationPath() const
 {
 	return m_destinationPath;
 }
 
-void DiffModel::setSourceFile( QString path )
+void DiffModel::setSourceFile( TQString path )
 {
 	m_source = path;
 	splitSourceInPathAndFileName();
 }
 
-void DiffModel::setDestinationFile( QString path )
+void DiffModel::setDestinationFile( TQString path )
 {
 	m_destination = path;
 	splitDestinationInPathAndFileName();
 }
 
-void DiffModel::setSourceTimestamp( QString timestamp )
+void DiffModel::setSourceTimestamp( TQString timestamp )
 {
 	m_sourceTimestamp = timestamp;
 }
 
-void DiffModel::setDestinationTimestamp( QString timestamp )
+void DiffModel::setDestinationTimestamp( TQString timestamp )
 {
 	m_destinationTimestamp = timestamp;
 }
 
-void DiffModel::setSourceRevision( QString revision )
+void DiffModel::setSourceRevision( TQString revision )
 {
 	m_destinationRevision = revision;
 }
 
-void DiffModel::setDestinationRevision( QString revision )
+void DiffModel::setDestinationRevision( TQString revision )
 {
 	m_destinationRevision = revision;
 }
-- 
cgit v1.2.1