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, 30 insertions, 30 deletions

diff --git a/kompare/libdiff2/parserbase.h b/kompare/libdiff2/parserbase.h
index 5e08803e..e8d5eec4 100644
--- a/kompare/libdiff2/parserbase.h
+++ b/kompare/libdiff2/parserbase.h
@@ -18,7 +18,7 @@
 #ifndef _DIFF2_PARSERBASE_H
 #define _DIFF2_PARSERBASE_H
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include "kompare.h"
 #include "difference.h"
@@ -35,7 +35,7 @@ class KompareModelList;
 class ParserBase
 {
 public:
-	ParserBase( const KompareModelList* list, const QStringList& diff );
+	ParserBase( const KompareModelList* list, const TQStringList& diff );
 	virtual ~ParserBase();
 
 public:
@@ -68,7 +68,7 @@ protected:
 	virtual DiffModelList* parseUnified();
 
 protected: // Helper methods to speed things up
-	bool matchesUnifiedHunkLine( QString line ) const;
+	bool matchesUnifiedHunkLine( TQString line ) const;
 
 protected:
 	/** What is format of the diff */
@@ -76,51 +76,51 @@ protected:
 
 protected:
 	// Regexps for context parsing
-	QRegExp m_contextDiffHeader1;
-	QRegExp m_contextDiffHeader2;
+	TQRegExp m_contextDiffHeader1;
+	TQRegExp m_contextDiffHeader2;
 
-	QRegExp m_contextHunkHeader1;
-	QRegExp m_contextHunkHeader2;
-	QRegExp m_contextHunkHeader3;
+	TQRegExp m_contextHunkHeader1;
+	TQRegExp m_contextHunkHeader2;
+	TQRegExp m_contextHunkHeader3;
 
-	QRegExp m_contextHunkBodyRemoved;
-	QRegExp m_contextHunkBodyAdded;
-	QRegExp m_contextHunkBodyChanged;
-	QRegExp m_contextHunkBodyContext;
-	QRegExp m_contextHunkBodyLine; // Added for convenience
+	TQRegExp m_contextHunkBodyRemoved;
+	TQRegExp m_contextHunkBodyAdded;
+	TQRegExp m_contextHunkBodyChanged;
+	TQRegExp m_contextHunkBodyContext;
+	TQRegExp m_contextHunkBodyLine; // Added for convenience
 
 	// Regexps for normal parsing
-	QRegExp m_normalDiffHeader;
+	TQRegExp m_normalDiffHeader;
 
-	QRegExp m_normalHunkHeaderAdded;
-	QRegExp m_normalHunkHeaderRemoved;
-	QRegExp m_normalHunkHeaderChanged;
+	TQRegExp m_normalHunkHeaderAdded;
+	TQRegExp m_normalHunkHeaderRemoved;
+	TQRegExp m_normalHunkHeaderChanged;
 
-	QRegExp m_normalHunkBodyRemoved;
-	QRegExp m_normalHunkBodyAdded;
-	QRegExp m_normalHunkBodyDivider;
+	TQRegExp m_normalHunkBodyRemoved;
+	TQRegExp m_normalHunkBodyAdded;
+	TQRegExp m_normalHunkBodyDivider;
 
 	enum Difference::Type m_normalDiffType;
 
 	// RegExps for rcs parsing
-	QRegExp m_rcsDiffHeader;
+	TQRegExp m_rcsDiffHeader;
 
 	// Regexps for unified parsing
-	QRegExp m_unifiedDiffHeader1;
-	QRegExp m_unifiedDiffHeader2;
+	TQRegExp m_unifiedDiffHeader1;
+	TQRegExp m_unifiedDiffHeader2;
 
-	QRegExp m_unifiedHunkHeader;
+	TQRegExp m_unifiedHunkHeader;
 
-	QRegExp m_unifiedHunkBodyAdded;
-	QRegExp m_unifiedHunkBodyRemoved;
-	QRegExp m_unifiedHunkBodyContext;
-	QRegExp m_unifiedHunkBodyLine; // Added for convenience
+	TQRegExp m_unifiedHunkBodyAdded;
+	TQRegExp m_unifiedHunkBodyRemoved;
+	TQRegExp m_unifiedHunkBodyContext;
+	TQRegExp m_unifiedHunkBodyLine; // Added for convenience
 
 protected:
-	const QStringList&         m_diffLines;
+	const TQStringList&         m_diffLines;
 	DiffModel*                 m_currentModel;
 	DiffModelList*             m_models;
-	QStringList::ConstIterator m_diffIterator;
+	TQStringList::ConstIterator m_diffIterator;
 
 	bool                       m_singleFileDiff;