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

This reverts commit 94844816550ad672ccfcdc25659c625546239998.

1 files changed, 18 insertions, 18 deletions

diff --git a/kexi/kexidb/parser/parser_p.cpp b/kexi/kexidb/parser/parser_p.cpp
index 38a7d386..c2cece0b 100644
--- a/kexi/kexidb/parser/parser_p.cpp
+++ b/kexi/kexidb/parser/parser_p.cpp
@@ -142,10 +142,10 @@ void yyerror(const char *str)
 
 			if (parser->isReservedKeyword(ctoken.latin1()))
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("\"%1\" is a reserved keyword").arg(ctoken)+lexerErr, ctoken, current) );
+					i18n("\"%1\" is a reserved keyword").tqarg(ctoken)+lexerErr, ctoken, current) );
 			else
 				parser->setError( ParserError(i18n("Syntax Error"), 
-					i18n("Syntax Error near \"%1\"").arg(ctoken)+lexerErr, ctoken, current) );
+					i18n("Syntax Error near \"%1\"").tqarg(ctoken)+lexerErr, ctoken, current) );
 		}
 	}
 }
@@ -204,7 +204,7 @@ bool parseData(Parser *p, const char *data)
 			{
 				if(tableList.findRef(item->table()) == -1)
 				{
-					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").arg(item->table()->name()), ctoken, current);
+					ParserError err(i18n("Field List Error"), i18n("Unknown table '%1' in field list").tqarg(item->table()->name()), ctoken, current);
 					parser->setError(err);
 
 					yyerror("fieldlisterror");
@@ -288,15 +288,15 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 						setError(i18n("Ambiguous field name"), 
 							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) {
 					setError(i18n("Field not found"), 
-						i18n("Table containing \"%1\" field not found").arg(fieldName));
+						i18n("Table containing \"%1\" field not found").tqarg(fieldName));
 					return false;
 			}
 			//ok
@@ -321,8 +321,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 			if (covered) {
 				setError(i18n("Could not access the table directly using its name"), 
 					i18n("Table \"%1\" is covered by aliases. Instead of \"%2\", "
-					"you can write \"%3\"").arg(tableName)
-					.arg(tableName+"."+fieldName).arg(tableAlias+"."+fieldName.latin1()));
+					"you can write \"%3\"").tqarg(tableName)
+					.tqarg(tableName+"."+fieldName).tqarg(tableAlias+"."+fieldName.latin1()));
 				return false;
 			}
 		}
@@ -348,8 +348,8 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 
 			if (fieldName=="*") {
 				if (positionsList->count()>1) {
-					setError(i18n("Ambiguous \"%1.*\" expression").arg(tableName),
-						i18n("More than one \"%1\" table or alias defined").arg(tableName));
+					setError(i18n("Ambiguous \"%1.*\" expression").tqarg(tableName),
+						i18n("More than one \"%1\" table or alias defined").tqarg(tableName));
 					return false;
 				}
 				parseInfo.querySchema->addAsterisk( new QueryAsterisk(parseInfo.querySchema, ts) );
@@ -368,9 +368,9 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 						if (otherTS->field(fieldName))
 							numberOfTheSameFields++;
 						if (numberOfTheSameFields>1) {
-							setError(i18n("Ambiguous \"%1.%2\" expression").arg(tableName).arg(fieldName),
+							setError(i18n("Ambiguous \"%1.%2\" expression").tqarg(tableName).tqarg(fieldName),
 								i18n("More than one \"%1\" table or alias defined containing \"%2\" field")
-								.arg(tableName).arg(fieldName));
+								.tqarg(tableName).tqarg(fieldName));
 							return false;
 						}
 					}
@@ -379,7 +379,7 @@ bool addColumn( ParseInfo& parseInfo, BaseExpr* columnExpr )
 				}
 				else {
 					setError(i18n("Field not found"), i18n("Table \"%1\" has no \"%2\" field")
-						.arg(tableName).arg(fieldName));
+						.tqarg(tableName).tqarg(fieldName));
 					return false;
 				}
 			}
@@ -436,7 +436,7 @@ QuerySchema* buildSelectQuery(
 			TableSchema *s = parser->db()->tableSchema(TQString(tname));
 			if(!s) {
 				setError(//i18n("Field List Error"), 
-					i18n("Table \"%1\" does not exist").arg(TQString(tname)));
+					i18n("Table \"%1\" does not exist").tqarg(TQString(tname)));
 	//			yyerror("fieldlisterror");
 				CLEANUP;
 				return 0;
@@ -511,7 +511,7 @@ QuerySchema* buildSelectQuery(
 				aliasVariable = e->toBinary()->right()->toVariable();
 				if (!aliasVariable) {
 					setError(i18n("Invalid alias definition for column \"%1\"")
-						.arg(columnExpr->toString())); //ok?
+						.tqarg(columnExpr->toString())); //ok?
 					CLEANUP;
 					return 0;
 				}
@@ -542,7 +542,7 @@ QuerySchema* buildSelectQuery(
 				e->toBinary()->m_larg = 0;
 			}
 			else {
-				setError(i18n("Invalid \"%1\" column definition").arg(e->toString())); //ok?
+				setError(i18n("Invalid \"%1\" column definition").tqarg(e->toString())); //ok?
 				CLEANUP;
 				return 0;
 			}
@@ -610,7 +610,7 @@ QuerySchema* buildSelectQuery(
 							(*it).ascending, (*it).columnNumber-1 ))
 						{
 							setError(i18n("Could not define sorting - no column at position %1")
-								.arg((*it).columnNumber));
+								.tqarg((*it).columnNumber));
 							CLEANUP;
 							return 0;
 						}
@@ -619,7 +619,7 @@ QuerySchema* buildSelectQuery(
 						Field * f = querySchema->findTableField((*it).aliasOrName);
 						if (!f) {
 							setError(i18n("Could not define sorting - "
-								"column name or alias \"%1\" does not exist").arg((*it).aliasOrName));
+								"column name or alias \"%1\" does not exist").tqarg((*it).aliasOrName));
 							CLEANUP;
 							return 0;
 						}