diff options
Diffstat (limited to 'kexi/kexidb/queryschema.cpp')
| -rw-r--r-- | kexi/kexidb/queryschema.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index cff98a31..47e5d95c 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -402,11 +402,11 @@ TQString OrderByColumn::debugString() const if (m_column) { if (m_pos>-1) return TQString("COLUMN_AT_POSITION_%1(%2, %3)") - .tqarg(m_pos+1).tqarg(m_column->debugString()).tqarg(orderString); + .arg(m_pos+1).arg(m_column->debugString()).arg(orderString); else - return TQString("COLUMN(%1, %2)").tqarg(m_column->debugString()).tqarg(orderString); + return TQString("COLUMN(%1, %2)").arg(m_column->debugString()).arg(orderString); } - return m_field ? TQString("FIELD(%1, %2)").tqarg(m_field->debugString()).tqarg(orderString) + return m_field ? TQString("FIELD(%1, %2)").arg(m_field->debugString()).arg(orderString) : TQString("NONE"); } @@ -801,7 +801,7 @@ TQString QuerySchema::debugString() else { dbg1 = "<NONE>\n"; } - dbg1.prepend( TQString("(%1):\n").tqarg(fieldsExpandedCount) ); + dbg1.prepend( TQString("(%1):\n").arg(fieldsExpandedCount) ); dbg += dbg1; //it's safer to delete fieldsExpanded for now @@ -847,7 +847,7 @@ TQString QuerySchema::debugString() for (int i=0; it.current(); ++it, i++) { TQCString *alias = d->columnAlias(i); if (alias) - aliases += (TQString("field #%1: ").tqarg(i) + aliases += (TQString("field #%1: ").arg(i) + (it.current()->name().isEmpty() ? "<noname>" : it.current()->name()) + " -> " + (const char*)*alias + "\n"); } @@ -862,7 +862,7 @@ TQString QuerySchema::debugString() for (int i=0; t_it.current(); ++t_it, i++) { TQCString *alias = d->tableAliases[i]; if (alias) - aliases += (TQString("table #%1: ").tqarg(i) + aliases += (TQString("table #%1: ").arg(i) + (t_it.current()->name().isEmpty() ? "<noname>" : t_it.current()->name()) + " -> " + (const char*)*alias + "\n"); } @@ -872,7 +872,7 @@ TQString QuerySchema::debugString() if (!where.isEmpty()) dbg += (TQString("\n-WHERE EXPRESSION:\n") + where); if (!orderByColumnList().isEmpty()) - dbg += (TQString("\n-ORDER BY (%1):\n").tqarg(orderByColumnList().count()) + dbg += (TQString("\n-ORDER BY (%1):\n").arg(orderByColumnList().count()) + orderByColumnList().debugString()); return dbg; } @@ -1292,7 +1292,7 @@ void QuerySchema::computeFieldsExpanded() visibleColumn = new Field(); visibleColumn->setName( TQString::fromLatin1("[multiple_visible_fields_%1]") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields )); + .arg( ++numberOfColumnsWithMultipleVisibleFields )); visibleColumn->setExpression( new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/)); if (!d->ownedVisibleColumns) { @@ -1352,7 +1352,7 @@ void QuerySchema::computeFieldsExpanded() visibleColumn = new Field(); visibleColumn->setName( TQString::fromLatin1("[multiple_visible_fields_%1]") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields )); + .arg( ++numberOfColumnsWithMultipleVisibleFields )); visibleColumn->setExpression( new ConstExpr(CHARACTER_STRING_LITERAL, TQVariant()/*not important*/)); if (!d->ownedVisibleColumns) { @@ -1509,8 +1509,8 @@ void QuerySchema::computeFieldsExpanded() } else { const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields ) - .tqarg(ci->field->table()->name()).tqarg(ci->field->name()) ); + .arg( ++numberOfColumnsWithMultipleVisibleFields ) + .arg(ci->field->table()->name()).arg(ci->field->name()) ); uint *index = lookup_dict[ key ]; if (index) ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); @@ -1543,8 +1543,8 @@ void QuerySchema::computeFieldsExpanded() } else { const TQString key( TQString::fromLatin1("[multiple_visible_fields_%1]_%2.%3") - .tqarg( ++numberOfColumnsWithMultipleVisibleFields ) - .tqarg(ci->field->table()->name()).tqarg(ci->field->name()) ); + .arg( ++numberOfColumnsWithMultipleVisibleFields ) + .arg(ci->field->table()->name()).arg(ci->field->name()) ); uint *index = lookup_dict[ key ]; if (index) ci->setIndexForVisibleLookupValue( d->fieldsExpanded->size() + *index ); |