diff options
Diffstat (limited to 'src/tellico_kernel.cpp')
| -rw-r--r-- | src/tellico_kernel.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/tellico_kernel.cpp b/src/tellico_kernel.cpp index 4268681..8709bb2 100644 --- a/src/tellico_kernel.cpp +++ b/src/tellico_kernel.cpp @@ -283,7 +283,7 @@ bool Kernel::removeFilter(FilterPtr filter_) { } TQString str = i18n("Do you really want to delete this filter?"); - TQString dontAsk = TQString::tqfromLatin1("DeleteFilter"); + TQString dontAsk = TQString::fromLatin1("DeleteFilter"); int ret = KMessageBox::questionYesNo(m_widget, str, i18n("Delete Filter?"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk); if(ret != KMessageBox::Yes) { @@ -371,8 +371,8 @@ TQPair<Tellico::Data::FieldVec, Tellico::Data::FieldVec> Kernel::mergeFields(Dat int Kernel::askAndMerge(Data::EntryPtr entry1_, Data::EntryPtr entry2_, Data::FieldPtr field_, TQString value1_, TQString value2_) { - TQString title1 = entry1_->field(TQString::tqfromLatin1("title")); - TQString title2 = entry2_->field(TQString::tqfromLatin1("title")); + TQString title1 = entry1_->field(TQString::fromLatin1("title")); + TQString title2 = entry2_->field(TQString::fromLatin1("title")); if(title1 == title2) { title1 = i18n("Entry 1"); title2 = i18n("Entry 2"); @@ -383,15 +383,15 @@ int Kernel::askAndMerge(Data::EntryPtr entry1_, Data::EntryPtr entry2_, Data::Fi if(value2_.isEmpty()) { value2_ = entry2_->field(field_); } - TQString text = TQString::tqfromLatin1("<qt>") + TQString text = TQString::fromLatin1("<qt>") + i18n("Conflicting values for %1 were found while merging entries.").tqarg(field_->title()) - + TQString::tqfromLatin1("<br/><center><table><tr>" + + TQString::fromLatin1("<br/><center><table><tr>" "<th>%1</th>" "<th>%2</th></tr>").tqarg(title1, title2) - + TQString::tqfromLatin1("<tr><td><em>%1</em></td>").tqarg(value1_) - + TQString::tqfromLatin1("<td><em>%1</em></td></tr></table></center>").tqarg(value2_) + + TQString::fromLatin1("<tr><td><em>%1</em></td>").tqarg(value1_) + + TQString::fromLatin1("<td><em>%1</em></td></tr></table></center>").tqarg(value2_) + i18n("Please choose which value to keep.") - + TQString::tqfromLatin1("</qt>"); + + TQString::fromLatin1("</qt>"); int ret = KMessageBox::warningYesNoCancel(Kernel::self()->widget(), text, |