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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 22 insertions, 22 deletions

diff --git a/kexi/kexidb/expression.cpp b/kexi/kexidb/expression.cpp
index d9a33b4c..35ab8d70 100644
--- a/kexi/kexidb/expression.cpp
+++ b/kexi/kexidb/expression.cpp
@@ -82,7 +82,7 @@ Field::Type BaseExpr::type()
 
 TQString BaseExpr::debugString()
 {
-	return TQString("BaseExpr(%1,type=%1)").arg(m_token).arg(Driver::defaultSQLTypeName(type()));
+	return TQString("BaseExpr(%1,type=%1)").tqarg(m_token).tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 bool BaseExpr::validate(ParseInfo& /*parseInfo*/)
@@ -241,7 +241,7 @@ TQString UnaryExpr::debugString()
 	return "UnaryExpr('" 
 		+ tokenToDebugString() + "', "
 		+ (m_arg ? m_arg->debugString() : TQString("<NONE>")) 
-		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -256,7 +256,7 @@ TQString UnaryExpr::toString(QuerySchemaParameterValueListIterator* params)
 		return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NULL";
 	if (m_token==SQL_IS_NOT_NULL)
 		return (m_arg ? m_arg->toString(params) : "<NULL>") + " IS NOT NULL";
-	return TQString("{INVALID_OPERATOR#%1} ").arg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
+	return TQString("{INVALID_OPERATOR#%1} ").tqarg(m_token) + (m_arg ? m_arg->toString(params) : "<NULL>");
 }
 
 void UnaryExpr::getQueryParameters(QuerySchemaParameterList& params)
@@ -419,7 +419,7 @@ TQString BinaryExpr::debugString()
 		+ "," + (m_larg ? m_larg->debugString() : TQString("<NONE>")) 
 		+ ",'" + tokenToDebugString() + "',"
 		+ (m_rarg ? m_rarg->debugString() : TQString("<NONE>")) 
-		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString BinaryExpr::tokenToString()
@@ -449,7 +449,7 @@ TQString BinaryExpr::tokenToString()
 	/* not handled here */
 	default:;
 	}
-	return TQString("{INVALID_BINARY_OPERATOR#%1} ").arg(m_token);
+	return TQString("{INVALID_BINARY_OPERATOR#%1} ").tqarg(m_token);
 }
 
 TQString BinaryExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -529,7 +529,7 @@ Field::Type ConstExpr::type()
 TQString ConstExpr::debugString()
 {
 	return TQString("ConstExpr('") + tokenToDebugString() +"'," + toString()
-		+ TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type()));
+		+ TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString ConstExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -601,13 +601,13 @@ void QueryParameterExpr::setType(Field::Type type)
 
 TQString QueryParameterExpr::debugString()
 {
-	return TQString("QueryParameterExpr('") + TQString::fromLatin1("[%2]").arg(value.toString())
-		+ TQString("',type=%1)").arg(Driver::defaultSQLTypeName(type()));
+	return TQString("QueryParameterExpr('") + TQString::tqfromLatin1("[%2]").tqarg(value.toString())
+		+ TQString("',type=%1)").tqarg(Driver::defaultSQLTypeName(type()));
 }
 
 TQString QueryParameterExpr::toString(QuerySchemaParameterValueListIterator* params)
 {
-	return params ? params->getPreviousValueAsString(type()) : TQString::fromLatin1("[%2]").arg(value.toString());
+	return params ? params->getPreviousValueAsString(type()) : TQString::tqfromLatin1("[%2]").tqarg(value.toString());
 }
 
 void QueryParameterExpr::getQueryParameters(QuerySchemaParameterList& params)
@@ -656,7 +656,7 @@ VariableExpr* VariableExpr::copy() const
 TQString VariableExpr::debugString()
 {
 	return TQString("VariableExpr(") + name
-		+ TQString(",type=%1)").arg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
+		+ TQString(",type=%1)").tqarg(field ? Driver::defaultSQLTypeName(type()) : TQString("FIELD NOT DEFINED YET"));
 }
 
 TQString VariableExpr::toString(QuerySchemaParameterValueListIterator* params)
@@ -719,15 +719,15 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 					parseInfo.errMsg = i18n("Ambiguous field name");
 					parseInfo.errDescr = i18n("Both table \"%1\" and \"%2\" have defined \"%3\" field. "
 						"Use \"<tableName>.%4\" notation to specify table name.")
-						.arg(firstField->table()->name()).arg(f->table()->name())
-						.arg(fieldName).arg(fieldName);
+						.tqarg(firstField->table()->name()).tqarg(f->table()->name())
+						.tqarg(fieldName).tqarg(fieldName);
 					return false;
 				}
 			}
 		}
 		if (!firstField) {
 			parseInfo.errMsg = i18n("Field not found");
-			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").arg(fieldName);
+			parseInfo.errDescr = i18n("Table containing \"%1\" field not found").tqarg(fieldName);
 			return false;
 		}
 		//ok
@@ -754,8 +754,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 		if (covered) {
 			parseInfo.errMsg = i18n("Could not access the table directly using its name");
 			parseInfo.errDescr = i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", "
-				"you can write \"%3\"").arg(tableName)
-				.arg(TQString(tableName+"."+fieldName)).arg(TQString(tableAlias+"."+fieldName.latin1()));
+				"you can write \"%3\"").tqarg(tableName)
+				.tqarg(TQString(tableName+"."+fieldName)).tqarg(TQString(tableAlias+"."+fieldName.latin1()));
 			return false;
 		}
 	}
@@ -773,7 +773,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 
 	if (!ts) {
 		parseInfo.errMsg = i18n("Table not found");
-		parseInfo.errDescr = i18n("Unknown table \"%1\"").arg(tableName);
+		parseInfo.errDescr = i18n("Unknown table \"%1\"").tqarg(tableName);
 		return false;
 	}
 
@@ -786,8 +786,8 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 	//it's a table.*
 	if (fieldName=="*") {
 		if (positionsList->count()>1) {
-			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").arg(tableName);
-			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").arg(tableName);
+			parseInfo.errMsg = i18n("Ambiguous \"%1.*\" expression").tqarg(tableName);
+			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined").tqarg(tableName);
 			return false;
 		}
 		tableForQueryAsterisk = ts;
@@ -800,7 +800,7 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 	if (!realField) {
 		parseInfo.errMsg = i18n("Field not found");
 		parseInfo.errDescr = i18n("Table \"%1\" has no \"%2\" field")
-			.arg(tableName).arg(fieldName);
+			.tqarg(tableName).tqarg(fieldName);
 		return false;
 	}
 
@@ -815,9 +815,9 @@ bool VariableExpr::validate(ParseInfo& parseInfo)
 			numberOfTheSameFields++;
 		if (numberOfTheSameFields>1) {
 			parseInfo.errMsg = i18n("Ambiguous \"%1.%2\" expression")
-				.arg(tableName).arg(fieldName);
+				.tqarg(tableName).tqarg(fieldName);
 			parseInfo.errDescr = i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-				.arg(tableName).arg(fieldName);
+				.tqarg(tableName).tqarg(fieldName);
 			return false;
 		}
 	}
@@ -880,7 +880,7 @@ TQString FunctionExpr::debugString()
 	res.append( TQString("FunctionExpr(") + name );
 	if (args)
 		res.append(TQString(",") + args->debugString());
-	res.append(TQString(",type=%1)").arg(Driver::defaultSQLTypeName(type())));
+	res.append(TQString(",type=%1)").tqarg(Driver::defaultSQLTypeName(type())));
 	return res;
 }