diff options
Diffstat (limited to 'src/collection.cpp')
| -rw-r--r-- | src/collection.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/collection.cpp b/src/collection.cpp index 02200ff..0e37523 100644 --- a/src/collection.cpp +++ b/src/collection.cpp @@ -30,7 +30,7 @@ using Tellico::Data::Collection; const char* Collection::s_emptyGroupTitle = I18N_NOOP("(Empty)"); -const TQString Collection::s_peopleGroupName = TQString::tqfromLatin1("_people"); +const TQString Collection::s_peopleGroupName = TQString::fromLatin1("_people"); Collection::Collection(const TQString& title_) : TQObject(), KShared(), m_nextEntryId(0), m_title(title_), m_entryIdDict(997) @@ -135,7 +135,7 @@ bool Collection::mergeField(FieldPtr newField_) { if(newField_->type() == Field::Table2) { newField_->setType(Data::Field::Table); - newField_->setProperty(TQString::tqfromLatin1("columns"), TQChar('2')); + newField_->setProperty(TQString::fromLatin1("columns"), TQChar('2')); } // the original field type is kept @@ -794,7 +794,7 @@ int Collection::sameEntry(Data::EntryPtr entry1_, Data::EntryPtr entry2_) const // start with twice the title score // and since the minimum is > 10, then need more than just a perfect title match - int res = 2*Entry::compareValues(entry1_, entry2_, TQString::tqfromLatin1("title"), this); + int res = 2*Entry::compareValues(entry1_, entry2_, TQString::fromLatin1("title"), this); // then add score for each field FieldVec fields = entry1_->collection()->fields(); for(Data::FieldVecIt it = fields.begin(); it != fields.end(); ++it) { @@ -825,13 +825,13 @@ bool Collection::mergeEntry(EntryPtr e1, EntryPtr e2, bool overwrite_, bool askU continue; } else if(field->type() == Field::Para) { // for paragraph fields, concatenate the values, if they're not equal - e1->setField(field, e1->field(field) + TQString::tqfromLatin1("<br/><br/>") + e2->field(field)); + e1->setField(field, e1->field(field) + TQString::fromLatin1("<br/><br/>") + e2->field(field)); ret = true; } else if(field->type() == Field::Table) { // if field F is a table-type field (album tracks, files, etc.), merge rows (keep their position) // if e1's F val in [row i, column j] empty, replace with e2's val at same position // if different (non-empty) vals at same position, CONFLICT! - const TQString sep = TQString::tqfromLatin1("::"); + const TQString sep = TQString::fromLatin1("::"); TQStringList vals1 = e1->fields(field, false); TQStringList vals2 = e2->fields(field, false); while(vals1.count() < vals2.count()) { @@ -876,7 +876,7 @@ bool Collection::mergeEntry(EntryPtr e1, EntryPtr e2, bool overwrite_, bool askU } } if(ret) { - e1->setField(field, vals1.join(TQString::tqfromLatin1("; "))); + e1->setField(field, vals1.join(TQString::fromLatin1("; "))); } } else if(field->flags() & Data::Field::AllowMultiple) { // if field F allows multiple values and not a Table (see above case), @@ -892,7 +892,7 @@ bool Collection::mergeEntry(EntryPtr e1, EntryPtr e2, bool overwrite_, bool askU } // not sure if I think it should be sorted or not // items1.sort(); - e1->setField(field, items1.join(TQString::tqfromLatin1("; "))); + e1->setField(field, items1.join(TQString::fromLatin1("; "))); ret = true; } else if(askUser_ && e1->field(field) != e2->field(field)) { int ret = Kernel::self()->askAndMerge(e1, e2, field); |