diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:51 -0600 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:51 -0600 |
| commit | 2781e27b871150395a5a82e221684108641002b2 (patch) | |
| tree | 57f4d7c01a48faef1a840fbe0de8f4ec1e5f606f /src/tellico_kernel.cpp | |
| parent | 031454e56009d576589c28757f6c6fcf4884095e (diff) | |
| download | tellico-2781e27b871150395a5a82e221684108641002b2.tar.gz tellico-2781e27b871150395a5a82e221684108641002b2.zip | |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.
Diffstat (limited to 'src/tellico_kernel.cpp')
| -rw-r--r-- | src/tellico_kernel.cpp | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/tellico_kernel.cpp b/src/tellico_kernel.cpp index 1c5fdec..4268681 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::fromLatin1("DeleteFilter"); + TQString dontAsk = TQString::tqfromLatin1("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::fromLatin1("title")); - TQString title2 = entry2_->field(TQString::fromLatin1("title")); + TQString title1 = entry1_->field(TQString::tqfromLatin1("title")); + TQString title2 = entry2_->field(TQString::tqfromLatin1("title")); if(title1 == title2) { title1 = i18n("Entry 1"); title2 = i18n("Entry 2"); @@ -383,21 +383,21 @@ int Kernel::askAndMerge(Data::EntryPtr entry1_, Data::EntryPtr entry2_, Data::Fi if(value2_.isEmpty()) { value2_ = entry2_->field(field_); } - TQString text = TQString::fromLatin1("<qt>") - + i18n("Conflicting values for %1 were found while merging entries.").arg(field_->title()) - + TQString::fromLatin1("<br/><center><table><tr>" + TQString text = TQString::tqfromLatin1("<qt>") + + i18n("Conflicting values for %1 were found while merging entries.").tqarg(field_->title()) + + TQString::tqfromLatin1("<br/><center><table><tr>" "<th>%1</th>" - "<th>%2</th></tr>").arg(title1, title2) - + TQString::fromLatin1("<tr><td><em>%1</em></td>").arg(value1_) - + TQString::fromLatin1("<td><em>%1</em></td></tr></table></center>").arg(value2_) + "<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_) + i18n("Please choose which value to keep.") - + TQString::fromLatin1("</qt>"); + + TQString::tqfromLatin1("</qt>"); int ret = KMessageBox::warningYesNoCancel(Kernel::self()->widget(), text, i18n("Merge Entries"), - i18n("Select value from %1").arg(title1), - i18n("Select value from %1").arg(title2)); + i18n("Select value from %1").tqarg(title1), + i18n("Select value from %1").tqarg(title2)); switch(ret) { case KMessageBox::Cancel: return 0; case KMessageBox::Yes: return -1; // keep original value |