diff options
Diffstat (limited to 'kexi/kexidb/queryschema.cpp')
-rw-r--r-- | kexi/kexidb/queryschema.cpp | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp index 4fae1cf1..a82ca99a 100644 --- a/kexi/kexidb/queryschema.cpp +++ b/kexi/kexidb/queryschema.cpp @@ -187,8 +187,8 @@ class QuerySchemaPrivate void setColumnAliasInternal(uint position, const TQCString& alias) { - columnAliases.tqreplace(position, new TQCString(alias)); - columnPositionsForAliases.tqreplace(alias, new int(position)); + columnAliases.replace(position, new TQCString(alias)); + columnPositionsForAliases.replace(alias, new int(position)); maxIndexWithAlias = TQMAX( maxIndexWithAlias, (int)position ); } @@ -245,7 +245,7 @@ class QuerySchemaPrivate for (Field::ListIterator it(query->fieldsIterator()); (f = it.current()); ++it, p++) { if (f->isExpression() && !columnAliases[p]) { //missing - for (;;) { //tqfind 1st unused + for (;;) { //find 1st unused colNum++; columnAlias = (i18n("short for 'expression' word (only latin letters, please)", "expr") + TQString::number(colNum)).latin1(); @@ -663,12 +663,12 @@ FieldList& QuerySchema::insertField(uint position, Field *field, d->asterisks.append(field); //if this is single-table asterisk, //add a table to list if doesn't exist there: - if (field->table() && (d->tables.tqfindRef(field->table())==-1)) + if (field->table() && (d->tables.findRef(field->table())==-1)) d->tables.append(field->table()); } else if (field->table()) { //add a table to list if doesn't exist there: - if (d->tables.tqfindRef(field->table())==-1) + if (d->tables.findRef(field->table())==-1) d->tables.append(field->table()); } // //visible by default @@ -918,7 +918,7 @@ void QuerySchema::addTable(TableSchema *table, const TQCString& alias) //only append table if: //-it has alias //-it has no alias but there is no such table on the list - if (alias.isEmpty() && d->tables.tqfindRef(table)!=-1) { + if (alias.isEmpty() && d->tables.findRef(table)!=-1) { const TQString& tableNameLower = table->name().lower(); const TQString& aliasLower = TQString(alias.lower()); int num = 0; @@ -960,9 +960,9 @@ TableSchema* QuerySchema::table(const TQString& tableName) const return 0; } -bool QuerySchema::tqcontains(TableSchema *table) const +bool QuerySchema::contains(TableSchema *table) const { - return d->tables.tqfindRef(table)!=-1; + return d->tables.findRef(table)!=-1; } Field* QuerySchema::findTableField(const TQString &tableOrTableAndFieldName) const @@ -1080,8 +1080,8 @@ void QuerySchema::setTableAlias(uint position, const TQCString& alias) // d->maxIndexWithTableAlias = -1; } else { - d->tableAliases.tqreplace(position, new TQCString(fixedAlias)); - d->tablePositionsForAliases.tqreplace(fixedAlias, new int(position)); + d->tableAliases.replace(position, new TQCString(fixedAlias)); + d->tablePositionsForAliases.replace(fixedAlias, new int(position)); // d->maxIndexWithTableAlias = TQMAX( d->maxIndexWithTableAlias, (int)index ); } } @@ -1164,7 +1164,7 @@ QueryColumnInfo::Vector QuerySchema::fieldsExpanded(FieldsExpandedOptions option uint uniqueListCount = 0; for (uint i=0; i<d->fieldsExpanded->count(); i++) { QueryColumnInfo *ci = (*d->fieldsExpanded)[i]; -// columnsAlreadyFoundIt = columnsAlreadyFound.tqfind(ci); +// columnsAlreadyFoundIt = columnsAlreadyFound.find(ci); // uint foundColumnIndex = -1; if (!columnsAlreadyFound[ci->aliasOrName()]) {// columnsAlreadyFoundIt==columnsAlreadyFound.constEnd()) columnsAlreadyFound.insert(ci->aliasOrName(), (char*)1); @@ -1412,7 +1412,7 @@ void QuerySchema::computeFieldsExpanded() if (!d->columnInfosByNameExpanded[ tableAndAlias ]) d->columnInfosByNameExpanded.insert( tableAndAlias, ci ); //the same for "unexpanded" list - if (columnInfosOutsideAsterisks.tqcontains(ci)) { + if (columnInfosOutsideAsterisks.contains(ci)) { if (!d->columnInfosByName[ ci->alias ]) d->columnInfosByName.insert( ci->alias, ci ); if (!d->columnInfosByName[ tableAndAlias ]) @@ -1429,7 +1429,7 @@ void QuerySchema::computeFieldsExpanded() if (!d->columnInfosByNameExpanded[ tableAndName ]) d->columnInfosByNameExpanded.insert( tableAndName, ci ); //the same for "unexpanded" list - if (columnInfosOutsideAsterisks.tqcontains(ci)) { + if (columnInfosOutsideAsterisks.contains(ci)) { if (!d->columnInfosByName[ ci->field->name() ]) d->columnInfosByName.insert( ci->field->name(), ci ); if (!d->columnInfosByName[ tableAndName ]) @@ -1453,7 +1453,7 @@ void QuerySchema::computeFieldsExpanded() lookup_list.removeRef( ci ); } else { - lookup_dict.tqreplace( key, new uint( i ) ); + lookup_dict.replace( key, new uint( i ) ); ++it; i++; } |