diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp
index 9be8003..924bda2 100644
--- a/kmymoney2/converter/mymoneygncreader.cpp
+++ b/kmymoney2/converter/mymoneygncreader.cpp
@@ -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());
diff --git a/kmymoney2/converter/mymoneyqifprofile.cpp b/kmymoney2/converter/mymoneyqifprofile.cpp
index f9854f9..52ef770 100644
--- a/kmymoney2/converter/mymoneyqifprofile.cpp
+++ b/kmymoney2/converter/mymoneyqifprofile.cpp
@@ -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;
}
diff --git a/kmymoney2/converter/mymoneyqifreader.cpp b/kmymoney2/converter/mymoneyqifreader.cpp
index 75aca75..9390429 100644
--- a/kmymoney2/converter/mymoneyqifreader.cpp
+++ b/kmymoney2/converter/mymoneyqifreader.cpp
@@ -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("%1").tqarg(i18n("KMyMoney has imported a second opening balance transaction into account %1 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("%1").arg(i18n("KMyMoney has imported a second opening balance transaction into account %1 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::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::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 %2 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 %2 currently does not exist. You can "
"create a new %3 by pressing the Create 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 Create 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(),
diff --git a/kmymoney2/converter/mymoneyqifwriter.cpp b/kmymoney2/converter/mymoneyqifwriter.cpp
index d84e325..9fed9d5 100644
--- a/kmymoney2/converter/mymoneyqifwriter.cpp
+++ b/kmymoney2/converter/mymoneyqifwriter.cpp
@@ -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));
}
}
diff --git a/kmymoney2/converter/mymoneystatementreader.cpp b/kmymoney2/converter/mymoneystatementreader.cpp
index 8f8f7d0..6756767 100644
--- a/kmymoney2/converter/mymoneystatementreader.cpp
+++ b/kmymoney2/converter/mymoneystatementreader.cpp
@@ -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 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(o)));
- if(KMessageBox::questionYesNo(0, TQString("%1").tqarg(i18n("KMyMoney has found a scheduled transaction named %1 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("%1").arg(i18n("KMyMoney has found a scheduled transaction named %1 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("You have downloaded a statement for the following account:
");
- msg += i18n(" - Account Name: %1").tqarg(account.name()) + " ";
- msg += i18n(" - Account Type: %1").tqarg(KMyMoneyUtils::accountTypeToString(account.accountType())) + " ";
- msg += i18n(" - Account Number: %1").tqarg(account.number()) + " ";
+ msg += i18n(" - Account Name: %1").arg(account.name()) + " ";
+ msg += i18n(" - Account Type: %1").arg(KMyMoneyUtils::accountTypeToString(account.accountType())) + " ";
+ msg += i18n(" - Account Number: %1").arg(account.number()) + " ";
msg += " ";
TQString header;
@@ -1332,7 +1332,7 @@ bool MyMoneyStatementReader::selectOrCreateAccount(const SelectCreateMode /*mode
//throw new MYMONEYEXCEPTION("USERABORT");
done = true;
else
- KMessageBox::error(0, TQString("%1").tqarg(i18n("You must select an account, create a new one, or press the Abort button.")));
+ KMessageBox::error(0, TQString("%1").arg(i18n("You must select an account, create a new one, or press the Abort button.")));
}
}
return result;
diff --git a/kmymoney2/converter/mymoneytemplate.cpp b/kmymoney2/converter/mymoneytemplate.cpp
index bf70d0a..1bbd7c6 100644
--- a/kmymoney2/converter/mymoneytemplate.cpp
+++ b/kmymoney2/converter/mymoneytemplate.cpp
@@ -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("%1 is not a template file.").tqarg(filename);
+ TQString msg=i18n("%1 is not a template file.").arg(filename);
KMessageBox::error(tqApp->mainWidget(), TQString("
")+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 %1 in line %2, column %3").tqarg(filename).tqarg(errLine).tqarg(errColumn);
+ TQString msg=i18n("Error while reading template file %1 in line %2, column %3").arg(filename).arg(errLine).arg(errColumn);
KMessageBox::detailedError(tqApp->mainWidget(), TQString("
")+i18n("Invalid tag %1 in template file %2!").tqarg(childElement.tagName()).tqarg(m_source.prettyURL()));
+ KMessageBox::error(tqApp->mainWidget(), TQString("
")+i18n("Invalid flag type %1 for account %3 in template file %2!").tqarg(flagElement.attribute("name")).tqarg(m_source.prettyURL()).tqarg(acc.name()));
+ KMessageBox::error(tqApp->mainWidget(), TQString("
")+i18n("Invalid flag type %1 for account %3 in template file %2!").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;
diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp
index 0fab2b9..7f43686 100644
--- a/kmymoney2/converter/webpricequote.cpp
+++ b/kmymoney2/converter/webpricequote.cpp
@@ -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;
}
diff --git a/kmymoney2/dialogs/investactivities.cpp b/kmymoney2/dialogs/investactivities.cpp
index 526b54e..75081b7 100644
--- a/kmymoney2/dialogs/investactivities.cpp
+++ b/kmymoney2/dialogs/investactivities.cpp
@@ -165,7 +165,7 @@ void Activity::preloadAssetAccount(void)
cat = dynamic_cast(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
diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui
index 14f167a..2f27a20 100644
--- a/kmymoney2/dialogs/kbackupdlgdecl.ui
+++ b/kmymoney2/dialogs/kbackupdlgdecl.ui
@@ -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."
-
+ WordBreak|AlignTop
diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp
index 1b61272..45ca032 100644
--- a/kmymoney2/dialogs/kbalancechartdlg.cpp
+++ b/kmymoney2/dialogs/kbalancechartdlg.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/kcategoryreassigndlg.cpp b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
index e0fb54d..4de99f6 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlg.cpp
+++ b/kmymoney2/dialogs/kcategoryreassigndlg.cpp
@@ -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("")+i18n("At least one transaction/schedule still references the category %1. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString(""));
+ KMessageBox::sorry(this, TQString("")+i18n("At least one transaction/schedule still references the category %1. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").arg(category.name())+TQString(""));
return TQString();
}
diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
index 666c714..10c6137 100644
--- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
+++ b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui
@@ -38,7 +38,7 @@
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.
-
+ WordBreak|AlignJustify|AlignTop
diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
index 0179721..966ed55 100644
--- a/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
+++ b/kmymoney2/dialogs/kconfirmmanualenterdlg.cpp
@@ -83,7 +83,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons
if (po != pn) {
noItemsChanged++;
- messageDetail += i18n("Payee changed. Old: %1, New: %2
")
- .tqarg(KMyMoneyUtils::reconcileStateToString(fo, true))
- .tqarg(KMyMoneyUtils::reconcileStateToString(fn, true));
+ .arg(KMyMoneyUtils::reconcileStateToString(fo, true))
+ .arg(KMyMoneyUtils::reconcileStateToString(fn, true));
}
}
catch (MyMoneyException *e)
diff --git a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui
index f31e80a..04912ff 100644
--- a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui
+++ b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui
@@ -387,7 +387,7 @@ You can cancel the process at any time by clicking on the Cancel button.Unknown
- tqalignment
+ alignmentAlignVCenter|AlignRight
@@ -433,7 +433,7 @@ You can cancel the process at any time by clicking on the Cancel button.0 of 0
- tqalignment
+ alignmentAlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp
index 9fe4404..0ecd16e 100644
--- a/kmymoney2/dialogs/kcurrencycalculator.cpp
+++ b/kmymoney2/dialogs/kcurrencycalculator.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/kcurrencycalculatordecl.ui b/kmymoney2/dialogs/kcurrencycalculatordecl.ui
index 3a5ff3c..2e723fc 100644
--- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui
+++ b/kmymoney2/dialogs/kcurrencycalculatordecl.ui
@@ -157,7 +157,7 @@
xxx
-
+ AlignVCenter|AlignRight
@@ -192,7 +192,7 @@
xxx
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui
index 47c1af0..686ab91 100644
--- a/kmymoney2/dialogs/keditequityentrydecl.ui
+++ b/kmymoney2/dialogs/keditequityentrydecl.ui
@@ -87,7 +87,7 @@
1 /
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp
index d7b372e..6350845 100644
--- a/kmymoney2/dialogs/keditloanwizard.cpp
+++ b/kmymoney2/dialogs/keditloanwizard.cpp
@@ -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;
diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp
index 5c4c337..0195e48 100644
--- a/kmymoney2/dialogs/kendingbalancedlg.cpp
+++ b/kmymoney2/dialogs/kendingbalancedlg.cpp
@@ -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("")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in %1.").tqarg(currency.name())+TQString(""));
+ m_enterInformationLabel->setText(TQString("")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in %1.").arg(currency.name())+TQString(""));
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())
diff --git a/kmymoney2/dialogs/kendingbalancedlgdecl.ui b/kmymoney2/dialogs/kendingbalancedlgdecl.ui
index 0968bdd..bfbe543 100644
--- a/kmymoney2/dialogs/kendingbalancedlgdecl.ui
+++ b/kmymoney2/dialogs/kendingbalancedlgdecl.ui
@@ -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.
-
+ WordBreak|AlignTop
@@ -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:
-
+ WordBreak|AlignTop
@@ -231,7 +231,7 @@ Please enter the following information found on your statement:
1
-
+ WordBreak|AlignTop
@@ -334,7 +334,7 @@ Please enter the following information found on your statement:
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.
-
+ WordBreak|AlignTop
@@ -381,7 +381,7 @@ Please enter the following information found on your statement:
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.
-
+ WordBreak|AlignTop
@@ -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'.
-
+ WordBreak|AlignTop
diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
index ab752be..f241c93 100644
--- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
+++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp
@@ -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("%1").tqarg(i18n("Failed to retrieve a quote for %1 from %2. Press No to remove the online price source from this security permanently, Yes to continue updating this security during future price updates or Cancel 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("%1").arg(i18n("Failed to retrieve a quote for %1 from %2. Press No to remove the online price source from this security permanently, Yes to continue updating this security during future price updates or Cancel 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("")+i18n("Cannot update security %1: %2").tqarg(_symbol, e->what())+TQString(""), i18n("Price Update Failed"));
+ KMessageBox::error(this, TQString("")+i18n("Cannot update security %1: %2").arg(_symbol, e->what())+TQString(""), 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)
diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui
index e429f53..53275ee 100644
--- a/kmymoney2/dialogs/kexportdlgdecl.ui
+++ b/kmymoney2/dialogs/kexportdlgdecl.ui
@@ -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.
-
+ WordBreak|AlignTop|AlignLeft
diff --git a/kmymoney2/dialogs/kfindtransactiondlg.cpp b/kmymoney2/dialogs/kfindtransactiondlg.cpp
index c97e32e..e639c41 100644
--- a/kmymoney2/dialogs/kfindtransactiondlg.cpp
+++ b/kmymoney2/dialogs/kfindtransactiondlg.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
index 3284fa0..9172946 100644
--- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
+++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui
@@ -852,7 +852,7 @@
text
-
+ AlignTop
@@ -969,7 +969,7 @@
F
-
+ AlignVCenter|AlignLeft
diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
index b40a178..a5ff636 100644
--- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
+++ b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui
@@ -38,7 +38,7 @@
Use 'Help' for more information on these options
-
+ AlignCenter
diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.cpp b/kmymoney2/dialogs/kgncpricesourcedlg.cpp
index 8c807f3..1fc35bc 100644
--- a/kmymoney2/dialogs/kgncpricesourcedlg.cpp
+++ b/kmymoney2/dialogs/kgncpricesourcedlg.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp
index 72a7452..e484711 100644
--- a/kmymoney2/dialogs/kimportdlg.cpp
+++ b/kmymoney2/dialogs/kimportdlg.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
index b692bf7..49852a7 100644
--- a/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
+++ b/kmymoney2/dialogs/kmymoneyfileinfodlg.cpp
@@ -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 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 accountMap;
TQMap accountMapClosed;
@@ -67,22 +67,22 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name )
TQMap::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()
diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp
index c1b8f57..5f085aa 100644
--- a/kmymoney2/dialogs/knewaccountdlg.cpp
+++ b/kmymoney2/dialogs/knewaccountdlg.cpp
@@ -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("")+i18n("An account named %1 already exists. You cannot create a second account with the same name.").tqarg(accountNameText)+TQString(""));
+ KMessageBox::error(this, TQString("")+i18n("An account named %1 already exists. You cannot create a second account with the same name.").arg(accountNameText)+TQString(""));
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("")+i18n("A category named %1 already exists. You cannot create a second category with the same name.").tqarg(newName)+TQString(""));
+ KMessageBox::error(this, TQString("")+i18n("A category named %1 already exists. You cannot create a second category with the same name.").arg(newName)+TQString(""));
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;
}
diff --git a/kmymoney2/dialogs/knewaccountdlgdecl.ui b/kmymoney2/dialogs/knewaccountdlgdecl.ui
index e13989b..ea17b68 100644
--- a/kmymoney2/dialogs/knewaccountdlgdecl.ui
+++ b/kmymoney2/dialogs/knewaccountdlgdecl.ui
@@ -250,7 +250,7 @@
Notes:
-
+ AlignTop
diff --git a/kmymoney2/dialogs/knewequityentrydecl.ui b/kmymoney2/dialogs/knewequityentrydecl.ui
index a9e35b7..de1d71c 100644
--- a/kmymoney2/dialogs/knewequityentrydecl.ui
+++ b/kmymoney2/dialogs/knewequityentrydecl.ui
@@ -80,7 +80,7 @@
1 /
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/knewinvestmentwizard.cpp b/kmymoney2/dialogs/knewinvestmentwizard.cpp
index 85e6cc9..5eb793d 100644
--- a/kmymoney2/dialogs/knewinvestmentwizard.cpp
+++ b/kmymoney2/dialogs/knewinvestmentwizard.cpp
@@ -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;
}
}
diff --git a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui
index 91403b7..1925a19 100644
--- a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui
+++ b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui
@@ -33,7 +33,7 @@
This wizard allows you to create a new investment.
-
+ WordBreak|AlignTop
@@ -61,7 +61,7 @@
The first step in this process requires to select the type of investment. The following steps collect more details about the investment from you.
-
+ WordBreak|AlignTop
@@ -174,7 +174,7 @@
Enter the details below and click <b>Next</b> to continue entering the online update details.
-
+ WordBreak|AlignTop
@@ -231,7 +231,7 @@
1 /
-
+ AlignVCenter|AlignRight
@@ -401,7 +401,7 @@
Select an online source and click <b>Finish</b> to store the investment data. If you don't want to use online updates, just leave the data as is.
-
+ WordBreak|AlignTop
diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp
index ef5c4a4..884807f 100644
--- a/kmymoney2/dialogs/knewloanwizard.cpp
+++ b/kmymoney2/dialogs/knewloanwizard.cpp
@@ -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(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(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(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(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(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;
}
}
diff --git a/kmymoney2/dialogs/knewloanwizarddecl.ui b/kmymoney2/dialogs/knewloanwizarddecl.ui
index d5cb1b7..f8138ff 100644
--- a/kmymoney2/dialogs/knewloanwizarddecl.ui
+++ b/kmymoney2/dialogs/knewloanwizarddecl.ui
@@ -84,7 +84,7 @@
New Loan Account Wizard
-
+ AlignTop|AlignHCenter
@@ -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.
-
+ WordBreak|AlignTop
@@ -196,7 +196,7 @@ Please make sure that you have the relevant information handy. You usually get t
Edit Loan Account Wizard
-
+ AlignTop|AlignHCenter
@@ -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.
-
+ WordBreak|AlignTop
@@ -277,7 +277,7 @@ Please make sure that you have the relevant information handy. You usually get t
In the first step, KMyMoney will ask you some general information about the loan account to be created.
-
+ WordBreak|AlignTop
@@ -350,7 +350,7 @@ In the first step, KMyMoney will ask you some general information about the loan
1. General Information
-
+ AlignTop
@@ -450,7 +450,7 @@ In the first step, KMyMoney will ask you some general information about the loan
Please select, which data of the loan you want to modify.
-
+ WordBreak|AlignTop
@@ -613,7 +613,7 @@ Please select, which data of the loan you want to modify.
1
-
+ WordBreak|AlignTop
@@ -624,7 +624,7 @@ Please select, which data of the loan you want to modify.
1
-
+ WordBreak|AlignTop
@@ -718,7 +718,7 @@ Please select, which data of the loan you want to modify.
Do you borrow or lend money?
-
+ WordBreak|AlignTop
@@ -851,7 +851,7 @@ Do you borrow or lend money?
How do you want to call this loan? Examples for names are 'car loan', 'school loan', 'home owner loan'.
-
+ WordBreak|AlignTop
@@ -993,7 +993,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo
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'.
-
+ WordBreak|AlignTop
@@ -1132,7 +1132,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t
Were there any payments for this loan whether they are entered into KMyMoney or not?
-
+ WordBreak|AlignTop
@@ -1251,7 +1251,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
Note: Payments made to obtain the loan (e.g. Dissagio) are not considered as payments in this context.
-
+ WordBreak|AlignTop
@@ -1299,7 +1299,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or
Do you want to record all payments of this loan with KMyMoney?
-
+ WordBreak|AlignTop
@@ -1432,7 +1432,7 @@ Do you want to record all payments of this loan with KMyMoney?
Select the date when the interest rate for this loan will be modified and the frequency of the future changes.
-
+ WordBreak|AlignTop
@@ -1556,7 +1556,7 @@ Select the date when the interest rate for this loan will be modified and the fr
Please enter the amount you pay for principal and interest or leave the field empty to calculate it.
-
+ WordBreak|AlignTop
@@ -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.
-
+ WordBreak|AlignVCenter
@@ -1729,7 +1729,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.
Please enter the interest rate or leave the field empty to calculate it.
-
+ WordBreak|AlignTop
@@ -1871,7 +1871,7 @@ Please enter the interest rate or leave the field empty to calculate it.
-
+ WordBreak|AlignTop
@@ -1901,7 +1901,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.
1
-
+ WordBreak|AlignTop
@@ -1975,7 +1975,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.
-
+ WordBreak|AlignBottom
@@ -2006,7 +2006,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.
You have successfully entered the general information about your loan. Next, KMyMoney needs some information about the calculation of the loan.
-
+ WordBreak|AlignTop
@@ -2082,7 +2082,7 @@ You have successfully entered the general information about your loan. Next, KMy
1. General Information
-
+ AlignTop
@@ -2189,7 +2189,7 @@ You have successfully entered the general information about your loan. Next, KMy
How often will there be payments made to this loan?
-
+ WordBreak|AlignTop
@@ -2309,7 +2309,7 @@ How often will there be payments made to this loan?
When does the actual interest rate get calculated?
-
+ WordBreak|AlignTop
@@ -2447,7 +2447,7 @@ When does the actual interest rate get calculated?
1
-
+ WordBreak|AlignTop
@@ -2524,7 +2524,7 @@ When does the actual interest rate get calculated?
Loan amount:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -2535,7 +2535,7 @@ When does the actual interest rate get calculated?
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -2546,7 +2546,7 @@ When does the actual interest rate get calculated?
Term:
-
+ AlignVCenter|AlignRight
@@ -2557,7 +2557,7 @@ When does the actual interest rate get calculated?
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -2568,7 +2568,7 @@ When does the actual interest rate get calculated?
Final amortization payment
-
+ AlignVCenter|AlignRight
@@ -2681,7 +2681,7 @@ When does the actual interest rate get calculated?
Please enter the interest rate or leave the field empty to calculate it.
-
+ WordBreak|AlignTop
@@ -2758,7 +2758,7 @@ Please enter the interest rate or leave the field empty to calculate it.
Loan amount:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -2769,7 +2769,7 @@ Please enter the interest rate or leave the field empty to calculate it.
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -2780,7 +2780,7 @@ Please enter the interest rate or leave the field empty to calculate it.
Term:
-
+ AlignVCenter|AlignRight
@@ -2791,7 +2791,7 @@ Please enter the interest rate or leave the field empty to calculate it.
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -2802,7 +2802,7 @@ Please enter the interest rate or leave the field empty to calculate it.
Final amortization payment
-
+ AlignVCenter|AlignRight
@@ -2909,7 +2909,7 @@ Please enter the interest rate or leave the field empty to calculate it.
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.
-
+ WordBreak|AlignTop
@@ -2993,7 +2993,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
Loan amount:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -3004,7 +3004,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -3015,7 +3015,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
Term:
-
+ AlignVCenter|AlignRight
@@ -3026,7 +3026,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -3037,7 +3037,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
Final amortization payment
-
+ AlignVCenter|AlignRight
@@ -3150,7 +3150,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The
Please enter the amount you pay for principal and interest or leave the field empty to calculate it.
-
+ WordBreak|AlignTop
@@ -3227,7 +3227,7 @@ Please enter the amount you pay for principal and interest or leave the field em
Loan amount:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -3238,7 +3238,7 @@ Please enter the amount you pay for principal and interest or leave the field em
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -3249,7 +3249,7 @@ Please enter the amount you pay for principal and interest or leave the field em
Term:
-
+ AlignVCenter|AlignRight
@@ -3260,7 +3260,7 @@ Please enter the amount you pay for principal and interest or leave the field em
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -3271,7 +3271,7 @@ Please enter the amount you pay for principal and interest or leave the field em
Final amortization payment
-
+ AlignVCenter|AlignRight
@@ -3384,7 +3384,7 @@ Please enter the amount you pay for principal and interest or leave the field em
Please enter the amount of a final amortization payment or leave the field empty to calculate it.
-
+ WordBreak|AlignTop
@@ -3461,7 +3461,7 @@ Please enter the amount of a final amortization payment or leave the field empty
Loan amount:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -3472,7 +3472,7 @@ Please enter the amount of a final amortization payment or leave the field empty
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -3483,7 +3483,7 @@ Please enter the amount of a final amortization payment or leave the field empty
Term:
-
+ AlignVCenter|AlignRight
@@ -3494,7 +3494,7 @@ Please enter the amount of a final amortization payment or leave the field empty
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -3505,7 +3505,7 @@ Please enter the amount of a final amortization payment or leave the field empty
Final amortization payment
-
+ AlignVCenter|AlignRight
@@ -3618,7 +3618,7 @@ Please enter the amount of a final amortization payment or leave the field empty
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.
-
+ WordBreak|AlignTop
@@ -3666,7 +3666,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
Loan amount:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -3677,7 +3677,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -3688,7 +3688,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
Term:
-
+ AlignVCenter|AlignRight
@@ -3699,7 +3699,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -3710,7 +3710,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
Final amortization payment
-
+ AlignVCenter|AlignRight
@@ -3823,7 +3823,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept
In the following steps, KMyMoney supports you in setting up categories and schedules for your loan payments.
-
+ WordBreak|AlignTop
@@ -3899,7 +3899,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
1. General Information
-
+ AlignTop
@@ -4009,7 +4009,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched
Please select the category you want to assign the interest payments to or create a new category.
-
+ WordBreak|AlignTop
@@ -4120,7 +4120,7 @@ Please select the category you want to assign the interest payments to or create
If your regular payment contains any additional fees, click on the button "Additional fees" to enter them.
-
+ WordBreak|AlignTop
@@ -4168,7 +4168,7 @@ If your regular payment contains any additional fees, click on the button "Addit
= periodical payment:
-
+ AlignVCenter|AlignRight
@@ -4187,7 +4187,7 @@ If your regular payment contains any additional fees, click on the button "Addit
PlainText
-
+ AlignVCenter|AlignRight
@@ -4206,7 +4206,7 @@ If your regular payment contains any additional fees, click on the button "Addit
PlainText
-
+ AlignVCenter|AlignRight
@@ -4231,7 +4231,7 @@ If your regular payment contains any additional fees, click on the button "Addit
+
-
+ AlignVCenter|AlignRight
@@ -4260,7 +4260,7 @@ If your regular payment contains any additional fees, click on the button "Addit
PlainText
-
+ AlignVCenter|AlignRight
@@ -4271,7 +4271,7 @@ If your regular payment contains any additional fees, click on the button "Addit
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -4335,7 +4335,7 @@ If your regular payment contains any additional fees, click on the button "Addit
If no additional fees are included in your periodical payment or you have entered all such fees, then click on "Next".
-
+ WordBreak|AlignTop
@@ -4383,7 +4383,7 @@ If your regular payment contains any additional fees, click on the button "Addit
KMyMoney will create a schedule for this payment and reminds you whenever a payment must be made.<p>
If you selected to record all payments this date has already been supplied. If you selected to record only this years payments, then the <b>First payment due date</b> is the date of the first payment made in this year.
-
+ WordBreak|AlignTop
@@ -4443,7 +4443,7 @@ If you selected to record all payments this date has already been supplied. If y
Make payment from/to:
-
+ AlignTop
@@ -4493,7 +4493,7 @@ If you selected to record all payments this date has already been supplied. If y
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.
-
+ WordBreak|AlignTop
@@ -4541,7 +4541,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
Principal + Interest:
-
+ WordBreak|AlignVCenter|AlignRight
@@ -4552,7 +4552,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
Additional fees:
-
+ AlignVCenter|AlignRight
@@ -4563,7 +4563,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
Total payment:
-
+ AlignVCenter|AlignRight
@@ -4574,7 +4574,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -4585,7 +4585,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
Valid from:
-
+ AlignVCenter|AlignRight
@@ -4596,7 +4596,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
Affected payments:
-
+ AlignVCenter|AlignRight
@@ -4719,7 +4719,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val
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.
-
+ WordBreak|AlignTop
@@ -4871,7 +4871,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a
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.
-
+ WordBreak|AlignTop
@@ -4958,7 +4958,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Payee:
-
+ AlignVCenter|AlignRight
@@ -5001,7 +5001,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
First payment:
-
+ AlignVCenter|AlignRight
@@ -5028,7 +5028,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Amount is:
-
+ AlignVCenter|AlignRight
@@ -5122,7 +5122,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Periodic Payment:
-
+ AlignVCenter|AlignRight
@@ -5133,7 +5133,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Additional Fees:
-
+ AlignVCenter|AlignRight
@@ -5144,7 +5144,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Interest category:
-
+ AlignVCenter|AlignRight
@@ -5155,7 +5155,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Payment from:
-
+ AlignVCenter|AlignRight
@@ -5198,7 +5198,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Next due date:
-
+ AlignVCenter|AlignRight
@@ -5262,7 +5262,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Term:
-
+ AlignVCenter|AlignRight
@@ -5289,7 +5289,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Interest rate:
-
+ AlignVCenter|AlignRight
@@ -5316,7 +5316,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Final Payment:
-
+ AlignVCenter|AlignRight
@@ -5343,7 +5343,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Interest is due:
-
+ AlignVCenter|AlignRight
@@ -5370,7 +5370,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Principal + Interest:
-
+ AlignVCenter|AlignRight
@@ -5397,7 +5397,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Loan amount:
-
+ AlignVCenter|AlignRight
@@ -5408,7 +5408,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas
Payment frequency:
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui
index 9db25ed..db158ad 100644
--- a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui
+++ b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui
@@ -38,7 +38,7 @@
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.
-
+ WordBreak|AlignJustify|AlignTop
diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui
index b0a2770..d5893e8 100644
--- a/kmymoney2/dialogs/kreconciledlgdecl.ui
+++ b/kmymoney2/dialogs/kreconciledlgdecl.ui
@@ -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.
-
+ WordBreak|AlignVCenter|AlignLeft
@@ -386,7 +386,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
Previous Balance:
-
+ AlignVCenter|AlignRight
@@ -407,7 +407,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
0
-
+ AlignVCenter|AlignRight
@@ -450,7 +450,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
Ending Balance:
-
+ AlignVCenter|AlignRight
@@ -477,7 +477,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
0
-
+ AlignVCenter|AlignRight
@@ -520,7 +520,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
Cleared Balance:
-
+ AlignVCenter|AlignRight
@@ -547,7 +547,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
0
-
+ AlignVCenter|AlignRight
@@ -590,7 +590,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
Difference:
-
+ AlignVCenter|AlignRight
@@ -611,7 +611,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto
0
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/ksecuritylisteditor.cpp b/kmymoney2/dialogs/ksecuritylisteditor.cpp
index 0be4b0b..2feac68 100644
--- a/kmymoney2/dialogs/ksecuritylisteditor.cpp
+++ b/kmymoney2/dialogs/ksecuritylisteditor.cpp
@@ -181,10 +181,10 @@ void KSecurityListEditor::slotDeleteSecurity(void)
TQString msg;
TQString dontAsk;
if(security.isCurrency()) {
- msg = TQString("
") + i18n("Do you really want to remove the currency %1 from the file?
Note: It is currently not supported to add currencies.").tqarg(security.name());
+ msg = TQString("
") + i18n("Do you really want to remove the currency %1 from the file?
Note: It is currently not supported to add currencies.").arg(security.name());
dontAsk = "DeleteCurrency";
} else {
- msg = TQString("
") + i18n("Do you really want to remove the %1 %2 from the file?").tqarg(KMyMoneyUtils::securityTypeToString(security.securityType())).tqarg(security.name());
+ msg = TQString("
") + i18n("Do you really want to remove the %1 %2 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) {
diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp
index 9bb1e33..50e66d4 100644
--- a/kmymoney2/dialogs/kselectdatabasedlg.cpp
+++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp
@@ -107,11 +107,11 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const cha
// list drivers supported by KMM
TQMap 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();
diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp
index d64ecf0..907f927 100644
--- a/kmymoney2/dialogs/ksplittransactiondlg.cpp
+++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui
index 9e96775..5b23190 100644
--- a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui
+++ b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui
@@ -136,7 +136,7 @@
<b>11,00<b>
-
+ AlignVCenter|AlignRight
@@ -163,7 +163,7 @@
<b>111,00<b>
-
+ AlignVCenter|AlignRight
@@ -181,7 +181,7 @@
Unassigned
-
+ AlignVCenter|AlignRight
@@ -199,7 +199,7 @@
Sum of splits
-
+ AlignVCenter|AlignRight
@@ -226,7 +226,7 @@
100,00
-
+ AlignVCenter|AlignRight
@@ -250,7 +250,7 @@
Transaction amount
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp
index a9f3bae..470806c 100644
--- a/kmymoney2/dialogs/kstartdlg.cpp
+++ b/kmymoney2/dialogs/kstartdlg.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
index 65c361c..7cb1f1b 100644
--- a/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
+++ b/kmymoney2/dialogs/mymoneyqifprofileeditor.cpp
@@ -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);
diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
index 9d8efdc..88a9b2e 100644
--- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui
@@ -366,7 +366,7 @@
Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality.
-
+ WordBreak|AlignTop
diff --git a/kmymoney2/dialogs/settings/ksettingsgpg.cpp b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
index fc0c4eb..07b5d18 100644
--- a/kmymoney2/dialogs/settings/ksettingsgpg.cpp
+++ b/kmymoney2/dialogs/settings/ksettingsgpg.cpp
@@ -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("%1").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 File/Save as... 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("%1").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 File/Save as... 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;
}
diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui
index eda3bbb..6a64eb3 100644
--- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui
+++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui
@@ -120,7 +120,7 @@
Selected entries are shown on the home page of the application.<p>
Use the buttons and checkboxes to customize the tqlayout of the home page.
-
+ WordBreak|AlignTop
diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp
index 9646c91..cdc111a 100644
--- a/kmymoney2/dialogs/transactioneditor.cpp
+++ b/kmymoney2/dialogs/transactioneditor.cpp
@@ -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("")+i18n("The number %1 has already been used in account %2. Do you want to replace it with the next available number?").tqarg(txt).tqarg(m_account.name())+TQString(""), i18n("Duplicate number")) == KMessageBox::Yes) {
+ if(KMessageBox::questionYesNo(m_regForm, TQString("")+i18n("The number %1 has already been used in account %2. Do you want to replace it with the next available number?").arg(txt).arg(m_account.name())+TQString(""), 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("
")+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("
")+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. %1 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. %1 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("%1").tqarg(msg)) == KMessageBox::Cancel) {
+ if(KMessageBox::warningContinueCancel(0, TQString("%1").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("%1").tqarg(i18n("The transaction you are about to enter has a post date in the future.
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("%1").arg(i18n("The transaction you are about to enter has a post date in the future.
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("%1").tqarg(i18n("The balance of account %1 dropped below the warning balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
+ msg = TQString("%1").arg(i18n("The balance of account %1 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("%1").tqarg(i18n("The balance of account %1 dropped below the minimum balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
+ msg = TQString("%1").arg(i18n("The balance of account %1 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("%1").tqarg(i18n("The balance of account %1 dropped below the maximum credit warning limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
+ msg = TQString("%1").arg(i18n("The balance of account %1 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("%1").tqarg(i18n("The balance of account %1 dropped below the maximum credit limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec)));
+ msg = TQString("%1").arg(i18n("The balance of account %1 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::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);
diff --git a/kmymoney2/dialogs/transactionmatcher.cpp b/kmymoney2/dialogs/transactionmatcher.cpp
index 2ed5356..ce1c16e 100644
--- a/kmymoney2/dialogs/transactionmatcher.cpp
+++ b/kmymoney2/dialogs/transactionmatcher.cpp
@@ -80,7 +80,7 @@ void TransactionMatcher::match(MyMoneyTransaction tm, MyMoneySplit sm, MyMoneyTr
// verify that the amounts are the same, otherwise we should not be matching!
if(sm.shares() != si.shares()) {
- throw new MYMONEYEXCEPTION(i18n("Splits for %1 have conflicting values (%2,%3)").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;
diff --git a/kmymoney2/kmymoney2.cpp b/kmymoney2/kmymoney2.cpp
index 8e519b4..6b59c03 100644
--- a/kmymoney2/kmymoney2.cpp
+++ b/kmymoney2/kmymoney2.cpp
@@ -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("
")+i18n("%1 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("
")+i18n("%1 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("
")+i18n("File %1 is already opened in another instance of KMyMoney").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Duplicate open"));
+ KMessageBox::sorry(this, TQString("
")+i18n("File %1 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("")+i18n("The file %1 already exists. Do you really want to override it?").tqarg(url.prettyURL(0, KURL::StripFileProtocol))+TQString(""), i18n("File already exists")) != KMessageBox::Yes)
+ if(KMessageBox::warningYesNo(this, TQString("")+i18n("The file %1 already exists. Do you really want to override it?").arg(url.prettyURL(0, KURL::StripFileProtocol))+TQString(""), 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("
")+i18n("Do you really want to delete institution %1 ?").tqarg(institution.name()))) == KMessageBox::No)
+ if ((KMessageBox::questionYesNo(this, TQString("
")+i18n("Do you really want to delete institution %1 ?").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("%1").tqarg(i18n("The category %1 currently does not exist. Do you want to create it?
The parent account will default to %2 but can be changed in the following dialog.").tqarg(account.name()).tqarg(parent.name())), i18n("Create category"),
+ TQString("%1").arg(i18n("The category %1 currently does not exist. Do you want to create it?
The parent account will default to %2 but can be changed in the following dialog.").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("")+i18n("The security %1 currently does not exist as sub-account of %2. "
- "Do you want to create it?").tqarg(account.name()).tqarg(parent.name())+TQString(""), i18n("Create security"),
+ "Do you want to create it?").arg(account.name()).arg(parent.name())+TQString(""), 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("
")+i18n("Do you really want to delete the investment %1?").tqarg(m_selectedInvestment.name()), i18n("Delete investment"), KStdGuiItem::yes(), KStdGuiItem::no(), "DeleteInvestment") == KMessageBox::Yes) {
+ if(KMessageBox::questionYesNo(this, TQString("
")+i18n("Do you really want to delete the investment %1?").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 %1 with category %2. Reason: %3").tqarg(m_selectedAccount.name()).tqarg(newCategory.name()).tqarg(e->what()));
+ KMessageBox::error( this, i18n("Unable to exchange category %1 with category %2. 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("")+i18n("Do you really want to delete category %1?").tqarg(m_selectedAccount.name())+TQString("")) == KMessageBox::Yes)) {
+ if (!needAskUser || (KMessageBox::questionYesNo(this, TQString("")+i18n("Do you really want to delete category %1?").arg(m_selectedAccount.name())+TQString("")) == KMessageBox::Yes)) {
try {
file->removeAccount(m_selectedAccount);
m_selectedAccount.clearId();
slotUpdateActions();
ft.commit();
} catch(MyMoneyException* e) {
- KMessageBox::error( this, TQString("")+i18n("Unable to delete category %1. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())+TQString(""));
+ KMessageBox::error( this, TQString("")+i18n("Unable to delete category %1. Cause: %2").arg(m_selectedAccount.name()).arg(e->what())+TQString(""));
delete e;
}
}
@@ -2851,7 +2851,7 @@ void KMyMoney2App::slotAccountDelete(void)
int result = KMessageBox::questionYesNoCancel(this, TQString("")+
i18n("Do you want to delete category %1 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 %2.").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())+TQString(""),
+ "will be made sub-categories of %2.").arg(m_selectedAccount.name()).arg(parentAccount.name())+TQString(""),
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("
")+i18n("Some sub-categories of category %1 cannot "
- "be deleted, because they are still used. They will be made sub-categories of %2. Proceed?").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())) != KMessageBox::Yes) {
+ "be deleted, because they are still used. They will be made sub-categories of %2. 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("")+i18n("Unable to delete a sub-category of category %1. Reason: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())+TQString(""));
+ KMessageBox::error( this, TQString("")+i18n("Unable to delete a sub-category of category %1. Reason: %2").arg(m_selectedAccount.name()).arg(e->what())+TQString(""));
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("
")+i18n("%1 cannot be moved to institution %2. Reason: %3").tqarg(src.name()).tqarg(_dst.name()).tqarg(e->what()));
+ KMessageBox::sorry(this, TQString("
")+i18n("%1 cannot be moved to %2. Reason: %3").tqarg(src.name()).tqarg(dst.name()).tqarg(e->what()));
+ KMessageBox::sorry(this, TQString("
")+i18n("%1 cannot be moved to %2. 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("")+i18n("You have entered a scheduled transaction date of %1. Because the scheduled transaction was last paid on %2, 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(""),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) {
+ if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered a scheduled transaction date of %1. Because the scheduled transaction was last paid on %2, 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(""),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("
")+i18n("Are you sure you want to delete the scheduled transaction %1?").tqarg(m_selectedSchedule.name());
+ TQString msg = TQString("
")+i18n("Are you sure you want to delete the scheduled transaction %1?").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("")+i18n("Do you really want to skip the %1 transaction scheduled for %2?").tqarg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString(""))) == KMessageBox::Yes) {
+ if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("")+i18n("Do you really want to skip the %1 transaction scheduled for %2?").arg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString(""))) == 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("")+i18n("Unable to skip scheduled transaction %1.").tqarg(m_selectedSchedule.name())+TQString(""), e->what());
+ KMessageBox::detailedSorry(this, TQString("")+i18n("Unable to skip scheduled transaction %1.").arg(m_selectedSchedule.name())+TQString(""), 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("") + i18n("Do you want to add %1 as payer/receiver ?").tqarg(newnameBase) + TQString("");
+ TQString msg = TQString("") + i18n("Do you want to add %1 as payer/receiver ?").arg(newnameBase) + TQString("");
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("
")+i18n("Do you really want to remove the payee %1?").tqarg(m_selectedPayees.front().name());
+ prompt = TQString("
").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 Org: %2 Fid: %3 ").tqarg(info.url,info.org,info.fid);
+ message += TQString("URL: %1 Org: %2 Fid: %3 ").arg(info.url,info.org,info.fid);
if ( info.statements )
message += i18n("Supports online statements ");
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(), 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;
diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
index c010ab6..084d73c 100644
--- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp
@@ -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);
diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
index f5222dc..36a05b5 100644
--- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
+++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp
@@ -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)
diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
index 5ed6175..a155ccc 100644
--- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
+++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp
@@ -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("%1").tqarg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:
%2").tqarg(url, lastError())), i18n("Importing error"));
+ KMessageBox::error( 0, TQString("%1").arg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:
%2").arg(url, lastError())), i18n("Importing error"));
}
}
diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp
index 651fd2a..711bff5 100644
--- a/kmymoney2/plugins/ofximport/ofxpartner.cpp
+++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp
@@ -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) {
diff --git a/kmymoney2/reports/kreportchartview.cpp b/kmymoney2/reports/kreportchartview.cpp
index 5fe01e3..208089f 100644
--- a/kmymoney2/reports/kreportchartview.cpp
+++ b/kmymoney2/reports/kreportchartview.cpp
@@ -151,17 +151,17 @@ void KReportChartView::mouseMoveEvent( TQMouseEvent* event )
{
// set the tooltip text
label->setText(TQString("
%1
%2 (%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("
");
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("
\n");
result += TQString("
\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");
}
diff --git a/kmymoney2/reports/objectinfotable.cpp b/kmymoney2/reports/objectinfotable.cpp
index 26bdc1f..f99c115 100644
--- a/kmymoney2/reports/objectinfotable.cpp
+++ b/kmymoney2/reports/objectinfotable.cpp
@@ -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;
}
}
diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp
index 5acac5b..db73062 100644
--- a/kmymoney2/reports/pivottable.cpp
+++ b/kmymoney2/reports/pivottable.cpp
@@ -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 %2 - %3 %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 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("
%1
\n").tqarg(m_config_f.name());
+ TQString result = TQString("
%1
\n").arg(m_config_f.name());
//actual dates of the report
result += TQString("
");
- 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("
\n");
result += TQString("
\n");
//currency conversion message
result += TQString("
");
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("
");
@@ -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("
")+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("%1"). arg(i18n("GPG is not available for decryption of file %1").tqarg(filename)));
+ KMessageBox::sorry(this, TQString("%1"). arg(i18n("GPG is not available for decryption of file %1").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("%1"). arg(i18n("File %1 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("%1"). arg(i18n("File %1 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("%1"). arg(i18n("File %1 contains an unknown file format!").tqarg(filename)));
+ KMessageBox::sorry(this, TQString("%1"). arg(i18n("File %1 contains an unknown file format!").arg(filename)));
}
rc = false;
}
} else {
- KMessageBox::sorry(this, TQString("%1"). arg(i18n("Cannot read from file %1!").tqarg(filename)));
+ KMessageBox::sorry(this, TQString("%1"). arg(i18n("Cannot read from file %1!").arg(filename)));
rc = false;
}
} catch (MyMoneyException *e) {
- KMessageBox::sorry(this, TQString("%1"). arg(i18n("Cannot load file %1. Reason: %2").tqarg(filename, e->what())));
+ KMessageBox::sorry(this, TQString("%1"). arg(i18n("Cannot load file %1. 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("%1"). arg(i18n("File %1 not found!").tqarg(filename)));
+ KMessageBox::sorry(this, TQString("%1"). arg(i18n("File %1 not found!").arg(filename)));
rc = false;
}
delete qfile;
}
} else {
- KMessageBox::sorry(this, TQString("%1"). arg(i18n("File %1 not found!").tqarg(filename)));
+ KMessageBox::sorry(this, TQString("%1"). arg(i18n("File %1 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("
")+i18n("You have selected to encrypt your data also with the KMyMoney recover key, but the key with id
%1
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 KMyMoney web-site. 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("
")+i18n("You have selected to encrypt your data also with the KMyMoney recover key, but the key with id
%1
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 KMyMoney web-site. 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("
")+i18n("You have specified to encrypt your data for the user-id
%1.
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("
")+i18n("You have specified to encrypt your data for the user-id
%1.
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 (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(-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");
diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp
index 87066ac..29696e5 100644
--- a/kmymoney2/views/kpayeesview.cpp
+++ b/kmymoney2/views/kpayeesview.cpp
@@ -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("%1").tqarg(
- i18n("Do you want to save the changes for %1?").tqarg(m_newName)),
+ if (KMessageBox::questionYesNo(this, TQString("%1").arg(
+ i18n("Do you want to save the changes for %1?").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;
}
}
diff --git a/kmymoney2/views/kpayeesview.h b/kmymoney2/views/kpayeesview.h
index 95be179..adbd708 100644
--- a/kmymoney2/views/kpayeesview.h
+++ b/kmymoney2/views/kpayeesview.h
@@ -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
diff --git a/kmymoney2/views/kpayeesviewdecl.ui b/kmymoney2/views/kpayeesviewdecl.ui
index a513e61..01bb31d 100644
--- a/kmymoney2/views/kpayeesviewdecl.ui
+++ b/kmymoney2/views/kpayeesviewdecl.ui
@@ -168,7 +168,7 @@
Balance:
-
+ AlignVCenter|AlignRight
@@ -293,7 +293,7 @@
Notes
-
+ AlignTop|AlignLeft
@@ -359,7 +359,7 @@
Address:
-
+ AlignTop|AlignLeft
diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp
index 045de08..12b8cef 100755
--- a/kmymoney2/views/kreportsview.cpp
+++ b/kmymoney2/views/kreportsview.cpp
@@ -156,7 +156,7 @@ void KReportsView::KReportTab::saveAs( const TQString& filename, bool includeCSS
else {
TQTextStream stream(&file);
- TQRegExp exp(TQString("(.*)(()(.*)").tqarg(KGlobal::locale()->encoding()));
+ TQRegExp exp(TQString("(.*)(()(.*)").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("\n") +
- TQString("").tqarg(filename);
+ TQString("").arg(filename);
- header += TQString("").tqarg(KGlobal::locale()->encoding());
+ header += TQString("").arg(KGlobal::locale()->encoding());
header += KMyMoneyUtils::variableCSS();
header += "\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("")+i18n("Are you sure you want to delete report %1? There is no way to recover it!").tqarg(report.name())+TQString(""), i18n("Delete Report?")))
+ if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, TQString("")+i18n("Are you sure you want to delete report %1? There is no way to recover it!").arg(report.name())+TQString(""), 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("")+i18n("Sorry, %1 is a default report. You may not delete it.").tqarg(report.name())+TQString(""), i18n("Delete Report?"));
+ KMessageBox::information(this, TQString("")+i18n("Sorry, %1 is a default report. You may not delete it.").arg(report.name())+TQString(""), i18n("Delete Report?"));
}
}
diff --git a/kmymoney2/views/kscheduledlistitem.cpp b/kmymoney2/views/kscheduledlistitem.cpp
index 9983c7d..b055b25 100644
--- a/kmymoney2/views/kscheduledlistitem.cpp
+++ b/kmymoney2/views/kscheduledlistitem.cpp
@@ -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())
{
diff --git a/kmymoney2/views/kscheduledlistitem.h b/kmymoney2/views/kscheduledlistitem.h
index 44d2af8..61ef12d 100644
--- a/kmymoney2/views/kscheduledlistitem.h
+++ b/kmymoney2/views/kscheduledlistitem.h
@@ -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.
diff --git a/kmymoney2/views/kscheduledview.cpp b/kmymoney2/views/kscheduledview.cpp
index 74ea25b..ec3bc44 100644
--- a/kmymoney2/views/kscheduledview.cpp
+++ b/kmymoney2/views/kscheduledview.cpp
@@ -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);
}
diff --git a/kmymoney2/widgets/kaccounttemplateselector.cpp b/kmymoney2/widgets/kaccounttemplateselector.cpp
index 6e96b78..9b26503 100644
--- a/kmymoney2/widgets/kaccounttemplateselector.cpp
+++ b/kmymoney2/widgets/kaccounttemplateselector.cpp
@@ -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;
}
}
diff --git a/kmymoney2/widgets/kbudgetvalues.cpp b/kmymoney2/widgets/kbudgetvalues.cpp
index d635eba..df665a8 100644
--- a/kmymoney2/widgets/kbudgetvalues.cpp
+++ b/kmymoney2/widgets/kbudgetvalues.cpp
@@ -184,7 +184,7 @@ void KBudgetValues::slotChangePeriod(int id)
newValue = (newValue / MyMoneyMoney(12, 1)).convert();
}
if(!newValue.isZero()) {
- if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a monthly budget of %1. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
+ if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a monthly budget of %1. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString(""), 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("")+i18n("You have entered budget values using a different base which would result in a yearly budget of %1. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
+ if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in a yearly budget of %1. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString(""), 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("")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of %1. Should this value be used to fill the monthly budgets?").tqarg(newValue.formatMoney("", 2))+TQString(""), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) {
+ if(KMessageBox::questionYesNo(this, TQString("")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of %1. Should this value be used to fill the monthly budgets?").arg(newValue.formatMoney("", 2))+TQString(""), 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);
}
diff --git a/kmymoney2/widgets/klistviewsearchline.cpp b/kmymoney2/widgets/klistviewsearchline.cpp
index 97431b1..b2d554c 100644
--- a/kmymoney2/widgets/klistviewsearchline.cpp
+++ b/kmymoney2/widgets/klistviewsearchline.cpp
@@ -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())
diff --git a/kmymoney2/widgets/klistviewsearchline.h b/kmymoney2/widgets/klistviewsearchline.h
index 1ecb94b..7655c2b 100644
--- a/kmymoney2/widgets/klistviewsearchline.h
+++ b/kmymoney2/widgets/klistviewsearchline.h
@@ -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);
diff --git a/kmymoney2/widgets/kmymoneyaccountselector.cpp b/kmymoney2/widgets/kmymoneyaccountselector.cpp
index e33a2e5..33bba13 100644
--- a/kmymoney2/widgets/kmymoneyaccountselector.cpp
+++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp
@@ -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(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;
diff --git a/kmymoney2/widgets/kmymoneyaccounttree.cpp b/kmymoney2/widgets/kmymoneyaccounttree.cpp
index be2be0c..e89553b 100644
--- a/kmymoney2/widgets/kmymoneyaccounttree.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttree.cpp
@@ -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:
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
index c6c5d6d..03d5c41 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreebase.cpp
@@ -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
diff --git a/kmymoney2/widgets/kmymoneyaccounttreebase.h b/kmymoney2/widgets/kmymoneyaccounttreebase.h
index 9843b9d..f44837b 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreebase.h
+++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h
@@ -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
diff --git a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
index 1d1717c..d7584c5 100644
--- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
+++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp
@@ -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
diff --git a/kmymoney2/widgets/kmymoneybriefschedule.cpp b/kmymoney2/widgets/kmymoneybriefschedule.cpp
index 5cb6348..5fa5917 100644
--- a/kmymoney2/widgets/kmymoneybriefschedule.cpp
+++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp
@@ -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 += " ";
text += i18n("%1 days overdue (%2 occurences).")
- .tqarg(TQString::number(days))
- .tqarg(TQString::number(transactions));
+ .arg(TQString::number(days))
+ .arg(TQString::number(transactions));
text += "";
}
}
diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp
index adc51d2..47d45ed 100644
--- a/kmymoney2/widgets/kmymoneycalculator.cpp
+++ b/kmymoney2/widgets/kmymoneycalculator.cpp
@@ -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);
diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp
index 4c824c8..61b91fd 100644
--- a/kmymoney2/widgets/kmymoneycalendar.cpp
+++ b/kmymoney2/widgets/kmymoneycalendar.cpp
@@ -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);
diff --git a/kmymoney2/widgets/kmymoneychecklistitem.cpp b/kmymoney2/widgets/kmymoneychecklistitem.cpp
index 039d2c8..49b96fa 100644
--- a/kmymoney2/widgets/kmymoneychecklistitem.cpp
+++ b/kmymoney2/widgets/kmymoneychecklistitem.cpp
@@ -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()
diff --git a/kmymoney2/widgets/kmymoneychecklistitem.h b/kmymoney2/widgets/kmymoneychecklistitem.h
index 26624f4..cbfb30f 100644
--- a/kmymoney2/widgets/kmymoneychecklistitem.h
+++ b/kmymoney2/widgets/kmymoneychecklistitem.h
@@ -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
diff --git a/kmymoney2/widgets/kmymoneycombo.cpp b/kmymoney2/widgets/kmymoneycombo.cpp
index 7146f68..37f4517 100644
--- a/kmymoney2/widgets/kmymoneycombo.cpp
+++ b/kmymoney2/widgets/kmymoneycombo.cpp
@@ -267,7 +267,7 @@ void KMyMoneyCombo::focusOutEvent(TQFocusEvent* e)
m_id = TQString();
if(!id.isEmpty())
emit itemSelected(m_id);
- tqrepaint();
+ repaint();
}
m_inFocusOutEvent = false;
}
diff --git a/kmymoney2/widgets/kmymoneycurrencyselector.cpp b/kmymoney2/widgets/kmymoneycurrencyselector.cpp
index b2637a2..f99dd93 100644
--- a/kmymoney2/widgets/kmymoneycurrencyselector.cpp
+++ b/kmymoney2/widgets/kmymoneycurrencyselector.cpp
@@ -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;
diff --git a/kmymoney2/widgets/kmymoneydateinput.cpp b/kmymoney2/widgets/kmymoneydateinput.cpp
index 3362a15..9203a76 100644
--- a/kmymoney2/widgets/kmymoneydateinput.cpp
+++ b/kmymoney2/widgets/kmymoneydateinput.cpp
@@ -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);
diff --git a/kmymoney2/widgets/kmymoneydateinput.h b/kmymoney2/widgets/kmymoneydateinput.h
index c47abb6..d3c3f33 100644
--- a/kmymoney2/widgets/kmymoneydateinput.h
+++ b/kmymoney2/widgets/kmymoneydateinput.h
@@ -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;
diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp
index 4007345..37d1311 100644
--- a/kmymoney2/widgets/kmymoneydatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneydatetbl.cpp
@@ -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);
diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp
index 54affd2..c3ad220 100644
--- a/kmymoney2/widgets/kmymoneyedit.cpp
+++ b/kmymoney2/widgets/kmymoneyedit.cpp
@@ -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();
diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp
index 75f3491..9164d1a 100644
--- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp
+++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp
@@ -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)
diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h
index 6a08c61..fe5fd0a 100644
--- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.h
+++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.h
@@ -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:
diff --git a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui
index ec3c34c..4e6e762 100644
--- a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui
+++ b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui
@@ -53,7 +53,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece
RichText
-
+ WordBreak|AlignTop
@@ -168,7 +168,7 @@ This mechanism is provided for the case that you have lost your key and cannot a
RichText
-
+ WordBreak|AlignTop
diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp
index 53cb3a5..5907782 100644
--- a/kmymoney2/widgets/kmymoneylineedit.cpp
+++ b/kmymoney2/widgets/kmymoneylineedit.cpp
@@ -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)
diff --git a/kmymoney2/widgets/kmymoneylineedit.h b/kmymoney2/widgets/kmymoneylineedit.h
index e97205d..30d079e 100644
--- a/kmymoney2/widgets/kmymoneylineedit.h
+++ b/kmymoney2/widgets/kmymoneylineedit.h
@@ -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();
/**
diff --git a/kmymoney2/widgets/kmymoneylistviewitem.cpp b/kmymoney2/widgets/kmymoneylistviewitem.cpp
index 2ed4377..09ff2f9 100644
--- a/kmymoney2/widgets/kmymoneylistviewitem.cpp
+++ b/kmymoney2/widgets/kmymoneylistviewitem.cpp
@@ -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()
diff --git a/kmymoney2/widgets/kmymoneylistviewitem.h b/kmymoney2/widgets/kmymoneylistviewitem.h
index 72e41ea..015a002 100644
--- a/kmymoney2/widgets/kmymoneylistviewitem.h
+++ b/kmymoney2/widgets/kmymoneylistviewitem.h
@@ -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
diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
index 7d203fa..f15773c 100644
--- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
+++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp
@@ -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()));
}
}
}
diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp
index daf7991..b32adcb 100644
--- a/kmymoney2/widgets/kmymoneyselector.cpp
+++ b/kmymoney2/widgets/kmymoneyselector.cpp
@@ -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;
}
diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp
index 5cf561c..4abef85 100644
--- a/kmymoney2/widgets/kmymoneytitlelabel.cpp
+++ b/kmymoney2/widgets/kmymoneytitlelabel.cpp
@@ -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 );
}
diff --git a/kmymoney2/widgets/kmymoneywizard.cpp b/kmymoney2/widgets/kmymoneywizard.cpp
index aeef106..24f9fbc 100644
--- a/kmymoney2/widgets/kmymoneywizard.cpp
+++ b/kmymoney2/widgets/kmymoneywizard.cpp
@@ -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)
diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp
index 93277cf..ef1c956 100644
--- a/kmymoney2/widgets/register.cpp
+++ b/kmymoney2/widgets/register.cpp
@@ -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);
}
diff --git a/kmymoney2/widgets/stdtransactionmatched.cpp b/kmymoney2/widgets/stdtransactionmatched.cpp
index 352999e..833c88e 100644
--- a/kmymoney2/widgets/stdtransactionmatched.cpp
+++ b/kmymoney2/widgets/stdtransactionmatched.cpp
@@ -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:
diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp
index 8afc4e4..daf080f 100644
--- a/kmymoney2/widgets/transaction.cpp
+++ b/kmymoney2/widgets/transaction.cpp
@@ -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("%1").tqarg(i18n("Transaction is missing a category assignment."));
+ msg = TQString("%1").arg(i18n("Transaction is missing a category assignment."));
} else {
const MyMoneySecurity& sec = MyMoneyFile::instance()->security(m_account.currencyId());
- msg = TQString("%1").tqarg(i18n("The transaction has a missing assignment of %1.").tqarg(m_transaction.splitSum().abs().formatMoney(m_account, sec)));
+ msg = TQString("%1").arg(i18n("The transaction has a missing assignment of %1.").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("
%1
%2
").tqarg(category, amount);
+ txt += TQString("
%1
%2
").arg(category, amount);
}
- msg = TQString("
%1
").tqarg(txt);
+ msg = TQString("
%1
").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;
diff --git a/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui
index b4cfbd9..de44e39 100644
--- a/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui
+++ b/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui
@@ -80,7 +80,7 @@
xxx
-
+ AlignVCenter|AlignRight
@@ -112,7 +112,7 @@
xxx
-
+ AlignVCenter|AlignRight
@@ -136,7 +136,7 @@
xxx
-
+ AlignVCenter|AlignRight
diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
index 6889f4d..9d9b109 100644
--- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
+++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp
@@ -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(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(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(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(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(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));
diff --git a/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui
index 955198d..aca76e6 100644
--- a/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui
+++ b/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui
@@ -132,7 +132,7 @@
Payment should be made
from account
-
+ AlignTop
diff --git a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui
index 62b895b..df1d9aa 100644
--- a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui
+++ b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui
@@ -29,7 +29,7 @@
Welcome to KMyMoney!
-
+ AlignCenter
diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
index 841ba03..04daf5c 100644
--- a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
+++ b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp
@@ -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);
diff --git a/libkdchart/KDChart.cpp b/libkdchart/KDChart.cpp
index 5d0c6bf..4d8fd0c 100644
--- a/libkdchart/KDChart.cpp
+++ b/libkdchart/KDChart.cpp
@@ -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 colorMap;
diff --git a/libkdchart/KDChartAreaPainter.cpp b/libkdchart/KDChartAreaPainter.cpp
index 6c47aee..2fca8d6 100644
--- a/libkdchart/KDChartAreaPainter.cpp
+++ b/libkdchart/KDChartAreaPainter.cpp
@@ -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.
}
diff --git a/libkdchart/KDChartAxesPainter.cpp b/libkdchart/KDChartAxesPainter.cpp
index 3f3b312..ee9dc87 100644
--- a/libkdchart/KDChartAxesPainter.cpp
+++ b/libkdchart/KDChartAxesPainter.cpp
@@ -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;
}
diff --git a/libkdchart/KDChartBWPainter.cpp b/libkdchart/KDChartBWPainter.cpp
index 9f6e5fb..7fed752 100644
--- a/libkdchart/KDChartBWPainter.cpp
+++ b/libkdchart/KDChartBWPainter.cpp
@@ -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 ) {
diff --git a/libkdchart/KDChartBarPainter.cpp b/libkdchart/KDChartBarPainter.cpp
index f8ae89d..8bfe1a7 100644
--- a/libkdchart/KDChartBarPainter.cpp
+++ b/libkdchart/KDChartBarPainter.cpp
@@ -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( 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() ) {
diff --git a/libkdchart/KDChartCustomBox.h b/libkdchart/KDChartCustomBox.h
index 223920e..823dd2c 100644
--- a/libkdchart/KDChartCustomBox.h
+++ b/libkdchart/KDChartCustomBox.h
@@ -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
diff --git a/libkdchart/KDChartEnums.h b/libkdchart/KDChartEnums.h
index 82956e8..b3fe163 100644
--- a/libkdchart/KDChartEnums.h
+++ b/libkdchart/KDChartEnums.h
@@ -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
*/
diff --git a/libkdchart/KDChartHiLoPainter.cpp b/libkdchart/KDChartHiLoPainter.cpp
index bb8b2e3..d8f766c 100644
--- a/libkdchart/KDChartHiLoPainter.cpp
+++ b/libkdchart/KDChartHiLoPainter.cpp
@@ -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.
}
diff --git a/libkdchart/KDChartLinesPainter.cpp b/libkdchart/KDChartLinesPainter.cpp
index a7e0109..9f0995e 100644
--- a/libkdchart/KDChartLinesPainter.cpp
+++ b/libkdchart/KDChartLinesPainter.cpp
@@ -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.
}
diff --git a/libkdchart/KDChartObjectFactory.cpp b/libkdchart/KDChartObjectFactory.cpp
index 6e2a128..a53f84c 100644
--- a/libkdchart/KDChartObjectFactory.cpp
+++ b/libkdchart/KDChartObjectFactory.cpp
@@ -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
diff --git a/libkdchart/KDChartPainter.cpp b/libkdchart/KDChartPainter.cpp
index df60857..5ec6109 100644
--- a/libkdchart/KDChartPainter.cpp
+++ b/libkdchart/KDChartPainter.cpp
@@ -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 );
diff --git a/libkdchart/KDChartParams.cpp b/libkdchart/KDChartParams.cpp
index aac8928..deedda9 100644
--- a/libkdchart/KDChartParams.cpp
+++ b/libkdchart/KDChartParams.cpp
@@ -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 anchor
point -- specified by \c negativePosition (or \c
- positivePosition, resp.) -- and the internal tqalignment point
+ positivePosition, resp.) -- and the internal alignment point
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). Note: 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 anchor
point -- specified by \c negativePosition (or \c
- positivePosition, resp.) -- and the internal tqalignment point
+ positivePosition, resp.) -- and the internal alignment point
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). Note: 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 tqalignment point of the
+will be performed around the internal alignment point 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 anchor
point -- specified by \c negativePosition (or \c
- positivePosition, resp.) -- and the internal tqalignment point
+ positivePosition, resp.) -- and the internal alignment point
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). Note: 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 anchor
point -- specified by \c negativePosition (or \c
- positivePosition, resp.) -- and the internal tqalignment point
+ positivePosition, resp.) -- and the internal alignment point
of the text -- specified by \c negativeAlign (or \c positiveAlign,
resp.). Note: 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 tqalignment point of the
+will be performed around the internal alignment point 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... Note: Those headers share the same area 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).
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 additional headers ( \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).
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.
@@ -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...
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 additional footers ( \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).
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 trailing footers ( \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).
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.
diff --git a/libkdchart/KDChartParams.h b/libkdchart/KDChartParams.h
index 1672269..840ad12 100644
--- a/libkdchart/KDChartParams.h
+++ b/libkdchart/KDChartParams.h
@@ -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,
diff --git a/libkdchart/KDChartParams_io.cpp b/libkdchart/KDChartParams_io.cpp
index 4f17e65..86f37d6 100644
--- a/libkdchart/KDChartParams_io.cpp
+++ b/libkdchart/KDChartParams_io.cpp
@@ -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 );
}
}
diff --git a/libkdchart/KDChartPiePainter.cpp b/libkdchart/KDChartPiePainter.cpp
index 44f4c60..a8e126c 100644
--- a/libkdchart/KDChartPiePainter.cpp
+++ b/libkdchart/KDChartPiePainter.cpp
@@ -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.
}
diff --git a/libkdchart/KDChartPolarPainter.cpp b/libkdchart/KDChartPolarPainter.cpp
index 9ebed86..99cee95 100644
--- a/libkdchart/KDChartPolarPainter.cpp
+++ b/libkdchart/KDChartPolarPainter.cpp
@@ -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.
}
diff --git a/libkdchart/KDChartPropertySet.h b/libkdchart/KDChartPropertySet.h
index cdd64f7..d963af5 100644
--- a/libkdchart/KDChartPropertySet.h
+++ b/libkdchart/KDChartPropertySet.h
@@ -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
or 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.
diff --git a/libkdchart/KDChartRingPainter.cpp b/libkdchart/KDChartRingPainter.cpp
index 8797da5..ba1e6fe 100644
--- a/libkdchart/KDChartRingPainter.cpp
+++ b/libkdchart/KDChartRingPainter.cpp
@@ -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.
}
diff --git a/libkdchart/KDChartWidget.cpp b/libkdchart/KDChartWidget.cpp
index d530ea1..8217abf 100644
--- a/libkdchart/KDChartWidget.cpp
+++ b/libkdchart/KDChartWidget.cpp
@@ -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
diff --git a/libkdchart/KDDrawText.cpp b/libkdchart/KDDrawText.cpp
index 70283da..c098513 100644
--- a/libkdchart/KDDrawText.cpp
+++ b/libkdchart/KDDrawText.cpp
@@ -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 );
diff --git a/libkdchart/KDFrameProfileSection.h b/libkdchart/KDFrameProfileSection.h
index 9fe38ad..48f70bb 100644
--- a/libkdchart/KDFrameProfileSection.h
+++ b/libkdchart/KDFrameProfileSection.h
@@ -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.
diff --git a/libkgpgfile/kgpgfile.cpp b/libkgpgfile/kgpgfile.cpp
index 5dc3b69..56f3dd5 100644
--- a/libkgpgfile/kgpgfile.cpp
+++ b/libkgpgfile/kgpgfile.cpp
@@ -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::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]);
}
}
}