Trinity Qt initial conversion

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

1 files changed, 18 insertions, 18 deletions

diff --git a/languages/ruby/debugger/rdbparser.cpp b/languages/ruby/debugger/rdbparser.cpp
index 7792acc5..c1cd7717 100644
--- a/languages/ruby/debugger/rdbparser.cpp
+++ b/languages/ruby/debugger/rdbparser.cpp
@@ -22,7 +22,7 @@
 #include "rdbparser.h"
 #include "variablewidget.h"
 
-#include <qregexp.h>
+#include <tqregexp.h>
 
 #include <ctype.h>
 #include <stdlib.h>
@@ -51,9 +51,9 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
         buf = (char*)unknown;
 	}
 		
-	QRegExp var_re("\\s*([^\\n\\s]+) => ([^\\n]+)");
-	QRegExp ref_re("(#<([^:]|::)+:0x[\\da-f]+)\\s*([^=]*)>?");
-	QRegExp struct_re("#<struct Struct::(\\w+)");
+	TQRegExp var_re("\\s*([^\\n\\s]+) => ([^\\n]+)");
+	TQRegExp ref_re("(#<([^:]|::)+:0x[\\da-f]+)\\s*([^=]*)>?");
+	TQRegExp struct_re("#<struct Struct::(\\w+)");
 	
 	// Look for 'dataitem => value' pairs. For example:
 	// 	a => 1
@@ -71,7 +71,7 @@ void RDBParser::parseVariables(LazyFetchItem *parent, char *buf)
 					value = var_re.cap(2).latin1();
 				}
 			} else if (struct_re.search(var_re.cap(2)) != -1) {
-				value = (QString("#<Struct::") + struct_re.cap(1) + ">").latin1();
+				value = (TQString("#<Struct::") + struct_re.cap(1) + ">").latin1();
 			} else {
 				value = var_re.cap(2).latin1();
 			}
@@ -100,7 +100,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 	int			pos;
 	QString		varName;
 	QCString	value;
-	QRegExp 	ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)");
+	TQRegExp 	ppref_re("(#<([^:]|::)+:0x[\\da-f]+)([^\\n>]*)(>?)");
     
 	switch (parent->dataType()) {
     case REFERENCE_TYPE:
@@ -112,14 +112,14 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 		//		@sleeper=#<Thread:0x3008fd18 sleep>,
 		//		@temp={"z"=>"zed", "p"=>"pee"}>
 		//
-		QRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]");
+		TQRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]");
 
 		pos = ppref_re.search(buf);
 		if (pos != -1) {
 			if (ppref_re.cap(4) != "") {
 				// The value is all on one line, so match against name=value 
 				// pairs which can't have commas in their values
-				ppvalue_re = QRegExp("\\s*([^\\s=]+)=([^,>]+)([,>])");
+				ppvalue_re = TQRegExp("\\s*([^\\s=]+)=([^,>]+)([,>])");
 			}
 
 			pos = ppvalue_re.search(buf, pos);
@@ -156,7 +156,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 		//		[0]="hello"
 		//		[1]=#"goodbye"
 		//
-		QRegExp pparray_re("\\s*([^=]+)=([^\\n]+)\\n");
+		TQRegExp pparray_re("\\s*([^=]+)=([^\\n]+)\\n");
 		
 		pos = pparray_re.search(buf);
 			
@@ -186,7 +186,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 		//		["greeting"]="hello"
 		//		["farewell"]="goodbye"
 		//
-		QRegExp pphash_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n");
+		TQRegExp pphash_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n");
 		pos = pphash_re.search(buf);
 		
 		while (pos != -1) {
@@ -211,8 +211,8 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 		//		@sleeper=#<Thread:0x3008fd18 sleep>,
 		//		@temp={"z"=>"zed", "p"=>"pee"}>
 		//
-		QRegExp ppstruct_re("(#<Struct::\\w+)\\s([^\\n>]*)(>?)");
-		QRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]");
+		TQRegExp ppstruct_re("(#<Struct::\\w+)\\s([^\\n>]*)(>?)");
+		TQRegExp ppvalue_re("\\s*([^\\n\\s=]+)=([^\\n]+)[,>]");
 	
 		pos = ppstruct_re.search(buf);
 		if (pos != -1) {
@@ -252,7 +252,7 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 		//		[0..11]=0x89504e470d0a1a0a0000000d
 		//		[12..23]=0x494844520000001600000016
 		//
-		QRegExp ppstring_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n");
+		TQRegExp ppstring_re("\\s*(\\[[^\\]]+\\])=([^\\n]+)\\n");
 		pos = ppstring_re.search(buf);
 		
 		while (pos != -1) {
@@ -278,8 +278,8 @@ void RDBParser::parseExpandedVariable(VarItem *parent, char *buf)
 
 // **************************************************************************
 
-void RDBParser::setItem(LazyFetchItem *parent, const QString &varName,
-                        DataType dataType, const QCString &value)
+void RDBParser::setItem(LazyFetchItem *parent, const TQString &varName,
+                        DataType dataType, const TQCString &value)
 {
 	VarItem *item = parent->findItem(varName);
     if (item == 0) {
@@ -315,9 +315,9 @@ void RDBParser::setItem(LazyFetchItem *parent, const QString &varName,
 
 DataType RDBParser::determineType(char *buf)
 {
-	QRegExp array_re("(Array \\(\\d+ element\\(s\\)\\))");
-	QRegExp hash_re("(Hash \\(\\d+ element\\(s\\)\\))");
-	QRegExp string_re("(String \\(length \\d+\\))");
+	TQRegExp array_re("(Array \\(\\d+ element\\(s\\)\\))");
+	TQRegExp hash_re("(Hash \\(\\d+ element\\(s\\)\\))");
+	TQRegExp string_re("(String \\(length \\d+\\))");
 	
 	if (qstrncmp(buf, "#<struct", strlen("#<struct")) == 0) {
 		return STRUCT_TYPE;