Revert "Rename a number of old tq methods that are no longer tq specific"

This reverts commit d6331f1b56eb6dca7a1950658b2932f208015da0.

7 files changed, 30 insertions, 30 deletions

diff --git a/kompare/libdiff2/difference.h b/kompare/libdiff2/difference.h
index 87b8f556..4e440222 100644
--- a/kompare/libdiff2/difference.h
+++ b/kompare/libdiff2/difference.h
@@ -130,7 +130,7 @@ public:
 protected:
 	void calculateHash()
 	{
-		unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.unicode() );
+		unsigned short const* str = reinterpret_cast<unsigned short const*>( m_string.tqunicode() );
 		const unsigned int len = m_string.length();
 
 		m_hash = 1315423911;
diff --git a/kompare/libdiff2/diffhunk.cpp b/kompare/libdiff2/diffhunk.cpp
index 3b48d796..efa7e12d 100644
--- a/kompare/libdiff2/diffhunk.cpp
+++ b/kompare/libdiff2/diffhunk.cpp
@@ -97,16 +97,16 @@ TQString DiffHunk::recreateHunk() const
 	}
 
 	// recreate header
-	hunk += TQString::fromLatin1( "@@ -%1,%3 +%2,%4 @@" )
-	        .arg( m_sourceLine )
-	        .arg( m_destinationLine )
-	        .arg( slc )
-	        .arg( dlc ); 
+	hunk += TQString::tqfromLatin1( "@@ -%1,%3 +%2,%4 @@" )
+	        .tqarg( m_sourceLine )
+	        .tqarg( m_destinationLine )
+	        .tqarg( slc )
+	        .tqarg( dlc ); 
 
 	if ( !m_function.isEmpty() )
 		hunk += " " + m_function;
 
-	hunk += TQString::fromLatin1( "\n" );
+	hunk += TQString::tqfromLatin1( "\n" );
 
 	hunk += differences;
 
diff --git a/kompare/libdiff2/diffmodel.cpp b/kompare/libdiff2/diffmodel.cpp
index 1b3822b0..cd348dfc 100644
--- a/kompare/libdiff2/diffmodel.cpp
+++ b/kompare/libdiff2/diffmodel.cpp
@@ -152,13 +152,13 @@ TQString DiffModel::recreateDiff() const
 	TQString diff;
 
 	// recreate header
-	TQString tab = TQString::fromLatin1( "\t" );
-	TQString nl  = TQString::fromLatin1( "\n" );
-	diff += TQString::fromLatin1( "--- %1\t%2" ).arg( m_source ).arg( m_sourceTimestamp );
+	TQString tab = TQString::tqfromLatin1( "\t" );
+	TQString nl  = TQString::tqfromLatin1( "\n" );
+	diff += TQString::tqfromLatin1( "--- %1\t%2" ).tqarg( m_source ).tqarg( m_sourceTimestamp );
 	if ( !m_sourceRevision.isEmpty() )
 		diff += tab + m_sourceRevision;
 	diff += nl;
-	diff += TQString::fromLatin1( "+++ %1\t%2" ).arg( m_destination ).arg( m_destinationTimestamp );
+	diff += TQString::tqfromLatin1( "+++ %1\t%2" ).tqarg( m_destination ).tqarg( m_destinationTimestamp );
 	if ( !m_destinationRevision.isEmpty() )
 		diff += tab + m_destinationRevision;
 	diff += nl;
diff --git a/kompare/libdiff2/komparemodellist.cpp b/kompare/libdiff2/komparemodellist.cpp
index fc27fb56..89912eac 100644
--- a/kompare/libdiff2/komparemodellist.cpp
+++ b/kompare/libdiff2/komparemodellist.cpp
@@ -22,7 +22,7 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 #include <tqvaluelist.h>
 
 #include <kaction.h>
@@ -235,7 +235,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di
 
 	if ( parseDiffOutput( readFile( diff ) ) != 0 )
 	{
-		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg(  diff ) );
+		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg(  diff ) );
 		return false;
 	}
 
@@ -243,7 +243,7 @@ bool KompareModelList::openFileAndDiff( const TQString& file, const TQString& di
 	if ( !blendOriginalIntoModelList( file ) )
 	{
 		kdDebug(8101) << "Oops cant blend original file into modellist : " << file << endl;
-		emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).arg( diff ).arg( file ) );
+		emit( i18n( "<qt>There were problems applying the diff <b>%1</b> to the file <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( file ) );
 		return false;
 	}
 
@@ -259,7 +259,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff
 
 	if ( parseDiffOutput( readFile( diff ) ) != 0 )
 	{
-		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).arg( diff ) );
+		emit error( i18n( "<qt>No models or no differences, this file: <b>%1</b>, is not a valid diff file.</qt>" ).tqarg( diff ) );
 		return false;
 	}
 
@@ -268,7 +268,7 @@ bool KompareModelList::openDirAndDiff( const TQString& dir, const TQString& diff
 	{
 		// Trouble blending the original into the model
 		kdDebug(8101) << "Oops cant blend original dir into modellist : " << dir << endl;
-		emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).arg( diff ).arg( dir ) );
+		emit error( i18n( "<qt>There were problems applying the diff <b>%1</b> to the folder <b>%2</b>.</qt>" ).tqarg( diff ).tqarg( dir ) );
 		return false;
 	}
 
@@ -347,7 +347,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
 
 	temp->close();
 	if( temp->status() != 0 ) {
-		emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).arg( temp->name() ) );
+		emit error( i18n( "<qt>Could not write to the temporary file <b>%1</b>, deleting it.</qt>" ).tqarg( temp->name() ) );
 		temp->unlink();
 		delete temp;
 		return false;
@@ -380,7 +380,7 @@ bool KompareModelList::saveDestination( DiffModel* model )
 
 	if ( !result )
 	{
-		emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).arg( m_destination ).arg( temp->name() ) );
+		emit error( i18n( "<qt>Could not upload the temporary file to the destination location <b>%1</b>. The temporary file is still available under: <b>%2</b>. You can manually copy it to the right place.</qt>" ).tqarg( m_destination ).tqarg( temp->name() ) );
 	}
 	else
 	{
diff --git a/kompare/libdiff2/kompareprocess.cpp b/kompare/libdiff2/kompareprocess.cpp
index df1c5b14..db165ae5 100644
--- a/kompare/libdiff2/kompareprocess.cpp
+++ b/kompare/libdiff2/kompareprocess.cpp
@@ -21,7 +21,7 @@
 
 #include <tqdir.h>
 #include <tqstringlist.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
 
 #include <kcharsets.h>
 #include <kdebug.h>
diff --git a/kompare/libdiff2/levenshteintable.cpp b/kompare/libdiff2/levenshteintable.cpp
index 7e4ddbbe..c031ee61 100644
--- a/kompare/libdiff2/levenshteintable.cpp
+++ b/kompare/libdiff2/levenshteintable.cpp
@@ -113,8 +113,8 @@ unsigned int LevenshteinTable::createTable( DifferenceString* source, Difference
 	unsigned int m = s.length();
 	unsigned int n = d.length();
 
-	const TQChar* sq = s.unicode();
-	const TQChar* dq = d.unicode();
+	const TQChar* sq = s.tqunicode();
+	const TQChar* dq = d.tqunicode();
 
 	if ( m == 1 )
 		return --n;
diff --git a/kompare/libdiff2/perforceparser.cpp b/kompare/libdiff2/perforceparser.cpp
index 0e0a2aef..b0d54157 100644
--- a/kompare/libdiff2/perforceparser.cpp
+++ b/kompare/libdiff2/perforceparser.cpp
@@ -103,8 +103,8 @@ bool PerforceParser::parseContextDiffHeader()
 			destinationFileRE.exactMatch( m_contextDiffHeader1.cap( 2 ) );
 			kdDebug(8101) << "Matched length   = " << sourceFileRE.matchedLength() << endl;
 			kdDebug(8101) << "Matched length   = " << destinationFileRE.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts   = " << sourceFileRE.capturedTexts() << endl;
-			kdDebug(8101) << "Captured texts   = " << destinationFileRE.capturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << sourceFileRE.tqcapturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << destinationFileRE.tqcapturedTexts() << endl;
 			kdDebug(8101) << "Source File      : " << sourceFileRE.cap( 1 ) << endl;
 			kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
 			m_currentModel->setSourceFile     ( sourceFileRE.cap( 1 ) );
@@ -117,7 +117,7 @@ bool PerforceParser::parseContextDiffHeader()
 		else
 		{
 			kdDebug(8101) << "Matched length = " << m_contextDiffHeader1.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.capturedTexts() << endl;
+			kdDebug(8101) << "Captured texts = " << m_contextDiffHeader1.tqcapturedTexts() << endl;
 		}
 	}
 
@@ -149,8 +149,8 @@ bool PerforceParser::parseNormalDiffHeader()
 			destinationFileRE.exactMatch( m_normalDiffHeader.cap( 2 ) );
 			kdDebug(8101) << "Matched length   = " << sourceFileRE.matchedLength() << endl;
 			kdDebug(8101) << "Matched length   = " << destinationFileRE.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts   = " << sourceFileRE.capturedTexts() << endl;
-			kdDebug(8101) << "Captured texts   = " << destinationFileRE.capturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << sourceFileRE.tqcapturedTexts() << endl;
+			kdDebug(8101) << "Captured texts   = " << destinationFileRE.tqcapturedTexts() << endl;
 			kdDebug(8101) << "Source File      : " << sourceFileRE.cap( 1 ) << endl;
 			kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
 			m_currentModel->setSourceFile     ( sourceFileRE.cap( 1 ) );
@@ -163,7 +163,7 @@ bool PerforceParser::parseNormalDiffHeader()
 		else
 		{
 			kdDebug(8101) << "Matched length = " << m_normalDiffHeader.matchedLength() << endl;
-			kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.capturedTexts() << endl;
+			kdDebug(8101) << "Captured texts = " << m_normalDiffHeader.tqcapturedTexts() << endl;
 		}
 	}
 
@@ -200,8 +200,8 @@ bool PerforceParser::parseUnifiedDiffHeader()
 			destinationFileRE.exactMatch( m_unifiedDiffHeader1.cap( 2 ) );
 //			kdDebug(8101) << "Matched length   = " << sourceFileRE.matchedLength() << endl;
 //			kdDebug(8101) << "Matched length   = " << destinationFileRE.matchedLength() << endl;
-//			kdDebug(8101) << "Captured texts   = " << sourceFileRE.capturedTexts() << endl;
-//			kdDebug(8101) << "Captured texts   = " << destinationFileRE.capturedTexts() << endl;
+//			kdDebug(8101) << "Captured texts   = " << sourceFileRE.tqcapturedTexts() << endl;
+//			kdDebug(8101) << "Captured texts   = " << destinationFileRE.tqcapturedTexts() << endl;
 //			kdDebug(8101) << "Source File      : " << sourceFileRE.cap( 1 ) << endl;
 //			kdDebug(8101) << "Destination File : " << destinationFileRE.cap( 1 ) << endl;
 			m_currentModel->setSourceFile     ( sourceFileRE.cap( 1 ) );
@@ -214,7 +214,7 @@ bool PerforceParser::parseUnifiedDiffHeader()
 		else
 		{
 //			kdDebug(8101) << "Matched length = " << m_unifiedDiffHeader1.matchedLength() << endl;
-//			kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.capturedTexts() << endl;
+//			kdDebug(8101) << "Captured texts = " << m_unifiedDiffHeader1.tqcapturedTexts() << endl;
 		}
 	}