Trinity Qt initial conversion

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdesdk@1157652 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 11 insertions, 11 deletions

diff --git a/kompare/libdiff2/cvsdiffparser.cpp b/kompare/libdiff2/cvsdiffparser.cpp
index d210eb66..47c79a0f 100644
--- a/kompare/libdiff2/cvsdiffparser.cpp
+++ b/kompare/libdiff2/cvsdiffparser.cpp
@@ -15,7 +15,7 @@
 **
 ***************************************************************************/
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include <kdebug.h>
 
@@ -25,7 +25,7 @@
 
 using namespace Diff2;
 
-CVSDiffParser::CVSDiffParser( const KompareModelList* list, const QStringList& diff ) : ParserBase( list, diff )
+CVSDiffParser::CVSDiffParser( const KompareModelList* list, const TQStringList& diff ) : ParserBase( list, diff )
 {
 	// The regexps needed for context cvs diff parsing, the rest is the same as in parserbase.cpp
 	// third capture in header1 is non optional for cvs diff, it is the revision
@@ -43,13 +43,13 @@ enum Kompare::Format CVSDiffParser::determineFormat()
 {
 //	kdDebug(8101) << "Determining the format of the CVSDiff" << endl;
 
-	QRegExp normalRE ( "[0-9]+[0-9,]*[acd][0-9]+[0-9,]*" );
-	QRegExp unifiedRE( "^--- [^\\t]+\\t" );
-	QRegExp contextRE( "^\\*\\*\\* [^\\t]+\\t" );
-	QRegExp rcsRE    ( "^[acd][0-9]+ [0-9]+" );
-	QRegExp edRE     ( "^[0-9]+[0-9,]*[acd]" );
+	TQRegExp normalRE ( "[0-9]+[0-9,]*[acd][0-9]+[0-9,]*" );
+	TQRegExp unifiedRE( "^--- [^\\t]+\\t" );
+	TQRegExp contextRE( "^\\*\\*\\* [^\\t]+\\t" );
+	TQRegExp rcsRE    ( "^[acd][0-9]+ [0-9]+" );
+	TQRegExp edRE     ( "^[0-9]+[0-9,]*[acd]" );
 
-	QStringList::ConstIterator it = m_diffLines.begin();
+	TQStringList::ConstIterator it = m_diffLines.begin();
 
 	while( it != m_diffLines.end() )
 	{
@@ -89,7 +89,7 @@ bool CVSDiffParser::parseNormalDiffHeader()
 	kdDebug(8101) << "CVSDiffParser::parseNormalDiffHeader()" << endl;
 	bool result = false;
 
-	QStringList::ConstIterator diffEnd = m_diffLines.end();
+	TQStringList::ConstIterator diffEnd = m_diffLines.end();
 
 	while ( m_diffIterator != diffEnd )
 	{
@@ -99,7 +99,7 @@ bool CVSDiffParser::parseNormalDiffHeader()
 			kdDebug(8101) << "Matched string Header = " << m_normalDiffHeader.cap( 0 ) << endl;
 
 			m_currentModel = new DiffModel();
-			QObject::connect( m_currentModel, SIGNAL( setModified( bool ) ), m_list, SLOT( slotSetModified( bool ) ) );
+			TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_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();
-		QObject::connect( m_currentModel, SIGNAL( setModified( bool ) ), m_list, SLOT( slotSetModified( bool ) ) );
+		TQObject::connect( m_currentModel, TQT_SIGNAL( setModified( bool ) ), m_list, TQT_SLOT( slotSetModified( bool ) ) );
 		m_singleFileDiff = true;
 	}