TDE
/
kmymoney
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/kmymoney
0
0
Fork 0
Code Issues Releases Wiki Activity

Remove additional unneeded tq method conversions

Browse Source 
(cherry picked from commit c70e40bd3f)
v3.5.13-sru
Timothy Pearson 13 years ago committed by Slávek Banko
parent e0d4ece30d
commit 1de308fd3b
169 changed files with 1257 additions and 1257 deletions
Show Stats Download Patch File Download Diff File

46
kmymoney2/converter/mymoneygncreader.cpp
Unescape View File

@ -117,7 +117,7 @@ void GncObject::checkVersion (const TQString& elName, const TQXmlAttributes& elA
if (map.contains(elName)) { // if it's not in the map, there's nothing to check
if (!map[elName].contains(elAttrs.value("version"))) {
TQString em = i18n("%1: Sorry. This importer cannot handle version %2 of element %3")
.tqarg(__func__).tqarg(elAttrs.value("version")).tqarg(elName);
.arg(__func__).arg(elAttrs.value("version")).arg(elName);
throw new MYMONEYEXCEPTION (em);
}
}
@ -190,11 +190,11 @@ TQString GncObject::hide (TQString data, unsigned int anonClass) {
switch (anonClass) {
case ASIS: break; // this is not personal data
case SUPPRESS: result = ""; break; // this is personal and is not essential
case NXTACC: result = i18n("Account%1").tqarg(++nextAccount, -6); break; // generate account name
case NXTACC: result = i18n("Account%1").arg(++nextAccount, -6); break; // generate account name
case NXTEQU: // generate/return an equity name
it = anonStocks.find (data);
if (it == anonStocks.end()) {
result = i18n("Stock%1").tqarg(++nextEquity, -6);
result = i18n("Stock%1").arg(++nextEquity, -6);
anonStocks.insert (data, result);
} else {
result = (*it);
@ -203,13 +203,13 @@ TQString GncObject::hide (TQString data, unsigned int anonClass) {
case NXTPAY: // genearet/return a payee name
it = anonPayees.find (data);
if (it == anonPayees.end()) {
result = i18n("Payee%1").tqarg(++nextPayee, -6);
result = i18n("Payee%1").arg(++nextPayee, -6);
anonPayees.insert (data, result);
} else {
result = (*it);
}
break;
case NXTSCHD: result = i18n("Schedule%1").tqarg(++nextSched, -6); break; // generate a schedule name
case NXTSCHD: result = i18n("Schedule%1").arg(++nextSched, -6); break; // generate a schedule name
case MONEY1:
in = MyMoneyMoney(data);
if (data == "-1/0") in = MyMoneyMoney (0); // spurious gnucash data - causes a crash sometimes
@ -934,7 +934,7 @@ bool XmlReader::startElement (const TQString&, const TQString&, const TQString&
} catch (MyMoneyException *e) {
#ifndef _GNCFILEANON
// we can't pass on exceptions here coz the XML reader won't catch them and we just abort
KMessageBox::error(0, i18n("Import failed:\n\n%1").tqarg(e->what()), PACKAGE);
KMessageBox::error(0, i18n("Import failed:\n\n%1").arg(e->what()), PACKAGE);
qFatal ("%s", e->what().latin1());
#else
qFatal ("%s", e->latin1());
@ -969,7 +969,7 @@ bool XmlReader::endElement( const TQString&, const TQString&, const TQString&elN
} catch (MyMoneyException *e) {
#ifndef _GNCFILEANON
// we can't pass on exceptions here coz the XML reader won't catch them and we just abort
KMessageBox::error(0, i18n("Import failed:\n\n%1").tqarg(e->what()), PACKAGE);
KMessageBox::error(0, i18n("Import failed:\n\n%1").arg(e->what()), PACKAGE);
qFatal ("%s", e->what().latin1());
#else
qFatal ("%s", e->latin1());
@ -1059,7 +1059,7 @@ void MyMoneyGncReader::readFile(TQIODevice* pDevice, IMyMoneySerialize* storage)
terminate (); // do all the wind-up things
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::error(0, i18n("Import failed:\n\n%1").tqarg(e->what()), PACKAGE);
KMessageBox::error(0, i18n("Import failed:\n\n%1").arg(e->what()), PACKAGE);
qFatal ("%s", e->what().latin1());
} // end catch
signalProgress (0, 1, i18n("Import complete")); // switch off progress bar
@ -1121,7 +1121,7 @@ void MyMoneyGncReader::setFileHideFactor () {
i18n ("Each monetary value on your file will be multiplied by a random number between 0.01 and 1.99\n"
"with a different value used for each transaction. In addition, to further disguise the true\n"
"values, you may enter a number between %1 and %2 which will be applied to all values.\n"
"These numbers will not be stored in the file.").tqarg(MINFILEHIDEF).tqarg(MAXFILEHIDEF),
"These numbers will not be stored in the file.").arg(MINFILEHIDEF).arg(MAXFILEHIDEF),
(1.0 + (int)(1000.0 * rand() / (RAND_MAX + 1.0))) / 100.0,
MINFILEHIDEF, MAXFILEHIDEF, 2);
}
@ -1248,7 +1248,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) {
acc.setAccountType(MyMoneyAccount::MoneyMarket);
} else { // we have here an account type we can't currently handle
TQString em =
i18n("Current importer does not recognize GnuCash account type %1").tqarg(gac->type());
i18n("Current importer does not recognize GnuCash account type %1").arg(gac->type());
throw new MYMONEYEXCEPTION (em);
}
// if no parent account is present, assign to one of our standard accounts
@ -1406,7 +1406,7 @@ void MyMoneyGncReader::convertSplit (const GncSplit *gsp) {
// payee id
split.setPayeeId (m_txPayeeId.utf8());
// reconciled state and date
switch (gsp->recon().tqat(0).latin1()) {
switch (gsp->recon().at(0).latin1()) {
case 'n':
split.setReconcileFlag(MyMoneySplit::NotReconciled); break;
case 'c':
@ -1732,7 +1732,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
++itt;
}
if (itt == 0) {
throw new MYMONEYEXCEPTION (i18n("Can't find template transaction for schedule %1").tqarg(sc.name()));
throw new MYMONEYEXCEPTION (i18n("Can't find template transaction for schedule %1").arg(sc.name()));
} else {
tx = convertTemplateTransaction (sc.name(), *itt);
}
@ -1783,8 +1783,8 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
unknownOccurs = true;
} else {
const GncRecurrence *gre = gsc->m_vpRecurrence.first();
//qDebug (TQString("Sched %1, pt %2, mu %3, sd %4").tqarg(gsc->name()).tqarg(gre->periodType())
// .tqarg(gre->mult()).tqarg(gre->startDate().toString(Qt::ISODate)));
//qDebug (TQString("Sched %1, pt %2, mu %3, sd %4").arg(gsc->name()).arg(gre->periodType())
// .arg(gre->mult()).arg(gre->startDate().toString(Qt::ISODate)));
frequency = gre->getFrequency();
schedEnabled = gsc->enabled();
}
@ -1853,9 +1853,9 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) {
sc.setPaymentType((MyMoneySchedule::paymentTypeE)MyMoneySchedule::STYPE_OTHER);
sc.setFixed (!m_suspectSchedule); // if any probs were found, set it as variable so user will always be prompted
// we don't currently have a 'disable' option, but just make sure auto-enter is off if not enabled
//qDebug(TQString("%1 and %2").tqarg(gsc->autoCreate()).tqarg(schedEnabled));
//qDebug(TQString("%1 and %2").arg(gsc->autoCreate()).arg(schedEnabled));
sc.setAutoEnter ((gsc->autoCreate() == "y") && (schedEnabled == "y"));
//qDebug(TQString("autoEnter set to %1").tqarg(sc.autoEnter()));
//qDebug(TQString("autoEnter set to %1").arg(sc.autoEnter()));
// type
TQString actionType = tx.splits().first().action();
if (actionType == MyMoneySplit::ActionDeposit) {
@ -1971,7 +1971,7 @@ void MyMoneyGncReader::terminate () {
since for Yes, the id is 3 and the index is 0, whereas the No button will return 4 or 1. So we test for either Yes case */
/* and now it seems to have changed again, returning 259 for a Yes??? so use KMessagebox */
TQString question = i18n("Your main currency seems to be %1 (%2); do you want to set this as your base currency?")
.tqarg(mainCurrency).tqarg(m_storage->currency(mainCurrency.utf8()).name());
.arg(mainCurrency).arg(m_storage->currency(mainCurrency.utf8()).name());
if(KMessageBox::questionYesNo(0, question, PACKAGE) == KMessageBox::Yes) {
m_storage->setValue ("kmm-baseCurrency", mainCurrency);
}
@ -2015,7 +2015,7 @@ void MyMoneyGncReader::terminate () {
for (i = 0; i < m_suspectList.count(); i++) {
MyMoneySchedule sc = m_storage->schedule(m_suspectList[i]);
KEditScheduleDlg *s;
switch(KMessageBox::warningYesNo(0, i18n("Problems were encountered in converting schedule '%1'.\nDo you want to review or edit it now?").tqarg(sc.name()), PACKAGE)) {
switch(KMessageBox::warningYesNo(0, i18n("Problems were encountered in converting schedule '%1'.\nDo you want to review or edit it now?").arg(sc.name()), PACKAGE)) {
case KMessageBox::Yes:
s = new KEditScheduleDlg (sc);
// FIXME: connect newCategory to something useful, so that we
@ -2077,7 +2077,7 @@ TQString MyMoneyGncReader::buildReportSection (const TQString& source) {
GncMessageArgs *m = m_messageList.at(i);
if (m->source == source) {
if (gncdebug) qDebug("%s", TQString("build text source %1, code %2, argcount %3")
.tqarg(m->source).tqarg(m->code).tqarg(m->args.count()).data());
.arg(m->source).arg(m->code).arg(m->args.count()).data());
TQString ss = GncMessages::text (m->source, m->code);
// add variable args. the .arg function seems always to replace the
// lowest numbered placeholder it finds, so translating messages
@ -2267,7 +2267,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
bool ok = false;
while (!ok) { // keep going till we have a valid investment parent
TQString invAccName = TQInputDialog::getItem (
PACKAGE, i18n("Select parent investment account or enter new name. Stock %1").tqarg(stockAcc.name ()),
PACKAGE, i18n("Select parent investment account or enter new name. Stock %1").arg(stockAcc.name ()),
accList, lastSelected, true, &ok);
if (ok) {
lastSelected = accList.findIndex (invAccName); // preserve selection for next time
@ -2290,7 +2290,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
// this code is probably not going to be implemented coz we can't change account types (??)
#if 0
TQMessageBox mb (PACKAGE,
i18n ("%1 is not an Investment Account. Do you wish to make it one?").tqarg(invAcc.name()),
i18n ("%1 is not an Investment Account. Do you wish to make it one?").arg(invAcc.name()),
TQMessageBox::Question,
TQMessageBox::Yes | TQMessageBox::Default,
TQMessageBox::No | TQMessageBox::Escape,
@ -2305,7 +2305,7 @@ void MyMoneyGncReader::checkInvestmentOption (TQString stockId) {
break;
}
#endif
switch(KMessageBox::questionYesNo(0, i18n ("%1 is not an Investment Account. Do you wish to make it one?").tqarg(invAcc.name(), PACKAGE))) {
switch(KMessageBox::questionYesNo(0, i18n ("%1 is not an Investment Account. Do you wish to make it one?").arg(invAcc.name(), PACKAGE))) {
case KMessageBox::Yes:
// convert it - but what if it has splits???
qFatal ("Not yet implemented");
@ -2395,7 +2395,7 @@ void MyMoneyGncReader::postMessage (const TQString& source, const unsigned int c
const unsigned int argCount = GncMessages::argCount (source, code);
if ((gncdebug) && (argCount != argList.count()))
qDebug("%s", TQString("MyMoneyGncReader::postMessage debug: Message %1, code %2, requires %3 arguments, got %4")
.tqarg(source).tqarg(code).tqarg(argCount).tqarg(argList.count()).data());
.arg(source).arg(code).arg(argCount).arg(argList.count()).data());
// store the arguments
for (i = 0; i < argCount; i++) {
if (i > argList.count()) m->args.append(TQString());

2
kmymoney2/converter/mymoneyqifprofile.cpp
Unescape View File

@ -649,7 +649,7 @@ const TQDate MyMoneyQifProfile::date(const TQString& datein) const
}
} else {
msg = TQString("Length of year (%1) does not match expected length (%2).")
.tqarg(scannedParts[i].length()).tqarg(formatParts[i].length());
.arg(scannedParts[i].length()).arg(formatParts[i].length());
}
break;
}

64
kmymoney2/converter/mymoneyqifreader.cpp
Unescape View File

@ -202,7 +202,7 @@ TQString MyMoneyQifReader::Private::typeToAccountName(const TQString& type) cons
if(type == "sell" || type == "buy")
return i18n("Category name", "Investment fees");
return i18n("Unknown TQIF type %1").tqarg(type);
return i18n("Unknown TQIF type %1").arg(type);
}
bool MyMoneyQifReader::Private::isTransfer(TQString& tmp, const TQString& leftDelim, const TQString& rightDelim)
@ -213,7 +213,7 @@ bool MyMoneyQifReader::Private::isTransfer(TQString& tmp, const TQString& leftDe
// S[Mehrwertsteuer]/_VATCode_N_I
//
// so extracting is a bit more complex and we use a regexp for it
TQRegExp exp(TQString("\\%1(.*)\\%2(.*)").tqarg(leftDelim, rightDelim));
TQRegExp exp(TQString("\\%1(.*)\\%2(.*)").arg(leftDelim, rightDelim));
bool rc;
if((rc = (exp.search(tmp) != -1)) == true) {
@ -404,7 +404,7 @@ bool MyMoneyQifReader::startImport(void)
if(!KIO::NetAccess::download(m_url, m_filename, NULL)) {
KMessageBox::detailedError(0,
i18n("Error while loading file '%1'!").tqarg(m_url.prettyURL()),
i18n("Error while loading file '%1'!").arg(m_url.prettyURL()),
KIO::NetAccess::lastErrorString(),
i18n("File access error"));
return false;
@ -531,7 +531,7 @@ bool MyMoneyQifReader::finishImport(void)
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to add transactions"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
rc = false;
}
@ -773,7 +773,7 @@ void MyMoneyQifReader::processMSAccountEntry(const MyMoneyAccount::accountTypeE
const MyMoneySecurity& sec = file->security(m_account.currencyId());
if ( KMessageBox::questionYesNo(
tqApp->mainWidget(),
i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").tqarg(m_account.name(), split.shares().formatMoney(m_account, sec),balance.formatMoney(m_account, sec)),
i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").arg(m_account.name(), split.shares().formatMoney(m_account, sec),balance.formatMoney(m_account, sec)),
i18n("Overwrite opening balance"),
KStdGuiItem::yes(),
KStdGuiItem::no(),
@ -897,9 +897,9 @@ TQString MyMoneyQifReader::transferAccount(TQString name, bool useBrokerage)
MyMoneyAccount tmpAccount = m_account;
m_qifEntry.clear(); // and construct a temp entry to create/search the account
m_qifEntry << TQString("N%1").tqarg(name);
m_qifEntry << TQString("N%1").arg(name);
m_qifEntry << TQString("Tunknown");
m_qifEntry << TQString("D%1").tqarg(i18n("Autogenerated by TQIF importer"));
m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer"));
accountId = processAccountEntry(false);
// in case we found a reference to an investment account, we need
@ -908,9 +908,9 @@ TQString MyMoneyQifReader::transferAccount(TQString name, bool useBrokerage)
if(useBrokerage && (acc.accountType() == MyMoneyAccount::Investment)) {
name = acc.brokerageName();
m_qifEntry.clear(); // and construct a temp entry to create/search the account
m_qifEntry << TQString("N%1").tqarg(name);
m_qifEntry << TQString("N%1").arg(name);
m_qifEntry << TQString("Tunknown");
m_qifEntry << TQString("D%1").tqarg(i18n("Autogenerated by TQIF importer"));
m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer"));
accountId = processAccountEntry(false);
}
m_qifEntry = tmpEntry; // restore local copies
@ -932,9 +932,9 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp
d->isTransfer(name, m_qifProfile.accountDelimiter().left(1), m_qifProfile.accountDelimiter().mid(1,1));
TQStringList entry = m_qifEntry; // keep a temp copy
m_qifEntry.clear(); // and construct a temp entry to create/search the account
m_qifEntry << TQString("N%1").tqarg(name);
m_qifEntry << TQString("T%1").tqarg(d->accountTypeToQif(accType));
m_qifEntry << TQString("D%1").tqarg(i18n("Autogenerated by TQIF importer"));
m_qifEntry << TQString("N%1").arg(name);
m_qifEntry << TQString("T%1").arg(d->accountTypeToQif(accType));
m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer"));
processAccountEntry();
m_qifEntry = entry; // restore local copy
}
@ -960,7 +960,7 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp
}
if(needCreate) {
// in case we create it anyway, we issue a warning to the user to check it manually
KMessageBox::sorry(0, TQString("<qt>%1</qt>").tqarg(i18n("KMyMoney has imported a second opening balance transaction into account <b>%1</b> which differs from the one found already on file. Please correct this manually once the import is done.").tqarg(acc.name())), i18n("Opening balance problem"));
KMessageBox::sorry(0, TQString("<qt>%1</qt>").arg(i18n("KMyMoney has imported a second opening balance transaction into account <b>%1</b> which differs from the one found already on file. Please correct this manually once the import is done.").arg(acc.name())), i18n("Opening balance problem"));
}
}
@ -984,7 +984,7 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp
} catch(MyMoneyException* e) {
KMessageBox::detailedError(0,
i18n("Error while creating opening balance transaction"),
TQString("%1(%2):%3").tqarg(e->file()).tqarg(e->line()).tqarg(e->what()),
TQString("%1(%2):%3").arg(e->file()).arg(e->line()).arg(e->what()),
i18n("File access error"));
delete e;
}
@ -1017,7 +1017,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
int idx = 1;
TQString hash;
for(;;) {
hash = TQString("%1-%2").tqarg(hashBase).tqarg(idx);
hash = TQString("%1-%2").arg(hashBase).arg(idx);
TQMap<TQString, bool>::const_iterator it;
it = d->m_hashMap.find(hash);
if(it == d->m_hashMap.end()) {
@ -1054,7 +1054,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
"assign todays date to the transaction. Pressing \"Cancel\" will abort "
"the import operation. You can then restart the import and select a different "
"TQIF profile or create a new one.")
.tqarg(extractLine('D')).tqarg(m_qifProfile.inputDateFormat()),
.arg(extractLine('D')).arg(m_qifProfile.inputDateFormat()),
i18n("Invalid date format"));
switch(rc) {
case KMessageBox::Continue:
@ -1085,7 +1085,7 @@ void MyMoneyQifReader::processTransactionEntry(void)
tmp = extractLine('#');
if(!tmp.isEmpty())
{
tr.m_strBankID = TQString("ID %1").tqarg(tmp);
tr.m_strBankID = TQString("ID %1").arg(tmp);
}
#if 0
@ -1301,7 +1301,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
"assign todays date to the transaction. Pressing \"Cancel\" will abort "
"the import operation. You can then restart the import and select a different "
"TQIF profile or create a new one.")
.tqarg(extractLine('D')).tqarg(m_qifProfile.inputDateFormat()),
.arg(extractLine('D')).arg(m_qifProfile.inputDateFormat()),
i18n("Invalid date format"));
switch(rc) {
case KMessageBox::Continue:
@ -1327,7 +1327,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
int idx = 1;
TQString hash;
for(;;) {
hash = TQString("%1-%2").tqarg(hashBase).tqarg(idx);
hash = TQString("%1-%2").arg(hashBase).arg(idx);
TQMap<TQString, bool>::const_iterator it;
it = d->m_hashMap.find(hash);
if(it == d->m_hashMap.end()) {
@ -1341,7 +1341,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
// '#' field: BankID
TQString tmp = extractLine('#');
if ( ! tmp.isEmpty() )
tr.m_strBankID = TQString("ID %1").tqarg(tmp);
tr.m_strBankID = TQString("ID %1").arg(tmp);
// Reconciliation flag
tr.m_reconcile = d->reconcileState(extractLine('C'));
@ -1434,9 +1434,9 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
// If the security is not known, notify the user
// TODO (Ace) A "SelectOrCreateAccount" interface for investments
KMessageBox::information(0, i18n("This investment account does not contain the \"%1\" security. "
"Transactions involving this security will be ignored.").tqarg(securityname),
"Transactions involving this security will be ignored.").arg(securityname),
i18n("Security not found"),
TQString("MissingSecurity%1").tqarg(securityname.stripWhiteSpace()));
TQString("MissingSecurity%1").arg(securityname.stripWhiteSpace()));
return;
}
#endif
@ -1538,7 +1538,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void)
tr.m_amount = -(amount - tr.m_fees);
if(tr.m_strMemo.isEmpty())
tr.m_strMemo = (TQString("%1 %2").tqarg(extractLine('Y')).tqarg(d->typeToAccountName(action))).stripWhiteSpace();
tr.m_strMemo = (TQString("%1 %2").arg(extractLine('Y')).arg(d->typeToAccountName(action))).stripWhiteSpace();
}
else if (action == "xin" || action == "xout")
{
@ -2041,7 +2041,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId)
MyMoneyMoney balance;
// in case it's a stock account, we need to setup a fix investment account
if(account.isInvest()) {
acc.setName(i18n("%1 (Investment)").tqarg(account.name())); // use the same name for the investment account
acc.setName(i18n("%1 (Investment)").arg(account.name())); // use the same name for the investment account
acc.setDescription(i18n("Autogenerated by TQIF importer from type Mutual account entry"));
acc.setAccountType(MyMoneyAccount::Investment);
parentAccount = file->asset();
@ -2130,7 +2130,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone
return;
} catch (MyMoneyException *e) {
TQString message(i18n("Account \"%1\" disappeared: ").tqarg(account.name()));
TQString message(i18n("Account \"%1\" disappeared: ").arg(account.name()));
message += e->what();
KMessageBox::error(0, message);
delete e;
@ -2152,7 +2152,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone
} else {
switch(KMessageBox::questionYesNo(0,
i18n("The %1 '%2' does not exist. Do you "
"want to create it?").tqarg(typeStr).tqarg(account.name()))) {
"want to create it?").arg(typeStr).arg(account.name()))) {
case KMessageBox::Yes:
break;
case KMessageBox::No:
@ -2160,25 +2160,25 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone
}
}
} else {
accountSelect.setHeader(i18n("Select %1").tqarg(typeStr));
accountSelect.setHeader(i18n("Select %1").arg(typeStr));
if(!accountId.isEmpty()) {
msg = i18n("The %1 <b>%2</b> currently exists. Do you want "
"to import transactions to this account?")
.tqarg(typeStr).tqarg(account.name());
.arg(typeStr).arg(account.name());
} else {
msg = i18n("The %1 <b>%2</b> currently does not exist. You can "
"create a new %3 by pressing the <b>Create</b> button "
"or select another %4 manually from the selection box.")
.tqarg(typeStr).tqarg(account.name()).tqarg(typeStr).tqarg(typeStr);
.arg(typeStr).arg(account.name()).arg(typeStr).arg(typeStr);
}
}
} else {
accountSelect.setHeader(i18n("Import transactions to %1").tqarg(typeStr));
accountSelect.setHeader(i18n("Import transactions to %1").arg(typeStr));
msg = i18n("No %1 information has been found in the selected TQIF file. "
"Please select an account using the selection box in the dialog or "
"create a new %2 by pressing the <b>Create</b> button.")
.tqarg(typeStr).tqarg(typeStr);
.arg(typeStr).arg(typeStr);
}
accountSelect.setDescription(msg);
@ -2223,7 +2223,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone
const MyMoneySecurity& sec = file->security(account.currencyId());
if ( KMessageBox::questionYesNo(
tqApp->mainWidget(),
i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").tqarg(account.name(), split.shares().formatMoney(account, sec), balance.formatMoney(account, sec)),
i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").arg(account.name(), split.shares().formatMoney(account, sec), balance.formatMoney(account, sec)),
i18n("Overwrite opening balance"),
KStdGuiItem::yes(),
KStdGuiItem::no(),

4
kmymoney2/converter/mymoneyqifwriter.cpp
Unescape View File

@ -69,7 +69,7 @@ void MyMoneyQifWriter::write(const TQString& filename, const TQString& profile,
} catch(MyMoneyException *e) {
TQString errMsg = i18n("Unexpected exception '%1' thrown in %2, line %3 "
"caught in MyMoneyQifWriter::write()")
.tqarg(e->what()).tqarg(e->file()).tqarg(e->line());
.arg(e->what()).arg(e->file()).arg(e->line());
KMessageBox::error(0, errMsg);
delete e;
@ -77,7 +77,7 @@ void MyMoneyQifWriter::write(const TQString& filename, const TQString& profile,
qifFile.close();
} else {
KMessageBox::error(0, i18n("Unable to open file '%1' for writing").tqarg(filename));
KMessageBox::error(0, i18n("Unable to open file '%1' for writing").arg(filename));
}
}

46
kmymoney2/converter/mymoneystatementreader.cpp
Unescape View File

@ -171,7 +171,7 @@ void MyMoneyStatementReader::Private::assignUniqueBankID(MyMoneySplit& s, const
uniqIds[hash] = true;
break;
}
hash = TQString("%1-%2").tqarg(base).tqarg(idx);
hash = TQString("%1-%2").arg(base).arg(idx);
++idx;
}
@ -291,7 +291,7 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
if(!m_account.name().isEmpty())
messages += i18n("Importing statement for account %1").tqarg(m_account.name());
messages += i18n("Importing statement for account %1").arg(m_account.name());
else if(s.m_listTransactions.count() == 0)
messages += i18n("Importing statement without transactions");
@ -389,15 +389,15 @@ bool MyMoneyStatementReader::import(const MyMoneyStatement& s, TQStringList& mes
if(s.m_closingBalance.isAutoCalc()) {
messages += i18n(" Statement balance is not contained in statement.");
} else {
messages += i18n(" Statement balance on %1 is reported to be %2").tqarg(s.m_dateEnd.toString(Qt::ISODate)).tqarg(s.m_closingBalance.formatMoney("",2));
messages += i18n(" Statement balance on %1 is reported to be %2").arg(s.m_dateEnd.toString(Qt::ISODate)).arg(s.m_closingBalance.formatMoney("",2));
}
messages += i18n(" Transactions");
messages += i18n(" %1 processed").tqarg(d->transactionsCount);
messages += i18n(" %1 added").tqarg(d->transactionsAdded);
messages += i18n(" %1 matched").tqarg(d->transactionsMatched);
messages += i18n(" %1 duplicates").tqarg(d->transactionsDuplicate);
messages += i18n(" %1 processed").arg(d->transactionsCount);
messages += i18n(" %1 added").arg(d->transactionsAdded);
messages += i18n(" %1 matched").arg(d->transactionsMatched);
messages += i18n(" %1 duplicates").arg(d->transactionsDuplicate);
messages += i18n(" Payees");
messages += i18n(" %1 created").tqarg(payeeCount);
messages += i18n(" %1 created").arg(payeeCount);
messages += TQString();
// remove the Don't ask again entries
@ -485,7 +485,7 @@ void MyMoneyStatementReader::processSecurityEntry(const MyMoneyStatement::Securi
ft.commit();
kdDebug(0) << "Created " << security.name() << " with id " << security.id() << endl;
} catch(MyMoneyException *e) {
KMessageBox::error(0, i18n("Error creating security record: %1").tqarg(e->what()), i18n("Error"));
KMessageBox::error(0, i18n("Error creating security record: %1").arg(e->what()), i18n("Error"));
}
} else {
kdDebug(0) << "Found " << security.name() << " with id " << security.id() << endl;
@ -500,7 +500,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
#if 0
TQString dbgMsg;
dbgMsg = TQString("Process %1, '%3', %2").tqarg(t_in.m_datePosted.toString(Qt::ISODate)).tqarg(t_in.m_amount.formatMoney("", 2)).tqarg(t_in.m_strBankID);
dbgMsg = TQString("Process %1, '%3', %2").arg(t_in.m_datePosted.toString(Qt::ISODate)).arg(t_in.m_amount.formatMoney("", 2)).arg(t_in.m_strBankID);
qDebug("%s", dbgMsg.data());
#endif
@ -614,7 +614,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
if ( t_in.m_strSecurity.isEmpty() )
{
KMessageBox::information(0, i18n("This imported statement contains investment transactions with no security. These transactions will be ignored.").tqarg(t_in.m_strSecurity),i18n("Security not found"),TQString("BlankSecurity"));
KMessageBox::information(0, i18n("This imported statement contains investment transactions with no security. These transactions will be ignored.").arg(t_in.m_strSecurity),i18n("Security not found"),TQString("BlankSecurity"));
return;
}
else
@ -646,7 +646,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
// This should be rare. A statement should have a security entry for any
// of the securities referred to in the transactions. The only way to get
// here is if that's NOT the case.
KMessageBox::information(0, i18n("This investment account does not contain the \"%1\" security. Transactions involving this security will be ignored.").tqarg(t_in.m_strSecurity),i18n("Security not found"),TQString("MissingSecurity%1").tqarg(t_in.m_strSecurity.stripWhiteSpace()));
KMessageBox::information(0, i18n("This investment account does not contain the \"%1\" security. Transactions involving this security will be ignored.").arg(t_in.m_strSecurity),i18n("Security not found"),TQString("MissingSecurity%1").arg(t_in.m_strSecurity.stripWhiteSpace()));
return;
}
}
@ -840,7 +840,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
break;
case MyMoneyPayee::matchName:
keys << TQString("%1").tqarg(TQRegExp::escape((*it_p).name()));
keys << TQString("%1").arg(TQRegExp::escape((*it_p).name()));
// tricky fall through here
case MyMoneyPayee::matchKey:
@ -882,13 +882,13 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
if(m_autoCreatePayee == false) {
// Ask the user if that is what he intended to do?
TQString msg = i18n("Do you want to add \"%1\" as payee/receiver?\n\n").tqarg(payeename);
TQString msg = i18n("Do you want to add \"%1\" as payee/receiver?\n\n").arg(payeename);
msg += i18n("Selecting \"Yes\" will create the payee, \"No\" will skip "
"creation of a payee record and remove the payee information "
"from this transaction. Selecting \"Cancel\" aborts the import "
"operation.\n\nIf you select \"No\" here and mark the \"Don't ask "
"again\" checkbox, the payee information for all following transactions "
"referencing \"%1\" will be removed.").tqarg(payeename);
"referencing \"%1\" will be removed.").arg(payeename);
TQString askKey = TQString("Statement-Import-Payee-")+payeename;
if(!m_dontAskAgain.contains(askKey)) {
@ -928,7 +928,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
//add in caption? and account combo here
TQLabel *label1 = new TQLabel( topcontents);
label1->setText(i18n("Please select a default category for payee '%1':").tqarg(payee.name()));
label1->setText(i18n("Please select a default category for payee '%1':").arg(payee.name()));
TQGuardedPtr<KMyMoneyAccountCombo> accountCombo = new KMyMoneyAccountCombo(topcontents);
dialog->setMainWidget(topcontents);
@ -961,7 +961,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to add payee/receiver"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
@ -1164,7 +1164,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
// to enter the schedule and match it agains the new transaction. Otherwise, we
// just leave the transaction as imported.
MyMoneySchedule schedule(*(dynamic_cast<const MyMoneySchedule*>(o)));
if(KMessageBox::questionYesNo(0, TQString("<qt>%1</qt>").tqarg(i18n("KMyMoney has found a scheduled transaction named <b>%1</b> which matches an imported transaction. Do you want KMyMoney to enter this schedule now so that the transaction can be matched? ").tqarg(schedule.name())), i18n("Schedule found")) == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(0, TQString("<qt>%1</qt>").arg(i18n("KMyMoney has found a scheduled transaction named <b>%1</b> which matches an imported transaction. Do you want KMyMoney to enter this schedule now so that the transaction can be matched? ").arg(schedule.name())), i18n("Schedule found")) == KMessageBox::Yes) {
KEnterScheduleDlg dlg(0, schedule);
TransactionEditor* editor = dlg.startEdit();
if(editor) {
@ -1221,7 +1221,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra
}
delete o;
} catch (MyMoneyException *e) {
TQString message(i18n("Problem adding or matching imported transaction with id '%1': %2").tqarg(t_in.m_strBankID).tqarg(e->what()));
TQString message(i18n("Problem adding or matching imported transaction with id '%1': %2").arg(t_in.m_strBankID).arg(e->what()));
qDebug("%s", message.data());
delete e;
@ -1271,9 +1271,9 @@ bool MyMoneyStatementReader::selectOrCreateAccount(const SelectCreateMode /*mode
}
TQString msg = i18n("<b>You have downloaded a statement for the following account:</b><br><br>");
msg += i18n(" - Account Name: %1").tqarg(account.name()) + "<br>";
msg += i18n(" - Account Type: %1").tqarg(KMyMoneyUtils::accountTypeToString(account.accountType())) + "<br>";
msg += i18n(" - Account Number: %1").tqarg(account.number()) + "<br>";
msg += i18n(" - Account Name: %1").arg(account.name()) + "<br>";
msg += i18n(" - Account Type: %1").arg(KMyMoneyUtils::accountTypeToString(account.accountType())) + "<br>";
msg += i18n(" - Account Number: %1").arg(account.number()) + "<br>";
msg += "<br>";
TQString header;
@ -1332,7 +1332,7 @@ bool MyMoneyStatementReader::selectOrCreateAccount(const SelectCreateMode /*mode
//throw new MYMONEYEXCEPTION("USERABORT");
done = true;
else
KMessageBox::error(0, TQString("<qt>%1</qt>").tqarg(i18n("You must select an account, create a new one, or press the <b>Abort</b> button.")));
KMessageBox::error(0, TQString("<qt>%1</qt>").arg(i18n("You must select an account, create a new one, or press the <b>Abort</b> button.")));
}
}
return result;

24
kmymoney2/converter/mymoneytemplate.cpp
Unescape View File

@ -70,7 +70,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url)
rc = KIO::NetAccess::download(url, filename, tqApp->mainWidget());
if(!rc) {
KMessageBox::detailedError(tqApp->mainWidget(),
i18n("Error while loading file '%1'!").tqarg(url.url()),
i18n("Error while loading file '%1'!").arg(url.url()),
KIO::NetAccess::lastErrorString(),
i18n("File access error"));
return false;
@ -81,7 +81,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url)
TQFile file(filename);
TQFileInfo info(file);
if(!info.isFile()) {
TQString msg=i18n("<b>%1</b> is not a template file.").tqarg(filename);
TQString msg=i18n("<b>%1</b> is not a template file.").arg(filename);
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+msg, i18n("Filetype Error"));
return false;
}
@ -90,7 +90,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url)
TQString errMsg;
int errLine, errColumn;
if(!m_doc.setContent(&file, &errMsg, &errLine, &errColumn)) {
TQString msg=i18n("Error while reading template file <b>%1</b> in line %2, column %3").tqarg(filename).tqarg(errLine).tqarg(errColumn);
TQString msg=i18n("Error while reading template file <b>%1</b> in line %2, column %3").arg(filename).arg(errLine).arg(errColumn);
KMessageBox::detailedError(tqApp->mainWidget(), TQString("<p>")+msg, errMsg, i18n("Template Error"));
rc = false;
} else {
@ -98,7 +98,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url)
}
file.close();
} else {
KMessageBox::sorry(tqApp->mainWidget(), i18n("File '%1' not found!").tqarg(filename));
KMessageBox::sorry(tqApp->mainWidget(), i18n("File '%1' not found!").arg(filename));
rc = false;
}
@ -139,7 +139,7 @@ bool MyMoneyTemplate::loadDescription(void)
m_longDesc = childElement.text();
validMask |= validLong;
} else {
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid tag <b>%1</b> in template file <b>%2</b>!").tqarg(childElement.tagName()).tqarg(m_source.prettyURL()));
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid tag <b>%1</b> in template file <b>%2</b>!").arg(childElement.tagName()).arg(m_source.prettyURL()));
validMask |= invalid;
}
child = child.nextSibling();
@ -155,7 +155,7 @@ bool MyMoneyTemplate::hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQ
if(account.isElement()) {
TQDomElement accountElement = account.toElement();
if(accountElement.tagName() == "account") {
TQString name = TQString("%1:%2").tqarg(parent).tqarg(accountElement.attribute("name"));
TQString name = TQString("%1:%2").arg(parent).arg(accountElement.attribute("name"));
list[name] = 0;
hierarchy(list, name, account.firstChild());
}
@ -211,7 +211,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
m_progressCallback = callback;
bool rc = !m_accounts.isNull();
MyMoneyFile* file = MyMoneyFile::instance();
signalProgress(0, m_doc.elementsByTagName("account").count(), i18n("Loading template %1").tqarg(m_source.url()));
signalProgress(0, m_doc.elementsByTagName("account").count(), i18n("Loading template %1").arg(m_source.url()));
m_accountsRead = 0;
while(rc == true && !m_accounts.isNull() && m_accounts.isElement()) {
@ -238,7 +238,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&))
break;
default:
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid top-level account type <b>%1</b> in template file <b>%2</b>!").tqarg(childElement.attribute("type")).tqarg(m_source.prettyURL()));
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid top-level account type <b>%1</b> in template file <b>%2</b>!").arg(childElement.attribute("type")).arg(m_source.prettyURL()));
rc = false;
}
@ -306,7 +306,7 @@ bool MyMoneyTemplate::setFlags(MyMoneyAccount& acc, TQDomNode flags)
if(value == "Tax") {
acc.setValue(value.latin1(), "Yes");
} else {
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid flag type <b>%1</b> for account <b>%3</b> in template file <b>%2</b>!").tqarg(flagElement.attribute("name")).tqarg(m_source.prettyURL()).tqarg(acc.name()));
KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid flag type <b>%1</b> for account <b>%3</b> in template file <b>%2</b>!").arg(flagElement.attribute("name")).arg(m_source.prettyURL()).arg(acc.name()));
rc = false;
}
}
@ -395,16 +395,16 @@ bool MyMoneyTemplate::saveTemplate(const KURL& url)
if(qfile.status() == 0) {
saveToLocalFile(qfile.file());
if(!qfile.close()) {
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename));
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename));
}
} else {
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename));
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename));
}
} else {
KTempFile tmpfile;
saveToLocalFile(tmpfile.file());
if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL))
throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").tqarg(url.url()));
throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url()));
tmpfile.unlink();
}
return true;

54
kmymoney2/converter/webpricequote.cpp
Unescape View File

@ -77,7 +77,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
m_symbol = _symbol;
m_id = _id;
// emit status(TQString("(Debug) symbol=%1 id=%2...").tqarg(_symbol,_id));
// emit status(TQString("(Debug) symbol=%1 id=%2...").arg(_symbol,_id));
// if we're running normally, with a UI, we can just get these the normal way,
// from the config file
@ -90,7 +90,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
if ( quoteSources().contains(sourcename) )
m_source = WebPriceQuoteSource(sourcename);
else
emit error(TQString("Source <%1> does not exist.").tqarg(sourcename));
emit error(TQString("Source <%1> does not exist.").arg(sourcename));
}
// otherwise, if we have no kapp, we have no config. so we just get them from
// the defaults
@ -113,13 +113,13 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
// if we've truly found 2 symbols delimited this way...
if ( splitrx.search(m_symbol) != -1 )
url = KURL::fromPathOrURL(m_source.m_url.tqarg(splitrx.cap(1),splitrx.cap(2)));
url = KURL::fromPathOrURL(m_source.m_url.arg(splitrx.cap(1),splitrx.cap(2)));
else
kdDebug(2) << "WebPriceQuote::launch() did not find 2 symbols" << endl;
}
else
// a regular one-symbol quote
url = KURL::fromPathOrURL(m_source.m_url.tqarg(m_symbol));
url = KURL::fromPathOrURL(m_source.m_url.arg(m_symbol));
// If we're running a non-interactive session (with no UI), we can't
// use KIO::NetAccess, so we have to get our web data the old-fashioned
@ -133,7 +133,7 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
if ( url.isLocalFile() )
{
emit status(TQString("Executing %1...").tqarg(url.path()));
emit status(TQString("Executing %1...").arg(url.path()));
m_filter.clearArguments();
m_filter << TQStringList::split(" ",url.path());
@ -152,13 +152,13 @@ bool WebPriceQuote::launchNative( const TQString& _symbol, const TQString& _id,
}
else
{
emit error(TQString("Unable to launch: %1").tqarg(url.path()));
emit error(TQString("Unable to launch: %1").arg(url.path()));
slotParseQuote(TQString());
}
}
else
{
emit status(TQString("Fetching URL %1...").tqarg(url.prettyURL()));
emit status(TQString("Fetching URL %1...").arg(url.prettyURL()));
TQString tmpFile;
if( download( url, tmpFile, NULL ) )
@ -268,14 +268,14 @@ bool WebPriceQuote::launchFinanceQuote ( const TQString& _symbol, const TQString
"[^,]*,([^,]*),.*", // date regexp
"%y-%m-%d"); // date format
//emit status(TQString("(Debug) symbol=%1 id=%2...").tqarg(_symbol,_id));
//emit status(TQString("(Debug) symbol=%1 id=%2...").arg(_symbol,_id));
m_filter.clearArguments();
m_filter << "perl" << m_financeQuoteScriptPath << FTQSource << KProcess::quote(_symbol);
m_filter.setUseShell(true);
m_filter.setSymbol(m_symbol);
emit status(TQString("Executing %1 %2 %3...").tqarg(m_financeQuoteScriptPath).tqarg(FTQSource).tqarg(_symbol));
emit status(TQString("Executing %1 %2 %3...").arg(m_financeQuoteScriptPath).arg(FTQSource).arg(_symbol));
// if we're running non-interactive, we'll need to block.
// otherwise, just let us know when it's done.
@ -290,7 +290,7 @@ bool WebPriceQuote::launchFinanceQuote ( const TQString& _symbol, const TQString
}
else
{
emit error(TQString("Unable to launch: %1").tqarg(m_financeQuoteScriptPath));
emit error(TQString("Unable to launch: %1").arg(m_financeQuoteScriptPath));
slotParseQuote(TQString());
}
@ -337,7 +337,7 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
TQRegExp priceRegExp(m_source.m_price);
if( symbolRegExp.search(quotedata) > -1)
emit status(i18n("Symbol found: %1").tqarg(symbolRegExp.cap(1)));
emit status(i18n("Symbol found: %1").arg(symbolRegExp.cap(1)));
if(priceRegExp.search(quotedata)> -1)
{
@ -365,7 +365,7 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
}
m_price = pricestr.toDouble();
emit status(i18n("Price found: %1 (%2)").tqarg(pricestr).tqarg(m_price));
emit status(i18n("Price found: %1 (%2)").arg(pricestr).arg(m_price));
}
if(dateRegExp.search(quotedata) > -1)
@ -377,11 +377,11 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
{
m_date = dateparse.convertString( datestr,false /*strict*/ );
gotdate = true;
emit status(i18n("Date found: %1").tqarg(m_date.toString()));;
emit status(i18n("Date found: %1").arg(m_date.toString()));;
}
catch (MyMoneyException* e)
{
// emit error(i18n("Unable to parse date %1 using format %2: %3").tqarg(datestr,dateparse.format(),e->what()));
// emit error(i18n("Unable to parse date %1 using format %2: %3").arg(datestr,dateparse.format(),e->what()));
m_date = TQDate::currentDate();
gotdate = true;
delete e;
@ -394,13 +394,13 @@ void WebPriceQuote::slotParseQuote(const TQString& _quotedata)
}
else
{
emit error(i18n("Unable to update price for %1").tqarg(m_symbol));
emit error(i18n("Unable to update price for %1").arg(m_symbol));
emit failed( m_id, m_symbol );
}
}
else
{
emit error(i18n("Unable to update price for %1").tqarg(m_symbol));
emit error(i18n("Unable to update price for %1").arg(m_symbol));
emit failed( m_id, m_symbol );
}
}
@ -624,7 +624,7 @@ TQStringList WebPriceQuote::quoteSourcesNative()
kconfig->deleteGroup("Online Quotes Options");
groups += "Old Source";
kconfig->setGroup(TQString("Online-Quote-Source-%1").tqarg("Old Source"));
kconfig->setGroup(TQString("Online-Quote-Source-%1").arg("Old Source"));
kconfig->writeEntry("URL", url);
kconfig->writeEntry("SymbolRegex", symbolRegExp);
kconfig->writeEntry("PriceRegex",priceRegExp);
@ -684,7 +684,7 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name)
{
m_name = name;
KConfig *kconfig = KGlobal::config();
kconfig->setGroup(TQString("Online-Quote-Source-%1").tqarg(m_name));
kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name));
m_sym = kconfig->readEntry("SymbolRegex");
m_date = kconfig->readEntry("DateRegex");
m_dateformat = kconfig->readEntry("DateFormatRegex","%m %d %y");
@ -696,7 +696,7 @@ WebPriceQuoteSource::WebPriceQuoteSource(const TQString& name)
void WebPriceQuoteSource::write(void) const
{
KConfig *kconfig = KGlobal::config();
kconfig->setGroup(TQString("Online-Quote-Source-%1").tqarg(m_name));
kconfig->setGroup(TQString("Online-Quote-Source-%1").arg(m_name));
kconfig->writeEntry("URL", m_url);
kconfig->writeEntry("PriceRegex", m_price);
kconfig->writeEntry("DateRegex", m_date);
@ -718,7 +718,7 @@ void WebPriceQuoteSource::rename(const TQString& name)
void WebPriceQuoteSource::remove(void) const
{
KConfig *kconfig = KGlobal::config();
kconfig->deleteGroup(TQString("Online-Quote-Source-%1").tqarg(m_name));
kconfig->deleteGroup(TQString("Online-Quote-Source-%1").arg(m_name));
}
//
@ -907,7 +907,7 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
// strict mode means we must enforce the delimiters as specified in the
// format. non-strict allows any delimiters
if ( _strict )
inputrex.setPattern(TQString("(\\w+)%1(\\w+)%2(\\w+)").tqarg(formatDelimiters[0],formatDelimiters[1]));
inputrex.setPattern(TQString("(\\w+)%1(\\w+)%2(\\w+)").arg(formatDelimiters[0],formatDelimiters[1]));
else
inputrex.setPattern("(\\w+)\\W+(\\w+)\\W+(\\w+)");
@ -940,7 +940,7 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
if ( digitrex.search(*it_scanned) != -1 )
day = digitrex.cap(1).toUInt(&ok);
if ( !ok || day > 31 )
throw new MYMONEYEXCEPTION(TQString("Invalid day entry: %1").tqarg(*it_scanned));
throw new MYMONEYEXCEPTION(TQString("Invalid day entry: %1").arg(*it_scanned));
break;
case 'm':
month = (*it_scanned).toUInt(&ok);
@ -958,18 +958,18 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
}
if ( month < 1 || month > 12 )
throw new MYMONEYEXCEPTION(TQString("Invalid month entry: %1").tqarg(*it_scanned));
throw new MYMONEYEXCEPTION(TQString("Invalid month entry: %1").arg(*it_scanned));
break;
case 'y':
if ( _strict && (*it_scanned).length() != (*it_format).length())
throw new MYMONEYEXCEPTION(TQString("Length of year (%1) does not match expected length (%2).")
.tqarg(*it_scanned,*it_format));
.arg(*it_scanned,*it_format));
year = (*it_scanned).toUInt(&ok);
if (!ok)
throw new MYMONEYEXCEPTION(TQString("Invalid year entry: %1").tqarg(*it_scanned));
throw new MYMONEYEXCEPTION(TQString("Invalid year entry: %1").arg(*it_scanned));
//
// 2-digit year case
@ -988,7 +988,7 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
}
if ( year < 1900 )
throw new MYMONEYEXCEPTION(TQString("Invalid year (%1)").tqarg(year));
throw new MYMONEYEXCEPTION(TQString("Invalid year (%1)").arg(year));
break;
default:
@ -1001,7 +1001,7 @@ TQDate MyMoneyDateFormat::convertString(const TQString& _in, bool _strict, unsig
TQDate result(year,month,day);
if ( ! result.isValid() )
throw new MYMONEYEXCEPTION(TQString("Invalid date (yr%1 mo%2 dy%3)").tqarg(year).tqarg(month).tqarg(day));
throw new MYMONEYEXCEPTION(TQString("Invalid date (yr%1 mo%2 dy%3)").arg(year).arg(month).arg(day));
return result;
}

2
kmymoney2/dialogs/investactivities.cpp
Unescape View File

@ -165,7 +165,7 @@ void Activity::preloadAssetAccount(void)
cat = dynamic_cast<KMyMoneyCategory*>(haveWidget("asset-account"));
if(cat->isVisible()) {
if(cat->currentText().isEmpty()) {
MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").tqarg(m_parent->account().name()));
MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").arg(m_parent->account().name()));
if(!acc.id().isEmpty()) {
bool blocked = cat->signalsBlocked();
// block signals, so that the focus does not go crazy

2
kmymoney2/dialogs/kbackupdlgdecl.ui
Unescape View File

@ -42,7 +42,7 @@ Please make sure you have a disk inserted and that the drive is ready. Then choo
Click OK to perform the backup. If your system does not use an automounter, make sure you mark the checkbox below to "mount this directory before backing up."</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

4
kmymoney2/dialogs/kbalancechartdlg.cpp
Unescape View File

@ -56,7 +56,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
KDialog(parent, name)
{
#ifdef HAVE_KDCHART
setCaption(i18n("Balance of %1").tqarg(account.name()));
setCaption(i18n("Balance of %1").arg(account.name()));
setSizeGripEnabled( TRUE );
setModal( TRUE );
@ -67,7 +67,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare
MyMoneyReport::eMonths,
MyMoneyTransactionFilter::userDefined, // overridden by the setDateFilter() call below
MyMoneyReport::eDetailTotal,
i18n("%1 Balance History").tqarg(account.name()),
i18n("%1 Balance History").arg(account.name()),
i18n("Generated Report")
);
reportCfg.setChartByDefault(true);

2
kmymoney2/dialogs/kcategoryreassigndlg.cpp
Unescape View File

@ -78,7 +78,7 @@ TQString KCategoryReassignDlg::show(const MyMoneyAccount& category)
// if there is no category for reassignment left, we bail out
if(list.isEmpty()) {
KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>"));
KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").arg(category.name())+TQString("</qt>"));
return TQString();
}

2
kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
Unescape View File

@ -38,7 +38,7 @@
<property name="text">
<string>The transactions, schedules and budgets associated with the selected category need to be re-assigned to a different category before the selected category can be deleted. Please select a category from the list below.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignJustify|AlignTop</set>
</property>
</widget>

24
kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
Unescape View File

@ -83,7 +83,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
if (po != pn) {
noItemsChanged++;
messageDetail += i18n("Payee changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(po).tqarg(pn);
messageDetail += i18n("Payee changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>").arg(po).arg(pn);
}
#if 0
if ( (m_schedule.type() == MyMoneySchedule::TYPE_TRANSFER ||
@ -92,7 +92,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
{
noItemsChanged++;
messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"")
.tqarg(m_schedule.account().name()).tqarg(m_from->currentText()) + TQString("\n");
.arg(m_schedule.account().name()).arg(m_from->currentText()) + TQString("\n");
}
if ( m_schedule.type() == MyMoneySchedule::TYPE_DEPOSIT &&
@ -100,23 +100,23 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
{
noItemsChanged++;
messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"")
.tqarg(m_schedule.account().name()).tqarg(m_to->currentText()) + TQString("\n");
.arg(m_schedule.account().name()).arg(m_to->currentText()) + TQString("\n");
}
#endif
if(to.splits()[0].accountId() != tn.splits()[0].accountId()) {
noItemsChanged++;
messageDetail += i18n("Account changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>")
.tqarg(file->account(to.splits()[0].accountId()).name())
.tqarg(file->account(tn.splits()[0].accountId()).name());
.arg(file->account(to.splits()[0].accountId()).name())
.arg(file->account(tn.splits()[0].accountId()).name());
}
if(file->isTransfer(to) && file->isTransfer(tn)) {
if(to.splits()[1].accountId() != tn.splits()[1].accountId()) {
noItemsChanged++;
messageDetail += i18n("Transfer account changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>")
.tqarg(file->account(to.splits()[1].accountId()).name())
.tqarg(file->account(tn.splits()[1].accountId()).name());
.arg(file->account(to.splits()[1].accountId()).name())
.arg(file->account(tn.splits()[1].accountId()).name());
}
} else {
TQString co, cn;
@ -142,7 +142,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
if (co != cn)
{
noItemsChanged++;
messageDetail += i18n("Category changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(co).tqarg(cn);
messageDetail += i18n("Category changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>").arg(co).arg(cn);
}
}
@ -156,7 +156,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
if (mo != mn)
{
noItemsChanged++;
messageDetail += i18n("Memo changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(mo).tqarg(mn);
messageDetail += i18n("Memo changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>").arg(mo).arg(mn);
}
const MyMoneySecurity& sec = MyMoneyFile::instance()->security(to.commodity());
@ -166,7 +166,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
if (ao != an) {
noItemsChanged++;
messageDetail += i18n("Amount changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>")
.tqarg(ao.formatMoney(sec.smallestAccountFraction())).tqarg(an.formatMoney(sec.smallestAccountFraction()));
.arg(ao.formatMoney(sec.smallestAccountFraction())).arg(an.formatMoney(sec.smallestAccountFraction()));
}
MyMoneySplit::reconcileFlagE fo, fn;
@ -175,8 +175,8 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
if(fo != fn) {
noItemsChanged++;
messageDetail += i18n("Reconciliation flag changed.<br>&nbsp;&nbsp;&nbsp;Old: <b>%1</b>, New: <b>%2</b><p>")
.tqarg(KMyMoneyUtils::reconcileStateToString(fo, true))
.tqarg(KMyMoneyUtils::reconcileStateToString(fn, true));
.arg(KMyMoneyUtils::reconcileStateToString(fo, true))
.arg(KMyMoneyUtils::reconcileStateToString(fn, true));
}
}
catch (MyMoneyException *e)

4
kmymoney2/dialogs/kcsvprogressdlgdecl.ui
Unescape View File

@ -387,7 +387,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string
<string>Unknown</string>
</property>
<property stdset="1">
<name>tqalignment</name>
<name>alignment</name>
<set>AlignVCenter|AlignRight</set>
</property>
<property>
@ -433,7 +433,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string
<string>0 of 0</string>
</property>
<property stdset="1">
<name>tqalignment</name>
<name>alignment</name>
<set>AlignVCenter|AlignRight</set>
</property>
<property>

20
kmymoney2/dialogs/kcurrencycalculator.cpp
Unescape View File

@ -247,22 +247,22 @@ void KCurrencyCalculator::updateExample(const MyMoneyMoney& price)
{
TQString msg;
if(price.isZero()) {
msg = TQString("1 %1 = ? %2").tqarg(m_fromCurrency.tradingSymbol())
.tqarg(m_toCurrency.tradingSymbol());
msg = TQString("1 %1 = ? %2").arg(m_fromCurrency.tradingSymbol())
.arg(m_toCurrency.tradingSymbol());
if(m_fromCurrency.isCurrency()) {
msg += TQString("\n");
msg += TQString("1 %1 = ? %2").tqarg(m_toCurrency.tradingSymbol())
.tqarg(m_fromCurrency.tradingSymbol());
msg += TQString("1 %1 = ? %2").arg(m_toCurrency.tradingSymbol())
.arg(m_fromCurrency.tradingSymbol());
}
} else {
msg = TQString("1 %1 = %2 %3").tqarg(m_fromCurrency.tradingSymbol())
.tqarg(price.formatMoney("", KMyMoneyGlobalSettings::pricePrecision()))
.tqarg(m_toCurrency.tradingSymbol());
msg = TQString("1 %1 = %2 %3").arg(m_fromCurrency.tradingSymbol())
.arg(price.formatMoney("", KMyMoneyGlobalSettings::pricePrecision()))
.arg(m_toCurrency.tradingSymbol());
if(m_fromCurrency.isCurrency()) {
msg += TQString("\n");
msg += TQString("1 %1 = %2 %3").tqarg(m_toCurrency.tradingSymbol())
.tqarg((MyMoneyMoney(1,1)/price).formatMoney("", KMyMoneyGlobalSettings::pricePrecision()))
.tqarg(m_fromCurrency.tradingSymbol());
msg += TQString("1 %1 = %2 %3").arg(m_toCurrency.tradingSymbol())
.arg((MyMoneyMoney(1,1)/price).formatMoney("", KMyMoneyGlobalSettings::pricePrecision()))
.arg(m_fromCurrency.tradingSymbol());
}
}
m_conversionExample->setText(msg);

4
kmymoney2/dialogs/kcurrencycalculatordecl.ui
Unescape View File

@ -157,7 +157,7 @@
<property name="text">
<string>xxx</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -192,7 +192,7 @@
<property name="text">
<string>xxx</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

2
kmymoney2/dialogs/keditequityentrydecl.ui
Unescape View File

@ -87,7 +87,7 @@
<property name="text">
<string>1 /</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

6
kmymoney2/dialogs/keditloanwizard.cpp
Unescape View File

@ -57,7 +57,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent
m_effectiveDateLabel->setText(TQString("\n") + i18n(
"Please enter the date from which on the following changes will be effective. "
"The date entered must be later than the opening date of this account (%1), but must "
"not be in the future. The default will be today.").tqarg(KGlobal::locale()->formatDate(account.openingDate(), true)));
"not be in the future. The default will be today.").arg(KGlobal::locale()->formatDate(account.openingDate(), true)));
m_account = account;
try {
TQString id = m_account.value("schedule");
@ -75,7 +75,7 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent
m_effectiveDateNoteLabel->setText(TQString("\n") + i18n(
"Note: you will not be able to modify this account today, because the opening date \"%1\" is in the future. "
"Please revisit this dialog when the time has come."
).tqarg(KGlobal::locale()->formatDate(m_account.openingDate(), true)));
).arg(KGlobal::locale()->formatDate(m_account.openingDate(), true)));
} else {
m_effectiveDateNoteLabel->hide();
}
@ -243,7 +243,7 @@ void KEditLoanWizard::next()
TQString errMsg = i18n(
"Your previous selection was \"%1\". If you select another option, "
"KMyMoney will dismiss the changes you have just entered. "
"Do you wish to proceed?").tqarg(button->text());
"Do you wish to proceed?").arg(button->text());
if(KMessageBox::questionYesNo(this, errMsg) == KMessageBox::No) {
dontLeavePage = true;

8
kmymoney2/dialogs/kendingbalancedlg.cpp
Unescape View File

@ -68,7 +68,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa
d->m_account = account;
MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId());
m_enterInformationLabel->setText(TQString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").tqarg(currency.name())+TQString("</qt>"));
m_enterInformationLabel->setText(TQString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").arg(currency.name())+TQString("</qt>"));
m_statementDate->setDate(TQDate::currentDate());
@ -122,7 +122,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa
m_lastStatementDate->setText(TQString());
if(account.lastReconciliationDate().isValid()) {
m_lastStatementDate->setText(i18n("Last reconciled statement: %1")
.tqarg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true)));
.arg(KGlobal::locale()->formatDate(account.lastReconciliationDate(), true)));
}
// remove all unwanted pages
@ -510,8 +510,8 @@ void KEndingBalanceLoanDlg::next(void)
m_loanOverview->setText(i18n("KMyMoney has calculated the following amounts for "
"interest and amortization according to recorded payments "
"between %1 and %2.")
.tqarg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true))
.tqarg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true)));
.arg(KGlobal::locale()->formatDate(m_startDateEdit->date(), true))
.arg(KGlobal::locale()->formatDate(m_endDateEdit->date(), true)));
// preload widgets with calculated values if they are empty
if(m_amortizationTotalEdit->value().isZero() && !amortization.isZero())

12
kmymoney2/dialogs/kendingbalancedlgdecl.ui
Unescape View File

@ -43,7 +43,7 @@ All relevant information necessary for this process is usually printed on your s
On the next page you will verify, that the starting and ending balance are matching those on your statement. If not, please modify the figures.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -75,7 +75,7 @@ On the next page you will verify, that the starting and ending balance are match
Please enter the following information found on your statement:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -231,7 +231,7 @@ Please enter the following information found on your statement:</string>
<property name="text">
<string>1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -334,7 +334,7 @@ Please enter the following information found on your statement:</string>
<property name="text">
<string>If your statement shows different amounts, please cancel this dialog and correct the false transactions or correct the values in this dialog. In the later case, KMyMoney will create an adjustment transaction and add it to the ledger.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -381,7 +381,7 @@ Please enter the following information found on your statement:</string>
<property name="text">
<string>In order to create the adjustment transaction, KMyMoney requires an account and possibly an interest category to assign the differences to. Please select an account and - if necessary - a category.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -512,7 +512,7 @@ It is important, that you continue with the same statement you used when you pos
All information you have entered into this wizard will be shown and all transactions that you already cleared are marked with a 'C'.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

22
kmymoney2/dialogs/kequitypriceupdatedlg.cpp
Unescape View File

@ -183,8 +183,8 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d
{
MyMoneyFile* file = MyMoneyFile::instance();
TQString symbol = TQString("%1 > %2").tqarg(pair.first,pair.second);
TQString id = TQString("%1 %2").tqarg(pair.first,pair.second);
TQString symbol = TQString("%1 > %2").arg(pair.first,pair.second);
TQString id = TQString("%1 %2").arg(pair.first,pair.second);
if ( ! lvEquityList->findItem(id,ID_COL,TQt::ExactMatch) )
{
MyMoneyPrice pr = file->price(pair.first,pair.second);
@ -219,7 +219,7 @@ void KEquityPriceUpdateDlg::addPricePair(const MyMoneySecurityPair& pair, bool d
if(keep) {
KListViewItem* item = new KListViewItem(lvEquityList,
symbol,
i18n("%1 units in %2").tqarg(pair.first,pair.second));
i18n("%1 units in %2").arg(pair.first,pair.second));
if(pr.isValid()) {
item->setText(PRICE_COL, pr.rate(pair.second).formatMoney(file->currency(pair.second).tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
item->setText(DATE_COL, pr.date().toString(Qt::ISODate));
@ -260,7 +260,7 @@ void KEquityPriceUpdateDlg::addInvestment(const MyMoneySecurity& inv)
}
item->setText(ID_COL,id);
if (inv.value("kmm-online-quote-system") == "Finance::Quote")
item->setText(SOURCE_COL, TQString("Finance::Quote %1").tqarg( inv.value("kmm-online-source")));
item->setText(SOURCE_COL, TQString("Finance::Quote %1").arg( inv.value("kmm-online-source")));
else
item->setText(SOURCE_COL, inv.value("kmm-online-source"));
@ -342,7 +342,7 @@ void KEquityPriceUpdateDlg::storePrices(void)
TQStringList ids = TQStringList::split(" ",TQString(id));
TQString fromid = ids[0].utf8();
TQString toid = ids[1].utf8();
name = TQString("%1 --> %2").tqarg(fromid).tqarg(toid);
name = TQString("%1 --> %2").arg(fromid).arg(toid);
MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL));
file->addPrice(price);
}
@ -422,9 +422,9 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString&
// Give the user some options
int result;
if(_id.contains(" ")) {
result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").tqarg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed"));
result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").arg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed"));
} else {
result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").tqarg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").tqarg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no());
result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").arg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").arg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no());
}
if ( result == KMessageBox::No )
@ -444,7 +444,7 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString&
MyMoneyFile::instance()->modifySecurity(security);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").tqarg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed"));
KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").arg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed"));
delete e;
}
}
@ -525,13 +525,13 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
}
item->setText(PRICE_COL, KGlobal::locale()->formatMoney(price, sec.tradingSymbol(), KMyMoneyGlobalSettings::pricePrecision()));
item->setText(DATE_COL, date.toString(Qt::ISODate));
logStatusMessage(i18n("Price for %1 updated (id %2)").tqarg(_symbol,_id));
logStatusMessage(i18n("Price for %1 updated (id %2)").arg(_symbol,_id));
// make sure to make OK button available
btnOK->setEnabled(true);
}
else
{
logErrorMessage(i18n("Received an invalid price for %1, unable to update.").tqarg(_symbol));
logErrorMessage(i18n("Received an invalid price for %1, unable to update.").arg(_symbol));
}
prgOnlineProgress->advance(1);
@ -551,7 +551,7 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin
}
else
{
logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list! Aborting entire update.").tqarg(_symbol,_id));
logErrorMessage(i18n("Received a price for %1 (id %2), but this symbol is not on the list! Aborting entire update.").arg(_symbol,_id));
}
if (next)

2
kmymoney2/dialogs/kexportdlgdecl.ui
Unescape View File

@ -57,7 +57,7 @@
You can choose the file's path, the account and the format of the QIF file (profile). Choose Account to export all the transactions between the specified dates or just categories. You can also limit the transactions that are exported by start and ending date. Once you have pressed the Export button a message box will appear when the export has completed detailing how many transactions, categories and payees were exported.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">

4
kmymoney2/dialogs/kfindtransactiondlg.cpp
Unescape View File

@ -714,9 +714,9 @@ void KFindTransactionDlg::loadView(void)
#if KMM_DEBUG
m_foundText->setText(i18n("Found %1 matching transactions (D %2 / P %3 = %4)")
.tqarg(splitCount).tqarg(deposit.formatMoney("", 2)).tqarg(payment.formatMoney("", 2)).tqarg((deposit-payment).formatMoney("", 2)));
.arg(splitCount).arg(deposit.formatMoney("", 2)).arg(payment.formatMoney("", 2)).arg((deposit-payment).formatMoney("", 2)));
#else
m_foundText->setText(i18n("Found %1 matching transactions") .tqarg(splitCount));
m_foundText->setText(i18n("Found %1 matching transactions") .arg(splitCount));
#endif
m_tabWidget->setTabEnabled(m_resultPage, true);

4
kmymoney2/dialogs/kfindtransactiondlgdecl.ui
Unescape View File

@ -852,7 +852,7 @@
<property name="text">
<string>text</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -969,7 +969,7 @@
<property name="text">
<string>F</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignLeft</set>
</property>
</widget>

2
kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
Unescape View File

@ -38,7 +38,7 @@
<property name="text">
<string>Use 'Help' for more information on these options</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

4
kmymoney2/dialogs/kgncpricesourcedlg.cpp
Unescape View File

@ -45,8 +45,8 @@ KGncPriceSourceDlg::KGncPriceSourceDlg(const TQString &stockName, const TQString
connect( buttonGroup5, TQT_SIGNAL( released(int) ), this, TQT_SLOT( buttonPressed(int) ) );
connect( buttonHelp, TQT_SIGNAL( clicked() ), this, TQT_SLOT( slotHelp() ) );
// initialize data fields
textStockName->setText (i18n ("Investment: %1").tqarg(stockName));
textGncSource->setText (i18n ("Quote source: %1").tqarg(gncSource));
textStockName->setText (i18n ("Investment: %1").arg(stockName));
textGncSource->setText (i18n ("Quote source: %1").arg(gncSource));
listKnownSource->insertStringList (WebPriceQuote::quoteSources());
lineUserSource->setText (gncSource);
checkAlwaysUse->setChecked(true);

2
kmymoney2/dialogs/kimportdlg.cpp
Unescape View File

@ -107,7 +107,7 @@ void KImportDlg::slotBrowse()
tmpprofile.loadProfile("Profile-" + profile());
KFileDialog dialog(KGlobalSettings::documentPath(),
i18n("%1|Import files\n%2|All files (*.*)").tqarg(tmpprofile.filterFileType()).tqarg("*"),
i18n("%1|Import files\n%2|All files (*.*)").arg(tmpprofile.filterFileType()).arg("*"),
this, i18n("Import File..."), true);
dialog.setMode(KFile::File | KFile::ExistingOnly);

16
kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
Unescape View File

@ -48,12 +48,12 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name )
m_lastModificationDate->setText(storage->lastModificationDate().toString(Qt::ISODate));
m_baseCurrency->setText(storage->value("kmm-baseCurrency"));
m_payeeCount->setText(TQString("%1").tqarg(storage->payeeList().count()));
m_institutionCount->setText(TQString("%1").tqarg(storage->institutionList().count()));
m_payeeCount->setText(TQString("%1").arg(storage->payeeList().count()));
m_institutionCount->setText(TQString("%1").arg(storage->institutionList().count()));
TQValueList<MyMoneyAccount> a_list;
storage->accountList(a_list);
m_accountCount->setText(TQString("%1").tqarg(a_list.count()));
m_accountCount->setText(TQString("%1").arg(a_list.count()));
TQMap<MyMoneyAccount::accountTypeE, int> accountMap;
TQMap<MyMoneyAccount::accountTypeE, int> accountMapClosed;
@ -67,22 +67,22 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name )
TQMap<MyMoneyAccount::accountTypeE, int>::const_iterator it_m;
for(it_m = accountMap.begin(); it_m != accountMap.end(); ++it_m) {
new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").tqarg(*it_m), TQString("%1").tqarg(accountMapClosed[it_m.key()]));
new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()]));
}
MyMoneyTransactionFilter filter;
filter.setReportAllSplits(false);
m_transactionCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count()));
m_transactionCount->setText(TQString("%1").arg(storage->transactionList(filter).count()));
filter.setReportAllSplits(true);
m_splitCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count()));
m_scheduleCount->setText(TQString("%1").tqarg(storage->scheduleList().count()));
m_splitCount->setText(TQString("%1").arg(storage->transactionList(filter).count()));
m_scheduleCount->setText(TQString("%1").arg(storage->scheduleList().count()));
MyMoneyPriceList list = storage->priceList();
MyMoneyPriceList::const_iterator it_p;
int pCount = 0;
for(it_p = list.begin(); it_p != list.end(); ++it_p)
pCount += (*it_p).count();
m_priceCount->setText(TQString("%1").tqarg(pCount));
m_priceCount->setText(TQString("%1").arg(pCount));
}
KMyMoneyFileInfoDlg::~KMyMoneyFileInfoDlg()

12
kmymoney2/dialogs/knewaccountdlg.cpp
Unescape View File

@ -394,7 +394,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo
m_vatAssignment->setChecked(false);
// make sure our account does not have an id and no parent assigned
// and certainly no tqchildren in case we create a new account
// and certainly no children in case we create a new account
if(!m_isEditing) {
m_account.clearId();
m_account.setParentAccountId(TQString());
@ -549,7 +549,7 @@ void KNewAccountDlg::okClicked()
// we don't need this check anymore.
if(!file->nameToAccount(accountNameText).isEmpty()
&& (file->nameToAccount(accountNameText) != m_account.id())) {
KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").tqarg(accountNameText)+TQString("</qt>"));
KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").arg(accountNameText)+TQString("</qt>"));
return;
}
#endif
@ -564,7 +564,7 @@ void KNewAccountDlg::okClicked()
newName += accountNameText;
if(!file->categoryToAccount(newName, acctype).isEmpty()
&& (file->categoryToAccount(newName, acctype) != m_account.id())) {
KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").tqarg(newName)+TQString("</qt>"));
KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").arg(newName)+TQString("</qt>"));
return;
}
}
@ -669,7 +669,7 @@ const MyMoneyAccount& KNewAccountDlg::account(void)
break;
case 1:
case 2:
m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem()));
m_account.setValue("priceMode", TQString("%1").arg(m_priceMode->currentItem()));
break;
}
@ -924,7 +924,7 @@ void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& account
if (m_parentItem)
{
m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name()));
m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name()));
m_parentItem->setOpen(true);
m_qlistviewParentAccounts->setSelected(m_parentItem, true);
}
@ -976,7 +976,7 @@ void KNewAccountDlg::slotSelectionChanged(TQListViewItem *item)
//qDebug("Selected account id: %s", accountItem->accountID().data());
m_parentAccount = file->account(accountItem->id());
m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name()));
m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name()));
if(m_qlistviewParentAccounts->isEnabled()) {
m_bSelectedParentAccount = true;
}

2
kmymoney2/dialogs/knewaccountdlgdecl.ui
Unescape View File

@ -250,7 +250,7 @@
<property name="text">
<string>Notes:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>

2
kmymoney2/dialogs/knewequityentrydecl.ui
Unescape View File

@ -80,7 +80,7 @@
<property name="text">
<string>1 /</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

4
kmymoney2/dialogs/knewinvestmentwizard.cpp
Unescape View File

@ -294,7 +294,7 @@ void KNewInvestmentWizard::createObjects(const TQString& parentId)
break;
case 1:
case 2:
m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem()));
m_account.setValue("priceMode", TQString("%1").arg(m_priceMode->currentItem()));
break;
}
@ -306,7 +306,7 @@ void KNewInvestmentWizard::createObjects(const TQString& parentId)
}
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Unable to create all objects for the investment"), TQString("%1 caugt in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Unable to create all objects for the investment"), TQString("%1 caugt in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}

10
kmymoney2/dialogs/knewinvestmentwizarddecl.ui
Unescape View File

@ -33,7 +33,7 @@
<property name="text">
<string>This wizard allows you to create a new investment.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -61,7 +61,7 @@
<property name="text">
<string>The first step in this process requires to select the type of investment. The following steps collect more details about the investment from you.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -174,7 +174,7 @@
<property name="text">
<string>Enter the details below and click &lt;b&gt;Next&lt;/b&gt; to continue entering the online update details.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -231,7 +231,7 @@
<property name="text">
<string>1 /</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -401,7 +401,7 @@
<property name="text">
<string>Select an online source and click &lt;b&gt;Finish&lt;/b&gt; to store the investment data. If you don't want to use online updates, just leave the data as is.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

24
kmymoney2/dialogs/knewloanwizard.cpp
Unescape View File

@ -510,7 +510,7 @@ void KNewLoanWizard::next()
if(m_loanAmountEdit->lineedit()->text().isEmpty()
&& m_interestRateEdit->lineedit()->text().isEmpty()) {
dontLeavePage = true;
KMessageBox::error(0, errMsg.tqarg(i18n("interest rate")), i18n("Calculation error"));
KMessageBox::error(0, errMsg.arg(i18n("interest rate")), i18n("Calculation error"));
} else
updateInterestRate();
@ -519,7 +519,7 @@ void KNewLoanWizard::next()
|| m_interestRateEdit->lineedit()->text().isEmpty())
&& m_durationValueEdit->value() == 0) {
dontLeavePage = true;
KMessageBox::error(0, errMsg.tqarg(i18n("term")), i18n("Calculation error"));
KMessageBox::error(0, errMsg.arg(i18n("term")), i18n("Calculation error"));
} else
updateDuration();
@ -529,7 +529,7 @@ void KNewLoanWizard::next()
|| m_durationValueEdit->value() == 0)
&& m_paymentEdit->lineedit()->text().isEmpty()) {
dontLeavePage = true;
KMessageBox::error(0, errMsg.tqarg(i18n("principal and interest")), i18n("Calculation error"));
KMessageBox::error(0, errMsg.arg(i18n("principal and interest")), i18n("Calculation error"));
} else
updatePayment();
@ -709,14 +709,14 @@ int KNewLoanWizard::calculateLoan(void)
val = calc.presentValue();
m_loanAmountEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney(fraction));
result = i18n("KMyMoney has calculated the amount of the loan as %1.")
.tqarg(m_loanAmountEdit->lineedit()->text());
.arg(m_loanAmountEdit->lineedit()->text());
} else if(m_interestRateEdit->lineedit()->text().isEmpty()) {
// calculate the interest rate out of the other information
val = calc.interestRate();
m_interestRateEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3));
result = i18n("KMyMoney has calculated the interest rate to %1%.")
.tqarg(m_interestRateEdit->lineedit()->text());
.arg(m_interestRateEdit->lineedit()->text());
} else if(m_paymentEdit->lineedit()->text().isEmpty()) {
// calculate the periodical amount of the payment out of the other information
@ -729,7 +729,7 @@ int KNewLoanWizard::calculateLoan(void)
calc.setPmt(val);
result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.")
.tqarg(m_paymentEdit->lineedit()->text());
.arg(m_paymentEdit->lineedit()->text());
val = calc.futureValue();
if((m_borrowButton->isChecked() && val < 0 && fabsl(val) >= fabsl(calc.payment()))
@ -741,7 +741,7 @@ int KNewLoanWizard::calculateLoan(void)
m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction));
result += TQString(" ");
result += i18n("The number of payments has been decremented and the final payment has been modified to %1.")
.tqarg(m_finalPaymentEdit->lineedit()->text());
.arg(m_finalPaymentEdit->lineedit()->text());
} else if((m_borrowButton->isChecked() && val < 0 && fabsl(val) < fabsl(calc.payment()))
|| (m_lendButton->isChecked() && val > 0 && fabs(val) < fabs(calc.payment()))) {
m_finalPaymentEdit->loadText(MyMoneyMoney(0,1).formatMoney(fraction));
@ -749,7 +749,7 @@ int KNewLoanWizard::calculateLoan(void)
MyMoneyMoney refVal(static_cast<double>(val));
m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction));
result += i18n("The final payment has been modified to %1.")
.tqarg(m_finalPaymentEdit->lineedit()->text());
.arg(m_finalPaymentEdit->lineedit()->text());
}
} else if(m_durationValueEdit->value() == 0) {
@ -761,7 +761,7 @@ int KNewLoanWizard::calculateLoan(void)
// if the number of payments has a fractional part, then we
// round it to the smallest integer and calculate the balloon payment
result = i18n("KMyMoney has calculated the term of your loan as %1. ")
.tqarg(updateTermWidgets(floorl(val)));
.arg(updateTermWidgets(floorl(val)));
if(val != floorl(val)) {
calc.setNpp(floorl(val));
@ -769,7 +769,7 @@ int KNewLoanWizard::calculateLoan(void)
MyMoneyMoney refVal(static_cast<double>(val));
m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction));
result += i18n("The final payment has been modified to %1.")
.tqarg(m_finalPaymentEdit->lineedit()->text());
.arg(m_finalPaymentEdit->lineedit()->text());
}
} else {
@ -800,7 +800,7 @@ int KNewLoanWizard::calculateLoan(void)
MyMoneyMoney refVal(static_cast<double>(val));
result = i18n("KMyMoney has calculated a final payment of %1 for this loan.")
.tqarg(refVal.abs().formatMoney(fraction));
.arg(refVal.abs().formatMoney(fraction));
if(!m_finalPaymentEdit->lineedit()->text().isEmpty()) {
if((m_finalPaymentEdit->value().abs() - refVal.abs()).abs().toDouble() > 1) {
@ -889,7 +889,7 @@ void KNewLoanWizard::slotCreateCategory(void)
m_interestAccountEdit->setSelected(id);
} catch (MyMoneyException *e) {
KMessageBox::information(this, i18n("Unable to add account: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to add account: %1").arg(e->what()));
delete e;
}
}

198
kmymoney2/dialogs/knewloanwizarddecl.ui
Unescape View File

@ -84,7 +84,7 @@
<property name="text">
<string>New Loan Account Wizard</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignHCenter</set>
</property>
</widget>
@ -117,7 +117,7 @@ Welcome to the New Loan Account Wizard which will guide you through the creation
Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -196,7 +196,7 @@ Please make sure that you have the relevant information handy. You usually get t
<property name="text">
<string>Edit Loan Account Wizard</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignHCenter</set>
</property>
</widget>
@ -229,7 +229,7 @@ Welcome to the Edit Loan Account Wizard. Please use this wizard to modify inform
Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -277,7 +277,7 @@ Please make sure that you have the relevant information handy. You usually get t
<string>
In the first step, KMyMoney will ask you some general information about the loan account to be created.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -350,7 +350,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<property name="text">
<string>1. General Information</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -450,7 +450,7 @@ In the first step, KMyMoney will ask you some general information about the loan
<string>
Please select, which data of the loan you want to modify.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -613,7 +613,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="text">
<string>1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -624,7 +624,7 @@ Please select, which data of the loan you want to modify.</string>
<property name="text">
<string>1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -718,7 +718,7 @@ Please select, which data of the loan you want to modify.</string>
<string>
Do you borrow or lend money?</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -851,7 +851,7 @@ Do you borrow or lend money?</string>
<string>
How do you want to call this loan? Examples for names are 'car loan', 'school loan', 'home owner loan'.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -993,7 +993,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo
<string>
Is the interest of this loan fixed over a period of time or is it adapted from time to time? If the interest rate changes during the amortization phase of the loan you should choose the option 'variable interest rate'.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1132,7 +1132,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t
<string>
Were there any payments for this loan whether they are entered into KMyMoney or not?</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1251,7 +1251,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
<property name="text">
<string>Note: Payments made to obtain the loan (e.g. Dissagio) are not considered as payments in this context.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1299,7 +1299,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
<string>
Do you want to record all payments of this loan with KMyMoney?</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1432,7 +1432,7 @@ Do you want to record all payments of this loan with KMyMoney?</string>
<string>
Select the date when the interest rate for this loan will be modified and the frequency of the future changes.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1556,7 +1556,7 @@ Select the date when the interest rate for this loan will be modified and the fr
<string>
Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1698,7 +1698,7 @@ Please enter the amount you pay for principal and interest or leave the field em
If KMyMoney should calculate this value for you, then leave the field blank.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -1729,7 +1729,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st
<string>
Please enter the interest rate or leave the field empty to calculate it.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1871,7 +1871,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
If KMyMoney should calculate this value for you, then leave the field blank.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1901,7 +1901,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st
<property name="text">
<string>1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -1975,7 +1975,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st
<property name="text">
<string></string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignBottom</set>
</property>
</widget>
@ -2006,7 +2006,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st
<string>
You have successfully entered the general information about your loan. Next, KMyMoney needs some information about the calculation of the loan.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -2082,7 +2082,7 @@ You have successfully entered the general information about your loan. Next, KMy
<property name="text">
<string>1. General Information</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -2189,7 +2189,7 @@ You have successfully entered the general information about your loan. Next, KMy
<string>
How often will there be payments made to this loan?</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -2309,7 +2309,7 @@ How often will there be payments made to this loan?</string>
<string>
When does the actual interest rate get calculated?</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -2447,7 +2447,7 @@ When does the actual interest rate get calculated?</string>
<property name="text">
<string>1</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -2524,7 +2524,7 @@ When does the actual interest rate get calculated?</string>
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2535,7 +2535,7 @@ When does the actual interest rate get calculated?</string>
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2546,7 +2546,7 @@ When does the actual interest rate get calculated?</string>
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2557,7 +2557,7 @@ When does the actual interest rate get calculated?</string>
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2568,7 +2568,7 @@ When does the actual interest rate get calculated?</string>
<property name="text">
<string>Final amortization payment</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2681,7 +2681,7 @@ When does the actual interest rate get calculated?</string>
<string>
Please enter the interest rate or leave the field empty to calculate it.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -2758,7 +2758,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2769,7 +2769,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2780,7 +2780,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2791,7 +2791,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2802,7 +2802,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<property name="text">
<string>Final amortization payment</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -2909,7 +2909,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string
<string>
Please enter the term of this loan or leave the field empty to calculate it. The term is the time that is required to fully repay the loan. This time might be different from the time your loan contract is signed for.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -2993,7 +2993,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3004,7 +3004,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3015,7 +3015,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3026,7 +3026,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3037,7 +3037,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<property name="text">
<string>Final amortization payment</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3150,7 +3150,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
<string>
Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -3227,7 +3227,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3238,7 +3238,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3249,7 +3249,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3260,7 +3260,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3271,7 +3271,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<property name="text">
<string>Final amortization payment</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3384,7 +3384,7 @@ Please enter the amount you pay for principal and interest or leave the field em
<string>
Please enter the amount of a final amortization payment or leave the field empty to calculate it.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -3461,7 +3461,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3472,7 +3472,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3483,7 +3483,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3494,7 +3494,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3505,7 +3505,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<property name="text">
<string>Final amortization payment</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3618,7 +3618,7 @@ Please enter the amount of a final amortization payment or leave the field empty
<string>
KMyMoney has calculated the loan as shown in the overview below. You can accept these values by selecting "Next" or change them by choosing "Back" to return to the input field for the information you want to change.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -3666,7 +3666,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3677,7 +3677,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3688,7 +3688,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3699,7 +3699,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3710,7 +3710,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<property name="text">
<string>Final amortization payment</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -3823,7 +3823,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
<string>
In the following steps, KMyMoney supports you in setting up categories and schedules for your loan payments.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -3899,7 +3899,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<property name="text">
<string>1. General Information</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -4009,7 +4009,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
<string>
Please select the category you want to assign the interest payments to or create a new category.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4120,7 +4120,7 @@ Please select the category you want to assign the interest payments to or create
<string>
If your regular payment contains any additional fees, click on the button "Additional fees" to enter them.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4168,7 +4168,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="text">
<string>= periodical payment:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4187,7 +4187,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="textFormat">
<enum>PlainText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4206,7 +4206,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="textFormat">
<enum>PlainText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4231,7 +4231,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="text">
<string>+</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4260,7 +4260,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="textFormat">
<enum>PlainText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4271,7 +4271,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4335,7 +4335,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<property name="text">
<string>If no additional fees are included in your periodical payment or you have entered all such fees, then click on "Next".</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4383,7 +4383,7 @@ If your regular payment contains any additional fees, click on the button "Addit
<string>KMyMoney will create a schedule for this payment and reminds you whenever a payment must be made.&lt;p&gt;
If you selected to record all payments this date has already been supplied. If you selected to record only this years payments, then the &lt;b&gt;First payment due date&lt;/b&gt; is the date of the first payment made in this year.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4443,7 +4443,7 @@ If you selected to record all payments this date has already been supplied. If y
<property name="text">
<string>Make payment from/to:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>
@ -4493,7 +4493,7 @@ If you selected to record all payments this date has already been supplied. If y
<string>
KMyMoney has calculated the loan as shown below. If you want to accept these values use the "Finish" button to update your account, otherwise use the "Back" button to modify your settings.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4541,7 +4541,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4552,7 +4552,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="text">
<string>Additional fees:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4563,7 +4563,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="text">
<string>Total payment:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4574,7 +4574,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4585,7 +4585,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="text">
<string>Valid from:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4596,7 +4596,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<property name="text">
<string>Affected payments:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -4719,7 +4719,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
<string>If this loan is for an asset, such as a car or a house, you can create the asset account now. An asset account represents the total value of an asset. The money from this loan will be transfered into the asset account you create or select.
If this loan is a 'consumer loan' (money to use however you want), you can use a checking account instead.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4871,7 +4871,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
<string>
This page summarizes the data you entered. If you need to modify anything, please use the "Back" button to go to respective page. Otherwise use the "Finish" button to create the account.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -4958,7 +4958,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Payee:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5001,7 +5001,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>First payment:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5028,7 +5028,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Amount is:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5122,7 +5122,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Periodic Payment:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5133,7 +5133,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Additional Fees:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5144,7 +5144,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Interest category:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5155,7 +5155,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Payment from:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5198,7 +5198,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Next due date:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5262,7 +5262,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Term:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5289,7 +5289,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Interest rate:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5316,7 +5316,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Final Payment:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5343,7 +5343,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Interest is due:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5370,7 +5370,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Principal + Interest:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5397,7 +5397,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Loan amount:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -5408,7 +5408,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
<property name="text">
<string>Payment frequency:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

2
kmymoney2/dialogs/kpayeereassigndlgdecl.ui
Unescape View File

@ -38,7 +38,7 @@
<property name="text">
<string>The transactions associated with the selected payees need to be re-assigned to a different payee before the selected payees can be deleted. Please select a payee from the list below.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignJustify|AlignTop</set>
</property>
</widget>

18
kmymoney2/dialogs/kreconciledlgdecl.ui
Unescape View File

@ -63,7 +63,7 @@ a transaction you can return to the register by clicking on the Edit Transaction
Your account is balanced when the Difference is Zero. Click on the Finish button to save the reconciled transactions.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignLeft</set>
</property>
<property name="wordwrap" stdset="0">
@ -386,7 +386,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>Previous Balance:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -407,7 +407,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -450,7 +450,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>Ending Balance:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -477,7 +477,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -520,7 +520,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>Cleared Balance:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -547,7 +547,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -590,7 +590,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>Difference:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -611,7 +611,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
<property name="text">
<string>0</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

4
kmymoney2/dialogs/ksecuritylisteditor.cpp
Unescape View File

@ -181,10 +181,10 @@ void KSecurityListEditor::slotDeleteSecurity(void)
TQString msg;
TQString dontAsk;
if(security.isCurrency()) {
msg = TQString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").tqarg(security.name());
msg = TQString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").arg(security.name());
dontAsk = "DeleteCurrency";
} else {
msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").tqarg(KMyMoneyUtils::securityTypeToString(security.securityType())).tqarg(security.name());
msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").arg(KMyMoneyUtils::securityTypeToString(security.securityType())).arg(security.name());
dontAsk = "DeleteSecurity";
}
if(KMessageBox::questionYesNo(this, msg, i18n("Delete security"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk) == KMessageBox::Yes) {

8
kmymoney2/dialogs/kselectdatabasedlg.cpp
Unescape View File

@ -107,11 +107,11 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const cha
// list drivers supported by KMM
TQMap<TQString, TQString> map = m_map.driverMap();
if (!list.contains(driverName)) {
KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").tqarg(driverName),
KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").arg(driverName),
"");
setError();
} else if (!map.contains(driverName)) {
KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").tqarg(driverName),
KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").arg(driverName),
"");
setError();
} else {
@ -159,7 +159,7 @@ const KURL KSelectDatabaseDlg::selectedURL() {
url.setHost(textHostName->text());
url.setPath("/" + textDbName->text());
TQString qs = TQString("driver=%1")
.tqarg(listDrivers->currentText().section (' ', 0, 0));
.arg(listDrivers->currentText().section (' ', 0, 0));
if (checkPreLoad->isChecked()) qs.append("&options=loadAll");
if (!textPassword->text().isEmpty()) qs.append("&secure=yes");
url.setQuery(qs);
@ -171,7 +171,7 @@ void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) {
if (!m_map.isTested(dbType)) {
int rc = KMessageBox::warningContinueCancel (0,
i18n("TQt SQL driver %1 has not been fully tested in a KMyMoney environment. Please make sure you have adequate backups of your data. Please report any problems to the developer mailing list at kmymoney2-developer@lists.sourceforge.net")
.tqarg(driver->text()),
.arg(driver->text()),
"");
if (rc == KMessageBox::Cancel) {
listDrivers->clearSelection();

14
kmymoney2/dialogs/ksplittransactiondlg.cpp
Unescape View File

@ -183,15 +183,15 @@ int KSplitTransactionDlg::exec(void)
TQString q = i18n("The total amount of this transaction is %1 while "
"the sum of the splits is %2. The remaining %3 are "
"unassigned.")
.tqarg(total)
.tqarg(sums)
.tqarg(diff);
.arg(total)
.arg(sums)
.arg(diff);
corrDlg->explanation->setText(q);
q = i18n("Change &total amount of transaction to %1.").tqarg(sums);
q = i18n("Change &total amount of transaction to %1.").arg(sums);
corrDlg->changeBtn->setText(q);
q = i18n("&Distribute difference of %1 among all splits.").tqarg(diff);
q = i18n("&Distribute difference of %1 among all splits.").arg(diff);
corrDlg->distributeBtn->setText(q);
// FIXME remove the following line once distribution among
// all splits is implemented
@ -200,9 +200,9 @@ int KSplitTransactionDlg::exec(void)
// if we have only two splits left, we don't allow leaving sth. unassigned.
if(m_transaction.splitCount() < 3) {
q = i18n("&Leave total amount of transaction at %1.").tqarg(total);
q = i18n("&Leave total amount of transaction at %1.").arg(total);
} else {
q = i18n("&Leave %1 unassigned.").tqarg(diff);
q = i18n("&Leave %1 unassigned.").arg(diff);
}
corrDlg->leaveBtn->setText(q);

12
kmymoney2/dialogs/ksplittransactiondlgdecl.ui
Unescape View File

@ -136,7 +136,7 @@
<property name="text">
<string>&lt;b&gt;11,00&lt;b&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -163,7 +163,7 @@
<property name="text">
<string>&lt;b&gt;111,00&lt;b&gt;</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -181,7 +181,7 @@
<property name="text">
<string>Unassigned</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -199,7 +199,7 @@
<property name="text">
<string>Sum of splits</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -226,7 +226,7 @@
<property name="text">
<string>100,00</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">
@ -250,7 +250,7 @@
<property name="text">
<string>Transaction amount</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

4
kmymoney2/dialogs/kstartdlg.cpp
Unescape View File

@ -89,7 +89,7 @@ void KStartDlg::setPage_Documents()
kurlrequest = new KURLRequester( recentMainFrame, "kurlrequest" );
//allow user to select either a .kmy file, or any generic file.
kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").tqarg("*.kmy").tqarg("*.*") );
kurlrequest->fileDialog()->setFilter( i18n("%1|KMyMoney files (*.kmy)\n" "%2|All files (*.*)").arg("*.kmy").arg("*.*") );
kurlrequest->fileDialog()->setMode(KFile::File || KFile::ExistingOnly);
kurlrequest->fileDialog()->setURL(KURL(kmymoney2->readLastUsedDir()));//kurlrequest->fileDialog()->setURL(KURL(KGlobalSettings::documentPath()));
mainLayout->addWidget( kurlrequest );
@ -138,7 +138,7 @@ void KStartDlg::readConfig()
// it does not make a difference, if you call setGroup() outside of
// this loop. The first time it does make a difference!
config->setGroup("Recent Files");
value = config->readEntry( TQString( "File%1" ).tqarg( i ), TQString() );
value = config->readEntry( TQString( "File%1" ).arg( i ), TQString() );
if( !value.isNull() && fileExists(value) )
{
TQString file_name = value.mid(value.findRev('/')+1);

2
kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
Unescape View File

@ -433,7 +433,7 @@ void MyMoneyQifProfileEditor::slotDelete(void)
{
TQString profile = m_profile.profileName().mid(8);
if(KMessageBox::questionYesNo(this, i18n("Do you really want to delete profile '%1'?").tqarg(profile)) == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(this, i18n("Do you really want to delete profile '%1'?").arg(profile)) == KMessageBox::Yes) {
int idx = m_profileListBox->currentItem();
m_profile.saveProfile();
deleteProfile(profile);

2
kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
Unescape View File

@ -366,7 +366,7 @@
<property name="text">
<string>Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

4
kmymoney2/dialogs/settings/ksettingsgpg.cpp
Unescape View File

@ -153,7 +153,7 @@ void KSettingsGpg::show(void)
TQString name = fields[1];
name.replace('(', "[");
name.replace(')', "]");
name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]);
name = TQString("%1 (0x%2)").arg(name).arg(fields[0]);
m_masterKeyCombo->insertItem(name);
if(name.contains(masterKey))
m_masterKeyCombo->setCurrentItem(name);
@ -177,7 +177,7 @@ void KSettingsGpg::slotStatusChanged(bool state)
state = false;
if((state == true) && (oncePerSession == true) && isVisible()) {
KMessageBox::information(this, TQString("<qt>%1</qt>").tqarg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated");
KMessageBox::information(this, TQString("<qt>%1</qt>").arg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated");
oncePerSession = false;
}

2
kmymoney2/dialogs/settings/ksettingshomedecl.ui
Unescape View File

@ -120,7 +120,7 @@
<string>Selected entries are shown on the home page of the application.&lt;p&gt;
Use the buttons and checkboxes to customize the tqlayout of the home page.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

24
kmymoney2/dialogs/transactioneditor.cpp
Unescape View File

@ -220,7 +220,7 @@ void TransactionEditor::slotNumberChanged(const TQString& txt)
if(number) {
if(MyMoneyFile::instance()->checkNoUsed(m_account.id(), txt)) {
if(KMessageBox::questionYesNo(m_regForm, TQString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").tqarg(txt).tqarg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(m_regForm, TQString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").arg(txt).arg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) {
number->loadText(KMyMoneyUtils::nextCheckNumber(m_account));
}
}
@ -302,11 +302,11 @@ int TransactionEditor::slotEditSplits(void)
acc = MyMoneyAccount();
}
TQString msg;
msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").tqarg(sec.name())+TQString(" ");
msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").arg(sec.name())+TQString(" ");
if(acc.id().isEmpty()) {
msg += i18n("KMyMoney was not able to find a more appropriate account to edit this transaction. Nevertheless, you are allowed to modify the transaction. If you don't want to edit this transaction, please cancel from editing next.");
} else {
msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").tqarg(acc.name());
msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").arg(acc.name());
}
KMessageBox::information(0, msg);
}
@ -409,12 +409,12 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account)
if(firstTimeMultiCurrency) {
firstTimeMultiCurrency = false;
if(!isMultiSelection()) {
msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").tqarg(osec.name());
msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").arg(osec.name());
} else {
msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").tqarg(osec.name());
msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").arg(osec.name());
}
if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").tqarg(msg)) == KMessageBox::Cancel) {
if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").arg(msg)) == KMessageBox::Cancel) {
rc = false;
}
}
@ -611,7 +611,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule,
i18n("Accepts the entered data and stores it as schedule"),
i18n("Use this to schedule the transaction for later entry into the ledger."));
enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").tqarg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes;
enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").arg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes;
}
if(enter) {
// add new transaction
@ -679,25 +679,25 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule,
key = "minBalanceEarly";
if(!acc.value(key).isEmpty()) {
if(minBalanceEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) {
msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
}
}
key = "minBalanceAbsolute";
if(!acc.value(key).isEmpty()) {
if(minBalanceAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) {
msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
}
}
key = "maxCreditEarly";
if(!acc.value(key).isEmpty()) {
if(maxCreditEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) {
msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
}
}
key = "maxCreditAbsolute";
if(!acc.value(key).isEmpty()) {
if(maxCreditAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) {
msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
}
}
@ -1240,7 +1240,7 @@ void StdTransactionEditor::autoFill(const TQString& payeeId)
int cnt = 0;
TQMap<TQString, struct uniqTransaction>::iterator it_u;
do {
TQString ukey = TQString("%1-%2").tqarg(key).tqarg(cnt);
TQString ukey = TQString("%1-%2").arg(key).arg(cnt);
it_u = uniqList.find(ukey);
if(it_u == uniqList.end()) {
uniqList[ukey].t = &((*it_t).first);

12
kmymoney2/dialogs/transactionmatcher.cpp
Unescape View File

@ -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)").tqarg(m_account.name()).tqarg(sm.shares().formatMoney(m_account, sec), si.shares().formatMoney(m_account, sec)));
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)));
}
// 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.").tqarg(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.").arg(m_account.name()));
}
} catch(MyMoneyException *e) {
TQString estr = e->what();
delete e;
throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr));
throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(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)").tqarg(accountname).tqarg((*it_split).value().formatMoney(),startSplit.value().formatMoney()));
throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").arg(accountname).arg((*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.").tqarg(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.").arg(accountname));
}
}
catch(MyMoneyException *e)
{
TQString estr = e->what();
delete e;
throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").tqarg(estr));
throw new MYMONEYEXCEPTION(i18n("Unable to match all splits (%1)").arg(estr));
}
}
++it_split;

216
kmymoney2/kmymoney2.cpp
Unescape View File

@ -874,7 +874,7 @@ void KMyMoney2App::slotFileOpen(void)
KMSTATUS(i18n("Open a file."));
KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(),
i18n("%1|KMyMoney files\n%2|All files (*.*)").tqarg("*.kmy *.xml").tqarg("*"),
i18n("%1|KMyMoney files\n%2|All files (*.*)").arg("*.kmy *.xml").arg("*"),
this, i18n("Open File..."), true);
dialog->setMode(KFile::File | KFile::ExistingOnly);
@ -988,10 +988,10 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url)
}
} else {
slotFileClose();
KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> is either an invalid filename or the file does not exist. You can open another file or create a new one.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("File not found"));
KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> is either an invalid filename or the file does not exist. You can open another file or create a new one.").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("File not found"));
}
} else {
KMessageBox::sorry(this, TQString("<p>")+i18n("File <b>%1</b> is already opened in another instance of KMyMoney").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Duplicate open"));
KMessageBox::sorry(this, TQString("<p>")+i18n("File <b>%1</b> is already opened in another instance of KMyMoney").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Duplicate open"));
}
}
@ -1039,7 +1039,7 @@ void KMyMoney2App::slotManageGpgKeys(void)
dlg.setKeys(m_additionalGpgKeys);
if(dlg.exec() == TQDialog::Accepted) {
m_additionalGpgKeys = dlg.keys();
m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").tqarg(m_additionalGpgKeys.count()));
m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").arg(m_additionalGpgKeys.count()));
}
}
@ -1051,7 +1051,7 @@ void KMyMoney2App::slotKeySelected(int idx)
}
m_additionalKeyLabel->setEnabled(idx != 0);
m_additionalKeyButton->setEnabled(idx != 0);
m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").tqarg(cnt));
m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").arg(cnt));
}
bool KMyMoney2App::slotFileSaveAs(void)
@ -1075,7 +1075,7 @@ bool KMyMoney2App::slotFileSaveAs(void)
m_saveEncrypted = new KComboBox(keyBox);
TQHBox* labelBox = new TQHBox(vbox);
m_additionalKeyLabel = new TQLabel(i18n("Additional encryption key(s) to be used: %1").tqarg(m_additionalGpgKeys.count()), labelBox);
m_additionalKeyLabel = new TQLabel(i18n("Additional encryption key(s) to be used: %1").arg(m_additionalGpgKeys.count()), labelBox);
m_additionalKeyButton = new KPushButton(i18n("Manage additional keys"), labelBox);
connect(m_additionalKeyButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotManageGpgKeys()));
connect(m_saveEncrypted, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotKeySelected(int)));
@ -1092,7 +1092,7 @@ bool KMyMoney2App::slotFileSaveAs(void)
TQString name = fields[1];
name.replace('(', "[");
name.replace(')', "]");
name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]);
name = TQString("%1 (0x%2)").arg(name).arg(fields[0]);
m_saveEncrypted->insertItem(name);
if(name.contains(KMyMoneyGlobalSettings::gpgRecipient())) {
m_saveEncrypted->setCurrentItem(name);
@ -1106,10 +1106,10 @@ bool KMyMoney2App::slotFileSaveAs(void)
// enhanced to show the m_saveEncrypted combo box
bool specialDir = prevDir.at(0) == ':';
KFileDialog dlg( specialDir ? prevDir : TQString(),
TQString("%1|%2\n").tqarg("*.kmy").tqarg(i18n("KMyMoney (Filefilter)", "KMyMoney files")) +
TQString("%1|%2\n").tqarg("*.xml").tqarg(i18n("XML (Filefilter)", "XML files")) +
TQString("%1|%2\n").tqarg("*.anon.xml").tqarg(i18n("Anonymous (Filefilter)", "Anonymous files")) +
TQString("%1|%2\n").tqarg("*").tqarg(i18n("All files")),
TQString("%1|%2\n").arg("*.kmy").arg(i18n("KMyMoney (Filefilter)", "KMyMoney files")) +
TQString("%1|%2\n").arg("*.xml").arg(i18n("XML (Filefilter)", "XML files")) +
TQString("%1|%2\n").arg("*.anon.xml").arg(i18n("Anonymous (Filefilter)", "Anonymous files")) +
TQString("%1|%2\n").arg("*").arg(i18n("All files")),
this, "filedialog", true, vbox);
connect(&dlg, TQT_SIGNAL(filterChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAsFilterChanged(const TQString&)));
@ -1428,7 +1428,7 @@ void KMyMoney2App::slotFileViewPersonal(void)
file->setUser(user);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::information(this, i18n("Unable to store user information: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to store user information: %1").arg(e->what()));
delete e;
}
}
@ -1466,7 +1466,7 @@ void KMyMoney2App::slotLoadAccountTemplates(void)
}
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to import template(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to import template(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -1622,7 +1622,7 @@ void KMyMoney2App::slotGncImport(void)
KMSTATUS(i18n("Importing a Gnucash file."));
KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(),
i18n("%1|Gnucash files\n%2|All files (*.*)").tqarg("*").tqarg("*"),
i18n("%1|Gnucash files\n%2|All files (*.*)").arg("*").arg("*"),
this, i18n("Import Gnucash file..."), true);
dialog->setMode(KFile::File | KFile::ExistingOnly);
@ -1665,7 +1665,7 @@ void KMyMoney2App::slotStatementImport(void)
KMSTATUS(i18n("Importing an XML Statement."));
KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(),
i18n("%1|XML files\n%2|All files (*.*)").tqarg("*.xml").tqarg("*.*"),
i18n("%1|XML files\n%2|All files (*.*)").arg("*.xml").arg("*.*"),
this, i18n("Import XML Statement..."), true);
dialog->setMode(KFile::File | KFile::ExistingOnly);
@ -1702,7 +1702,7 @@ void KMyMoney2App::slotStatementImport(void)
if ( !result )
{
TQMessageBox::critical( this, i18n("Critical Error"), i18n("Unable to read file %1: %2").tqarg( dialog->selectedURL().path()).tqarg(error), TQMessageBox::Ok, 0 );
TQMessageBox::critical( this, i18n("Critical Error"), i18n("Unable to read file %1: %2").arg( dialog->selectedURL().path()).arg(error), TQMessageBox::Ok, 0 );
}*/
}
@ -1722,7 +1722,7 @@ bool KMyMoney2App::slotStatementImport(const TQString& url)
if ( MyMoneyStatement::readXMLFile( s, url ) )
result = slotStatementImport(s);
else
KMessageBox::error(this, i18n("Error importing %1: This file is not a valid KMM statement file.").tqarg(url), i18n("Invalid Statement"));
KMessageBox::error(this, i18n("Error importing %1: This file is not a valid KMM statement file.").arg(url), i18n("Invalid Statement"));
return result;
}
@ -1732,7 +1732,7 @@ bool KMyMoney2App::slotStatementImport(const MyMoneyStatement& s)
bool result = false;
// keep a copy of the statement
MyMoneyStatement::writeXMLFile(s, TQString("/home/thb/kmm-statement-%1.txt").tqarg(d->statementXMLindex++));
MyMoneyStatement::writeXMLFile(s, TQString("/home/thb/kmm-statement-%1.txt").arg(d->statementXMLindex++));
// we use an object on the heap here, so that we can check the presence
// of it during slotUpdateActions() by looking at the pointer.
@ -1792,7 +1792,7 @@ bool KMyMoney2App::okToWriteFile(const KURL& url)
bool reallySaveFile = true;
if(KIO::NetAccess::exists(url, true, this)) {
if(KMessageBox::warningYesNo(this, TQString("<qt>")+i18n("The file <b>%1</b> already exists. Do you really want to override it?").tqarg(url.prettyURL(0, KURL::StripFileProtocol))+TQString("</qt>"), i18n("File already exists")) != KMessageBox::Yes)
if(KMessageBox::warningYesNo(this, TQString("<qt>")+i18n("The file <b>%1</b> already exists. Do you really want to override it?").arg(url.prettyURL(0, KURL::StripFileProtocol))+TQString("</qt>"), i18n("File already exists")) != KMessageBox::Yes)
reallySaveFile = false;
}
return reallySaveFile;
@ -1917,7 +1917,7 @@ void KMyMoney2App::slotFileBackup(void)
if(!m_fileName.isLocalFile()) {
KMessageBox::sorry(this,
i18n("The current implementation of the backup functionality only supports local files as source files! Your current source file is '%1'.")
.tqarg(m_fileName.url()),
.arg(m_fileName.url()),
i18n("Local files only"));
return;
@ -1934,7 +1934,7 @@ void KMyMoney2App::slotFileBackup(void)
m_mountpoint = backupDlg->txtMountPoint->text();
if (m_backupMount) {
progressCallback(0, 300, i18n("Mounting %1").tqarg(m_mountpoint));
progressCallback(0, 300, i18n("Mounting %1").arg(m_mountpoint));
proc << "mount";
proc << m_mountpoint;
proc.start();
@ -1978,7 +1978,7 @@ void KMyMoney2App::slotProcessExited(void)
m_backupResult = 1;
if (m_backupMount) {
progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint));
progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint));
proc.clearArguments();
proc << "umount";
proc << m_mountpoint;
@ -1993,7 +1993,7 @@ void KMyMoney2App::slotProcessExited(void)
}
if(m_backupResult == 0) {
progressCallback(50, 0, i18n("Writing %1").tqarg(backupfile));
progressCallback(50, 0, i18n("Writing %1").arg(backupfile));
proc << "cp" << "-f" << m_fileName.path(0) << backupfile;
m_backupState = BACKUP_COPYING;
proc.start();
@ -2003,7 +2003,7 @@ void KMyMoney2App::slotProcessExited(void)
KMessageBox::information(this, i18n("Error mounting device"), i18n("Backup"));
m_backupResult = 1;
if (m_backupMount) {
progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint));
progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint));
proc.clearArguments();
proc << "umount";
proc << m_mountpoint;
@ -2022,7 +2022,7 @@ void KMyMoney2App::slotProcessExited(void)
if(proc.normalExit() && proc.exitStatus() == 0) {
if (m_backupMount) {
progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint));
progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint));
proc.clearArguments();
proc << "umount";
proc << m_mountpoint;
@ -2041,7 +2041,7 @@ void KMyMoney2App::slotProcessExited(void)
KMessageBox::information(this, i18n("Error copying file to device"), i18n("Backup"));
if (m_backupMount) {
progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint));
progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint));
proc.clearArguments();
proc << "umount";
proc << m_mountpoint;
@ -2153,7 +2153,7 @@ void KMyMoney2App::createInstitution(MyMoneyInstitution& institution)
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::information(this, i18n("Cannot add institution: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Cannot add institution: %1").arg(e->what()));
delete e;
}
}
@ -2195,14 +2195,14 @@ void KMyMoney2App::slotInstitutionEdit(const MyMoneyObject& obj)
slotSelectInstitution(file->institution(dlg.institution().id()));
} catch(MyMoneyException *e) {
KMessageBox::information(this, i18n("Unable to store institution: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to store institution: %1").arg(e->what()));
delete e;
}
}
} catch(MyMoneyException *e) {
if(!obj.id().isEmpty())
KMessageBox::information(this, i18n("Unable to edit institution: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to edit institution: %1").arg(e->what()));
delete e;
}
}
@ -2213,7 +2213,7 @@ void KMyMoney2App::slotInstitutionDelete(void)
try {
MyMoneyInstitution institution = file->institution(m_selectedInstitution.id());
if ((KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete institution <b>%1</b> ?").tqarg(institution.name()))) == KMessageBox::No)
if ((KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete institution <b>%1</b> ?").arg(institution.name()))) == KMessageBox::No)
return;
MyMoneyFileTransaction ft;
@ -2221,11 +2221,11 @@ void KMyMoney2App::slotInstitutionDelete(void)
file->removeInstitution(institution);
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::information(this, i18n("Unable to delete institution: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to delete institution: %1").arg(e->what()));
delete e;
}
} catch (MyMoneyException *e) {
KMessageBox::information(this, i18n("Unable to delete institution: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to delete institution: %1").arg(e->what()));
delete e;
}
}
@ -2278,7 +2278,7 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const
}
}
} catch (MyMoneyException *e) {
KMessageBox::error(0, i18n("Unable to find account: %1").tqarg(e->what()));
KMessageBox::error(0, i18n("Unable to find account: %1").arg(e->what()));
delete e;
}
return nullAccount;
@ -2325,8 +2325,8 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par
"Please click Yes to change the opening balance to %1,\n"
"Please click No to leave the amount as %2,\n"
"Please click Cancel to abort the account creation.")
.tqarg((-openingBal).formatMoney(newAccount, sec))
.tqarg(openingBal.formatMoney(newAccount, sec));
.arg((-openingBal).formatMoney(newAccount, sec))
.arg(openingBal.formatMoney(newAccount, sec));
int ans = KMessageBox::questionYesNoCancel(this, message);
if (ans == KMessageBox::Yes) {
@ -2384,7 +2384,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par
}
catch (MyMoneyException *e)
{
KMessageBox::information(this, i18n("Unable to add account: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to add account: %1").arg(e->what()));
delete e;
}
}
@ -2402,7 +2402,7 @@ void KMyMoney2App::slotCategoryNew(const TQString& name, TQString& id)
void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& parent)
{
if(KMessageBox::questionYesNo(this,
TQString("<qt>%1</qt>").tqarg(i18n("The category <b>%1</b> currently does not exist. Do you want to create it?<p><i>The parent account will default to <b>%2</b> but can be changed in the following dialog</i>.").tqarg(account.name()).tqarg(parent.name())), i18n("Create category"),
TQString("<qt>%1</qt>").arg(i18n("The category <b>%1</b> currently does not exist. Do you want to create it?<p><i>The parent account will default to <b>%2</b> but can be changed in the following dialog</i>.").arg(account.name()).arg(parent.name())), i18n("Create category"),
KStdGuiItem::yes(), KStdGuiItem::no(), "CreateNewCategories") == KMessageBox::Yes) {
createCategory(account, parent);
} else {
@ -2523,7 +2523,7 @@ void KMyMoney2App::slotAccountNew(MyMoneyAccount& account)
ft.commit();
account = acc;
} catch (MyMoneyException *e) {
KMessageBox::error(this, i18n("Unable to create account: %1").tqarg(e->what()));
KMessageBox::error(this, i18n("Unable to create account: %1").arg(e->what()));
}
}
}
@ -2535,7 +2535,7 @@ void KMyMoney2App::slotInvestmentNew(MyMoneyAccount& account, const MyMoneyAccou
TQString dontShowAgain = "CreateNewInvestments";
if(KMessageBox::questionYesNo(this,
TQString("<qt>")+i18n("The security <b>%1</b> currently does not exist as sub-account of <b>%2</b>. "
"Do you want to create it?").tqarg(account.name()).tqarg(parent.name())+TQString("</qt>"), i18n("Create security"),
"Do you want to create it?").arg(account.name()).arg(parent.name())+TQString("</qt>"), i18n("Create security"),
KStdGuiItem::yes(), KStdGuiItem::no(), dontShowAgain) == KMessageBox::Yes) {
KNewInvestmentWizard dlg;
dlg.setName(account.name());
@ -2569,14 +2569,14 @@ void KMyMoney2App::slotInvestmentEdit(void)
void KMyMoney2App::slotInvestmentDelete(void)
{
if(KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete the investment <b>%1</b>?").tqarg(m_selectedInvestment.name()), i18n("Delete investment"), KStdGuiItem::yes(), KStdGuiItem::no(), "DeleteInvestment") == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete the investment <b>%1</b>?").arg(m_selectedInvestment.name()), i18n("Delete investment"), KStdGuiItem::yes(), KStdGuiItem::no(), "DeleteInvestment") == KMessageBox::Yes) {
MyMoneyFile* file = MyMoneyFile::instance();
MyMoneyFileTransaction ft;
try {
file->removeAccount(m_selectedInvestment);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::information(this, i18n("Unable to delete investment: %1").tqarg(e->what()));
KMessageBox::information(this, i18n("Unable to delete investment: %1").arg(e->what()));
delete e;
}
} else {
@ -2809,7 +2809,7 @@ void KMyMoney2App::slotAccountDelete(void)
slotStatusProgressBar(blist.count(), 0);
}
} catch(MyMoneyException *e) {
KMessageBox::error( this, i18n("Unable to exchange category <b>%1</b> with category <b>%2</b>. Reason: %3").tqarg(m_selectedAccount.name()).tqarg(newCategory.name()).tqarg(e->what()));
KMessageBox::error( this, i18n("Unable to exchange category <b>%1</b> with category <b>%2</b>. Reason: %3").arg(m_selectedAccount.name()).arg(newCategory.name()).arg(e->what()));
delete e;
exit = true;
}
@ -2830,14 +2830,14 @@ void KMyMoney2App::slotAccountDelete(void)
// case A - only a single, unused category without subcats selected
if (m_selectedAccount.accountList().isEmpty()) {
if (!needAskUser || (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to delete category <b>%1</b>?").tqarg(m_selectedAccount.name())+TQString("</qt>")) == KMessageBox::Yes)) {
if (!needAskUser || (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to delete category <b>%1</b>?").arg(m_selectedAccount.name())+TQString("</qt>")) == KMessageBox::Yes)) {
try {
file->removeAccount(m_selectedAccount);
m_selectedAccount.clearId();
slotUpdateActions();
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete category <b>%1</b>. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())+TQString("</qt>"));
KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete category <b>%1</b>. Cause: %2").arg(m_selectedAccount.name()).arg(e->what())+TQString("</qt>"));
delete e;
}
}
@ -2851,7 +2851,7 @@ void KMyMoney2App::slotAccountDelete(void)
int result = KMessageBox::questionYesNoCancel(this, TQString("<qt>")+
i18n("Do you want to delete category <b>%1</b> with all its sub-categories or only "
"the category itself? If you only delete the category itself, all its sub-categories "
"will be made sub-categories of <b>%2</b>.").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())+TQString("</qt>"),
"will be made sub-categories of <b>%2</b>.").arg(m_selectedAccount.name()).arg(parentAccount.name())+TQString("</qt>"),
TQString(),
KGuiItem(i18n("Delete all")),
KGuiItem(i18n("Just the category")));
@ -2885,7 +2885,7 @@ void KMyMoney2App::slotAccountDelete(void)
}
if (!accountsToReparent.isEmpty() && need_confirmation) {
if (KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Some sub-categories of category <b>%1</b> cannot "
"be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())) != KMessageBox::Yes) {
"be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").arg(m_selectedAccount.name()).arg(parentAccount.name())) != KMessageBox::Yes) {
return; // user gets wet feet...
}
}
@ -2904,7 +2904,7 @@ void KMyMoney2App::slotAccountDelete(void)
// the old account list, which is no longer valid
m_selectedAccount = file->account(m_selectedAccount.id());
} catch(MyMoneyException* e) {
KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete a sub-category of category <b>%1</b>. Reason: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())+TQString("</qt>"));
KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete a sub-category of category <b>%1</b>. Reason: %2").arg(m_selectedAccount.name()).arg(e->what())+TQString("</qt>"));
delete e;
return;
}
@ -2916,7 +2916,7 @@ void KMyMoney2App::slotAccountDelete(void)
return; // can't delete accounts which still have subaccounts
if (KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to "
"delete account <b>%1</b>?").tqarg(m_selectedAccount.name())) != KMessageBox::Yes) {
"delete account <b>%1</b>?").arg(m_selectedAccount.name())) != KMessageBox::Yes) {
return; // ok, you don't want to? why did you click then, hmm?
}
} // switch;
@ -2927,7 +2927,7 @@ void KMyMoney2App::slotAccountDelete(void)
slotUpdateActions();
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::error( this, i18n("Unable to delete account '%1'. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what()));
KMessageBox::error( this, i18n("Unable to delete account '%1'. Cause: %2").arg(m_selectedAccount.name()).arg(e->what()));
delete e;
}
}
@ -2943,12 +2943,12 @@ void KMyMoney2App::slotAccountEdit(void)
bool category = false;
switch(MyMoneyAccount::accountGroup(m_selectedAccount.accountType())) {
default:
caption = i18n("Edit account '%1'").tqarg(m_selectedAccount.name());
caption = i18n("Edit account '%1'").arg(m_selectedAccount.name());
break;
case MyMoneyAccount::Expense:
case MyMoneyAccount::Income:
caption = i18n("Edit category '%1'").tqarg(m_selectedAccount.name());
caption = i18n("Edit category '%1'").arg(m_selectedAccount.name());
category = true;
break;
}
@ -3034,7 +3034,7 @@ void KMyMoney2App::slotAccountEdit(void)
slotSelectAccount(file->account(account.id()));
} catch(MyMoneyException* e) {
KMessageBox::error( this, i18n("Unable to modify account '%1'. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what()));
KMessageBox::error( this, i18n("Unable to modify account '%1'. Cause: %2").arg(m_selectedAccount.name()).arg(e->what()));
delete e;
}
}
@ -3328,7 +3328,7 @@ bool KMyMoney2App::canCloseAccount(const MyMoneyAccount& acc) const
if(!acc.balance().isZero())
return false;
// all tqchildren must be already closed
// all children must be already closed
TQStringList::const_iterator it_a;
for(it_a = acc.accountList().begin(); it_a != acc.accountList().end(); ++it_a) {
MyMoneyAccount a = MyMoneyFile::instance()->account(*it_a);
@ -3405,7 +3405,7 @@ void KMyMoney2App::slotReparentAccount(const MyMoneyAccount& _src, const MyMoney
MyMoneyFile::instance()->modifyAccount(src);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to institution <b>%2</b>. Reason: %3").tqarg(src.name()).tqarg(_dst.name()).tqarg(e->what()));
KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to institution <b>%2</b>. Reason: %3").arg(src.name()).arg(_dst.name()).arg(e->what()));
delete e;
}
}
@ -3419,7 +3419,7 @@ void KMyMoney2App::slotReparentAccount(const MyMoneyAccount& _src, const MyMoney
MyMoneyFile::instance()->reparentAccount(src, dst);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to <b>%2</b>. Reason: %3").tqarg(src.name()).tqarg(dst.name()).tqarg(e->what()));
KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to <b>%2</b>. Reason: %3").arg(src.name()).arg(dst.name()).arg(e->what()));
delete e;
}
}
@ -3434,7 +3434,7 @@ void KMyMoney2App::slotAccountTransactionReport(void)
MyMoneyReport::eTQCnumber|MyMoneyReport::eTQCpayee|MyMoneyReport::eTQCcategory,
MyMoneyTransactionFilter::yearToDate,
MyMoneyReport::eDetailAll,
i18n("%1 YTD Account Transactions").tqarg(m_selectedAccount.name()),
i18n("%1 YTD Account Transactions").arg(m_selectedAccount.name()),
i18n("Generated Report")
);
report.setGroup(i18n("Transactions"));
@ -3475,7 +3475,7 @@ void KMyMoney2App::slotScheduleNew(const MyMoneyTransaction& _t, MyMoneySchedule
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::error(this, i18n("Unable to add scheduled transaction: %1").tqarg(e->what()), i18n("Add scheduled transaction"));
KMessageBox::error(this, i18n("Unable to add scheduled transaction: %1").arg(e->what()), i18n("Add scheduled transaction"));
delete e;
}
}
@ -3515,7 +3515,7 @@ void KMyMoney2App::slotScheduleEdit(void)
// than previous payment. Date would be
// updated automatically so we probably
// want to clear it. Let's ask the user.
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered a scheduled transaction date of <b>%1</b>. Because the scheduled transaction was last paid on <b>%2</b>, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").tqarg(KGlobal::locale()->formatDate(next, true)).tqarg(KGlobal::locale()->formatDate(last, true))+TQString("</qt>"),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered a scheduled transaction date of <b>%1</b>. Because the scheduled transaction was last paid on <b>%2</b>, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").arg(KGlobal::locale()->formatDate(next, true)).arg(KGlobal::locale()->formatDate(last, true))+TQString("</qt>"),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) {
sched.setLastPayment( TQDate() );
}
}
@ -3525,7 +3525,7 @@ void KMyMoney2App::slotScheduleEdit(void)
deleteTransactionEditor();
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
}
@ -3545,7 +3545,7 @@ void KMyMoney2App::slotScheduleEdit(void)
MyMoneyFile::instance()->modifyAccount(loan_wiz->account());
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
}
@ -3557,7 +3557,7 @@ void KMyMoney2App::slotScheduleEdit(void)
}
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
}
@ -3569,7 +3569,7 @@ void KMyMoney2App::slotScheduleDelete(void)
MyMoneyFileTransaction ft;
try {
MyMoneySchedule sched = MyMoneyFile::instance()->schedule(m_selectedSchedule.id());
TQString msg = TQString("<p>")+i18n("Are you sure you want to delete the scheduled transaction <b>%1</b>?").tqarg(m_selectedSchedule.name());
TQString msg = TQString("<p>")+i18n("Are you sure you want to delete the scheduled transaction <b>%1</b>?").arg(m_selectedSchedule.name());
if(sched.type() == MyMoneySchedule::TYPE_LOANPAYMENT) {
msg += TQString(" ");
msg += i18n("In case of loan payments it is currently not possible to recreate the scheduled transaction.");
@ -3581,7 +3581,7 @@ void KMyMoney2App::slotScheduleDelete(void)
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to remove scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unable to remove scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
}
@ -3595,7 +3595,7 @@ void KMyMoney2App::slotScheduleDuplicate(void)
MyMoneySchedule sch = m_selectedSchedule;
sch.clearId();
sch.setLastPayment(TQDate());
sch.setName(i18n("Copy of scheduled transaction name", "Copy of %1").tqarg(sch.name()));
sch.setName(i18n("Copy of scheduled transaction name", "Copy of %1").arg(sch.name()));
MyMoneyFileTransaction ft;
try {
@ -3607,7 +3607,7 @@ void KMyMoney2App::slotScheduleDuplicate(void)
myMoneyView->slotScheduleSelected(sch.id());
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -3621,7 +3621,7 @@ void KMyMoney2App::slotScheduleSkip(void)
if(!schedule.isFinished()) {
if(schedule.occurence() != MyMoneySchedule::OCCUR_ONCE) {
TQDate next = schedule.nextDueDate();
if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to skip the <b>%1</b> transaction scheduled for <b>%2</b>?").tqarg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString("</qt>"))) == KMessageBox::Yes) {
if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to skip the <b>%1</b> transaction scheduled for <b>%2</b>?").arg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString("</qt>"))) == KMessageBox::Yes) {
MyMoneyFileTransaction ft;
schedule.setLastPayment(next);
schedule.setNextDueDate(schedule.nextPayment(next));
@ -3631,7 +3631,7 @@ void KMyMoney2App::slotScheduleSkip(void)
}
}
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, TQString("<qt>")+i18n("Unable to skip scheduled transaction <b>%1</b>.").tqarg(m_selectedSchedule.name())+TQString("</qt>"), e->what());
KMessageBox::detailedSorry(this, TQString("<qt>")+i18n("Unable to skip scheduled transaction <b>%1</b>.").arg(m_selectedSchedule.name())+TQString("</qt>"), e->what());
delete e;
}
}
@ -3644,7 +3644,7 @@ void KMyMoney2App::slotScheduleEnter(void)
MyMoneySchedule schedule = MyMoneyFile::instance()->schedule(m_selectedSchedule.id());
enterSchedule(schedule);
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unknown scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unknown scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
}
@ -3751,14 +3751,14 @@ KMyMoneyUtils::EnterScheduleResultCodeE KMyMoney2App::enterSchedule(MyMoneySched
ft.commit();
}
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
deleteTransactionEditor();
}
}
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what());
KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what());
delete e;
}
}
@ -3771,7 +3771,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id)
if(newnameBase != i18n("New Payee")) {
// Ask the user if that is what he intended to do?
TQString msg = TQString("<qt>") + i18n("Do you want to add <b>%1</b> as payer/receiver ?").tqarg(newnameBase) + TQString("</qt>");
TQString msg = TQString("<qt>") + i18n("Do you want to add <b>%1</b> as payer/receiver ?").arg(newnameBase) + TQString("</qt>");
const TQString dontAskAgain = TQString::fromLatin1("NewPayee");
if(KMessageBox::questionYesNo(this, msg, i18n("New payee/receiver"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAskAgain) == KMessageBox::No) {
doit = false;
@ -3794,7 +3794,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id)
for(;;) {
try {
MyMoneyFile::instance()->payeeByName(newname);
newname = TQString("%1 [%2]").tqarg(newnameBase).tqarg(++count);
newname = TQString("%1 [%2]").arg(newnameBase).arg(++count);
} catch(MyMoneyException* e) {
delete e;
break;
@ -3808,7 +3808,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id)
ft.commit();
} catch (MyMoneyException *e) {
KMessageBox::detailedSorry(this, i18n("Unable to add payee"),
TQString("%1 thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
TQString("%1 thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -3860,7 +3860,7 @@ void KMyMoney2App::slotPayeeDelete(void)
// get confirmation from user
TQString prompt;
if (m_selectedPayees.size() == 1)
prompt = TQString("<p>")+i18n("Do you really want to remove the payee <b>%1</b>?").tqarg(m_selectedPayees.front().name());
prompt = TQString("<p>")+i18n("Do you really want to remove the payee <b>%1</b>?").arg(m_selectedPayees.front().name());
else
prompt = i18n("Do you really want to remove all selected payees?");
@ -3960,7 +3960,7 @@ void KMyMoney2App::slotPayeeDelete(void)
} // for - Schedules
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to reassign payee of transaction/split"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
} // if !translist.isEmpty()
@ -4017,7 +4017,7 @@ void KMyMoney2App::slotPayeeDelete(void)
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to remove payee(s)"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
}
@ -4033,7 +4033,7 @@ void KMyMoney2App::slotCurrencyNew(void)
MyMoneyFile::instance()->addCurrency(currency);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::sorry(this, i18n("Cannot create new currency. %1").tqarg(e->what()), i18n("New currency"));
KMessageBox::sorry(this, i18n("Cannot create new currency. %1").arg(e->what()), i18n("New currency"));
delete e;
}
emit currencyCreated(id);
@ -4055,12 +4055,12 @@ void KMyMoney2App::slotCurrencyRename(TQListViewItem* item, int, const TQString&
m_selectedCurrency = currency;
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::sorry(this, i18n("Cannot rename currency. %1").tqarg(e->what()), i18n("Rename currency"));
KMessageBox::sorry(this, i18n("Cannot rename currency. %1").arg(e->what()), i18n("Rename currency"));
delete e;
}
}
} catch(MyMoneyException *e) {
KMessageBox::sorry(this, i18n("Cannot rename currency. %1").tqarg(e->what()), i18n("Rename currency"));
KMessageBox::sorry(this, i18n("Cannot rename currency. %1").arg(e->what()), i18n("Rename currency"));
delete e;
}
}
@ -4073,7 +4073,7 @@ void KMyMoney2App::slotCurrencyDelete(void)
MyMoneyFile::instance()->removeCurrency(m_selectedCurrency);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::sorry(this, i18n("Cannot delete currency %1. %2").tqarg(m_selectedCurrency.name()).tqarg(e->what()), i18n("Delete currency"));
KMessageBox::sorry(this, i18n("Cannot delete currency %1. %2").arg(m_selectedCurrency.name()).arg(e->what()), i18n("Delete currency"));
delete e;
}
}
@ -4088,7 +4088,7 @@ void KMyMoney2App::slotCurrencySetBase(void)
MyMoneyFile::instance()->setBaseCurrency(m_selectedCurrency);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").tqarg(m_selectedCurrency.name()).tqarg(e->what()), i18n("Set base currency"));
KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").arg(m_selectedCurrency.name()).arg(e->what()), i18n("Set base currency"));
delete e;
}
}
@ -4099,7 +4099,7 @@ void KMyMoney2App::slotBudgetNew(void)
{
TQDate date = TQDate::currentDate(Qt::LocalTime);
date.setYMD(date.year(), 1, 1);
TQString newname = i18n("Budget %1").tqarg(TQString::number(date.year()));
TQString newname = i18n("Budget %1").arg(TQString::number(date.year()));
MyMoneyBudget budget;
@ -4109,7 +4109,7 @@ void KMyMoney2App::slotBudgetNew(void)
// Exception thrown when the name is not found
while (1) {
MyMoneyFile::instance()->budgetByName(newname);
newname = i18n("Budget %1 (%2)").tqarg(TQString::number(date.year()), TQString::number(i++));
newname = i18n("Budget %1 (%2)").arg(TQString::number(date.year()), TQString::number(i++));
}
} catch(MyMoneyException *e) {
// all ok, the name is unique
@ -4124,7 +4124,7 @@ void KMyMoney2App::slotBudgetNew(void)
MyMoneyFile::instance()->addBudget(budget);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4139,7 +4139,7 @@ void KMyMoney2App::slotBudgetDelete(void)
// get confirmation from user
TQString prompt;
if (m_selectedBudgets.size() == 1)
prompt = TQString("<p>")+i18n("Do you really want to remove the budget <b>%1</b>?").tqarg(m_selectedBudgets.front().name());
prompt = TQString("<p>")+i18n("Do you really want to remove the budget <b>%1</b>?").arg(m_selectedBudgets.front().name());
else
prompt = i18n("Do you really want to remove all selected budgets?");
@ -4156,7 +4156,7 @@ void KMyMoney2App::slotBudgetDelete(void)
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to remove budget: %1, thrown in %2:%3"). tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to remove budget: %1, thrown in %2:%3"). arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4168,12 +4168,12 @@ void KMyMoney2App::slotBudgetCopy(void)
try {
MyMoneyBudget budget = m_selectedBudgets[0];
budget.clearId();
budget.setName(i18n("Copy of %1").tqarg(budget.name()));
budget.setName(i18n("Copy of %1").arg(budget.name()));
MyMoneyFile::instance()->addBudget(budget);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4187,7 +4187,7 @@ void KMyMoney2App::slotBudgetChangeYear(void)
bool haveCurrent = false;
MyMoneyBudget budget = *(m_selectedBudgets.begin());
for(int i = (TQDate::currentDate().year()-3); i < (TQDate::currentDate().year()+5); ++i) {
years << TQString("%1").tqarg(i);
years << TQString("%1").arg(i);
if(i == budget.budgetStart().year()) {
haveCurrent = true;
}
@ -4210,7 +4210,7 @@ void KMyMoney2App::slotBudgetChangeYear(void)
MyMoneyFile::instance()->modifyBudget(budget);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3"). tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3"). arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4248,7 +4248,7 @@ void KMyMoney2App::slotBudgetForecast(void)
ft.commit();
}
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4308,7 +4308,7 @@ void KMyMoney2App::slotNewFeature(void)
ft.commit();
}
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4337,7 +4337,7 @@ void KMyMoney2App::slotTransactionsDelete(void)
if(m_selectedTransactions.count() == 1) {
msg = i18n("Do you really want to delete the selected transaction?");
} else {
msg = i18n("Do you really want to delete all %1 selected transactions?").tqarg(m_selectedTransactions.count());
msg = i18n("Do you really want to delete all %1 selected transactions?").arg(m_selectedTransactions.count());
}
if(KMessageBox::questionYesNo(this, msg, i18n("Delete transaction")) == KMessageBox::Yes) {
KMSTATUS(i18n("Deleting transactions"));
@ -4386,7 +4386,7 @@ void KMyMoney2App::slotTransactionDuplicate(void)
myMoneyView->slotLedgerSelected(m_selectedAccount.id(), lt.id());
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
// switch off the progress bar
@ -4412,7 +4412,7 @@ void KMyMoney2App::doDeleteTransactions(void)
}
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to delete transaction(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to delete transaction(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
slotStatusProgressBar(-1, -1);
@ -4496,7 +4496,7 @@ void KMyMoney2App::slotTransactionsEditSplits(void)
m_transactionEditor->enterTransactions(id);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4666,7 +4666,7 @@ void KMyMoney2App::markTransaction(MyMoneySplit::reconcileFlagE flag)
slotStatusProgressBar(-1, -1);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -4711,7 +4711,7 @@ void KMyMoney2App::slotTransactionsAccept(void)
slotStatusProgressBar(-1, -1);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to accept transaction: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to accept transaction: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line()));
delete e;
}
}
@ -5113,7 +5113,7 @@ void KMyMoney2App::updateCaption(bool skipActions)
}
#if KMM_DEBUG
caption += TQString(" (%1 x %2)").tqarg(width()).tqarg(height());
caption += TQString(" (%1 x %2)").arg(width()).arg(height());
#endif
caption = kapp->makeStdCaption(caption, false, modified);
@ -5567,7 +5567,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa
m_payeeGoto = payee.id();
TQString name = payee.name();
name.replace(TQRegExp("&(?!&)"), "&&");
action("transaction_goto_payee")->setText(i18n("Goto '%1'").tqarg(name));
action("transaction_goto_payee")->setText(i18n("Goto '%1'").arg(name));
}
} catch(MyMoneyException *e) {
delete e;
@ -5589,7 +5589,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa
m_accountGoto = acc.id();
TQString name = acc.name();
name.replace(TQRegExp("&(?!&)"), "&&");
action("transaction_goto_account")->setText(i18n("Goto '%1'").tqarg(name));
action("transaction_goto_account")->setText(i18n("Goto '%1'").arg(name));
break;
}
}
@ -5706,7 +5706,7 @@ void KMyMoney2App::slotFileConsitencyCheck(void)
msg = MyMoneyFile::instance()->consistencyCheck();
ft.commit();
} catch(MyMoneyException *e) {
msg = i18n("Consistency check failed: %1").tqarg(e->what());
msg = i18n("Consistency check failed: %1").arg(e->what());
delete e;
}
@ -5875,7 +5875,7 @@ void KMyMoney2App::webConnect(const TQString& url, const TQCString& asn_id)
TQValueList<MyMoneyStatement> statements;
if (!(*it_plugin)->import(url) )
{
KMessageBox::error( this, i18n("Unable to import %1 using %2 plugin. The plugin returned the following error: %3").tqarg(url,(*it_plugin)->formatName(),(*it_plugin)->lastError()), i18n("Importing error"));
KMessageBox::error( this, i18n("Unable to import %1 using %2 plugin. The plugin returned the following error: %3").arg(url,(*it_plugin)->formatName(),(*it_plugin)->lastError()), i18n("Importing error"));
}
break;
@ -6029,7 +6029,7 @@ void KMyMoney2App::setAccountOnlineParameters(const MyMoneyAccount& _acc, const
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to setup online parameters for account ''%1'").tqarg(_acc.name()), e->what() );
KMessageBox::detailedSorry(0, i18n("Unable to setup online parameters for account ''%1'").arg(_acc.name()), e->what() );
delete e;
}
}
@ -6044,7 +6044,7 @@ void KMyMoney2App::slotAccountUnmapOnline(void)
if(m_selectedAccount.onlineBankingSettings().value("provider").isEmpty())
return;
if(KMessageBox::warningYesNo(this, TQString("<qt>%1</qt>").tqarg(i18n("Do you really want to remove the mapping of account <b>%1</b> to an online account? Depending on the details of the online banking method used, this action cannot be reverted.").tqarg(m_selectedAccount.name())), i18n("Remove mapping to online account")) == KMessageBox::Yes) {
if(KMessageBox::warningYesNo(this, TQString("<qt>%1</qt>").arg(i18n("Do you really want to remove the mapping of account <b>%1</b> to an online account? Depending on the details of the online banking method used, this action cannot be reverted.").arg(m_selectedAccount.name())), i18n("Remove mapping to online account")) == KMessageBox::Yes) {
MyMoneyFileTransaction ft;
try {
m_selectedAccount.setOnlineBankingSettings(MyMoneyKeyValueContainer());
@ -6055,7 +6055,7 @@ void KMyMoney2App::slotAccountUnmapOnline(void)
MyMoneyFile::instance()->modifyAccount(m_selectedAccount);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::error(this, i18n("Unable to unmap account from online account: %1").tqarg(e->what()));
KMessageBox::error(this, i18n("Unable to unmap account from online account: %1").arg(e->what()));
delete e;
}
}
@ -6121,7 +6121,7 @@ void KMyMoney2App::slotAccountMapOnline(void)
MyMoneyFile::instance()->modifyAccount(acc);
ft.commit();
} catch(MyMoneyException* e) {
KMessageBox::error(this, i18n("Unable to map account to online account: %1").tqarg(e->what()));
KMessageBox::error(this, i18n("Unable to map account to online account: %1").arg(e->what()));
delete e;
}
}
@ -6199,7 +6199,7 @@ void KMyMoney2App::Private::unlinkStatementXML(void)
TQDir d("/home/thb", "kmm-statement*");
for(int i=0; i < d.count(); ++i) {
qDebug("Remove %s", d[i].data());
d.remove(TQString("/home/thb/%1").tqarg(d[i]));
d.remove(TQString("/home/thb/%1").arg(d[i]));
}
statementXMLindex = 0;
}

4
kmymoney2/kmymoney2.h
Unescape View File

@ -559,7 +559,7 @@ k_dcop:
// TQValueList<MyMoneyAccount> accountList() const;
protected:
/** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration
/** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration
* file
*/
void saveOptions(void);
@ -617,7 +617,7 @@ protected:
* can be closed if:
*
* - the balance is zero and
* - all tqchildren are already closed and
* - all children are already closed and
* - there is no unfinished schedule referencing the account
*
* @param acc reference to MyMoneyAccount object in question

2
kmymoney2/kmymoneyglobalsettings.cpp
Unescape View File

@ -77,7 +77,7 @@ TQStringList KMyMoneyGlobalSettings::itemList(void)
TQStringList::iterator it_s;
for(it_s = all.begin(); it_s != all.end(); ++it_s) {
exp.search(*it_s);
if(!list.contains(exp.cap(1)) && !list.contains(TQString("-%1").tqarg(exp.cap(1)))) {
if(!list.contains(exp.cap(1)) && !list.contains(TQString("-%1").arg(exp.cap(1)))) {
list << *it_s;
}
}

20
kmymoney2/kmymoneyutils.cpp
Unescape View File

@ -266,9 +266,9 @@ TQString KMyMoneyUtils::variableCSS(void)
TQString css;
css += "<style type=\"text/css\">\n<!--\n";
css += TQString(".row-even, .item0 { background-color: %1; color: %2 }\n")
.tqarg((KMyMoneyGlobalSettings::listBGColor()).name()).tqarg(tcolor.name());
.arg((KMyMoneyGlobalSettings::listBGColor()).name()).arg(tcolor.name());
css += TQString(".row-odd, .item1 { background-color: %1; color: %2 }\n")
.tqarg((KMyMoneyGlobalSettings::listColor()).name()).tqarg(tcolor.name());
.arg((KMyMoneyGlobalSettings::listColor()).name()).arg(tcolor.name());
css += "-->\n</style>\n";
return css;
}
@ -286,18 +286,18 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename)
}
// search the given resource
mask = filename.tqarg("_%1.%2");
rc = KGlobal::dirs()->findResource(type, mask.tqarg(country).tqarg(language));
mask = filename.arg("_%1.%2");
rc = KGlobal::dirs()->findResource(type, mask.arg(country).arg(language));
if(rc.isEmpty()) {
mask = filename.tqarg("_%1");
rc = KGlobal::dirs()->findResource(type, mask.tqarg(language));
mask = filename.arg("_%1");
rc = KGlobal::dirs()->findResource(type, mask.arg(language));
}
if(rc.isEmpty()) {
// qDebug(TQString("html/home_%1.html not found").tqarg(country).latin1());
rc = KGlobal::dirs()->findResource(type, mask.tqarg(country));
// qDebug(TQString("html/home_%1.html not found").arg(country).latin1());
rc = KGlobal::dirs()->findResource(type, mask.arg(country));
}
if(rc.isEmpty()) {
rc = KGlobal::dirs()->findResource(type, filename.tqarg(""));
rc = KGlobal::dirs()->findResource(type, filename.arg(""));
}
if(rc.isEmpty()) {
@ -374,7 +374,7 @@ TQString KMyMoneyUtils::nextCheckNumber(const MyMoneyAccount& acc)
TQString number;
TQRegExp exp(TQString("(.*\\D)?(\\d+)(\\D.*)?"));
if(exp.search(acc.value("lastNumberUsed")) != -1) {
number = TQString("%1%2%3").tqarg(exp.cap(1)).tqarg(exp.cap(2).toULongLong() + 1).tqarg(exp.cap(3));
number = TQString("%1%2%3").arg(exp.cap(1)).arg(exp.cap(2).toULongLong() + 1).arg(exp.cap(3));
} else {
number = "1";
}

8
kmymoney2/kstartuplogo.cpp
Unescape View File

@ -57,13 +57,13 @@ KStartupSplash::~KStartupSplash()
delete d;
}
void KStartupSplash::message( const TQString &message, int tqalignment, const TQColor &color)
void KStartupSplash::message( const TQString &message, int alignment, const TQColor &color)
{
d->message = message;
d->align = tqalignment;
d->align = alignment;
d->color = color;
// the next line causes the base class signal management to happen
// and also forces a tqrepaint
// and also forces a repaint
KSplashScreen::clear();
}
@ -100,7 +100,7 @@ KStartupLogo::KStartupLogo() :
splash->message(i18n("Loading..."), AlignLeft, white);
splash->show();
splash->tqrepaint();
splash->repaint();
m_splash = splash;
}
}

2
kmymoney2/kstartuplogo.h
Unescape View File

@ -38,7 +38,7 @@ class KStartupSplash : public KSplashScreen
public:
KStartupSplash(const TQPixmap &pixmap, WFlags f = 0);
~KStartupSplash();
void message( const TQString &message, int tqalignment = AlignLeft, const TQColor &color = black);
void message( const TQString &message, int alignment = AlignLeft, const TQColor &color = black);
protected:
void drawContents(TQPainter *p);

2
kmymoney2/main.cpp
Unescape View File

@ -287,7 +287,7 @@ int main(int argc, char *argv[])
} while(0);
} catch(MyMoneyException *e) {
KMessageBox::detailedError(0, i18n("Uncaught error. Please report the details to the developers"),
TQString("%1 in file %2 line %3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line()));
TQString("%1 in file %2 line %3").arg(e->what()).arg(e->file()).arg(e->line()));
throw e;
}

6
kmymoney2/mymoney/mymoneyaccount.cpp
Unescape View File

@ -98,7 +98,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) :
if(node.hasAttribute("openingbalance")) {
if(!MyMoneyMoney(node.attribute("openingbalance")).isZero()) {
TQString msg = i18n("Account %1 contains an opening balance. Please use a KMyMoney version >= 0.8 and < 0.9 to correct the problem.").tqarg(m_name);
TQString msg = i18n("Account %1 contains an opening balance. Please use a KMyMoney version >= 0.8 and < 0.9 to correct the problem.").arg(m_name);
throw new MYMONEYEXCEPTION(msg);
}
}
@ -467,7 +467,7 @@ bool MyMoneyAccountLoan::hasReferenceTo(const TQString& id) const
void MyMoneyAccountLoan::setInterestCompounding(int frequency)
{
setValue("compoundingFrequency", TQString("%1").tqarg(frequency));
setValue("compoundingFrequency", TQString("%1").arg(frequency));
}
int MyMoneyAccountLoan::interestCompounding(void) const
@ -594,7 +594,7 @@ bool MyMoneyAccount::isCategory(void) const
TQString MyMoneyAccount::brokerageName(void) const
{
if(m_accountType == Investment)
return TQString("%1 (%2)").tqarg(m_name, i18n("Brokerage (suffix for account names)", "Brokerage"));
return TQString("%1 (%2)").arg(m_name, i18n("Brokerage (suffix for account names)", "Brokerage"));
return m_name;
}

6
kmymoney2/mymoney/mymoneyaccounttest.cpp
Unescape View File

@ -309,7 +309,7 @@ void MyMoneyAccountTest::testWriteXML() {
" </KEYVALUEPAIRS>\n"
" </ACCOUNT>\n"
"</ACCOUNT-CONTAINER>\n").
arg(TQDate::currentDate().toString(Qt::ISODate)).tqarg(TQDate::currentDate().toString(Qt::ISODate));
arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
CPPUNIT_ASSERT(doc.toString() == ref);
}
@ -330,7 +330,7 @@ void MyMoneyAccountTest::testReadXML() {
" </KEYVALUEPAIRS>\n"
" </ACCOUNT>\n"
"</ACCOUNT-CONTAINER>\n").
arg(TQDate::currentDate().toString(Qt::ISODate)).tqarg(TQDate::currentDate().toString(Qt::ISODate));
arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
TQString ref_false = TQString(
"<!DOCTYPE TEST>\n"
@ -346,7 +346,7 @@ void MyMoneyAccountTest::testReadXML() {
" </KEYVALUEPAIRS>\n"
" </KACCOUNT>\n"
"</ACCOUNT-CONTAINER>\n").
arg(TQDate::currentDate().toString(Qt::ISODate)).tqarg(TQDate::currentDate().toString(Qt::ISODate));
arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate));
TQDomDocument doc;
TQDomElement node;

72
kmymoney2/mymoney/mymoneyfile.cpp
Unescape View File

@ -146,7 +146,7 @@ void MyMoneyFile::checkTransaction(const char* txt) const
{
checkStorage();
if(!d->m_inTransaction) {
throw new MYMONEYEXCEPTION(TQString("No transaction started for %1").tqarg(txt));
throw new MYMONEYEXCEPTION(TQString("No transaction started for %1").arg(txt));
}
}
@ -605,7 +605,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& parent)
throw new MYMONEYEXCEPTION("Stock account must have investment account as parent ");
if(!account.isInvest() && parent.accountType() == MyMoneyAccount::Investment)
throw new MYMONEYEXCEPTION("Investment account can only have stock accounts as tqchildren");
throw new MYMONEYEXCEPTION("Investment account can only have stock accounts as children");
// clear all changed objects from cache
MyMoneyNotifier notifier(this);
@ -757,7 +757,7 @@ const MyMoneyAccount MyMoneyFile::openingBalanceAccount_internal(const MyMoneySe
throw new MYMONEYEXCEPTION("Opening balance for non currencies not supported");
MyMoneyAccount acc;
TQRegExp match(TQString("^%1").tqarg(i18n(MyMoneyFile::OpeningBalancesPrefix)));
TQRegExp match(TQString("^%1").arg(i18n(MyMoneyFile::OpeningBalancesPrefix)));
TQValueList<MyMoneyAccount> accounts;
TQValueList<MyMoneyAccount>::Iterator it;
@ -774,7 +774,7 @@ const MyMoneyAccount MyMoneyFile::openingBalanceAccount_internal(const MyMoneySe
}
if(acc.id().isEmpty()) {
throw new MYMONEYEXCEPTION(TQString("No opening balance account for %1").tqarg(security.tradingSymbol()));
throw new MYMONEYEXCEPTION(TQString("No opening balance account for %1").arg(security.tradingSymbol()));
}
return acc;
@ -787,7 +787,7 @@ const MyMoneyAccount MyMoneyFile::createOpeningBalanceAccount(const MyMoneySecur
MyMoneyAccount acc;
TQString name(i18n(MyMoneyFile::OpeningBalancesPrefix));
if(security.id() != baseCurrency().id()) {
name += TQString(" (%1)").tqarg(security.id());
name += TQString(" (%1)").arg(security.id());
}
acc.setName(name);
acc.setAccountType(MyMoneyAccount::Equity);
@ -1418,9 +1418,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
if((*it_b).id() == parent.id()) {
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
rc << i18n(" * Loop detected between this account and account '%2'.").tqarg((*it_b).name());
rc << i18n(" Reparenting account '%2' to top level account '%1'.").tqarg(toplevel.name(), (*it_a).name());
rc << i18n("* Problem with account '%1'").arg(problemAccount);
rc << i18n(" * Loop detected between this account and account '%2'.").arg((*it_b).name());
rc << i18n(" Reparenting account '%2' to top level account '%1'.").arg(toplevel.name(), (*it_a).name());
(*it_a).setParentAccountId(toplevel.id());
if(accountRebuild.contains(toplevel.id()) == 0)
accountRebuild << toplevel.id();
@ -1448,13 +1448,13 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
rc << i18n("* Problem with account '%1'").arg(problemAccount);
}
// the parent belongs to a different group, so we reconnect to the
// master group account (asset, liability, etc) to which this account
// should belong and update it in the engine.
rc << i18n(" * Parent account '%1' belongs to a different group.").tqarg(parent.name());
rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name());
rc << i18n(" * Parent account '%1' belongs to a different group.").arg(parent.name());
rc << i18n(" New parent account is the top level account '%1'.").arg(toplevel.name());
(*it_a).setParentAccountId(toplevel.id());
// make sure to rebuild the sub-accounts of the top account
@ -1467,10 +1467,10 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
rc << i18n("* Problem with account '%1'").arg(problemAccount);
}
// parent exists, but does not have a reference to the account
rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(parent.name(), problemAccount);
rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").arg(parent.name(), problemAccount);
if(accountRebuild.contains(parent.id()) == 0)
accountRebuild << parent.id();
}
@ -1482,10 +1482,10 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
rc << i18n("* Problem with account '%1'").arg(problemAccount);
}
rc << i18n(" * The parent with id %1 does not exist anymore.").tqarg(parentId);
rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name());
rc << i18n(" * The parent with id %1 does not exist anymore.").arg(parentId);
rc << i18n(" New parent account is the top level account '%1'.").arg(toplevel.name());
(*it_a).setParentAccountId(toplevel.id());
addNotification((*it_a).id());
@ -1495,7 +1495,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
accountRebuild << toplevel.id();
}
// now check that all the tqchildren exist and have the correct type
// now check that all the children exist and have the correct type
for(it_c = (*it_a).accountList().begin(); it_c != (*it_a).accountList().end(); ++it_c) {
// check that the child exists
try {
@ -1504,9 +1504,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
problemCount++;
if(problemAccount != (*it_a).name()) {
problemAccount = (*it_a).name();
rc << i18n("* Problem with account '%1'").tqarg(problemAccount);
rc << i18n("* Problem with account '%1'").arg(problemAccount);
}
rc << i18n(" * Child account with id %1 does not exist anymore.").tqarg(*it_c);
rc << i18n(" * Child account with id %1 does not exist anymore.").arg(*it_c);
rc << i18n(" The child account list will be reconstructed.");
if(accountRebuild.contains((*it_a).id()) == 0)
accountRebuild << (*it_a).id();
@ -1540,7 +1540,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
// clear the affected lists
for(it_a = list.begin(); it_a != list.end(); ++it_a) {
if(accountRebuild.contains((*it_a).id())) {
rc << TQString(" %1").tqarg((*it_a).name());
rc << TQString(" %1").arg((*it_a).name());
// clear the account list
for(it_c = (*it_a).accountList().begin(); it_c != (*it_a).accountList().end();) {
(*it_a).removeAccountId(*it_c);
@ -1571,7 +1571,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
addNotification((*it_a).id());
} catch (MyMoneyException *e) {
delete e;
rc << i18n(" * Unable to update account data for account %1 in engine").tqarg((*it_a).name());
rc << i18n(" * Unable to update account data for account %1 in engine").arg((*it_a).name());
}
}
}
@ -1589,7 +1589,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
payee.clearId();
m_storage->addPayee(payee);
payeeConversionMap[(*it_p).id()] = payee.id();
rc << i18n(" * Payee %1 recreated with fixed id").tqarg(payee.name());
rc << i18n(" * Payee %1 recreated with fixed id").arg(payee.name());
++problemCount;
}
}
@ -1618,7 +1618,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
if(payeeConversionMap.find((*it_s).payeeId()) != payeeConversionMap.end()) {
s.setPayeeId(payeeConversionMap[s.payeeId()]);
sChanged = true;
rc << i18n(" * Payee id updated in split of transaction '%1'.").tqarg(t.id());
rc << i18n(" * Payee id updated in split of transaction '%1'.").arg(t.id());
++problemCount;
}
@ -1631,16 +1631,16 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
// use the value as master if the transaction is balanced
if(t.splitSum().isZero()) {
s.setShares(s.value());
rc << i18n(" * shares set to value in split of transaction '%1'.").tqarg(t.id());
rc << i18n(" * shares set to value in split of transaction '%1'.").arg(t.id());
} else {
s.setValue(s.shares());
rc << i18n(" * value set to shares in split of transaction '%1'.").tqarg(t.id());
rc << i18n(" * value set to shares in split of transaction '%1'.").arg(t.id());
}
sChanged = true;
++problemCount;
}
} catch(MyMoneyException *e) {
rc << i18n(" * Split %2 in transaction '%1' contains a reference to invalid account %3. Please fix manually.").tqarg(t.id(), (*it_s).id(), (*it_s).accountId());
rc << i18n(" * Split %2 in transaction '%1' contains a reference to invalid account %3. Please fix manually.").arg(t.id(), (*it_s).id(), (*it_s).accountId());
++problemCount;
++unfixedCount;
delete e;
@ -1651,7 +1651,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
&& s.action() != MyMoneySplit::ActionInterest) {
s.setAction(MyMoneySplit::ActionInterest);
sChanged = true;
rc << i18n(" * action marked as interest in split of transaction '%1'.").tqarg(t.id());
rc << i18n(" * action marked as interest in split of transaction '%1'.").arg(t.id());
++problemCount;
}
@ -1678,13 +1678,13 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
if(payeeConversionMap.find((*it_s).payeeId()) != payeeConversionMap.end()) {
s.setPayeeId(payeeConversionMap[s.payeeId()]);
sChanged = true;
rc << i18n(" * Payee id updated in split of schedule '%1'.").tqarg((*it_sch).name());
rc << i18n(" * Payee id updated in split of schedule '%1'.").arg((*it_sch).name());
++problemCount;
}
if(!(*it_s).value().isZero() && (*it_s).shares().isZero()) {
s.setShares(s.value());
sChanged = true;
rc << i18n(" * Split in scheduled transaction '%1' contained value != 0 and shares == 0.").tqarg((*it_sch).name());
rc << i18n(" * Split in scheduled transaction '%1' contained value != 0 and shares == 0.").arg((*it_sch).name());
rc << i18n(" Shares set to value.");
++problemCount;
}
@ -1693,7 +1693,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
if(!(*it_s).bankID().isEmpty()) {
s.setBankID(TQString());
sChanged = true;
rc << i18n(" * Removed bankid from split in scheduled transaction '%1'.").tqarg((*it_sch).name());
rc << i18n(" * Removed bankid from split in scheduled transaction '%1'.").arg((*it_sch).name());
++problemCount;
}
@ -1706,16 +1706,16 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
// use the value as master if the transaction is balanced
if(t.splitSum().isZero()) {
s.setShares(s.value());
rc << i18n(" * shares set to value in split in schedule '%1'.").tqarg((*it_sch).name());
rc << i18n(" * shares set to value in split in schedule '%1'.").arg((*it_sch).name());
} else {
s.setValue(s.shares());
rc << i18n(" * value set to shares in split in schedule '%1'.").tqarg((*it_sch).name());
rc << i18n(" * value set to shares in split in schedule '%1'.").arg((*it_sch).name());
}
sChanged = true;
++problemCount;
}
} catch(MyMoneyException *e) {
rc << i18n(" * Split %2 in schedule '%1' contains a reference to invalid account %3. Please fix manually.").tqarg((*it_sch).name(), (*it_s).id(), (*it_s).accountId());
rc << i18n(" * Split %2 in schedule '%1' contains a reference to invalid account %3. Please fix manually.").arg((*it_sch).name(), (*it_s).id(), (*it_s).accountId());
++problemCount;
++unfixedCount;
delete e;
@ -1741,7 +1741,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
bool rChanged = false;
for(it_p = pList.begin(); it_p != pList.end(); ++it_p) {
if(payeeConversionMap.find(*it_p) != payeeConversionMap.end()) {
rc << i18n(" * Payee id updated in report '%1'.").tqarg((*it_r).name());
rc << i18n(" * Payee id updated in report '%1'.").arg((*it_r).name());
++problemCount;
r.removeReference(*it_p);
r.addPayee(payeeConversionMap[*it_p]);
@ -1758,7 +1758,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
for(it_m = payeeConversionMap.begin(); it_m != payeeConversionMap.end(); ++it_m) {
MyMoneyPayee payee = this->payee(it_m.key());
removePayee(payee);
rc << i18n(" * Payee '%1' removed.").tqarg(payee.id());
rc << i18n(" * Payee '%1' removed.").arg(payee.id());
++problemCount;
}
@ -1768,7 +1768,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void)
rc << i18n("Finish! Data is consistent.");
else
rc << i18n("Finish! %1 problem(s) corrected. %2 problem(s) still present.")
.tqarg(problemCount).tqarg(unfixedCount);
.arg(problemCount).arg(unfixedCount);
return rc;
}

8
kmymoney2/mymoney/mymoneyfiletest.cpp
Unescape View File

@ -646,7 +646,7 @@ void MyMoneyFileTest::testRemoveAccountTree() {
delete e;
}
// make sure that tqchildren are re-parented to parent account
// make sure that children are re-parented to parent account
try {
a = m->account("A000001");
CPPUNIT_ASSERT(a.parentAccountId() == m->asset().id());
@ -1290,7 +1290,7 @@ void MyMoneyFileTest::testAddEquityAccount() {
// keep a copy for later use
m_inv = i;
// make sure, that only equity accounts can be tqchildren to it
// make sure, that only equity accounts can be children to it
MyMoneyAccount a;
a.setName("Testaccount");
TQValueList<MyMoneyAccount::accountTypeE> list;
@ -1389,7 +1389,7 @@ void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountType
TQValueList<MyMoneyAccount::accountTypeE>::Iterator it;
MyMoneyFileTransaction ft;
for(it = list.begin(); it != list.end(); ++it) {
a.setName(TQString("Testaccount %1").tqarg(*it));
a.setName(TQString("Testaccount %1").arg(*it));
a.setAccountType(*it);
try {
m->addAccount(a, parent);
@ -1504,7 +1504,7 @@ void MyMoneyFileTest::testOpeningBalance(void)
unexpectedException(e);
}
TQString refName = TQString("%1 (%2)").tqarg(MyMoneyFile::OpeningBalancesPrefix).tqarg("USD");
TQString refName = TQString("%1 (%2)").arg(MyMoneyFile::OpeningBalancesPrefix).arg("USD");
try {
openingAcc = m->openingBalanceAccount(second);
CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id());

4
kmymoney2/mymoney/mymoneyinstitution.cpp
Unescape View File

@ -72,7 +72,7 @@ MyMoneyInstitution::MyMoneyInstitution(const TQDomElement& node) :
TQDomNodeList nodeList = node.elementsByTagName("ADDRESS");
if(nodeList.count() == 0) {
TQString msg = TQString("No ADDRESS in institution %1").tqarg(m_name);
TQString msg = TQString("No ADDRESS in institution %1").arg(m_name);
throw new MYMONEYEXCEPTION(msg);
}
@ -177,6 +177,6 @@ bool MyMoneyInstitution::hasReferenceTo(const TQString& /* id */) const
}
TQPixmap MyMoneyInstitution::pixmap() const {
return TQPixmap(KGlobal::dirs()->findResource("appdata",TQString( "icons/hicolor/22x22/actions/%1.png").tqarg("bank")));
return TQPixmap(KGlobal::dirs()->findResource("appdata",TQString( "icons/hicolor/22x22/actions/%1.png").arg("bank")));
}

18
kmymoney2/mymoney/mymoneymoney.cpp
Unescape View File

@ -145,7 +145,7 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount)
// a) numeric
// b) _decimalSeparator
// c) negative indicator
TQString validChars = TQString("\\d%1").tqarg(TQChar(decimalSeparator()));
TQString validChars = TQString("\\d%1").arg(TQChar(decimalSeparator()));
// we need to escape the minus sign here, because later on it will be
// part of "\d,-()" and that does not work. It needs to be "\d,\-()"
// And we need two of them, because we're in C
@ -158,11 +158,11 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount)
validChars += negChars;
// qDebug("0: '%s'", validChars.data());
TQRegExp invChars(TQString("[^%1]").tqarg(validChars));
TQRegExp invChars(TQString("[^%1]").arg(validChars));
// qDebug("1: '%s'", res.data());
res.remove(invChars);
TQRegExp negCharSet(TQString("[%1]").tqarg(negChars));
TQRegExp negCharSet(TQString("[%1]").arg(negChars));
bool isNegative = false;
if(res.find(negCharSet) != -1) {
isNegative = true;
@ -243,12 +243,12 @@ TQString MyMoneyMoney::formatMoney(const TQString& currency, const int prec, boo
// TQString.sprintf("%Ld") did not work :-(, so I had to
// do it the old ugly way.
while(tmp) {
res.insert(0, TQString("%1").tqarg(static_cast<int>(tmp % 10)));
res.insert(0, TQString("%1").arg(static_cast<int>(tmp % 10)));
tmp /= 10;
}
} else
res = TQString("%1").tqarg((long)left);
res = TQString("%1").arg((long)left);
if(showThousandSeparator) {
int pos = res.length();
@ -262,13 +262,13 @@ TQString MyMoneyMoney::formatMoney(const TQString& currency, const int prec, boo
// using
//
// res += TQString("%1").tqarg(right).rightJustify(prec, '0', true);
// res += TQString("%1").arg(right).rightJustify(prec, '0', true);
//
// caused some weird results if right was rather large. Eg: right being
// 666600000 should have appended a 0, but instead it prepended a 0. With
// res being "2," the result wasn't "2,6666000000" as expected, but rather
// "2,0666600000" which was not usable. The code below works for me.
TQString rs = TQString("%1").tqarg(right);
TQString rs = TQString("%1").arg(right);
if(prec != -1)
rs = rs.rightJustify(prec, '0', true);
else {
@ -325,7 +325,7 @@ const TQString MyMoneyMoney::toString(void) const
// TQString.sprintf("%Ld") did not work :-(, so I had to
// do it the old ugly way.
while(tmp) {
res.prepend(TQString("%1").tqarg(static_cast<int>(tmp % 10)));
res.prepend(TQString("%1").arg(static_cast<int>(tmp % 10)));
tmp /= 10;
}
if(res.isEmpty())
@ -336,7 +336,7 @@ const TQString MyMoneyMoney::toString(void) const
tmp = m_denom;
while(tmp) {
resf.prepend(TQString("%1").tqarg(static_cast<int>(tmp % 10)));
resf.prepend(TQString("%1").arg(static_cast<int>(tmp % 10)));
tmp /= 10;
}
return res + "/" + resf;

2
kmymoney2/mymoney/mymoneypayee.cpp
Unescape View File

@ -91,7 +91,7 @@ MyMoneyPayee::MyMoneyPayee(const TQDomElement& node) :
TQDomNodeList nodeList = node.elementsByTagName("ADDRESS");
if(nodeList.count() == 0) {
TQString msg = TQString("No ADDRESS in payee %1").tqarg(m_name);
TQString msg = TQString("No ADDRESS in payee %1").arg(m_name);
throw new MYMONEYEXCEPTION(msg);
}

2
kmymoney2/mymoney/mymoneyprice.cpp
Unescape View File

@ -88,7 +88,7 @@ const MyMoneyMoney MyMoneyPrice::rate(const TQString& id) const
if(id == m_fromSecurity)
return m_invRate;
TQString msg = TQString("Unknown security id %1 for price info %2/%3.").tqarg(id).tqarg(m_fromSecurity).tqarg(m_toSecurity);
TQString msg = TQString("Unknown security id %1 for price info %2/%3.").arg(id).arg(m_fromSecurity).arg(m_toSecurity);
throw new MYMONEYEXCEPTION(msg);
}

14
kmymoney2/mymoney/mymoneyscheduled.cpp
Unescape View File

@ -843,14 +843,14 @@ TQString MyMoneySchedule::occurenceToString(int mult, occurenceE type)
switch (mult)
{
case 1: occurenceString = I18N_NOOP("Once"); break;
default: occurenceString = I18N_NOOP(static_cast<TQString>("%1 times").tqarg(mult));
default: occurenceString = I18N_NOOP(static_cast<TQString>("%1 times").arg(mult));
}
else if(type == MyMoneySchedule::OCCUR_DAILY)
switch (mult)
{
case 1: occurenceString = I18N_NOOP("Daily"); break;
case 30: occurenceString = I18N_NOOP("Every thirty days"); break;
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 days").tqarg(mult));
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 days").arg(mult));
}
else if(type == MyMoneySchedule::OCCUR_WEEKLY)
switch (mult)
@ -860,13 +860,13 @@ TQString MyMoneySchedule::occurenceToString(int mult, occurenceE type)
case 3: occurenceString = I18N_NOOP("Every three weeks"); break;
case 4: occurenceString = I18N_NOOP("Every four weeks"); break;
case 8: occurenceString = I18N_NOOP("Every eight weeks"); break;
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 weeks").tqarg(mult));
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 weeks").arg(mult));
}
else if(type == MyMoneySchedule::OCCUR_EVERYHALFMONTH)
switch (mult)
{
case 1: occurenceString = I18N_NOOP("Every half month"); break;
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 half months").tqarg(mult));
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 half months").arg(mult));
}
else if(type == MyMoneySchedule::OCCUR_MONTHLY)
switch (mult)
@ -876,14 +876,14 @@ TQString MyMoneySchedule::occurenceToString(int mult, occurenceE type)
case 3: occurenceString = I18N_NOOP("Every three months"); break;
case 4: occurenceString = I18N_NOOP("Every four months"); break;
case 6: occurenceString = I18N_NOOP("Twice yearly"); break;
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 months").tqarg(mult));
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 months").arg(mult));
}
else if(type == MyMoneySchedule::OCCUR_YEARLY)
switch (mult)
{
case 1: occurenceString = I18N_NOOP("Yearly"); break;
case 2: occurenceString = I18N_NOOP("Every other year"); break;
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 years").tqarg(mult));
default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 years").arg(mult));
}
return occurenceString;
}
@ -1008,7 +1008,7 @@ void MyMoneySchedule::setVariation(int var)
#if 0
deletePair("kmm-variation");
if(var != 0)
setValue("kmm-variation", TQString("%1").tqarg(var));
setValue("kmm-variation", TQString("%1").arg(var));
#endif
}

48
kmymoney2/mymoney/mymoneyscheduletest.cpp
Unescape View File

@ -258,13 +258,13 @@ void MyMoneyScheduleTest::testOverdue()
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n");
TQString ref_overdue = ref.tqarg(startDate.toString(Qt::ISODate))
.tqarg(lastPaymentDate.toString(Qt::ISODate))
.tqarg(lastPaymentDate.toString(Qt::ISODate));
TQString ref_overdue = ref.arg(startDate.toString(Qt::ISODate))
.arg(lastPaymentDate.toString(Qt::ISODate))
.arg(lastPaymentDate.toString(Qt::ISODate));
TQString ref_intime = ref.tqarg(startDate.addDays(1).toString(Qt::ISODate))
.tqarg(lastPaymentDate.addDays(1).toString(Qt::ISODate))
.tqarg(lastPaymentDate.addDays(1).toString(Qt::ISODate));
TQString ref_intime = ref.arg(startDate.addDays(1).toString(Qt::ISODate))
.arg(lastPaymentDate.addDays(1).toString(Qt::ISODate))
.arg(lastPaymentDate.addDays(1).toString(Qt::ISODate));
TQDomDocument doc;
TQDomElement node;
@ -1070,9 +1070,9 @@ void MyMoneyScheduleTest::testWriteXML() {
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate));
).arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate));
CPPUNIT_ASSERT(doc.toString() == ref);
}
@ -1098,9 +1098,9 @@ void MyMoneyScheduleTest::testReadXML() {
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate));
).arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate));
// diff to ref_ok1 is that we now have an empty entrydate
// in the transaction parameters
@ -1122,9 +1122,9 @@ void MyMoneyScheduleTest::testReadXML() {
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate));
).arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate));
TQString ref_false = TQString(
"<!DOCTYPE TEST>\n"
@ -1144,9 +1144,9 @@ void MyMoneyScheduleTest::testReadXML() {
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate));
).arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate));
TQDomDocument doc;
TQDomElement node;
@ -1236,9 +1236,9 @@ void MyMoneyScheduleTest::testHasReferenceTo()
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n"
).tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate))
.tqarg(TQDate::currentDate().toString(Qt::ISODate));
).arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate))
.arg(TQDate::currentDate().toString(Qt::ISODate));
TQDomDocument doc;
TQDomElement node;
@ -1887,9 +1887,9 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime()
" </TRANSACTION>\n"
" </SCHEDULED_TX>\n"
"</SCHEDULE-CONTAINER>\n"
).tqarg(paymentInFuture.toString(Qt::ISODate))
.tqarg(paymentInFuture.toString(Qt::ISODate))
.tqarg(paymentInFuture.toString(Qt::ISODate));
).arg(paymentInFuture.toString(Qt::ISODate))
.arg(paymentInFuture.toString(Qt::ISODate))
.arg(paymentInFuture.toString(Qt::ISODate));
TQDomDocument doc;
TQDomElement node;

2
kmymoney2/mymoney/mymoneystatement.cpp
Unescape View File

@ -245,7 +245,7 @@ void MyMoneyStatement::writeXMLFile( const MyMoneyStatement& _s, const TQString&
static unsigned filenum = 1;
TQString filename = _filename;
if ( filename.isEmpty() ) {
filename = TQString("statement-%1%2.xml").tqarg((filenum<10)?"0":"").tqarg(filenum);
filename = TQString("statement-%1%2.xml").arg((filenum<10)?"0":"").arg(filenum);
filenum++;
}

14
kmymoney2/mymoney/mymoneytransaction.cpp
Unescape View File

@ -188,7 +188,7 @@ void MyMoneyTransaction::modifySplit(MyMoneySplit& split)
return;
}
}
throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").tqarg(split.id()));
throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").arg(split.id()));
}
void MyMoneyTransaction::removeSplit(const MyMoneySplit& split)
@ -202,7 +202,7 @@ void MyMoneyTransaction::removeSplit(const MyMoneySplit& split)
}
}
if(it == m_splits.end())
throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").tqarg(split.id()));
throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").arg(split.id()));
}
void MyMoneyTransaction::removeSplits(void)
@ -219,7 +219,7 @@ const MyMoneySplit& MyMoneyTransaction::splitByPayee(const TQString& payeeId) co
if((*it).payeeId() == payeeId)
return *it;
}
throw new MYMONEYEXCEPTION(TQString("Split not found for payee '%1'").tqarg(TQString(payeeId)));
throw new MYMONEYEXCEPTION(TQString("Split not found for payee '%1'").arg(TQString(payeeId)));
}
const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQString& accountId, const bool match) const
@ -232,7 +232,7 @@ const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQString& accountId
if(match == false && (*it).accountId() != accountId)
return *it;
}
throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%2").tqarg(match?"":"!").tqarg(TQString(accountId)));
throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%2").arg(match?"":"!").arg(TQString(accountId)));
}
const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQStringList& accountIds, const bool match) const
@ -245,7 +245,7 @@ const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQStringList& accou
if(match == false && !accountIds.contains((*it).accountId()))
return *it;
}
throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%1...%2").tqarg(match?"":"!").tqarg(accountIds.front(),accountIds.back()));
throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%1...%2").arg(match?"":"!").arg(accountIds.front(),accountIds.back()));
}
const MyMoneySplit& MyMoneyTransaction::splitById(const TQString& splitId) const
@ -256,7 +256,7 @@ const MyMoneySplit& MyMoneyTransaction::splitById(const TQString& splitId) const
if((*it).id() == splitId)
return *it;
}
throw new MYMONEYEXCEPTION(TQString("Split not found for id '%1'").tqarg(TQString(splitId)));
throw new MYMONEYEXCEPTION(TQString("Split not found for id '%1'").arg(TQString(splitId)));
}
const TQString MyMoneyTransaction::nextSplitID()
@ -467,7 +467,7 @@ TQString MyMoneyTransaction::accountSignature(bool includeSplitCount) const
rc += "-";
rc += it_a.key();
if(includeSplitCount)
rc += TQString("*%1").tqarg(*it_a);
rc += TQString("*%1").arg(*it_a);
}
return rc;
}

6
kmymoney2/mymoney/mymoneytransactionfilter.cpp
Unescape View File

@ -845,13 +845,13 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start,
void MyMoneyTransactionFilter::removeReference(const TQString& id)
{
if(m_accounts.find(id)) {
qDebug("%s", (TQString("Remove account '%1' from report").tqarg(id)).data());
qDebug("%s", (TQString("Remove account '%1' from report").arg(id)).data());
m_accounts.remove(id);
} else if(m_categories.find(id)) {
qDebug("%s", (TQString("Remove category '%1' from report").tqarg(id)).data());
qDebug("%s", (TQString("Remove category '%1' from report").arg(id)).data());
m_categories.remove(id);
} else if(m_payees.find(id)) {
qDebug("%s", (TQString("Remove payee '%1' from report").tqarg(id)).data());
qDebug("%s", (TQString("Remove payee '%1' from report").arg(id)).data());
m_payees.remove(id);
}
}

14
kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp
Unescape View File

@ -220,7 +220,7 @@ void MyMoneyDatabaseMgr::removePayee(const MyMoneyPayee& payee)
TQMap<TQString, MyMoneyTransaction> transactionList = m_sql->fetchTransactions(); // make sure they're all here
for(it_t = transactionList.begin(); it_t != transactionList.end(); ++it_t) {
if((*it_t).hasReferenceTo(payee.id())) {
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("transaction"));
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("transaction"));
}
}
@ -228,7 +228,7 @@ void MyMoneyDatabaseMgr::removePayee(const MyMoneyPayee& payee)
TQMap<TQString, MyMoneySchedule> scheduleList = m_sql->fetchSchedules(); // make sure they're all here
for(it_s = scheduleList.begin(); it_s != scheduleList.end(); ++it_s) {
if((*it_s).hasReferenceTo(payee.id())) {
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("schedule"));
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("schedule"));
}
}
// remove any reference to report and/or budget
@ -532,7 +532,7 @@ void MyMoneyDatabaseMgr::modifyAccount(const MyMoneyAccount& account, const bool
// update information in account list
//m_accountList.modify(account.id(), account);
// tqinvalidate cached balance
// invalidate cached balance
//FIXME: invalidateBalanceCache(account.id());
// mark file as changed
@ -1344,7 +1344,7 @@ void MyMoneyDatabaseMgr::addCurrency(const MyMoneySecurity& currency)
it = currencyList.find(currency.id());
if(it != currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").tqarg(currency.id()));
throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").arg(currency.id()));
}
m_sql->addCurrency(currency);
@ -1358,7 +1358,7 @@ void MyMoneyDatabaseMgr::modifyCurrency(const MyMoneySecurity& currency)
it = currencyList.find(currency.id());
if(it == currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").tqarg(currency.id()));
throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").arg(currency.id()));
}
m_sql->modifyCurrency(currency);
@ -1373,7 +1373,7 @@ void MyMoneyDatabaseMgr::removeCurrency(const MyMoneySecurity& currency)
it = currencyList.find(currency.id());
if(it == currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").tqarg(currency.id()));
throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").arg(currency.id()));
}
m_sql->removeCurrency(currency);
@ -1389,7 +1389,7 @@ const MyMoneySecurity MyMoneyDatabaseMgr::currency(const TQString& id) const
it = currencyList.find(id);
if(it == currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").tqarg(id));
throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").arg(id));
}
return *it;

2
kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp
Unescape View File

@ -742,7 +742,7 @@ void MyMoneyDatabaseMgrTest::testCopyBudget() {
MyMoneyBudget newBudget = oldBudget;
newBudget.clearId();
newBudget.setName(TQString("Copy of %1").tqarg(oldBudget.name()));
newBudget.setName(TQString("Copy of %1").arg(oldBudget.name()));
m->addBudget(newBudget);
CPPUNIT_ASSERT(m->budgetList().count() == 2);

18
kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp
Unescape View File

@ -225,14 +225,14 @@ void MyMoneySeqAccessMgr::removePayee(const MyMoneyPayee& payee)
// scan all transactions to check if the payee is still referenced
for(it_t = m_transactionList.begin(); it_t != m_transactionList.end(); ++it_t) {
if((*it_t).hasReferenceTo(payee.id())) {
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("transaction"));
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("transaction"));
}
}
// check referential integrity in schedules
for(it_s = m_scheduleList.begin(); it_s != m_scheduleList.end(); ++it_s) {
if((*it_s).hasReferenceTo(payee.id())) {
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("schedule"));
throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("schedule"));
}
}
@ -503,7 +503,7 @@ void MyMoneySeqAccessMgr::modifyAccount(const MyMoneyAccount& account, const boo
// update information in account list
m_accountList.modify(account.id(), account);
// tqinvalidate cached balance
// invalidate cached balance
invalidateBalanceCache(account.id());
} else
@ -817,14 +817,14 @@ const MyMoneyTransaction MyMoneySeqAccessMgr::transaction(const TQString& id) co
// get the full key of this transaction, throw exception
// if it's invalid (unknown)
if(!m_transactionKeys.contains(id)) {
TQString msg = TQString("Invalid transaction id '%1'").tqarg(id);
TQString msg = TQString("Invalid transaction id '%1'").arg(id);
throw new MYMONEYEXCEPTION(msg);
}
// check if this key is in the list, throw exception if not
TQString key = m_transactionKeys[id];
if(!m_transactionList.contains(key)) {
TQString msg = TQString("Invalid transaction key '%1'").tqarg(key);
TQString msg = TQString("Invalid transaction key '%1'").arg(key);
throw new MYMONEYEXCEPTION(msg);
}
@ -1446,7 +1446,7 @@ void MyMoneySeqAccessMgr::addCurrency(const MyMoneySecurity& currency)
it = m_currencyList.find(currency.id());
if(it != m_currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").tqarg(currency.id()));
throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").arg(currency.id()));
}
m_currencyList.insert(currency.id(), currency);
@ -1458,7 +1458,7 @@ void MyMoneySeqAccessMgr::modifyCurrency(const MyMoneySecurity& currency)
it = m_currencyList.find(currency.id());
if(it == m_currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").tqarg(currency.id()));
throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").arg(currency.id()));
}
m_currencyList.modify(currency.id(), currency);
@ -1472,7 +1472,7 @@ void MyMoneySeqAccessMgr::removeCurrency(const MyMoneySecurity& currency)
it = m_currencyList.find(currency.id());
if(it == m_currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").tqarg(currency.id()));
throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").arg(currency.id()));
}
m_currencyList.remove(currency.id());
@ -1487,7 +1487,7 @@ const MyMoneySecurity MyMoneySeqAccessMgr::currency(const TQString& id) const
it = m_currencyList.find(id);
if(it == m_currencyList.end()) {
throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").tqarg(id));
throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").arg(id));
}
return *it;

2
kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h
Unescape View File

@ -997,7 +997,7 @@ private:
void touch(void);
/**
* This method is used to tqinvalidate the cached balance for
* This method is used to invalidate the cached balance for
* the selected account and all it's parents.
*
* @param id id of the account in question

2
kmymoney2/mymoney/storage/mymoneystorageanon.cpp
Unescape View File

@ -152,7 +152,7 @@ void MyMoneyStorageANON::fakeTransaction(MyMoneyTransaction& tx)
TQValueList<MyMoneySplit>::ConstIterator it_s;
for(it_s = tx.splits().begin(); it_s != tx.splits().end(); ++it_s) {
MyMoneySplit s = (*it_s);
s.setMemo(TQString("%1/%2").tqarg(tn.id()).tqarg(s.id()));
s.setMemo(TQString("%1/%2").arg(tn.id()).arg(s.id()));
if(s.value() != MyMoneyMoney::autoCalc) {
s.setValue((s.value() * m_factor));

100
kmymoney2/mymoney/storage/mymoneystoragesql.cpp
Unescape View File

@ -60,11 +60,11 @@ MyMoneySqlQuery::MyMoneySqlQuery (MyMoneyStorageSql* db)
}
bool MyMoneySqlQuery::exec () {
TRACE(TQString("start sql - %1").tqarg(lastQuery()));
TRACE(TQString("start sql - %1").arg(lastQuery()));
bool rc = TQSqlQuery::exec();
TQString msg("end sql\n%1\n***Query returned %2, row count %3");
TRACE (msg.tqarg(TQSqlQuery::executedQuery()).tqarg(rc).tqarg(numRowsAffected()));
//DBG (TQString("%1\n***Query returned %2, row count %3").tqarg(TQSqlQuery::executedQuery()).tqarg(rc).tqarg(size()));
TRACE (msg.arg(TQSqlQuery::executedQuery()).arg(rc).arg(numRowsAffected()));
//DBG (TQString("%1\n***Query returned %2, row count %3").arg(TQSqlQuery::executedQuery()).arg(rc).arg(size()));
return (rc);
}
@ -97,7 +97,7 @@ databaseTypeE MyMoneyDbDrivers::driverToType (const TQString& driver) const {
else if (driver == "QPSQL7") return(Postgresql);
else if (driver == "QTDS7") return(Sybase);
else if (driver == "QSQLITE3") return(Sqlite3);
else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").tqarg(driver));
else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").arg(driver));
}
bool MyMoneyDbDrivers::isTested (databaseTypeE dbType) const {
@ -182,7 +182,7 @@ try {
}
break;
default:
qFatal("%s", TQString("%1 - unknown open mode %2").tqarg(__func__).tqarg(openMode).data());
qFatal("%s", TQString("%1 - unknown open mode %2").arg(__func__).arg(openMode).data());
}
if (rc != 0) return (rc);
// bypass logon check if we are creating a database
@ -192,9 +192,9 @@ try {
if (!m_logonUser.isEmpty() && (!m_override)) {
m_error = TQString
(i18n("Database apparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?"))
.tqarg(m_logonUser)
.tqarg(m_logonAt.date().toString(Qt::ISODate))
.tqarg(m_logonAt.time().toString("hh.mm.ss"));
.arg(m_logonUser)
.arg(m_logonAt.date().toString(Qt::ISODate))
.arg(m_logonAt.time().toString("hh.mm.ss"));
qDebug("%s", m_error.data());
close(false);
rc = -1;
@ -229,7 +229,7 @@ int MyMoneyStorageSql::createDatabase (const KURL& url) {
if (m_dbType == Sqlite3) return(0); // not needed for sqlite
if (!m_dbType == Mysql) {
m_error =
TQString(i18n("Cannot currently create database for driver %1; please create manually")).tqarg(driverName());
TQString(i18n("Cannot currently create database for driver %1; please create manually")).arg(driverName());
return (1);
}
// create the database (only works for mysql at present)
@ -241,10 +241,10 @@ int MyMoneyStorageSql::createDatabase (const KURL& url) {
maindb->setPassword (url.pass());
maindb->open();
TQSqlQuery qm(maindb);
TQString qs = TQString("CREATE DATABASE %1;").tqarg(dbName);
TQString qs = TQString("CREATE DATABASE %1;").arg(dbName);
qm.prepare (qs);
if (!qm.exec()) {
buildError (qm, __func__, TQString(i18n("Error in create database %1; do you have create permissions?")).tqarg(dbName));
buildError (qm, __func__, TQString(i18n("Error in create database %1; do you have create permissions?")).arg(dbName));
return (1);
}
TQSqlDatabase::removeDatabase (maindb);
@ -325,7 +325,7 @@ int MyMoneyStorageSql::upgradeDb() {
}
}
// write updated version to DB
//setVersion(TQString("%1.%2").tqarg(m_dbVersion).tqarg(m_minorVersion));
//setVersion(TQString("%1.%2").arg(m_dbVersion).arg(m_minorVersion));
q.prepare (TQString("UPDATE kmmFileInfo SET version = :version;"));
q.bindValue(":version", m_dbVersion);
if (!q.exec()) {
@ -363,12 +363,12 @@ bool MyMoneyStorageSql::addColumn
TQSqlQuery q(this);
TQString afterString = ";";
if (!after.isEmpty())
afterString = TQString("AFTER %1;").tqarg(after);
afterString = TQString("AFTER %1;").arg(after);
q.prepare("ALTER TABLE " + t.name() + " ADD COLUMN " +
c.generateDDL(m_dbType) + afterString);
if (!q.exec()) {
buildError (q, __func__,
TQString("Error adding column %1 to table %2").tqarg(c.name()).tqarg(t.name()));
TQString("Error adding column %1 to table %2").arg(c.name()).arg(t.name()));
return (false);
}
return (true);
@ -392,7 +392,7 @@ bool MyMoneyStorageSql::dropColumn
+ col + ";");
if (!q.exec()) {
buildError (q, __func__,
TQString("Error dropping column %1 from table %2").tqarg(col).tqarg(t.name()));
TQString("Error dropping column %1 from table %2").arg(col).arg(t.name()));
return (false);
}
return (true);
@ -657,7 +657,7 @@ int MyMoneyStorageSql::upgradeToV6() {
// upgrade Mysql to InnoDB transaction-safe engine
if (m_dbType == Mysql) {
for (TQMapConstIterator<TQString, MyMoneyDbTable> tt = m_db.tableBegin(); tt != m_db.tableEnd(); ++tt) {
q.prepare(TQString("ALTER TABLE %1 ENGINE = InnoDB;").tqarg(tt.data().name()));
q.prepare(TQString("ALTER TABLE %1 ENGINE = InnoDB;").arg(tt.data().name()));
if (!q.exec()) {
buildError (q, __func__, "Error updating to InnoDB");
return (1);
@ -737,7 +737,7 @@ bool MyMoneyStorageSql::sqliteAlterTable(const MyMoneyDbTable& t) {
long unsigned MyMoneyStorageSql::getRecCount (const TQString& table) const {
DBG("*** Entering MyMoneyStorageSql::getRecCount");
MyMoneySqlQuery q(const_cast <MyMoneyStorageSql*> (this));
q.prepare(TQString("SELECT COUNT(*) FROM %1;").tqarg(table));
q.prepare(TQString("SELECT COUNT(*) FROM %1;").arg(table));
if ((!q.exec()) || (!q.next())) {
buildError (q, __func__, "error retrieving record count");
qFatal("Error retrieving record count"); // definitely shouldn't happen
@ -763,7 +763,7 @@ int MyMoneyStorageSql::createTables () {
for (TQMapConstIterator<TQString, MyMoneyDbView> tt = m_db.viewBegin(); tt != m_db.viewEnd(); ++tt) {
if (!lowerTables.contains(tt.key().lower())) {
q.prepare (tt.data().createString());
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating view %1").tqarg(tt.key())));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating view %1").arg(tt.key())));
}
}
@ -780,7 +780,7 @@ void MyMoneyStorageSql::createTable (const MyMoneyDbTable& t) {
MyMoneySqlQuery q(this);
for (unsigned int i = 0; i < ql.count(); ++i) {
q.prepare (ql[i]);
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating table/index %1").tqarg(t.name())));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating table/index %1").arg(t.name())));
}
}
@ -791,7 +791,7 @@ int MyMoneyStorageSql::isEmpty () {
int recordCount = 0;
MyMoneySqlQuery q(this);
while ((tt != m_db.tableEnd()) && (recordCount == 0)) {
q.prepare (TQString("select count(*) from %1;").tqarg((*tt).name()));
q.prepare (TQString("select count(*) from %1;").arg((*tt).name()));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, "getting record count"));
if (!q.next()) throw new MYMONEYEXCEPTION(buildError (q, __func__, "retrieving record count"));
recordCount += q.value(0).toInt();
@ -811,7 +811,7 @@ void MyMoneyStorageSql::clean() {
TQMapConstIterator<TQString, MyMoneyDbTable> it = m_db.tableBegin();
MyMoneySqlQuery q(this);
while (it != m_db.tableEnd()) {
q.prepare(TQString("DELETE from %1;").tqarg(it.key()));
q.prepare(TQString("DELETE from %1;").arg(it.key()));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("cleaning database")));
++it;
}
@ -921,7 +921,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) {
// as value of this method.
bool rc = true;
if (callingFunction != m_commitUnitStack.top())
qDebug("%s", TQString("%1 - %2 s/be %3").tqarg(__func__).tqarg(callingFunction).tqarg(m_commitUnitStack.top()).data());
qDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data());
m_commitUnitStack.pop();
if (m_commitUnitStack.isEmpty()) {
if (!commit()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "ending commit unit"));
@ -932,7 +932,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) {
void MyMoneyStorageSql::cancelCommitUnit (const TQString& callingFunction) {
DBG("*** Entering MyMoneyStorageSql::cancelCommitUnit");
if (callingFunction != m_commitUnitStack.top())
qDebug("%s", TQString("%1 - %2 s/be %3").tqarg(__func__).tqarg(callingFunction).tqarg(m_commitUnitStack.top()).data());
qDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data());
if (m_commitUnitStack.isEmpty()) return;
m_commitUnitStack.clear();
if (!rollback()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "cancelling commit unit"));
@ -2239,7 +2239,7 @@ void MyMoneyStorageSql::deleteKeyValuePairs (const TQString& kvpType, const TQSt
q.prepare ("DELETE FROM kmmKeyValuePairs WHERE kvpType = :kvpType AND kvpId = :kvpId;");
q.bindValue(":kvpType", kvpType);
q.bindValue(":kvpId", kvpId);
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("deleting kvp for %1 %2").tqarg(kvpType).tqarg(kvpId)));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("deleting kvp for %1 %2").arg(kvpType).arg(kvpId)));
m_kvps -= q.numRowsAffected();
}
@ -2428,7 +2428,7 @@ const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStri
TQString itemConnector = "";
TQStringList::ConstIterator it;
for (it = idList.begin(); it != idList.end(); ++it) {
whereClause.append(TQString("%1id = '%2'").tqarg(itemConnector).tqarg(*it));
whereClause.append(TQString("%1id = '%2'").arg(itemConnector).arg(*it));
itemConnector = " or ";
}
whereClause += ")";
@ -2623,7 +2623,7 @@ const TQMap<TQString, MyMoneyMoney> MyMoneyStorageSql::fetchBalance(const TQStri
// the <= operator misbehave when the date matches. To avoid this, add a day to the
// requested date and use the < operator.
if (date.isValid() && !date.isNull())
queryString += TQString(" AND postDate < '%1'").tqarg(date.addDays(1).toString(Qt::ISODate));
queryString += TQString(" AND postDate < '%1'").arg(date.addDays(1).toString(Qt::ISODate));
DBG (queryString);
q.prepare(queryString);
@ -2866,7 +2866,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
TQStringList::const_iterator it;
for (it = payees.begin(); it != payees.end(); ++it) {
payeesClause.append(TQString("%1'%2'")
.tqarg(itemConnector).tqarg(*it));
.arg(itemConnector).arg(*it));
itemConnector = ", ";
}
if (!payeesClause.isEmpty()) {
@ -2885,7 +2885,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
for (it = accounts.begin(); it != accounts.end(); ++it) {
// if (m_accountsLoaded.find(*it) == m_accountsLoaded.end()) {
accountsClause.append(TQString("%1 '%2'")
.tqarg(itemConnector).tqarg(*it));
.arg(itemConnector).arg(*it));
itemConnector = ", ";
//if (accountsOnlyFilter) m_accountsLoaded.append(*it); // a bit premature...
// }
@ -2904,8 +2904,8 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
TQString statesClause = "";
for (TQValueList<int>::ConstIterator it = splitStates.begin(); it != splitStates.end(); ++it) {
statesClause.append(TQString(" %1 '%2'")
.tqarg(itemConnector)
.tqarg(splitState(MyMoneyTransactionFilter::stateOptionE(*it))));
.arg(itemConnector)
.arg(splitState(MyMoneyTransactionFilter::stateOptionE(*it))));
itemConnector = ",";
}
if (!statesClause.isEmpty()) {
@ -2941,19 +2941,19 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (
TQString dateClause;
TQString connector = "";
if (end != TQDate()) {
dateClause = TQString("(postDate < '%1')").tqarg(end.addDays(1).toString(Qt::ISODate));
dateClause = TQString("(postDate < '%1')").arg(end.addDays(1).toString(Qt::ISODate));
connector = " and ";
}
if (start != TQDate()) {
dateClause += TQString("%1 (postDate >= '%2')").tqarg(connector).tqarg(start.toString(Qt::ISODate));
dateClause += TQString("%1 (postDate >= '%2')").arg(connector).arg(start.toString(Qt::ISODate));
}
// now get a list of transaction ids
// if we have only a date filter, we need to build the list from the tx table
// otherwise we need to build from the split table
if (splitFilterActive) {
inQuery = TQString("(select distinct transactionId from kmmSplits %1)").tqarg(whereClause);
inQuery = TQString("(select distinct transactionId from kmmSplits %1)").arg(whereClause);
} else {
inQuery = TQString("(select distinct id from kmmTransactions where %1)").tqarg(dateClause);
inQuery = TQString("(select distinct id from kmmTransactions where %1)").arg(dateClause);
txFilterActive = false; // kill off the date filter now
}
@ -3522,8 +3522,8 @@ const MyMoneyKeyValueContainer MyMoneyStorageSql::readKeyValuePairs (const TQStr
q.prepare ("SELECT kvpKey, kvpData from kmmKeyValuePairs where kvpType = :type and kvpId = :id;");
q.bindValue(":type", kvpType);
q.bindValue(":id", kvpId);
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp for %1 %2").tqarg(kvpType)
.tqarg(kvpId)));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp for %1 %2").arg(kvpType)
.arg(kvpId)));
while (q.next()) list.setValue(q.value(0).toString(), q.value(1).toString());
return (list);
}
@ -3542,7 +3542,7 @@ const TQMap<TQString, MyMoneyKeyValueContainer> MyMoneyStorageSql::readKeyValueP
query += " order by kvpId;";
q.prepare (query);
q.bindValue(":type", kvpType);
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp List for %1").tqarg(kvpType)));
if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp List for %1").arg(kvpType)));
while (q.next()) {
retval [q.value(0).toString()].setValue(q.value(1).toString(), q.value(2).toString());
}
@ -3786,15 +3786,15 @@ void MyMoneyStorageSql::signalProgress(int current, int total, const TQString& m
// **************************** Error display routine *******************************
TQString& MyMoneyStorageSql::buildError (const TQSqlQuery& q, const TQString& function, const TQString& message) const {
TQString s = TQString("Error in function %1 : %2").tqarg(function).tqarg(message);
TQString s = TQString("Error in function %1 : %2").arg(function).arg(message);
TQSqlError e = lastError();
s += TQString ("\nDriver = %1, Host = %2, User = %3, Database = %4")
.tqarg(driverName()).tqarg(hostName()).tqarg(userName()).tqarg(databaseName());
s += TQString ("\nDriver Error: %1").tqarg(e.driverText());
s += TQString ("\nDatabase Error No %1: %2").tqarg(e.number()).tqarg(e.databaseText());
.arg(driverName()).arg(hostName()).arg(userName()).arg(databaseName());
s += TQString ("\nDriver Error: %1").arg(e.driverText());
s += TQString ("\nDatabase Error No %1: %2").arg(e.number()).arg(e.databaseText());
e = q.lastError();
s += TQString ("\nExecuted: %1").tqarg(q.executedQuery());
s += TQString ("\nQuery error No %1: %2").tqarg(e.number()).tqarg(e.text());
s += TQString ("\nExecuted: %1").arg(q.executedQuery());
s += TQString ("\nQuery error No %1: %2").arg(e.number()).arg(e.text());
const_cast <MyMoneyStorageSql*> (this)->m_error = s;
qDebug("%s", s.ascii());
@ -4188,12 +4188,12 @@ void MyMoneyDbTable::addIndex(const TQString& name, const TQStringList& columns,
void MyMoneyDbTable::buildSQLStrings (void) {
// build fixed SQL strings for this table
// build the insert string with placeholders for each field
TQString qs = TQString("INSERT INTO %1 (").tqarg(name());
TQString qs = TQString("INSERT INTO %1 (").arg(name());
TQString ws = ") VALUES (";
field_iterator ft = m_fields.begin();
while (ft != m_fields.end()) {
qs += TQString("%1, ").tqarg((*ft)->name());
ws += TQString(":%1, ").tqarg((*ft)->name());
qs += TQString("%1, ").arg((*ft)->name());
ws += TQString(":%1, ").arg((*ft)->name());
++ft;
}
qs = qs.left(qs.length() - 2);
@ -4210,9 +4210,9 @@ void MyMoneyDbTable::buildSQLStrings (void) {
while (ft != m_fields.end()) {
if ((*ft)->isPrimaryKey()) {
if (!ws.isEmpty()) ws += " AND ";
ws += TQString("%1 = :%2").tqarg((*ft)->name()).tqarg((*ft)->name());
ws += TQString("%1 = :%2").arg((*ft)->name()).arg((*ft)->name());
} else {
qs += TQString("%1 = :%2, ").tqarg((*ft)->name()).tqarg((*ft)->name());
qs += TQString("%1 = :%2, ").arg((*ft)->name()).arg((*ft)->name());
}
++ft;
}
@ -4230,14 +4230,14 @@ const TQString MyMoneyDbTable::columnList() const {
TQString qs;
ft = m_fields.begin();
while (ft != m_fields.end()) {
qs += TQString("%1, ").tqarg((*ft)->name());
qs += TQString("%1, ").arg((*ft)->name());
++ft;
}
return (qs.left(qs.length() - 2));
}
const TQString MyMoneyDbTable::generateCreateSQL (databaseTypeE dbType) const {
TQString qs = TQString("CREATE TABLE %1 (").tqarg(name());
TQString qs = TQString("CREATE TABLE %1 (").arg(name());
TQString pkey;
for (field_iterator it = m_fields.begin(); it != m_fields.end(); ++it) {
qs += (*it)->generateDDL (dbType) + ", ";

10
kmymoney2/mymoney/storage/mymoneystoragexml.cpp
Unescape View File

@ -119,19 +119,19 @@ bool MyMoneyXmlContentHandler::endDocument(void)
bool MyMoneyXmlContentHandler::skippedEntity (const TQString & /* name */)
{
// qDebug(TQString("Skipped entity '%1'").tqarg(name));
// qDebug(TQString("Skipped entity '%1'").arg(name));
return true;
}
bool MyMoneyXmlContentHandler::startPrefixMapping (const TQString& /*prefix */, const TQString & /* uri */)
{
// qDebug(TQString("start prefix '%1', '%2'").tqarg(prefix).tqarg(uri));
// qDebug(TQString("start prefix '%1', '%2'").arg(prefix).arg(uri));
return true;
}
bool MyMoneyXmlContentHandler::endPrefixMapping (const TQString& /* prefix */)
{
// qDebug(TQString("end prefix '%1'").tqarg(prefix));
// qDebug(TQString("end prefix '%1'").arg(prefix));
return true;
}
@ -265,13 +265,13 @@ bool MyMoneyXmlContentHandler::endElement(const TQString& /* namespaceURI */, co
MyMoneyPrice p(m_reader->d->m_fromSecurity, m_reader->d->m_toSecurity, m_baseNode);
m_reader->d->prList[MyMoneySecurityPair(m_reader->d->m_fromSecurity, m_reader->d->m_toSecurity)][p.date()] = p;
} else {
m_errMsg = i18n("Unknown XML tag %1 found in line %2").tqarg(qName).tqarg(m_loc->lineNumber());
m_errMsg = i18n("Unknown XML tag %1 found in line %2").arg(qName).arg(m_loc->lineNumber());
kdWarning() << m_errMsg << endl;
rc = false;
}
m_reader->signalProgress(++m_elementCount, 0);
} catch(MyMoneyException* e) {
m_errMsg = i18n("Exception while creating a %1 element: %2").tqarg(s).tqarg(e->what());
m_errMsg = i18n("Exception while creating a %1 element: %2").arg(s).arg(e->what());
kdWarning() << m_errMsg << endl;
delete e;
rc = false;

10
kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp
Unescape View File

@ -88,7 +88,7 @@ void KOfxDirectConnectDlg::init(void)
TQDir homeDir(TQDir::home());
if(homeDir.exists("ofxlog.txt")) {
d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath()));
d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath()));
d->m_fpTrace.open(IO_WriteOnly | IO_Append);
}
@ -113,7 +113,7 @@ void KOfxDirectConnectDlg::init(void)
connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&)));
connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*)));
setStatus(TQString("Contacting %1...").tqarg(m_connector.url()));
setStatus(TQString("Contacting %1...").arg(m_connector.url()));
kProgress1->setTotalSteps(3);
kProgress1->setProgress(1);
}
@ -133,13 +133,13 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*)
{
if ( m_tmpfile )
{
// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").tqarg(m_tmpfile->name()));
// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").arg(m_tmpfile->name()));
kdDebug(2) << "Already connected, using " << m_tmpfile->name() << endl;
delete m_tmpfile; //delete otherwise we mem leak
}
m_tmpfile = new KTempFile();
setStatus("Connection established, retrieving data...");
setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name()));
setDetails(TQString("Downloading data to %1...").arg(m_tmpfile->name()));
kProgress1->advance(1);
}
@ -154,7 +154,7 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba)
d->m_fpTrace.writeBlock(_ba, _ba.size());
}
setDetails(TQString("Got %1 bytes").tqarg(_ba.size()));
setDetails(TQString("Got %1 bytes").arg(_ba.size()));
}
void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */)

6
kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui
Unescape View File

@ -58,7 +58,7 @@
<property name="text">
<string>Please select your financial institution from the list below...</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -361,7 +361,7 @@
<property name="text">
<string>Please select the account from your financial institution from the list below which matches this account.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>
@ -461,7 +461,7 @@
<property name="text">
<string>Congratulations! You have successfully set up your bank for online banking via OFX.</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter</set>
</property>
</widget>

22
kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp
Unescape View File

@ -134,7 +134,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
{
TQString bank = item->text(0);
m_textDetails->clear();
m_textDetails->append(TQString("<p>Details for %1:</p>").tqarg(bank));
m_textDetails->append(TQString("<p>Details for %1:</p>").arg(bank));
TQStringList fipids = OfxPartner::FipidForBank(bank);
TQStringList::const_iterator it_fipid = fipids.begin();
while ( it_fipid != fipids.end() )
@ -143,14 +143,14 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
info = OfxPartner::ServiceInfo(*it_fipid);
// Print them to the text browser
TQString message = TQString("<p>Fipid: %1<br>").tqarg(*it_fipid);
TQString message = TQString("<p>Fipid: %1<br>").arg(*it_fipid);
// If the bank supports retrieving statements
if ( info.accountlist )
{
m_bankInfo.push_back(info);
message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").tqarg(info.url,info.org,info.fid);
message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").arg(info.url,info.org,info.fid);
if ( info.statements )
message += i18n("Supports online statements<br>");
if ( info.investments )
@ -180,7 +180,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
}
m_textDetails->clear();
m_textDetails->append(TQString("<p>Details for %1:</p>").tqarg(m_bankName->text()));
m_textDetails->append(TQString("<p>Details for %1:</p>").arg(m_bankName->text()));
memset(&info, 0, sizeof(OfxFiServiceInfo));
strncpy(info.fid, m_fid->text().ascii(), OFX_FID_LENGTH-1);
@ -194,7 +194,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void)
m_bankInfo.push_back(info);
TQString message;
message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").tqarg(info.url,info.org,info.fid);
message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").arg(info.url,info.org,info.fid);
if ( info.statements )
message += i18n("Supports online statements<br>");
if ( info.investments )
@ -248,7 +248,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void)
// who owns this memory?!?!
char* request = libofx_request_accountinfo( &fi );
KURL filename(TQString("%1response.ofx").tqarg(locateLocal("appdata", "")));
KURL filename(TQString("%1response.ofx").arg(locateLocal("appdata", "")));
TQByteArray req;
req.setRawData(request, strlen(request));
OfxHttpsRequest("POST", (*m_it_info).url, req, TQMap<TQString, TQString>(), filename, true);
@ -360,7 +360,7 @@ int KOnlineBankingSetupWizard::ofxAccountCallback(struct OfxAccountData data, vo
if(/* !kvps.value("bankid").isEmpty()
&& */ !kvps.value("uniqueId").isEmpty()) {
kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").tqarg(kvps.value("bankid"), kvps.value("uniqueId")));
kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").arg(kvps.value("bankid"), kvps.value("uniqueId")));
} else {
qDebug("Cannot setup kmmofx-acc-ref for '%s'", kvps.value("bankname").data());
}
@ -379,11 +379,11 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void
if(data.code_valid==true)
{
message += TQString("#%1 %2: \"%3\"\n").tqarg(data.code).tqarg(data.name,data.description);
message += TQString("#%1 %2: \"%3\"\n").arg(data.code).arg(data.name,data.description);
}
if(data.server_message_valid==true){
message += i18n("Server message: %1\n").tqarg(data.server_message);
message += i18n("Server message: %1\n").arg(data.server_message);
}
if(data.severity_valid==true){
@ -391,10 +391,10 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void
case OfxStatusData::INFO :
break;
case OfxStatusData::WARN :
KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").tqarg(message) );
KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").arg(message) );
break;
case OfxStatusData::ERROR :
KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").tqarg(message) );
KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").arg(message) );
break;
default:
break;

4
kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
Unescape View File

@ -61,9 +61,9 @@ KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *
TQString account = settings.value("accountid");
TQString bank = settings.value("bankname");
TQString bankid = TQString("%1 %2").tqarg(settings.value("bankid")).tqarg(settings.value("branchid"));
TQString bankid = TQString("%1 %2").arg(settings.value("bankid")).arg(settings.value("branchid"));
if ( bankid.length() > 1 )
bank += TQString(" (%1)").tqarg(bankid);
bank += TQString(" (%1)").arg(bankid);
m_textBank->setText(bank);
m_textOnlineAccount->setText(account);

2
kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
Unescape View File

@ -416,7 +416,7 @@ TQString MyMoneyOfxConnector::header(void)
"COMPRESSION:NONE\r\n"
"OLDFILEUID:NONE\r\n"
"NEWFILEUID:%1\r\n"
"\r\n").tqarg(uuid());
"\r\n").arg(uuid());
}
TQString MyMoneyOfxConnector::uuid(void)

20
kmymoney2/plugins/ofximport/ofximporterplugin.cpp
Unescape View File

@ -74,7 +74,7 @@ void OfxImporterPlugin::slotImportFile(void)
if ( isMyFormat(url.path()) ) {
slotImportFile(url.path());
} else {
KMessageBox::error( 0, i18n("Unable to import %1 using the OFX importer plugin. This file is not the correct format.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Incorrect format"));
KMessageBox::error( 0, i18n("Unable to import %1 using the OFX importer plugin. This file is not the correct format.").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Incorrect format"));
}
}
@ -351,7 +351,7 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo
break;
default:
unhandledtype = true;
type = TQString("UNKNOWN %1").tqarg(data.invtransactiontype);
type = TQString("UNKNOWN %1").arg(data.invtransactiontype);
break;
}
}
@ -373,14 +373,14 @@ int OfxImporterPlugin::ofxTransactionCallback(struct OfxTransactionData data, vo
double proper_total = t.m_dShares * data.unitprice + t.m_moneyFees;
if ( proper_total != t.m_moneyAmount )
{
pofx->addWarning(TQString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").tqarg(t.m_strBankID).tqarg(t.m_moneyAmount).tqarg(proper_total));
pofx->addWarning(TQString("Transaction %1 has an incorrect total of %2. Using calculated total of %3 instead.").arg(t.m_strBankID).arg(t.m_moneyAmount).arg(proper_total));
t.m_moneyAmount = proper_total;
}
}
#endif
if ( unhandledtype )
pofx->addWarning(TQString("Transaction %1 has an unsupported type (%2).").tqarg(t.m_strBankID,type));
pofx->addWarning(TQString("Transaction %1 has an unsupported type (%2).").arg(t.m_strBankID,type));
else
s.m_listTransactions += t;
@ -482,7 +482,7 @@ int OfxImporterPlugin::ofxAccountCallback(struct OfxAccountData data, void * pv)
}
// ask KMyMoney for an account id
s.m_accountId = pofx->account("kmmofx-acc-ref", TQString("%1-%2").tqarg(s.m_strRoutingNumber, s.m_strAccountNumber)).id();
s.m_accountId = pofx->account("kmmofx-acc-ref", TQString("%1-%2").arg(s.m_strRoutingNumber, s.m_strAccountNumber)).id();
// copy over the securities
s.m_listSecurities = pofx->m_securitylist;
@ -527,13 +527,13 @@ int OfxImporterPlugin::ofxStatusCallback(struct OfxStatusData data, void * pv)
pofx->m_fatalerror = "No accounts found.";
if(data.ofx_element_name_valid==true)
message.prepend(TQString("%1: ").tqarg(data.ofx_element_name));
message.prepend(TQString("%1: ").arg(data.ofx_element_name));
if(data.code_valid==true)
message += TQString("%1 (Code %2): %3").tqarg(data.name).tqarg(data.code).tqarg(data.description);
message += TQString("%1 (Code %2): %3").arg(data.name).arg(data.code).arg(data.description);
if(data.server_message_valid==true)
message += TQString(" (%1)").tqarg(data.server_message);
message += TQString(" (%1)").arg(data.server_message);
if(data.severity_valid==true){
switch(data.severity){
@ -636,7 +636,7 @@ bool OfxImporterPlugin::updateAccount(const MyMoneyAccount& acc, bool moreAccoun
dlg.exec();
}
} catch (MyMoneyException *e) {
KMessageBox::information(0 ,i18n("Error connecting to bank: %1").tqarg(e->what()));
KMessageBox::information(0 ,i18n("Error connecting to bank: %1").arg(e->what()));
delete e;
}
@ -647,7 +647,7 @@ void OfxImporterPlugin::slotImportFile(const TQString& url)
{
if(!import(url)) {
KMessageBox::error( 0, TQString("<qt>%1</qt>").tqarg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:<p>%2").tqarg(url, lastError())), i18n("Importing error"));
KMessageBox::error( 0, TQString("<qt>%1</qt>").arg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:<p>%2").arg(url, lastError())), i18n("Importing error"));
}
}

8
kmymoney2/plugins/ofximport/ofxpartner.cpp
Unescape View File

@ -233,7 +233,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid)
attr["content-type"] = "application/x-www-form-urlencoded";
attr["accept"] = "*/*";
KURL guidFile(TQString("%1fipid-%2.xml").tqarg(directory).tqarg(fipid));
KURL guidFile(TQString("%1fipid-%2.xml").arg(directory).arg(fipid));
// Apparently at some point in time, for VER=6 msn returned an online URL
// to a static error page (http://moneycentral.msn.com/cust404.htm).
@ -241,7 +241,7 @@ OfxFiServiceInfo ServiceInfo(const TQString& fipid)
// future.
TQFileInfo i(guidFile.path());
if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::currentDateTime())
get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).tqarg(fipid)), guidFile);
get("", attr, KURL(TQString("http://moneycentral.msn.com/money/2005/mnynet/service/olsvcupd/OnlSvcBrandInfo.aspx?MSNGUID=&GUID=%1&SKU=3&VER=" VER).arg(fipid)), guidFile);
TQFile f(guidFile.path());
if(f.open(IO_ReadOnly)) {
@ -299,7 +299,7 @@ OfxHttpsRequest::OfxHttpsRequest(const TQString& type, const KURL &url, const TQ
{
TQDir homeDir(TQDir::home());
if(homeDir.exists("ofxlog.txt")) {
d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath()));
d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath()));
d->m_fpTrace.open(IO_WriteOnly | IO_Append);
}
@ -407,7 +407,7 @@ OfxHttpRequest::OfxHttpRequest(const TQString& type, const KURL &url, const TQBy
delete m_job;
} else {
m_error = TQHttp::Aborted;
errorMsg = i18n("Cannot open file %1 for writing").tqarg(dst.path());
errorMsg = i18n("Cannot open file %1 for writing").arg(dst.path());
}
if(m_error != TQHttp::NoError) {

10
kmymoney2/reports/kreportchartview.cpp
Unescape View File

@ -151,17 +151,17 @@ void KReportChartView::mouseMoveEvent( TQMouseEvent* event )
{
// set the tooltip text
label->setText(TQString("<h2>%1</h2><strong>%2</strong><br>(%3\%)")
.tqarg(this->params()->legendText( dataset ))
.tqarg(value, 0, 'f', 2)
.tqarg(pivot_sum, 0, 'f', 2)
.arg(this->params()->legendText( dataset ))
.arg(value, 0, 'f', 2)
.arg(pivot_sum, 0, 'f', 2)
);
}
else // if there is only one dataset, don't show percentage
{
// set the tooltip text
label->setText(TQString("<h2>%1</h2><strong>%2</strong>")
.tqarg(this->params()->legendText( dataset ))
.tqarg(value, 0, 'f', 2)
.arg(this->params()->legendText( dataset ))
.arg(value, 0, 'f', 2)
);
}

4
kmymoney2/reports/listtable.cpp
Unescape View File

@ -157,11 +157,11 @@ namespace reports {
//actual dates of the report
result += TQString("<div class=\"subtitle\">");
if(!m_config.fromDate().isNull()) {
result += i18n("Report date range", "%1 through %2").tqarg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).tqarg(KGlobal::locale()->formatDate(m_config.toDate(), true));
result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true));
result += TQString("</div>\n");
result += TQString("<div class=\"gap\">&nbsp;</div>\n");
csv += i18n("Report date range", "%1 through %2").tqarg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).tqarg(KGlobal::locale()->formatDate(m_config.toDate(), true));
csv += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true));
csv += TQString("\n");
}

2
kmymoney2/reports/objectinfotable.cpp
Unescape View File

@ -357,7 +357,7 @@ MyMoneyMoney ObjectInfoTable::investmentBalance(const MyMoneyAccount& acc)
val = val.convert(acc.fraction());
value += val;
} catch(MyMoneyException* e) {
qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").tqarg(stock.name(), e->what())).data());
qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data());
delete e;
}
}

200
kmymoney2/reports/pivottable.cpp
Unescape View File

@ -193,7 +193,7 @@ void PivotTable::init(void)
qDebug("ERR: %s thrown in %s(%ld)", e->what().data(), e->file().data(), e->line());
throw e;
}
DEBUG_OUTPUT(TQString("Found %1 matching transactions").tqarg(transactions.count()));
DEBUG_OUTPUT(TQString("Found %1 matching transactions").arg(transactions.count()));
// Include scheduled transactions if required
@ -240,7 +240,7 @@ void PivotTable::init(void)
transactions += tx;
}
DEBUG_OUTPUT(TQString("Added transaction for schedule %1 on %2").tqarg((*it_schedule).id()).tqarg((*it_date).toString()));
DEBUG_OUTPUT(TQString("Added transaction for schedule %1 on %2").arg((*it_schedule).id()).arg((*it_date).toString()));
++it_date;
}
@ -468,7 +468,7 @@ void PivotTable::collapseColumns(void)
void PivotTable::accumulateColumn(unsigned destcolumn, unsigned sourcecolumn)
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
DEBUG_OUTPUT(TQString("From Column %1 to %2").tqarg(sourcecolumn).tqarg(destcolumn));
DEBUG_OUTPUT(TQString("From Column %1 to %2").arg(sourcecolumn).arg(destcolumn));
// iterate over outer groups
PivotGrid::iterator it_outergroup = m_grid.begin();
@ -483,9 +483,9 @@ void PivotTable::accumulateColumn(unsigned destcolumn, unsigned sourcecolumn)
while ( it_row != (*it_innergroup).end() )
{
if ( (*it_row)[eActual].count() <= sourcecolumn )
throw new MYMONEYEXCEPTION(TQString("Sourcecolumn %1 out of grid range (%2) in PivotTable::accumulateColumn").tqarg(sourcecolumn).tqarg((*it_row)[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Sourcecolumn %1 out of grid range (%2) in PivotTable::accumulateColumn").arg(sourcecolumn).arg((*it_row)[eActual].count()));
if ( (*it_row)[eActual].count() <= destcolumn )
throw new MYMONEYEXCEPTION(TQString("Destcolumn %1 out of grid range (%2) in PivotTable::accumulateColumn").tqarg(sourcecolumn).tqarg((*it_row)[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Destcolumn %1 out of grid range (%2) in PivotTable::accumulateColumn").arg(sourcecolumn).arg((*it_row)[eActual].count()));
(*it_row)[eActual][destcolumn] += (*it_row)[eActual][sourcecolumn];
++it_row;
@ -500,7 +500,7 @@ void PivotTable::accumulateColumn(unsigned destcolumn, unsigned sourcecolumn)
void PivotTable::clearColumn(unsigned column)
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
DEBUG_OUTPUT(TQString("Column %1").tqarg(column));
DEBUG_OUTPUT(TQString("Column %1").arg(column));
// iterate over outer groups
PivotGrid::iterator it_outergroup = m_grid.begin();
@ -515,7 +515,7 @@ void PivotTable::clearColumn(unsigned column)
while ( it_row != (*it_innergroup).end() )
{
if ( (*it_row)[eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::accumulateColumn").tqarg(column).tqarg((*it_row)[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::accumulateColumn").arg(column).arg((*it_row)[eActual].count()));
(*it_row++)[eActual][column] = PivotCell();
}
@ -562,10 +562,10 @@ void PivotTable::calculateColumnHeadings(void)
if (((dow % columnpitch) == 0) || (day == m_endDate))
{
m_columnHeadings.append(TQString("%1&nbsp;%2 - %3&nbsp;%4")
.tqarg(KGlobal::locale()->calendar()->monthName(prv.month(), prv.year(), true))
.tqarg(prv.day())
.tqarg(KGlobal::locale()->calendar()->monthName(day.month(), day.year(), true))
.tqarg(day.day()));
.arg(KGlobal::locale()->calendar()->monthName(prv.month(), prv.year(), true))
.arg(prv.day())
.arg(KGlobal::locale()->calendar()->monthName(day.month(), day.year(), true))
.arg(day.day()));
prv = day.addDays(1);
}
day = day.addDays(1);
@ -626,7 +626,7 @@ void PivotTable::createAccountRows(void)
// and if the report includes this account
if ( m_config_f.includes( *it_account ) )
{
DEBUG_OUTPUT(TQString("Includes account %1").tqarg(account.name()));
DEBUG_OUTPUT(TQString("Includes account %1").arg(account.name()));
// the row group is the account class (major account type)
TQString outergroup = KMyMoneyUtils::accountTypeToString(account.accountGroup());
@ -677,13 +677,13 @@ void PivotTable::calculateOpeningBalances( void )
TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter);
//if a closed account has no transactions in that timeframe, do not include it
if(transactions.size() == 0 ) {
DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").tqarg(account.name()));
DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").arg(account.name()));
++it_account;
continue;
}
}
DEBUG_OUTPUT(TQString("Includes account %1").tqarg(account.name()));
DEBUG_OUTPUT(TQString("Includes account %1").arg(account.name()));
// the row group is the account class (major account type)
TQString outergroup = KMyMoneyUtils::accountTypeToString(account.accountGroup());
@ -699,7 +699,7 @@ void PivotTable::calculateOpeningBalances( void )
}
else
{
DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").tqarg(account.name()));
DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").arg(account.name()));
}
++it_account;
@ -713,7 +713,7 @@ void PivotTable::calculateRunningSums( PivotInnerGroup::iterator& it_row)
while ( column < m_numColumns )
{
if ( it_row.data()[eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").tqarg(column).tqarg(it_row.data()[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").arg(column).arg(it_row.data()[eActual].count()));
runningsum = it_row.data()[eActual][column].calculateRunningSum(runningsum);
@ -742,7 +742,7 @@ void PivotTable::calculateRunningSums( void )
while ( column < m_numColumns )
{
if ( it_row.data()[eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").tqarg(column).tqarg(it_row.data()[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").arg(column).arg(it_row.data()[eActual].count()));
runningsum = ( it_row.data()[eActual][column] += runningsum );
@ -787,9 +787,9 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc
TQString innergroup( row.topParentName() );
if ( m_numColumns <= _column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::cellBalance").tqarg(_column).tqarg(m_numColumns));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::cellBalance").arg(_column).arg(m_numColumns));
if ( m_grid[outergroup][innergroup][row][eActual].count() <= _column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").tqarg(_column).tqarg(m_grid[outergroup][innergroup][row][eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").arg(_column).arg(m_grid[outergroup][innergroup][row][eActual].count()));
MyMoneyMoney balance;
if ( budget )
@ -801,7 +801,7 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc
while ( column < _column)
{
if ( m_grid[outergroup][innergroup][row][eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").tqarg(column).tqarg(m_grid[outergroup][innergroup][row][eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").arg(column).arg(m_grid[outergroup][innergroup][row][eActual].count()));
balance = m_grid[outergroup][innergroup][row][eActual][column].cellBalance(balance);
@ -1009,7 +1009,7 @@ void PivotTable::convertToBaseCurrency( void )
while ( column < m_numColumns )
{
if ( it_row.data()[eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToBaseCurrency").tqarg(column).tqarg(it_row.data()[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToBaseCurrency").arg(column).arg(it_row.data()[eActual].count()));
TQDate valuedate = columnDate(column);
@ -1025,7 +1025,7 @@ void PivotTable::convertToBaseCurrency( void )
//convert to lowest fraction
it_row.data()[ m_rowTypeList[i] ][column] = PivotCell(value.convert(fraction));
DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").tqarg(conversionfactor).tqarg(DEBUG_SENSITIVE(oldval)).tqarg(DEBUG_SENSITIVE(it_row.data()[m_rowTypeList[i]][column].toDouble())));
DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").arg(conversionfactor).arg(DEBUG_SENSITIVE(oldval)).arg(DEBUG_SENSITIVE(it_row.data()[m_rowTypeList[i]][column].toDouble())));
}
}
@ -1058,7 +1058,7 @@ void PivotTable::convertToDeepCurrency( void )
while ( column < m_numColumns )
{
if ( it_row.data()[eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToDeepCurrency").tqarg(column).tqarg(it_row.data()[eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToDeepCurrency").arg(column).arg(it_row.data()[eActual].count()));
TQDate valuedate = columnDate(column);
@ -1085,7 +1085,7 @@ void PivotTable::convertToDeepCurrency( void )
it_row.data()[ePrice][column] = PivotCell(priceValue.convert(10000));
}
DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").tqarg(conversionfactor).tqarg(DEBUG_SENSITIVE(oldval)).tqarg(DEBUG_SENSITIVE(it_row.data()[eActual][column].toDouble())));
DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").arg(conversionfactor).arg(DEBUG_SENSITIVE(oldval)).arg(DEBUG_SENSITIVE(it_row.data()[eActual][column].toDouble())));
++column;
}
@ -1139,9 +1139,9 @@ void PivotTable::calculateTotals( void )
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
if ( it_row.data()[ m_rowTypeList[i] ].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, row columns").tqarg(column).tqarg(it_row.data()[ m_rowTypeList[i] ].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, row columns").arg(column).arg(it_row.data()[ m_rowTypeList[i] ].count()));
if ( (*it_innergroup).m_total[ m_rowTypeList[i] ].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
//calculate total
MyMoneyMoney value = it_row.data()[ m_rowTypeList[i] ][column];
@ -1162,9 +1162,9 @@ void PivotTable::calculateTotals( void )
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
if ( (*it_innergroup).m_total[ m_rowTypeList[i] ].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
if ( (*it_outergroup).m_total[ m_rowTypeList[i] ].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, outer group totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, outer group totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
//calculate totals
MyMoneyMoney value = (*it_innergroup).m_total[ m_rowTypeList[i] ][column];
@ -1187,7 +1187,7 @@ void PivotTable::calculateTotals( void )
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
if ( m_grid.m_total[ m_rowTypeList[i] ].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count()));
//calculate actual totals
MyMoneyMoney value = (*it_outergroup).m_total[ m_rowTypeList[i] ][column];
@ -1215,7 +1215,7 @@ void PivotTable::calculateTotals( void )
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
if ( m_grid.m_total[ m_rowTypeList[i] ].count() <= totalcolumn )
throw new MYMONEYEXCEPTION(TQString("Total column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").tqarg(totalcolumn).tqarg(m_grid.m_total[ m_rowTypeList[i] ].count()));
throw new MYMONEYEXCEPTION(TQString("Total column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").arg(totalcolumn).arg(m_grid.m_total[ m_rowTypeList[i] ].count()));
//calculate actual totals
MyMoneyMoney value = m_grid.m_total[ m_rowTypeList[i] ][totalcolumn];
@ -1228,7 +1228,7 @@ void PivotTable::calculateTotals( void )
void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _row, unsigned column, MyMoneyMoney value, bool budget, bool stockSplit )
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
DEBUG_OUTPUT(TQString("Parameters: %1,%2,%3,%4,%5").tqarg(outergroup).tqarg(_row.debugName()).tqarg(column).tqarg(DEBUG_SENSITIVE(value.toDouble())).tqarg(budget));
DEBUG_OUTPUT(TQString("Parameters: %1,%2,%3,%4,%5").arg(outergroup).arg(_row.debugName()).arg(column).arg(DEBUG_SENSITIVE(value.toDouble())).arg(budget));
// for budget reports, if this is the actual value, map it to the account which
// holds its budget
@ -1252,9 +1252,9 @@ void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _r
TQString innergroup( row.topParentName() );
if ( m_numColumns <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::assignCell").tqarg(column).tqarg(m_numColumns));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::assignCell").arg(column).arg(m_numColumns));
if ( m_grid[outergroup][innergroup][row][eActual].count() <= column )
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::assignCell").tqarg(column).tqarg(m_grid[outergroup][innergroup][row][eActual].count()));
throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::assignCell").arg(column).arg(m_grid[outergroup][innergroup][row][eActual].count()));
if(!stockSplit) {
// Determine whether the value should be inverted before being placed in the row
@ -1281,19 +1281,19 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row
if ( ! m_grid.contains(outergroup) )
{
DEBUG_OUTPUT(TQString("Adding group [%1]").tqarg(outergroup));
DEBUG_OUTPUT(TQString("Adding group [%1]").arg(outergroup));
m_grid[outergroup] = PivotOuterGroup(m_numColumns);
}
if ( ! m_grid[outergroup].contains(innergroup) )
{
DEBUG_OUTPUT(TQString("Adding group [%1][%2]").tqarg(outergroup).tqarg(innergroup));
DEBUG_OUTPUT(TQString("Adding group [%1][%2]").arg(outergroup).arg(innergroup));
m_grid[outergroup][innergroup] = PivotInnerGroup(m_numColumns);
}
if ( ! m_grid[outergroup][innergroup].contains(row) )
{
DEBUG_OUTPUT(TQString("Adding row [%1][%2][%3]").tqarg(outergroup).tqarg(innergroup).tqarg(row.debugName()));
DEBUG_OUTPUT(TQString("Adding row [%1][%2][%3]").arg(outergroup).arg(innergroup).arg(row.debugName()));
m_grid[outergroup][innergroup][row] = PivotGridRowSet(m_numColumns);
if ( recursive && !row.isTopLevel() )
@ -1325,11 +1325,11 @@ TQString PivotTable::renderCSV( void ) const
// Report Title
//
TQString result = TQString("\"Report: %1\"\n").tqarg(m_config_f.name());
TQString result = TQString("\"Report: %1\"\n").arg(m_config_f.name());
if ( m_config_f.isConvertCurrency() )
result += i18n("All currencies converted to %1\n").tqarg(MyMoneyFile::instance()->baseCurrency().name());
result += i18n("All currencies converted to %1\n").arg(MyMoneyFile::instance()->baseCurrency().name());
else
result += i18n("All values shown in %1 unless otherwise noted\n").tqarg(MyMoneyFile::instance()->baseCurrency().name());
result += i18n("All values shown in %1 unless otherwise noted\n").arg(MyMoneyFile::instance()->baseCurrency().name());
//
// Table Header
@ -1339,10 +1339,10 @@ TQString PivotTable::renderCSV( void ) const
unsigned column = 1;
while ( column < m_numColumns )
result += TQString(",%1").tqarg(TQString(m_columnHeadings[column++]));
result += TQString(",%1").arg(TQString(m_columnHeadings[column++]));
if ( m_config_f.isShowingRowTotals() )
result += TQString(",%1").tqarg(i18n("Total"));
result += TQString(",%1").arg(i18n("Total"));
result += "\n";
@ -1396,14 +1396,14 @@ TQString PivotTable::renderCSV( void ) const
//show columns
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
isUsed |= it_row.data()[ m_rowTypeList[i] ][column].isUsed();
rowdata += TQString(",\"%1\"").tqarg(it_row.data()[ m_rowTypeList[i] ][column].formatMoney(fraction, false));
rowdata += TQString(",\"%1\"").arg(it_row.data()[ m_rowTypeList[i] ][column].formatMoney(fraction, false));
}
column++;
}
if ( m_config_f.isShowingRowTotals() ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i)
rowdata += TQString(",\"%1\"").tqarg((*it_row)[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
rowdata += TQString(",\"%1\"").arg((*it_row)[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
}
//
@ -1417,7 +1417,7 @@ TQString PivotTable::renderCSV( void ) const
// current row contains a foreign currency, then we append the currency
// to the name of the account
if (!m_config_f.isConvertCurrency() && rowname.isForeignCurrency() )
innergroupdata += TQString(" (%1)").tqarg(rowname.currencyId());
innergroupdata += TQString(" (%1)").arg(rowname.currencyId());
innergroupdata += "\"";
@ -1461,7 +1461,7 @@ TQString PivotTable::renderCSV( void ) const
finalRow = "\"" + TQString().fill(' ',rowname.hierarchyDepth() - 1) + rowname.name();
if (!m_config_f.isConvertCurrency() && rowname.isForeignCurrency() )
finalRow += TQString(" (%1)").tqarg(rowname.currencyId());
finalRow += TQString(" (%1)").arg(rowname.currencyId());
finalRow += "\"";
}
@ -1477,14 +1477,14 @@ TQString PivotTable::renderCSV( void ) const
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
isUsed |= (*it_innergroup).m_total[ m_rowTypeList[i] ][column].isUsed();
finalRow += TQString(",\"%1\"").tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false));
finalRow += TQString(",\"%1\"").arg((*it_innergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false));
}
column++;
}
if ( m_config_f.isShowingRowTotals() ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i)
finalRow += TQString(",\"%1\"").tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
finalRow += TQString(",\"%1\"").arg((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
}
finalRow += "\n";
@ -1504,18 +1504,18 @@ TQString PivotTable::renderCSV( void ) const
if ( m_config_f.isShowingColumnTotals() )
{
result += TQString("%1 %2").tqarg(i18n("Total")).tqarg(it_outergroup.key());
result += TQString("%1 %2").arg(i18n("Total")).arg(it_outergroup.key());
unsigned column = 1;
while ( column < m_numColumns ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i)
result += TQString(",\"%1\"").tqarg((*it_outergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false));
result += TQString(",\"%1\"").arg((*it_outergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false));
column++;
}
if ( m_config_f.isShowingRowTotals() ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i)
result += TQString(",\"%1\"").tqarg((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
result += TQString(",\"%1\"").arg((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
}
result += "\n";
@ -1533,14 +1533,14 @@ TQString PivotTable::renderCSV( void ) const
unsigned totalcolumn = 1;
while ( totalcolumn < m_numColumns ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i)
result += TQString(",\"%1\"").tqarg(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn].formatMoney(fraction, false));
result += TQString(",\"%1\"").arg(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn].formatMoney(fraction, false));
totalcolumn++;
}
if ( m_config_f.isShowingRowTotals() ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i)
result += TQString(",\"%1\"").tqarg(m_grid.m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
result += TQString(",\"%1\"").arg(m_grid.m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false));
}
result += "\n";
@ -1553,26 +1553,26 @@ TQString PivotTable::renderHTML( void ) const
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
TQString colspan = TQString(" colspan=\"%1\"").tqarg(m_numColumns + 1 + (m_config_f.isShowingRowTotals() ? 1 : 0) );
TQString colspan = TQString(" colspan=\"%1\"").arg(m_numColumns + 1 + (m_config_f.isShowingRowTotals() ? 1 : 0) );
//
// Report Title
//
TQString result = TQString("<h2 class=\"report\">%1</h2>\n").tqarg(m_config_f.name());
TQString result = TQString("<h2 class=\"report\">%1</h2>\n").arg(m_config_f.name());
//actual dates of the report
result += TQString("<div class=\"subtitle\">");
result += i18n("Report date range", "%1 through %2").tqarg(KGlobal::locale()->formatDate(m_config_f.fromDate(), true)).tqarg(KGlobal::locale()->formatDate(m_config_f.toDate(), true));
result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config_f.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config_f.toDate(), true));
result += TQString("</div>\n");
result += TQString("<div class=\"gap\">&nbsp;</div>\n");
//currency conversion message
result += TQString("<div class=\"subtitle\">");
if ( m_config_f.isConvertCurrency() )
result += i18n("All currencies converted to %1").tqarg(MyMoneyFile::instance()->baseCurrency().name());
result += i18n("All currencies converted to %1").arg(MyMoneyFile::instance()->baseCurrency().name());
else
result += i18n("All values shown in %1 unless otherwise noted").tqarg(MyMoneyFile::instance()->baseCurrency().name());
result += i18n("All values shown in %1 unless otherwise noted").arg(MyMoneyFile::instance()->baseCurrency().name());
result += TQString("</div>\n");
result += TQString("<div class=\"gap\">&nbsp;</div>\n");
@ -1585,19 +1585,19 @@ TQString PivotTable::renderHTML( void ) const
// Table Header
//
result += TQString("\n\n<table class=\"report\" cellspacing=\"0\">\n"
"<thead><tr class=\"itemheader\">\n<th>%1</th>").tqarg(i18n("Account"));
"<thead><tr class=\"itemheader\">\n<th>%1</th>").arg(i18n("Account"));
TQString headerspan;
int span = m_rowTypeList.size();
headerspan = TQString(" colspan=\"%1\"").tqarg(span);
headerspan = TQString(" colspan=\"%1\"").arg(span);
unsigned column = 1;
while ( column < m_numColumns )
result += TQString("<th%1>%2</th>").tqarg(headerspan,TQString(m_columnHeadings[column++]).replace(TQRegExp(" "),"<br>"));
result += TQString("<th%1>%2</th>").arg(headerspan,TQString(m_columnHeadings[column++]).replace(TQRegExp(" "),"<br>"));
if ( m_config_f.isShowingRowTotals() )
result += TQString("<th%1>%2</th>").tqarg(headerspan).tqarg(i18n("Total"));
result += TQString("<th%1>%2</th>").arg(headerspan).arg(i18n("Total"));
result += "</tr></thead>\n";
@ -1617,16 +1617,16 @@ TQString PivotTable::renderHTML( void ) const
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
result += TQString("<td%2>%1</td>")
.tqarg(i18n( m_columnTypeHeaderList[i] ))
.tqarg(i == 0 ? lb : TQString() );
.arg(i18n( m_columnTypeHeaderList[i] ))
.arg(i == 0 ? lb : TQString() );
}
column++;
}
if ( m_config_f.isShowingRowTotals() ) {
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
result += TQString("<td%2>%1</td>")
.tqarg(i18n( m_columnTypeHeaderList[i] ))
.tqarg(i == 0 ? leftborder : TQString() );
.arg(i18n( m_columnTypeHeaderList[i] ))
.arg(i == 0 ? leftborder : TQString() );
}
}
result += "</tr>";
@ -1667,7 +1667,7 @@ TQString PivotTable::renderHTML( void ) const
// Outer Group Header
//
result += TQString("<tr class=\"sectionheader\"><td class=\"left\"%1>%2</td></tr>\n").tqarg(colspan).tqarg((*it_outergroup).m_displayName);
result += TQString("<tr class=\"sectionheader\"><td class=\"left\"%1>%2</td></tr>\n").arg(colspan).arg((*it_outergroup).m_displayName);
// Skip the inner groups if the report only calls for outer group totals to be shown
if ( m_config_f.detailLevel() != MyMoneyReport::eDetailGroup )
@ -1704,8 +1704,8 @@ TQString PivotTable::renderHTML( void ) const
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
rowdata += TQString("<td%2>%1</td>")
.tqarg(coloredAmount(it_row.data()[ m_rowTypeList[i] ][column]))
.tqarg(i == 0 ? lb : TQString());
.arg(coloredAmount(it_row.data()[ m_rowTypeList[i] ][column]))
.arg(i == 0 ? lb : TQString());
isUsed |= it_row.data()[ m_rowTypeList[i] ][column].isUsed();
}
@ -1717,8 +1717,8 @@ TQString PivotTable::renderHTML( void ) const
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
rowdata += TQString("<td%2>%1</td>")
.tqarg(coloredAmount(it_row.data()[ m_rowTypeList[i] ].m_total))
.tqarg(i == 0 ? leftborder : TQString());
.arg(coloredAmount(it_row.data()[ m_rowTypeList[i] ].m_total))
.arg(i == 0 ? leftborder : TQString());
}
}
@ -1731,12 +1731,12 @@ TQString PivotTable::renderHTML( void ) const
// don't show closed accounts if they have not been used
if(!rowname.isClosed() || isUsed) {
innergroupdata += TQString("<tr class=\"row-%1\"%2><td%3 class=\"left\" style=\"text-indent: %4.0em\">%5%6</td>")
.tqarg(rownum & 0x01 ? "even" : "odd")
.tqarg(rowname.isTopLevel() ? " id=\"topparent\"" : "")
.tqarg("") //.tqarg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank
.tqarg(rowname.hierarchyDepth() - 1)
.tqarg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
.tqarg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").tqarg(rowname.currency().id()));
.arg(rownum & 0x01 ? "even" : "odd")
.arg(rowname.isTopLevel() ? " id=\"topparent\"" : "")
.arg("") //.arg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank
.arg(rowname.hierarchyDepth() - 1)
.arg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
.arg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").arg(rowname.currency().id()));
// Don't print this row if it's going to be all zeros
// TODO: Uncomment this, and deal with the case where the data
@ -1766,8 +1766,8 @@ TQString PivotTable::renderHTML( void ) const
{
// Start the TOTALS row
finalRow = TQString("<tr class=\"row-%1\" id=\"subtotal\"><td class=\"left\">&nbsp;&nbsp;%2</td>")
.tqarg(rownum & 0x01 ? "even" : "odd")
.tqarg(i18n("Total"));
.arg(rownum & 0x01 ? "even" : "odd")
.arg(i18n("Total"));
// don't suppress display of totals
isUsed = true;
}
@ -1788,11 +1788,11 @@ TQString PivotTable::renderHTML( void ) const
ReportAccount rowname = (*it_innergroup).begin().key();
isUsed |= !rowname.isClosed();
finalRow = TQString("<tr class=\"row-%1\"%2><td class=\"left\" style=\"text-indent: %3.0em;\">%5%6</td>")
.tqarg(rownum & 0x01 ? "even" : "odd")
.tqarg( m_config_f.detailLevel() == MyMoneyReport::eDetailAll ? "id=\"solo\"" : "" )
.tqarg(rowname.hierarchyDepth() - 1)
.tqarg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
.tqarg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").tqarg(rowname.currency().id()));
.arg(rownum & 0x01 ? "even" : "odd")
.arg( m_config_f.detailLevel() == MyMoneyReport::eDetailAll ? "id=\"solo\"" : "" )
.arg(rowname.hierarchyDepth() - 1)
.arg(rowname.name().replace(TQRegExp(" "), "&nbsp;"))
.arg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").arg(rowname.currency().id()));
}
// Finish the row started above, unless told not to
@ -1808,8 +1808,8 @@ TQString PivotTable::renderHTML( void ) const
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
finalRow += TQString("<td%2>%1</td>")
.tqarg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ][column]))
.tqarg(i == 0 ? lb : TQString());
.arg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ][column]))
.arg(i == 0 ? lb : TQString());
isUsed |= (*it_innergroup).m_total[ m_rowTypeList[i] ][column].isUsed();
}
@ -1820,8 +1820,8 @@ TQString PivotTable::renderHTML( void ) const
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
finalRow += TQString("<td%2>%1</td>")
.tqarg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total))
.tqarg(i == 0 ? leftborder : TQString());
.arg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total))
.arg(i == 0 ? leftborder : TQString());
}
}
@ -1844,7 +1844,7 @@ TQString PivotTable::renderHTML( void ) const
if ( m_config_f.isShowingColumnTotals() )
{
result += TQString("<tr class=\"sectionfooter\"><td class=\"left\">%1&nbsp;%2</td>").tqarg(i18n("Total")).tqarg((*it_outergroup).m_displayName);
result += TQString("<tr class=\"sectionfooter\"><td class=\"left\">%1&nbsp;%2</td>").arg(i18n("Total")).arg((*it_outergroup).m_displayName);
unsigned column = 1;
while ( column < m_numColumns )
{
@ -1854,8 +1854,8 @@ TQString PivotTable::renderHTML( void ) const
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
result += TQString("<td%2>%1</td>")
.tqarg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ][column]))
.tqarg(i == 0 ? lb : TQString());
.arg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ][column]))
.arg(i == 0 ? lb : TQString());
}
column++;
@ -1865,8 +1865,8 @@ TQString PivotTable::renderHTML( void ) const
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
result += TQString("<td%2>%1</td>")
.tqarg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total))
.tqarg(i == 0 ? leftborder : TQString());
.arg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total))
.arg(i == 0 ? leftborder : TQString());
}
}
result += "</tr>\n";
@ -1885,7 +1885,7 @@ TQString PivotTable::renderHTML( void ) const
if ( m_config_f.isShowingColumnTotals() )
{
result += TQString("<tr class=\"spacer\"><td>&nbsp;</td></tr>\n");
result += TQString("<tr class=\"reportfooter\"><td class=\"left\">%1</td>").tqarg(i18n("Grand Total"));
result += TQString("<tr class=\"reportfooter\"><td class=\"left\">%1</td>").arg(i18n("Grand Total"));
unsigned totalcolumn = 1;
while ( totalcolumn < m_numColumns )
{
@ -1895,8 +1895,8 @@ TQString PivotTable::renderHTML( void ) const
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
result += TQString("<td%2>%1</td>")
.tqarg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn]))
.tqarg(i == 0 ? lb : TQString());
.arg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn]))
.arg(i == 0 ? lb : TQString());
}
totalcolumn++;
@ -1906,8 +1906,8 @@ TQString PivotTable::renderHTML( void ) const
{
for(unsigned i = 0; i < m_rowTypeList.size(); ++i) {
result += TQString("<td%2>%1</td>")
.tqarg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ].m_total))
.tqarg(i == 0 ? leftborder : TQString());
.arg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ].m_total))
.arg(i == 0 ? leftborder : TQString());
}
}
@ -2275,9 +2275,9 @@ TQString PivotTable::coloredAmount(const MyMoneyMoney& amount, const TQString& c
TQString result;
if( amount.isNegative() )
result += TQString("<font color=\"rgb(%1,%2,%3)\">")
.tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().red())
.tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().green())
.tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().blue());
.arg(KMyMoneyGlobalSettings::listNegativeValueColor().red())
.arg(KMyMoneyGlobalSettings::listNegativeValueColor().green())
.arg(KMyMoneyGlobalSettings::listNegativeValueColor().blue());
result += amount.formatMoney(currencySymbol, prec);
if( amount.isNegative() )
result += TQString("</font>");

2
kmymoney2/reports/pivottabletest.cpp
Unescape View File

@ -1003,7 +1003,7 @@ void PivotTableTest::testBudget(void)
// - Totals for D, D:1, D:2 show up. D:2:a and D:2:b do not
// - D actuals (only) compare against D budget
// - Ditto for D:1
// - D:2 acutals and tqchildren compare against D:2 budget
// - D:2 acutals and children compare against D:2 budget
// 5. Budget on E, no transactions on E
{

26
kmymoney2/reports/querytable.cpp
Unescape View File

@ -432,8 +432,8 @@ void QueryTable::constructTransactionTable(void)
qA["commodity"] = qS["commodity"] = (* it_transaction).commodity();
pd = (* it_transaction).postDate();
qA["month"] = qS["month"] = i18n("Month of %1").tqarg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate));
qA["week"] = qS["week"] = i18n("Week of %1").tqarg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate));
qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate));
qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate));
qA["currency"] = qS["currency"] = "";
@ -671,7 +671,7 @@ void QueryTable::constructTransactionTable(void)
//--- default case includes all transaction details
else {
//this is when the splits are going to be shown as tqchildren of the main split
//this is when the splits are going to be shown as children of the main split
if ((splits.count() > 2) && use_summary) {
qA["value"] = "";
@ -693,8 +693,8 @@ void QueryTable::constructTransactionTable(void)
if (! splitAcc.isIncomeExpense()) {
qA["category"] = ((*it_split).shares().isNegative()) ?
i18n("Transfer from %1").tqarg(splitAcc.fullName())
: i18n("Transfer to %1").tqarg(splitAcc.fullName());
i18n("Transfer from %1").arg(splitAcc.fullName())
: i18n("Transfer to %1").arg(splitAcc.fullName());
qA["topcategory"] = splitAcc.topParentName();
qA["categorytype"] = i18n("Transfer");
}
@ -735,8 +735,8 @@ void QueryTable::constructTransactionTable(void)
qS["topaccount"] = splitAcc.topParentName();
qS["category"] = ((*it_split).shares().isNegative())
? i18n("Transfer to %1").tqarg(a_fullname)
: i18n("Transfer from %1").tqarg(a_fullname);
? i18n("Transfer to %1").arg(a_fullname)
: i18n("Transfer from %1").arg(a_fullname);
qS["institution"] = institution.isEmpty()
? i18n("No Institution")
@ -1209,8 +1209,8 @@ void QueryTable::constructSplitsTable(void)
qA["commodity"] = qS["commodity"] = (* it_transaction).commodity();
pd = (* it_transaction).postDate();
qA["month"] = qS["month"] = i18n("Month of %1").tqarg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate));
qA["week"] = qS["week"] = i18n("Week of %1").tqarg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate));
qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate));
qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate));
qA["currency"] = qS["currency"] = "";
@ -1364,8 +1364,8 @@ void QueryTable::constructSplitsTable(void)
//fill in account information
if (! splitAcc.isIncomeExpense() && it_split != myBegin) {
qA["account"] = ((*it_split).shares().isNegative()) ?
i18n("Transfer to %1").tqarg(myBeginAcc.fullName())
: i18n("Transfer from %1").tqarg(myBeginAcc.fullName());
i18n("Transfer to %1").arg(myBeginAcc.fullName())
: i18n("Transfer from %1").arg(myBeginAcc.fullName());
} else if (it_split == myBegin ) {
//handle the main split
if((splits.count() > 2)) {
@ -1383,8 +1383,8 @@ void QueryTable::constructSplitsTable(void)
ReportAccount tempSplitAcc = (*tempSplit).accountId();
if (! tempSplitAcc.isIncomeExpense()) {
qA["account"] = ((*it_split).shares().isNegative()) ?
i18n("Transfer to %1").tqarg(tempSplitAcc.fullName())
: i18n("Transfer from %1").tqarg(tempSplitAcc.fullName());
i18n("Transfer to %1").arg(tempSplitAcc.fullName())
: i18n("Transfer from %1").arg(tempSplitAcc.fullName());
} else {
qA["account"] = tempSplitAcc.fullName();
}

34
kmymoney2/reports/reportaccount.cpp
Unescape View File

@ -56,7 +56,7 @@ ReportAccount::ReportAccount( const TQString& accountid ):
MyMoneyAccount( MyMoneyFile::instance()->account(accountid) )
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
DEBUG_OUTPUT(TQString("Account %1").tqarg(accountid));
DEBUG_OUTPUT(TQString("Account %1").arg(accountid));
calculateAccountHierarchy();
}
@ -64,7 +64,7 @@ ReportAccount::ReportAccount( const MyMoneyAccount& account ):
MyMoneyAccount( account )
{
DEBUG_ENTER(__PRETTY_FUNCTION__);
DEBUG_OUTPUT(TQString("Account %1").tqarg(account.id()));
DEBUG_OUTPUT(TQString("Account %1").arg(account.id()));
calculateAccountHierarchy();
}
@ -112,17 +112,17 @@ MyMoneyMoney ReportAccount::deepCurrencyPrice( const TQDate& date ) const
result = price.rate(undersecurity.tradingCurrency());
DEBUG_OUTPUT(TQString("Converting under %1 to deep %2, price on %3 is %4")
.tqarg(undersecurity.name())
.tqarg(file->security(undersecurity.tradingCurrency()).name())
.tqarg(date.toString())
.tqarg(result.toDouble()));
.arg(undersecurity.name())
.arg(file->security(undersecurity.tradingCurrency()).name())
.arg(date.toString())
.arg(result.toDouble()));
}
else
{
DEBUG_OUTPUT(TQString("No price to convert under %1 to deep %2 on %3")
.tqarg(undersecurity.name())
.tqarg(file->security(undersecurity.tradingCurrency()).name())
.tqarg(date.toString()));
.arg(undersecurity.name())
.arg(file->security(undersecurity.tradingCurrency()).name())
.arg(date.toString()));
}
}
@ -181,17 +181,17 @@ MyMoneyMoney ReportAccount::foreignCurrencyPrice( const TQString foreignCurrency
{
result = price.rate(tradingCurrency);
DEBUG_OUTPUT(TQString("Converting deep %1 to currency %2, price on %3 is %4")
.tqarg(file->currency(currency().id()).name())
.tqarg(file->currency(foreignCurrency).name())
.tqarg(date.toString())
.tqarg(result.toDouble()));
.arg(file->currency(currency().id()).name())
.arg(file->currency(foreignCurrency).name())
.arg(date.toString())
.arg(result.toDouble()));
}
else
{
DEBUG_OUTPUT(TQString("No price to convert deep %1 to currency %2 on %3")
.tqarg(file->currency(currency().id()).name())
.tqarg(file->currency(foreignCurrency).name())
.tqarg(date.toString()));
.arg(file->currency(currency().id()).name())
.arg(file->currency(foreignCurrency).name())
.arg(date.toString()));
}
}
return result;
@ -265,7 +265,7 @@ bool ReportAccount::operator<(const ReportAccount& second) const
if ( !haveresult && ( it_second != second.m_nameHierarchy.end() ) )
result = true;
// DEBUG_OUTPUT(TQString("%1 < %2 is %3").tqarg(debugName(),second.debugName()).tqarg(result));
// DEBUG_OUTPUT(TQString("%1 < %2 is %3").arg(debugName(),second.debugName()).arg(result));
return result;
}

12
kmymoney2/reports/reportstestcommon.cpp
Unescape View File

@ -319,7 +319,7 @@ void writeTabletoHTML( const PivotTable& table, const TQString& _filename )
TQString filename = _filename;
if ( filename.isEmpty() )
{
filename = TQString("report-%1%2.html").tqarg((filenumber<10)?"0":"").tqarg(filenumber);
filename = TQString("report-%1%2.html").arg((filenumber<10)?"0":"").arg(filenumber);
++filenumber;
}
@ -336,7 +336,7 @@ void writeTabletoHTML( const QueryTable& table, const TQString& _filename )
TQString filename = _filename;
if ( filename.isEmpty() )
{
filename = TQString("report-%1%2.html").tqarg((filenumber<10)?"0":"").tqarg(filenumber);
filename = TQString("report-%1%2.html").arg((filenumber<10)?"0":"").arg(filenumber);
++filenumber;
}
@ -352,7 +352,7 @@ void writeTabletoCSV( const PivotTable& table, const TQString& _filename )
TQString filename = _filename;
if ( filename.isEmpty() )
{
filename = TQString("report-%1%2.csv").tqarg((filenumber<10)?"0":"").tqarg(filenumber);
filename = TQString("report-%1%2.csv").arg((filenumber<10)?"0":"").arg(filenumber);
++filenumber;
}
@ -369,7 +369,7 @@ void writeTabletoCSV( const QueryTable& table, const TQString& _filename )
TQString filename = _filename;
if ( filename.isEmpty() )
{
filename = TQString("qreport-%1%2.csv").tqarg((filenumber<10)?"0":"").tqarg(filenumber);
filename = TQString("qreport-%1%2.csv").arg((filenumber<10)?"0":"").arg(filenumber);
++filenumber;
}
@ -385,7 +385,7 @@ void writeRCFtoXML( const MyMoneyReport& filter, const TQString& _filename )
static unsigned filenum = 1;
TQString filename = _filename;
if ( filename.isEmpty() ) {
filename = TQString("report-%1%2.xml").tqarg(TQString::number(filenum).rightJustify(2, '0'));
filename = TQString("report-%1%2.xml").arg(TQString::number(filenum).rightJustify(2, '0'));
++filenum;
}
@ -481,7 +481,7 @@ void XMLandback( MyMoneyReport& filter )
MyMoneyMoney searchHTML(const TQString& _html, const TQString& _search)
{
TQRegExp re(TQString("%1[<>/td]*([\\-.0-9,]*)").tqarg(_search));
TQRegExp re(TQString("%1[<>/td]*([\\-.0-9,]*)").arg(_search));
re.search(_html);
TQString found = re.cap(1);
found.remove(',');

4
kmymoney2/views/kaccountsview.cpp
Unescape View File

@ -241,7 +241,7 @@ void KAccountsView::loadIconView(void)
file->accountList(alist);
TQValueList<MyMoneyAccount>::const_iterator it_a;
for(it_a = alist.begin(); it_a != alist.end(); ++it_a) {
accountMap[TQString("%1-%2").tqarg((*it_a).name()).tqarg((*it_a).id())] = *it_a;
accountMap[TQString("%1-%2").arg((*it_a).name()).arg((*it_a).id())] = *it_a;
}
bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked()
@ -583,7 +583,7 @@ void KAccountsView::slotOpenObject(TQIconViewItem* item)
TQString KAccountsView::point(const TQPoint& val) const
{
return TQString("%1;%2").tqarg(val.x()).tqarg(val.y());
return TQString("%1;%2").arg(val.x()).arg(val.y());
}
TQPoint KAccountsView::point(const TQString& val) const

2
kmymoney2/views/kaccountsviewdecl.ui
Unescape View File

@ -176,7 +176,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

14
kmymoney2/views/kbudgetview.cpp
Unescape View File

@ -66,7 +66,7 @@ KBudgetListItem::KBudgetListItem(KListView *parent, const MyMoneyBudget& budget)
m_budget(budget)
{
setText(0, budget.name());
setText(1, TQString("%1").tqarg(budget.budgetStart().year()));
setText(1, TQString("%1").arg(budget.budgetStart().year()));
// allow in column rename
setRenameEnabled(0, true);
@ -485,8 +485,8 @@ void KBudgetView::askSave(void)
// check if the content of a currently selected budget was modified
// and ask to store the data
if (m_updateButton->isEnabled()) {
if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").tqarg(
i18n("Do you want to save the changes for <b>%1</b>").tqarg(m_budget.name())),
if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").arg(
i18n("Do you want to save the changes for <b>%1</b>").arg(m_budget.name())),
i18n("Save changes")) == KMessageBox::Yes) {
m_inSelection = true;
slotUpdateBudget();
@ -609,7 +609,7 @@ void KBudgetView::slotRenameBudget(TQListViewItem* p , int /*col*/, const TQStri
if (KMessageBox::questionYesNo(this,
i18n("A budget with the name '%1' already exists. It is not advisable to have "
"multiple budgets with the same identification name. Are you sure you would like "
"to rename the budget?").tqarg(new_name)) != KMessageBox::Yes)
"to rename the budget?").arg(new_name)) != KMessageBox::Yes)
{
p->setText(0,pBudget->budget().name());
return;
@ -633,7 +633,7 @@ void KBudgetView::slotRenameBudget(TQListViewItem* p , int /*col*/, const TQStri
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to modify budget"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
}
@ -734,7 +734,7 @@ void KBudgetView::slotResetBudget(void)
loadAccounts();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to reset budget"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
}
@ -748,7 +748,7 @@ void KBudgetView::slotUpdateBudget(void)
slotRefreshHideUnusedButton();
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to modify budget"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
}

2
kmymoney2/views/kcategoriesview.h
Unescape View File

@ -45,7 +45,7 @@ class KListViewSearchLineWidget;
* @author Michael Edwardes, Thomas Baumgart
*
* While named "categories view", this view actually displays all accounts
* that are tqchildren of the global "Income" and "Expense" accounts. Even though
* that are children of the global "Income" and "Expense" accounts. Even though
* categories are internally just accounts as well, the distinction between
* categories and accounts in the user interface is done for better
* usability and clarity.

2
kmymoney2/views/kcategoriesviewdecl.ui
Unescape View File

@ -125,7 +125,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

32
kmymoney2/views/kforecastview.cpp
Unescape View File

@ -292,13 +292,13 @@ void KForecastView::loadSummaryView(void)
case -1:
break;
case 0:
msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %2 is below the minimum balance %3 today.").tqarg(acc.name()).tqarg(minBalance.formatMoney(acc, currency));
msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %2 is below the minimum balance %3 today.").arg(acc.name()).arg(minBalance.formatMoney(acc, currency));
msg += TQString("</font>");
break;
default:
msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").tqarg(acc.name()).tqarg(minBalance.formatMoney(acc, currency)).tqarg(dropMinimum-1);
msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").arg(acc.name()).arg(minBalance.formatMoney(acc, currency)).arg(dropMinimum-1);
msg += TQString("</font>");
}
@ -314,25 +314,25 @@ void KForecastView::loadSummaryView(void)
break;
case 0:
if(acc.accountGroup() == MyMoneyAccount::Asset) {
msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %1 is below %2 today.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency));
msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %1 is below %2 today.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency));
msg += TQString("</font>");
break;
}
if(acc.accountGroup() == MyMoneyAccount::Liability) {
msg = i18n("The balance of %1 is above %2 today.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency));
msg = i18n("The balance of %1 is above %2 today.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency));
break;
}
break;
default:
if(acc.accountGroup() == MyMoneyAccount::Asset) {
msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %1 will drop below %2 in %3 days.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency)).tqarg(dropZero);
msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The balance of %1 will drop below %2 in %3 days.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency)).arg(dropZero);
msg += TQString("</font>");
break;
}
if(acc.accountGroup() == MyMoneyAccount::Liability) {
msg = i18n("The balance of %1 will raise above %2 in %3 days.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency)).tqarg(dropZero);
msg = i18n("The balance of %1 will raise above %2 in %3 days.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency)).arg(dropZero);
break;
}
}
@ -344,8 +344,8 @@ void KForecastView::loadSummaryView(void)
msg = TQString();
MyMoneyMoney accCycleVariation = forecast.accountCycleVariation(acc);
if (accCycleVariation < MyMoneyMoney(0, 1)) {
msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The account %1 is decreasing %2 per cycle.").tqarg(acc.name()).tqarg(accCycleVariation.formatMoney(acc, currency));
msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name());
msg += i18n("The account %1 is decreasing %2 per cycle.").arg(acc.name()).arg(accCycleVariation.formatMoney(acc, currency));
msg += TQString("</font>");
}
@ -401,14 +401,14 @@ void KForecastView::loadAdvancedView(void)
//add columns
for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) {
int col = m_advancedList->addColumn(i18n("Min Bal %1").tqarg(i), -1);
int col = m_advancedList->addColumn(i18n("Min Bal %1").arg(i), -1);
m_advancedList->setColumnAlignment(col, TQt::AlignRight);
m_advancedList->addColumn(i18n("Min Date %1").tqarg(i), -1);
m_advancedList->addColumn(i18n("Min Date %1").arg(i), -1);
}
for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) {
int col = m_advancedList->addColumn(i18n("Max Bal %1").tqarg(i), -1);
int col = m_advancedList->addColumn(i18n("Max Bal %1").arg(i), -1);
m_advancedList->setColumnAlignment(col, TQt::AlignRight);
m_advancedList->addColumn(i18n("Max Date %1").tqarg(i), -1);
m_advancedList->addColumn(i18n("Max Date %1").arg(i), -1);
}
int col = m_advancedList->addColumn(i18n("Average"), -1);
m_advancedList->setColumnAlignment(col, TQt::AlignRight);

18
kmymoney2/views/kgloballedgerview.cpp
Unescape View File

@ -652,11 +652,11 @@ void KGlobalLedgerView::loadView(void)
arg(paymentAmount[m_account.id()].abs().formatMoney(m_account.fraction())) );
}
if(pStatement) {
pStatement->setText(i18n("%1 payments (%2)").tqarg(payments[m_account.id()]).
pStatement->setText(i18n("%1 payments (%2)").arg(payments[m_account.id()]).
arg(paymentAmount[m_account.id()].abs().formatMoney(m_account.fraction())) );
}
if(dStatement) {
dStatement->setText(i18n("%1 deposits (%2)").tqarg(deposits[m_account.id()]).
dStatement->setText(i18n("%1 deposits (%2)").arg(deposits[m_account.id()]).
arg(depositAmount[m_account.id()].abs().formatMoney(m_account.fraction())) );
}
@ -724,24 +724,24 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& a
if(isReconciliationAccount()) {
if(m_account.accountType() != MyMoneyAccount::Investment) {
m_leftSummaryLabel->setText(i18n("Statement: %1").tqarg(d->m_endingBalance.formatMoney("", d->m_precision)));
m_centerSummaryLabel->setText(i18n("Cleared: %1").tqarg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
m_rightSummaryLabel->setText(i18n("Difference: %1").tqarg((clearedBalance[m_account.id()] - d->m_endingBalance).formatMoney("", d->m_precision)));
m_leftSummaryLabel->setText(i18n("Statement: %1").arg(d->m_endingBalance.formatMoney("", d->m_precision)));
m_centerSummaryLabel->setText(i18n("Cleared: %1").arg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
m_rightSummaryLabel->setText(i18n("Difference: %1").arg((clearedBalance[m_account.id()] - d->m_endingBalance).formatMoney("", d->m_precision)));
}
} else {
// update summary line in normal mode
TQDate reconcileDate = m_account.lastReconciliationDate();
if(reconcileDate.isValid()) {
m_leftSummaryLabel->setText(i18n("Last reconciled: %1").tqarg(KGlobal::locale()->formatDate(reconcileDate, true)));
m_leftSummaryLabel->setText(i18n("Last reconciled: %1").arg(KGlobal::locale()->formatDate(reconcileDate, true)));
} else {
m_leftSummaryLabel->setText(i18n("Never reconciled"));
}
m_rightSummaryLabel->setPaletteForegroundColor(m_leftSummaryLabel->paletteForegroundColor());
if(m_account.accountType() != MyMoneyAccount::Investment) {
m_centerSummaryLabel->setText(i18n("Cleared: %1").tqarg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
m_rightSummaryLabel->setText(i18n("Balance: %1").tqarg(actBalance[m_account.id()].formatMoney("", d->m_precision)));
m_centerSummaryLabel->setText(i18n("Cleared: %1").arg(clearedBalance[m_account.id()].formatMoney("", d->m_precision)));
m_rightSummaryLabel->setText(i18n("Balance: %1").arg(actBalance[m_account.id()].formatMoney("", d->m_precision)));
bool showNegative = actBalance[m_account.id()].isNegative();
if(m_account.accountGroup() == MyMoneyAccount::Liability && !actBalance[m_account.id()].isZero())
showNegative = !showNegative;
@ -775,7 +775,7 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& a
}
balance += ((*it_b) * rate).convert(base.smallestAccountFraction());
}
m_rightSummaryLabel->setText(i18n("Investment value: %1%2").tqarg(approx ? "~" : "").tqarg(balance.formatMoney(base.tradingSymbol(), d->m_precision)));
m_rightSummaryLabel->setText(i18n("Investment value: %1%2").arg(approx ? "~" : "").arg(balance.formatMoney(base.tradingSymbol(), d->m_precision)));
}
}
}

156
kmymoney2/views/khomeview.cpp
Unescape View File

@ -101,10 +101,10 @@ void KHomeView::Private::addNameIndex(TQMap<TQString, MyMoneyAccount> &idx, cons
} else if(idx[key].id() != account.id()) {
key = account.name() + "[%1]";
int dup = 2;
while(!idx[key.tqarg(dup)].id().isEmpty()
&& idx[key.tqarg(dup)].id() != account.id())
while(!idx[key.arg(dup)].id().isEmpty()
&& idx[key.arg(dup)].id() != account.id())
++dup;
idx[key.tqarg(dup)] = account;
idx[key.arg(dup)] = account;
}
}
@ -215,7 +215,7 @@ void KHomeView::loadView(void)
m_forecast.setForecastDone(false);
TQString filename = KGlobal::dirs()->findResource("appdata", "html/kmymoney2.css");
TQString header = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\n").tqarg(filename);
TQString header = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\n").arg(filename);
header += KMyMoneyUtils::variableCSS();
@ -226,7 +226,7 @@ void KHomeView::loadView(void)
m_part->begin();
m_part->write(header);
m_part->write(TQString("<div id=\"summarytitle\">%1</div>").tqarg(i18n("Your Financial Summary")));
m_part->write(TQString("<div id=\"summarytitle\">%1</div>").arg(i18n("Your Financial Summary")));
TQStringList settings = KMyMoneyGlobalSettings::itemList();
@ -291,7 +291,7 @@ void KHomeView::loadView(void)
void KHomeView::showNetWorthGraph(void)
{
#ifdef HAVE_KDCHART
m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\">&nbsp;</div>\n").tqarg(i18n("Networth Forecast")));
m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\">&nbsp;</div>\n").arg(i18n("Networth Forecast")));
MyMoneyReport reportCfg = MyMoneyReport(
MyMoneyReport::eAssetLiability,
@ -361,7 +361,7 @@ void KHomeView::showNetWorthGraph(void)
m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >");
m_part->write("<tr>");
m_part->write(TQString("<td><center><IMG SRC=\"data:image/png;base64,%1\" ALT=\"Networth\"></center></td>").tqarg(TQString(KCodecs::base64Encode(ba))));
m_part->write(TQString("<td><center><IMG SRC=\"data:image/png;base64,%1\" ALT=\"Networth\"></center></td>").arg(TQString(KCodecs::base64Encode(ba))));
m_part->write("</tr>");
m_part->write("</table></div></div>");
@ -422,7 +422,7 @@ void KHomeView::showPayments(void)
}
m_part->write("<div class=\"shadow\"><div class=\"displayblock\">");
m_part->write(TQString("<div class=\"summaryheader\">%1</div>\n").tqarg(i18n("Payments")));
m_part->write(TQString("<div class=\"summaryheader\">%1</div>\n").arg(i18n("Payments")));
if(overdues.count() > 0) {
m_part->write("<div class=\"gap\">&nbsp;</div>\n");
@ -432,7 +432,7 @@ void KHomeView::showPayments(void)
TQValueList<MyMoneySchedule>::Iterator it_f;
m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >");
m_part->write(TQString("<tr class=\"itemtitle warningtitle\" ><td colspan=\"5\">%1</td></tr>\n").tqarg(showColoredAmount(i18n("Overdue payments"), true)));
m_part->write(TQString("<tr class=\"itemtitle warningtitle\" ><td colspan=\"5\">%1</td></tr>\n").arg(showColoredAmount(i18n("Overdue payments"), true)));
m_part->write("<tr class=\"item warning\">");
m_part->write("<td class=\"left\" width=\"10%\">");
m_part->write(i18n("Date"));
@ -464,7 +464,7 @@ void KHomeView::showPayments(void)
break;
}
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
showPaymentEntry(*it, cnt);
m_part->write("</tr>");
// make sure to not repeat overdues later again
@ -502,7 +502,7 @@ void KHomeView::showPayments(void)
if (todays.count() > 0) {
m_part->write("<div class=\"gap\">&nbsp;</div>\n");
m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >");
m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").tqarg(i18n("Today's payments")));
m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").arg(i18n("Today's payments")));
m_part->write("<tr class=\"item\">");
m_part->write("<td class=\"left\" width=\"10%\">");
m_part->write(i18n("Date"));
@ -522,7 +522,7 @@ void KHomeView::showPayments(void)
m_part->write("</tr>");
for(t_it = todays.begin(); t_it != todays.end(); ++t_it) {
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
showPaymentEntry(*t_it);
m_part->write("</tr>");
}
@ -536,7 +536,7 @@ void KHomeView::showPayments(void)
TQValueList<MyMoneySchedule>::Iterator it;
m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >");
m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").tqarg(i18n("Future payments")));
m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").arg(i18n("Future payments")));
m_part->write("<tr class=\"item\">");
m_part->write("<td class=\"left\" width=\"10%\">");
m_part->write(i18n("Date"));
@ -585,7 +585,7 @@ void KHomeView::showPayments(void)
if(cnt > 0)
--cnt;
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
showPaymentEntry(*it);
m_part->write("</tr>");
@ -602,12 +602,12 @@ void KHomeView::showPayments(void)
while(1);
if (needMoreLess) {
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
m_part->write("<td>");
if(m_showAllSchedules) {
m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").tqarg("reduced")) + i18n("Less...") + linkend());
m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").arg("reduced")) + i18n("Less...") + linkend());
} else {
m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").tqarg("full")) + i18n("More...") + linkend());
m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").arg("full")) + i18n("More...") + linkend());
}
m_part->write("</td><td></td><td></td><td></td><td></td>");
m_part->write("</tr>");
@ -642,16 +642,16 @@ void KHomeView::showPaymentEntry(const MyMoneySchedule& sched, int cnt)
KGlobal::locale()->formatDate(sched.adjustedNextDueDate(), true) +
"</td><td>";
if(pathEnter.length() > 0)
tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=enter").tqarg(sched.id()), i18n("Enter schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").tqarg(pathEnter) + linkend();
tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=enter").arg(sched.id()), i18n("Enter schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").arg(pathEnter) + linkend();
if(pathSkip.length() > 0)
tmp += "&nbsp;" + link(VIEW_SCHEDULE, TQString("?id=%1&mode=skip").tqarg(sched.id()), i18n("Skip schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").tqarg(pathSkip) + linkend();
tmp += "&nbsp;" + link(VIEW_SCHEDULE, TQString("?id=%1&mode=skip").arg(sched.id()), i18n("Skip schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").arg(pathSkip) + linkend();
tmp += TQString("&nbsp;");
tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=edit").tqarg(sched.id()), i18n("Edit schedule")) + sched.name() + linkend();
tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=edit").arg(sched.id()), i18n("Edit schedule")) + sched.name() + linkend();
//show quantity of payments overdue if any
if(cnt > 1)
tmp += i18n(" (%1 payments)").tqarg(cnt);
tmp += i18n(" (%1 payments)").arg(cnt);
//show account of the main split
tmp += "</td><td>";
@ -788,7 +788,7 @@ void KHomeView::showAccounts(KHomeView::paymentTypeE type, const TQString& heade
TQMap<TQString, MyMoneyAccount>::const_iterator it_m;
for(it_m = nameIdx.begin(); it_m != nameIdx.end(); ++it_m) {
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
showAccountEntry(*it_m);
m_part->write("</tr>");
}
@ -846,10 +846,10 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc, const MyMoneyMoney&
}
tmp = TQString("<td>") +
link(VIEW_LEDGER, TQString("?id=%1").tqarg(acc.id())) + acc.name() + linkend() + "</td>";
link(VIEW_LEDGER, TQString("?id=%1").arg(acc.id())) + acc.name() + linkend() + "</td>";
//show account balance
tmp += TQString("<td class=\"right\">%1</td>").tqarg(showColoredAmount(amount, value.isNegative()));
tmp += TQString("<td class=\"right\">%1</td>").arg(showColoredAmount(amount, value.isNegative()));
//show minimum balance column if requested
if(showMinBal) {
@ -858,7 +858,7 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc, const MyMoneyMoney&
tmp += TQString("<td class=\"right\">&nbsp;</td>");
} else {
//show minimum balance entry
tmp += TQString("<td class=\"right\">%1</td>").tqarg(showColoredAmount(amountToMinBal, valueToMinBal.isNegative()));
tmp += TQString("<td class=\"right\">%1</td>").arg(showColoredAmount(amountToMinBal, valueToMinBal.isNegative()));
}
}
// qDebug("accountEntry = '%s'", tmp.latin1());
@ -886,7 +886,7 @@ MyMoneyMoney KHomeView::investmentBalance(const MyMoneyAccount& acc)
val = val.convert(acc.fraction());
value += val;
} catch(MyMoneyException* e) {
qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").tqarg(stock.name(), e->what())).data());
qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data());
delete e;
}
}
@ -906,7 +906,7 @@ void KHomeView::showFavoriteReports(void)
{
if ( (*it_report).isFavorite() ) {
if(firstTime) {
m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\">&nbsp;</div>\n").tqarg(i18n("Favorite Reports")));
m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\">&nbsp;</div>\n").arg(i18n("Favorite Reports")));
m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >");
m_part->write("<tr class=\"item\"><td class=\"left\" width=\"40%\">");
m_part->write(i18n("Report"));
@ -917,11 +917,11 @@ void KHomeView::showFavoriteReports(void)
}
m_part->write(TQString("<tr class=\"row-%1\"><td>%2%3%4</td><td align=\"left\">%5</td></tr>")
.tqarg(row++ & 0x01 ? "even" : "odd")
.tqarg(link(VIEW_REPORTS, TQString("?id=%1").tqarg((*it_report).id())))
.tqarg((*it_report).name())
.tqarg(linkend())
.tqarg((*it_report).comment())
.arg(row++ & 0x01 ? "even" : "odd")
.arg(link(VIEW_REPORTS, TQString("?id=%1").arg((*it_report).id())))
.arg((*it_report).name())
.arg(linkend())
.arg((*it_report).comment())
);
}
@ -961,16 +961,16 @@ void KHomeView::showForecast(void)
beginDay = m_forecast.accountsCycle();
// Now output header
m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\">&nbsp;</div>\n").tqarg(i18n("%1 Day Forecast").tqarg(m_forecast.forecastDays())));
m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\">&nbsp;</div>\n").arg(i18n("%1 Day Forecast").arg(m_forecast.forecastDays())));
m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >");
m_part->write("<tr class=\"item\"><td class=\"left\" width=\"40%\">");
m_part->write(i18n("Account"));
m_part->write("</td>");
int colWidth = 55/ (m_forecast.forecastDays() / m_forecast.accountsCycle());
for(i = 0; (i*m_forecast.accountsCycle() + beginDay) <= m_forecast.forecastDays(); ++i) {
m_part->write(TQString("<td width=\"%1%\" class=\"right\">").tqarg(colWidth));
m_part->write(TQString("<td width=\"%1%\" class=\"right\">").arg(colWidth));
m_part->write(i18n("%1 days").tqarg(i*m_forecast.accountsCycle() + beginDay));
m_part->write(i18n("%1 days").arg(i*m_forecast.accountsCycle() + beginDay));
m_part->write("</td>");
colspan++;
}
@ -983,9 +983,9 @@ void KHomeView::showForecast(void)
for(it_account = nameIdx.begin(); it_account != nameIdx.end(); ++it_account) {
//MyMoneyAccount acc = (*it_n);
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<td width=\"40%\">") +
link(VIEW_LEDGER, TQString("?id=%1").tqarg((*it_account).id())) + (*it_account).name() + linkend() + "</td>");
link(VIEW_LEDGER, TQString("?id=%1").arg((*it_account).id())) + (*it_account).name() + linkend() + "</td>");
int dropZero = -1; //account dropped below zero
int dropMinimum = -1; //account dropped below minimum balance
@ -1007,8 +1007,8 @@ void KHomeView::showForecast(void)
TQString amount;
amount = forecastBalance.formatMoney( *it_account, currency);
amount.replace(" ","&nbsp;");
m_part->write(TQString("<td width=\"%1%\" align=\"right\">").tqarg(colWidth));
m_part->write(TQString("%1</td>").tqarg(showColoredAmount(amount, forecastBalance.isNegative())));
m_part->write(TQString("<td width=\"%1%\" align=\"right\">").arg(colWidth));
m_part->write(TQString("%1</td>").arg(showColoredAmount(amount, forecastBalance.isNegative())));
}
m_part->write("</tr>");
@ -1036,17 +1036,17 @@ void KHomeView::showForecast(void)
case -1:
break;
case 0:
msg = i18n("The balance of %1 is below the minimum balance %2 today.").tqarg((*it_account).name()).tqarg(minBalance.formatMoney(*it_account, currency));
msg = i18n("The balance of %1 is below the minimum balance %2 today.").arg((*it_account).name()).arg(minBalance.formatMoney(*it_account, currency));
msg = showColoredAmount(msg, true);
break;
default:
msg = i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").tqarg((*it_account).name()).tqarg(minBalance.formatMoney(*it_account, currency)).tqarg(dropMinimum-1);
msg = i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").arg((*it_account).name()).arg(minBalance.formatMoney(*it_account, currency)).arg(dropMinimum-1);
msg = showColoredAmount(msg, true);
break;
}
if(!msg.isEmpty()) {
m_part->write(TQString("<tr class=\"warning\" style=\"font-weight: normal;\" ><td colspan=%2 align=\"center\" >%1</td></tr>").tqarg(msg).tqarg(colspan));
m_part->write(TQString("<tr class=\"warning\" style=\"font-weight: normal;\" ><td colspan=%2 align=\"center\" >%1</td></tr>").arg(msg).arg(colspan));
}
}
// a drop below zero is always shown
@ -1056,28 +1056,28 @@ void KHomeView::showForecast(void)
break;
case 0:
if((*it_account).accountGroup() == MyMoneyAccount::Asset) {
msg = i18n("The balance of %1 is below %2 today.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency));
msg = i18n("The balance of %1 is below %2 today.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency));
msg = showColoredAmount(msg, true);
break;
}
if((*it_account).accountGroup() == MyMoneyAccount::Liability) {
msg = i18n("The balance of %1 is above %2 today.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency));
msg = i18n("The balance of %1 is above %2 today.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency));
break;
}
break;
default:
if((*it_account).accountGroup() == MyMoneyAccount::Asset) {
msg = i18n("The balance of %1 will drop below %2 in %3 days.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency)).tqarg(dropZero);
msg = i18n("The balance of %1 will drop below %2 in %3 days.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency)).arg(dropZero);
msg = showColoredAmount(msg, true);
break;
}
if((*it_account).accountGroup() == MyMoneyAccount::Liability) {
msg = i18n("The balance of %1 will raise above %2 in %3 days.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency)).tqarg(dropZero);
msg = i18n("The balance of %1 will raise above %2 in %3 days.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency)).arg(dropZero);
break;
}
}
if(!msg.isEmpty()) {
m_part->write(TQString("<tr class=\"warning\"><td colspan=%2 align=\"center\" ><b>%1</b></td></tr>").tqarg(msg).tqarg(colspan));
m_part->write(TQString("<tr class=\"warning\"><td colspan=%2 align=\"center\" ><b>%1</b></td></tr>").arg(msg).arg(colspan));
}
}
m_part->write("</table></div></div>");
@ -1090,9 +1090,9 @@ const TQString KHomeView::link(const TQString& view, const TQString& query, cons
TQString titlePart;
TQString title(_title);
if(!title.isEmpty())
titlePart = TQString(" title=\"%1\"").tqarg(title.replace(" ", "&nbsp;"));
titlePart = TQString(" title=\"%1\"").arg(title.replace(" ", "&nbsp;"));
return TQString("<a href=\"/%1%2\"%3>").tqarg(view, query, titlePart);
return TQString("<a href=\"/%1%2\"%3>").arg(view, query, titlePart);
}
const TQString KHomeView::linkend(void) const
@ -1260,7 +1260,7 @@ void KHomeView::showAssetsLiabilities(void)
TQMap<TQString, MyMoneyAccount>::const_iterator asset_it = nameAssetsIdx.begin();
TQMap<TQString,MyMoneyAccount>::const_iterator liabilities_it = nameLiabilitiesIdx.begin();
for(; asset_it != nameAssetsIdx.end() || liabilities_it != nameLiabilitiesIdx.end();) {
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
//write an asset account if we still have any
if(asset_it != nameAssetsIdx.end()) {
MyMoneyMoney value;
@ -1325,23 +1325,23 @@ void KHomeView::showAssetsLiabilities(void)
amountLiabilities.replace(" ","&nbsp;");
amountNetWorth.replace(" ","&nbsp;");
m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").arg(i++ & 0x01 ? "even" : "odd"));
//print total for assets
m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").tqarg(i18n("Total Assets")).tqarg(showColoredAmount(amountAssets, netAssets.isNegative())));
m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").arg(i18n("Total Assets")).arg(showColoredAmount(amountAssets, netAssets.isNegative())));
//leave the intermediate column empty
m_part->write("<td class=\"setcolor\"></td>");
//print total liabilities
m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").tqarg(i18n("Total Liabilities")).tqarg(showColoredAmount(amountLiabilities, netLiabilities.isNegative())));
m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").arg(i18n("Total Liabilities")).arg(showColoredAmount(amountLiabilities, netLiabilities.isNegative())));
m_part->write("</tr>");
//print net worth
m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").arg(i++ & 0x01 ? "even" : "odd"));
m_part->write("<td></td><td></td><td class=\"setcolor\"></td>");
m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").tqarg(i18n("Net Worth")).tqarg(showColoredAmount(amountNetWorth, netWorth.isNegative() )));
m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").arg(i18n("Net Worth")).arg(showColoredAmount(amountNetWorth, netWorth.isNegative() )));
m_part->write("</tr>");
m_part->write("</table>");
@ -1402,9 +1402,9 @@ void KHomeView::showBudget(void)
TQString totalActualAmount = totalActualValue.formatMoney(file->baseCurrency().tradingSymbol(), prec);
TQString totalBudgetDiffAmount = totalBudgetDiffValue.formatMoney(file->baseCurrency().tradingSymbol(), prec);
m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(totalBudgetAmount, totalBudgetValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(totalActualAmount, totalActualValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(totalBudgetDiffAmount, totalBudgetDiffValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(totalBudgetAmount, totalBudgetValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(totalActualAmount, totalActualValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(totalBudgetDiffAmount, totalBudgetDiffValue.isNegative())));
m_part->write("</tr>");
m_part->write("</table>");
@ -1448,10 +1448,10 @@ void KHomeView::showBudget(void)
//write the outergroup if it is the first row of outergroup being shown
if(i == 0) {
m_part->write("<tr style=\"font-weight:bold;\">");
m_part->write(TQString("<td class=\"left\" colspan=\"4\">%1</td>").tqarg(KMyMoneyUtils::accountTypeToString( rowname.accountType())));
m_part->write(TQString("<td class=\"left\" colspan=\"4\">%1</td>").arg(KMyMoneyUtils::accountTypeToString( rowname.accountType())));
m_part->write("</tr>");
}
m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd"));
//get values from grid
MyMoneyMoney actualValue = it_row.data()[eActual][1];
@ -1464,12 +1464,12 @@ void KHomeView::showBudget(void)
TQString budgetDiffAmount = budgetDiffValue.formatMoney(file->baseCurrency().tradingSymbol(), prec);
//account name
m_part->write(TQString("<td>") + link(VIEW_LEDGER, TQString("?id=%1").tqarg(rowname.id())) + rowname.name() + linkend() + "</td>");
m_part->write(TQString("<td>") + link(VIEW_LEDGER, TQString("?id=%1").arg(rowname.id())) + rowname.name() + linkend() + "</td>");
//show amounts
m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(budgetAmount, budgetValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(actualAmount, actualValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(budgetDiffAmount, budgetDiffValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(budgetAmount, budgetValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(actualAmount, actualValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(budgetDiffAmount, budgetDiffValue.isNegative())));
m_part->write("</tr>");
}
++it_row;
@ -1481,8 +1481,8 @@ void KHomeView::showBudget(void)
//if no negative differences are found, then inform that
if(i == 0) {
m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").tqarg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<td class=\"center\" colspan=\"4\">%1</td>").tqarg(i18n("No Budget Categories have been overrun")));
m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").arg(i++ & 0x01 ? "even" : "odd"));
m_part->write(TQString("<td class=\"center\" colspan=\"4\">%1</td>").arg(i18n("No Budget Categories have been overrun")));
m_part->write("</tr>");
}
m_part->write("</table></div></div>");
@ -1493,7 +1493,7 @@ TQString KHomeView::showColoredAmount(const TQString& amount, bool isNegative)
{
if(isNegative) {
//if negative, get the settings for negative numbers
return TQString("<font color=\"%1\">%2</font>").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name(), amount);
return TQString("<font color=\"%1\">%2</font>").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name(), amount);
}
//if positive, return the same string
@ -1810,16 +1810,16 @@ void KHomeView::showCashFlowSummary()
m_part->write(TQString("<tr class=\"row-even\" style=\"font-weight:bold;\">"));
//print current income
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountIncome, incomeValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountIncome, incomeValue.isNegative())));
//print the scheduled income
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledIncome, scheduledIncome.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledIncome, scheduledIncome.isNegative())));
//print current expenses
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountExpense, expenseValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountExpense, expenseValue.isNegative())));
//print the scheduled expenses
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledExpense, scheduledExpense.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledExpense, scheduledExpense.isNegative())));
m_part->write("</tr>");
m_part->write("</table>");
@ -1852,16 +1852,16 @@ void KHomeView::showCashFlowSummary()
m_part->write(TQString("<tr class=\"row-even\" style=\"font-weight:bold;\">"));
//print current liquid assets
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountLiquidAssets, liquidAssets.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountLiquidAssets, liquidAssets.isNegative())));
//print the scheduled transfers
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledLiquidTransfer, scheduledLiquidTransfer.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledLiquidTransfer, scheduledLiquidTransfer.isNegative())));
//print current liabilities
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountLiquidLiabilities, liquidLiabilities.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountLiquidLiabilities, liquidLiabilities.isNegative())));
//print the scheduled transfers
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledOtherTransfer, scheduledOtherTransfer.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledOtherTransfer, scheduledOtherTransfer.isNegative())));
m_part->write("</tr>");
@ -1909,13 +1909,13 @@ void KHomeView::showCashFlowSummary()
m_part->write("<td>&nbsp;</td>");
//print expected assets
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountExpectedAsset, expectedAsset.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountExpectedAsset, expectedAsset.isNegative())));
//print expected liabilities
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountExpectedLiabilities, expectedLiabilities.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountExpectedLiabilities, expectedLiabilities.isNegative())));
//print expected profit
m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountProfit, profitValue.isNegative())));
m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountProfit, profitValue.isNegative())));
m_part->write("</tr>");

2
kmymoney2/views/kinstitutionsviewdecl.ui
Unescape View File

@ -68,7 +68,7 @@
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignVCenter|AlignRight</set>
</property>
<property name="hAlign" stdset="0">

2
kmymoney2/views/kinvestmentlistitem.cpp
Unescape View File

@ -195,7 +195,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi
bNegative = true;
}
TQString ds = TQString("%1%").tqarg(result, 0, 'f', 3);
TQString ds = TQString("%1%").arg(result, 0, 'f', 3);
return ds;
/*MyMoneyMoney result = (currentValue / comparisonValue);

52
kmymoney2/views/kmymoneyview.cpp
Unescape View File

@ -583,7 +583,7 @@ bool KMyMoneyView::readFile(const KURL& url)
} else {
if(!KIO::NetAccess::download(url, filename, NULL)) {
KMessageBox::detailedError(this,
i18n("Error while loading file '%1'!").tqarg(url.url()),
i18n("Error while loading file '%1'!").arg(url.url()),
KIO::NetAccess::lastErrorString(),
i18n("File access error"));
return false;
@ -595,7 +595,7 @@ bool KMyMoneyView::readFile(const KURL& url)
TQFile file(filename);
TQFileInfo info(file);
if(!info.isFile()) {
TQString msg=i18n("<b>%1</b> is not a KMyMoney file.").tqarg(filename);
TQString msg=i18n("<b>%1</b> is not a KMyMoney file.").arg(filename);
KMessageBox::error(this, TQString("<p>")+msg, i18n("Filetype Error"));
return false;
}
@ -636,7 +636,7 @@ bool KMyMoneyView::readFile(const KURL& url)
haveAt = false;
isEncrypted = true;
} else {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("GPG is not available for decryption of file <b>%1</b>").tqarg(filename)));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("GPG is not available for decryption of file <b>%1</b>").arg(filename)));
qfile = TQT_TQIODEVICE(new TQFile(file.name()));
}
} else {
@ -714,18 +714,18 @@ bool KMyMoneyView::readFile(const KURL& url)
::timetrace("done reading to memory");
} else {
if(m_fileType == KmmBinary) {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains the old binary format used by KMyMoney. Please use an older version of KMyMoney (0.8.x) that still supports this format to convert it to the new XML based format.").tqarg(filename)));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains the old binary format used by KMyMoney. Please use an older version of KMyMoney (0.8.x) that still supports this format to convert it to the new XML based format.").arg(filename)));
} else {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains an unknown file format!").tqarg(filename)));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains an unknown file format!").arg(filename)));
}
rc = false;
}
} else {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot read from file <b>%1</b>!").tqarg(filename)));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot read from file <b>%1</b>!").arg(filename)));
rc = false;
}
} catch (MyMoneyException *e) {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot load file <b>%1</b>. Reason: %2").tqarg(filename, e->what())));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot load file <b>%1</b>. Reason: %2").arg(filename, e->what())));
delete e;
rc = false;
}
@ -735,13 +735,13 @@ bool KMyMoneyView::readFile(const KURL& url)
}
qfile->close();
} else {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").tqarg(filename)));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").arg(filename)));
rc = false;
}
delete qfile;
}
} else {
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").tqarg(filename)));
KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").arg(filename)));
rc = false;
}
@ -805,7 +805,7 @@ bool KMyMoneyView::openDatabase (const KURL& url) {
retry = false;
break;
case 1: // permanent error
KMessageBox::detailedError (this, i18n("Can't open database %1\n").tqarg(dbURL.prettyURL()), reader->lastError());
KMessageBox::detailedError (this, i18n("Can't open database %1\n").arg(dbURL.prettyURL()), reader->lastError());
if (pDBMgr) {
removeStorage();
delete pDBMgr;
@ -911,7 +911,7 @@ bool KMyMoneyView::initializeStorage()
// Check if we have to modify the file before we allow to work with it
IMyMoneyStorage* s = MyMoneyFile::instance()->storage();
while (s->fileFixVersion() < s->currentFixVersion()) {
qDebug("%s", (TQString("testing fileFixVersion %1 < %2").tqarg(s->fileFixVersion()).tqarg(s->currentFixVersion())).data());
qDebug("%s", (TQString("testing fileFixVersion %1 < %2").arg(s->fileFixVersion()).arg(s->currentFixVersion())).data());
switch (s->fileFixVersion()) {
case 0:
fixFile_0();
@ -984,7 +984,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
if(KMyMoneyGlobalSettings::encryptRecover()) {
encryptRecover = true;
if(!KGPGFile::keyAvailable(TQString(RECOVER_KEY_ID))) {
KMessageBox::sorry(this, TQString("<p>")+i18n("You have selected to encrypt your data also with the KMyMoney recover key, but the key with id</p><p><center><b>%1</b></center></p>has not been found in your keyring at this time. Please make sure to import this key into your keyring. You can find it on the <a href=\"http://kmymoney2.sourceforge.net/\">KMyMoney web-site</a>. This time your data will not be encrypted with the KMyMoney recover key.").tqarg(RECOVER_KEY_ID), i18n("GPG-Key not found"));
KMessageBox::sorry(this, TQString("<p>")+i18n("You have selected to encrypt your data also with the KMyMoney recover key, but the key with id</p><p><center><b>%1</b></center></p>has not been found in your keyring at this time. Please make sure to import this key into your keyring. You can find it on the <a href=\"http://kmymoney2.sourceforge.net/\">KMyMoney web-site</a>. This time your data will not be encrypted with the KMyMoney recover key.").arg(RECOVER_KEY_ID), i18n("GPG-Key not found"));
encryptRecover = false;
}
}
@ -993,7 +993,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
TQStringList::const_iterator it_s;
for(it_s = keys.begin(); it_s != keys.begin(); ++it_s) {
if(!KGPGFile::keyAvailable(*it_s)) {
KMessageBox::sorry(this, TQString("<p>")+i18n("You have specified to encrypt your data for the user-id</p><p><center><b>%1</b>.</center></p>Unfortunately, a valid key for this user-id was not found in your keyring. Please make sure to import a valid key for this user-id. This time, encryption is disabled.").tqarg(*it_s), i18n("GPG-Key not found"));
KMessageBox::sorry(this, TQString("<p>")+i18n("You have specified to encrypt your data for the user-id</p><p><center><b>%1</b>.</center></p>Unfortunately, a valid key for this user-id was not found in your keyring. Please make sure to import a valid key for this user-id. This time, encryption is disabled.").arg(*it_s), i18n("GPG-Key not found"));
encryptedOk = false;
}
}
@ -1031,7 +1031,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
if(!dev || !dev->open(IO_WriteOnly)) {
MyMoneyFile::instance()->blockSignals(blocked);
delete dev;
throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").tqarg(qfile->name()));
throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").arg(qfile->name()));
}
} else if(!plaintext) {
@ -1045,7 +1045,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
if(!dev || !dev->open(IO_WriteOnly)) {
MyMoneyFile::instance()->blockSignals(blocked);
delete dev;
throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").tqarg(qfile->name()));
throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").arg(qfile->name()));
}
statusDevice = base->device();
}
@ -1054,11 +1054,11 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
ft.commit();
pWriter->setProgressCallback(&KMyMoneyView::progressCallback);
dev->reseStatus();
dev->resetStatus();
pWriter->writeFile(dev, dynamic_cast<IMyMoneySerialize*> (MyMoneyFile::instance()->storage()));
MyMoneyFile::instance()->blockSignals(blocked);
if(statusDevice->status() != IO_Ok) {
throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").tqarg(qfile->name()));
throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").arg(qfile->name()));
}
pWriter->setProgressCallback(0);
@ -1067,7 +1067,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter
dev->close();
if(statusDevice->status() != IO_Ok) {
delete dev;
throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").tqarg(qfile->name()));
throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").arg(qfile->name()));
}
delete dev;
} else
@ -1115,7 +1115,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList)
bool rc = true;
try {
if(! url.isValid()) {
throw new MYMONEYEXCEPTION(i18n("Malformed URL '%1'").tqarg(url.url()));
throw new MYMONEYEXCEPTION(i18n("Malformed URL '%1'").arg(url.url()));
}
if(url.isLocalFile()) {
@ -1144,10 +1144,10 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList)
} catch (MyMoneyException* e) {
qfile.abort();
delete e;
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename));
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename));
}
} else {
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename));
throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename));
}
}
chown(filename, static_cast<uid_t>(-1), gid);
@ -1155,7 +1155,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList)
KTempFile tmpfile;
saveToLocalFile(tmpfile.file(), pWriter, plaintext, keyList);
if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL))
throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").tqarg(url.url()));
throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url()));
tmpfile.unlink();
}
m_fileType = KmmXML;
@ -1210,7 +1210,7 @@ bool KMyMoneyView::saveAsDatabase(const KURL& url)
KMessageBox::detailedError (this,
i18n("Can't open or create database %1\n"
"Retry SaveAsDatabase and click Help"
" for further info").tqarg(url.prettyURL()), writer->lastError());
" for further info").arg(url.prettyURL()), writer->lastError());
}
delete writer;
return (rc);
@ -1268,7 +1268,7 @@ void KMyMoneyView::slotSetBaseCurrency(const MyMoneySecurity& baseCurrency)
MyMoneyFile::instance()->setBaseCurrency(baseCurrency);
ft.commit();
} catch(MyMoneyException *e) {
KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").tqarg(baseCurrency.name()).tqarg(e->what()), i18n("Set base currency"));
KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").arg(baseCurrency.name()).arg(e->what()), i18n("Set base currency"));
delete e;
}
}
@ -1568,7 +1568,7 @@ void KMyMoneyView::loadAncientCurrencies(void)
// Source: http://www.focus.de/finanzen/news/malta-und-zypern_aid_66058.html
loadAncientCurrency("MTL", i18n("Maltese Lira"), "MTL", TQDate(2008,1,1), MyMoneyMoney(429300,1000000), "EUR");
loadAncientCurrency("CYP", i18n("Cyprus Pound"), TQString("C%1").tqarg(TQChar(0x00A3)), TQDate(2008,1,1), MyMoneyMoney(585274,1000000), "EUR");
loadAncientCurrency("CYP", i18n("Cyprus Pound"), TQString("C%1").arg(TQChar(0x00A3)), TQDate(2008,1,1), MyMoneyMoney(585274,1000000), "EUR");
// Source: http://www.focus.de/finanzen/news/waehrungszone-slowakei-ist-neuer-euro-staat_aid_359025.html
loadAncientCurrency("SKK", i18n("Slovak Koruna"), "SKK", TQDate(2008,12,31), MyMoneyMoney(1000,30126), "EUR");
@ -1884,7 +1884,7 @@ void KMyMoneyView::fixLoanAccount_0(MyMoneyAccount acc)
i18n("The account \"%1\" was previously created as loan account but some information "
"is missing. The new loan wizard will be started to collect all relevant "
"information. Please use a KMyMoney version >= 0.8.7 and < 0.9 to correct the problem."
).tqarg(acc.name()),
).arg(acc.name()),
i18n("Account problem"));
throw new MYMONEYEXCEPTION("Fix LoanAccount0 not supported anymore");

32
kmymoney2/views/kpayeesview.cpp
Unescape View File

@ -298,11 +298,11 @@ KTransactionListItem::~KTransactionListItem()
{
}
void KTransactionListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
void KTransactionListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
_cg.setColor(TQColorGroup::Base, backgroundColor());
TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
TQListViewItem::paintCell(p, _cg, column, width, alignment);
}
const TQColor KTransactionListItem::backgroundColor(void)
@ -495,7 +495,7 @@ void KPayeesView::slotRenamePayee(TQListViewItem* p , int /* col */, const TQStr
if (KMessageBox::questionYesNo(this,
i18n("A payee with the name '%1' already exists. It is not advisable to have "
"multiple payees with the same identification name. Are you sure you would like "
"to rename the payee?").tqarg(new_name)) != KMessageBox::Yes)
"to rename the payee?").arg(new_name)) != KMessageBox::Yes)
{
p->setText(0,m_payee.name());
return;
@ -521,7 +521,7 @@ void KPayeesView::slotRenamePayee(TQListViewItem* p , int /* col */, const TQStr
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to modify payee"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
}
@ -565,8 +565,8 @@ void KPayeesView::slotSelectPayee(void)
// check if the content of a currently selected payee was modified
// and ask to store the data
if (m_updateButton->isEnabled()) {
if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").tqarg(
i18n("Do you want to save the changes for <b>%1</b>?").tqarg(m_newName)),
if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").arg(
i18n("Do you want to save the changes for <b>%1</b>?").arg(m_newName)),
i18n("Save changes")) == KMessageBox::Yes) {
m_inSelection = true;
slotUpdatePayee();
@ -664,7 +664,7 @@ void KPayeesView::showTransactions(void)
m_transactionView->clear();
if(m_payee.id().isEmpty() || !m_tabWidget->isEnabled()) {
m_balanceLabel->setText(i18n("Balance: %1").tqarg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
m_balanceLabel->setText(i18n("Balance: %1").arg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
return;
}
@ -727,24 +727,24 @@ void KPayeesView::showTransactions(void)
if(s.action() == MyMoneySplit::ActionAmortization) {
if(acc.accountType() == MyMoneyAccount::Loan) {
if(s.value().isPositive()) {
txt = i18n("Amortization of %1").tqarg(acc.name());
txt = i18n("Amortization of %1").arg(acc.name());
} else {
txt = i18n("Payment to %1").tqarg(acc.name());
txt = i18n("Payment to %1").arg(acc.name());
}
} else if(acc.accountType() == MyMoneyAccount::AssetLoan) {
if(s.value().isNegative()) {
txt = i18n("Amortization of %1").tqarg(acc.name());
txt = i18n("Amortization of %1").arg(acc.name());
} else {
txt = i18n("Payment to %1").tqarg(acc.name());
txt = i18n("Payment to %1").arg(acc.name());
}
} else {
txt = i18n("Loan payment from %1").tqarg(acc.name());
txt = i18n("Loan payment from %1").arg(acc.name());
}
} else if (file->isTransfer(*t)) {
if(!s.value().isNegative()) {
txt = i18n("Transfer to %1").tqarg(acc.name());
txt = i18n("Transfer to %1").arg(acc.name());
} else {
txt = i18n("Transfer from %1").tqarg(acc.name());
txt = i18n("Transfer from %1").arg(acc.name());
}
} else if(t->splitCount() > 2) {
txt = i18n("Split transaction (category replacement)", "Split transaction");
@ -755,7 +755,7 @@ void KPayeesView::showTransactions(void)
item->setText(2, txt);
item->setText(3, s.value().formatMoney(acc.fraction()));
}
m_balanceLabel->setText(i18n("Balance: %1").tqarg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
m_balanceLabel->setText(i18n("Balance: %1").arg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction())));
// Trick: it seems, that the initial sizing of the view does
// not work correctly. At least, the columns do not get displayed
@ -872,7 +872,7 @@ void KPayeesView::slotUpdatePayee(void)
} catch(MyMoneyException *e) {
KMessageBox::detailedSorry(0, i18n("Unable to modify payee"),
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line()));
(e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line()));
delete e;
}
}

2
kmymoney2/views/kpayeesview.h
Unescape View File

@ -185,7 +185,7 @@ public:
/**
* use my own paint method
*/
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
/**
* use my own backgroundColor method

6
kmymoney2/views/kpayeesviewdecl.ui
Unescape View File

@ -168,7 +168,7 @@
<property name="text">
<string>Balance: </string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -293,7 +293,7 @@
<property name="text">
<string>Notes</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
</widget>
@ -359,7 +359,7 @@
<property name="text">
<string>Address:</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop|AlignLeft</set>
</property>
</widget>

22
kmymoney2/views/kreportsview.cpp
Unescape View File

@ -156,7 +156,7 @@ void KReportsView::KReportTab::saveAs( const TQString& filename, bool includeCSS
else {
TQTextStream stream(&file);
TQRegExp exp(TQString("(.*)(<link.*css\" href=)\"(.*)\">(<meta.*%1\" />)(.*)").tqarg(KGlobal::locale()->encoding()));
TQRegExp exp(TQString("(.*)(<link.*css\" href=)\"(.*)\">(<meta.*%1\" />)(.*)").arg(KGlobal::locale()->encoding()));
TQString table = createTable();
if(exp.search(table) != -1 && includeCSS) {
TQFile cssFile(exp.cap(3));
@ -234,13 +234,13 @@ TQString KReportsView::KReportTab::createTable(const TQString& links)
{
TQString filename;
if(!MyMoneyFile::instance()->value("reportstylesheet").isEmpty())
filename = KGlobal::dirs()->findResource("appdata", TQString("html/%1").tqarg(MyMoneyFile::instance()->value("reportstylesheet")));
filename = KGlobal::dirs()->findResource("appdata", TQString("html/%1").arg(MyMoneyFile::instance()->value("reportstylesheet")));
if(filename.isEmpty())
filename = KGlobal::dirs()->findResource("appdata", "html/kmymoney2.css");
TQString header = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n") +
TQString("<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">").tqarg(filename);
TQString("<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">").arg(filename);
header += TQString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").tqarg(KGlobal::locale()->encoding());
header += TQString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").arg(KGlobal::locale()->encoding());
header += KMyMoneyUtils::variableCSS();
header += "</head><body>\n";
@ -260,7 +260,7 @@ TQString KReportsView::KReportTab::createTable(const TQString& links)
{
kdDebug(2) << "KReportsView::KReportTab::createTable(): ERROR " << e->what() << endl;
TQString error = TQString(i18n("There was an error creating your report: \"%1\".\nPlease report this error to the developer's list: kmymoney2-developer@lists.sourceforge.net")).tqarg(e->what());
TQString error = TQString(i18n("There was an error creating your report: \"%1\".\nPlease report this error to the developer's list: kmymoney2-developer@lists.sourceforge.net")).arg(e->what());
KMessageBox::error(this, error, i18n("Critical Error"));
@ -394,7 +394,7 @@ KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* parent, cons
void KReportsView::KReportGroupListItem::setNr(const int nr)
{
m_nr = nr;
setText(0, TQString("%1. %2").tqarg(nr).tqarg(m_name));
setText(0, TQString("%1. %2").arg(nr).arg(m_name));
}
void KReportsView::loadView(void)
@ -583,8 +583,8 @@ void KReportsView::slotSaveView(void)
// adjust to our local needs (filetypes etc.) and
// enhanced to show the m_saveEncrypted combo box
KFileDialog dlg( ":kmymoney-export",
TQString("%1|%2\n").tqarg("*.csv").tqarg(i18n("CSV (Filefilter)", "CSV files")) +
TQString("%1|%2\n").tqarg("*.html").tqarg(i18n("HTML (Filefilter)", "HTML files")),
TQString("%1|%2\n").arg("*.csv").arg(i18n("CSV (Filefilter)", "CSV files")) +
TQString("%1|%2\n").arg("*.html").arg(i18n("HTML (Filefilter)", "HTML files")),
this, "filedialog", true, vbox);
connect(&dlg, TQT_SIGNAL(filterChanged(const TQString&)), this, TQT_SLOT(slotSaveFilterChanged(const TQString&)));
@ -657,7 +657,7 @@ void KReportsView::slotDuplicate(void)
if(tab) {
MyMoneyReport dupe = tab->report();
dupe.setName( TQString(i18n("Copy of %1")).tqarg(dupe.name()) );
dupe.setName( TQString(i18n("Copy of %1")).arg(dupe.name()) );
if ( dupe.comment() == i18n("Default Report") )
dupe.setComment( i18n("Custom Report") );
dupe.clearId();
@ -688,7 +688,7 @@ void KReportsView::slotDelete(void)
MyMoneyReport report = tab->report();
if ( ! report.id().isEmpty() )
{
if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, TQString("<qt>")+i18n("Are you sure you want to delete report <b>%1</b>? There is no way to recover it!").tqarg(report.name())+TQString("</qt>"), i18n("Delete Report?")))
if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, TQString("<qt>")+i18n("Are you sure you want to delete report <b>%1</b>? There is no way to recover it!").arg(report.name())+TQString("</qt>"), i18n("Delete Report?")))
{
// close the tab and then remove the report so that it is not
// generated again during the following loadView() call
@ -700,7 +700,7 @@ void KReportsView::slotDelete(void)
}
}
else
KMessageBox::information(this, TQString("<qt>")+i18n("Sorry, <b>%1</b> is a default report. You may not delete it.").tqarg(report.name())+TQString("</qt>"), i18n("Delete Report?"));
KMessageBox::information(this, TQString("<qt>")+i18n("Sorry, <b>%1</b> is a default report. You may not delete it.").arg(report.name())+TQString("</qt>"), i18n("Delete Report?"));
}
}

2
kmymoney2/views/kscheduledlistitem.cpp
Unescape View File

@ -130,7 +130,7 @@ KScheduledListItem::KScheduledListItem(KScheduledListItem *parent, const MyMoney
else
setText(2, "---");
m_amount = split.shares().abs();
setText(3, TQString("%1 ").tqarg(m_amount.formatMoney(acc, currency)));
setText(3, TQString("%1 ").arg(m_amount.formatMoney(acc, currency)));
// Do the real next payment like ms-money etc
if (schedule.isFinished())
{

2
kmymoney2/views/kscheduledlistitem.h
Unescape View File

@ -66,7 +66,7 @@ public:
KScheduledListItem(KListView *parent, const TQString& description, const TQPixmap& pixmap = TQPixmap(), const TQString& sortKey = TQString());
/**
* This constructor is used to create a child of one of the tqchildren
* This constructor is used to create a child of one of the children
* created by the above method.
*
* This child describes a schedule and represents the data in schedule.

4
kmymoney2/views/kscheduledview.cpp
Unescape View File

@ -240,7 +240,7 @@ void KScheduledView::refresh(bool full, const TQString& schedId)
TQTimer::singleShot(10, this, TQT_SLOT(slotTimerDone()));
m_qlistviewScheduled->update();
// force tqrepaint in case the filter is set
// force repaint in case the filter is set
m_searchWidget->searchLine()->updateSearch(TQString());
if (m_openBills)
@ -273,7 +273,7 @@ void KScheduledView::slotTimerDone(void)
m_qlistviewScheduled->ensureItemVisible(item);
}
// force a tqrepaint of all items to update the branches
// force a repaint of all items to update the branches
for(item = m_qlistviewScheduled->firstChild(); item != 0; item = item->itemBelow()) {
m_qlistviewScheduled->repaintItem(item);
}

12
kmymoney2/widgets/kaccounttemplateselector.cpp
Unescape View File

@ -204,8 +204,8 @@ void KAccountTemplateSelector::slotLoadTemplateList(void)
TQString oCountry = KGlobal::locale()->twoAlphaToCountryName(exp.cap(2));
TQString oLang = KGlobal::locale()->twoAlphaToLanguageName(exp.cap(1));
d->countries.remove(country);
d->countries[TQString("%1 (%2)").tqarg(oCountry).tqarg(oLang)] = oName;
d->countries[TQString("%1 (%2)").tqarg(country).tqarg(lang)] = *it_d;
d->countries[TQString("%1 (%2)").arg(oCountry).arg(oLang)] = oName;
d->countries[TQString("%1 (%2)").arg(country).arg(lang)] = *it_d;
}
} else {
d->countries[country] = *it_d;
@ -238,13 +238,13 @@ void KAccountTemplateSelector::slotLoadCountry(void)
TQStringList::iterator it;
for(it = d->dirlist.begin(); it != d->dirlist.end(); ++it) {
TQStringList::iterator it_f;
TQDir dir(TQString("%1%2").tqarg(*it).tqarg(*(d->it_m)));
TQDir dir(TQString("%1%2").arg(*it).arg(*(d->it_m)));
if(dir.exists()) {
TQStringList files = dir.entryList("*", TQDir::Files);
for(it_f = files.begin(); it_f != files.end(); ++it_f) {
MyMoneyTemplate templ(TQString("%1/%2").tqarg(dir.canonicalPath()).tqarg(*it_f));
d->m_templates[TQString("%1").tqarg(d->id)] = templ;
new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").tqarg(d->id));
MyMoneyTemplate templ(TQString("%1/%2").arg(dir.canonicalPath()).arg(*it_f));
d->m_templates[TQString("%1").arg(d->id)] = templ;
new KListViewItem(parent, templ.title(), templ.shortDescription(), TQString("%1").arg(d->id));
++d->id;
}
}

6
kmymoney2/widgets/kbudgetvalues.cpp
Unescape View File

@ -184,7 +184,7 @@ void KBudgetValues::slotChangePeriod(int id)
newValue = (newValue / MyMoneyMoney(12, 1)).convert();
}
if(!newValue.isZero()) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a monthly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a monthly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
m_amountMonthly->setValue(newValue);
}
}
@ -203,7 +203,7 @@ void KBudgetValues::slotChangePeriod(int id)
newValue += m_field[i]->value();
}
if(!newValue.isZero()) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a yearly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a yearly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
m_amountYearly->setValue(newValue);
}
}
@ -222,7 +222,7 @@ void KBudgetValues::slotChangePeriod(int id)
}
if(!newValue.isZero()) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of <b>%1</b>. Should this value be used to fill the monthly budgets?").tqarg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of <b>%1</b>. Should this value be used to fill the monthly budgets?").arg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
for(int i=0; i < 12; ++i)
m_field[i]->setValue(newValue);
}

8
kmymoney2/widgets/klistviewsearchline.cpp
Unescape View File

@ -263,7 +263,7 @@ TQPopupMenu *KListViewSearchLine::createPopupMenu()
for(int j = 0; j < header->mapToIndex(i); j++)
if(d->listView->columnWidth(header->mapToSection(j))>0)
visiblePosition++;
columnText = i18n("Column number %1","Column No. %1").tqarg(visiblePosition);
columnText = i18n("Column number %1","Column No. %1").arg(visiblePosition);
}
subMenu->insertItem(columnText, visibleColumns);
if(d->searchColumns.isEmpty() || d->searchColumns.find(i) != d->searchColumns.end())
@ -376,12 +376,12 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi
TQListViewItem * first = item;
for(; item; item = item->nextSibling())
{
//What we pass to our tqchildren as highestHiddenParent:
//What we pass to our children as highestHiddenParent:
TQListViewItem * hhp = highestHiddenParent ? highestHiddenParent : item->isVisible() ? 0L : item;
bool childMatch = false;
if(item->firstChild() && checkItemParentsVisible(item->firstChild(), hhp))
childMatch = true;
// Should this item be shown? It should if any tqchildren should be, or if it matches.
// Should this item be shown? It should if any children should be, or if it matches.
if(childMatch || itemMatches(item, d->search))
{
visible = true;
@ -393,7 +393,7 @@ bool KListViewSearchLine::checkItemParentsVisible(TQListViewItem *item, TQListVi
for(TQListViewItem *hide = first; hide != item; hide = hide->nextSibling())
hide->setVisible(false);
highestHiddenParent = 0;
// If we matched, than none of our tqchildren matched, yet the setVisible() call on our
// If we matched, than none of our children matched, yet the setVisible() call on our
// ancestor unhid them, undo the damage:
if(!childMatch)
for(TQListViewItem *hide = item->firstChild(); hide; hide = hide->nextSibling())

4
kmymoney2/widgets/klistviewsearchline.h
Unescape View File

@ -112,7 +112,7 @@ public slots:
/**
* When a search is active on a list that's organized into a tree view if
* a parent or ancesestor of an item is does not match the search then it
* will be hidden and as such so too will any tqchildren that match.
* will be hidden and as such so too will any children that match.
*
* If this is set to true (the default) then the parents of matching items
* will be shown.
@ -190,7 +190,7 @@ private:
/**
* This is used in case parent items of matching items should be visible.
* It makes a recursive call to all tqchildren. It returns true if at least
* It makes a recursive call to all children. It returns true if at least
* one item in the subtree with the given root item is visible.
*/
bool checkItemParentsVisible(TQListViewItem *item, TQListViewItem *highestHiddenParent = 0);

16
kmymoney2/widgets/kmymoneyaccountselector.cpp
Unescape View File

@ -182,7 +182,7 @@ bool kMyMoneyAccountSelector::contains(const TQString& txt) const
i18n("Security");
while((it_v = it.current()) != 0) {
TQRegExp exp(TQString("^(?:%1):%2$").tqarg(baseName).tqarg(TQRegExp::escape(txt)));
TQRegExp exp(TQString("^(?:%1):%2$").arg(baseName).arg(TQRegExp::escape(txt)));
if(it_v->rtti() == 1) {
KMyMoneyCheckListItem* it_c = dynamic_cast<KMyMoneyCheckListItem*>(it_v);
if(exp.search(it_c->key(1, true)) != -1) {
@ -346,28 +346,28 @@ int AccountSet::load(kMyMoneyAccountSelector* selector)
TQListViewItem* after = 0;
// create the favorite section first and sort it to the beginning
key = TQString("A%1").tqarg(i18n("Favorites"));
key = TQString("A%1").arg(i18n("Favorites"));
m_favorites = selector->newItem(i18n("Favorites"), key);
for(int mask = 0x01; mask != KMyMoneyUtils::last; mask <<= 1) {
TQListViewItem* item = 0;
if((typeMask & mask & KMyMoneyUtils::asset) != 0) {
++m_count;
key = TQString("B%1").tqarg(i18n("Asset"));
key = TQString("B%1").arg(i18n("Asset"));
item = selector->newItem(i18n("Asset accounts"), key);
list = m_file->asset().accountList();
}
if((typeMask & mask & KMyMoneyUtils::liability) != 0) {
++m_count;
key = TQString("C%1").tqarg(i18n("Liability"));
key = TQString("C%1").arg(i18n("Liability"));
item = selector->newItem(i18n("Liability accounts"), key);
list = m_file->liability().accountList();
}
if((typeMask & mask & KMyMoneyUtils::income) != 0) {
++m_count;
key = TQString("D%1").tqarg(i18n("Income"));
key = TQString("D%1").arg(i18n("Income"));
item = selector->newItem(i18n("Income categories"), key);
list = m_file->income().accountList();
if(selector->selectionMode() == TQListView::Multi) {
@ -377,7 +377,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector)
if((typeMask & mask & KMyMoneyUtils::expense) != 0) {
++m_count;
key = TQString("E%1").tqarg(i18n("Expense"));
key = TQString("E%1").arg(i18n("Expense"));
item = selector->newItem(i18n("Expense categories"), key);
list = m_file->expense().accountList();
if(selector->selectionMode() == TQListView::Multi) {
@ -387,7 +387,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector)
if((typeMask & mask & KMyMoneyUtils::equity) != 0) {
++m_count;
key = TQString("F%1").tqarg(i18n("Equity"));
key = TQString("F%1").arg(i18n("Equity"));
item = selector->newItem(i18n("Equity accounts"), key);
list = m_file->equity().accountList();
}
@ -470,7 +470,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector, const TQString& baseName
continue;
TQString tmpKey;
// the first character must be preset. Since we don't know any sort order here, we just use A
tmpKey = TQString("A%1%2%3").tqarg(baseName, MyMoneyFile::AccountSeperator, acc.name());
tmpKey = TQString("A%1%2%3").arg(baseName, MyMoneyFile::AccountSeperator, acc.name());
selector->newItem(item, acc.name(), tmpKey, acc.id());
++m_count;
++count;

2
kmymoney2/widgets/kmymoneyaccounttree.cpp
Unescape View File

@ -104,7 +104,7 @@ void KMyMoneyAccountTreeItem::fillColumns()
}
if(!m_account.value("VatRate").isEmpty()) {
vatRate = MyMoneyMoney(m_account.value("VatRate")) * MyMoneyMoney(100,1);
setText(lv->vatCategoryColumn(), TQString("%1 %").tqarg(vatRate.formatMoney("", 1)));
setText(lv->vatCategoryColumn(), TQString("%1 %").arg(vatRate.formatMoney("", 1)));
}
break;
default:

18
kmymoney2/widgets/kmymoneyaccounttreebase.cpp
Unescape View File

@ -129,8 +129,8 @@ void KMyMoneyAccountTreeBase::showValue(void)
void KMyMoneyAccountTreeBase::connectNotify(const char * /* s */)
{
// update drag and drop settings
m_accountConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0);
m_institutionConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0);
m_accountConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0);
m_institutionConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0);
setDragEnabled(m_accountConnections | m_institutionConnections);
setAcceptDrops(m_accountConnections | m_institutionConnections);
}
@ -138,8 +138,8 @@ void KMyMoneyAccountTreeBase::connectNotify(const char * /* s */)
void KMyMoneyAccountTreeBase::disconnectNotify(const char * /* s */)
{
// update drag and drop settings
m_accountConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0);
m_institutionConnections = (tqreceivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0);
m_accountConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyAccount&))) != 0);
m_institutionConnections = (receivers(TQT_SIGNAL(reparent(const MyMoneyAccount&, const MyMoneyInstitution&))) != 0);
setDragEnabled(m_accountConnections | m_institutionConnections);
setAcceptDrops(m_accountConnections | m_institutionConnections);
}
@ -380,7 +380,7 @@ void KMyMoneyAccountTreeBase::slotOpenFolder(void)
m_autoopenTimer.stop();
if ( m_dropItem && !m_dropItem->isOpen() ) {
m_dropItem->setOpen( TRUE );
m_dropItem->tqrepaint();
m_dropItem->repaint();
}
}
@ -450,7 +450,7 @@ void KMyMoneyAccountTreeBase::contentsDragMoveEvent(TQDragMoveEvent* e)
if (tmpRect != m_lastDropHighlighter) {
cleanItemHighlighter();
m_lastDropHighlighter = tmpRect;
viewport()->tqrepaint(tmpRect);
viewport()->repaint(tmpRect);
}
}
}
@ -497,12 +497,12 @@ void KMyMoneyAccountTreeBase::cleanItemHighlighter(void)
if(m_lastDropHighlighter.isValid()) {
TQRect rect=m_lastDropHighlighter;
m_lastDropHighlighter = TQRect();
// make sure, we tqrepaint a bit more. that's important during
// make sure, we repaint a bit more. that's important during
// autoscroll. if we don't do that, parts of the highlighter
// do not get removed
rect.moveBy(-1, -1);
rect.setSize(rect.size() + TQSize(2,2));
viewport()->tqrepaint(rect, true);
viewport()->repaint(rect, true);
}
}
@ -684,7 +684,7 @@ void KMyMoneyAccountTreeBaseItem::adjustTotalValue(const MyMoneyMoney& diff)
{
m_totalValue += diff;
// if the entry has no tqchildren,
// if the entry has no children,
// or it is the top entry
// or it is currently not open
// we need to display the value of it

2
kmymoney2/widgets/kmymoneyaccounttreebase.h
Unescape View File

@ -353,7 +353,7 @@ public:
/**
* If o is TRUE all child items are shown initially. The user can
* hide them by clicking the - icon to the left of the item. If
* o is FALSE, the tqchildren of this item are initially hidden.
* o is FALSE, the children of this item are initially hidden.
* The user can show them by clicking the + icon to the left of the item.
*
* Overrides KListViewItem::setOpen() and exchanges the value field

12
kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
Unescape View File

@ -64,7 +64,7 @@ void KMyMoneyAccountTreeForecast::showSummary(MyMoneyForecast& forecast)
}
for(int i = 0; ((i*forecast.accountsCycle())+daysToBeginDay) <= forecast.forecastDays(); ++i) {
int intervalDays = ((i*forecast.accountsCycle())+daysToBeginDay);
TQString columnName = i18n("%1 days").tqarg(intervalDays, 0, 10);
TQString columnName = i18n("%1 days").arg(intervalDays, 0, 10);
addColumn(columnName, -1);
}
@ -111,14 +111,14 @@ void KMyMoneyAccountTreeForecast::showAdvanced(MyMoneyForecast& forecast)
//add columns
for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) {
int col = addColumn(i18n("Min Bal %1").tqarg(i), -1);
int col = addColumn(i18n("Min Bal %1").arg(i), -1);
setColumnAlignment(col, TQt::AlignRight);
addColumn(i18n("Min Date %1").tqarg(i), -1);
addColumn(i18n("Min Date %1").arg(i), -1);
}
for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) {
int col = addColumn(i18n("Max Bal %1").tqarg(i), -1);
int col = addColumn(i18n("Max Bal %1").arg(i), -1);
setColumnAlignment(col, TQt::AlignRight);
addColumn(i18n("Max Date %1").tqarg(i), -1);
addColumn(i18n("Max Date %1").arg(i), -1);
}
int col = addColumn(i18n("Average"), -1);
setColumnAlignment(col, TQt::AlignRight);
@ -329,7 +329,7 @@ void KMyMoneyAccountTreeForecastItem::adjustParentValue(int column, const MyMone
m_values[column] += value;
m_values[column] = m_values[column].convert(listView()->baseCurrency().smallestAccountFraction());
// if the entry has no tqchildren,
// if the entry has no children,
// or it is the top entry
// or it is currently not open
// we need to display the value of it

22
kmymoney2/widgets/kmymoneybriefschedule.cpp
Unescape View File

@ -94,8 +94,8 @@ void KMyMoneyBriefSchedule::loadSchedule()
MyMoneySchedule sched = m_scheduleList[m_index];
m_indexLabel->setText(i18n("%1 of %2")
.tqarg(TQString::number(m_index+1))
.tqarg(TQString::number(m_scheduleList.count())));
.arg(TQString::number(m_index+1))
.arg(TQString::number(m_scheduleList.count())));
m_name->setText(sched.name());
m_type->setText(KMyMoneyUtils::scheduleTypeToString(sched.type()));
m_account->setText(sched.account().name());
@ -107,15 +107,15 @@ void KMyMoneyBriefSchedule::loadSchedule()
{
int transactions = sched.paymentDates(m_date, sched.endDate()).count()-1;
text = i18n("Payment on %1 for %2 with %3 transactions remaining occuring %4.")
.tqarg(KGlobal::locale()->formatDate(m_date, true))
.tqarg(amount.formatMoney(sched.account().fraction()))
.tqarg(TQString::number(transactions))
.tqarg(i18n(sched.occurenceToString()));
.arg(KGlobal::locale()->formatDate(m_date, true))
.arg(amount.formatMoney(sched.account().fraction()))
.arg(TQString::number(transactions))
.arg(i18n(sched.occurenceToString()));
} else {
text = i18n("Payment on %1 for %2 occuring %4.")
.tqarg(KGlobal::locale()->formatDate(m_date, true))
.tqarg(amount.formatMoney(sched.account().fraction()))
.tqarg(i18n(sched.occurenceToString()));
.arg(KGlobal::locale()->formatDate(m_date, true))
.arg(amount.formatMoney(sched.account().fraction()))
.arg(i18n(sched.occurenceToString()));
}
if (m_date < TQDate::currentDate())
@ -134,8 +134,8 @@ void KMyMoneyBriefSchedule::loadSchedule()
text += "<br><font color=red>";
text += i18n("%1 days overdue (%2 occurences).")
.tqarg(TQString::number(days))
.tqarg(TQString::number(transactions));
.arg(TQString::number(days))
.arg(TQString::number(transactions));
text += "</color>";
}
}

4
kmymoney2/widgets/kmymoneycalculator.cpp
Unescape View File

@ -337,7 +337,7 @@ const TQString kMyMoneyCalculator::result(void) const
mask = "-%1";
break;
}
txt = TQString(mask).tqarg(txt);
txt = TQString(mask).arg(txt);
}
return txt;
}
@ -433,7 +433,7 @@ void kMyMoneyCalculator::setInitialValues(const TQString& value, TQKeyEvent* ev)
if(operand.isEmpty())
operand = "0";
else if(negative)
operand = TQString("-%1").tqarg(operand);
operand = TQString("-%1").arg(operand);
changeDisplay(operand);

4
kmymoney2/widgets/kmymoneycalendar.cpp
Unescape View File

@ -261,7 +261,7 @@ kMyMoneyCalendar::dateChangedSlot(TQDate date)
{
kdDebug() << "kMyMoneyCalendar::dateChangedSlot: date changed (" << date.year() << "/" << date.month() << "/" << date.day() << ")." << endl;
line->setText(KGlobal::locale()->formatDate(date, true));
d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
selectMonth->setText(MONTH_NAME(date.month(), date.year(), false));
selectYear->setText(date.toString("yyyy"));
emit(dateChanged(date));
@ -297,7 +297,7 @@ kMyMoneyCalendar::setDate(const TQDate& date)
TQString temp;
// -----
table->setDate(date);
d->selectWeek->setText(i18n("Week %1").tqarg(weekOfYear(date)));
d->selectWeek->setText(i18n("Week %1").arg(weekOfYear(date)));
selectMonth->setText(MONTH_NAME(date.month(), date.year(), false));
temp.setNum(date.year());
selectYear->setText(temp);

4
kmymoney2/widgets/kmymoneychecklistitem.cpp
Unescape View File

@ -85,7 +85,7 @@ void KMyMoneyCheckListItem::stateChange(bool state)
emit stateChanged(state);
}
void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
_cg.setColor(TQColorGroup::Base, backgroundColor());
@ -95,7 +95,7 @@ void KMyMoneyCheckListItem::paintCell(TQPainter *p, const TQColorGroup &cg, int
f.setBold(!isSelectable());
p->setFont(f);
TQCheckListItem::paintCell(p, _cg, column, width, tqalignment);
TQCheckListItem::paintCell(p, _cg, column, width, alignment);
}
const TQColor KMyMoneyCheckListItem::backgroundColor()

2
kmymoney2/widgets/kmymoneychecklistitem.h
Unescape View File

@ -56,7 +56,7 @@ public:
/**
* use my own paint method
*/
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
/**
* use my own backgroundColor method

2
kmymoney2/widgets/kmymoneycombo.cpp
Unescape View File

@ -267,7 +267,7 @@ void KMyMoneyCombo::focusOutEvent(TQFocusEvent* e)
m_id = TQString();
if(!id.isEmpty())
emit itemSelected(m_id);
tqrepaint();
repaint();
}
m_inFocusOutEvent = false;
}

4
kmymoney2/widgets/kmymoneycurrencyselector.cpp
Unescape View File

@ -96,9 +96,9 @@ void KMyMoneySecuritySelector::update(const TQString& id)
default:
case FullName:
if((*it).isCurrency()) {
display = TQString("%2 (%1)").tqarg((*it).id()).tqarg((*it).name());
display = TQString("%2 (%1)").arg((*it).id()).arg((*it).name());
} else
display = TQString("%2 (%1)").tqarg((*it).tradingSymbol()).tqarg((*it).name());
display = TQString("%2 (%1)").arg((*it).tradingSymbol()).arg((*it).name());
break;
break;

6
kmymoney2/widgets/kmymoneydateinput.cpp
Unescape View File

@ -72,7 +72,7 @@ bool KMyMoneyDateEdit::event(TQEvent* e)
kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::AlignmentFlags flags)
: TQHBox(parent,name)
{
m_qttqalignment = flags;
m_qtalignment = flags;
m_date = TQDate::currentDate();
dateEdit = new KMyMoneyDateEdit(m_date, this, "dateEdit");
@ -191,7 +191,7 @@ void kMyMoneyDateInput::toggleDatePicker()
}
else
{
TQPoint tmpPoint = mapToGlobal(m_dateButton->tqgeometry().bottomRight());
TQPoint tmpPoint = mapToGlobal(m_dateButton->geometry().bottomRight());
// usually, the datepicker widget is shown underneath the dateEdit widget
// if it does not fit on the screen, we show it above this widget
@ -200,7 +200,7 @@ void kMyMoneyDateInput::toggleDatePicker()
tmpPoint.setY(tmpPoint.y() - h - m_dateButton->height());
}
if((m_qttqalignment == TQt::AlignRight && tmpPoint.x()+w <= TQApplication::desktop()->width())
if((m_qtalignment == TQt::AlignRight && tmpPoint.x()+w <= TQApplication::desktop()->width())
|| (tmpPoint.x()-w < 0) )
{
m_dateFrame->setGeometry(tmpPoint.x()-width(), tmpPoint.y(), w, h);

2
kmymoney2/widgets/kmymoneydateinput.h
Unescape View File

@ -114,7 +114,7 @@ private:
KDatePicker *m_datePicker;
TQDate m_date; // The date !
TQDate m_prevDate;
TQt::AlignmentFlags m_qttqalignment;
TQt::AlignmentFlags m_qtalignment;
TQVBox *m_dateFrame;
KPushButton *m_dateButton;
KPassivePopup *m_datePopup;

4
kmymoney2/widgets/kmymoneydatetbl.cpp
Unescape View File

@ -168,8 +168,8 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col)
TQString weekStr = TQString::number(date.weekNumber(&year));
TQString yearStr = TQString::number(year);
headerText = i18n("Week %1 for year %2.")
.tqarg(weekStr)
.tqarg(yearStr);
.arg(weekStr)
.arg(yearStr);
painter->drawText(0, 0, w, h-1, AlignCenter, headerText, -1, &rect);

4
kmymoney2/widgets/kmymoneyedit.cpp
Unescape View File

@ -118,7 +118,7 @@ TQValidator::State kMyMoneyMoneyValidator::validate( TQString & input, int & _p
// check for minus sign trailing the number
TQRegExp trailingMinus("^([^-]*)\\w*-$");
if(s.find(trailingMinus) != -1) {
s = TQString("-%1").tqarg(trailingMinus.cap(1));
s = TQString("-%1").arg(trailingMinus.cap(1));
}
// check for the maximum allowed number of decimal places
@ -477,7 +477,7 @@ void kMyMoneyEdit::calculatorOpen(TQKeyEvent* k)
if(p.x() + w > TQApplication::desktop()->width())
p.setX(p.x() + width() - w);
TQRect r = m_calculator->tqgeometry();
TQRect r = m_calculator->geometry();
r.moveTopLeft(p);
m_calculatorFrame->setGeometry(r);
m_calculatorFrame->show();

4
kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp
Unescape View File

@ -43,7 +43,7 @@ KMyMoneyForecastListViewItem::~KMyMoneyForecastListViewItem()
{
}
void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
TQColor textColour;
@ -54,7 +54,7 @@ void KMyMoneyForecastListViewItem::paintCell(TQPainter *p, const TQColorGroup &c
}
_cg.setColor(TQColorGroup::Text, textColour);
KListViewItem::paintCell(p, _cg, column, width, tqalignment);
KListViewItem::paintCell(p, _cg, column, width, alignment);
}
void KMyMoneyForecastListViewItem::setNegative(bool isNegative)

2
kmymoney2/widgets/kmymoneyforecastlistviewitem.h
Unescape View File

@ -52,7 +52,7 @@ public:
/**
* use my own paint method
*/
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
private:

4
kmymoney2/widgets/kmymoneygpgconfigdecl.ui
Unescape View File

@ -53,7 +53,7 @@ The &lt;i&gt;Recovery encryption&lt;/i&gt; group is only accessible, if the nece
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>
@ -168,7 +168,7 @@ This mechanism is provided for the case that you have lost your key and cannot a
<property name="textFormat">
<enum>RichText</enum>
</property>
<property name="tqalignment">
<property name="alignment">
<set>WordBreak|AlignTop</set>
</property>
</widget>

6
kmymoney2/widgets/kmymoneylineedit.cpp
Unescape View File

@ -35,11 +35,11 @@
#include "kmymoneylineedit.h"
kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMonetaryDecimalSymbol, int tqalignment) :
kMyMoneyLineEdit::kMyMoneyLineEdit(TQWidget *w, const char* name, bool forceMonetaryDecimalSymbol, int alignment) :
KLineEdit(w, name),
m_forceMonetaryDecimalSymbol(forceMonetaryDecimalSymbol)
{
setAlignment(tqalignment);
setAlignment(alignment);
}
kMyMoneyLineEdit::~kMyMoneyLineEdit()
@ -69,7 +69,7 @@ void kMyMoneyLineEdit::focusOutEvent(TQFocusEvent *ev)
// force update of hint
if(text().isEmpty())
tqrepaint();
repaint();
}
void kMyMoneyLineEdit::keyReleaseEvent(TQKeyEvent* k)

4
kmymoney2/widgets/kmymoneylineedit.h
Unescape View File

@ -52,10 +52,10 @@ public:
* @param name pointer to name of object
* @param forceMonetaryDecimalSymbol if @a true, the numeric keypad comma key will have a fixed
* value and does not follow the keyboard tqlayout (default: @p false)
* @param tqalignment Controls the tqalignment of the text. Default is TQt::AlignLeft | TQt::AlignVCenter.
* @param alignment Controls the alignment of the text. Default is TQt::AlignLeft | TQt::AlignVCenter.
* See TQt::AlignmentFlags for other possible values.
*/
kMyMoneyLineEdit(TQWidget *w = 0, const char* name = 0, bool forceMonetaryDecimalSymbol = false, int tqalignment = (AlignLeft | AlignVCenter));
kMyMoneyLineEdit(TQWidget *w = 0, const char* name = 0, bool forceMonetaryDecimalSymbol = false, int alignment = (AlignLeft | AlignVCenter));
~kMyMoneyLineEdit();
/**

4
kmymoney2/widgets/kmymoneylistviewitem.cpp
Unescape View File

@ -71,7 +71,7 @@ TQString KMyMoneyListViewItem::key(int column, bool ascending) const
}
void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment)
void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment)
{
TQColorGroup _cg = cg;
_cg.setColor(TQColorGroup::Base, backgroundColor());
@ -79,7 +79,7 @@ void KMyMoneyListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int c
// make sure to bypass KListViewItem::paintCell() as
// we don't like it's logic - that's why we do this
// here ;-) (ipwizard)
TQListViewItem::paintCell(p, _cg, column, width, tqalignment);
TQListViewItem::paintCell(p, _cg, column, width, alignment);
}
const TQColor KMyMoneyListViewItem::backgroundColor()

2
kmymoney2/widgets/kmymoneylistviewitem.h
Unescape View File

@ -55,7 +55,7 @@ public:
/**
* use my own paint method
*/
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int tqalignment);
void paintCell(TQPainter *p, const TQColorGroup &cg, int column, int width, int alignment);
/**
* use my own backgroundColor method

6
kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
Unescape View File

@ -238,7 +238,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
if (billSchedules.count() >= 1)
{
text += i18n("%1 Bills.").tqarg(TQString::number(billSchedules.count()));
text += i18n("%1 Bills.").arg(TQString::number(billSchedules.count()));
}
}
@ -254,7 +254,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
{
if(!text.isEmpty())
text += " ";
text += i18n("%1 Deposits.").tqarg(TQString::number(depositSchedules.count()));
text += i18n("%1 Deposits.").arg(TQString::number(depositSchedules.count()));
}
}
@ -270,7 +270,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/,
{
if(!text.isEmpty())
text += " ";
text += i18n("%1 Transfers.").tqarg(TQString::number(transferSchedules.count()));
text += i18n("%1 Transfers.").arg(TQString::number(transferSchedules.count()));
}
}
}

20
kmymoney2/widgets/kmymoneyselector.cpp
Unescape View File

@ -319,7 +319,7 @@ void KMyMoneySelector::removeItem(const TQString& id)
it++;
}
// get rid of top items that just lost the last tqchildren (e.g. Favorites)
// get rid of top items that just lost the last children (e.g. Favorites)
it = TQListViewItemIterator(m_listView, TQListViewItemIterator::NotSelectable);
while((it_v = it.current()) != 0) {
if(it_v->rtti() == 1) {
@ -536,14 +536,14 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp)
TQListViewItem* it_v;
// The logic used here seems to be awkward. The problem is, that
// TQListViewItem::setVisible works recursively on all it's tqchildren
// and grand-tqchildren.
// TQListViewItem::setVisible works recursively on all it's children
// and grand-children.
//
// The way out of this is as follows: Make all items visible.
// Then go through the list again and perform the checks.
// If an item does not have any tqchildren (last leaf in the tree view)
// If an item does not have any children (last leaf in the tree view)
// perform the check. Then check recursively on the parent of this
// leaf that it has no visible tqchildren. If that is the case, make the
// leaf that it has no visible children. If that is the case, make the
// parent invisible and continue this check with it's parent.
while((it_v = it.current()) != 0) {
it_v->setVisible(true);
@ -558,12 +558,12 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp)
if(it_v->firstChild() == 0) {
if(!match(exp, it_v)) {
// this is a node which does not contain the
// text and does not have tqchildren. So we can
// text and does not have children. So we can
// safely hide it. Then we check, if the parent
// has more tqchildren which are still visible. If
// has more children which are still visible. If
// none are found, the parent node is hidden also. We
// continue until the top of the tree or until we
// find a node that still has visible tqchildren.
// find a node that still has visible children.
bool hide = true;
while(hide) {
it_v->setVisible(false);
@ -587,7 +587,7 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp)
if(!firstMatch) {
firstMatch = it_v;
}
// a node with tqchildren contains the text. We want
// a node with children contains the text. We want
// to display all child nodes in this case, so we need
// to advance the iterator to the next sibling of the
// current node. This could well be the sibling of a
@ -606,7 +606,7 @@ int KMyMoneySelector::slotMakeCompletion(const TQRegExp& exp)
} while(it.current() && it.current() != item);
} else {
// It's a node with tqchildren that does not match. We don't
// It's a node with children that does not match. We don't
// change it's status here.
++it;
}

2
kmymoney2/widgets/kmymoneytitlelabel.cpp
Unescape View File

@ -91,7 +91,7 @@ void KMyMoneyTitleLabel::drawContents(TQPainter *p)
TQLabel::drawContents(p);
// then draw text on top
tqstyle().drawItem( p, contentsRect(), tqalignment(), colorGroup(), isEnabled(),
tqstyle().drawItem( p, contentsRect(), alignment(), colorGroup(), isEnabled(),
0, TQString(" ")+m_text, -1, &m_textColor );
}

2
kmymoney2/widgets/kmymoneywizard.cpp
Unescape View File

@ -271,7 +271,7 @@ void KMyMoneyWizard::updateStepCount(void)
hiddenAdjust++;
++step;
}
m_stepLabel->setText(i18n("Step %1 of %2").tqarg(m_step - hiddenAdjust).tqarg(stepCount));
m_stepLabel->setText(i18n("Step %1 of %2").arg(m_step - hiddenAdjust).arg(stepCount));
}
void KMyMoneyWizard::setFirstPage(KMyMoneyWizardPage* page)

10
kmymoney2/widgets/register.cpp
Unescape View File

@ -665,7 +665,7 @@ void Register::slotAutoColumnSizing(int section)
size += "0";
continue;
}
size += TQString("%1").tqarg((columnWidth(i) * 100) / w);
size += TQString("%1").arg((columnWidth(i) * 100) / w);
}
qDebug("size = %s", size.data());
m_account.setValue("kmm-ledger-column-width", size);
@ -1354,7 +1354,7 @@ void Register::adjustColumn(int col)
Q_UNUSED(col)
#else
TQString msg = "%1 adjusting column %2";
::timetrace((msg.tqarg("Start").tqarg(col)).ascii());
::timetrace((msg.arg("Start").arg(col)).ascii());
TQHeader *topHeader = horizontalHeader();
TQFontMetrics cellFontMetrics(KMyMoneyGlobalSettings::listCellFont());
@ -1428,7 +1428,7 @@ void Register::repaintItems(RegisterItem* first, RegisterItem* last)
TQRect tmp = m_lastRepaintRect | r;
if(abs(tmp.height()) > 3000) {
// make sure that the previously triggered tqrepaint has been done before we
// make sure that the previously triggered repaint has been done before we
// trigger the next. Not having this used to cause some trouble when changing
// the focus within a 2000 item ledger from the last to the first item.
TQApplication::eventLoop()->processEvents(TQEventLoop::ExcludeUserInput, 10);
@ -1616,7 +1616,7 @@ bool Register::setFocusItem(RegisterItem* focusItem)
if(focusItem && focusItem->canHaveFocus()) {
if(m_focusItem) {
m_focusItem->setFocus(false);
// issue a tqrepaint here only if we move the focus
// issue a repaint here only if we move the focus
if(m_focusItem != focusItem)
repaintItems(m_focusItem);
}
@ -2290,7 +2290,7 @@ void Register::addGroupMarkers(void)
MyMoneyMoney balance(m_account.value("lastStatementBalance"));
if(m_account.accountGroup() == MyMoneyAccount::Liability)
balance = -balance;
TQString txt = i18n("Online Statement Balance: %1").tqarg(balance.formatMoney(m_account.fraction()));
TQString txt = i18n("Online Statement Balance: %1").arg(balance.formatMoney(m_account.fraction()));
new KMyMoneyRegister::StatementGroupMarker(this, KMyMoneyRegister::Deposit, TQDate::fromString(m_account.value("lastImportedTransactionDate"), Qt::ISODate), txt);
}

4
kmymoney2/widgets/stdtransactionmatched.cpp
Unescape View File

@ -140,7 +140,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row,
case DetailColumn:
align |= TQt::AlignLeft;
txt = TQString("%1 %2").tqarg(matchedTransaction.postDate().toString(Qt::ISODate)).tqarg(matchedTransaction.memo());
txt = TQString("%1 %2").arg(matchedTransaction.postDate().toString(Qt::ISODate)).arg(matchedTransaction.memo());
break;
case PaymentColumn:
@ -181,7 +181,7 @@ void StdTransactionMatched::registerCellText(TQString& txt, int& align, int row,
memo = memo.left(pos-1);
}
}
txt = TQString("%1 %2").tqarg(postDate.toString(Qt::ISODate)).tqarg(memo);
txt = TQString("%1 %2").arg(postDate.toString(Qt::ISODate)).arg(memo);
break;
case PaymentColumn:

14
kmymoney2/widgets/transaction.cpp
Unescape View File

@ -664,10 +664,10 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS
// qDebug("p is in r = %d", r.contains(cpos));
if(r.contains(cpos) && m_erronous) {
if(m_transaction.splits().count() < 2) {
msg = TQString("<qt>%1</qt>").tqarg(i18n("Transaction is missing a category assignment."));
msg = TQString("<qt>%1</qt>").arg(i18n("Transaction is missing a category assignment."));
} else {
const MyMoneySecurity& sec = MyMoneyFile::instance()->security(m_account.currencyId());
msg = TQString("<qt>%1</qt>").tqarg(i18n("The transaction has a missing assignment of <b>%1</b>.").tqarg(m_transaction.splitSum().abs().formatMoney(m_account, sec)));
msg = TQString("<qt>%1</qt>").arg(i18n("The transaction has a missing assignment of <b>%1</b>.").arg(m_transaction.splitSum().abs().formatMoney(m_account, sec)));
}
return true;
}
@ -690,9 +690,9 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS
TQString category = file->accountToCategory(acc.id());
TQString amount = ((*it_s).value() * factor).formatMoney(acc, sec);
txt += TQString("<tr><td><nobr>%1</nobr></td><td align=right><nobr>%2</nobr></td></tr>").tqarg(category, amount);
txt += TQString("<tr><td><nobr>%1</nobr></td><td align=right><nobr>%2</nobr></td></tr>").arg(category, amount);
}
msg = TQString("<table>%1</table>").tqarg(txt);
msg = TQString("<table>%1</table>").arg(txt);
return true;
}
@ -880,7 +880,7 @@ StdTransaction::StdTransaction(Register *parent, const MyMoneyTransaction& trans
addon = i18n("Yield");
}
if(!addon.isEmpty()) {
m_payee += TQString(" (%1)").tqarg(addon);
m_payee += TQString(" (%1)").arg(addon);
}
m_payeeHeader = i18n("Activity");
m_category = i18n("Investment transaction");
@ -1533,7 +1533,7 @@ bool InvestTransaction::formCellText(TQString& txt, int& align, int row, int col
if((fieldEditable = haveShares()) == true) {
txt = m_split.shares().abs().formatMoney("", MyMoneyMoney::denomToPrec(m_security.smallestAccountFraction()));
} else if(haveSplitRatio()) {
txt = TQString("1 / %1").tqarg(m_split.shares().abs().formatMoney("", -1));
txt = TQString("1 / %1").arg(m_split.shares().abs().formatMoney("", -1));
}
break;
}
@ -1712,7 +1712,7 @@ void InvestTransaction::registerCellText(TQString& txt, int& align, int row, int
if(haveShares())
txt = m_split.shares().abs().formatMoney("", MyMoneyMoney::denomToPrec(m_security.smallestAccountFraction()));
else if(haveSplitRatio()) {
txt = TQString("1 / %1").tqarg(m_split.shares().abs().formatMoney("", -1));
txt = TQString("1 / %1").arg(m_split.shares().abs().formatMoney("", -1));
}
break;

6
kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui
Unescape View File

@ -80,7 +80,7 @@
<property name="text">
<string>xxx</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -112,7 +112,7 @@
<property name="text">
<string>xxx</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>
@ -136,7 +136,7 @@
<property name="text">
<string>xxx</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignVCenter|AlignRight</set>
</property>
</widget>

24
kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
Unescape View File

@ -261,7 +261,7 @@ const MyMoneySchedule& NewAccountWizard::Wizard::schedule(void)
m_schedule.setTransaction(t);
} else if(m_account.isLoan()) {
m_schedule.setName(i18n("Loan payment for %1").tqarg(m_accountTypePage->m_accountName->text()));
m_schedule.setName(i18n("Loan payment for %1").arg(m_accountTypePage->m_accountName->text()));
m_schedule.setType(MyMoneySchedule::TYPE_LOANPAYMENT);
if(moneyBorrowed())
m_schedule.setPaymentType(MyMoneySchedule::STYPE_DIRECTDEBIT);
@ -694,7 +694,7 @@ CreditCardSchedulePage::CreditCardSchedulePage(Wizard* wizard, const char* name)
void CreditCardSchedulePage::enterPage(void)
{
if(m_name->text().isEmpty())
m_name->setText(i18n("CreditCard %1 monthly payment").tqarg(m_wizard->m_accountTypePage->m_accountName->text()));
m_name->setText(i18n("CreditCard %1 monthly payment").arg(m_wizard->m_accountTypePage->m_accountName->text()));
}
bool CreditCardSchedulePage::isComplete(void) const
@ -959,14 +959,14 @@ void LoanDetailsPage::slotCalculate(void)
val = calc.presentValue();
m_loanAmount->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", m_wizard->precision()));
result = i18n("KMyMoney has calculated the amount of the loan as %1.")
.tqarg(m_loanAmount->lineedit()->text());
.arg(m_loanAmount->lineedit()->text());
} else if(m_interestRate->lineedit()->text().isEmpty()) {
// calculate the interest rate out of the other information
val = calc.interestRate();
m_interestRate->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3));
result = i18n("KMyMoney has calculated the interest rate to %1%.")
.tqarg(m_interestRate->lineedit()->text());
.arg(m_interestRate->lineedit()->text());
} else if(m_paymentAmount->lineedit()->text().isEmpty()) {
// calculate the periodical amount of the payment out of the other information
@ -979,7 +979,7 @@ void LoanDetailsPage::slotCalculate(void)
calc.setPmt(val);
result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.")
.tqarg(m_paymentAmount->lineedit()->text());
.arg(m_paymentAmount->lineedit()->text());
val = calc.futureValue();
if((moneyBorrowed && val < 0 && fabsl(val) >= fabsl(calc.payment()))
@ -991,7 +991,7 @@ void LoanDetailsPage::slotCalculate(void)
m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision()));
result += TQString(" ");
result += i18n("The number of payments has been decremented and the balloon payment has been modified to %1.")
.tqarg(m_balloonAmount->lineedit()->text());
.arg(m_balloonAmount->lineedit()->text());
} else if((moneyBorrowed && val < 0 && fabsl(val) < fabsl(calc.payment()))
|| (moneyLend && val > 0 && fabs(val) < fabs(calc.payment()))) {
m_balloonAmount->loadText(MyMoneyMoney(0,1).formatMoney("", m_wizard->precision()));
@ -999,7 +999,7 @@ void LoanDetailsPage::slotCalculate(void)
MyMoneyMoney refVal(static_cast<double>(val));
m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision()));
result += i18n("The balloon payment has been modified to %1.")
.tqarg(m_balloonAmount->lineedit()->text());
.arg(m_balloonAmount->lineedit()->text());
}
} else if(m_termAmount->value() == 0) {
@ -1011,7 +1011,7 @@ void LoanDetailsPage::slotCalculate(void)
// if the number of payments has a fractional part, then we
// round it to the smallest integer and calculate the balloon payment
result = i18n("KMyMoney has calculated the term of your loan as %1. ")
.tqarg(updateTermWidgets(floorl(val)));
.arg(updateTermWidgets(floorl(val)));
if(val != floorl(val)) {
calc.setNpp(floorl(val));
@ -1019,7 +1019,7 @@ void LoanDetailsPage::slotCalculate(void)
MyMoneyMoney refVal(static_cast<double>(val));
m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision()));
result += i18n("The balloon payment has been modified to %1.")
.tqarg(m_balloonAmount->lineedit()->text());
.arg(m_balloonAmount->lineedit()->text());
}
} else {
@ -1050,7 +1050,7 @@ void LoanDetailsPage::slotCalculate(void)
MyMoneyMoney refVal(static_cast<double>(val));
result = i18n("KMyMoney has calculated a balloon payment of %1 for this loan.")
.tqarg(refVal.abs().formatMoney("", m_wizard->precision()));
.arg(refVal.abs().formatMoney("", m_wizard->precision()));
if(!m_balloonAmount->lineedit()->text().isEmpty()) {
if((m_balloonAmount->value().abs() - refVal.abs()).abs().toDouble() > 1) {
@ -1626,7 +1626,7 @@ void AccountSummaryPage::enterPage(void)
if(m_wizard->m_brokeragepage->m_createBrokerageButton->isChecked()) {
group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Brokerage Account"), TQString(), TQString(), TQCheckListItem::RadioButtonController);
group->setOpen(true);
p = new KListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").tqarg(acc.name()));
p = new KListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").arg(acc.name()));
p = new KListViewItem(group, p, i18n("Currency"), m_wizard->m_brokeragepage->m_brokerageCurrency->security().name());
if(m_wizard->m_brokeragepage->m_accountNumber->isEnabled() && !m_wizard->m_brokeragepage->m_accountNumber->text().isEmpty())
p = new KListViewItem(group, p, i18n("Number"), m_wizard->m_brokeragepage->m_accountNumber->text());
@ -1644,7 +1644,7 @@ void AccountSummaryPage::enterPage(void)
} else {
p = new KListViewItem(group, p, i18n("Amount lent"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision()));
}
p = new KListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").tqarg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1)));
p = new KListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").arg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1)));
p = new KListViewItem(group, p, i18n("Interest rate is"), m_wizard->m_generalLoanInfoPage->m_interestType->currentText());
p = new KListViewItem(group, p, i18n("Principal and interest"), m_wizard->m_loanDetailsPage->m_paymentAmount->value().formatMoney(acc, sec));
p = new KListViewItem(group, p, i18n("Additional fees"), m_wizard->m_loanPaymentPage->additionalFees().formatMoney(acc, sec));

2
kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui
Unescape View File

@ -132,7 +132,7 @@
<string>Payment should be made
from account</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignTop</set>
</property>
</widget>

2
kmymoney2/wizards/newuserwizard/kintropagedecl.ui
Unescape View File

@ -29,7 +29,7 @@
<property name="text">
<string>Welcome to KMyMoney!</string>
</property>
<property name="tqalignment">
<property name="alignment">
<set>AlignCenter</set>
</property>
</widget>

4
kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
Unescape View File

@ -208,7 +208,7 @@ void GeneralPage::slotLoadFromKABC(void)
TQString sep;
if(!a.country().isEmpty() && !a.region().isEmpty())
sep = " / ";
m_countyEdit->setText(TQString("%1%2%3").tqarg(a.country(), sep, a.region()));
m_countyEdit->setText(TQString("%1%2%3").arg(a.country(), sep, a.region()));
m_postcodeEdit->setText( a.postalCode() );
m_townEdit->setText( a.locality() );
m_streetEdit->setText( a.street() );
@ -329,7 +329,7 @@ FilePage::FilePage(Wizard* wizard, const char* name) :
KUser user;
m_dataFileEdit->setShowLocalProtocol(false);
m_dataFileEdit->setURL(TQString("%1/%2.kmy").tqarg(TQDir::homeDirPath(), user.loginName()));
m_dataFileEdit->setURL(TQString("%1/%2.kmy").arg(TQDir::homeDirPath(), user.loginName()));
// allow selection of non-existing files
m_dataFileEdit->setMode(KFile::File);

8
libkdchart/KDChart.cpp
Unescape View File

@ -302,7 +302,7 @@ void KDChart::paint( TQPainter* painter,
}
//qDebug("xxx" );
if( (params || data) && !setupGeometry( painter, params, data, drawRect ) ){
qDebug("ERROR: KDChart::paint() could not calculate the chart tqgeometry.");
qDebug("ERROR: KDChart::paint() could not calculate the chart geometry.");
bOk = false;
}
}else{
@ -439,12 +439,12 @@ TQString KDChart::globals()
}
globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT=\"%1\";\n" )
.tqarg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
.arg( TQString::fromLatin1( KDCHART_AXIS_LABELS_AUTO_DATETIME_FORMAT ) );
globals += TQString::fromLatin1( "const KDCHART_AXIS_LABELS_AUTO_LIMIT = 140319.64;\n" );
globals += TQString::fromLatin1( "const KDCHART_DEFAULT_AXIS_GRID_COLOR = new Color(\"%1\");\n" )
.tqarg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
.arg(KDCHART_DEFAULT_AXIS_GRID_COLOR.name());
globals += TQString::fromLatin1( "const KDCHART_DATA_VALUE_AUTO_COLOR = new Color(\"%1\");\n" )
.tqarg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
.arg( (KDCHART_DATA_VALUE_AUTO_COLOR)->name());
TQMap<char*,TQColor> colorMap;

2
libkdchart/KDChartAreaPainter.cpp
Unescape View File

@ -43,7 +43,7 @@
KDChartLinesPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}

8
libkdchart/KDChartAxesPainter.cpp
Unescape View File

@ -65,7 +65,7 @@ int secondsSinceUTCStart( const TQDateTime& dt )
KDChartPainter( params )
{
// Intentionally left blank.
// We cannot setup the tqgeometry yet
// We cannot setup the geometry yet
// since we do not know the size of the painter.
}
@ -2823,7 +2823,7 @@ void KDChartAxesPainter::calculateLabelTexts(
const double secHour = 60.0 * secMin;
const double secDay = 24.0 * secHour;
//
// we temporarily disable week tqalignment until bug
// we temporarily disable week alignment until bug
// is fixed (1st week of year must not start in the
// preceeding year but rather be shown incompletely)
//
@ -3661,7 +3661,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
sVal.setNum( nVal, 'f', bUseAutoDigits ? nTrustedPrecision
: TQMIN(behindComma, nTrustedPrecision) );
//qDebug("nVal: %f sVal: "+sVal, nVal );
//qDebug( TQString(" %1").tqarg(sVal));
//qDebug( TQString(" %1").arg(sVal));
if ( bUseAutoDigits ) {
int comma = sVal.find( '.' );
if ( -1 < comma ) {
@ -3697,7 +3697,7 @@ TQString KDChartAxesPainter::truncateBehindComma( const double nVal,
}
}
}
//qDebug( TQString(" - %1").tqarg(trueBehindComma));
//qDebug( TQString(" - %1").arg(trueBehindComma));
return sVal;
}

4
libkdchart/KDChartBWPainter.cpp
Unescape View File

@ -55,7 +55,7 @@
KDChartAxesPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}
@ -291,7 +291,7 @@ void KDChartBWPainter::specificPaintData( TQPainter* painter,
const bool noBrush = TQt::NoBrush == params()->bWChartBrush().style();
// Loop over the datasets, draw one box and whisker tqshape for each series.
// Loop over the datasets, draw one box and whisker shape for each series.
for ( uint dataset = chartDatasetStart;
dataset <= chartDatasetEnd;
++dataset ) {

4
libkdchart/KDChartBarPainter.cpp
Unescape View File

@ -48,7 +48,7 @@ KDChartBarPainter::KDChartBarPainter( KDChartParams* params ) :
KDChartAxesPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}
@ -226,7 +226,7 @@ void KDChartBarPainter::specificPaintData( TQPainter* painter,
? 0.0
: static_cast<int>( valueBlockGap ) * numValues;
// Set some tqgeometry values that apply to bar charts only
// Set some geometry values that apply to bar charts only
double totalNumberOfBars = 0.0;
double spaceBetweenDatasets = 0.0;
switch ( params()->barChartSubType() ) {

12
libkdchart/KDChartCustomBox.h
Unescape View File

@ -181,7 +181,7 @@ public:
\param deltaAlign The way how \c deltaX and \deltaY affect the position of the box.
Leave this parameter to its default value KDCHART_AlignAuto to have the delta values
used according to the box's main \c align settings, otherwise specify your own
tqalignment settings: e.g. right means there will be a gap between the right side of
alignment settings: e.g. right means there will be a gap between the right side of
the box and its anchor point - if the main \c align parameter is set to right too
the anchor point will to be outside of the box / if \c align is set to left
(but the \c deltaAlign to right) the anchor point will be inside the box.
@ -192,7 +192,7 @@ public:
\li \c TQt::AlignRight | TQt::AlignTop
\li \c TQt::AlignRight | TQt::AlignBottom
Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
center delta tqalignment will cause KDChart to ignore the respective delta
center delta alignment will cause KDChart to ignore the respective delta
settings: deltaX or deltaY or both will become ineffective.
\param deltaScaleGlobal If true the actual delta X and delta Y values will
be calculated by \c deltaX and \c deltaY based upon the size of the
@ -297,7 +297,7 @@ public:
\param deltaAlign The way how \c deltaX and \deltaY affect the position of the box.
Leave this parameter to its default value KDCHART_AlignAuto to have the delta values
used according to the box's main \c align settings, otherwise specify your own
tqalignment settings: e.g. TQt::AlignRight means the box will be moved to the left
alignment settings: e.g. TQt::AlignRight means the box will be moved to the left
(by the amount calculated using the \c deltaX value), so there will be a gap
between the right side of the box and its anchor point IF the main \c align flag
is set to TQt::AlignRight too, so the anchor point will to be outside of the
@ -310,7 +310,7 @@ public:
\li \c TQt::AlignRight | TQt::AlignTop
\li \c TQt::AlignRight | TQt::AlignBottom
Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
center delta tqalignment will cause KDChart to ignore the respective delta
center delta alignment will cause KDChart to ignore the respective delta
settings: deltaX or deltaY or both will become ineffective.
\note Moving of the box due to \c deltaAlign settings is applied after
the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop
@ -643,7 +643,7 @@ public slots: // PENDING(blackie) merge slots sections.
Set this to KDHART_KDCHART_AlignAuto to have the delta values
used according to the box's main \c align settings, otherwise specify your own
tqalignment settings: e.g. right means there will be a gap between the right side of
alignment settings: e.g. right means there will be a gap between the right side of
the box and its anchor point - if the main \c align parameter is set to right too
the anchor point will to be outside of the box / if \c align is set to left
(but the \c deltaAlign to right) the anchor point will be inside the box.
@ -654,7 +654,7 @@ public slots: // PENDING(blackie) merge slots sections.
\li \c TQt::AlignRight | TQt::AlignTop
\li \c TQt::AlignRight | TQt::AlignBottom
Using AlignVCenter or AlignHCenter or AlignCenter does not make sense here:
center delta tqalignment will cause KDChart to ignore the respective delta
center delta alignment will cause KDChart to ignore the respective delta
settings: deltaX or deltaY or both will become ineffective.
\note Moving of the box due to \c deltaAlign settings is applied after
the box is rotated: e.g. this means a gap specified by \c deltaAlign = TQt::AlignTop

8
libkdchart/KDChartEnums.h
Unescape View File

@ -240,7 +240,7 @@ public:
\image html "../refman_images/positions.png"
\image latex "../refman_images/positions.png" "the PositionFlag enum" width=4in
\note The position and tqalignment of content to be printed at (or
\note The position and alignment of content to be printed at (or
inside of, resp.) an area or a point -- like for printing data value texts next
to their graphical representations (which might be a bar, line, pie slice,...) --
is specified by two parameters: a \c PositionFlag and a uint holding a combination of \c TQt::AlignmentFlags.
@ -249,10 +249,10 @@ public:
The position of content and the way it is aligned to this
position is shown in the following drawing, note that annotation #2 and annotation #3
share the same PositionFlag but have different tqalignment flags set:
share the same PositionFlag but have different alignment flags set:
\image html "../refman_images/tqalignment.png"
\image latex "../refman_images/tqalignment.png" "positioning and aligning" width=4in
\image html "../refman_images/alignment.png"
\image latex "../refman_images/alignment.png" "positioning and aligning" width=4in
\sa KDChartParams::setPrintDataValues
*/

2
libkdchart/KDChartHiLoPainter.cpp
Unescape View File

@ -49,7 +49,7 @@
KDChartAxesPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}

2
libkdchart/KDChartLinesPainter.cpp
Unescape View File

@ -56,7 +56,7 @@ KDChartLinesPainter::KDChartLinesPainter( KDChartParams* params ) :
KDChartAxesPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}

14
libkdchart/KDChartObjectFactory.cpp
Unescape View File

@ -438,11 +438,11 @@ bool KDChartObjectFactory::isNumber( const TQVariant& v )
bool KDChartObjectFactory::checkArgCount( const TQString& className, int count, int min, int max )
{
if ( count < min ) {
throwError( TQObject::tr( "Too few arguments when creating %1 object." ).tqarg( className ) );
throwError( TQObject::tr( "Too few arguments when creating %1 object." ).arg( className ) );
return false;
}
if ( count > max ) {
throwError( TQObject::tr( "Too many arguments when creating %1 object." ).tqarg( className ) );
throwError( TQObject::tr( "Too many arguments when creating %1 object." ).arg( className ) );
return false;
}
return true;
@ -453,7 +453,7 @@ bool KDChartObjectFactory::checkArgsIsTQtClass( const TQSArgumentList& args, int
{
const TQSArgument& arg = args[index-1];
if ( arg.type() != TQSArgument::TQObjectPtr || !arg.qobject()->inherits( expected ) ) {
throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).tqarg(index).tqarg(constructing).tqarg(expected) );
throwError( TQObject::tr( "Invalid type for argument no %1 to %2, must be a %3" ).arg(index).arg(constructing).arg(expected) );
return false;
}
return true;
@ -464,7 +464,7 @@ bool KDChartObjectFactory::getString( const TQSArgumentList& args, int index, TQ
{
const TQSArgument& arg = args[index-1];
if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::String ) {
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).tqarg(index).tqarg(constructing) );
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a string" ).arg(index).arg(constructing) );
return false;
}
else {
@ -477,7 +477,7 @@ bool KDChartObjectFactory::getNumber( const TQSArgumentList& args, int index, do
{
const TQSArgument& arg = args[index-1];
if ( arg.type() != TQSArgument::Variant || !isNumber(arg.variant()) ) {
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).tqarg(index).tqarg( constructing ) );
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a number" ).arg(index).arg( constructing ) );
return false;
}
else {
@ -508,7 +508,7 @@ bool KDChartObjectFactory::getBool( const TQSArgumentList& args, int index, bool
{
const TQSArgument& arg = args[index-1];
if ( arg.type() != TQSArgument::Variant || arg.variant().type() != TQVariant::Bool ) {
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).tqarg(index).tqarg( constructing ) );
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a boolean" ).arg(index).arg( constructing ) );
return false;
}
else {
@ -521,7 +521,7 @@ bool KDChartObjectFactory::checkIsTQtVariant( const TQSArgumentList& args, int i
{
const TQSArgument& arg = args[index-1];
if ( arg.type() != TQSArgument::Variant || arg.variant().type() != expected ) {
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").tqarg(index).tqarg(constructing).tqarg(variantName) );
throwError( TQObject::tr( "Invalid type for argument %1 to %2, must be a %3").arg(index).arg(constructing).arg(variantName) );
return false;
}
else

14
libkdchart/KDChartPainter.cpp
Unescape View File

@ -103,7 +103,7 @@ _legendTitleWidth( 0 ),
_legendTitleMetricsHeight( 0 )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}
/**
@ -979,7 +979,7 @@ TQPoint KDChartPainter::calculateAnchor( const KDChartCustomBox & box,
// Rule:
//
// A box may be aligned to another box (and the 2nd box may again be
// aligned to a 3rd box and so on) but NO CIRCULAR tqalignment is allowed.
// aligned to a 3rd box and so on) but NO CIRCULAR alignment is allowed.
//
if( !box.anchorBeingCalculated() ) {
@ -1650,7 +1650,7 @@ void KDChartPainter::paintHeaderFooter( TQPainter* painter,
params()->headerFooterFontRelSize( iHdFt ) * averageValueP1000 ) );
painter->setPen( params()->headerFooterColor( iHdFt ) );
painter->setFont( actFont );
// Note: The tqalignment flags used here match the rect calculation
// Note: The alignment flags used here match the rect calculation
// done in KDChartPainter::setupGeometry().
// AlignTop is done to ensure that the hd/ft texts of the same
// group (e.g. Hd2L and Hd2 and Hd2R) have the same baselines.
@ -2063,7 +2063,7 @@ void KDChartPainter::calculateAllAxesRects(
int nAxesBottom = TQMAX( nAxesBottom0 + nAxesBottomADD, nMinDistance );
// for micro tqalignment with the X axis, we adjust the Y axis - but not for Area Charts:
// for micro alignment with the X axis, we adjust the Y axis - but not for Area Charts:
// otherwise the areas drawn would overwrite the Y axis line.
int nAxesLeft = TQMAX( nAxesLeft0 + nAxesLeftADD, nMinDistance )
- (bIsAreaChart ? 0 : 1);
@ -2143,10 +2143,10 @@ void KDChartPainter::calculateAllAxesRects(
/**
This method will be called whenever any parameters that affect
tqgeometry have been changed. It will compute the appropriate
geometry have been changed. It will compute the appropriate
positions for the various parts of the chart (legend, axes, data
area etc.). The implementation in KDChartPainter computes a
standard tqgeometry that should be suitable for most chart
standard geometry that should be suitable for most chart
types. Subclasses can provide their own implementations.
\param data the data that will be displayed as a chart
@ -2158,7 +2158,7 @@ void KDChartPainter::setupGeometry( TQPainter* painter,
const TQRect& drawRect )
{
//qDebug("INVOKING: KDChartPainter::setupGeometry()");
// avoid recursion from tqrepaint() being called due to params() changed signals...
// avoid recursion from repaint() being called due to params() changed signals...
const bool oldBlockSignalsState = params()->signalsBlocked();
const_cast < KDChartParams* > ( params() )->blockSignals( true );

44
libkdchart/KDChartParams.cpp
Unescape View File

@ -707,7 +707,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
break;
++i;
}while( properties(id, propSet) );
// retrieve marker tqalignment
// retrieve marker alignment
propSet.deepCopy( &startSet ); i=0;
do{
if( propSet.hasOwnMarkerAlign( id, markerAlign ) ){
@ -750,7 +750,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
// extra lines:
// retrieve tqalignment of extra lines
// retrieve alignment of extra lines
propSet.deepCopy( &startSet ); i=0;
do{
if( propSet.hasOwnExtraLinesAlign( id, extraLinesAlign ) ){
@ -813,7 +813,7 @@ bool KDChartParams::calculateProperties( int startId, KDChartPropertySet& rSet )
// markers at the ends of the extra lines:
// retrieve marker tqalignment
// retrieve marker alignment
propSet.deepCopy( &startSet ); i=0;
do{
if( propSet.hasOwnExtraMarkersAlign( id, extraMarkersAlign ) ){
@ -976,7 +976,7 @@ aligned to.
This must be a reasonable combination of TQt::AlignmentFlags.
\param negativeDeltaX The X distance between the <b>anchor
point</b> -- specified by \c negativePosition (or \c
positivePosition, resp.) -- and the internal <b>tqalignment point</b>
positivePosition, resp.) -- and the internal <b>alignment point</b>
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). <b>Note: </b> For better compatibility to the dynamic font
size this parameter is interpreted as being a per-cent value of the
@ -987,7 +987,7 @@ size of the chart and the specification made via parameter \c size.
\param negativeDeltaY The Y distance between the <b>anchor
point</b> -- specified by \c negativePosition (or \c
positivePosition, resp.) -- and the internal <b>tqalignment point</b>
positivePosition, resp.) -- and the internal <b>alignment point</b>
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). <b>Note: </b> For better compatibility to the dynamic font
size this parameter is interpreted as being a per-cent value of the
@ -1002,7 +1002,7 @@ special values that you might find usefull for Pie charts or for
Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c
KDCHART_TANGENTIAL_ROTATION both leading to individual
calculation of appropriate rotation for each data value. Rotation
will be performed around the internal <b>tqalignment point</b> of the
will be performed around the internal <b>alignment point</b> of the
text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
The following parameters apply to values greater than zero or equal zero:
@ -1013,7 +1013,7 @@ aligned to.
This must be a reasonable combination of TQt::AlignmentFlags.
\param negativeDeltaX The X distance between the <b>anchor
point</b> -- specified by \c negativePosition (or \c
positivePosition, resp.) -- and the internal <b>tqalignment point</b>
positivePosition, resp.) -- and the internal <b>alignment point</b>
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). <b>Note: </b> For better compatibility to the dynamic font
size this parameter is interpreted as being a per-cent value of the
@ -1023,7 +1023,7 @@ delta value are calculated dynamically before painting based on the
size of the chart and the specification made via parameter \c size.
\param positiveDeltaY The Y distance between the <b>anchor
point</b> -- specified by \c negativePosition (or \c
positivePosition, resp.) -- and the internal <b>tqalignment point</b>
positivePosition, resp.) -- and the internal <b>alignment point</b>
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). <b>Note: </b> For better compatibility to the dynamic font
size this parameter is interpreted as being a per-cent value of the
@ -1038,7 +1038,7 @@ special values that you might find usefull for Pie charts or for
Ring charts: \c KDCHART_SAGGITAL_ROTATION and \c
KDCHART_TANGENTIAL_ROTATION both leading to individual
calculation of appropriate rotation for each data value. Rotation
will be performed around the internal <b>tqalignment point</b> of the
will be performed around the internal <b>alignment point</b> of the
text -- specified by \c negativeAlign (or \c positiveAlign, resp.).
\param layoutPolicy The way to handle too narrow space conflicts:
@ -1872,10 +1872,10 @@ TQString KDChartParams::dataRegionFrameAreaName( uint dataRow,
uint data3rd )
{
return TQString( "%1/%2/%3/%4" )
.tqarg( KDChartEnums::AreaChartDataRegion, 5 )
.tqarg( dataRow, 5 )
.tqarg( dataCol, 5 )
.tqarg( data3rd, 5 );
.arg( KDChartEnums::AreaChartDataRegion, 5 )
.arg( dataRow, 5 )
.arg( dataCol, 5 )
.arg( data3rd, 5 );
}
@ -2609,7 +2609,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
{
if( pIterIdx )
*pIterIdx = 0;
const TQString key( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
const TQString key( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
KDChartFrameSettings* it = _areaDict.find( key );
bFound = ( it != 0 );
if( bFound )
@ -2643,7 +2643,7 @@ const KDChartParams::KDChartFrameSettings* KDChartParams::frameSettings( uint ar
*/
bool KDChartParams::removeFrame( uint area )
{
return _areaDict.remove( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ) );
return _areaDict.remove( TQString( "%1/-----/-----/-----" ).arg( area, 5 ) );
}
@ -4617,7 +4617,7 @@ void KDChartParams::setThreeDBarAngle( uint angle )
point. Only used if chartType() == Line and if threeDLines() ==
false. The default is not to draw markers.
\note Use the setLineMarkerStyle function to specify the tqshape
\note Use the setLineMarkerStyle function to specify the shape
of the markers, use the setLineWidth function to set the
width of the lines connecting the markers (or to surpress
drawing of such lines, resp.)
@ -7487,7 +7487,7 @@ void KDChartParams::setAxisParams( uint n,
You might want to use those sections to show some marginal information
like department name, print date, page number... <br>
<b>Note:</b> Those headers <b>share the same area</b> so make sure to
specify propper horizontal tqalignment for each section when using more than
specify propper horizontal alignment for each section when using more than
one of them. By default \c HdFtPosHeader0 has centered alignement,
\c HdFtPosHeader0L is aligned to the left and \c HdFtPosHeader0R to the
right side. All of them are vertically aligned to the bottom, you may
@ -7504,7 +7504,7 @@ void KDChartParams::setAxisParams( uint n,
You could use this headers to show the main information such as project name,
chart title or period of time (e.g. census year). <br>
Like their counterparts they share the same part of the printable area so the
restrictions regarding tqalignment mentioned above apply also to these three
restrictions regarding alignment mentioned above apply also to these three
sections.
\li Up to three <b>additional headers</b> ( \c HdFtPosHeader2 , \c
@ -7513,7 +7513,7 @@ void KDChartParams::setAxisParams( uint n,
This headers could show additional information such as project phase, chart
sub-title or sub-period of time (e.g. census quarter-year). <br>
Like their counterparts they share the same part of the printable area so the
restrictions regarding tqalignment mentioned above apply also to these three
restrictions regarding alignment mentioned above apply also to these three
sections.
<p>
@ -7524,7 +7524,7 @@ void KDChartParams::setAxisParams( uint n,
You might want to use these footers instead of (or additional to) the
main header(s) for showing the main information... <br>
Like their header-counterparts they share the same part of the printable area
so the restrictions regarding tqalignment mentioned above apply also to these
so the restrictions regarding alignment mentioned above apply also to these
three sections.
\li Up to three <b>additional footers</b> ( \c HdFtPosFooter2 , \c
@ -7533,7 +7533,7 @@ void KDChartParams::setAxisParams( uint n,
This footers could show additional information instead of (or additional to)
the additional header(s). <br>
Like their counterparts they share the same part of the printable area so the
restrictions regarding tqalignment mentioned above apply also to these three
restrictions regarding alignment mentioned above apply also to these three
sections.
\li Up to three <b>trailing footers</b> ( \c HdFtPosFooter0 , \c
@ -7542,7 +7542,7 @@ void KDChartParams::setAxisParams( uint n,
You might want to use those sections to show some marginal information
instead of (or additional to) the leading header(s). <br>
Like their counterparts they share the same part of the printable area so the
restrictions regarding tqalignment mentioned above apply also to these three
restrictions regarding alignment mentioned above apply also to these three
sections.
\note The names \c HdFtPosHeader or \c HdFtPosFooter are the basic names also returned by \c basicAxisPos.

4
libkdchart/KDChartParams.h
Unescape View File

@ -393,7 +393,7 @@ public slots:
bool addFrameHeightToLayout = true )
{
_areaDict.setAutoDelete( TRUE );
_areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
_areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
new KDChartFrameSettings(0,0,0,
frame,
outerGapX,
@ -436,7 +436,7 @@ public slots:
shadowWidth,
sunPos );
_areaDict.replace( TQString( "%1/-----/-----/-----" ).tqarg( area, 5 ),
_areaDict.replace( TQString( "%1/-----/-----/-----" ).arg( area, 5 ),
new KDChartFrameSettings( 0,0,0, frame,
outerGapX,
outerGapY,

10
libkdchart/KDChartParams_io.cpp
Unescape View File

@ -2194,12 +2194,12 @@ bool KDChartParams::loadXML( const TQDomDocument& doc )
TQString str;
if(areaId == KDChartEnums::AreaChartDataRegion)
str = TQString( "%1/%2/%3/%4" )
.tqarg( areaId, 5 )
.tqarg( frameSettings->dataRow(), 5 )
.tqarg( frameSettings->dataCol(), 5 )
.tqarg( 0, 5 );//frameSettings->data3rd(), 5 );
.arg( areaId, 5 )
.arg( frameSettings->dataRow(), 5 )
.arg( frameSettings->dataCol(), 5 )
.arg( 0, 5 );//frameSettings->data3rd(), 5 );
else
str = TQString( "%1/-----/-----/-----" ).tqarg( areaId, 5 );
str = TQString( "%1/-----/-----/-----" ).arg( areaId, 5 );
_areaDict.replace( str, frameSettings );
}
}

2
libkdchart/KDChartPiePainter.cpp
Unescape View File

@ -55,7 +55,7 @@
KDChartPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}

2
libkdchart/KDChartPolarPainter.cpp
Unescape View File

@ -50,7 +50,7 @@ KDChartPolarPainter::KDChartPolarPainter( KDChartParams* params ) :
KDChartPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}

6
libkdchart/KDChartPropertySet.h
Unescape View File

@ -721,14 +721,14 @@ public slots:
}
/**
Specify the ID of the property set specifying the tqalignment of the
Specify the ID of the property set specifying the alignment of the
Marker to be displayed for this data value
<b>or</b> specifying this flag directly.
\note This function should be used for Line Charts only, otherwise
the settings specified here will be ignored.
\param idMarkerAlign ID of the property set specifying the tqalignment
\param idMarkerAlign ID of the property set specifying the alignment
of the Marker to be shown.
Use special value KDChartPropertySet::UndefinedID
to specify neither another property set's ID
@ -737,7 +737,7 @@ public slots:
if you do NOT want to inherit another property set's
settings but want to specify the flag by using
the following parameter.
\param markerAlign The tqalignment of the marker to be shown.
\param markerAlign The alignment of the marker to be shown.
This parameter is stored but ignored if the previous parameter
is not set to KDChartPropertySet::OwnID.

2
libkdchart/KDChartRingPainter.cpp
Unescape View File

@ -53,7 +53,7 @@
KDChartPainter( params )
{
// This constructor intentionally left blank so far; we cannot setup the
// tqgeometry yet since we do not know the size of the painter.
// geometry yet since we do not know the size of the painter.
}

6
libkdchart/KDChartWidget.cpp
Unescape View File

@ -244,8 +244,8 @@ void KDChartWidget::resizeEvent( TQResizeEvent* /*event*/ )
display process, so this is turned off by default.
If active data reporting is turned on when the widget is already
shown, data will be reported after the next tqrepaint(). Call
tqrepaint() explicitly if necessary.
shown, data will be reported after the next repaint(). Call
repaint() explicitly if necessary.
Active data is currently supported for bar, pie, and line charts
(the latter only with markers, as trying to hit the line would be
@ -281,7 +281,7 @@ bool KDChartWidget::isActiveData() const
needs to be kept around. However, in most cases, it is worth
spending the extra memory. Double-buffering is on by
default. Turning double-buffering on or off does not trigger a
tqrepaint.
repaint.
\param doublebuffered if true, turns double-buffering on, if false,
turns double-buffering off

2
libkdchart/KDDrawText.cpp
Unescape View File

@ -408,7 +408,7 @@ void KDDrawText::drawRotatedTxt( TQPainter* painter,
painter->drawLine( x+pBotRight.x(), y+pBotRight.y()-3, x+pBotRight.x(), y+pBotRight.y()+3 );
*/
// The horizontal and vertical tqalignment together define one of
// The horizontal and vertical alignment together define one of
// NINE possible points: this point must be moved on the anchor.
int hAlign = align & ( TQt::AlignLeft | TQt::AlignRight | TQt::AlignHCenter );
int vAlign = align & ( TQt::AlignTop | TQt::AlignBottom | TQt::AlignVCenter );

2
libkdchart/KDFrameProfileSection.h
Unescape View File

@ -104,7 +104,7 @@ public:
/**
Profile Curvature Mode: specifying the tqshape of a frame profile section.
Profile Curvature Mode: specifying the shape of a frame profile section.
(curvature setting will be ignored for \c DirPlain profiles)
\li \c CvtFlat looking like a evenly sloping surface.

26
libkgpgfile/kgpgfile.cpp
Unescape View File

@ -85,7 +85,7 @@ KGPGFile::~KGPGFile()
void KGPGFile::init(void)
{
setFlags(IO_Sequential);
seStatus(IO_Ok);
setStatus(IO_Ok);
setState(0);
}
@ -151,19 +151,19 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
TQStringList args;
if(cmdArgs.isEmpty()) {
args << "--homedir" << TQString("\"%1\"").tqarg(m_homedir)
args << "--homedir" << TQString("\"%1\"").arg(m_homedir)
<< "-q"
<< "--batch";
if(isWritable()) {
args << "-ea"
<< "-z" << "6"
<< "--comment" << TQString("\"%1\"").tqarg(m_comment)
<< "--comment" << TQString("\"%1\"").arg(m_comment)
<< "--trust-model=always"
<< "-o" << TQString("\"%1\"").tqarg(m_fn);
<< "-o" << TQString("\"%1\"").arg(m_fn);
TQValueList<TQCString>::Iterator it;
for(it = m_recipient.begin(); it != m_recipient.end(); ++it)
args << "-r" << TQString("\"%1\"").tqarg(TQString(*it));
args << "-r" << TQString("\"%1\"").arg(TQString(*it));
// some versions of GPG had trouble to replace a file
// so we delete it first
@ -174,7 +174,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
args << "--passphrase-fd" << "0";
else
args << "--use-agent";
args << "--no-default-recipient" << TQString("\"%1\"").tqarg(m_fn);
args << "--no-default-recipient" << TQString("\"%1\"").arg(m_fn);
}
} else {
args = TQStringList::split(" ", cmdArgs);
@ -218,7 +218,7 @@ bool KGPGFile::open(int mode, const TQString& cmdArgs, bool skipPasswd)
}
setState( IO_Open );
tqat( 0 );
at( 0 );
// qDebug("File open");
return true;
}
@ -444,7 +444,7 @@ void KGPGFile::slotGPGExited(KProcess* )
if(m_process->normalExit()) {
m_exitStatus = m_process->exitStatus();
if(m_exitStatus != 0)
seStatus(IO_UnspecifiedError);
setStatus(IO_UnspecifiedError);
} else {
m_exitStatus = -1;
}
@ -542,7 +542,7 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern)
KGPGFile file;
TQString args("--list-keys --with-colons");
if(!pattern.isEmpty())
args += TQString(" %1").tqarg(pattern);
args += TQString(" %1").arg(pattern);
file.open(IO_ReadOnly, args, true);
while((len = file.readBlock(buffer, sizeof(buffer)-1)) != EOF) {
buffer[len] = 0;
@ -569,13 +569,13 @@ void KGPGFile::publicKeyList(TQStringList& list, const TQString& pattern)
TQDate expiration = TQDate::fromString(fields[6], Qt::ISODate);
if(expiration > TQDate::currentDate()) {
currentKey = fields[4];
val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
val = TQString("%1:%2").arg(currentKey).arg(fields[9]);
map[val] = val;
} else {
qDebug("'%s' is expired", fields[9].data());
}
} else if(fields[0] == "uid") {
val = TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
val = TQString("%1:%2").arg(currentKey).arg(fields[9]);
map[val] = val;
}
}
@ -614,9 +614,9 @@ void KGPGFile::secretKeyList(TQStringList& list)
TQStringList fields = TQStringList::split(":", (*it), true);
if(fields[0] == "sec") {
currentKey = fields[4];
list << TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
list << TQString("%1:%2").arg(currentKey).arg(fields[9]);
} else if(fields[0] == "uid") {
list << TQString("%1:%2").tqarg(currentKey).tqarg(fields[9]);
list << TQString("%1:%2").arg(currentKey).arg(fields[9]);
}
}
}

Write Preview
Loading…
Cancel
Save