diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:17 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:56:17 -0600 |
commit | 1f9d00360b9018301630ce062d7dda0c6583edfb (patch) | |
tree | 1013b917f9a8ad41ed928d62250e9bfe1ed91414 /kmymoney2/dialogs/transactionmatcher.cpp | |
parent | 252fce5a2a5384702fbcc1c9987284d7bd2e6943 (diff) | |
download | kmymoney-1f9d00360b9018301630ce062d7dda0c6583edfb.tar.gz kmymoney-1f9d00360b9018301630ce062d7dda0c6583edfb.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 252fce5a2a5384702fbcc1c9987284d7bd2e6943.
Diffstat (limited to 'kmymoney2/dialogs/transactionmatcher.cpp')
-rw-r--r-- | kmymoney2/dialogs/transactionmatcher.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kmymoney2/dialogs/transactionmatcher.cpp b/kmymoney2/dialogs/transactionmatcher.cpp index ce1c16e..2ed5356 100644 --- a/kmymoney2/dialogs/transactionmatcher.cpp +++ b/kmymoney2/dialogs/transactionmatcher.cpp @@ -80,7 +80,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr // verify that the amounts are the same, otherwise we should not be matching! if(sm.shares() != si.shares()) { - throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(m_account.name()).arg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec))); + throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").tqarg(m_account.name()).tqarg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec))); } // ipwizard: I took over the code to keep the bank id found in the endMatchTransaction @@ -93,12 +93,12 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr sm.setBankID( bankID ); tm.modifySplit(sm); } else if(sm.bankID() != bankID) { - throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").arg(m_account.name())); + throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").tqarg(m_account.name())); } } catch(MyMoneyException *e) { TQString estr = e->what(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr)); + throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr)); } } @@ -130,7 +130,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr if ( (*it_split).value() != startSplit.value() ) { TQString accountname = MyMoneyFile::instance()->account(accountid).name(); - throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(accountname).arg((*it_split).value().formatMoney(),startSplit.value().formatMoney())); + throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").tqarg(accountname).tqarg((*it_split).value().formatMoney(),startSplit.value().formatMoney())); } TQString bankID = (*it_split).bankID(); @@ -146,14 +146,14 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr else { TQString accountname = MyMoneyFile::instance()->account(accountid).name(); - throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").arg(accountname)); + throw new MYMONEYEXCEPTION(i18n("Both of these transactions have been imported into %1. Therefore they cannot be matched. Matching works with one imported transaction and one non-imported transaction.").tqarg(accountname)); } } catch(MyMoneyException *e) { TQString estr = e->what(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr)); + throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr)); } } ++it_split; |