From 2781e27b871150395a5a82e221684108641002b2 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:57:51 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit 031454e56009d576589c28757f6c6fcf4884095e. --- src/commands/addentries.cpp | 2 +- src/commands/addloans.cpp | 8 ++++---- src/commands/fieldcommand.cpp | 6 +++--- src/commands/modifyentries.cpp | 4 ++-- src/commands/removeentries.cpp | 2 +- src/commands/removeloans.cpp | 2 +- src/commands/updateentries.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) (limited to 'src/commands') diff --git a/src/commands/addentries.cpp b/src/commands/addentries.cpp index 87d7bc7..9460ebd 100644 --- a/src/commands/addentries.cpp +++ b/src/commands/addentries.cpp @@ -60,5 +60,5 @@ void AddEntries::unexecute() { TQString AddEntries::name() const { return m_entries.count() > 1 ? i18n("Add Entries") - : i18n("Add (Entry Title)", "Add %1").arg(m_entries.begin()->title()); + : i18n("Add (Entry Title)", "Add %1").tqarg(m_entries.begin()->title()); } diff --git a/src/commands/addloans.cpp b/src/commands/addloans.cpp index bbef197..8b9bc27 100644 --- a/src/commands/addloans.cpp +++ b/src/commands/addloans.cpp @@ -41,7 +41,7 @@ void AddLoans::execute() { bool wasEmpty = m_borrower->isEmpty(); // if there's no loaned field, we'll add one - bool loanExisted = m_loans.begin()->entry()->collection()->hasField(TQString::fromLatin1("loaned")); + bool loanExisted = m_loans.begin()->entry()->collection()->hasField(TQString::tqfromLatin1("loaned")); m_addedLoanField = false; // assume we didn't add the field yet // add the loans to the borrower @@ -54,7 +54,7 @@ void AddLoans::execute() { } if(!loanExisted) { Data::CollPtr c = m_loans.begin()->entry()->collection(); - Data::FieldPtr f = c->fieldByName(TQString::fromLatin1("loaned")); + Data::FieldPtr f = c->fieldByName(TQString::tqfromLatin1("loaned")); if(f) { // notify everything that a new field was added Controller::self()->addedField(c, f); @@ -89,7 +89,7 @@ void AddLoans::unexecute() { } if(m_addedLoanField) { Data::CollPtr c = m_loans.begin()->entry()->collection(); - Data::FieldPtr f = c->fieldByName(TQString::fromLatin1("loaned")); + Data::FieldPtr f = c->fieldByName(TQString::tqfromLatin1("loaned")); if(f) { c->removeField(f); Controller::self()->removedField(c, f); @@ -106,5 +106,5 @@ void AddLoans::unexecute() { TQString AddLoans::name() const { return m_loans.count() > 1 ? i18n("Check-out Items") - : i18n("Check-out (Entry Title)", "Check-out %1").arg(m_loans.begin()->entry()->title()); + : i18n("Check-out (Entry Title)", "Check-out %1").tqarg(m_loans.begin()->entry()->title()); } diff --git a/src/commands/fieldcommand.cpp b/src/commands/fieldcommand.cpp index 43c063a..5ba080b 100644 --- a/src/commands/fieldcommand.cpp +++ b/src/commands/fieldcommand.cpp @@ -101,11 +101,11 @@ void FieldCommand::unexecute() { TQString FieldCommand::name() const { switch(m_mode) { case FieldAdd: - return i18n("Add %1 Field").arg(m_activeField->title()); + return i18n("Add %1 Field").tqarg(m_activeField->title()); case FieldModify: - return i18n("Modify %1 Field").arg(m_activeField->title()); + return i18n("Modify %1 Field").tqarg(m_activeField->title()); case FieldRemove: - return i18n("Delete %1 Field").arg(m_activeField->title()); + return i18n("Delete %1 Field").tqarg(m_activeField->title()); } // hush warnings return TQString(); diff --git a/src/commands/modifyentries.cpp b/src/commands/modifyentries.cpp index 3db5297..9d8712a 100644 --- a/src/commands/modifyentries.cpp +++ b/src/commands/modifyentries.cpp @@ -44,7 +44,7 @@ void ModifyEntries::execute() { } // loans expose a field named "loaned", and the user might modify that without // checking in the loan, so verify that. Heavy-handed, yes... - const TQString loaned = TQString::fromLatin1("loaned"); + const TQString loaned = TQString::tqfromLatin1("loaned"); bool hasLoanField = m_coll->hasField(loaned); for(Data::EntryVecIt entry = m_entries.begin(); hasLoanField && entry != m_entries.end(); ++entry) { if(entry->field(loaned).isEmpty()) { @@ -70,7 +70,7 @@ void ModifyEntries::unexecute() { TQString ModifyEntries::name() const { return m_entries.count() > 1 ? i18n("Modify Entries") - : i18n("Modify (Entry Title)", "Modify %1").arg(m_entries.begin()->title()); + : i18n("Modify (Entry Title)", "Modify %1").tqarg(m_entries.begin()->title()); } void ModifyEntries::swapValues() { diff --git a/src/commands/removeentries.cpp b/src/commands/removeentries.cpp index 1fb9b60..bf2676b 100644 --- a/src/commands/removeentries.cpp +++ b/src/commands/removeentries.cpp @@ -46,5 +46,5 @@ void RemoveEntries::unexecute() { TQString RemoveEntries::name() const { return m_entries.count() > 1 ? i18n("Delete Entries") - : i18n("Delete (Entry Title)", "Delete %1").arg(m_entries.begin()->title()); + : i18n("Delete (Entry Title)", "Delete %1").tqarg(m_entries.begin()->title()); } diff --git a/src/commands/removeloans.cpp b/src/commands/removeloans.cpp index 3d39886..7ee321b 100644 --- a/src/commands/removeloans.cpp +++ b/src/commands/removeloans.cpp @@ -77,5 +77,5 @@ void RemoveLoans::unexecute() { TQString RemoveLoans::name() const { return m_loans.count() > 1 ? i18n("Check-in Entries") - : i18n("Check-in (Entry Title)", "Check-in %1").arg(m_loans.begin()->entry()->title()); + : i18n("Check-in (Entry Title)", "Check-in %1").tqarg(m_loans.begin()->entry()->title()); } diff --git a/src/commands/updateentries.cpp b/src/commands/updateentries.cpp index 32ab8e0..6b53102 100644 --- a/src/commands/updateentries.cpp +++ b/src/commands/updateentries.cpp @@ -47,7 +47,7 @@ private: } UpdateEntries::UpdateEntries(Data::CollPtr coll_, Data::EntryPtr oldEntry_, Data::EntryPtr newEntry_, bool overWrite_) - : Group(i18n("Modify (Entry Title)", "Modify %1").arg(newEntry_->title())) + : Group(i18n("Modify (Entry Title)", "Modify %1").tqarg(newEntry_->title())) , m_coll(coll_) , m_oldEntry(oldEntry_) , m_newEntry(newEntry_) -- cgit v1.2.1