diff options
Diffstat (limited to 'kmymoney2')
270 files changed, 2666 insertions, 2666 deletions
diff --git a/kmymoney2/converter/convertertest.cpp b/kmymoney2/converter/convertertest.cpp index 739c6f3..bbe0ec4 100644 --- a/kmymoney2/converter/convertertest.cpp +++ b/kmymoney2/converter/convertertest.cpp @@ -112,8 +112,8 @@ void ConverterTest::testWebQuotes() CPPUNIT_ASSERT(qr.m_errors.count() == 0); // Quote date should be within the last week, or something bad is going on. - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate()); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate()); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); // Quote value should at least be positive CPPUNIT_ASSERT(qr.m_price.isPositive()); @@ -123,8 +123,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); q.launch("EUR > USD","Yahoo Currency"); @@ -132,8 +132,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); q.launch("50492","Globe & Mail"); @@ -141,8 +141,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); q.launch("TDB647","MSN.CA"); @@ -150,8 +150,8 @@ void ConverterTest::testWebQuotes() // kdDebug(2) << "ConverterTest::testWebQuotes(): quote for " << q.m_symbol << " on " << qr.m_date.toString() << " is " << qr.m_price.toString() << " errors(" << qr.m_errors.count() << "): " << qr.m_errors.join(" /// ") << endl; CPPUNIT_ASSERT(qr.m_errors.count() == 0); - CPPUNIT_ASSERT(qr.m_date <= TQDate::tqcurrentDate().addDays(1)); - CPPUNIT_ASSERT(qr.m_date >= TQDate::tqcurrentDate().addDays(-7)); + CPPUNIT_ASSERT(qr.m_date <= TQDate::currentDate().addDays(1)); + CPPUNIT_ASSERT(qr.m_date >= TQDate::currentDate().addDays(-7)); CPPUNIT_ASSERT(qr.m_price.isPositive()); } diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp index bfd6911..7fe9a28 100644 --- a/kmymoney2/converter/mymoneygncreader.cpp +++ b/kmymoney2/converter/mymoneygncreader.cpp @@ -58,7 +58,7 @@ email : [email protected] #define PASS } catch (MyMoneyException *e) { throw e; } #else #include "mymoneymoney.h" - #include <tqtextedit.h> + #include <textedit.h> #define i18n TQObject::tr #define TRY #define CATCH @@ -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); } @@ -1192,10 +1192,10 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { acc.setDescription(gac->desc()); - TQDate tqcurrentDate = TQDate::tqcurrentDate(); - acc.setOpeningDate(tqcurrentDate); - acc.setLastModified(tqcurrentDate); - acc.setLastReconciliationDate(tqcurrentDate); + TQDate currentDate = TQDate::currentDate(); + acc.setOpeningDate(currentDate); + acc.setLastModified(currentDate); + acc.setLastReconciliationDate(currentDate); if (gac->commodity()->isCurrency()) { acc.setCurrencyId (gac->commodity()->id().utf8()); m_currencyCount[gac->commodity()->id()]++; @@ -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': @@ -1717,7 +1717,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) { MyMoneyTransaction tx; m_suspectSchedule = false; TQDate startDate, nextDate, lastDate, endDate; // for date calculations - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); int numOccurs, remOccurs; if (m_scheduleCount == 0) signalProgress (0, m_gncScheduleCount, i18n("Loading schedules...")); @@ -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 @@ -2139,7 +2139,7 @@ TQString MyMoneyGncReader::createOrphanAccount (const TQString& gncName) { acc.setName ("orphan_" + gncName); acc.setDescription (i18n("Orphan created from unknown gnucash account")); - TQDate today = TQDate::tqcurrentDate(); + TQDate today = TQDate::currentDate(); acc.setOpeningDate (today); acc.setLastModified (today); @@ -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/mymoneygncreader.h b/kmymoney2/converter/mymoneygncreader.h index b34abf7..e66114a 100644 --- a/kmymoney2/converter/mymoneygncreader.h +++ b/kmymoney2/converter/mymoneygncreader.h @@ -157,7 +157,7 @@ class TQIODevice; #include <tqptrstack.h> #include <tqxml.h> #include <tqdatetime.h> -#include <tqtextcodec.h> +#include <textcodec.h> // ---------------------------------------------------------------------------- // Project Includes 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 809d71c..76e71d2 100644 --- a/kmymoney2/converter/mymoneyqifreader.cpp +++ b/kmymoney2/converter/mymoneyqifreader.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqstringlist.h> #include <tqtimer.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqregexp.h> #include <tqbuffer.h> @@ -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; @@ -460,7 +460,7 @@ bool MyMoneyQifReader::finishImport(void) // remove the Don't ask again entries KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { @@ -480,7 +480,7 @@ bool MyMoneyQifReader::finishImport(void) // remove the Don't ask again entries KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { @@ -531,7 +531,7 @@ bool MyMoneyQifReader::finishImport(void) ft.commit(); } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to add transactions"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; rc = false; } @@ -773,7 +773,7 @@ void MyMoneyQifReader::processMSAccountEntry(const MyMoneyAccount::accountTypeE const MyMoneySecurity& sec = file->security(m_account.currencyId()); if ( KMessageBox::questionYesNo( tqApp->mainWidget(), - i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").tqarg(m_account.name(), split.shares().formatMoney(m_account, sec),balance.formatMoney(m_account, sec)), + i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").arg(m_account.name(), split.shares().formatMoney(m_account, sec),balance.formatMoney(m_account, sec)), i18n("Overwrite opening balance"), KStdGuiItem::yes(), KStdGuiItem::no(), @@ -897,9 +897,9 @@ TQString MyMoneyQifReader::transferAccount(TQString name, bool useBrokerage) MyMoneyAccount tmpAccount = m_account; m_qifEntry.clear(); // and construct a temp entry to create/search the account - m_qifEntry << TQString("N%1").tqarg(name); + m_qifEntry << TQString("N%1").arg(name); m_qifEntry << TQString("Tunknown"); - m_qifEntry << TQString("D%1").tqarg(i18n("Autogenerated by TQIF importer")); + m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer")); accountId = processAccountEntry(false); // in case we found a reference to an investment account, we need @@ -908,9 +908,9 @@ TQString MyMoneyQifReader::transferAccount(TQString name, bool useBrokerage) if(useBrokerage && (acc.accountType() == MyMoneyAccount::Investment)) { name = acc.brokerageName(); m_qifEntry.clear(); // and construct a temp entry to create/search the account - m_qifEntry << TQString("N%1").tqarg(name); + m_qifEntry << TQString("N%1").arg(name); m_qifEntry << TQString("Tunknown"); - m_qifEntry << TQString("D%1").tqarg(i18n("Autogenerated by TQIF importer")); + m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer")); accountId = processAccountEntry(false); } m_qifEntry = tmpEntry; // restore local copies @@ -932,9 +932,9 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp d->isTransfer(name, m_qifProfile.accountDelimiter().left(1), m_qifProfile.accountDelimiter().mid(1,1)); TQStringList entry = m_qifEntry; // keep a temp copy m_qifEntry.clear(); // and construct a temp entry to create/search the account - m_qifEntry << TQString("N%1").tqarg(name); - m_qifEntry << TQString("T%1").tqarg(d->accountTypeToQif(accType)); - m_qifEntry << TQString("D%1").tqarg(i18n("Autogenerated by TQIF importer")); + m_qifEntry << TQString("N%1").arg(name); + m_qifEntry << TQString("T%1").arg(d->accountTypeToQif(accType)); + m_qifEntry << TQString("D%1").arg(i18n("Autogenerated by TQIF importer")); processAccountEntry(); m_qifEntry = entry; // restore local copy } @@ -960,7 +960,7 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp } if(needCreate) { // in case we create it anyway, we issue a warning to the user to check it manually - KMessageBox::sorry(0, TQString("<qt>%1</qt>").tqarg(i18n("KMyMoney has imported a second opening balance transaction into account <b>%1</b> which differs from the one found already on file. Please correct this manually once the import is done.").tqarg(acc.name())), i18n("Opening balance problem")); + KMessageBox::sorry(0, TQString("<qt>%1</qt>").arg(i18n("KMyMoney has imported a second opening balance transaction into account <b>%1</b> which differs from the one found already on file. Please correct this manually once the import is done.").arg(acc.name())), i18n("Opening balance problem")); } } @@ -984,7 +984,7 @@ void MyMoneyQifReader::createOpeningBalance(MyMoneyAccount::_accountTypeE accTyp } catch(MyMoneyException* e) { KMessageBox::detailedError(0, i18n("Error while creating opening balance transaction"), - TQString("%1(%2):%3").tqarg(e->file()).tqarg(e->line()).tqarg(e->what()), + TQString("%1(%2):%3").arg(e->file()).arg(e->line()).arg(e->what()), i18n("File access error")); delete e; } @@ -1017,7 +1017,7 @@ void MyMoneyQifReader::processTransactionEntry(void) int idx = 1; TQString hash; for(;;) { - hash = TQString("%1-%2").tqarg(hashBase).tqarg(idx); + hash = TQString("%1-%2").arg(hashBase).arg(idx); TQMap<TQString, bool>::const_iterator it; it = d->m_hashMap.find(hash); if(it == d->m_hashMap.end()) { @@ -1054,11 +1054,11 @@ 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: - tr.m_datePosted = (TQDate::tqcurrentDate()); + tr.m_datePosted = (TQDate::currentDate()); break; case KMessageBox::Cancel: @@ -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,11 +1301,11 @@ 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: - tr.m_datePosted = TQDate::tqcurrentDate(); + tr.m_datePosted = TQDate::currentDate(); break; case KMessageBox::Cancel: @@ -1327,7 +1327,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) int idx = 1; TQString hash; for(;;) { - hash = TQString("%1-%2").tqarg(hashBase).tqarg(idx); + hash = TQString("%1-%2").arg(hashBase).arg(idx); TQMap<TQString, bool>::const_iterator it; it = d->m_hashMap.find(hash); if(it == d->m_hashMap.end()) { @@ -1341,7 +1341,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) // '#' field: BankID TQString tmp = extractLine('#'); if ( ! tmp.isEmpty() ) - tr.m_strBankID = TQString("ID %1").tqarg(tmp); + tr.m_strBankID = TQString("ID %1").arg(tmp); // Reconciliation flag tr.m_reconcile = d->reconcileState(extractLine('C')); @@ -1434,9 +1434,9 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) // If the security is not known, notify the user // TODO (Ace) A "SelectOrCreateAccount" interface for investments KMessageBox::information(0, i18n("This investment account does not contain the \"%1\" security. " - "Transactions involving this security will be ignored.").tqarg(securityname), + "Transactions involving this security will be ignored.").arg(securityname), i18n("Security not found"), - TQString("MissingSecurity%1").tqarg(securityname.stripWhiteSpace())); + TQString("MissingSecurity%1").arg(securityname.stripWhiteSpace())); return; } #endif @@ -1538,7 +1538,7 @@ void MyMoneyQifReader::processInvestmentTransactionEntry(void) tr.m_amount = -(amount - tr.m_fees); if(tr.m_strMemo.isEmpty()) - tr.m_strMemo = (TQString("%1 %2").tqarg(extractLine('Y')).tqarg(d->typeToAccountName(action))).stripWhiteSpace(); + tr.m_strMemo = (TQString("%1 %2").arg(extractLine('Y')).arg(d->typeToAccountName(action))).stripWhiteSpace(); } else if (action == "xin" || action == "xout") { @@ -2041,7 +2041,7 @@ TQString MyMoneyQifReader::processAccountEntry(bool resetAccountId) MyMoneyMoney balance; // in case it's a stock account, we need to setup a fix investment account if(account.isInvest()) { - acc.setName(i18n("%1 (Investment)").tqarg(account.name())); // use the same name for the investment account + acc.setName(i18n("%1 (Investment)").arg(account.name())); // use the same name for the investment account acc.setDescription(i18n("Autogenerated by TQIF importer from type Mutual account entry")); acc.setAccountType(MyMoneyAccount::Investment); parentAccount = file->asset(); @@ -2130,7 +2130,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone return; } catch (MyMoneyException *e) { - TQString message(i18n("Account \"%1\" disappeared: ").tqarg(account.name())); + TQString message(i18n("Account \"%1\" disappeared: ").arg(account.name())); message += e->what(); KMessageBox::error(0, message); delete e; @@ -2152,7 +2152,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone } else { switch(KMessageBox::questionYesNo(0, i18n("The %1 '%2' does not exist. Do you " - "want to create it?").tqarg(typeStr).tqarg(account.name()))) { + "want to create it?").arg(typeStr).arg(account.name()))) { case KMessageBox::Yes: break; case KMessageBox::No: @@ -2160,25 +2160,25 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone } } } else { - accountSelect.setHeader(i18n("Select %1").tqarg(typeStr)); + accountSelect.setHeader(i18n("Select %1").arg(typeStr)); if(!accountId.isEmpty()) { msg = i18n("The %1 <b>%2</b> currently exists. Do you want " "to import transactions to this account?") - .tqarg(typeStr).tqarg(account.name()); + .arg(typeStr).arg(account.name()); } else { msg = i18n("The %1 <b>%2</b> currently does not exist. You can " "create a new %3 by pressing the <b>Create</b> button " "or select another %4 manually from the selection box.") - .tqarg(typeStr).tqarg(account.name()).tqarg(typeStr).tqarg(typeStr); + .arg(typeStr).arg(account.name()).arg(typeStr).arg(typeStr); } } } else { - accountSelect.setHeader(i18n("Import transactions to %1").tqarg(typeStr)); + accountSelect.setHeader(i18n("Import transactions to %1").arg(typeStr)); msg = i18n("No %1 information has been found in the selected TQIF file. " "Please select an account using the selection box in the dialog or " "create a new %2 by pressing the <b>Create</b> button.") - .tqarg(typeStr).tqarg(typeStr); + .arg(typeStr).arg(typeStr); } accountSelect.setDescription(msg); @@ -2223,7 +2223,7 @@ void MyMoneyQifReader::selectOrCreateAccount(const SelectCreateMode mode, MyMone const MyMoneySecurity& sec = file->security(account.currencyId()); if ( KMessageBox::questionYesNo( tqApp->mainWidget(), - i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").tqarg(account.name(), split.shares().formatMoney(account, sec), balance.formatMoney(account, sec)), + i18n("The %1 account currently has an opening balance of %2. This TQIF file reports an opening balance of %3. Would you like to overwrite the current balance with the one from the TQIF file?").arg(account.name(), split.shares().formatMoney(account, sec), balance.formatMoney(account, sec)), i18n("Overwrite opening balance"), KStdGuiItem::yes(), KStdGuiItem::no(), diff --git a/kmymoney2/converter/mymoneyqifwriter.cpp b/kmymoney2/converter/mymoneyqifwriter.cpp index d84e325..1032d95 100644 --- a/kmymoney2/converter/mymoneyqifwriter.cpp +++ b/kmymoney2/converter/mymoneyqifwriter.cpp @@ -23,7 +23,7 @@ // QT Headers #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -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 f25eed4..e7b81e5 100644 --- a/kmymoney2/converter/mymoneystatementreader.cpp +++ b/kmymoney2/converter/mymoneystatementreader.cpp @@ -29,7 +29,7 @@ #include <tqfile.h> #include <tqstringlist.h> #include <tqtimer.h> -#include <tqtextedit.h> +#include <textedit.h> // ---------------------------------------------------------------------------- // KDE Headers @@ -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,20 +389,20 @@ 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 KConfig* config = KGlobal::config(); - config->setGroup(TQString::tqfromLatin1("Notification Messages")); + config->setGroup(TQString::fromLatin1("Notification Messages")); TQStringList::ConstIterator it; for(it = m_dontAskAgain.begin(); it != m_dontAskAgain.end(); ++it) { @@ -485,7 +485,7 @@ void MyMoneyStatementReader::processSecurityEntry(const MyMoneyStatement::Securi ft.commit(); kdDebug(0) << "Created " << security.name() << " with id " << security.id() << endl; } catch(MyMoneyException *e) { - KMessageBox::error(0, i18n("Error creating security record: %1").tqarg(e->what()), i18n("Error")); + KMessageBox::error(0, i18n("Error creating security record: %1").arg(e->what()), i18n("Error")); } } else { kdDebug(0) << "Found " << security.name() << " with id " << security.id() << endl; @@ -500,7 +500,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra #if 0 TQString dbgMsg; - dbgMsg = TQString("Process %1, '%3', %2").tqarg(t_in.m_datePosted.toString(Qt::ISODate)).tqarg(t_in.m_amount.formatMoney("", 2)).tqarg(t_in.m_strBankID); + dbgMsg = TQString("Process %1, '%3', %2").arg(t_in.m_datePosted.toString(Qt::ISODate)).arg(t_in.m_amount.formatMoney("", 2)).arg(t_in.m_strBankID); qDebug("%s", dbgMsg.data()); #endif @@ -614,7 +614,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra if ( t_in.m_strSecurity.isEmpty() ) { - KMessageBox::information(0, i18n("This imported statement contains investment transactions with no security. These transactions will be ignored.").tqarg(t_in.m_strSecurity),i18n("Security not found"),TQString("BlankSecurity")); + KMessageBox::information(0, i18n("This imported statement contains investment transactions with no security. These transactions will be ignored.").arg(t_in.m_strSecurity),i18n("Security not found"),TQString("BlankSecurity")); return; } else @@ -646,7 +646,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra // This should be rare. A statement should have a security entry for any // of the securities referred to in the transactions. The only way to get // here is if that's NOT the case. - KMessageBox::information(0, i18n("This investment account does not contain the \"%1\" security. Transactions involving this security will be ignored.").tqarg(t_in.m_strSecurity),i18n("Security not found"),TQString("MissingSecurity%1").tqarg(t_in.m_strSecurity.stripWhiteSpace())); + KMessageBox::information(0, i18n("This investment account does not contain the \"%1\" security. Transactions involving this security will be ignored.").arg(t_in.m_strSecurity),i18n("Security not found"),TQString("MissingSecurity%1").arg(t_in.m_strSecurity.stripWhiteSpace())); return; } } @@ -840,7 +840,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra break; case MyMoneyPayee::matchName: - keys << TQString("%1").tqarg(TQRegExp::escape((*it_p).name())); + keys << TQString("%1").arg(TQRegExp::escape((*it_p).name())); // tricky fall through here case MyMoneyPayee::matchKey: @@ -882,13 +882,13 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra if(m_autoCreatePayee == false) { // Ask the user if that is what he intended to do? - TQString msg = i18n("Do you want to add \"%1\" as payee/receiver?\n\n").tqarg(payeename); + TQString msg = i18n("Do you want to add \"%1\" as payee/receiver?\n\n").arg(payeename); msg += i18n("Selecting \"Yes\" will create the payee, \"No\" will skip " "creation of a payee record and remove the payee information " "from this transaction. Selecting \"Cancel\" aborts the import " "operation.\n\nIf you select \"No\" here and mark the \"Don't ask " "again\" checkbox, the payee information for all following transactions " - "referencing \"%1\" will be removed.").tqarg(payeename); + "referencing \"%1\" will be removed.").arg(payeename); TQString askKey = TQString("Statement-Import-Payee-")+payeename; if(!m_dontAskAgain.contains(askKey)) { @@ -928,7 +928,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra //add in caption? and account combo here TQLabel *label1 = new TQLabel( topcontents); - label1->setText(i18n("Please select a default category for payee '%1':").tqarg(payee.name())); + label1->setText(i18n("Please select a default category for payee '%1':").arg(payee.name())); TQGuardedPtr<KMyMoneyAccountCombo> accountCombo = new KMyMoneyAccountCombo(topcontents); dialog->setMainWidget(topcontents); @@ -961,7 +961,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to add payee/receiver"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } @@ -1164,7 +1164,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra // to enter the schedule and match it agains the new transaction. Otherwise, we // just leave the transaction as imported. MyMoneySchedule schedule(*(dynamic_cast<const MyMoneySchedule*>(o))); - if(KMessageBox::questionYesNo(0, TQString("<qt>%1</qt>").tqarg(i18n("KMyMoney has found a scheduled transaction named <b>%1</b> which matches an imported transaction. Do you want KMyMoney to enter this schedule now so that the transaction can be matched? ").tqarg(schedule.name())), i18n("Schedule found")) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(0, TQString("<qt>%1</qt>").arg(i18n("KMyMoney has found a scheduled transaction named <b>%1</b> which matches an imported transaction. Do you want KMyMoney to enter this schedule now so that the transaction can be matched? ").arg(schedule.name())), i18n("Schedule found")) == KMessageBox::Yes) { KEnterScheduleDlg dlg(0, schedule); TransactionEditor* editor = dlg.startEdit(); if(editor) { @@ -1221,7 +1221,7 @@ void MyMoneyStatementReader::processTransactionEntry(const MyMoneyStatement::Tra } delete o; } catch (MyMoneyException *e) { - TQString message(i18n("Problem adding or matching imported transaction with id '%1': %2").tqarg(t_in.m_strBankID).tqarg(e->what())); + TQString message(i18n("Problem adding or matching imported transaction with id '%1': %2").arg(t_in.m_strBankID).arg(e->what())); qDebug("%s", message.data()); delete e; @@ -1271,9 +1271,9 @@ bool MyMoneyStatementReader::selectOrCreateAccount(const SelectCreateMode /*mode } TQString msg = i18n("<b>You have downloaded a statement for the following account:</b><br><br>"); - msg += i18n(" - Account Name: %1").tqarg(account.name()) + "<br>"; - msg += i18n(" - Account Type: %1").tqarg(KMyMoneyUtils::accountTypeToString(account.accountType())) + "<br>"; - msg += i18n(" - Account Number: %1").tqarg(account.number()) + "<br>"; + msg += i18n(" - Account Name: %1").arg(account.name()) + "<br>"; + msg += i18n(" - Account Type: %1").arg(KMyMoneyUtils::accountTypeToString(account.accountType())) + "<br>"; + msg += i18n(" - Account Number: %1").arg(account.number()) + "<br>"; msg += "<br>"; TQString header; @@ -1332,7 +1332,7 @@ bool MyMoneyStatementReader::selectOrCreateAccount(const SelectCreateMode /*mode //throw new MYMONEYEXCEPTION("USERABORT"); done = true; else - KMessageBox::error(0, TQString("<qt>%1</qt>").tqarg(i18n("You must select an account, create a new one, or press the <b>Abort</b> button."))); + KMessageBox::error(0, TQString("<qt>%1</qt>").arg(i18n("You must select an account, create a new one, or press the <b>Abort</b> button."))); } } return result; 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("<b>%1</b> is not a template file.").tqarg(filename); + TQString msg=i18n("<b>%1</b> is not a template file.").arg(filename); KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+msg, i18n("Filetype Error")); return false; } @@ -90,7 +90,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url) TQString errMsg; int errLine, errColumn; if(!m_doc.setContent(&file, &errMsg, &errLine, &errColumn)) { - TQString msg=i18n("Error while reading template file <b>%1</b> in line %2, column %3").tqarg(filename).tqarg(errLine).tqarg(errColumn); + TQString msg=i18n("Error while reading template file <b>%1</b> in line %2, column %3").arg(filename).arg(errLine).arg(errColumn); KMessageBox::detailedError(tqApp->mainWidget(), TQString("<p>")+msg, errMsg, i18n("Template Error")); rc = false; } else { @@ -98,7 +98,7 @@ bool MyMoneyTemplate::loadTemplate(const KURL& url) } file.close(); } else { - KMessageBox::sorry(tqApp->mainWidget(), i18n("File '%1' not found!").tqarg(filename)); + KMessageBox::sorry(tqApp->mainWidget(), i18n("File '%1' not found!").arg(filename)); rc = false; } @@ -139,7 +139,7 @@ bool MyMoneyTemplate::loadDescription(void) m_longDesc = childElement.text(); validMask |= validLong; } else { - KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid tag <b>%1</b> in template file <b>%2</b>!").tqarg(childElement.tagName()).tqarg(m_source.prettyURL())); + KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid tag <b>%1</b> in template file <b>%2</b>!").arg(childElement.tagName()).arg(m_source.prettyURL())); validMask |= invalid; } child = child.nextSibling(); @@ -155,7 +155,7 @@ bool MyMoneyTemplate::hierarchy(TQMap<TQString, TQListViewItem*>& list, const TQ if(account.isElement()) { TQDomElement accountElement = account.toElement(); if(accountElement.tagName() == "account") { - TQString name = TQString("%1:%2").tqarg(parent).tqarg(accountElement.attribute("name")); + TQString name = TQString("%1:%2").arg(parent).arg(accountElement.attribute("name")); list[name] = 0; hierarchy(list, name, account.firstChild()); } @@ -211,7 +211,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&)) m_progressCallback = callback; bool rc = !m_accounts.isNull(); MyMoneyFile* file = MyMoneyFile::instance(); - signalProgress(0, m_doc.elementsByTagName("account").count(), i18n("Loading template %1").tqarg(m_source.url())); + signalProgress(0, m_doc.elementsByTagName("account").count(), i18n("Loading template %1").arg(m_source.url())); m_accountsRead = 0; while(rc == true && !m_accounts.isNull() && m_accounts.isElement()) { @@ -238,7 +238,7 @@ bool MyMoneyTemplate::importTemplate(void(*callback)(int, int, const TQString&)) break; default: - KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid top-level account type <b>%1</b> in template file <b>%2</b>!").tqarg(childElement.attribute("type")).tqarg(m_source.prettyURL())); + KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid top-level account type <b>%1</b> in template file <b>%2</b>!").arg(childElement.attribute("type")).arg(m_source.prettyURL())); rc = false; } @@ -306,7 +306,7 @@ bool MyMoneyTemplate::setFlags(MyMoneyAccount& acc, TQDomNode flags) if(value == "Tax") { acc.setValue(value.latin1(), "Yes"); } else { - KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid flag type <b>%1</b> for account <b>%3</b> in template file <b>%2</b>!").tqarg(flagElement.attribute("name")).tqarg(m_source.prettyURL()).tqarg(acc.name())); + KMessageBox::error(tqApp->mainWidget(), TQString("<p>")+i18n("Invalid flag type <b>%1</b> for account <b>%3</b> in template file <b>%2</b>!").arg(flagElement.attribute("name")).arg(m_source.prettyURL()).arg(acc.name())); rc = false; } } @@ -395,16 +395,16 @@ bool MyMoneyTemplate::saveTemplate(const KURL& url) if(qfile.status() == 0) { saveToLocalFile(qfile.file()); if(!qfile.close()) { - throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename)); + throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename)); } } else { - throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename)); + throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename)); } } else { KTempFile tmpfile; saveToLocalFile(tmpfile.file()); if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL)) - throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").tqarg(url.url())); + throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url())); tmpfile.unlink(); } return true; diff --git a/kmymoney2/converter/webpricequote.cpp b/kmymoney2/converter/webpricequote.cpp index 7732e54..5fdc032 100644 --- a/kmymoney2/converter/webpricequote.cpp +++ b/kmymoney2/converter/webpricequote.cpp @@ -20,7 +20,7 @@ #include <tqfile.h> #include <tqregexp.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqprocess.h> // ---------------------------------------------------------------------------- @@ -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,12 +377,12 @@ 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())); - m_date = TQDate::tqcurrentDate(); + // 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; } @@ -1016,7 +1016,7 @@ convertertest::QuoteReceiver::QuoteReceiver(WebPriceQuote* q, TQObject* parent, connect(q,TQT_SIGNAL(quote(const TQString&,const TQDate&, const double&)), this,TQT_SLOT(slotGetQuote(const TQString&,const TQDate&, const double&))); connect(q,TQT_SIGNAL(status(const TQString&)), - this,TQT_SLOT(slottqStatus(const TQString&))); + this,TQT_SLOT(slotStatus(const TQString&))); connect(q,TQT_SIGNAL(error(const TQString&)), this,TQT_SLOT(slotError(const TQString&))); } @@ -1032,7 +1032,7 @@ void convertertest::QuoteReceiver::slotGetQuote(const TQString&,const TQDate& d, m_price = MyMoneyMoney(m); m_date = d; } -void convertertest::QuoteReceiver::slottqStatus(const TQString& msg) +void convertertest::QuoteReceiver::slotStatus(const TQString& msg) { // kdDebug(2) << "test::QuoteReceiver::slotStatus( " << msg << " )" << endl; diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h index ada7684..377ba8d 100644 --- a/kmymoney2/converter/webpricequote.h +++ b/kmymoney2/converter/webpricequote.h @@ -217,7 +217,7 @@ class MyMoneyDateFormat public: MyMoneyDateFormat(const TQString& _format): m_format(_format) {} TQString convertDate(const TQDate& _in) const; - TQDate convertString(const TQString& _in, bool _strict=true, unsigned _centurymidpoint = TQDate::tqcurrentDate().year() ) const; + TQDate convertString(const TQString& _in, bool _strict=true, unsigned _centurymidpoint = TQDate::currentDate().year() ) const; const TQString& format(void) const { return m_format; } private: TQString m_format; @@ -239,7 +239,7 @@ public: ~QuoteReceiver(); public slots: void slotGetQuote(const TQString&,const TQDate&, const double&); - void slottqStatus(const TQString&); + void slotStatus(const TQString&); void slotError(const TQString&); public: TQStringList m_statuses; 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<KMyMoneyCategory*>(haveWidget("asset-account")); if(cat->isVisible()) { if(cat->currentText().isEmpty()) { - MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").tqarg(m_parent->account().name())); + MyMoneyAccount acc = MyMoneyFile::instance()->accountByName(i18n("%1 (Brokerage)").arg(m_parent->account().name())); if(!acc.id().isEmpty()) { bool blocked = cat->signalsBlocked(); // block signals, so that the focus does not go crazy diff --git a/kmymoney2/dialogs/investtransactioneditor.cpp b/kmymoney2/dialogs/investtransactioneditor.cpp index 92ea338..1f6f6da 100644 --- a/kmymoney2/dialogs/investtransactioneditor.cpp +++ b/kmymoney2/dialogs/investtransactioneditor.cpp @@ -279,39 +279,39 @@ void InvestTransactionEditor::createEditWidgets(void) } TQLabel* label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::AlignRight | TQt::DontClip); m_editWidgets["total"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["total-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["asset-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["fee-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["fee-amount-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["interest-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["interest-amount-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["price-label"] = label; label = new TQLabel("", 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["shares-label"] = label; // if we don't have more than 1 selected transaction, we don't need @@ -586,7 +586,7 @@ void InvestTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action /* action else if(m_lastPostDate.isValid()) postDate->setDate(m_lastPostDate); else - postDate->setDate(TQDate::tqcurrentDate()); + postDate->setDate(TQDate::currentDate()); // security (but only if it's not the investment account) if(m_split.accountId() != m_account.id()) { @@ -1014,7 +1014,7 @@ bool InvestTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyM s0.setReconcileFlag(status->state()); if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) - s0.setReconcileDate(TQDate::tqcurrentDate()); + s0.setReconcileDate(TQDate::currentDate()); // call the creation logic for the current selected activity bool rc = d->m_activity->createTransaction(t, s0, assetAccountSplit, feeSplits, m_feeSplits, interestSplits, m_interestSplits, security, currency); diff --git a/kmymoney2/dialogs/kaccountselectdlgdecl.ui b/kmymoney2/dialogs/kaccountselectdlgdecl.ui index 705998a..81be6c2 100644 --- a/kmymoney2/dialogs/kaccountselectdlgdecl.ui +++ b/kmymoney2/dialogs/kaccountselectdlgdecl.ui @@ -30,7 +30,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -58,7 +58,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -95,7 +95,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -127,7 +127,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -154,7 +154,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>160</width> <height>0</height> diff --git a/kmymoney2/dialogs/kbackupdlgdecl.ui b/kmymoney2/dialogs/kbackupdlgdecl.ui index e0e3a7a..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."</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -135,7 +135,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>24</height> @@ -168,7 +168,7 @@ Click OK to perform the backup. If your system does not use an automounter, make <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>455</width> <height>0</height> diff --git a/kmymoney2/dialogs/kbalancechartdlg.cpp b/kmymoney2/dialogs/kbalancechartdlg.cpp index 85134da..ceb7ff8 100644 --- a/kmymoney2/dialogs/kbalancechartdlg.cpp +++ b/kmymoney2/dialogs/kbalancechartdlg.cpp @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqframe.h> // ---------------------------------------------------------------------------- @@ -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); @@ -83,7 +83,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare reportCfg.addAccount(account.id()); reportCfg.setColumnsAreDays( true ); reportCfg.setConvertCurrency( false ); - reportCfg.setDateFilter(TQDate::tqcurrentDate().addDays(-90),TQDate::tqcurrentDate().addDays(+90)); + reportCfg.setDateFilter(TQDate::currentDate().addDays(-90),TQDate::currentDate().addDays(+90)); reports::PivotTable table(reportCfg); @@ -213,7 +213,7 @@ KBalanceChartDlg::KBalanceChartDlg(const MyMoneyAccount& account, TQWidget* pare // connect( buttonOk, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); connect( buttonClose, TQT_SIGNAL( clicked() ), this, TQT_SLOT( accept() ) ); - resize( TQSize(700, 500).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(700, 500).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); #endif } 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("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").tqarg(category.name())+TQString("</qt>")); + KMessageBox::sorry(this, TQString("<qt>")+i18n("At least one transaction/schedule still references the category <b>%1</b>. However, at least one category with the same currency must exist so that the transactions/schedules can be reassigned.").arg(category.name())+TQString("</qt>")); return TQString(); } diff --git a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui index ee9faa4..f29d82b 100644 --- a/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui +++ b/kmymoney2/dialogs/kcategoryreassigndlgdecl.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -38,7 +38,7 @@ <property name="text"> <string>The transactions, schedules and budgets associated with the selected category need to be re-assigned to a different category before the selected category can be deleted. Please select a category from the list below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -105,7 +105,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -121,7 +121,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>20</height> diff --git a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui index f52cbca..9ddaed0 100644 --- a/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui +++ b/kmymoney2/dialogs/kchooseimportexportdlgdecl.ui @@ -95,7 +95,7 @@ Once you have chosen an import type please press the OK button.</string> <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -132,7 +132,7 @@ Once you have chosen an import type please press the OK button.</string> <cstring>typeCombo</cstring> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>100</width> <height>0</height> @@ -155,7 +155,7 @@ Once you have chosen an import type please press the OK button.</string> </sizepolicy> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>410</width> <height>100</height> @@ -195,7 +195,7 @@ Once you have chosen an import type please press the OK button.</string> <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> 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.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(po).tqarg(pn); + messageDetail += i18n("Payee changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(po).arg(pn); } #if 0 if ( (m_schedule.type() == MyMoneySchedule::TYPE_TRANSFER || @@ -92,7 +92,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons { noItemsChanged++; messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .tqarg(m_schedule.account().name()).tqarg(m_from->currentText()) + TQString("\n"); + .arg(m_schedule.account().name()).arg(m_from->currentText()) + TQString("\n"); } if ( m_schedule.type() == MyMoneySchedule::TYPE_DEPOSIT && @@ -100,23 +100,23 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons { noItemsChanged++; messageDetail += i18n("Account changed. Old: \"%1\", New: \"%2\"") - .tqarg(m_schedule.account().name()).tqarg(m_to->currentText()) + TQString("\n"); + .arg(m_schedule.account().name()).arg(m_to->currentText()) + TQString("\n"); } #endif if(to.splits()[0].accountId() != tn.splits()[0].accountId()) { noItemsChanged++; messageDetail += i18n("Account changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(file->account(to.splits()[0].accountId()).name()) - .tqarg(file->account(tn.splits()[0].accountId()).name()); + .arg(file->account(to.splits()[0].accountId()).name()) + .arg(file->account(tn.splits()[0].accountId()).name()); } if(file->isTransfer(to) && file->isTransfer(tn)) { if(to.splits()[1].accountId() != tn.splits()[1].accountId()) { noItemsChanged++; messageDetail += i18n("Transfer account changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(file->account(to.splits()[1].accountId()).name()) - .tqarg(file->account(tn.splits()[1].accountId()).name()); + .arg(file->account(to.splits()[1].accountId()).name()) + .arg(file->account(tn.splits()[1].accountId()).name()); } } else { TQString co, cn; @@ -142,7 +142,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (co != cn) { noItemsChanged++; - messageDetail += i18n("Category changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(co).tqarg(cn); + messageDetail += i18n("Category changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(co).arg(cn); } } @@ -156,7 +156,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (mo != mn) { noItemsChanged++; - messageDetail += i18n("Memo changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").tqarg(mo).tqarg(mn); + messageDetail += i18n("Memo changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>").arg(mo).arg(mn); } const MyMoneySecurity& sec = MyMoneyFile::instance()->security(to.commodity()); @@ -166,7 +166,7 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if (ao != an) { noItemsChanged++; messageDetail += i18n("Amount changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(ao.formatMoney(sec.smallestAccountFraction())).tqarg(an.formatMoney(sec.smallestAccountFraction())); + .arg(ao.formatMoney(sec.smallestAccountFraction())).arg(an.formatMoney(sec.smallestAccountFraction())); } MyMoneySplit::reconcileFlagE fo, fn; @@ -175,8 +175,8 @@ void KConfirmManualEnterDlg::loadTransactions(const MyMoneyTransaction& to, cons if(fo != fn) { noItemsChanged++; messageDetail += i18n("Reconciliation flag changed.<br> Old: <b>%1</b>, New: <b>%2</b><p>") - .tqarg(KMyMoneyUtils::reconcileStateToString(fo, true)) - .tqarg(KMyMoneyUtils::reconcileStateToString(fn, true)); + .arg(KMyMoneyUtils::reconcileStateToString(fo, true)) + .arg(KMyMoneyUtils::reconcileStateToString(fn, true)); } } catch (MyMoneyException *e) diff --git a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui index 5a4b87b..a605fdb 100644 --- a/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui +++ b/kmymoney2/dialogs/kconfirmmanualenterdlgdecl.ui @@ -93,7 +93,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>16</height> diff --git a/kmymoney2/dialogs/kcsvprogressdlg.cpp b/kmymoney2/dialogs/kcsvprogressdlg.cpp index 2330a8a..a1eef8c 100644 --- a/kmymoney2/dialogs/kcsvprogressdlg.cpp +++ b/kmymoney2/dialogs/kcsvprogressdlg.cpp @@ -25,7 +25,7 @@ // ---------------------------------------------------------------------------- // QT Includes #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqlabel.h> #include <tqpushbutton.h> #include <tqprogressbar.h> diff --git a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui index d7c0f20..04912ff 100644 --- a/kmymoney2/dialogs/kcsvprogressdlgdecl.ui +++ b/kmymoney2/dialogs/kcsvprogressdlgdecl.ui @@ -187,7 +187,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </sizepolicy> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>50</width> <height>0</height> @@ -243,7 +243,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string </sizepolicy> </property> <property stdset="1"> - <name>tqminimumSize</name> + <name>minimumSize</name> <size> <width>50</width> <height>0</height> @@ -303,7 +303,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> @@ -387,7 +387,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <string>Unknown</string> </property> <property stdset="1"> - <name>tqalignment</name> + <name>alignment</name> <set>AlignVCenter|AlignRight</set> </property> <property> @@ -433,7 +433,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <string>0 of 0</string> </property> <property stdset="1"> - <name>tqalignment</name> + <name>alignment</name> <set>AlignVCenter|AlignRight</set> </property> <property> @@ -484,7 +484,7 @@ You can cancel the process at any time by clicking on the Cancel button.</string <enum>Expanding</enum> </property> <property> - <name>tqsizeHint</name> + <name>sizeHint</name> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kcurrencycalculator.cpp b/kmymoney2/dialogs/kcurrencycalculator.cpp index 2306816..0ecd16e 100644 --- a/kmymoney2/dialogs/kcurrencycalculator.cpp +++ b/kmymoney2/dialogs/kcurrencycalculator.cpp @@ -125,7 +125,7 @@ KCurrencyCalculator::KCurrencyCalculator(const MyMoneySecurity& from, const MyMo if(date.isValid()) m_dateEdit->setDate(date); else - m_dateEdit->setDate(TQDate::tqcurrentDate()); + m_dateEdit->setDate(TQDate::currentDate()); m_fromCurrencyText->setText(m_fromCurrency.isCurrency() ? m_fromCurrency.id() : m_fromCurrency.tradingSymbol()); m_toCurrencyText->setText(m_toCurrency.isCurrency() ? m_toCurrency.id() : m_toCurrency.tradingSymbol()); @@ -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 2d17eb0..ce43b13 100644 --- a/kmymoney2/dialogs/kcurrencycalculatordecl.ui +++ b/kmymoney2/dialogs/kcurrencycalculatordecl.ui @@ -44,7 +44,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -76,7 +76,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -109,7 +109,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>145</width> <height>20</height> @@ -122,7 +122,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -157,7 +157,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -192,7 +192,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -202,7 +202,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -329,7 +329,7 @@ xx</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -352,7 +352,7 @@ xx</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -368,7 +368,7 @@ xx</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui index cd803cb..2ab7f00 100644 --- a/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui +++ b/kmymoney2/dialogs/kcurrencyeditdlgdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -62,7 +62,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>31</height> @@ -129,7 +129,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <grid> <property name="name"> @@ -246,7 +246,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/keditequityentrydecl.ui b/kmymoney2/dialogs/keditequityentrydecl.ui index ce06abb..d51151e 100644 --- a/kmymoney2/dialogs/keditequityentrydecl.ui +++ b/kmymoney2/dialogs/keditequityentrydecl.ui @@ -25,7 +25,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -66,7 +66,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -147,7 +147,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -163,7 +163,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>21</height> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>238</width> <height>21</height> diff --git a/kmymoney2/dialogs/keditequityentrydlg.cpp b/kmymoney2/dialogs/keditequityentrydlg.cpp index 3eed5e6..b5919b5 100644 --- a/kmymoney2/dialogs/keditequityentrydlg.cpp +++ b/kmymoney2/dialogs/keditequityentrydlg.cpp @@ -82,7 +82,7 @@ KEditEquityEntryDlg::KEditEquityEntryDlg(const MyMoneySecurity& selectedSecurity slotDataChanged(); m_changes = false; - // force a resize to optimize the tqlayout of all widgets + // force a resize to optimize the layout of all widgets resize(width()-1, height()-1); TQTimer::singleShot(10, this, TQT_SLOT(slotTimerDone())); } diff --git a/kmymoney2/dialogs/keditloanwizard.cpp b/kmymoney2/dialogs/keditloanwizard.cpp index 89b2f90..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"); @@ -71,11 +71,11 @@ KEditLoanWizard::KEditLoanWizard(const MyMoneyAccount& account, TQWidget *parent loadWidgets(m_account); - if(m_account.openingDate() > TQDate::tqcurrentDate()) { + if(m_account.openingDate() > TQDate::currentDate()) { 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(); } @@ -123,10 +123,10 @@ void KEditLoanWizard::loadWidgets(const MyMoneyAccount& /* account */) } MyMoneyMoney ir; - if(m_schedule.startDate() > TQDate::tqcurrentDate()) { + if(m_schedule.startDate() > TQDate::currentDate()) { ir = m_account.interestRate(m_schedule.startDate()); } else { - ir = m_account.interestRate(TQDate::tqcurrentDate()); + ir = m_account.interestRate(TQDate::currentDate()); } m_interestRateEdit->loadText(ir.formatMoney("", 3)); m_newInterestRateEdit->loadText(ir.formatMoney("", 3)); @@ -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; @@ -417,7 +417,7 @@ void KEditLoanWizard::slotCheckPageFinished(void) if(currentPage() == m_effectiveDatePage) { if(m_effectiveChangeDateEdit->date() < m_account.openingDate() - || m_effectiveChangeDateEdit->date() > TQDate::tqcurrentDate()) + || m_effectiveChangeDateEdit->date() > TQDate::currentDate()) nextButton()->setEnabled(false); } else if(currentPage() == m_interestEditPage) { diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp index c6ece41..40b89f0 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -22,7 +22,7 @@ #include <tqwidgetlist.h> #include <tqcheckbox.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqvaluevector.h> // ---------------------------------------------------------------------------- @@ -165,7 +165,7 @@ KEditScheduleDlg::~KEditScheduleDlg() void KEditScheduleDlg::slotSetupSize(void) { - resize(width(), tqminimumSizeHint().height()); + resize(width(), minimumSizeHint().height()); } TransactionEditor* KEditScheduleDlg::startEdit(void) @@ -393,7 +393,7 @@ bool KEditScheduleDlg::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - w = tqApp->tqfocusWidget(); + w = tqApp->focusWidget(); while(w && d->m_tabOrderWidgets.find(w) == -1) { // qDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); diff --git a/kmymoney2/dialogs/keditscheduledlgdecl.ui b/kmymoney2/dialogs/keditscheduledlgdecl.ui index d3ec65c..a717abc 100644 --- a/kmymoney2/dialogs/keditscheduledlgdecl.ui +++ b/kmymoney2/dialogs/keditscheduledlgdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -55,7 +55,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -105,7 +105,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -142,7 +142,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -247,7 +247,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -285,7 +285,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -320,7 +320,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -372,7 +372,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -428,7 +428,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -437,7 +437,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10_3</cstring> + <cstring>layout10_3</cstring> </property> <hbox> <property name="name"> @@ -467,7 +467,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>280</width> <height>0</height> diff --git a/kmymoney2/dialogs/kendingbalancedlg.cpp b/kmymoney2/dialogs/kendingbalancedlg.cpp index 9aeb0e1..0195e48 100644 --- a/kmymoney2/dialogs/kendingbalancedlg.cpp +++ b/kmymoney2/dialogs/kendingbalancedlg.cpp @@ -68,9 +68,9 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa d->m_account = account; MyMoneySecurity currency = MyMoneyFile::instance()->security(account.currencyId()); - m_enterInformationLabel->setText(TQString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").tqarg(currency.name())+TQString("</qt>")); + m_enterInformationLabel->setText(TQString("<qt>")+i18n("Please enter the following fields with the information as you find them on your statement. Make sure to enter all values in <b>%1</b>.").arg(currency.name())+TQString("</qt>")); - m_statementDate->setDate(TQDate::tqcurrentDate()); + m_statementDate->setDate(TQDate::currentDate()); // If the previous reconciliation was postponed, // we show a different first page @@ -80,7 +80,7 @@ KEndingBalanceDlg::KEndingBalanceDlg(const MyMoneyAccount& account, TQWidget *pa // then take the last statement date and add one month and use that as statement // date. TQDate lastStatementDate = account.lastReconciliationDate(); - if(lastStatementDate.addMonths(1) < TQDate::tqcurrentDate()) { + if(lastStatementDate.addMonths(1) < TQDate::currentDate()) { m_statementDate->setDate(lastStatementDate.addMonths(1)); } @@ -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 2f67c50..97addb0 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.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -75,7 +75,7 @@ On the next page you will verify, that the starting and ending balance are match Please enter the following information found on your statement:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -89,7 +89,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -120,7 +120,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>42</width> <height>0</height> @@ -179,7 +179,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>44</width> <height>0</height> @@ -198,7 +198,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>20</height> @@ -231,7 +231,7 @@ Please enter the following information found on your statement:</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -259,7 +259,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>0</height> @@ -318,7 +318,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>0</height> @@ -334,7 +334,7 @@ Please enter the following information found on your statement:</string> <property name="text"> <string>If your statement shows different amounts, please cancel this dialog and correct the false transactions or correct the values in this dialog. In the later case, KMyMoney will create an adjustment transaction and add it to the ledger.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -348,7 +348,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -381,7 +381,7 @@ Please enter the following information found on your statement:</string> <property name="text"> <string>In order to create the adjustment transaction, KMyMoney requires an account and possibly an interest category to assign the differences to. Please select an account and - if necessary - a category.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -475,7 +475,7 @@ Please enter the following information found on your statement:</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>25</height> @@ -512,7 +512,7 @@ It is important, that you continue with the same statement you used when you pos All information you have entered into this wizard will be shown and all transactions that you already cleared are marked with a 'C'.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -547,7 +547,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> @@ -578,7 +578,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>42</width> <height>0</height> @@ -650,7 +650,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>46</width> <height>0</height> @@ -669,7 +669,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>87</height> @@ -729,7 +729,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -738,7 +738,7 @@ All information you have entered into this wizard will be shown and all transact </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -754,7 +754,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -763,7 +763,7 @@ All information you have entered into this wizard will be shown and all transact </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <vbox> <property name="name"> @@ -771,7 +771,7 @@ All information you have entered into this wizard will be shown and all transact </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -837,7 +837,7 @@ All information you have entered into this wizard will be shown and all transact </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -889,7 +889,7 @@ All information you have entered into this wizard will be shown and all transact </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -924,7 +924,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>60</width> <height>20</height> @@ -943,7 +943,7 @@ All information you have entered into this wizard will be shown and all transact <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp index 4c078f1..c225de5 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.cpp +++ b/kmymoney2/dialogs/kenterscheduledlg.cpp @@ -175,7 +175,7 @@ void KEnterScheduleDlg::resizeEvent(TQResizeEvent* ev) void KEnterScheduleDlg::slotSetupSize(void) { - resize(width(), tqminimumSizeHint().height()); + resize(width(), minimumSizeHint().height()); } int KEnterScheduleDlg::exec(void) @@ -266,10 +266,10 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void) // Check if the editor has some preference on where to set the focus // If not, set the focus to the first widget in the tab order - TQWidget* tqfocusWidget = editor->firstWidget(); - if(!tqfocusWidget) - tqfocusWidget = d->m_tabOrderWidgets.first(); - tqfocusWidget->setFocus(); + TQWidget* focusWidget = editor->firstWidget(); + if(!focusWidget) + focusWidget = d->m_tabOrderWidgets.first(); + focusWidget->setFocus(); // Make sure, we use the adjusted date kMyMoneyDateInput* dateEdit = dynamic_cast<kMyMoneyDateInput*>(editor->haveWidget("postdate")); @@ -289,7 +289,7 @@ bool KEnterScheduleDlg::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - w = tqApp->tqfocusWidget(); + w = tqApp->focusWidget(); while(w && d->m_tabOrderWidgets.find(w) == -1) { // qDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); diff --git a/kmymoney2/dialogs/kenterscheduledlgdecl.ui b/kmymoney2/dialogs/kenterscheduledlgdecl.ui index f36e6b6..5e707e4 100644 --- a/kmymoney2/dialogs/kenterscheduledlgdecl.ui +++ b/kmymoney2/dialogs/kenterscheduledlgdecl.ui @@ -45,7 +45,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -79,7 +79,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>70</width> <height>0</height> @@ -221,7 +221,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -245,7 +245,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>190</width> <height>20</height> diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp index 4121abd..c943d10 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.cpp +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.cpp @@ -28,9 +28,9 @@ #include <tqpushbutton.h> #include <tqradiobutton.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -104,7 +104,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s if ( file->security( pair.first ).isCurrency() && ( securityId.isEmpty() || ( pair == currencyIds ) ) ) { const MyMoneyPriceEntries& entries = (*it_price); - if(entries.count() > 0 && entries.begin().key() <= TQDate::tqcurrentDate()) { + if(entries.count() > 0 && entries.begin().key() <= TQDate::currentDate()) { addPricePair(pair); btnUpdateAll->setEnabled(true); } @@ -157,7 +157,7 @@ KEquityPriceUpdateDlg::KEquityPriceUpdateDlg(TQWidget *parent, const TQString& s { btnUpdateSelected->hide(); btnUpdateAll->hide(); - // delete tqlayout1; + // delete layout1; TQTimer::singleShot(100,this,TQT_SLOT(slotUpdateAllClicked())); } @@ -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")); @@ -282,7 +282,7 @@ void KEquityPriceUpdateDlg::logErrorMessage(const TQString& message) void KEquityPriceUpdateDlg::logStatusMessage(const TQString& message) { - lbtqStatus->append(message); + lbStatus->append(message); } MyMoneyPrice KEquityPriceUpdateDlg::price(const TQString& id) const @@ -342,7 +342,7 @@ void KEquityPriceUpdateDlg::storePrices(void) TQStringList ids = TQStringList::split(" ",TQString(id)); TQString fromid = ids[0].utf8(); TQString toid = ids[1].utf8(); - name = TQString("%1 --> %2").tqarg(fromid).tqarg(toid); + name = TQString("%1 --> %2").arg(fromid).arg(toid); MyMoneyPrice price(fromid,toid,TQDate().fromString(item->text(DATE_COL), Qt::ISODate),rate,item->text(SOURCE_COL)); file->addPrice(price); } @@ -422,9 +422,9 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString& // Give the user some options int result; if(_id.contains(" ")) { - result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").tqarg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed")); + result = KMessageBox::warningContinueCancel(this, i18n("Failed to retrieve an exchange rate for %1 from %2. It will be skipped this time.").arg(_symbol, item->text(SOURCE_COL)), i18n("Price Update Failed")); } else { - result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").tqarg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").tqarg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no()); + result = KMessageBox::questionYesNoCancel(this, TQString("<qt>%1</qt>").arg(i18n("Failed to retrieve a quote for %1 from %2. Press <b>No</b> to remove the online price source from this security permanently, <b>Yes</b> to continue updating this security during future price updates or <b>Cancel</b> to stop the current update operation.").arg(_symbol, item->text(SOURCE_COL))), i18n("Price Update Failed"), KStdGuiItem::yes(), KStdGuiItem::no()); } if ( result == KMessageBox::No ) @@ -444,7 +444,7 @@ void KEquityPriceUpdateDlg::slotQuoteFailed(const TQString& _id, const TQString& MyMoneyFile::instance()->modifySecurity(security); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").tqarg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed")); + KMessageBox::error(this, TQString("<qt>")+i18n("Cannot update security <b>%1</b>: %2").arg(_symbol, e->what())+TQString("</qt>"), i18n("Price Update Failed")); delete e; } } @@ -492,8 +492,8 @@ void KEquityPriceUpdateDlg::slotReceivedQuote(const TQString& _id, const TQStrin if ( _price > 0.0f && _date.isValid() ) { TQDate date = _date; - if ( date > TQDate::tqcurrentDate() ) - date = TQDate::tqcurrentDate(); + if ( date > TQDate::currentDate() ) + date = TQDate::currentDate(); double price = _price; TQString id = _id.utf8(); @@ -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/kequitypriceupdatedlgdecl.ui b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui index e1fb0de..a381e0d 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui +++ b/kmymoney2/dialogs/kequitypriceupdatedlgdecl.ui @@ -24,7 +24,7 @@ <property name="name"> <cstring>lvEquityList</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>350</width> <height>0</height> @@ -51,7 +51,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -105,12 +105,12 @@ <cstring>textLabel1</cstring> </property> <property name="text"> - <string>tqStatus:</string> + <string>Status:</string> </property> </widget> <widget class="KTextEdit"> <property name="name"> - <cstring>lbtqStatus</cstring> + <cstring>lbStatus</cstring> </property> <property name="textFormat"> <enum>LogText</enum> @@ -123,7 +123,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -139,7 +139,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> diff --git a/kmymoney2/dialogs/kexportdlgdecl.ui b/kmymoney2/dialogs/kexportdlgdecl.ui index ab3ff63..5444b18 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.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -132,7 +132,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -140,7 +140,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -209,7 +209,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -235,7 +235,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <hbox> <property name="name"> @@ -295,7 +295,7 @@ You can choose the file's path, the account and the format of the QIF file (prof </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <grid> <property name="name"> @@ -318,7 +318,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -340,7 +340,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>50</width> <height>0</height> @@ -377,7 +377,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>230</width> <height>16</height> @@ -424,7 +424,7 @@ You can choose the file's path, the account and the format of the QIF file (prof <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>451</width> <height>0</height> diff --git a/kmymoney2/dialogs/kfindtransactiondlg.cpp b/kmymoney2/dialogs/kfindtransactiondlg.cpp index c97e32e..21cf5ec 100644 --- a/kmymoney2/dialogs/kfindtransactiondlg.cpp +++ b/kmymoney2/dialogs/kfindtransactiondlg.cpp @@ -22,7 +22,7 @@ #include <tqcheckbox.h> #include <tqtimer.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -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 e2a8ee1..81d17c1 100644 --- a/kmymoney2/dialogs/kfindtransactiondlgdecl.ui +++ b/kmymoney2/dialogs/kfindtransactiondlgdecl.ui @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>83</height> @@ -103,7 +103,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -180,7 +180,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -188,7 +188,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <grid> <property name="name"> @@ -247,7 +247,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -266,7 +266,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -288,7 +288,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -334,7 +334,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -344,7 +344,7 @@ <property name="name"> <cstring>m_amountToEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -372,7 +372,7 @@ <property name="name"> <cstring>m_amountEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -392,7 +392,7 @@ <property name="name"> <cstring>m_amountFromEdit</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -411,7 +411,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -430,7 +430,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>75</height> @@ -554,7 +554,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>42</height> @@ -578,7 +578,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -586,7 +586,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <grid> <property name="name"> @@ -698,7 +698,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>20</height> @@ -709,7 +709,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -757,7 +757,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <grid> <property name="name"> @@ -816,7 +816,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -835,7 +835,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -852,7 +852,7 @@ <property name="text"> <string>text</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -886,7 +886,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>24</height> @@ -969,7 +969,7 @@ <property name="text"> <string>F</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignLeft</set> </property> </widget> @@ -978,7 +978,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -1008,7 +1008,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp index 40f47d8..c3da2a7 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlg.cpp +++ b/kmymoney2/dialogs/kgncimportoptionsdlg.cpp @@ -19,7 +19,7 @@ // QT Includes #include <tqcheckbox.h> #include <tqlineedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqcombobox.h> diff --git a/kmymoney2/dialogs/kgncimportoptionsdlg.h b/kmymoney2/dialogs/kgncimportoptionsdlg.h index 1c682c0..00949a5 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlg.h +++ b/kmymoney2/dialogs/kgncimportoptionsdlg.h @@ -22,7 +22,7 @@ // QT Includes #include <tqbuttongroup.h> #include <tqcheckbox.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqptrlist.h> // ---------------------------------------------------------------------------- diff --git a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui index 39e3711..a09d8e1 100644 --- a/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui +++ b/kmymoney2/dialogs/kgncimportoptionsdlgdecl.ui @@ -17,7 +17,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <property name="geometry"> <rect> @@ -38,7 +38,7 @@ <property name="text"> <string>Use 'Help' for more information on these options</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -137,7 +137,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -167,7 +167,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -254,7 +254,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -263,7 +263,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -299,7 +299,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> diff --git a/kmymoney2/dialogs/kgncpricesourcedlg.cpp b/kmymoney2/dialogs/kgncpricesourcedlg.cpp index 8c807f3..2c2be36 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlg.cpp +++ b/kmymoney2/dialogs/kgncpricesourcedlg.cpp @@ -21,7 +21,7 @@ #include <tqlistbox.h> #include <tqlineedit.h> #include <tqbuttongroup.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> // ---------------------------------------------------------------------------- @@ -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/kgncpricesourcedlgdecl.ui b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui index 6eb3e84..6ee7982 100644 --- a/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui +++ b/kmymoney2/dialogs/kgncpricesourcedlgdecl.ui @@ -17,7 +17,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <property name="geometry"> <rect> @@ -41,7 +41,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> @@ -66,7 +66,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> @@ -94,7 +94,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>171</width> <height>20</height> @@ -120,7 +120,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -227,7 +227,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>370</height> diff --git a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp index 03bdff4..39b49ce 100644 --- a/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp +++ b/kmymoney2/dialogs/kgpgkeyselectiondlg.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqwhatsthis.h> diff --git a/kmymoney2/dialogs/kimportdlg.cpp b/kmymoney2/dialogs/kimportdlg.cpp index 72a7452..a6023d6 100644 --- a/kmymoney2/dialogs/kimportdlg.cpp +++ b/kmymoney2/dialogs/kimportdlg.cpp @@ -22,7 +22,7 @@ // QT Headers #include <tqlineedit.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqprogressbar.h> #include <tqlabel.h> #include <tqbuttongroup.h> @@ -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/kimportdlgdecl.ui b/kmymoney2/dialogs/kimportdlgdecl.ui index ed879b2..94643f8 100644 --- a/kmymoney2/dialogs/kimportdlgdecl.ui +++ b/kmymoney2/dialogs/kimportdlgdecl.ui @@ -52,7 +52,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <grid> <property name="name"> @@ -131,7 +131,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>200</width> <height>0</height> @@ -204,7 +204,7 @@ Please enter the path to the QIF file or select it by clicking on the Browse but <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>411</width> <height>0</height> diff --git a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui index c857cc8..6b39148 100644 --- a/kmymoney2/dialogs/kloadtemplatedlgdecl.ui +++ b/kmymoney2/dialogs/kloadtemplatedlgdecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>228</width> <height>20</height> 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<MyMoneyAccount> a_list; storage->accountList(a_list); - m_accountCount->setText(TQString("%1").tqarg(a_list.count())); + m_accountCount->setText(TQString("%1").arg(a_list.count())); TQMap<MyMoneyAccount::accountTypeE, int> accountMap; TQMap<MyMoneyAccount::accountTypeE, int> accountMapClosed; @@ -67,22 +67,22 @@ KMyMoneyFileInfoDlg::KMyMoneyFileInfoDlg(TQWidget *parent, const char *name ) TQMap<MyMoneyAccount::accountTypeE, int>::const_iterator it_m; for(it_m = accountMap.begin(); it_m != accountMap.end(); ++it_m) { - new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").tqarg(*it_m), TQString("%1").tqarg(accountMapClosed[it_m.key()])); + new KListViewItem(m_accountView, KMyMoneyUtils::accountTypeToString(it_m.key()), TQString("%1").arg(*it_m), TQString("%1").arg(accountMapClosed[it_m.key()])); } MyMoneyTransactionFilter filter; filter.setReportAllSplits(false); - m_transactionCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count())); + m_transactionCount->setText(TQString("%1").arg(storage->transactionList(filter).count())); filter.setReportAllSplits(true); - m_splitCount->setText(TQString("%1").tqarg(storage->transactionList(filter).count())); - m_scheduleCount->setText(TQString("%1").tqarg(storage->scheduleList().count())); + m_splitCount->setText(TQString("%1").arg(storage->transactionList(filter).count())); + m_scheduleCount->setText(TQString("%1").arg(storage->scheduleList().count())); MyMoneyPriceList list = storage->priceList(); MyMoneyPriceList::const_iterator it_p; int pCount = 0; for(it_p = list.begin(); it_p != list.end(); ++it_p) pCount += (*it_p).count(); - m_priceCount->setText(TQString("%1").tqarg(pCount)); + m_priceCount->setText(TQString("%1").arg(pCount)); } KMyMoneyFileInfoDlg::~KMyMoneyFileInfoDlg() diff --git a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui index 6fd5756..4a625f7 100644 --- a/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneyfileinfodlgdecl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -252,7 +252,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -275,7 +275,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -305,7 +305,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>20</height> diff --git a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui index e8a4117..48ab056 100644 --- a/kmymoney2/dialogs/kmymoneypricedlgdecl.ui +++ b/kmymoney2/dialogs/kmymoneypricedlgdecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <hbox> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <vbox> <property name="name"> @@ -52,7 +52,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <vbox> <property name="name"> @@ -100,7 +100,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>150</height> @@ -135,7 +135,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -151,7 +151,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>560</width> <height>20</height> @@ -160,7 +160,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/dialogs/kmymoneysplittable.cpp b/kmymoney2/dialogs/kmymoneysplittable.cpp index f549d4c..fecc7e0 100644 --- a/kmymoney2/dialogs/kmymoneysplittable.cpp +++ b/kmymoney2/dialogs/kmymoneysplittable.cpp @@ -30,7 +30,7 @@ #include <tqcursor.h> #include <tqapplication.h> #include <tqtimer.h> -#include <tqlayout.h> +#include <layout.h> #include <tqeventloop.h> // ---------------------------------------------------------------------------- @@ -125,7 +125,7 @@ const TQColor kMyMoneySplitTable::rowBackgroundColor(const int row) const void kMyMoneySplitTable::paintCell(TQPainter *p, int row, int col, const TQRect& r, bool /*selected*/) { - TQColorGroup g = tqcolorGroup(); + TQColorGroup g = colorGroup(); TQColor textColor; g.setColor(TQColorGroup::Base, rowBackgroundColor(row)); @@ -452,7 +452,7 @@ void kMyMoneySplitTable::contentsMouseDoubleClickEvent( TQMouseEvent *e ) break; case 2: - editWidget = dynamic_cast<KLineEdit*> (m_editAmount->tqfocusWidget()); + editWidget = dynamic_cast<KLineEdit*> (m_editAmount->focusWidget()); break; default: @@ -493,7 +493,7 @@ void kMyMoneySplitTable::setNumRows(int irows) #if 0 // recalculate row height hint KMyMoneyCategory cat; - height = TQMAX(cat.tqsizeHint().height(), height); + height = TQMAX(cat.sizeHint().height(), height); #endif verticalHeader()->setUpdatesEnabled(false); @@ -568,7 +568,7 @@ void kMyMoneySplitTable::slotUpdateData(const MyMoneyTransaction& t) unsigned width = fontMetrics().width(amountTxt); valfield->setMinimumWidth(width); - width = valfield->tqminimumSizeHint().width(); + width = valfield->minimumSizeHint().width(); if(width > m_amountWidth) m_amountWidth = width; @@ -969,7 +969,7 @@ bool kMyMoneySplitTable::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - m_tabOrderWidgets.find(tqApp->tqfocusWidget()); + m_tabOrderWidgets.find(tqApp->focusWidget()); currentWidget = m_tabOrderWidgets.current(); w = next ? m_tabOrderWidgets.next() : m_tabOrderWidgets.prev(); diff --git a/kmymoney2/dialogs/knewaccountdlg.cpp b/kmymoney2/dialogs/knewaccountdlg.cpp index 2f2748b..e67fb49 100644 --- a/kmymoney2/dialogs/knewaccountdlg.cpp +++ b/kmymoney2/dialogs/knewaccountdlg.cpp @@ -33,8 +33,8 @@ #include <tqtabwidget.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqtabwidget.h> // ---------------------------------------------------------------------------- @@ -289,7 +289,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo } if(!m_account.openingDate().isValid()) - m_account.setOpeningDate(TQDate::tqcurrentDate()); + m_account.setOpeningDate(TQDate::currentDate()); startDateEdit->setDate(m_account.openingDate()); accountNoEdit->setText(account.number()); @@ -394,7 +394,7 @@ KNewAccountDlg::KNewAccountDlg(const MyMoneyAccount& account, bool isEditing, bo m_vatAssignment->setChecked(false); // make sure our account does not have an id and no parent assigned - // and certainly no tqchildren in case we create a new account + // and certainly no children in case we create a new account if(!m_isEditing) { m_account.clearId(); m_account.setParentAccountId(TQString()); @@ -549,7 +549,7 @@ void KNewAccountDlg::okClicked() // we don't need this check anymore. if(!file->nameToAccount(accountNameText).isEmpty() && (file->nameToAccount(accountNameText) != m_account.id())) { - KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").tqarg(accountNameText)+TQString("</qt>")); + KMessageBox::error(this, TQString("<qt>")+i18n("An account named <b>%1</b> already exists. You cannot create a second account with the same name.").arg(accountNameText)+TQString("</qt>")); return; } #endif @@ -564,7 +564,7 @@ void KNewAccountDlg::okClicked() newName += accountNameText; if(!file->categoryToAccount(newName, acctype).isEmpty() && (file->categoryToAccount(newName, acctype) != m_account.id())) { - KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").tqarg(newName)+TQString("</qt>")); + KMessageBox::error(this, TQString("<qt>")+i18n("A category named <b>%1</b> already exists. You cannot create a second category with the same name.").arg(newName)+TQString("</qt>")); return; } } @@ -669,7 +669,7 @@ const MyMoneyAccount& KNewAccountDlg::account(void) break; case 1: case 2: - m_account.setValue("priceMode", TQString("%1").tqarg(m_priceMode->currentItem())); + m_account.setValue("priceMode", TQString("%1").arg(m_priceMode->currentItem())); break; } @@ -924,7 +924,7 @@ void KNewAccountDlg::initParentWidget(TQString parentId, const TQString& account if (m_parentItem) { - m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name())); + m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); m_parentItem->setOpen(true); m_qlistviewParentAccounts->setSelected(m_parentItem, true); } @@ -976,7 +976,7 @@ void KNewAccountDlg::slotSelectionChanged(TQListViewItem *item) //qDebug("Selected account id: %s", accountItem->accountID().data()); m_parentAccount = file->account(accountItem->id()); - m_subAccountLabel->setText(i18n("Is a sub account of %1").tqarg(m_parentAccount.name())); + m_subAccountLabel->setText(i18n("Is a sub account of %1").arg(m_parentAccount.name())); if(m_qlistviewParentAccounts->isEnabled()) { m_bSelectedParentAccount = true; } diff --git a/kmymoney2/dialogs/knewaccountdlg.h b/kmymoney2/dialogs/knewaccountdlg.h index 807af7e..013fa3c 100644 --- a/kmymoney2/dialogs/knewaccountdlg.h +++ b/kmymoney2/dialogs/knewaccountdlg.h @@ -118,7 +118,7 @@ public: protected: void resizeEvent(TQResizeEvent* e); - void displayOnlineBankingtqStatus(void); + void displayOnlineBankingStatus(void); void adjustEditWidgets(kMyMoneyEdit* dst, kMyMoneyEdit* src, char mode, int corr); protected slots: diff --git a/kmymoney2/dialogs/knewaccountdlgdecl.ui b/kmymoney2/dialogs/knewaccountdlgdecl.ui index 5f42ead..ecbeaf0 100644 --- a/kmymoney2/dialogs/knewaccountdlgdecl.ui +++ b/kmymoney2/dialogs/knewaccountdlgdecl.ui @@ -39,7 +39,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -49,13 +49,13 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -136,7 +136,7 @@ <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -185,7 +185,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -193,7 +193,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>140</width> <height>20</height> @@ -235,13 +235,13 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -250,7 +250,7 @@ <property name="text"> <string>Notes:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -263,7 +263,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <grid> <property name="name"> @@ -279,7 +279,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <hbox> <property name="name"> @@ -333,7 +333,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -403,7 +403,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -418,13 +418,13 @@ <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -477,7 +477,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> @@ -534,7 +534,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -638,7 +638,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -671,7 +671,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout34</cstring> + <cstring>layout34</cstring> </property> <vbox> <property name="name"> @@ -712,7 +712,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout33</cstring> + <cstring>layout33</cstring> </property> <hbox> <property name="name"> @@ -733,7 +733,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -754,7 +754,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -782,7 +782,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -805,7 +805,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <vbox> <property name="name"> @@ -815,13 +815,13 @@ <property name="name"> <cstring>m_amountGroup</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>32767</height> @@ -871,7 +871,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -933,7 +933,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>422</width> <height>0</height> diff --git a/kmymoney2/dialogs/knewbankdlgdecl.ui b/kmymoney2/dialogs/knewbankdlgdecl.ui index 28a8cc2..f610612 100644 --- a/kmymoney2/dialogs/knewbankdlgdecl.ui +++ b/kmymoney2/dialogs/knewbankdlgdecl.ui @@ -62,7 +62,7 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -81,7 +81,7 @@ <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -100,7 +100,7 @@ <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -119,7 +119,7 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -138,7 +138,7 @@ <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -157,7 +157,7 @@ <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -184,7 +184,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -232,7 +232,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>449</width> <height>0</height> diff --git a/kmymoney2/dialogs/knewbudgetdlg.cpp b/kmymoney2/dialogs/knewbudgetdlg.cpp index 0224abb..2e9ee8f 100644 --- a/kmymoney2/dialogs/knewbudgetdlg.cpp +++ b/kmymoney2/dialogs/knewbudgetdlg.cpp @@ -41,7 +41,7 @@ KNewBudgetDlg::KNewBudgetDlg(TQWidget* parent, const char *name) : KNewBudgetDlgDecl(parent, name) { TQStringList slYear; - TQDate dToday = TQDate::tqcurrentDate(); + TQDate dToday = TQDate::currentDate(); int iYear = dToday.year(); for (int i=0; i<=m_icFutureYears; i++) diff --git a/kmymoney2/dialogs/knewbudgetdlgdecl.ui b/kmymoney2/dialogs/knewbudgetdlgdecl.ui index bbfbad6..1fb8e7a 100644 --- a/kmymoney2/dialogs/knewbudgetdlgdecl.ui +++ b/kmymoney2/dialogs/knewbudgetdlgdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <vbox> <property name="name"> @@ -66,7 +66,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <vbox> <property name="name"> @@ -102,7 +102,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> diff --git a/kmymoney2/dialogs/knewequityentrydecl.ui b/kmymoney2/dialogs/knewequityentrydecl.ui index 2fa832f..0bec33d 100644 --- a/kmymoney2/dialogs/knewequityentrydecl.ui +++ b/kmymoney2/dialogs/knewequityentrydecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -59,7 +59,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -80,7 +80,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -150,7 +150,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -159,7 +159,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> diff --git a/kmymoney2/dialogs/knewfiledlgdecl.ui b/kmymoney2/dialogs/knewfiledlgdecl.ui index d0fcffa..b9f39da 100644 --- a/kmymoney2/dialogs/knewfiledlgdecl.ui +++ b/kmymoney2/dialogs/knewfiledlgdecl.ui @@ -74,7 +74,7 @@ your KMyMoney file.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -84,7 +84,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -113,7 +113,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -132,7 +132,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -154,7 +154,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -168,7 +168,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -187,7 +187,7 @@ your KMyMoney file.</string> <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -211,7 +211,7 @@ your KMyMoney file.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -235,7 +235,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>21</height> @@ -254,7 +254,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -263,7 +263,7 @@ your KMyMoney file.</string> </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -279,7 +279,7 @@ your KMyMoney file.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>360</width> <height>16</height> 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 5e8196f..531505a 100644 --- a/kmymoney2/dialogs/knewinvestmentwizarddecl.ui +++ b/kmymoney2/dialogs/knewinvestmentwizarddecl.ui @@ -33,7 +33,7 @@ <property name="text"> <string>This wizard allows you to create a new investment.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -47,7 +47,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>10</height> @@ -61,7 +61,7 @@ <property name="text"> <string>The first step in this process requires to select the type of investment. The following steps collect more details about the investment from you.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> @@ -84,7 +84,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -128,7 +128,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -147,7 +147,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> @@ -174,7 +174,7 @@ <property name="text"> <string>Enter the details below and click <b>Next</b> to continue entering the online update details.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -197,7 +197,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -210,7 +210,7 @@ </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -231,7 +231,7 @@ <property name="text"> <string>1 /</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -374,7 +374,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -401,13 +401,13 @@ <property name="text"> <string>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.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout25</cstring> + <cstring>layout25</cstring> </property> <hbox> <property name="name"> @@ -421,7 +421,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout24</cstring> + <cstring>layout24</cstring> </property> <vbox> <property name="name"> @@ -429,7 +429,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout21</cstring> + <cstring>layout21</cstring> </property> <hbox> <property name="name"> @@ -455,7 +455,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout23</cstring> + <cstring>layout23</cstring> </property> <hbox> <property name="name"> @@ -478,7 +478,7 @@ <property name="name"> <cstring>m_onlineSourceCombo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -489,7 +489,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -522,7 +522,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>371</width> <height>20</height> @@ -541,7 +541,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>181</height> diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index fe39525..884807f 100644 --- a/kmymoney2/dialogs/knewloanwizard.cpp +++ b/kmymoney2/dialogs/knewloanwizard.cpp @@ -111,7 +111,7 @@ KNewLoanWizard::KNewLoanWizard(TQWidget *parent, const char *name ) : m_interestFrequencyAmountEdit->setValue(1); m_interestFrequencyUnitEdit->setCurrentItem(static_cast<int>(MyMoneyAccountLoan::changeYearly)); m_paymentFrequencyUnitEdit->setCurrentItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_MONTHLY))); - m_firstDueDateEdit->loadDate(TQDate(TQDate::tqcurrentDate().year(),TQDate::tqcurrentDate().month(),30)); + m_firstDueDateEdit->loadDate(TQDate(TQDate::currentDate().year(),TQDate::currentDate().month(),30)); m_paymentAccountEdit->removeButtons(); m_assetAccountEdit->removeButtons(); @@ -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(); @@ -557,7 +557,7 @@ void KNewLoanWizard::next() if(m_assetAccountPage) setAppropriate(m_assetAccountPage, true); } else { - TQDate nextPayment(TQDate::tqcurrentDate().year(), 1, m_firstDueDateEdit->date().day()); + TQDate nextPayment(TQDate::currentDate().year(), 1, m_firstDueDateEdit->date().day()); m_nextDueDateEdit->setDate(nextPayment); if(m_assetAccountPage) setAppropriate(m_assetAccountPage, false); @@ -709,14 +709,14 @@ int KNewLoanWizard::calculateLoan(void) val = calc.presentValue(); m_loanAmountEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney(fraction)); result = i18n("KMyMoney has calculated the amount of the loan as %1.") - .tqarg(m_loanAmountEdit->lineedit()->text()); + .arg(m_loanAmountEdit->lineedit()->text()); } else if(m_interestRateEdit->lineedit()->text().isEmpty()) { // calculate the interest rate out of the other information val = calc.interestRate(); m_interestRateEdit->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3)); result = i18n("KMyMoney has calculated the interest rate to %1%.") - .tqarg(m_interestRateEdit->lineedit()->text()); + .arg(m_interestRateEdit->lineedit()->text()); } else if(m_paymentEdit->lineedit()->text().isEmpty()) { // calculate the periodical amount of the payment out of the other information @@ -729,7 +729,7 @@ int KNewLoanWizard::calculateLoan(void) calc.setPmt(val); result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.") - .tqarg(m_paymentEdit->lineedit()->text()); + .arg(m_paymentEdit->lineedit()->text()); val = calc.futureValue(); if((m_borrowButton->isChecked() && val < 0 && fabsl(val) >= fabsl(calc.payment())) @@ -741,7 +741,7 @@ int KNewLoanWizard::calculateLoan(void) m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += TQString(" "); result += i18n("The number of payments has been decremented and the final payment has been modified to %1.") - .tqarg(m_finalPaymentEdit->lineedit()->text()); + .arg(m_finalPaymentEdit->lineedit()->text()); } else if((m_borrowButton->isChecked() && val < 0 && fabsl(val) < fabsl(calc.payment())) || (m_lendButton->isChecked() && val > 0 && fabs(val) < fabs(calc.payment()))) { m_finalPaymentEdit->loadText(MyMoneyMoney(0,1).formatMoney(fraction)); @@ -749,7 +749,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += i18n("The final payment has been modified to %1.") - .tqarg(m_finalPaymentEdit->lineedit()->text()); + .arg(m_finalPaymentEdit->lineedit()->text()); } } else if(m_durationValueEdit->value() == 0) { @@ -761,7 +761,7 @@ int KNewLoanWizard::calculateLoan(void) // if the number of payments has a fractional part, then we // round it to the smallest integer and calculate the balloon payment result = i18n("KMyMoney has calculated the term of your loan as %1. ") - .tqarg(updateTermWidgets(floorl(val))); + .arg(updateTermWidgets(floorl(val))); if(val != floorl(val)) { calc.setNpp(floorl(val)); @@ -769,7 +769,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); m_finalPaymentEdit->loadText(refVal.abs().formatMoney(fraction)); result += i18n("The final payment has been modified to %1.") - .tqarg(m_finalPaymentEdit->lineedit()->text()); + .arg(m_finalPaymentEdit->lineedit()->text()); } } else { @@ -800,7 +800,7 @@ int KNewLoanWizard::calculateLoan(void) MyMoneyMoney refVal(static_cast<double>(val)); result = i18n("KMyMoney has calculated a final payment of %1 for this loan.") - .tqarg(refVal.abs().formatMoney(fraction)); + .arg(refVal.abs().formatMoney(fraction)); if(!m_finalPaymentEdit->lineedit()->text().isEmpty()) { if((m_finalPaymentEdit->value().abs() - refVal.abs()).abs().toDouble() > 1) { @@ -889,7 +889,7 @@ void KNewLoanWizard::slotCreateCategory(void) m_interestAccountEdit->setSelected(id); } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to add account: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to add account: %1").arg(e->what())); delete e; } } diff --git a/kmymoney2/dialogs/knewloanwizarddecl.ui b/kmymoney2/dialogs/knewloanwizarddecl.ui index 19c589f..c20d955 100644 --- a/kmymoney2/dialogs/knewloanwizarddecl.ui +++ b/kmymoney2/dialogs/knewloanwizarddecl.ui @@ -12,7 +12,7 @@ <height>458</height> </rect> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>800</width> <height>32767</height> @@ -63,7 +63,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>0</height> @@ -84,7 +84,7 @@ <property name="text"> <string>New Loan Account Wizard</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -98,7 +98,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>119</width> <height>0</height> @@ -117,7 +117,7 @@ Welcome to the New Loan Account Wizard which will guide you through the creation Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -131,7 +131,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -175,7 +175,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>98</width> <height>0</height> @@ -196,7 +196,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="text"> <string>Edit Loan Account Wizard</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignHCenter</set> </property> </widget> @@ -210,7 +210,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>119</width> <height>0</height> @@ -229,7 +229,7 @@ Welcome to the Edit Loan Account Wizard. Please use this wizard to modify inform Please make sure that you have the relevant information handy. You usually get the information out of your contract and the last statement.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -243,7 +243,7 @@ Please make sure that you have the relevant information handy. You usually get t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -277,7 +277,7 @@ Please make sure that you have the relevant information handy. You usually get t <string> In the first step, KMyMoney will ask you some general information about the loan account to be created.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -291,7 +291,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -322,7 +322,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>138</width> <height>0</height> @@ -350,7 +350,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="text"> <string>1. General Information</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -378,7 +378,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>25</height> @@ -397,7 +397,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>137</width> <height>0</height> @@ -416,7 +416,7 @@ In the first step, KMyMoney will ask you some general information about the loan <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -450,7 +450,7 @@ In the first step, KMyMoney will ask you some general information about the loan <string> Please select, which data of the loan you want to modify.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -464,7 +464,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>48</height> @@ -495,7 +495,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>93</width> <height>0</height> @@ -561,7 +561,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>108</width> <height>0</height> @@ -580,7 +580,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>47</height> @@ -613,7 +613,7 @@ Please select, which data of the loan you want to modify.</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -624,7 +624,7 @@ Please select, which data of the loan you want to modify.</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -638,7 +638,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>30</height> @@ -684,7 +684,7 @@ Please select, which data of the loan you want to modify.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>87</height> @@ -718,7 +718,7 @@ Please select, which data of the loan you want to modify.</string> <string> Do you borrow or lend money?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -732,7 +732,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>61</height> @@ -804,7 +804,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>299</width> <height>0</height> @@ -823,7 +823,7 @@ Do you borrow or lend money?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>60</height> @@ -851,7 +851,7 @@ Do you borrow or lend money?</string> <string> How do you want to call this loan? Examples for names are 'car loan', 'school loan', 'home owner loan'.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -865,7 +865,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>56</height> @@ -911,7 +911,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>56</height> @@ -928,7 +928,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout55</cstring> + <cstring>layout55</cstring> </property> <hbox> <property name="name"> @@ -959,7 +959,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>56</height> @@ -993,7 +993,7 @@ How do you want to call this loan? Examples for names are 'car loan', 'school lo <string> Is the interest of this loan fixed over a period of time or is it adapted from time to time? If the interest rate changes during the amortization phase of the loan you should choose the option 'variable interest rate'.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1007,7 +1007,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>53</height> @@ -1079,7 +1079,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>286</width> <height>0</height> @@ -1098,7 +1098,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>53</height> @@ -1132,7 +1132,7 @@ Is the interest of this loan fixed over a period of time or is it adapted from t <string> Were there any payments for this loan whether they are entered into KMyMoney or not?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1146,7 +1146,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -1218,7 +1218,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>202</width> <height>0</height> @@ -1237,7 +1237,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -1251,7 +1251,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="text"> <string>Note: Payments made to obtain the loan (e.g. Dissagio) are not considered as payments in this context.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1265,7 +1265,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>32</height> @@ -1299,7 +1299,7 @@ Were there any payments for this loan whether they are entered into KMyMoney or <string> Do you want to record all payments of this loan with KMyMoney?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1313,7 +1313,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -1385,7 +1385,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>137</width> <height>0</height> @@ -1404,7 +1404,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -1432,7 +1432,7 @@ Do you want to record all payments of this loan with KMyMoney?</string> <string> Select the date when the interest rate for this loan will be modified and the frequency of the future changes.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1446,7 +1446,7 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>99</height> @@ -1455,7 +1455,7 @@ Select the date when the interest rate for this loan will be modified and the fr </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout44</cstring> + <cstring>layout44</cstring> </property> <grid> <property name="name"> @@ -1471,7 +1471,7 @@ Select the date when the interest rate for this loan will be modified and the fr </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout42</cstring> + <cstring>layout42</cstring> </property> <hbox> <property name="name"> @@ -1522,7 +1522,7 @@ Select the date when the interest rate for this loan will be modified and the fr <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -1556,7 +1556,7 @@ Select the date when the interest rate for this loan will be modified and the fr <string> Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1570,7 +1570,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>21</height> @@ -1601,7 +1601,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>0</height> @@ -1663,7 +1663,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>0</height> @@ -1682,7 +1682,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -1698,7 +1698,7 @@ Please enter the amount you pay for principal and interest or leave the field em If KMyMoney should calculate this value for you, then leave the field blank.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -1729,7 +1729,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <string> Please enter the interest rate or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1743,7 +1743,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>29</height> @@ -1774,7 +1774,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>0</height> @@ -1836,7 +1836,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>101</width> <height>0</height> @@ -1855,7 +1855,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>29</height> @@ -1871,7 +1871,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string If KMyMoney should calculate this value for you, then leave the field blank.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1901,7 +1901,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -1915,7 +1915,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>78</height> @@ -1961,7 +1961,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>28</height> @@ -1975,7 +1975,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <property name="text"> <string></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignBottom</set> </property> </widget> @@ -2006,7 +2006,7 @@ If KMyMoney should calculate this value for you, then leave the field blank.</st <string> You have successfully entered the general information about your loan. Next, KMyMoney needs some information about the calculation of the loan.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2020,7 +2020,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>19</height> @@ -2051,7 +2051,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>136</width> <height>0</height> @@ -2082,7 +2082,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="text"> <string>1. General Information</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -2117,7 +2117,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>18</height> @@ -2136,7 +2136,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>135</width> <height>0</height> @@ -2155,7 +2155,7 @@ You have successfully entered the general information about your loan. Next, KMy <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>23</height> @@ -2189,7 +2189,7 @@ You have successfully entered the general information about your loan. Next, KMy <string> How often will there be payments made to this loan?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2203,7 +2203,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>49</height> @@ -2234,7 +2234,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>39</width> <height>0</height> @@ -2256,7 +2256,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>56</width> <height>0</height> @@ -2275,7 +2275,7 @@ How often will there be payments made to this loan?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>49</height> @@ -2309,7 +2309,7 @@ How often will there be payments made to this loan?</string> <string> When does the actual interest rate get calculated?</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2323,7 +2323,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -2395,7 +2395,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>296</width> <height>0</height> @@ -2414,7 +2414,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>69</height> @@ -2447,7 +2447,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>1</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2461,7 +2461,7 @@ When does the actual interest rate get calculated?</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>15</height> @@ -2524,7 +2524,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -2535,7 +2535,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2546,7 +2546,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2557,7 +2557,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2568,7 +2568,7 @@ When does the actual interest rate get calculated?</string> <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2681,7 +2681,7 @@ When does the actual interest rate get calculated?</string> <string> Please enter the interest rate or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2695,7 +2695,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -2758,7 +2758,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -2769,7 +2769,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2780,7 +2780,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2791,7 +2791,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2802,7 +2802,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -2909,7 +2909,7 @@ Please enter the interest rate or leave the field empty to calculate it.</string <string> Please enter the term of this loan or leave the field empty to calculate it. The term is the time that is required to fully repay the loan. This time might be different from the time your loan contract is signed for.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -2923,7 +2923,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>54</height> @@ -2932,7 +2932,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43</cstring> + <cstring>layout43</cstring> </property> <hbox> <property name="name"> @@ -2993,7 +2993,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3004,7 +3004,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3015,7 +3015,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3026,7 +3026,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3037,7 +3037,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3150,7 +3150,7 @@ Please enter the term of this loan or leave the field empty to calculate it. The <string> Please enter the amount you pay for principal and interest or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3164,7 +3164,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -3227,7 +3227,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3238,7 +3238,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3249,7 +3249,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3260,7 +3260,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3271,7 +3271,7 @@ Please enter the amount you pay for principal and interest or leave the field em <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3384,7 +3384,7 @@ Please enter the amount you pay for principal and interest or leave the field em <string> Please enter the amount of a final amortization payment or leave the field empty to calculate it.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3398,7 +3398,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -3461,7 +3461,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3472,7 +3472,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3483,7 +3483,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3494,7 +3494,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3505,7 +3505,7 @@ Please enter the amount of a final amortization payment or leave the field empty <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3618,7 +3618,7 @@ Please enter the amount of a final amortization payment or leave the field empty <string> KMyMoney has calculated the loan as shown in the overview below. You can accept these values by selecting "Next" or change them by choosing "Back" to return to the input field for the information you want to change.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3632,7 +3632,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>22</height> @@ -3666,7 +3666,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -3677,7 +3677,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3688,7 +3688,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3699,7 +3699,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3710,7 +3710,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <property name="text"> <string>Final amortization payment</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -3823,7 +3823,7 @@ KMyMoney has calculated the loan as shown in the overview below. You can accept <string> In the following steps, KMyMoney supports you in setting up categories and schedules for your loan payments.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -3837,7 +3837,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>14</height> @@ -3868,7 +3868,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>136</width> <height>0</height> @@ -3899,7 +3899,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="text"> <string>1. General Information</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -3937,7 +3937,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>18</height> @@ -3956,7 +3956,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>135</width> <height>0</height> @@ -3975,7 +3975,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>18</height> @@ -4009,7 +4009,7 @@ In the following steps, KMyMoney supports you in setting up categories and sched <string> Please select the category you want to assign the interest payments to or create a new category.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4023,7 +4023,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>38</height> @@ -4059,7 +4059,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>264</width> <height>0</height> @@ -4086,7 +4086,7 @@ Please select the category you want to assign the interest payments to or create <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>22</height> @@ -4120,7 +4120,7 @@ Please select the category you want to assign the interest payments to or create <string> If your regular payment contains any additional fees, click on the button "Additional fees" to enter them.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4134,7 +4134,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4168,7 +4168,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>= periodical payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4187,7 +4187,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4206,7 +4206,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4231,7 +4231,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>+</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4260,7 +4260,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="textFormat"> <enum>PlainText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4271,7 +4271,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4285,7 +4285,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4302,7 +4302,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -4321,7 +4321,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4335,7 +4335,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="text"> <string>If no additional fees are included in your periodical payment or you have entered all such fees, then click on "Next".</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4349,7 +4349,7 @@ If your regular payment contains any additional fees, click on the button "Addit <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4383,7 +4383,7 @@ If your regular payment contains any additional fees, click on the button "Addit <string>KMyMoney will create a schedule for this payment and reminds you whenever a payment must be made.<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.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4397,7 +4397,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>23</height> @@ -4443,7 +4443,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="text"> <string>Make payment from/to:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -4459,7 +4459,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>24</height> @@ -4493,7 +4493,7 @@ If you selected to record all payments this date has already been supplied. If y <string> KMyMoney has calculated the loan as shown below. If you want to accept these values use the "Finish" button to update your account, otherwise use the "Back" button to modify your settings.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4507,7 +4507,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>23</height> @@ -4541,7 +4541,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> </widget> @@ -4552,7 +4552,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Additional fees:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4563,7 +4563,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Total payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4574,7 +4574,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4585,7 +4585,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Valid from:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4596,7 +4596,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <property name="text"> <string>Affected payments:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -4719,7 +4719,7 @@ KMyMoney has calculated the loan as shown below. If you want to accept these val <string>If this loan is for an asset, such as a car or a house, you can create the asset account now. An asset account represents the total value of an asset. The money from this loan will be transfered into the asset account you create or select. If this loan is a 'consumer loan' (money to use however you want), you can use a checking account instead.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4733,7 +4733,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -4750,7 +4750,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout124</cstring> + <cstring>layout124</cstring> </property> <vbox> <property name="name"> @@ -4763,7 +4763,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout123</cstring> + <cstring>layout123</cstring> </property> <hbox> <property name="name"> @@ -4779,7 +4779,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>466</width> <height>20</height> @@ -4806,7 +4806,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout170</cstring> + <cstring>layout170</cstring> </property> <hbox> <property name="name"> @@ -4837,7 +4837,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -4871,7 +4871,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <string> This page summarizes the data you entered. If you need to modify anything, please use the "Back" button to go to respective page. Otherwise use the "Finish" button to create the account.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -4885,7 +4885,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -4958,7 +4958,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Payee:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5001,7 +5001,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>First payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5028,7 +5028,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Amount is:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5122,7 +5122,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Periodic Payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5133,7 +5133,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Additional Fees:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5144,7 +5144,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Interest category:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5155,7 +5155,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Payment from:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5198,7 +5198,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Next due date:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5262,7 +5262,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Term:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5289,7 +5289,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Interest rate:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5316,7 +5316,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Final Payment:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5343,7 +5343,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Interest is due:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5370,7 +5370,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Principal + Interest:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5397,7 +5397,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Loan amount:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5408,7 +5408,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="text"> <string>Payment frequency:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -5444,7 +5444,7 @@ This page summarizes the data you entered. If you need to modify anything, pleas <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui index 3d6547b..08560e6 100644 --- a/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui +++ b/kmymoney2/dialogs/konlinequoteconfigurationdecl.ui @@ -64,7 +64,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui index 4b01cac..fd38082 100644 --- a/kmymoney2/dialogs/kpayeereassigndlgdecl.ui +++ b/kmymoney2/dialogs/kpayeereassigndlgdecl.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>300</width> <height>0</height> @@ -38,7 +38,7 @@ <property name="text"> <string>The transactions associated with the selected payees need to be re-assigned to a different payee before the selected payees can be deleted. Please select a payee from the list below.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignJustify|AlignTop</set> </property> </widget> @@ -52,7 +52,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -116,7 +116,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -132,7 +132,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>20</height> diff --git a/kmymoney2/dialogs/kplugindlg.ui b/kmymoney2/dialogs/kplugindlg.ui index 77b1ecb..2cf4373 100644 --- a/kmymoney2/dialogs/kplugindlg.ui +++ b/kmymoney2/dialogs/kplugindlg.ui @@ -36,7 +36,7 @@ </column> <column> <property name="text"> - <string>tqStatus</string> + <string>Status</string> </property> <property name="clickable"> <bool>true</bool> @@ -82,7 +82,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>180</width> <height>20</height> diff --git a/kmymoney2/dialogs/kreconciledlg.cpp b/kmymoney2/dialogs/kreconciledlg.cpp index c48e273..9c18d68 100644 --- a/kmymoney2/dialogs/kreconciledlg.cpp +++ b/kmymoney2/dialogs/kreconciledlg.cpp @@ -43,11 +43,11 @@ KReconcileDlg::KReconcileDlg(const MyMoneyMoney /* previousBal */, const MyMoney m_endingDate = endingDate; - totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); debitListView->setRootIsDecorated(false); @@ -313,11 +313,11 @@ void KReconcileDlg::resetData(const MyMoneyMoney /* previousBal */, const MyMone m_endingDate = endingDate; - //totalCreditsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //totalDebitsLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //previousLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //endingLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); - //differenceLabel->tqsetAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //totalCreditsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //totalDebitsLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //previousLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //endingLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); + //differenceLabel->setAlignment(AlignRight | AlignVCenter | ExpandTabs | SingleLine); endingLabel->setText(KGlobal::locale()->formatMoney(m_clearedBalance.amount(),"")); diff --git a/kmymoney2/dialogs/kreconciledlgdecl.ui b/kmymoney2/dialogs/kreconciledlgdecl.ui index 9ce4dbe..d5893e8 100644 --- a/kmymoney2/dialogs/kreconciledlgdecl.ui +++ b/kmymoney2/dialogs/kreconciledlgdecl.ui @@ -12,7 +12,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -63,7 +63,7 @@ a transaction you can return to the register by clicking on the Edit Transaction Your account is balanced when the Difference is Zero. Click on the Finish button to save the reconciled transactions.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignLeft</set> </property> <property name="wordwrap" stdset="0"> @@ -103,7 +103,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="name"> <cstring>Layout25</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>0</height> @@ -131,7 +131,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>15</height> @@ -153,7 +153,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>100</height> @@ -188,7 +188,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>15</height> @@ -210,7 +210,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>420</width> <height>100</height> @@ -264,7 +264,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -313,7 +313,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> @@ -332,7 +332,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>250</width> <height>120</height> @@ -377,7 +377,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -386,7 +386,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Previous Balance:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -407,7 +407,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -441,7 +441,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -450,7 +450,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Ending Balance:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -468,7 +468,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -477,7 +477,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -511,7 +511,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -520,7 +520,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Cleared Balance:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -538,7 +538,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -547,7 +547,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -581,7 +581,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -590,7 +590,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>Difference:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -611,7 +611,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="text"> <string>0</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -655,7 +655,7 @@ Your account is balanced when the Difference is Zero. Click on the Finish butto <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>0</height> diff --git a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp index 388019a..637fd4d 100644 --- a/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp +++ b/kmymoney2/dialogs/kreportconfigurationfilterdlg.cpp @@ -36,13 +36,13 @@ #include <tqlineedit.h> #include <tqpushbutton.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqspinbox.h> #include <tqtooltip.h> #include <tqwhatsthis.h> #include <tqtabwidget.h> -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> #include <tqapplication.h> // ---------------------------------------------------------------------------- @@ -378,7 +378,7 @@ void KReportConfigurationFilterDlg::slotReset(void) for(it_b = m_budgets.begin(); it_b != m_budgets.end(); ++it_b) { m_tab2->m_comboBudget->insertItem((*it_b).name(), i); //set the current selected item - if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == TQDate::tqcurrentDate().year()) + if( (m_initialState.budget() == "Any" && (*it_b).budgetStart().year() == TQDate::currentDate().year()) || m_initialState.budget() == (*it_b).id()) m_tab2->m_comboBudget->setCurrentItem(i); i++; 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("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").tqarg(security.name()); + msg = TQString("<p>") + i18n("Do you really want to remove the currency <b>%1</b> from the file?</p><i>Note: It is currently not supported to add currencies.</i>").arg(security.name()); dontAsk = "DeleteCurrency"; } else { - msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").tqarg(KMyMoneyUtils::securityTypeToString(security.securityType())).tqarg(security.name()); + msg = TQString("<p>") + i18n("Do you really want to remove the %1 <b>%2</b> from the file?").arg(KMyMoneyUtils::securityTypeToString(security.securityType())).arg(security.name()); dontAsk = "DeleteSecurity"; } if(KMessageBox::questionYesNo(this, msg, i18n("Delete security"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAsk) == KMessageBox::Yes) { diff --git a/kmymoney2/dialogs/ksecuritylisteditordecl.ui b/kmymoney2/dialogs/ksecuritylisteditordecl.ui index da8c628..d9033da 100644 --- a/kmymoney2/dialogs/ksecuritylisteditordecl.ui +++ b/kmymoney2/dialogs/ksecuritylisteditordecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -141,7 +141,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>51</height> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>110</height> @@ -217,7 +217,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -233,7 +233,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>91</width> <height>20</height> diff --git a/kmymoney2/dialogs/kselectdatabasedlg.cpp b/kmymoney2/dialogs/kselectdatabasedlg.cpp index 9bb1e33..b81ddf7 100644 --- a/kmymoney2/dialogs/kselectdatabasedlg.cpp +++ b/kmymoney2/dialogs/kselectdatabasedlg.cpp @@ -22,7 +22,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqpushbutton.h> #include <tqapplication.h> #include <tqsqldatabase.h> @@ -107,11 +107,11 @@ KSelectDatabaseDlg::KSelectDatabaseDlg(KURL openURL, TQWidget *parent, const cha // list drivers supported by KMM TQMap<TQString, TQString> map = m_map.driverMap(); if (!list.contains(driverName)) { - KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").tqarg(driverName), + KMessageBox::error (0, i18n("TQt SQL driver %1 is no longer installed on your system").arg(driverName), ""); setError(); } else if (!map.contains(driverName)) { - KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").tqarg(driverName), + KMessageBox::error (0, i18n("TQt SQL driver %1 is not suported").arg(driverName), ""); setError(); } else { @@ -159,7 +159,7 @@ const KURL KSelectDatabaseDlg::selectedURL() { url.setHost(textHostName->text()); url.setPath("/" + textDbName->text()); TQString qs = TQString("driver=%1") - .tqarg(listDrivers->currentText().section (' ', 0, 0)); + .arg(listDrivers->currentText().section (' ', 0, 0)); if (checkPreLoad->isChecked()) qs.append("&options=loadAll"); if (!textPassword->text().isEmpty()) qs.append("&secure=yes"); url.setQuery(qs); @@ -171,7 +171,7 @@ void KSelectDatabaseDlg::slotDriverSelected (TQListBoxItem *driver) { if (!m_map.isTested(dbType)) { int rc = KMessageBox::warningContinueCancel (0, i18n("TQt SQL driver %1 has not been fully tested in a KMyMoney environment. Please make sure you have adequate backups of your data. Please report any problems to the developer mailing list at [email protected]") - .tqarg(driver->text()), + .arg(driver->text()), ""); if (rc == KMessageBox::Cancel) { listDrivers->clearSelection(); diff --git a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui index 4b2b31e..2215b9a 100644 --- a/kmymoney2/dialogs/kselectdatabasedlgdecl.ui +++ b/kmymoney2/dialogs/kselectdatabasedlgdecl.ui @@ -153,7 +153,7 @@ As always, please make sure you have adequate backups of your data.</font> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -177,7 +177,7 @@ As always, please make sure you have adequate backups of your data.</font> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -202,7 +202,7 @@ As always, please make sure you have adequate backups of your data.</font> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> diff --git a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui index 5697104..f4fb116 100644 --- a/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui +++ b/kmymoney2/dialogs/kselecttransactionsdlgdecl.ui @@ -99,7 +99,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -123,7 +123,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>430</width> <height>20</height> diff --git a/kmymoney2/dialogs/ksortoptiondlg.ui b/kmymoney2/dialogs/ksortoptiondlg.ui index bfc4ca7..ac10946 100644 --- a/kmymoney2/dialogs/ksortoptiondlg.ui +++ b/kmymoney2/dialogs/ksortoptiondlg.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -61,7 +61,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>237</width> <height>20</height> diff --git a/kmymoney2/dialogs/ksplitcorrectiondlg.ui b/kmymoney2/dialogs/ksplitcorrectiondlg.ui index 0f2a196..3c94f93 100644 --- a/kmymoney2/dialogs/ksplitcorrectiondlg.ui +++ b/kmymoney2/dialogs/ksplitcorrectiondlg.ui @@ -12,7 +12,7 @@ <height>292</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> @@ -33,7 +33,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -133,7 +133,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> @@ -156,7 +156,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -172,7 +172,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -191,7 +191,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> @@ -213,7 +213,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>80</width> <height>0</height> diff --git a/kmymoney2/dialogs/ksplittransactiondlg.cpp b/kmymoney2/dialogs/ksplittransactiondlg.cpp index cb80e62..907f927 100644 --- a/kmymoney2/dialogs/ksplittransactiondlg.cpp +++ b/kmymoney2/dialogs/ksplittransactiondlg.cpp @@ -126,7 +126,7 @@ KSplitTransactionDlg::KSplitTransactionDlg(const MyMoneyTransaction& t, kapp->config()->setGroup("SplitTransactionEditor"); size = kapp->config()->readSizeEntry("Geometry", &size); size.setHeight(size.height()-1); - TQDialog::resize( size.expandedTo(tqminimumSizeHint()) ); + TQDialog::resize( size.expandedTo(minimumSizeHint()) ); // Trick: it seems, that the initial sizing of the dialog does // not work correctly. At least, the columns do not get displayed @@ -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 ecd6a90..8f45927 100644 --- a/kmymoney2/dialogs/ksplittransactiondlgdecl.ui +++ b/kmymoney2/dialogs/ksplittransactiondlgdecl.ui @@ -88,7 +88,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>0</width> <height>16</height> @@ -99,7 +99,7 @@ <property name="name"> <cstring>Layout49</cstring> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -127,7 +127,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>15</height> @@ -136,7 +136,7 @@ <property name="text"> <string><b>11,00<b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -154,7 +154,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>15</height> @@ -163,7 +163,7 @@ <property name="text"> <string><b>111,00<b></string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -181,7 +181,7 @@ <property name="text"> <string>Unassigned</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -199,7 +199,7 @@ <property name="text"> <string>Sum of splits</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -217,7 +217,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>120</width> <height>15</height> @@ -226,7 +226,7 @@ <property name="text"> <string>100,00</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -236,7 +236,7 @@ <property name="name"> <cstring>TextLabel1_2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -250,7 +250,7 @@ <property name="text"> <string>Transaction amount</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> @@ -284,13 +284,13 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>15</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>32767</width> <height>80</height> @@ -309,7 +309,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -364,7 +364,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>120</height> diff --git a/kmymoney2/dialogs/kstartdlg.cpp b/kmymoney2/dialogs/kstartdlg.cpp index a9f3bae..fcc6510 100644 --- a/kmymoney2/dialogs/kstartdlg.cpp +++ b/kmymoney2/dialogs/kstartdlg.cpp @@ -19,11 +19,11 @@ // QT Includes #include <tqvbox.h> -#include <tqlayout.h> +#include <layout.h> #include <tqbuttongroup.h> #include <tqabstractlayout.h> #include <tqpixmap.h> -#include <tqtextview.h> +#include <textview.h> #include <tqlabel.h> // ---------------------------------------------------------------------------- @@ -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/kupdatestockpricedlg.cpp b/kmymoney2/dialogs/kupdatestockpricedlg.cpp index 53d930e..84253e6 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlg.cpp +++ b/kmymoney2/dialogs/kupdatestockpricedlg.cpp @@ -37,7 +37,7 @@ KUpdateStockPriceDlg::KUpdateStockPriceDlg(TQWidget* parent, const char* name) : kUpdateStockPriceDecl(parent, name, true) { - m_date->setDate(TQDate::tqcurrentDate()); + m_date->setDate(TQDate::currentDate()); init(); } diff --git a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui index 3b1659f..40e178f 100644 --- a/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui +++ b/kmymoney2/dialogs/kupdatestockpricedlgdecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout38</cstring> + <cstring>layout38</cstring> </property> <grid> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout37</cstring> + <cstring>layout37</cstring> </property> <hbox> <property name="name"> @@ -50,7 +50,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> @@ -61,7 +61,7 @@ </widget> <widget class="TQLayoutWidget" row="1" column="1"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -90,7 +90,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -125,7 +125,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -154,7 +154,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -175,7 +175,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>40</height> @@ -198,7 +198,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -214,7 +214,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>21</height> 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/mymoneyqifprofileeditordecl.ui b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui index 8c27984..b7036de 100644 --- a/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui +++ b/kmymoney2/dialogs/mymoneyqifprofileeditordecl.ui @@ -30,7 +30,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -74,7 +74,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -84,7 +84,7 @@ <property name="name"> <cstring>TextLabel2_2_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -98,7 +98,7 @@ <property name="name"> <cstring>TextLabel2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -117,7 +117,7 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -141,7 +141,7 @@ <property name="name"> <cstring>TextLabel2_2_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -165,7 +165,7 @@ <property name="name"> <cstring>TextLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -195,7 +195,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -217,7 +217,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout43</cstring> + <cstring>layout43</cstring> </property> <hbox> <property name="name"> @@ -225,7 +225,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <grid> <property name="name"> @@ -243,7 +243,7 @@ <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -268,7 +268,7 @@ <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -293,7 +293,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -312,7 +312,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>80</height> @@ -563,7 +563,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout41</cstring> + <cstring>layout41</cstring> </property> <hbox> <property name="name"> @@ -571,7 +571,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout40</cstring> + <cstring>layout40</cstring> </property> <grid> <property name="name"> @@ -586,7 +586,7 @@ <property name="name"> <cstring>TextLabel1_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -600,7 +600,7 @@ <property name="name"> <cstring>TextLabel1_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -627,7 +627,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -646,7 +646,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>16</height> @@ -668,7 +668,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <grid> <property name="name"> @@ -678,7 +678,7 @@ <property name="name"> <cstring>TextLabel1_4_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -705,7 +705,7 @@ <property name="name"> <cstring>TextLabel1_4_3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -727,7 +727,7 @@ <property name="name"> <cstring>TextLabel1_4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>140</width> <height>0</height> @@ -749,7 +749,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -823,7 +823,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>104</width> <height>0</height> diff --git a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui index af307ac..a2920fb 100644 --- a/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingscolorsdecl.ui @@ -157,7 +157,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -382,7 +382,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui index bffa088..a6e48f9 100644 --- a/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsfontsdecl.ui @@ -58,7 +58,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>110</width> <height>20</height> @@ -75,7 +75,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>100</width> <height>20</height> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui index e70f01e..7c5139f 100644 --- a/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsforecastdecl.ui @@ -40,7 +40,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -48,7 +48,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="0"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -105,7 +105,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>133</width> <height>21</height> @@ -187,7 +187,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>130</width> <height>21</height> @@ -255,7 +255,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui index 9f8adaa..c442639 100644 --- a/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgeneraldecl.ui @@ -120,7 +120,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -194,7 +194,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>354</width> <height>20</height> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>90</width> <height>20</height> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -366,7 +366,7 @@ <property name="text"> <string>Check the views you want to enable, uncheck those you want to hide, because you don't need the functionality.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -452,7 +452,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -554,7 +554,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -588,7 +588,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>63</width> <height>20</height> @@ -620,7 +620,7 @@ You can use <b>View/Show all accounts</b> to temporarily show hidden <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> 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("<qt>%1</qt>").tqarg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); + KMessageBox::information(this, TQString("<qt>%1</qt>").arg(i18n("You have turned on the GPG encryption support. This means, that new files will be stored encrypted. Existing files will not be encrypted automatically. To achieve encryption of existing files, please use the <b>File/Save as...</b> feature and store the file under a different name. Once confident with the result, feel free to delete the old file and rename the encrypted one to the old name.")), i18n("GPG encryption activated"), "GpgEncryptionActivated"); oncePerSession = false; } diff --git a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui index 09f846a..e256d73 100644 --- a/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsgpgdecl.ui @@ -48,7 +48,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -104,7 +104,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -142,7 +142,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>50</width> <height>20</height> @@ -153,7 +153,7 @@ The <i>additional recovery encryption</i> is only accessible, if the </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -191,7 +191,7 @@ The <i>additional recovery encryption</i> is only accessible, if the <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>20</height> @@ -225,7 +225,7 @@ This mechanism is provided for the case that you have lost your key and cannot a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> diff --git a/kmymoney2/dialogs/settings/ksettingshomedecl.ui b/kmymoney2/dialogs/settings/ksettingshomedecl.ui index cc8eaff..f6342f3 100644 --- a/kmymoney2/dialogs/settings/ksettingshomedecl.ui +++ b/kmymoney2/dialogs/settings/ksettingshomedecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -29,7 +29,7 @@ </property> <widget class="TQLayoutWidget" row="0" column="2"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Fixed</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -78,7 +78,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>70</height> @@ -97,7 +97,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>21</height> @@ -118,9 +118,9 @@ </property> <property name="text"> <string>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.</string> +Use the buttons and checkboxes to customize the layout of the home page.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -193,7 +193,7 @@ Use the buttons and checkboxes to customize the tqlayout of the home page.</stri <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui index cc64bdb..ad68131 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotesdecl.ui @@ -12,7 +12,7 @@ <height>442</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -179,7 +179,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -211,7 +211,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> diff --git a/kmymoney2/dialogs/settings/ksettingsplugins.cpp b/kmymoney2/dialogs/settings/ksettingsplugins.cpp index 20434f6..203db56 100644 --- a/kmymoney2/dialogs/settings/ksettingsplugins.cpp +++ b/kmymoney2/dialogs/settings/ksettingsplugins.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqstring.h> #include <tqlabel.h> @@ -38,10 +38,10 @@ KSettingsPlugins::KSettingsPlugins(TQWidget* parent) : TQWidget(parent) { - TQVBoxLayout *tqlayout = new TQVBoxLayout(this); + TQVBoxLayout *layout = new TQVBoxLayout(this); KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()->reparent(this, TQPoint()); - tqlayout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); - tqlayout->setSpacing(KDialog::spacingHint()); + layout->addWidget(KMyMoneyPlugin::PluginLoader::instance()->pluginSelectorWidget()); + layout->setSpacing(KDialog::spacingHint()); } KSettingsPlugins::~KSettingsPlugins() diff --git a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui index 1d8f320..0c23a4b 100644 --- a/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsregisterdecl.ui @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> @@ -276,7 +276,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -323,7 +323,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -362,7 +362,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -432,7 +432,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -454,7 +454,7 @@ Selecting 0% will list all transactions.</string> </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -498,7 +498,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -531,7 +531,7 @@ Selecting 0% will list all transactions.</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>60</height> diff --git a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui index 94762cb..3fe9a40 100644 --- a/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui +++ b/kmymoney2/dialogs/settings/ksettingsschedulesdecl.ui @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -103,7 +103,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -122,7 +122,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmymoney2/dialogs/transactioneditor.cpp b/kmymoney2/dialogs/transactioneditor.cpp index 63ff168..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("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").tqarg(txt).tqarg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(m_regForm, TQString("<qt>")+i18n("The number <b>%1</b> has already been used in account <b>%2</b>. Do you want to replace it with the next available number?").arg(txt).arg(m_account.name())+TQString("</qt>"), i18n("Duplicate number")) == KMessageBox::Yes) { number->loadText(KMyMoneyUtils::nextCheckNumber(m_account)); } } @@ -302,11 +302,11 @@ int TransactionEditor::slotEditSplits(void) acc = MyMoneyAccount(); } TQString msg; - msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").tqarg(sec.name())+TQString(" "); + msg = TQString("<p>")+i18n("This transaction has more than two splits and is based on a different currency (%1). Using this account to modify the transaction is currently not very well supported by KMyMoney and may result in false results.").arg(sec.name())+TQString(" "); if(acc.id().isEmpty()) { msg += i18n("KMyMoney was not able to find a more appropriate account to edit this transaction. Nevertheless, you are allowed to modify the transaction. If you don't want to edit this transaction, please cancel from editing next."); } else { - msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").tqarg(acc.name()); + msg += i18n("Using e.g. <b>%1</b> to edit this transaction is a better choice. Nevertheless, you are allowed to modify the transaction. If you want to use the suggested account instead, please cancel from editing next and change the view to the suggested account.").arg(acc.name()); } KMessageBox::information(0, msg); } @@ -409,12 +409,12 @@ bool TransactionEditor::fixTransactionCommodity(const MyMoneyAccount& account) if(firstTimeMultiCurrency) { firstTimeMultiCurrency = false; if(!isMultiSelection()) { - msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").tqarg(osec.name()); + msg = i18n("This transaction has more than two splits and is originally based on a different currency (%1). Using this account to modify the transaction may result in rounding errors. Do you want to continue?").arg(osec.name()); } else { - msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").tqarg(osec.name()); + msg = i18n("At least one of the selected transactions has more than two splits and is originally based on a different currency (%1). Using this account to modify the transactions may result in rounding errors. Do you want to continue?").arg(osec.name()); } - if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").tqarg(msg)) == KMessageBox::Cancel) { + if(KMessageBox::warningContinueCancel(0, TQString("<qt>%1</qt>").arg(msg)) == KMessageBox::Cancel) { rc = false; } } @@ -599,7 +599,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, if((*it_ts).id().isEmpty()) { bool enter = true; - if(askForSchedule && (*it_ts).postDate() > TQDate::tqcurrentDate()) { + if(askForSchedule && (*it_ts).postDate() > TQDate::currentDate()) { KGuiItem enterItem; KIconLoader* il = KGlobal::iconLoader(); KGuiItem enterButton( i18n("&Enter" ), @@ -611,7 +611,7 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, i18n("Accepts the entered data and stores it as schedule"), i18n("Use this to schedule the transaction for later entry into the ledger.")); - enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").tqarg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes; + enter = KMessageBox::questionYesNo(m_regForm, TQString("<qt>%1</qt>").arg(i18n("The transaction you are about to enter has a post date in the future.<br/><br/>Do you want to enter it in the ledger or add it to the schedules?")), i18n("Dialog caption for 'Enter or schedule' dialog", "Enter or schedule?"), enterButton, scheduleButton, "EnterOrScheduleTransactionInFuture") == KMessageBox::Yes; } if(enter) { // add new transaction @@ -679,25 +679,25 @@ bool TransactionEditor::enterTransactions(TQString& newId, bool askForSchedule, key = "minBalanceEarly"; if(!acc.value(key).isEmpty()) { if(minBalanceEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the warning balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "minBalanceAbsolute"; if(!acc.value(key).isEmpty()) { if(minBalanceAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the minimum balance of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "maxCreditEarly"; if(!acc.value(key).isEmpty()) { if(maxCreditEarly[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit warning limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } key = "maxCreditAbsolute"; if(!acc.value(key).isEmpty()) { if(maxCreditAbsolute[acc.id()] == false && balance < MyMoneyMoney(acc.value(key))) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").tqarg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The balance of account <b>%1</b> dropped below the maximum credit limit of %2.").arg(acc.name(), MyMoneyMoney(acc.value(key)).formatMoney(acc, sec))); } } @@ -859,7 +859,7 @@ void StdTransactionEditor::createEditWidgets(void) TQLabel* label; m_editWidgets["category-label"] = label = new TQLabel(i18n("Category"), 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); // create a copy of tabbar above the form (if we are created for a form) KMyMoneyTransactionForm::TransactionForm* form = dynamic_cast<KMyMoneyTransactionForm::TransactionForm*>(m_regForm); @@ -872,11 +872,11 @@ void StdTransactionEditor::createEditWidgets(void) } label = new TQLabel(i18n("Date"), 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["date-label"] = label; label = new TQLabel(i18n("Number"), 0); - label->tqsetAlignment(TQt::AlignVCenter | TQt::DontClip); + label->setAlignment(TQt::AlignVCenter | TQt::DontClip); m_editWidgets["number-label"] = label; setupPrecision(); @@ -966,7 +966,7 @@ void StdTransactionEditor::loadEditWidgets(KMyMoneyRegister::Action action) else if(m_lastPostDate.isValid()) dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(m_lastPostDate); else - dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::tqcurrentDate()); + dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"])->setDate(TQDate::currentDate()); if((w = haveWidget("number")) != 0) { dynamic_cast<kMyMoneyLineEdit*>(w)->loadText(m_split.number()); @@ -1195,7 +1195,7 @@ void StdTransactionEditor::slotUpdatePayee(const TQString& payeeId) // check if date has been altered by user kMyMoneyDateInput* postDate = dynamic_cast<kMyMoneyDateInput*>(m_editWidgets["postdate"]); if((m_lastPostDate.isValid() && (postDate->date() != m_lastPostDate)) - || (!m_lastPostDate.isValid() && (postDate->date() != TQDate::tqcurrentDate()))) + || (!m_lastPostDate.isValid() && (postDate->date() != TQDate::currentDate()))) return; #endif @@ -1240,7 +1240,7 @@ void StdTransactionEditor::autoFill(const TQString& payeeId) int cnt = 0; TQMap<TQString, struct uniqTransaction>::iterator it_u; do { - TQString ukey = TQString("%1-%2").tqarg(key).tqarg(cnt); + TQString ukey = TQString("%1-%2").arg(key).arg(cnt); it_u = uniqList.find(ukey); if(it_u == uniqList.end()) { uniqList[ukey].t = &((*it_t).first); @@ -1615,7 +1615,7 @@ void StdTransactionEditor::updateVAT(bool amountChanged) // if we made this a split transaction, then move the // focus to the memo field - if(tqApp->tqfocusWidget() == haveWidget("category")) { + if(tqApp->focusWidget() == haveWidget("category")) { TQWidget* w = haveWidget("memo"); if(w) w->setFocus(); @@ -2029,7 +2029,7 @@ bool StdTransactionEditor::createTransaction(MyMoneyTransaction& t, const MyMone s0.setReconcileFlag(status->state()); if(s0.reconcileFlag() == MyMoneySplit::Reconciled && !s0.reconcileDate().isValid()) - s0.setReconcileDate(TQDate::tqcurrentDate()); + s0.setReconcileDate(TQDate::currentDate()); checkPayeeInSplit(s0, payeeId); 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 4e03477..e6ea813 100644 --- a/kmymoney2/kmymoney2.cpp +++ b/kmymoney2/kmymoney2.cpp @@ -34,9 +34,9 @@ #include <tqdir.h> #include <tqprinter.h> -#include <tqlayout.h> +#include <layout.h> #include <tqsignalmapper.h> -#include <tqclipboard.h> // temp for problem 1105503 +#include <clipboard.h> // temp for problem 1105503 #include <tqdatetime.h> // only for performance tests #include <tqtimer.h> #include <tqsqlpropertymap.h> @@ -199,7 +199,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : TQFrame* frame = new TQFrame(this); frame->setFrameStyle(TQFrame::NoFrame); // values for margin (11) and spacing(6) taken from KDialog implementation - TQBoxLayout* tqlayout = new TQBoxLayout(frame, TQBoxLayout::TopToBottom, 2, 6); + TQBoxLayout* layout = new TQBoxLayout(frame, TQBoxLayout::TopToBottom, 2, 6); ::timetrace("init statusbar"); initStatusBar(); @@ -210,7 +210,7 @@ KMyMoney2App::KMyMoney2App(TQWidget * /*parent*/ , const char* name) : ::timetrace("create view"); myMoneyView = new KMyMoneyView(frame, "KMyMoneyView"); - tqlayout->addWidget(myMoneyView, 10); + layout->addWidget(myMoneyView, 10); connect(myMoneyView, TQT_SIGNAL(aboutToShowPage(TQWidget*)), TQT_TQOBJECT(this), TQT_SLOT(slotResetSelections())); /////////////////////////////////////////////////////////////////// @@ -558,7 +558,7 @@ void KMyMoney2App::initStatusBar(void) progressBar->setLineWidth(0); progressBar->setBackgroundMode(TQWidget::PaletteBackground); statusBar()->addWidget(progressBar); - progressBar->setFixedHeight(progressBar->tqsizeHint().height() - 8); + progressBar->setFixedHeight(progressBar->sizeHint().height() - 8); // hide the progress bar for now slotStatusProgressBar(-1, -1); @@ -722,7 +722,7 @@ void KMyMoney2App::slotPerformanceTest(void) measurement[0] = measurement[1] = 0; if(MyMoneyFile::instance()->asset().accountCount()) { MyMoneyTransactionFilter filter(MyMoneyFile::instance()->asset().accountList()[0]); - filter.setDateFilter(TQDate(), TQDate::tqcurrentDate()); + filter.setDateFilter(TQDate(), TQDate::currentDate()); TQValueList<MyMoneyTransaction> list; timer.start(); @@ -741,7 +741,7 @@ void KMyMoney2App::slotPerformanceTest(void) measurement[0] = measurement[1] = 0; if(MyMoneyFile::instance()->asset().accountCount()) { MyMoneyTransactionFilter filter(MyMoneyFile::instance()->asset().accountList()[0]); - filter.setDateFilter(TQDate(), TQDate::tqcurrentDate()); + filter.setDateFilter(TQDate(), TQDate::currentDate()); TQValueList<MyMoneyTransaction> list; timer.start(); @@ -874,7 +874,7 @@ void KMyMoney2App::slotFileOpen(void) KMSTATUS(i18n("Open a file.")); KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), - i18n("%1|KMyMoney files\n%2|All files (*.*)").tqarg("*.kmy *.xml").tqarg("*"), + i18n("%1|KMyMoney files\n%2|All files (*.*)").arg("*.kmy *.xml").arg("*"), this, i18n("Open File..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -988,10 +988,10 @@ void KMyMoney2App::slotFileOpenRecent(const KURL& url) } } else { slotFileClose(); - KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> is either an invalid filename or the file does not exist. You can open another file or create a new one.").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("File not found")); + KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> is either an invalid filename or the file does not exist. You can open another file or create a new one.").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("File not found")); } } else { - KMessageBox::sorry(this, TQString("<p>")+i18n("File <b>%1</b> is already opened in another instance of KMyMoney").tqarg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Duplicate open")); + KMessageBox::sorry(this, TQString("<p>")+i18n("File <b>%1</b> is already opened in another instance of KMyMoney").arg(url.prettyURL(0, KURL::StripFileProtocol)), i18n("Duplicate open")); } } @@ -1039,7 +1039,7 @@ void KMyMoney2App::slotManageGpgKeys(void) dlg.setKeys(m_additionalGpgKeys); if(dlg.exec() == TQDialog::Accepted) { m_additionalGpgKeys = dlg.keys(); - m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").tqarg(m_additionalGpgKeys.count())); + m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").arg(m_additionalGpgKeys.count())); } } @@ -1051,7 +1051,7 @@ void KMyMoney2App::slotKeySelected(int idx) } m_additionalKeyLabel->setEnabled(idx != 0); m_additionalKeyButton->setEnabled(idx != 0); - m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").tqarg(cnt)); + m_additionalKeyLabel->setText(i18n("Additional encryption key(s) to be used: %1").arg(cnt)); } bool KMyMoney2App::slotFileSaveAs(void) @@ -1075,7 +1075,7 @@ bool KMyMoney2App::slotFileSaveAs(void) m_saveEncrypted = new KComboBox(keyBox); TQHBox* labelBox = new TQHBox(vbox); - m_additionalKeyLabel = new TQLabel(i18n("Additional encryption key(s) to be used: %1").tqarg(m_additionalGpgKeys.count()), labelBox); + m_additionalKeyLabel = new TQLabel(i18n("Additional encryption key(s) to be used: %1").arg(m_additionalGpgKeys.count()), labelBox); m_additionalKeyButton = new KPushButton(i18n("Manage additional keys"), labelBox); connect(m_additionalKeyButton, TQT_SIGNAL(clicked()), TQT_TQOBJECT(this), TQT_SLOT(slotManageGpgKeys())); connect(m_saveEncrypted, TQT_SIGNAL(activated(int)), TQT_TQOBJECT(this), TQT_SLOT(slotKeySelected(int))); @@ -1092,7 +1092,7 @@ bool KMyMoney2App::slotFileSaveAs(void) TQString name = fields[1]; name.replace('(', "["); name.replace(')', "]"); - name = TQString("%1 (0x%2)").tqarg(name).tqarg(fields[0]); + name = TQString("%1 (0x%2)").arg(name).arg(fields[0]); m_saveEncrypted->insertItem(name); if(name.contains(KMyMoneyGlobalSettings::gpgRecipient())) { m_saveEncrypted->setCurrentItem(name); @@ -1106,10 +1106,10 @@ bool KMyMoney2App::slotFileSaveAs(void) // enhanced to show the m_saveEncrypted combo box bool specialDir = prevDir.at(0) == ':'; KFileDialog dlg( specialDir ? prevDir : TQString(), - TQString("%1|%2\n").tqarg("*.kmy").tqarg(i18n("KMyMoney (Filefilter)", "KMyMoney files")) + - TQString("%1|%2\n").tqarg("*.xml").tqarg(i18n("XML (Filefilter)", "XML files")) + - TQString("%1|%2\n").tqarg("*.anon.xml").tqarg(i18n("Anonymous (Filefilter)", "Anonymous files")) + - TQString("%1|%2\n").tqarg("*").tqarg(i18n("All files")), + TQString("%1|%2\n").arg("*.kmy").arg(i18n("KMyMoney (Filefilter)", "KMyMoney files")) + + TQString("%1|%2\n").arg("*.xml").arg(i18n("XML (Filefilter)", "XML files")) + + TQString("%1|%2\n").arg("*.anon.xml").arg(i18n("Anonymous (Filefilter)", "Anonymous files")) + + TQString("%1|%2\n").arg("*").arg(i18n("All files")), this, "filedialog", true, vbox); connect(&dlg, TQT_SIGNAL(filterChanged(const TQString&)), TQT_TQOBJECT(this), TQT_SLOT(slotFileSaveAsFilterChanged(const TQString&))); @@ -1428,7 +1428,7 @@ void KMyMoney2App::slotFileViewPersonal(void) file->setUser(user); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to store user information: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to store user information: %1").arg(e->what())); delete e; } } @@ -1466,7 +1466,7 @@ void KMyMoney2App::slotLoadAccountTemplates(void) } ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to import template(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to import template(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -1622,7 +1622,7 @@ void KMyMoney2App::slotGncImport(void) KMSTATUS(i18n("Importing a Gnucash file.")); KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), - i18n("%1|Gnucash files\n%2|All files (*.*)").tqarg("*").tqarg("*"), + i18n("%1|Gnucash files\n%2|All files (*.*)").arg("*").arg("*"), this, i18n("Import Gnucash file..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -1665,7 +1665,7 @@ void KMyMoney2App::slotStatementImport(void) KMSTATUS(i18n("Importing an XML Statement.")); KFileDialog* dialog = new KFileDialog(KGlobalSettings::documentPath(), - i18n("%1|XML files\n%2|All files (*.*)").tqarg("*.xml").tqarg("*.*"), + i18n("%1|XML files\n%2|All files (*.*)").arg("*.xml").arg("*.*"), this, i18n("Import XML Statement..."), true); dialog->setMode(KFile::File | KFile::ExistingOnly); @@ -1702,7 +1702,7 @@ void KMyMoney2App::slotStatementImport(void) if ( !result ) { - TQMessageBox::critical( this, i18n("Critical Error"), i18n("Unable to read file %1: %2").tqarg( dialog->selectedURL().path()).tqarg(error), TQMessageBox::Ok, 0 ); + TQMessageBox::critical( this, i18n("Critical Error"), i18n("Unable to read file %1: %2").arg( dialog->selectedURL().path()).arg(error), TQMessageBox::Ok, 0 ); }*/ } @@ -1722,7 +1722,7 @@ bool KMyMoney2App::slotStatementImport(const TQString& url) if ( MyMoneyStatement::readXMLFile( s, url ) ) result = slotStatementImport(s); else - KMessageBox::error(this, i18n("Error importing %1: This file is not a valid KMM statement file.").tqarg(url), i18n("Invalid Statement")); + KMessageBox::error(this, i18n("Error importing %1: This file is not a valid KMM statement file.").arg(url), i18n("Invalid Statement")); return result; } @@ -1732,7 +1732,7 @@ bool KMyMoney2App::slotStatementImport(const MyMoneyStatement& s) bool result = false; // keep a copy of the statement - MyMoneyStatement::writeXMLFile(s, TQString("/home/thb/kmm-statement-%1.txt").tqarg(d->statementXMLindex++)); + MyMoneyStatement::writeXMLFile(s, TQString("/home/thb/kmm-statement-%1.txt").arg(d->statementXMLindex++)); // we use an object on the heap here, so that we can check the presence // of it during slotUpdateActions() by looking at the pointer. @@ -1792,7 +1792,7 @@ bool KMyMoney2App::okToWriteFile(const KURL& url) bool reallySaveFile = true; if(KIO::NetAccess::exists(url, true, this)) { - if(KMessageBox::warningYesNo(this, TQString("<qt>")+i18n("The file <b>%1</b> already exists. Do you really want to override it?").tqarg(url.prettyURL(0, KURL::StripFileProtocol))+TQString("</qt>"), i18n("File already exists")) != KMessageBox::Yes) + if(KMessageBox::warningYesNo(this, TQString("<qt>")+i18n("The file <b>%1</b> already exists. Do you really want to override it?").arg(url.prettyURL(0, KURL::StripFileProtocol))+TQString("</qt>"), i18n("File already exists")) != KMessageBox::Yes) reallySaveFile = false; } return reallySaveFile; @@ -1917,7 +1917,7 @@ void KMyMoney2App::slotFileBackup(void) if(!m_fileName.isLocalFile()) { KMessageBox::sorry(this, i18n("The current implementation of the backup functionality only supports local files as source files! Your current source file is '%1'.") - .tqarg(m_fileName.url()), + .arg(m_fileName.url()), i18n("Local files only")); return; @@ -1934,7 +1934,7 @@ void KMyMoney2App::slotFileBackup(void) m_mountpoint = backupDlg->txtMountPoint->text(); if (m_backupMount) { - progressCallback(0, 300, i18n("Mounting %1").tqarg(m_mountpoint)); + progressCallback(0, 300, i18n("Mounting %1").arg(m_mountpoint)); proc << "mount"; proc << m_mountpoint; proc.start(); @@ -1963,9 +1963,9 @@ void KMyMoney2App::slotProcessExited(void) proc.clearArguments(); TQString today; today.sprintf("-%04d-%02d-%02d.kmy", - TQDate::tqcurrentDate().year(), - TQDate::tqcurrentDate().month(), - TQDate::tqcurrentDate().day()); + TQDate::currentDate().year(), + TQDate::currentDate().month(), + TQDate::currentDate().day()); TQString backupfile = m_mountpoint + "/" + m_fileName.fileName(false); KMyMoneyUtils::appendCorrectFileExt(backupfile, today); @@ -1978,7 +1978,7 @@ void KMyMoney2App::slotProcessExited(void) m_backupResult = 1; if (m_backupMount) { - progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint)); + progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint)); proc.clearArguments(); proc << "umount"; proc << m_mountpoint; @@ -1993,7 +1993,7 @@ void KMyMoney2App::slotProcessExited(void) } if(m_backupResult == 0) { - progressCallback(50, 0, i18n("Writing %1").tqarg(backupfile)); + progressCallback(50, 0, i18n("Writing %1").arg(backupfile)); proc << "cp" << "-f" << m_fileName.path(0) << backupfile; m_backupState = BACKUP_COPYING; proc.start(); @@ -2003,7 +2003,7 @@ void KMyMoney2App::slotProcessExited(void) KMessageBox::information(this, i18n("Error mounting device"), i18n("Backup")); m_backupResult = 1; if (m_backupMount) { - progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint)); + progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint)); proc.clearArguments(); proc << "umount"; proc << m_mountpoint; @@ -2022,7 +2022,7 @@ void KMyMoney2App::slotProcessExited(void) if(proc.normalExit() && proc.exitStatus() == 0) { if (m_backupMount) { - progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint)); + progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint)); proc.clearArguments(); proc << "umount"; proc << m_mountpoint; @@ -2041,7 +2041,7 @@ void KMyMoney2App::slotProcessExited(void) KMessageBox::information(this, i18n("Error copying file to device"), i18n("Backup")); if (m_backupMount) { - progressCallback(250, 0, i18n("Unmounting %1").tqarg(m_mountpoint)); + progressCallback(250, 0, i18n("Unmounting %1").arg(m_mountpoint)); proc.clearArguments(); proc << "umount"; proc << m_mountpoint; @@ -2153,7 +2153,7 @@ void KMyMoney2App::createInstitution(MyMoneyInstitution& institution) ft.commit(); } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Cannot add institution: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Cannot add institution: %1").arg(e->what())); delete e; } } @@ -2195,14 +2195,14 @@ void KMyMoney2App::slotInstitutionEdit(const MyMoneyObject& obj) slotSelectInstitution(file->institution(dlg.institution().id())); } catch(MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to store institution: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to store institution: %1").arg(e->what())); delete e; } } } catch(MyMoneyException *e) { if(!obj.id().isEmpty()) - KMessageBox::information(this, i18n("Unable to edit institution: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to edit institution: %1").arg(e->what())); delete e; } } @@ -2213,7 +2213,7 @@ void KMyMoney2App::slotInstitutionDelete(void) try { MyMoneyInstitution institution = file->institution(m_selectedInstitution.id()); - if ((KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete institution <b>%1</b> ?").tqarg(institution.name()))) == KMessageBox::No) + if ((KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete institution <b>%1</b> ?").arg(institution.name()))) == KMessageBox::No) return; MyMoneyFileTransaction ft; @@ -2221,11 +2221,11 @@ void KMyMoney2App::slotInstitutionDelete(void) file->removeInstitution(institution); ft.commit(); } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to delete institution: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to delete institution: %1").arg(e->what())); delete e; } } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to delete institution: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to delete institution: %1").arg(e->what())); delete e; } } @@ -2278,7 +2278,7 @@ const MyMoneyAccount& KMyMoney2App::findAccount(const MyMoneyAccount& acc, const } } } catch (MyMoneyException *e) { - KMessageBox::error(0, i18n("Unable to find account: %1").tqarg(e->what())); + KMessageBox::error(0, i18n("Unable to find account: %1").arg(e->what())); delete e; } return nullAccount; @@ -2325,8 +2325,8 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par "Please click Yes to change the opening balance to %1,\n" "Please click No to leave the amount as %2,\n" "Please click Cancel to abort the account creation.") - .tqarg((-openingBal).formatMoney(newAccount, sec)) - .tqarg(openingBal.formatMoney(newAccount, sec)); + .arg((-openingBal).formatMoney(newAccount, sec)) + .arg(openingBal.formatMoney(newAccount, sec)); int ans = KMessageBox::questionYesNoCancel(this, message); if (ans == KMessageBox::Yes) { @@ -2384,7 +2384,7 @@ void KMyMoney2App::createAccount(MyMoneyAccount& newAccount, MyMoneyAccount& par } catch (MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to add account: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to add account: %1").arg(e->what())); delete e; } } @@ -2402,7 +2402,7 @@ void KMyMoney2App::slotCategoryNew(const TQString& name, TQString& id) void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount& parent) { if(KMessageBox::questionYesNo(this, - TQString("<qt>%1</qt>").tqarg(i18n("The category <b>%1</b> currently does not exist. Do you want to create it?<p><i>The parent account will default to <b>%2</b> but can be changed in the following dialog</i>.").tqarg(account.name()).tqarg(parent.name())), i18n("Create category"), + TQString("<qt>%1</qt>").arg(i18n("The category <b>%1</b> currently does not exist. Do you want to create it?<p><i>The parent account will default to <b>%2</b> but can be changed in the following dialog</i>.").arg(account.name()).arg(parent.name())), i18n("Create category"), KStdGuiItem::yes(), KStdGuiItem::no(), "CreateNewCategories") == KMessageBox::Yes) { createCategory(account, parent); } else { @@ -2410,8 +2410,8 @@ void KMyMoney2App::slotCategoryNew(MyMoneyAccount& account, const MyMoneyAccount // I have seen in some usability tests. So we just delete it right away. KConfig *kconfig = KGlobal::config(); if(kconfig) { - kconfig->setGroup(TQString::tqfromLatin1("Notification Messages")); - kconfig->deleteEntry(TQString::tqfromLatin1("CreateNewCategories")); + kconfig->setGroup(TQString::fromLatin1("Notification Messages")); + kconfig->deleteEntry(TQString::fromLatin1("CreateNewCategories")); } } } @@ -2461,7 +2461,7 @@ void KMyMoney2App::createCategory(MyMoneyAccount& account, const MyMoneyAccount& void KMyMoney2App::slotAccountNew(void) { MyMoneyAccount acc; - acc.setOpeningDate(TQDate::tqcurrentDate()); + acc.setOpeningDate(TQDate::currentDate()); slotAccountNew(acc); } @@ -2523,7 +2523,7 @@ void KMyMoney2App::slotAccountNew(MyMoneyAccount& account) ft.commit(); account = acc; } catch (MyMoneyException *e) { - KMessageBox::error(this, i18n("Unable to create account: %1").tqarg(e->what())); + KMessageBox::error(this, i18n("Unable to create account: %1").arg(e->what())); } } } @@ -2535,7 +2535,7 @@ void KMyMoney2App::slotInvestmentNew(MyMoneyAccount& account, const MyMoneyAccou TQString dontShowAgain = "CreateNewInvestments"; if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("The security <b>%1</b> currently does not exist as sub-account of <b>%2</b>. " - "Do you want to create it?").tqarg(account.name()).tqarg(parent.name())+TQString("</qt>"), i18n("Create security"), + "Do you want to create it?").arg(account.name()).arg(parent.name())+TQString("</qt>"), i18n("Create security"), KStdGuiItem::yes(), KStdGuiItem::no(), dontShowAgain) == KMessageBox::Yes) { KNewInvestmentWizard dlg; dlg.setName(account.name()); @@ -2569,14 +2569,14 @@ void KMyMoney2App::slotInvestmentEdit(void) void KMyMoney2App::slotInvestmentDelete(void) { - if(KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete the investment <b>%1</b>?").tqarg(m_selectedInvestment.name()), i18n("Delete investment"), KStdGuiItem::yes(), KStdGuiItem::no(), "DeleteInvestment") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to delete the investment <b>%1</b>?").arg(m_selectedInvestment.name()), i18n("Delete investment"), KStdGuiItem::yes(), KStdGuiItem::no(), "DeleteInvestment") == KMessageBox::Yes) { MyMoneyFile* file = MyMoneyFile::instance(); MyMoneyFileTransaction ft; try { file->removeAccount(m_selectedInvestment); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::information(this, i18n("Unable to delete investment: %1").tqarg(e->what())); + KMessageBox::information(this, i18n("Unable to delete investment: %1").arg(e->what())); delete e; } } else { @@ -2584,8 +2584,8 @@ void KMyMoney2App::slotInvestmentDelete(void) // I have seen in some usability tests. So we just delete it right away. KConfig *kconfig = KGlobal::config(); if(kconfig) { - kconfig->setGroup(TQString::tqfromLatin1("Notification Messages")); - kconfig->deleteEntry(TQString::tqfromLatin1("DeleteInvestment")); + kconfig->setGroup(TQString::fromLatin1("Notification Messages")); + kconfig->deleteEntry(TQString::fromLatin1("DeleteInvestment")); } } } @@ -2809,7 +2809,7 @@ void KMyMoney2App::slotAccountDelete(void) slotStatusProgressBar(blist.count(), 0); } } catch(MyMoneyException *e) { - KMessageBox::error( this, i18n("Unable to exchange category <b>%1</b> with category <b>%2</b>. Reason: %3").tqarg(m_selectedAccount.name()).tqarg(newCategory.name()).tqarg(e->what())); + KMessageBox::error( this, i18n("Unable to exchange category <b>%1</b> with category <b>%2</b>. Reason: %3").arg(m_selectedAccount.name()).arg(newCategory.name()).arg(e->what())); delete e; exit = true; } @@ -2830,14 +2830,14 @@ void KMyMoney2App::slotAccountDelete(void) // case A - only a single, unused category without subcats selected if (m_selectedAccount.accountList().isEmpty()) { - if (!needAskUser || (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to delete category <b>%1</b>?").tqarg(m_selectedAccount.name())+TQString("</qt>")) == KMessageBox::Yes)) { + if (!needAskUser || (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to delete category <b>%1</b>?").arg(m_selectedAccount.name())+TQString("</qt>")) == KMessageBox::Yes)) { try { file->removeAccount(m_selectedAccount); m_selectedAccount.clearId(); slotUpdateActions(); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete category <b>%1</b>. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())+TQString("</qt>")); + KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete category <b>%1</b>. Cause: %2").arg(m_selectedAccount.name()).arg(e->what())+TQString("</qt>")); delete e; } } @@ -2851,7 +2851,7 @@ void KMyMoney2App::slotAccountDelete(void) int result = KMessageBox::questionYesNoCancel(this, TQString("<qt>")+ i18n("Do you want to delete category <b>%1</b> with all its sub-categories or only " "the category itself? If you only delete the category itself, all its sub-categories " - "will be made sub-categories of <b>%2</b>.").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())+TQString("</qt>"), + "will be made sub-categories of <b>%2</b>.").arg(m_selectedAccount.name()).arg(parentAccount.name())+TQString("</qt>"), TQString(), KGuiItem(i18n("Delete all")), KGuiItem(i18n("Just the category"))); @@ -2885,7 +2885,7 @@ void KMyMoney2App::slotAccountDelete(void) } if (!accountsToReparent.isEmpty() && need_confirmation) { if (KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Some sub-categories of category <b>%1</b> cannot " - "be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").tqarg(m_selectedAccount.name()).tqarg(parentAccount.name())) != KMessageBox::Yes) { + "be deleted, because they are still used. They will be made sub-categories of <b>%2</b>. Proceed?").arg(m_selectedAccount.name()).arg(parentAccount.name())) != KMessageBox::Yes) { return; // user gets wet feet... } } @@ -2904,7 +2904,7 @@ void KMyMoney2App::slotAccountDelete(void) // the old account list, which is no longer valid m_selectedAccount = file->account(m_selectedAccount.id()); } catch(MyMoneyException* e) { - KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete a sub-category of category <b>%1</b>. Reason: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())+TQString("</qt>")); + KMessageBox::error( this, TQString("<qt>")+i18n("Unable to delete a sub-category of category <b>%1</b>. Reason: %2").arg(m_selectedAccount.name()).arg(e->what())+TQString("</qt>")); delete e; return; } @@ -2916,7 +2916,7 @@ void KMyMoney2App::slotAccountDelete(void) return; // can't delete accounts which still have subaccounts if (KMessageBox::questionYesNo(this, TQString("<p>")+i18n("Do you really want to " - "delete account <b>%1</b>?").tqarg(m_selectedAccount.name())) != KMessageBox::Yes) { + "delete account <b>%1</b>?").arg(m_selectedAccount.name())) != KMessageBox::Yes) { return; // ok, you don't want to? why did you click then, hmm? } } // switch; @@ -2927,7 +2927,7 @@ void KMyMoney2App::slotAccountDelete(void) slotUpdateActions(); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error( this, i18n("Unable to delete account '%1'. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())); + KMessageBox::error( this, i18n("Unable to delete account '%1'. Cause: %2").arg(m_selectedAccount.name()).arg(e->what())); delete e; } } @@ -2943,12 +2943,12 @@ void KMyMoney2App::slotAccountEdit(void) bool category = false; switch(MyMoneyAccount::accountGroup(m_selectedAccount.accountType())) { default: - caption = i18n("Edit account '%1'").tqarg(m_selectedAccount.name()); + caption = i18n("Edit account '%1'").arg(m_selectedAccount.name()); break; case MyMoneyAccount::Expense: case MyMoneyAccount::Income: - caption = i18n("Edit category '%1'").tqarg(m_selectedAccount.name()); + caption = i18n("Edit category '%1'").arg(m_selectedAccount.name()); category = true; break; } @@ -3034,7 +3034,7 @@ void KMyMoney2App::slotAccountEdit(void) slotSelectAccount(file->account(account.id())); } catch(MyMoneyException* e) { - KMessageBox::error( this, i18n("Unable to modify account '%1'. Cause: %2").tqarg(m_selectedAccount.name()).tqarg(e->what())); + KMessageBox::error( this, i18n("Unable to modify account '%1'. Cause: %2").arg(m_selectedAccount.name()).arg(e->what())); delete e; } } @@ -3328,7 +3328,7 @@ bool KMyMoney2App::canCloseAccount(const MyMoneyAccount& acc) const if(!acc.balance().isZero()) return false; - // all tqchildren must be already closed + // all children must be already closed TQStringList::const_iterator it_a; for(it_a = acc.accountList().begin(); it_a != acc.accountList().end(); ++it_a) { MyMoneyAccount a = MyMoneyFile::instance()->account(*it_a); @@ -3405,7 +3405,7 @@ void KMyMoney2App::slotReparentAccount(const MyMoneyAccount& _src, const MyMoney MyMoneyFile::instance()->modifyAccount(src); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to institution <b>%2</b>. Reason: %3").tqarg(src.name()).tqarg(_dst.name()).tqarg(e->what())); + KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to institution <b>%2</b>. Reason: %3").arg(src.name()).arg(_dst.name()).arg(e->what())); delete e; } } @@ -3419,7 +3419,7 @@ void KMyMoney2App::slotReparentAccount(const MyMoneyAccount& _src, const MyMoney MyMoneyFile::instance()->reparentAccount(src, dst); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to <b>%2</b>. Reason: %3").tqarg(src.name()).tqarg(dst.name()).tqarg(e->what())); + KMessageBox::sorry(this, TQString("<p>")+i18n("<b>%1</b> cannot be moved to <b>%2</b>. Reason: %3").arg(src.name()).arg(dst.name()).arg(e->what())); delete e; } } @@ -3434,7 +3434,7 @@ void KMyMoney2App::slotAccountTransactionReport(void) MyMoneyReport::eTQCnumber|MyMoneyReport::eTQCpayee|MyMoneyReport::eTQCcategory, MyMoneyTransactionFilter::yearToDate, MyMoneyReport::eDetailAll, - i18n("%1 YTD Account Transactions").tqarg(m_selectedAccount.name()), + i18n("%1 YTD Account Transactions").arg(m_selectedAccount.name()), i18n("Generated Report") ); report.setGroup(i18n("Transactions")); @@ -3475,7 +3475,7 @@ void KMyMoney2App::slotScheduleNew(const MyMoneyTransaction& _t, MyMoneySchedule ft.commit(); } catch (MyMoneyException *e) { - KMessageBox::error(this, i18n("Unable to add scheduled transaction: %1").tqarg(e->what()), i18n("Add scheduled transaction")); + KMessageBox::error(this, i18n("Unable to add scheduled transaction: %1").arg(e->what()), i18n("Add scheduled transaction")); delete e; } } @@ -3515,7 +3515,7 @@ void KMyMoney2App::slotScheduleEdit(void) // than previous payment. Date would be // updated automatically so we probably // want to clear it. Let's ask the user. - if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered a scheduled transaction date of <b>%1</b>. Because the scheduled transaction was last paid on <b>%2</b>, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").tqarg(KGlobal::locale()->formatDate(next, true)).tqarg(KGlobal::locale()->formatDate(last, true))+TQString("</qt>"),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered a scheduled transaction date of <b>%1</b>. Because the scheduled transaction was last paid on <b>%2</b>, KMyMoney will automatically adjust the scheduled transaction date to the next date unless the last payment date is reset. Do you want to reset the last payment date?").arg(KGlobal::locale()->formatDate(next, true)).arg(KGlobal::locale()->formatDate(last, true))+TQString("</qt>"),i18n("Reset Last Payment Date" ), KStdGuiItem::yes(), KStdGuiItem::no()) == KMessageBox::Yes) { sched.setLastPayment( TQDate() ); } } @@ -3525,7 +3525,7 @@ void KMyMoney2App::slotScheduleEdit(void) deleteTransactionEditor(); ft.commit(); } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } } @@ -3545,7 +3545,7 @@ void KMyMoney2App::slotScheduleEdit(void) MyMoneyFile::instance()->modifyAccount(loan_wiz->account()); ft.commit(); } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } } @@ -3557,7 +3557,7 @@ void KMyMoney2App::slotScheduleEdit(void) } } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unable to modify scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } } @@ -3569,7 +3569,7 @@ void KMyMoney2App::slotScheduleDelete(void) MyMoneyFileTransaction ft; try { MyMoneySchedule sched = MyMoneyFile::instance()->schedule(m_selectedSchedule.id()); - TQString msg = TQString("<p>")+i18n("Are you sure you want to delete the scheduled transaction <b>%1</b>?").tqarg(m_selectedSchedule.name()); + TQString msg = TQString("<p>")+i18n("Are you sure you want to delete the scheduled transaction <b>%1</b>?").arg(m_selectedSchedule.name()); if(sched.type() == MyMoneySchedule::TYPE_LOANPAYMENT) { msg += TQString(" "); msg += i18n("In case of loan payments it is currently not possible to recreate the scheduled transaction."); @@ -3581,7 +3581,7 @@ void KMyMoney2App::slotScheduleDelete(void) ft.commit(); } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unable to remove scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unable to remove scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } } @@ -3595,7 +3595,7 @@ void KMyMoney2App::slotScheduleDuplicate(void) MyMoneySchedule sch = m_selectedSchedule; sch.clearId(); sch.setLastPayment(TQDate()); - sch.setName(i18n("Copy of scheduled transaction name", "Copy of %1").tqarg(sch.name())); + sch.setName(i18n("Copy of scheduled transaction name", "Copy of %1").arg(sch.name())); MyMoneyFileTransaction ft; try { @@ -3607,7 +3607,7 @@ void KMyMoney2App::slotScheduleDuplicate(void) myMoneyView->slotScheduleSelected(sch.id()); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -3621,7 +3621,7 @@ void KMyMoney2App::slotScheduleSkip(void) if(!schedule.isFinished()) { if(schedule.occurence() != MyMoneySchedule::OCCUR_ONCE) { TQDate next = schedule.nextDueDate(); - if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to skip the <b>%1</b> transaction scheduled for <b>%2</b>?").tqarg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString("</qt>"))) == KMessageBox::Yes) { + if(!schedule.isFinished() && (KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("Do you really want to skip the <b>%1</b> transaction scheduled for <b>%2</b>?").arg(schedule.name(), KGlobal::locale()->formatDate(next, true))+TQString("</qt>"))) == KMessageBox::Yes) { MyMoneyFileTransaction ft; schedule.setLastPayment(next); schedule.setNextDueDate(schedule.nextPayment(next)); @@ -3631,7 +3631,7 @@ void KMyMoney2App::slotScheduleSkip(void) } } } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, TQString("<qt>")+i18n("Unable to skip scheduled transaction <b>%1</b>.").tqarg(m_selectedSchedule.name())+TQString("</qt>"), e->what()); + KMessageBox::detailedSorry(this, TQString("<qt>")+i18n("Unable to skip scheduled transaction <b>%1</b>.").arg(m_selectedSchedule.name())+TQString("</qt>"), e->what()); delete e; } } @@ -3644,7 +3644,7 @@ void KMyMoney2App::slotScheduleEnter(void) MyMoneySchedule schedule = MyMoneyFile::instance()->schedule(m_selectedSchedule.id()); enterSchedule(schedule); } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unknown scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unknown scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } } @@ -3751,14 +3751,14 @@ KMyMoneyUtils::EnterScheduleResultCodeE KMyMoney2App::enterSchedule(MyMoneySched ft.commit(); } } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } deleteTransactionEditor(); } } } catch (MyMoneyException *e) { - KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").tqarg(m_selectedSchedule.name()), e->what()); + KMessageBox::detailedSorry(this, i18n("Unable to enter scheduled transaction '%1'").arg(m_selectedSchedule.name()), e->what()); delete e; } } @@ -3771,15 +3771,15 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id) if(newnameBase != i18n("New Payee")) { // Ask the user if that is what he intended to do? - TQString msg = TQString("<qt>") + i18n("Do you want to add <b>%1</b> as payer/receiver ?").tqarg(newnameBase) + TQString("</qt>"); - const TQString dontAskAgain = TQString::tqfromLatin1("NewPayee"); + TQString msg = TQString("<qt>") + i18n("Do you want to add <b>%1</b> as payer/receiver ?").arg(newnameBase) + TQString("</qt>"); + const TQString dontAskAgain = TQString::fromLatin1("NewPayee"); if(KMessageBox::questionYesNo(this, msg, i18n("New payee/receiver"), KStdGuiItem::yes(), KStdGuiItem::no(), dontAskAgain) == KMessageBox::No) { doit = false; // we should not keep the 'no' setting because that can confuse people like // I have seen in some usability tests. So we just delete it right away. KConfig *kconfig = KGlobal::config(); if(kconfig) { - kconfig->setGroup(TQString::tqfromLatin1("Notification Messages")); + kconfig->setGroup(TQString::fromLatin1("Notification Messages")); kconfig->deleteEntry(dontAskAgain); } } @@ -3794,7 +3794,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id) for(;;) { try { MyMoneyFile::instance()->payeeByName(newname); - newname = TQString("%1 [%2]").tqarg(newnameBase).tqarg(++count); + newname = TQString("%1 [%2]").arg(newnameBase).arg(++count); } catch(MyMoneyException* e) { delete e; break; @@ -3808,7 +3808,7 @@ void KMyMoney2App::slotPayeeNew(const TQString& newnameBase, TQString& id) ft.commit(); } catch (MyMoneyException *e) { KMessageBox::detailedSorry(this, i18n("Unable to add payee"), - TQString("%1 thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + TQString("%1 thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -3860,7 +3860,7 @@ void KMyMoney2App::slotPayeeDelete(void) // get confirmation from user TQString prompt; if (m_selectedPayees.size() == 1) - prompt = TQString("<p>")+i18n("Do you really want to remove the payee <b>%1</b>?").tqarg(m_selectedPayees.front().name()); + prompt = TQString("<p>")+i18n("Do you really want to remove the payee <b>%1</b>?").arg(m_selectedPayees.front().name()); else prompt = i18n("Do you really want to remove all selected payees?"); @@ -3960,7 +3960,7 @@ void KMyMoney2App::slotPayeeDelete(void) } // for - Schedules } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to reassign payee of transaction/split"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } // if !translist.isEmpty() @@ -4017,7 +4017,7 @@ void KMyMoney2App::slotPayeeDelete(void) } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to remove payee(s)"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } @@ -4033,7 +4033,7 @@ void KMyMoney2App::slotCurrencyNew(void) MyMoneyFile::instance()->addCurrency(currency); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::sorry(this, i18n("Cannot create new currency. %1").tqarg(e->what()), i18n("New currency")); + KMessageBox::sorry(this, i18n("Cannot create new currency. %1").arg(e->what()), i18n("New currency")); delete e; } emit currencyCreated(id); @@ -4055,12 +4055,12 @@ void KMyMoney2App::slotCurrencyRename(TQListViewItem* item, int, const TQString& m_selectedCurrency = currency; ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::sorry(this, i18n("Cannot rename currency. %1").tqarg(e->what()), i18n("Rename currency")); + KMessageBox::sorry(this, i18n("Cannot rename currency. %1").arg(e->what()), i18n("Rename currency")); delete e; } } } catch(MyMoneyException *e) { - KMessageBox::sorry(this, i18n("Cannot rename currency. %1").tqarg(e->what()), i18n("Rename currency")); + KMessageBox::sorry(this, i18n("Cannot rename currency. %1").arg(e->what()), i18n("Rename currency")); delete e; } } @@ -4073,7 +4073,7 @@ void KMyMoney2App::slotCurrencyDelete(void) MyMoneyFile::instance()->removeCurrency(m_selectedCurrency); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::sorry(this, i18n("Cannot delete currency %1. %2").tqarg(m_selectedCurrency.name()).tqarg(e->what()), i18n("Delete currency")); + KMessageBox::sorry(this, i18n("Cannot delete currency %1. %2").arg(m_selectedCurrency.name()).arg(e->what()), i18n("Delete currency")); delete e; } } @@ -4088,7 +4088,7 @@ void KMyMoney2App::slotCurrencySetBase(void) MyMoneyFile::instance()->setBaseCurrency(m_selectedCurrency); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").tqarg(m_selectedCurrency.name()).tqarg(e->what()), i18n("Set base currency")); + KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").arg(m_selectedCurrency.name()).arg(e->what()), i18n("Set base currency")); delete e; } } @@ -4097,9 +4097,9 @@ void KMyMoney2App::slotCurrencySetBase(void) void KMyMoney2App::slotBudgetNew(void) { - TQDate date = TQDate::tqcurrentDate(Qt::LocalTime); + TQDate date = TQDate::currentDate(Qt::LocalTime); date.setYMD(date.year(), 1, 1); - TQString newname = i18n("Budget %1").tqarg(TQString::number(date.year())); + TQString newname = i18n("Budget %1").arg(TQString::number(date.year())); MyMoneyBudget budget; @@ -4109,7 +4109,7 @@ void KMyMoney2App::slotBudgetNew(void) // Exception thrown when the name is not found while (1) { MyMoneyFile::instance()->budgetByName(newname); - newname = i18n("Budget %1 (%2)").tqarg(TQString::number(date.year()), TQString::number(i++)); + newname = i18n("Budget %1 (%2)").arg(TQString::number(date.year()), TQString::number(i++)); } } catch(MyMoneyException *e) { // all ok, the name is unique @@ -4124,7 +4124,7 @@ void KMyMoney2App::slotBudgetNew(void) MyMoneyFile::instance()->addBudget(budget); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4139,7 +4139,7 @@ void KMyMoney2App::slotBudgetDelete(void) // get confirmation from user TQString prompt; if (m_selectedBudgets.size() == 1) - prompt = TQString("<p>")+i18n("Do you really want to remove the budget <b>%1</b>?").tqarg(m_selectedBudgets.front().name()); + prompt = TQString("<p>")+i18n("Do you really want to remove the budget <b>%1</b>?").arg(m_selectedBudgets.front().name()); else prompt = i18n("Do you really want to remove all selected budgets?"); @@ -4156,7 +4156,7 @@ void KMyMoney2App::slotBudgetDelete(void) ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to remove budget: %1, thrown in %2:%3"). tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to remove budget: %1, thrown in %2:%3"). arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4168,12 +4168,12 @@ void KMyMoney2App::slotBudgetCopy(void) try { MyMoneyBudget budget = m_selectedBudgets[0]; budget.clearId(); - budget.setName(i18n("Copy of %1").tqarg(budget.name())); + budget.setName(i18n("Copy of %1").arg(budget.name())); MyMoneyFile::instance()->addBudget(budget); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to add budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4186,8 +4186,8 @@ void KMyMoney2App::slotBudgetChangeYear(void) int current = 0; bool haveCurrent = false; MyMoneyBudget budget = *(m_selectedBudgets.begin()); - for(int i = (TQDate::tqcurrentDate().year()-3); i < (TQDate::tqcurrentDate().year()+5); ++i) { - years << TQString("%1").tqarg(i); + for(int i = (TQDate::currentDate().year()-3); i < (TQDate::currentDate().year()+5); ++i) { + years << TQString("%1").arg(i); if(i == budget.budgetStart().year()) { haveCurrent = true; } @@ -4210,7 +4210,7 @@ void KMyMoney2App::slotBudgetChangeYear(void) MyMoneyFile::instance()->modifyBudget(budget); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3"). tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3"). arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4248,7 +4248,7 @@ void KMyMoney2App::slotBudgetForecast(void) ft.commit(); } } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4308,7 +4308,7 @@ void KMyMoney2App::slotNewFeature(void) ft.commit(); } } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify budget: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4337,7 +4337,7 @@ void KMyMoney2App::slotTransactionsDelete(void) if(m_selectedTransactions.count() == 1) { msg = i18n("Do you really want to delete the selected transaction?"); } else { - msg = i18n("Do you really want to delete all %1 selected transactions?").tqarg(m_selectedTransactions.count()); + msg = i18n("Do you really want to delete all %1 selected transactions?").arg(m_selectedTransactions.count()); } if(KMessageBox::questionYesNo(this, msg, i18n("Delete transaction")) == KMessageBox::Yes) { KMSTATUS(i18n("Deleting transactions")); @@ -4373,7 +4373,7 @@ void KMyMoney2App::slotTransactionDuplicate(void) t.setEntryDate(TQDate()); t.clearId(); // and set the post date to today - t.setPostDate(TQDate::tqcurrentDate()); + t.setPostDate(TQDate::currentDate()); MyMoneyFile::instance()->addTransaction(t); lt = t; @@ -4386,7 +4386,7 @@ void KMyMoney2App::slotTransactionDuplicate(void) myMoneyView->slotLedgerSelected(m_selectedAccount.id(), lt.id()); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to duplicate transaction(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } // switch off the progress bar @@ -4412,7 +4412,7 @@ void KMyMoney2App::doDeleteTransactions(void) } ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to delete transaction(s): %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to delete transaction(s): %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } slotStatusProgressBar(-1, -1); @@ -4496,7 +4496,7 @@ void KMyMoney2App::slotTransactionsEditSplits(void) m_transactionEditor->enterTransactions(id); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4666,7 +4666,7 @@ void KMyMoney2App::markTransaction(MyMoneySplit::reconcileFlagE flag) slotStatusProgressBar(-1, -1); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to modify transaction: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -4711,7 +4711,7 @@ void KMyMoney2App::slotTransactionsAccept(void) slotStatusProgressBar(-1, -1); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to accept transaction: %1, thrown in %2:%3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + KMessageBox::detailedSorry(0, i18n("Error"), i18n("Unable to accept transaction: %1, thrown in %2:%3").arg(e->what()).arg(e->file()).arg(e->line())); delete e; } } @@ -5113,7 +5113,7 @@ void KMyMoney2App::updateCaption(bool skipActions) } #if KMM_DEBUG - caption += TQString(" (%1 x %2)").tqarg(width()).tqarg(height()); + caption += TQString(" (%1 x %2)").arg(width()).arg(height()); #endif caption = kapp->makeStdCaption(caption, false, modified); @@ -5567,7 +5567,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa m_payeeGoto = payee.id(); TQString name = payee.name(); name.replace(TQRegExp("&(?!&)"), "&&"); - action("transaction_goto_payee")->setText(i18n("Goto '%1'").tqarg(name)); + action("transaction_goto_payee")->setText(i18n("Goto '%1'").arg(name)); } } catch(MyMoneyException *e) { delete e; @@ -5589,7 +5589,7 @@ void KMyMoney2App::slotSelectTransactions(const KMyMoneyRegister::SelectedTransa m_accountGoto = acc.id(); TQString name = acc.name(); name.replace(TQRegExp("&(?!&)"), "&&"); - action("transaction_goto_account")->setText(i18n("Goto '%1'").tqarg(name)); + action("transaction_goto_account")->setText(i18n("Goto '%1'").arg(name)); break; } } @@ -5706,7 +5706,7 @@ void KMyMoney2App::slotFileConsitencyCheck(void) msg = MyMoneyFile::instance()->consistencyCheck(); ft.commit(); } catch(MyMoneyException *e) { - msg = i18n("Consistency check failed: %1").tqarg(e->what()); + msg = i18n("Consistency check failed: %1").arg(e->what()); delete e; } @@ -5721,7 +5721,7 @@ void KMyMoney2App::slotCheckSchedules(void) KMSTATUS(i18n("Checking for overdue scheduled transactions...")); MyMoneyFile *file = MyMoneyFile::instance(); - TQDate checkDate = TQDate::tqcurrentDate().addDays(KMyMoneyGlobalSettings::checkSchedulePreview()); + TQDate checkDate = TQDate::currentDate().addDays(KMyMoneyGlobalSettings::checkSchedulePreview()); TQValueList<MyMoneySchedule> scheduleList = file->scheduleList(); TQValueList<MyMoneySchedule>::Iterator it; @@ -5875,7 +5875,7 @@ void KMyMoney2App::webConnect(const TQString& url, const TQCString& asn_id) TQValueList<MyMoneyStatement> statements; if (!(*it_plugin)->import(url) ) { - KMessageBox::error( this, i18n("Unable to import %1 using %2 plugin. The plugin returned the following error: %3").tqarg(url,(*it_plugin)->formatName(),(*it_plugin)->lastError()), i18n("Importing error")); + KMessageBox::error( this, i18n("Unable to import %1 using %2 plugin. The plugin returned the following error: %3").arg(url,(*it_plugin)->formatName(),(*it_plugin)->lastError()), i18n("Importing error")); } break; @@ -5987,7 +5987,7 @@ void KMyMoney2App::slotAutoSave(void) void KMyMoney2App::slotDateChanged(void) { - TQDateTime dt = TQDateTime::tqcurrentDateTime(); + TQDateTime dt = TQDateTime::currentDateTime(); TQDateTime nextDay( TQDate(dt.date().addDays(1)), TQTime(0, 0, 0) ); TQTimer::singleShot(dt.secsTo(nextDay)*1000, TQT_TQOBJECT(this), TQT_SLOT(slotDateChanged())); @@ -6029,7 +6029,7 @@ void KMyMoney2App::setAccountOnlineParameters(const MyMoneyAccount& _acc, const ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::detailedSorry(0, i18n("Unable to setup online parameters for account ''%1'").tqarg(_acc.name()), e->what() ); + KMessageBox::detailedSorry(0, i18n("Unable to setup online parameters for account ''%1'").arg(_acc.name()), e->what() ); delete e; } } @@ -6044,7 +6044,7 @@ void KMyMoney2App::slotAccountUnmapOnline(void) if(m_selectedAccount.onlineBankingSettings().value("provider").isEmpty()) return; - if(KMessageBox::warningYesNo(this, TQString("<qt>%1</qt>").tqarg(i18n("Do you really want to remove the mapping of account <b>%1</b> to an online account? Depending on the details of the online banking method used, this action cannot be reverted.").tqarg(m_selectedAccount.name())), i18n("Remove mapping to online account")) == KMessageBox::Yes) { + if(KMessageBox::warningYesNo(this, TQString("<qt>%1</qt>").arg(i18n("Do you really want to remove the mapping of account <b>%1</b> to an online account? Depending on the details of the online banking method used, this action cannot be reverted.").arg(m_selectedAccount.name())), i18n("Remove mapping to online account")) == KMessageBox::Yes) { MyMoneyFileTransaction ft; try { m_selectedAccount.setOnlineBankingSettings(MyMoneyKeyValueContainer()); @@ -6055,7 +6055,7 @@ void KMyMoney2App::slotAccountUnmapOnline(void) MyMoneyFile::instance()->modifyAccount(m_selectedAccount); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error(this, i18n("Unable to unmap account from online account: %1").tqarg(e->what())); + KMessageBox::error(this, i18n("Unable to unmap account from online account: %1").arg(e->what())); delete e; } } @@ -6121,7 +6121,7 @@ void KMyMoney2App::slotAccountMapOnline(void) MyMoneyFile::instance()->modifyAccount(acc); ft.commit(); } catch(MyMoneyException* e) { - KMessageBox::error(this, i18n("Unable to map account to online account: %1").tqarg(e->what())); + KMessageBox::error(this, i18n("Unable to map account to online account: %1").arg(e->what())); delete e; } } @@ -6184,12 +6184,12 @@ void KMyMoney2App::slotAccountUpdateOnline(void) } } -KMtqStatus::KMtqStatus (const TQString &text) +KMStatus::KMStatus (const TQString &text) { m_prevText = kmymoney2->slotStatusMsg(text); } -KMtqStatus::~KMtqStatus() +KMStatus::~KMStatus() { kmymoney2->slotStatusMsg(m_prevText); } @@ -6199,7 +6199,7 @@ void KMyMoney2App::Private::unlinkStatementXML(void) TQDir d("/home/thb", "kmm-statement*"); for(int i=0; i < d.count(); ++i) { qDebug("Remove %s", d[i].data()); - d.remove(TQString("/home/thb/%1").tqarg(d[i])); + d.remove(TQString("/home/thb/%1").arg(d[i])); } statementXMLindex = 0; } diff --git a/kmymoney2/kmymoney2.h b/kmymoney2/kmymoney2.h index d7f9b15..df1a5dc 100644 --- a/kmymoney2/kmymoney2.h +++ b/kmymoney2/kmymoney2.h @@ -559,7 +559,7 @@ k_dcop: // TQValueList<MyMoneyAccount> accountList() const; protected: - /** save general Options like all bar positions and status as well as the tqgeometry and the recent file list to the configuration + /** save general Options like all bar positions and status as well as the geometry and the recent file list to the configuration * file */ void saveOptions(void); @@ -617,7 +617,7 @@ protected: * can be closed if: * * - the balance is zero and - * - all tqchildren are already closed and + * - all children are already closed and * - there is no unfinished schedule referencing the account * * @param acc reference to MyMoneyAccount object in question @@ -1293,15 +1293,15 @@ private: extern KMyMoney2App *kmymoney2; -class KMtqStatus +class KMStatus { public: - KMtqStatus (const TQString &text); - ~KMtqStatus(); + KMStatus (const TQString &text); + ~KMStatus(); private: TQString m_prevText; }; -#define KMSTATUS(msg) KMtqStatus _thistqStatus(msg) +#define KMSTATUS(msg) KMStatus _thisStatus(msg) #endif // KMYMONEY2_H diff --git a/kmymoney2/kmymoneyglobalsettings.cpp b/kmymoney2/kmymoneyglobalsettings.cpp index 9e205f8..32eb887 100644 --- a/kmymoney2/kmymoneyglobalsettings.cpp +++ b/kmymoney2/kmymoneyglobalsettings.cpp @@ -77,7 +77,7 @@ TQStringList KMyMoneyGlobalSettings::itemList(void) TQStringList::iterator it_s; for(it_s = all.begin(); it_s != all.end(); ++it_s) { exp.search(*it_s); - if(!list.contains(exp.cap(1)) && !list.contains(TQString("-%1").tqarg(exp.cap(1)))) { + if(!list.contains(exp.cap(1)) && !list.contains(TQString("-%1").arg(exp.cap(1)))) { list << *it_s; } } diff --git a/kmymoney2/kmymoneyutils.cpp b/kmymoney2/kmymoneyutils.cpp index 4fae4e1..4516413 100644 --- a/kmymoney2/kmymoneyutils.cpp +++ b/kmymoney2/kmymoneyutils.cpp @@ -266,9 +266,9 @@ TQString KMyMoneyUtils::variableCSS(void) TQString css; css += "<style type=\"text/css\">\n<!--\n"; css += TQString(".row-even, .item0 { background-color: %1; color: %2 }\n") - .tqarg((KMyMoneyGlobalSettings::listBGColor()).name()).tqarg(tcolor.name()); + .arg((KMyMoneyGlobalSettings::listBGColor()).name()).arg(tcolor.name()); css += TQString(".row-odd, .item1 { background-color: %1; color: %2 }\n") - .tqarg((KMyMoneyGlobalSettings::listColor()).name()).tqarg(tcolor.name()); + .arg((KMyMoneyGlobalSettings::listColor()).name()).arg(tcolor.name()); css += "-->\n</style>\n"; return css; } @@ -286,18 +286,18 @@ TQString KMyMoneyUtils::findResource(const char* type, const TQString& filename) } // search the given resource - mask = filename.tqarg("_%1.%2"); - rc = KGlobal::dirs()->findResource(type, mask.tqarg(country).tqarg(language)); + mask = filename.arg("_%1.%2"); + rc = KGlobal::dirs()->findResource(type, mask.arg(country).arg(language)); if(rc.isEmpty()) { - mask = filename.tqarg("_%1"); - rc = KGlobal::dirs()->findResource(type, mask.tqarg(language)); + mask = filename.arg("_%1"); + rc = KGlobal::dirs()->findResource(type, mask.arg(language)); } if(rc.isEmpty()) { - // qDebug(TQString("html/home_%1.html not found").tqarg(country).latin1()); - rc = KGlobal::dirs()->findResource(type, mask.tqarg(country)); + // qDebug(TQString("html/home_%1.html not found").arg(country).latin1()); + rc = KGlobal::dirs()->findResource(type, mask.arg(country)); } if(rc.isEmpty()) { - rc = KGlobal::dirs()->findResource(type, filename.tqarg("")); + rc = KGlobal::dirs()->findResource(type, filename.arg("")); } if(rc.isEmpty()) { @@ -374,7 +374,7 @@ TQString KMyMoneyUtils::nextCheckNumber(const MyMoneyAccount& acc) TQString number; TQRegExp exp(TQString("(.*\\D)?(\\d+)(\\D.*)?")); if(exp.search(acc.value("lastNumberUsed")) != -1) { - number = TQString("%1%2%3").tqarg(exp.cap(1)).tqarg(exp.cap(2).toULongLong() + 1).tqarg(exp.cap(3)); + number = TQString("%1%2%3").arg(exp.cap(1)).arg(exp.cap(2).toULongLong() + 1).arg(exp.cap(3)); } else { number = "1"; } diff --git a/kmymoney2/kstartuplogo.cpp b/kmymoney2/kstartuplogo.cpp index a0d8ac6..b22f0e4 100644 --- a/kmymoney2/kstartuplogo.cpp +++ b/kmymoney2/kstartuplogo.cpp @@ -57,13 +57,13 @@ KStartupSplash::~KStartupSplash() delete d; } -void KStartupSplash::message( const TQString &message, int tqalignment, const TQColor &color) +void KStartupSplash::message( const TQString &message, int alignment, const TQColor &color) { d->message = message; - d->align = tqalignment; + d->align = alignment; d->color = color; // the next line causes the base class signal management to happen - // and also forces a tqrepaint + // and also forces a repaint KSplashScreen::clear(); } @@ -100,7 +100,7 @@ KStartupLogo::KStartupLogo() : splash->message(i18n("Loading..."), AlignLeft, white); splash->show(); - splash->tqrepaint(); + splash->repaint(); m_splash = splash; } } diff --git a/kmymoney2/kstartuplogo.h b/kmymoney2/kstartuplogo.h index 0f340f9..421854b 100644 --- a/kmymoney2/kstartuplogo.h +++ b/kmymoney2/kstartuplogo.h @@ -38,7 +38,7 @@ class KStartupSplash : public KSplashScreen public: KStartupSplash(const TQPixmap &pixmap, WFlags f = 0); ~KStartupSplash(); - void message( const TQString &message, int tqalignment = AlignLeft, const TQColor &color = black); + void message( const TQString &message, int alignment = AlignLeft, const TQColor &color = black); protected: void drawContents(TQPainter *p); diff --git a/kmymoney2/main.cpp b/kmymoney2/main.cpp index 79d731c..63f8ce4 100644 --- a/kmymoney2/main.cpp +++ b/kmymoney2/main.cpp @@ -287,7 +287,7 @@ int main(int argc, char *argv[]) } while(0); } catch(MyMoneyException *e) { KMessageBox::detailedError(0, i18n("Uncaught error. Please report the details to the developers"), - TQString("%1 in file %2 line %3").tqarg(e->what()).tqarg(e->file()).tqarg(e->line())); + TQString("%1 in file %2 line %3").arg(e->what()).arg(e->file()).arg(e->line())); throw e; } diff --git a/kmymoney2/mymoney/mymoneyaccount.cpp b/kmymoney2/mymoney/mymoneyaccount.cpp index 5d74e62..6ef1f9c 100644 --- a/kmymoney2/mymoney/mymoneyaccount.cpp +++ b/kmymoney2/mymoney/mymoneyaccount.cpp @@ -98,7 +98,7 @@ MyMoneyAccount::MyMoneyAccount(const TQDomElement& node) : if(node.hasAttribute("openingbalance")) { if(!MyMoneyMoney(node.attribute("openingbalance")).isZero()) { - TQString msg = i18n("Account %1 contains an opening balance. Please use a KMyMoney version >= 0.8 and < 0.9 to correct the problem.").tqarg(m_name); + TQString msg = i18n("Account %1 contains an opening balance. Please use a KMyMoney version >= 0.8 and < 0.9 to correct the problem.").arg(m_name); throw new MYMONEYEXCEPTION(msg); } } @@ -467,7 +467,7 @@ bool MyMoneyAccountLoan::hasReferenceTo(const TQString& id) const void MyMoneyAccountLoan::setInterestCompounding(int frequency) { - setValue("compoundingFrequency", TQString("%1").tqarg(frequency)); + setValue("compoundingFrequency", TQString("%1").arg(frequency)); } int MyMoneyAccountLoan::interestCompounding(void) const @@ -594,7 +594,7 @@ bool MyMoneyAccount::isCategory(void) const TQString MyMoneyAccount::brokerageName(void) const { if(m_accountType == Investment) - return TQString("%1 (%2)").tqarg(m_name, i18n("Brokerage (suffix for account names)", "Brokerage")); + return TQString("%1 (%2)").arg(m_name, i18n("Brokerage (suffix for account names)", "Brokerage")); return m_name; } diff --git a/kmymoney2/mymoney/mymoneyaccount.h b/kmymoney2/mymoney/mymoneyaccount.h index 968cadb..8ab368c 100644 --- a/kmymoney2/mymoney/mymoneyaccount.h +++ b/kmymoney2/mymoney/mymoneyaccount.h @@ -342,7 +342,7 @@ public: /** * This method is used to update m_lastModified to the current date */ - void touch(void) { setLastModified(TQDate::tqcurrentDate()); } + void touch(void) { setLastModified(TQDate::currentDate()); } /** * This method returns the type of the account. diff --git a/kmymoney2/mymoney/mymoneyaccounttest.cpp b/kmymoney2/mymoney/mymoneyaccounttest.cpp index a7c55af..12ea7f1 100644 --- a/kmymoney2/mymoney/mymoneyaccounttest.cpp +++ b/kmymoney2/mymoney/mymoneyaccounttest.cpp @@ -49,8 +49,8 @@ void MyMoneyAccountTest::testConstructor() { MyMoneyAccount r; MyMoneySplit s; r.setAccountType(MyMoneyAccount::Asset); - r.setOpeningDate(TQDate::tqcurrentDate()); - r.setLastModified(TQDate::tqcurrentDate()); + r.setOpeningDate(TQDate::currentDate()); + r.setLastModified(TQDate::currentDate()); r.setDescription("Desc"); r.setNumber("465500"); r.setParentAccountId(parent); @@ -65,8 +65,8 @@ void MyMoneyAccountTest::testConstructor() { CPPUNIT_ASSERT(a.id() == id); CPPUNIT_ASSERT(a.institutionId().isEmpty()); CPPUNIT_ASSERT(a.accountType() == MyMoneyAccount::Asset); - CPPUNIT_ASSERT(a.openingDate() == TQDate::tqcurrentDate()); - CPPUNIT_ASSERT(a.lastModified() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(a.openingDate() == TQDate::currentDate()); + CPPUNIT_ASSERT(a.lastModified() == TQDate::currentDate()); CPPUNIT_ASSERT(a.number() == "465500"); CPPUNIT_ASSERT(a.description() == "Desc"); CPPUNIT_ASSERT(a.accountList().count() == 0); @@ -82,7 +82,7 @@ void MyMoneyAccountTest::testConstructor() { void MyMoneyAccountTest::testSetFunctions() { MyMoneyAccount a; - TQDate today(TQDate::tqcurrentDate()); + TQDate today(TQDate::currentDate()); CPPUNIT_ASSERT(a.name().isEmpty()); CPPUNIT_ASSERT(a.lastModified() == TQDate()); CPPUNIT_ASSERT(a.description().isEmpty()); @@ -108,8 +108,8 @@ void MyMoneyAccountTest::testCopyConstructor() { TQString parent = "ParentAccount"; MyMoneyAccount r; r.setAccountType(MyMoneyAccount::Expense); - r.setOpeningDate(TQDate::tqcurrentDate()); - r.setLastModified(TQDate::tqcurrentDate()); + r.setOpeningDate(TQDate::currentDate()); + r.setLastModified(TQDate::currentDate()); r.setName("Account"); r.setInstitutionId("Inst1"); r.setDescription("Desc1"); @@ -125,8 +125,8 @@ void MyMoneyAccountTest::testCopyConstructor() { CPPUNIT_ASSERT(b.name() == "Account"); CPPUNIT_ASSERT(b.institutionId() == institutionid); CPPUNIT_ASSERT(b.accountType() == MyMoneyAccount::Expense); - CPPUNIT_ASSERT(b.lastModified() == TQDate::tqcurrentDate()); - CPPUNIT_ASSERT(b.openingDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(b.lastModified() == TQDate::currentDate()); + CPPUNIT_ASSERT(b.openingDate() == TQDate::currentDate()); CPPUNIT_ASSERT(b.description() == "Desc1"); CPPUNIT_ASSERT(b.number() == "Number"); CPPUNIT_ASSERT(b.parentAccountId() == "ParentAccount"); @@ -146,7 +146,7 @@ void MyMoneyAccountTest::testAssignmentConstructor() { MyMoneyAccount b; - b.setLastModified(TQDate::tqcurrentDate()); + b.setLastModified(TQDate::currentDate()); b = a; @@ -199,13 +199,13 @@ void MyMoneyAccountTest::testEquality() { MyMoneyAccount a; - a.setLastModified(TQDate::tqcurrentDate()); + a.setLastModified(TQDate::currentDate()); a.setName("Name"); a.setNumber("Number"); a.setDescription("Desc"); a.setInstitutionId("I-ID"); - a.setOpeningDate(TQDate::tqcurrentDate()); - a.setLastReconciliationDate(TQDate::tqcurrentDate()); + a.setOpeningDate(TQDate::currentDate()); + a.setLastReconciliationDate(TQDate::currentDate()); a.setAccountType(MyMoneyAccount::Asset); a.setParentAccountId("P-ID"); a.setId("A-ID"); @@ -221,7 +221,7 @@ void MyMoneyAccountTest::testEquality() CPPUNIT_ASSERT(!(b == a)); b = a; - a.setLastModified(TQDate::tqcurrentDate().addDays(-1)); + a.setLastModified(TQDate::currentDate().addDays(-1)); CPPUNIT_ASSERT(!(b == a)); b = a; @@ -237,11 +237,11 @@ void MyMoneyAccountTest::testEquality() CPPUNIT_ASSERT(!(b == a)); b = a; - a.setOpeningDate(TQDate::tqcurrentDate().addDays(-1)); + a.setOpeningDate(TQDate::currentDate().addDays(-1)); CPPUNIT_ASSERT(!(b == a)); b = a; - a.setLastReconciliationDate(TQDate::tqcurrentDate().addDays(-1)); + a.setLastReconciliationDate(TQDate::currentDate().addDays(-1)); CPPUNIT_ASSERT(!(b == a)); b = a; @@ -278,8 +278,8 @@ void MyMoneyAccountTest::testWriteXML() { MyMoneyAccount r; r.setAccountType(MyMoneyAccount::Asset); - r.setOpeningDate(TQDate::tqcurrentDate()); - r.setLastModified(TQDate::tqcurrentDate()); + r.setOpeningDate(TQDate::currentDate()); + r.setLastModified(TQDate::currentDate()); r.setDescription("Desc"); r.setName("AccountName"); r.setNumber("465500"); @@ -309,7 +309,7 @@ void MyMoneyAccountTest::testWriteXML() { " </KEYVALUEPAIRS>\n" " </ACCOUNT>\n" "</ACCOUNT-CONTAINER>\n"). - arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate)); CPPUNIT_ASSERT(doc.toString() == ref); } @@ -330,7 +330,7 @@ void MyMoneyAccountTest::testReadXML() { " </KEYVALUEPAIRS>\n" " </ACCOUNT>\n" "</ACCOUNT-CONTAINER>\n"). - arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate)); TQString ref_false = TQString( "<!DOCTYPE TEST>\n" @@ -346,7 +346,7 @@ void MyMoneyAccountTest::testReadXML() { " </KEYVALUEPAIRS>\n" " </KACCOUNT>\n" "</ACCOUNT-CONTAINER>\n"). - arg(TQDate::tqcurrentDate().toString(Qt::ISODate)).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + arg(TQDate::currentDate().toString(Qt::ISODate)).arg(TQDate::currentDate().toString(Qt::ISODate)); TQDomDocument doc; TQDomElement node; @@ -371,11 +371,11 @@ void MyMoneyAccountTest::testReadXML() { CPPUNIT_ASSERT(a.id() == "A000001"); CPPUNIT_ASSERT(a.m_name == "AccountName"); CPPUNIT_ASSERT(a.m_parentAccount == "Parent"); - CPPUNIT_ASSERT(a.m_lastModified == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(a.m_lastModified == TQDate::currentDate()); CPPUNIT_ASSERT(a.m_lastReconciliationDate == TQDate()); CPPUNIT_ASSERT(a.m_institution == "B000001"); CPPUNIT_ASSERT(a.m_number == "465500"); - CPPUNIT_ASSERT(a.m_openingDate == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(a.m_openingDate == TQDate::currentDate()); CPPUNIT_ASSERT(a.m_accountType == MyMoneyAccount::Asset); CPPUNIT_ASSERT(a.m_description == "Desc"); CPPUNIT_ASSERT(a.accountList().count() == 2); diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp index c36c163..4809b28 100644 --- a/kmymoney2/mymoney/mymoneyfile.cpp +++ b/kmymoney2/mymoney/mymoneyfile.cpp @@ -146,7 +146,7 @@ void MyMoneyFile::checkTransaction(const char* txt) const { checkStorage(); if(!d->m_inTransaction) { - throw new MYMONEYEXCEPTION(TQString("No transaction started for %1").tqarg(txt)); + throw new MYMONEYEXCEPTION(TQString("No transaction started for %1").arg(txt)); } } @@ -605,7 +605,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& parent) throw new MYMONEYEXCEPTION("Stock account must have investment account as parent "); if(!account.isInvest() && parent.accountType() == MyMoneyAccount::Investment) - throw new MYMONEYEXCEPTION("Investment account can only have stock accounts as tqchildren"); + throw new MYMONEYEXCEPTION("Investment account can only have stock accounts as children"); // clear all changed objects from cache MyMoneyNotifier notifier(this); @@ -619,7 +619,7 @@ void MyMoneyFile::addAccount(MyMoneyAccount& account, MyMoneyAccount& parent) if(!account.openingDate().isValid()) { - account.setOpeningDate(TQDate::tqcurrentDate()); + account.setOpeningDate(TQDate::currentDate()); } account.setParentAccountId(parent.id()); @@ -757,7 +757,7 @@ const MyMoneyAccount MyMoneyFile::openingBalanceAccount_internal(const MyMoneySe throw new MYMONEYEXCEPTION("Opening balance for non currencies not supported"); MyMoneyAccount acc; - TQRegExp match(TQString("^%1").tqarg(i18n(MyMoneyFile::OpeningBalancesPrefix))); + TQRegExp match(TQString("^%1").arg(i18n(MyMoneyFile::OpeningBalancesPrefix))); TQValueList<MyMoneyAccount> accounts; TQValueList<MyMoneyAccount>::Iterator it; @@ -774,7 +774,7 @@ const MyMoneyAccount MyMoneyFile::openingBalanceAccount_internal(const MyMoneySe } if(acc.id().isEmpty()) { - throw new MYMONEYEXCEPTION(TQString("No opening balance account for %1").tqarg(security.tradingSymbol())); + throw new MYMONEYEXCEPTION(TQString("No opening balance account for %1").arg(security.tradingSymbol())); } return acc; @@ -787,7 +787,7 @@ const MyMoneyAccount MyMoneyFile::createOpeningBalanceAccount(const MyMoneySecur MyMoneyAccount acc; TQString name(i18n(MyMoneyFile::OpeningBalancesPrefix)); if(security.id() != baseCurrency().id()) { - name += TQString(" (%1)").tqarg(security.id()); + name += TQString(" (%1)").arg(security.id()); } acc.setName(name); acc.setAccountType(MyMoneyAccount::Equity); @@ -1418,9 +1418,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void) if((*it_b).id() == parent.id()) { if(problemAccount != (*it_a).name()) { problemAccount = (*it_a).name(); - rc << i18n("* Problem with account '%1'").tqarg(problemAccount); - rc << i18n(" * Loop detected between this account and account '%2'.").tqarg((*it_b).name()); - rc << i18n(" Reparenting account '%2' to top level account '%1'.").tqarg(toplevel.name(), (*it_a).name()); + rc << i18n("* Problem with account '%1'").arg(problemAccount); + rc << i18n(" * Loop detected between this account and account '%2'.").arg((*it_b).name()); + rc << i18n(" Reparenting account '%2' to top level account '%1'.").arg(toplevel.name(), (*it_a).name()); (*it_a).setParentAccountId(toplevel.id()); if(accountRebuild.contains(toplevel.id()) == 0) accountRebuild << toplevel.id(); @@ -1448,13 +1448,13 @@ const TQStringList MyMoneyFile::consistencyCheck(void) problemCount++; if(problemAccount != (*it_a).name()) { problemAccount = (*it_a).name(); - rc << i18n("* Problem with account '%1'").tqarg(problemAccount); + rc << i18n("* Problem with account '%1'").arg(problemAccount); } // the parent belongs to a different group, so we reconnect to the // master group account (asset, liability, etc) to which this account // should belong and update it in the engine. - rc << i18n(" * Parent account '%1' belongs to a different group.").tqarg(parent.name()); - rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name()); + rc << i18n(" * Parent account '%1' belongs to a different group.").arg(parent.name()); + rc << i18n(" New parent account is the top level account '%1'.").arg(toplevel.name()); (*it_a).setParentAccountId(toplevel.id()); // make sure to rebuild the sub-accounts of the top account @@ -1467,10 +1467,10 @@ const TQStringList MyMoneyFile::consistencyCheck(void) problemCount++; if(problemAccount != (*it_a).name()) { problemAccount = (*it_a).name(); - rc << i18n("* Problem with account '%1'").tqarg(problemAccount); + rc << i18n("* Problem with account '%1'").arg(problemAccount); } // parent exists, but does not have a reference to the account - rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").tqarg(parent.name(), problemAccount); + rc << i18n(" * Parent account '%1' does not contain '%2' as sub-account.").arg(parent.name(), problemAccount); if(accountRebuild.contains(parent.id()) == 0) accountRebuild << parent.id(); } @@ -1482,10 +1482,10 @@ const TQStringList MyMoneyFile::consistencyCheck(void) problemCount++; if(problemAccount != (*it_a).name()) { problemAccount = (*it_a).name(); - rc << i18n("* Problem with account '%1'").tqarg(problemAccount); + rc << i18n("* Problem with account '%1'").arg(problemAccount); } - rc << i18n(" * The parent with id %1 does not exist anymore.").tqarg(parentId); - rc << i18n(" New parent account is the top level account '%1'.").tqarg(toplevel.name()); + rc << i18n(" * The parent with id %1 does not exist anymore.").arg(parentId); + rc << i18n(" New parent account is the top level account '%1'.").arg(toplevel.name()); (*it_a).setParentAccountId(toplevel.id()); addNotification((*it_a).id()); @@ -1495,7 +1495,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) accountRebuild << toplevel.id(); } - // now check that all the tqchildren exist and have the correct type + // now check that all the children exist and have the correct type for(it_c = (*it_a).accountList().begin(); it_c != (*it_a).accountList().end(); ++it_c) { // check that the child exists try { @@ -1504,9 +1504,9 @@ const TQStringList MyMoneyFile::consistencyCheck(void) problemCount++; if(problemAccount != (*it_a).name()) { problemAccount = (*it_a).name(); - rc << i18n("* Problem with account '%1'").tqarg(problemAccount); + rc << i18n("* Problem with account '%1'").arg(problemAccount); } - rc << i18n(" * Child account with id %1 does not exist anymore.").tqarg(*it_c); + rc << i18n(" * Child account with id %1 does not exist anymore.").arg(*it_c); rc << i18n(" The child account list will be reconstructed."); if(accountRebuild.contains((*it_a).id()) == 0) accountRebuild << (*it_a).id(); @@ -1540,7 +1540,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // clear the affected lists for(it_a = list.begin(); it_a != list.end(); ++it_a) { if(accountRebuild.contains((*it_a).id())) { - rc << TQString(" %1").tqarg((*it_a).name()); + rc << TQString(" %1").arg((*it_a).name()); // clear the account list for(it_c = (*it_a).accountList().begin(); it_c != (*it_a).accountList().end();) { (*it_a).removeAccountId(*it_c); @@ -1571,7 +1571,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) addNotification((*it_a).id()); } catch (MyMoneyException *e) { delete e; - rc << i18n(" * Unable to update account data for account %1 in engine").tqarg((*it_a).name()); + rc << i18n(" * Unable to update account data for account %1 in engine").arg((*it_a).name()); } } } @@ -1589,7 +1589,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) payee.clearId(); m_storage->addPayee(payee); payeeConversionMap[(*it_p).id()] = payee.id(); - rc << i18n(" * Payee %1 recreated with fixed id").tqarg(payee.name()); + rc << i18n(" * Payee %1 recreated with fixed id").arg(payee.name()); ++problemCount; } } @@ -1618,7 +1618,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) if(payeeConversionMap.find((*it_s).payeeId()) != payeeConversionMap.end()) { s.setPayeeId(payeeConversionMap[s.payeeId()]); sChanged = true; - rc << i18n(" * Payee id updated in split of transaction '%1'.").tqarg(t.id()); + rc << i18n(" * Payee id updated in split of transaction '%1'.").arg(t.id()); ++problemCount; } @@ -1631,16 +1631,16 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // use the value as master if the transaction is balanced if(t.splitSum().isZero()) { s.setShares(s.value()); - rc << i18n(" * shares set to value in split of transaction '%1'.").tqarg(t.id()); + rc << i18n(" * shares set to value in split of transaction '%1'.").arg(t.id()); } else { s.setValue(s.shares()); - rc << i18n(" * value set to shares in split of transaction '%1'.").tqarg(t.id()); + rc << i18n(" * value set to shares in split of transaction '%1'.").arg(t.id()); } sChanged = true; ++problemCount; } } catch(MyMoneyException *e) { - rc << i18n(" * Split %2 in transaction '%1' contains a reference to invalid account %3. Please fix manually.").tqarg(t.id(), (*it_s).id(), (*it_s).accountId()); + rc << i18n(" * Split %2 in transaction '%1' contains a reference to invalid account %3. Please fix manually.").arg(t.id(), (*it_s).id(), (*it_s).accountId()); ++problemCount; ++unfixedCount; delete e; @@ -1651,7 +1651,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) && s.action() != MyMoneySplit::ActionInterest) { s.setAction(MyMoneySplit::ActionInterest); sChanged = true; - rc << i18n(" * action marked as interest in split of transaction '%1'.").tqarg(t.id()); + rc << i18n(" * action marked as interest in split of transaction '%1'.").arg(t.id()); ++problemCount; } @@ -1678,13 +1678,13 @@ const TQStringList MyMoneyFile::consistencyCheck(void) if(payeeConversionMap.find((*it_s).payeeId()) != payeeConversionMap.end()) { s.setPayeeId(payeeConversionMap[s.payeeId()]); sChanged = true; - rc << i18n(" * Payee id updated in split of schedule '%1'.").tqarg((*it_sch).name()); + rc << i18n(" * Payee id updated in split of schedule '%1'.").arg((*it_sch).name()); ++problemCount; } if(!(*it_s).value().isZero() && (*it_s).shares().isZero()) { s.setShares(s.value()); sChanged = true; - rc << i18n(" * Split in scheduled transaction '%1' contained value != 0 and shares == 0.").tqarg((*it_sch).name()); + rc << i18n(" * Split in scheduled transaction '%1' contained value != 0 and shares == 0.").arg((*it_sch).name()); rc << i18n(" Shares set to value."); ++problemCount; } @@ -1693,7 +1693,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) if(!(*it_s).bankID().isEmpty()) { s.setBankID(TQString()); sChanged = true; - rc << i18n(" * Removed bankid from split in scheduled transaction '%1'.").tqarg((*it_sch).name()); + rc << i18n(" * Removed bankid from split in scheduled transaction '%1'.").arg((*it_sch).name()); ++problemCount; } @@ -1706,16 +1706,16 @@ const TQStringList MyMoneyFile::consistencyCheck(void) // use the value as master if the transaction is balanced if(t.splitSum().isZero()) { s.setShares(s.value()); - rc << i18n(" * shares set to value in split in schedule '%1'.").tqarg((*it_sch).name()); + rc << i18n(" * shares set to value in split in schedule '%1'.").arg((*it_sch).name()); } else { s.setValue(s.shares()); - rc << i18n(" * value set to shares in split in schedule '%1'.").tqarg((*it_sch).name()); + rc << i18n(" * value set to shares in split in schedule '%1'.").arg((*it_sch).name()); } sChanged = true; ++problemCount; } } catch(MyMoneyException *e) { - rc << i18n(" * Split %2 in schedule '%1' contains a reference to invalid account %3. Please fix manually.").tqarg((*it_sch).name(), (*it_s).id(), (*it_s).accountId()); + rc << i18n(" * Split %2 in schedule '%1' contains a reference to invalid account %3. Please fix manually.").arg((*it_sch).name(), (*it_s).id(), (*it_s).accountId()); ++problemCount; ++unfixedCount; delete e; @@ -1741,7 +1741,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) bool rChanged = false; for(it_p = pList.begin(); it_p != pList.end(); ++it_p) { if(payeeConversionMap.find(*it_p) != payeeConversionMap.end()) { - rc << i18n(" * Payee id updated in report '%1'.").tqarg((*it_r).name()); + rc << i18n(" * Payee id updated in report '%1'.").arg((*it_r).name()); ++problemCount; r.removeReference(*it_p); r.addPayee(payeeConversionMap[*it_p]); @@ -1758,7 +1758,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) for(it_m = payeeConversionMap.begin(); it_m != payeeConversionMap.end(); ++it_m) { MyMoneyPayee payee = this->payee(it_m.key()); removePayee(payee); - rc << i18n(" * Payee '%1' removed.").tqarg(payee.id()); + rc << i18n(" * Payee '%1' removed.").arg(payee.id()); ++problemCount; } @@ -1768,7 +1768,7 @@ const TQStringList MyMoneyFile::consistencyCheck(void) rc << i18n("Finish! Data is consistent."); else rc << i18n("Finish! %1 problem(s) corrected. %2 problem(s) still present.") - .tqarg(problemCount).tqarg(unfixedCount); + .arg(problemCount).arg(unfixedCount); return rc; } diff --git a/kmymoney2/mymoney/mymoneyfile.h b/kmymoney2/mymoney/mymoneyfile.h index 410115d..ceb67ad 100644 --- a/kmymoney2/mymoney/mymoneyfile.h +++ b/kmymoney2/mymoney/mymoneyfile.h @@ -1145,7 +1145,7 @@ public: * @return price found as MyMoneyPrice object * @note This throws an exception when the base currency is not set and toId is empty */ - const MyMoneyPrice price(const TQString& fromId, const TQString& toId = TQString(), const TQDate& date = TQDate::tqcurrentDate(), const bool exactDate = false) const; + const MyMoneyPrice price(const TQString& fromId, const TQString& toId = TQString(), const TQDate& date = TQDate::currentDate(), const bool exactDate = false) const; /** * This method returns a list of all prices. diff --git a/kmymoney2/mymoney/mymoneyfiletest.cpp b/kmymoney2/mymoney/mymoneyfiletest.cpp index 431debb..1c25abd 100644 --- a/kmymoney2/mymoney/mymoneyfiletest.cpp +++ b/kmymoney2/mymoney/mymoneyfiletest.cpp @@ -646,7 +646,7 @@ void MyMoneyFileTest::testRemoveAccountTree() { delete e; } - // make sure that tqchildren are re-parented to parent account + // make sure that children are re-parented to parent account try { a = m->account("A000001"); CPPUNIT_ASSERT(a.parentAccountId() == m->asset().id()); @@ -761,16 +761,16 @@ void MyMoneyFileTest::testAddTransaction () { CPPUNIT_ASSERT(t.id() == "T000000000000000001"); CPPUNIT_ASSERT(t.postDate() == TQDate(2002,2,1)); - CPPUNIT_ASSERT(t.entryDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(t.entryDate() == TQDate::currentDate()); CPPUNIT_ASSERT(m->dirty() == true); // check the balance of the accounts a = m->account("A000001"); - CPPUNIT_ASSERT(a.lastModified() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(a.lastModified() == TQDate::currentDate()); CPPUNIT_ASSERT(a.balance() == MyMoneyMoney(-1000)); MyMoneyAccount b = m->account("A000003"); - CPPUNIT_ASSERT(b.lastModified() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(b.lastModified() == TQDate::currentDate()); CPPUNIT_ASSERT(b.balance() == MyMoneyMoney(1000)); storage->m_dirty = false; @@ -1290,7 +1290,7 @@ void MyMoneyFileTest::testAddEquityAccount() { // keep a copy for later use m_inv = i; - // make sure, that only equity accounts can be tqchildren to it + // make sure, that only equity accounts can be children to it MyMoneyAccount a; a.setName("Testaccount"); TQValueList<MyMoneyAccount::accountTypeE> list; @@ -1389,7 +1389,7 @@ void MyMoneyFileTest::testReparentEquity(TQValueList<MyMoneyAccount::accountType TQValueList<MyMoneyAccount::accountTypeE>::Iterator it; MyMoneyFileTransaction ft; for(it = list.begin(); it != list.end(); ++it) { - a.setName(TQString("Testaccount %1").tqarg(*it)); + a.setName(TQString("Testaccount %1").arg(*it)); a.setAccountType(*it); try { m->addAccount(a, parent); @@ -1490,7 +1490,7 @@ void MyMoneyFileTest::testOpeningBalance(void) openingAcc = m->openingBalanceAccount(m->baseCurrency()); CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id()); CPPUNIT_ASSERT(openingAcc.name() == MyMoneyFile::OpeningBalancesPrefix); - CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::currentDate()); } catch(MyMoneyException *e) { unexpectedException(e); } @@ -1504,12 +1504,12 @@ void MyMoneyFileTest::testOpeningBalance(void) unexpectedException(e); } - TQString refName = TQString("%1 (%2)").tqarg(MyMoneyFile::OpeningBalancesPrefix).tqarg("USD"); + TQString refName = TQString("%1 (%2)").arg(MyMoneyFile::OpeningBalancesPrefix).arg("USD"); try { openingAcc = m->openingBalanceAccount(second); CPPUNIT_ASSERT(openingAcc.parentAccountId() == m->equity().id()); CPPUNIT_ASSERT(openingAcc.name() == refName); - CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(openingAcc.openingDate() == TQDate::currentDate()); } catch(MyMoneyException *e) { unexpectedException(e); } diff --git a/kmymoney2/mymoney/mymoneyforecast.cpp b/kmymoney2/mymoney/mymoneyforecast.cpp index 4365b47..bfecce0 100644 --- a/kmymoney2/mymoney/mymoneyforecast.cpp +++ b/kmymoney2/mymoney/mymoneyforecast.cpp @@ -47,8 +47,8 @@ MyMoneyForecast::MyMoneyForecast() : { setForecastCycles(KMyMoneyGlobalSettings::forecastCycles()); setAccountsCycle(KMyMoneyGlobalSettings::forecastAccountCycle()); - setHistoryStartDate(TQDate::tqcurrentDate().addDays(-forecastCycles()*accountsCycle())); - setHistoryEndDate(TQDate::tqcurrentDate().addDays(-1)); + setHistoryStartDate(TQDate::currentDate().addDays(-forecastCycles()*accountsCycle())); + setHistoryEndDate(TQDate::currentDate().addDays(-1)); setForecastDays(KMyMoneyGlobalSettings::forecastDays()); setBeginForecastDay(KMyMoneyGlobalSettings::beginForecastDay()); setForecastMethod(KMyMoneyGlobalSettings::forecastMethod()); @@ -75,12 +75,12 @@ void MyMoneyForecast::doForecast() //initialize global variables setForecastDays(fDays); - setForecastStartDate(TQDate::tqcurrentDate().addDays(1)); - setForecastEndDate(TQDate::tqcurrentDate().addDays(fDays)); + setForecastStartDate(TQDate::currentDate().addDays(1)); + setForecastEndDate(TQDate::currentDate().addDays(fDays)); setAccountsCycle(fAccCycle); setForecastCycles(fCycles); setHistoryStartDate(forecastCycles() * accountsCycle()); - setHistoryEndDate(TQDate::tqcurrentDate().addDays(-1)); //yesterday + setHistoryEndDate(TQDate::currentDate().addDays(-1)); //yesterday //clear all data before calculating m_accountListPast.clear(); @@ -343,14 +343,14 @@ MyMoneyMoney MyMoneyForecast::calculateAccountTrend(const MyMoneyAccount& acc, i //If it is a new account, we don't take into account the first day //because it is usually a weird one and it would mess up the trend - if(openingDate.daysTo(TQDate::tqcurrentDate())<trendDays){ + if(openingDate.daysTo(TQDate::currentDate())<trendDays){ startDate = (acc.openingDate()).addDays(1); } else { - startDate = TQDate::tqcurrentDate().addDays(-trendDays); + startDate = TQDate::currentDate().addDays(-trendDays); } //get all transactions for the period - filter.setDateFilter(startDate, TQDate::tqcurrentDate()); + filter.setDateFilter(startDate, TQDate::currentDate()); if(acc.accountGroup() == MyMoneyAccount::Income || acc.accountGroup() == MyMoneyAccount::Expense) { filter.addCategory(acc.id()); @@ -377,8 +377,8 @@ MyMoneyMoney MyMoneyForecast::calculateAccountTrend(const MyMoneyAccount& acc, i MyMoneyMoney accTrend; //don't take into account the first day of the account - if(openingDate.daysTo(TQDate::tqcurrentDate())<trendDays) { - accTrend = netIncome/MyMoneyMoney(openingDate.daysTo(TQDate::tqcurrentDate())-1,1); + if(openingDate.daysTo(TQDate::currentDate())<trendDays) { + accTrend = netIncome/MyMoneyMoney(openingDate.daysTo(TQDate::currentDate())-1,1); } else { accTrend = netIncome/MyMoneyMoney(trendDays,1); } @@ -490,7 +490,7 @@ void MyMoneyForecast::calculateHistoricDailyBalances() break; case 2: { - TQDate baseDate = TQDate::tqcurrentDate().addDays(-accountsCycle()); + TQDate baseDate = TQDate::currentDate().addDays(-accountsCycle()); for(int t_day = 1; t_day <= accountsCycle(); ++t_day) { int f_day = 1; TQDate fDate = baseDate.addDays(accountsCycle()+1); @@ -536,7 +536,7 @@ MyMoneyMoney MyMoneyForecast::forecastBalance(const MyMoneyAccount& acc, TQDate */ MyMoneyMoney MyMoneyForecast::forecastBalance (const MyMoneyAccount& acc, int offset ) { - TQDate forecastDate = TQDate::tqcurrentDate().addDays(offset); + TQDate forecastDate = TQDate::currentDate().addDays(offset); return forecastBalance(acc, forecastDate); } @@ -570,7 +570,7 @@ void MyMoneyForecast::doFutureScheduledForecast(void) MyMoneyMoney rate = MyMoneyMoney ( 1, 1 ); MyMoneyPrice price; - for (TQDate it_day = TQDate::tqcurrentDate(); it_day <= forecastEndDate(); ) { + for (TQDate it_day = TQDate::currentDate(); it_day <= forecastEndDate(); ) { //get the price for the tradingCurrency that day price = file->price ( undersecurity.id(), undersecurity.tradingCurrency(), it_day ); if ( price.isValid() ) @@ -651,7 +651,7 @@ void MyMoneyForecast::addScheduledTransactions (void) TQValueList<MyMoneySchedule> schedule; schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY, - TQDate::tqcurrentDate(), forecastEndDate()); + TQDate::currentDate(), forecastEndDate()); if(schedule.count() > 0) { TQValueList<MyMoneySchedule>::Iterator it; do { @@ -698,12 +698,12 @@ void MyMoneyForecast::addScheduledTransactions (void) if(isForecastAccount(acc)) { // collect all overdues on the first day TQDate forecastDate = nextDate; - if(TQDate::tqcurrentDate() >= nextDate) - forecastDate = TQDate::tqcurrentDate().addDays(1); + if(TQDate::currentDate() >= nextDate) + forecastDate = TQDate::currentDate().addDays(1); dailyBalances balance; balance = m_accountList[acc.id()]; - for(TQDate f_day = TQDate::tqcurrentDate(); f_day < forecastDate; ) { + for(TQDate f_day = TQDate::currentDate(); f_day < forecastDate; ) { balanceMap[acc.id()] += m_accountList[acc.id()][f_day]; f_day = f_day.addDays(1); } @@ -719,14 +719,14 @@ void MyMoneyForecast::addScheduledTransactions (void) if(isForecastAccount(acc)) { dailyBalances balance; balance = m_accountList[acc.id()]; - //int offset = TQDate::tqcurrentDate().daysTo(nextDate); + //int offset = TQDate::currentDate().daysTo(nextDate); //if(offset <= 0) { // collect all overdues on the first day // offset = 1; //} // collect all overdues on the first day TQDate forecastDate = nextDate; - if(TQDate::tqcurrentDate() >= nextDate) - forecastDate = TQDate::tqcurrentDate().addDays(1); + if(TQDate::currentDate() >= nextDate) + forecastDate = TQDate::currentDate().addDays(1); if(acc.accountType() == MyMoneyAccount::Income) { balance[forecastDate] += ((*it_s).shares() * MyMoneyMoney(-1, 1)); @@ -807,9 +807,9 @@ int MyMoneyForecast::daysToMinimumBalance(const MyMoneyAccount& acc) balance = m_accountList[acc.id()]; - for(TQDate it_day = TQDate::tqcurrentDate() ; it_day <= forecastEndDate(); ) { + for(TQDate it_day = TQDate::currentDate() ; it_day <= forecastEndDate(); ) { if(minBalance > balance[it_day]) { - return TQDate::tqcurrentDate().daysTo(it_day); + return TQDate::currentDate().daysTo(it_day); } it_day = it_day.addDays(1); } @@ -828,20 +828,20 @@ int MyMoneyForecast::daysToZeroBalance(const MyMoneyAccount& acc) balance = m_accountList[acc.id()]; if (acc.accountGroup() == MyMoneyAccount::Asset) { - for (TQDate it_day = TQDate::tqcurrentDate() ; it_day <= forecastEndDate(); ) + for (TQDate it_day = TQDate::currentDate() ; it_day <= forecastEndDate(); ) { if ( balance[it_day] < MyMoneyMoney ( 0, 1 ) ) { - return TQDate::tqcurrentDate().daysTo(it_day); + return TQDate::currentDate().daysTo(it_day); } it_day = it_day.addDays(1); } } else if (acc.accountGroup() == MyMoneyAccount::Liability) { - for (TQDate it_day = TQDate::tqcurrentDate() ; it_day <= forecastEndDate(); ) + for (TQDate it_day = TQDate::currentDate() ; it_day <= forecastEndDate(); ) { if ( balance[it_day] > MyMoneyMoney ( 0, 1 ) ) { - return TQDate::tqcurrentDate().daysTo(it_day); + return TQDate::currentDate().daysTo(it_day); } it_day = it_day.addDays(1); } @@ -882,7 +882,7 @@ MyMoneyMoney MyMoneyForecast::accountTotalVariation(const MyMoneyAccount& acc) { MyMoneyMoney totalVariation; - totalVariation = forecastBalance(acc, forecastEndDate()) - forecastBalance(acc, TQDate::tqcurrentDate()); + totalVariation = forecastBalance(acc, forecastEndDate()) - forecastBalance(acc, TQDate::currentDate()); return totalVariation; } @@ -891,15 +891,15 @@ TQValueList<TQDate> MyMoneyForecast::accountMinimumBalanceDateList(const MyMoney TQValueList<TQDate> minBalanceList; int daysToBeginDay; - daysToBeginDay = TQDate::tqcurrentDate().daysTo(beginForecastDate()); + daysToBeginDay = TQDate::currentDate().daysTo(beginForecastDate()); for(int t_cycle = 0; ((t_cycle * accountsCycle()) + daysToBeginDay) < forecastDays() ; ++t_cycle) { MyMoneyMoney minBalance = forecastBalance(acc, (t_cycle * accountsCycle() + daysToBeginDay)); - TQDate minDate = TQDate::tqcurrentDate().addDays(t_cycle * accountsCycle() + daysToBeginDay); + TQDate minDate = TQDate::currentDate().addDays(t_cycle * accountsCycle() + daysToBeginDay); for(int t_day = 1; t_day <= accountsCycle() ; ++t_day) { if( minBalance > forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day) ) { minBalance = forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day ); - minDate = TQDate::tqcurrentDate().addDays( (t_cycle * accountsCycle()) + daysToBeginDay + t_day); + minDate = TQDate::currentDate().addDays( (t_cycle * accountsCycle()) + daysToBeginDay + t_day); } } minBalanceList.append(minDate); @@ -912,16 +912,16 @@ TQValueList<TQDate> MyMoneyForecast::accountMaximumBalanceDateList(const MyMoney TQValueList<TQDate> maxBalanceList; int daysToBeginDay; - daysToBeginDay = TQDate::tqcurrentDate().daysTo(beginForecastDate()); + daysToBeginDay = TQDate::currentDate().daysTo(beginForecastDate()); for(int t_cycle = 0; ((t_cycle * accountsCycle()) + daysToBeginDay) < forecastDays() ; ++t_cycle) { MyMoneyMoney maxBalance = forecastBalance(acc, ((t_cycle * accountsCycle()) + daysToBeginDay)); - TQDate maxDate = TQDate::tqcurrentDate().addDays((t_cycle * accountsCycle()) + daysToBeginDay); + TQDate maxDate = TQDate::currentDate().addDays((t_cycle * accountsCycle()) + daysToBeginDay); for(int t_day = 0; t_day < accountsCycle() ; ++t_day) { if( maxBalance < forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day) ) { maxBalance = forecastBalance(acc, (t_cycle * accountsCycle()) + daysToBeginDay + t_day ); - maxDate = TQDate::tqcurrentDate().addDays((t_cycle * accountsCycle()) + daysToBeginDay + t_day); + maxDate = TQDate::currentDate().addDays((t_cycle * accountsCycle()) + daysToBeginDay + t_day); } } maxBalanceList.append(maxDate); @@ -947,38 +947,38 @@ int MyMoneyForecast::calculateBeginForecastDay() //if 0, beginDate is current date and forecastDays remains unchanged if(beginDay == 0) { - setBeginForecastDate(TQDate::tqcurrentDate()); + setBeginForecastDate(TQDate::currentDate()); return fDays; } //adjust if beginDay more than days of current month - if(TQDate::tqcurrentDate().daysInMonth() < beginDay) - beginDay = TQDate::tqcurrentDate().daysInMonth(); + if(TQDate::currentDate().daysInMonth() < beginDay) + beginDay = TQDate::currentDate().daysInMonth(); //if beginDay still to come, calculate and return - if(TQDate::tqcurrentDate().day() <= beginDay) { - beginDate = TQDate( TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), beginDay); - fDays += TQDate::tqcurrentDate().daysTo(beginDate); + if(TQDate::currentDate().day() <= beginDay) { + beginDate = TQDate( TQDate::currentDate().year(), TQDate::currentDate().month(), beginDay); + fDays += TQDate::currentDate().daysTo(beginDate); setBeginForecastDate(beginDate); return fDays; } //adjust beginDay for next month - if(TQDate::tqcurrentDate().addMonths(1).daysInMonth() < beginDay) - beginDay = TQDate::tqcurrentDate().addMonths(1).daysInMonth(); + if(TQDate::currentDate().addMonths(1).daysInMonth() < beginDay) + beginDay = TQDate::currentDate().addMonths(1).daysInMonth(); //if beginDay of next month comes before 1 interval, use beginDay next month - if(TQDate::tqcurrentDate().addDays(accCycle) >= - (TQDate(TQDate::tqcurrentDate().addMonths(1).year(), TQDate::tqcurrentDate().addMonths(1).month(), 1).addDays(beginDay-1) ) ) + if(TQDate::currentDate().addDays(accCycle) >= + (TQDate(TQDate::currentDate().addMonths(1).year(), TQDate::currentDate().addMonths(1).month(), 1).addDays(beginDay-1) ) ) { - beginDate = TQDate(TQDate::tqcurrentDate().addMonths(1).year(), TQDate::tqcurrentDate().addMonths(1).month(), 1).addDays(beginDay-1); - fDays += TQDate::tqcurrentDate().daysTo(beginDate); + beginDate = TQDate(TQDate::currentDate().addMonths(1).year(), TQDate::currentDate().addMonths(1).month(), 1).addDays(beginDay-1); + fDays += TQDate::currentDate().daysTo(beginDate); } else //add intervals to current beginDay and take the first after current date { - beginDay = ((((TQDate::tqcurrentDate().day()-beginDay)/accCycle) + 1) * accCycle) + beginDay; - beginDate = TQDate::tqcurrentDate().addDays(beginDay - TQDate::tqcurrentDate().day()); - fDays += TQDate::tqcurrentDate().daysTo(beginDate); + beginDay = ((((TQDate::currentDate().day()-beginDay)/accCycle) + 1) * accCycle) + beginDay; + beginDate = TQDate::currentDate().addDays(beginDay - TQDate::currentDate().day()); + fDays += TQDate::currentDate().daysTo(beginDate); } setBeginForecastDate(beginDate); @@ -1190,15 +1190,15 @@ void MyMoneyForecast::setStartingBalance(const MyMoneyAccount &acc) //set the default value MyMoneyMoney rate = MyMoneyMoney ( 1, 1 ); //get te - MyMoneyPrice price = file->price ( undersecurity.id(), undersecurity.tradingCurrency(), TQDate::tqcurrentDate() ); + MyMoneyPrice price = file->price ( undersecurity.id(), undersecurity.tradingCurrency(), TQDate::currentDate() ); if ( price.isValid() ) { rate = price.rate ( undersecurity.tradingCurrency() ); } - m_accountList[acc.id()][TQDate::tqcurrentDate()] = file->balance(acc.id(), TQDate::tqcurrentDate()) * rate; + m_accountList[acc.id()][TQDate::currentDate()] = file->balance(acc.id(), TQDate::currentDate()) * rate; } } else { - m_accountList[acc.id()][TQDate::tqcurrentDate()] = file->balance(acc.id(), TQDate::tqcurrentDate()); + m_accountList[acc.id()][TQDate::currentDate()] = file->balance(acc.id(), TQDate::currentDate()); } //if the method is linear regression, we have to add the opening balance to m_accountListPast @@ -1267,8 +1267,8 @@ void MyMoneyForecast::calculateAutoLoan(const MyMoneySchedule& schedule, MyMoney // the payment is overdue then take the current date dueDate = schedule.nextDueDate(); if(acc.interestCalculation() == MyMoneyAccountLoan::paymentReceived) { - if(dueDate < TQDate::tqcurrentDate()) - dueDate = TQDate::tqcurrentDate(); + if(dueDate < TQDate::currentDate()) + dueDate = TQDate::currentDate(); } // we need to calculate the balance at the time the payment is due diff --git a/kmymoney2/mymoney/mymoneyforecast.h b/kmymoney2/mymoney/mymoneyforecast.h index 7291b2b..6fa231c 100644 --- a/kmymoney2/mymoney/mymoneyforecast.h +++ b/kmymoney2/mymoney/mymoneyforecast.h @@ -141,8 +141,8 @@ public: void setForecastMethod(int forecastMethod) { m_forecastMethod = forecastMethod; } void setHistoryStartDate(TQDate historyStartDate) { m_historyStartDate = historyStartDate; } void setHistoryEndDate(TQDate historyEndDate) { m_historyEndDate = historyEndDate; } - void setHistoryStartDate(int daysToStartDate) { setHistoryStartDate(TQDate::tqcurrentDate().addDays(-daysToStartDate)); } - void setHistoryEndDate(int daysToEndDate) { setHistoryEndDate(TQDate::tqcurrentDate().addDays(-daysToEndDate)); } + void setHistoryStartDate(int daysToStartDate) { setHistoryStartDate(TQDate::currentDate().addDays(-daysToStartDate)); } + void setHistoryEndDate(int daysToEndDate) { setHistoryEndDate(TQDate::currentDate().addDays(-daysToEndDate)); } void setForecastStartDate(TQDate _startDate) { m_forecastStartDate = _startDate; } void setForecastEndDate(TQDate _endDate) { m_forecastEndDate = _endDate; } void setSkipOpeningDate(bool _skip) { m_skipOpeningDate = _skip; } diff --git a/kmymoney2/mymoney/mymoneyforecasttest.cpp b/kmymoney2/mymoney/mymoneyforecasttest.cpp index ffcd232..dc829cd 100644 --- a/kmymoney2/mymoney/mymoneyforecasttest.cpp +++ b/kmymoney2/mymoney/mymoneyforecasttest.cpp @@ -78,7 +78,7 @@ void MyMoneyForecastTest::setUp () { acGrandChild2 = makeAccount(TQString("Grand Child 2"),MyMoneyAccount::Expense,0,TQDate(2004,2,11),acChild, "USD"); //this account added to have an account to test opening date calculations - acCash = makeAccount(TQString("Cash"),MyMoneyAccount::Cash,moCreditOpen,TQDate::tqcurrentDate().addDays(-2),acAsset, "USD"); + acCash = makeAccount(TQString("Cash"),MyMoneyAccount::Cash,moCreditOpen,TQDate::currentDate().addDays(-2),acAsset, "USD"); MyMoneyInstitution i("Bank of the World","","","","","",""); @@ -97,18 +97,18 @@ void MyMoneyForecastTest::testEmptyConstructor() { MyMoneyForecast a; MyMoneyAccount b; - int f = a.forecastBalance(b, TQDate::tqcurrentDate()); + int f = a.forecastBalance(b, TQDate::currentDate()); CPPUNIT_ASSERT(f == 0); CPPUNIT_ASSERT(!a.isForecastAccount(b)); - CPPUNIT_ASSERT(a.forecastBalance(b, TQDate::tqcurrentDate()) == MyMoneyMoney(0,1)); + CPPUNIT_ASSERT(a.forecastBalance(b, TQDate::currentDate()) == MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.daysToMinimumBalance(b) == -1); CPPUNIT_ASSERT(a.daysToZeroBalance(b) == -2); CPPUNIT_ASSERT(a.forecastDays() == KMyMoneyGlobalSettings::forecastDays()); CPPUNIT_ASSERT(a.accountsCycle() == KMyMoneyGlobalSettings::forecastAccountCycle()); CPPUNIT_ASSERT(a.forecastCycles() == KMyMoneyGlobalSettings::forecastCycles()); - CPPUNIT_ASSERT(a.historyStartDate() == TQDate::tqcurrentDate().addDays(-KMyMoneyGlobalSettings::forecastCycles()*KMyMoneyGlobalSettings::forecastAccountCycle())); - CPPUNIT_ASSERT(a.historyEndDate() == TQDate::tqcurrentDate().addDays(-1)); + CPPUNIT_ASSERT(a.historyStartDate() == TQDate::currentDate().addDays(-KMyMoneyGlobalSettings::forecastCycles()*KMyMoneyGlobalSettings::forecastAccountCycle())); + CPPUNIT_ASSERT(a.historyEndDate() == TQDate::currentDate().addDays(-1)); CPPUNIT_ASSERT(a.historyDays() == KMyMoneyGlobalSettings::forecastAccountCycle() * KMyMoneyGlobalSettings::forecastCycles()); } @@ -177,9 +177,9 @@ void MyMoneyForecastTest::testDoForecast() { a.doForecast(); //this is just to check nothing goes wrong if forecast is run agains an empty template //setup some transactions - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); + TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); + TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); a.setForecastMethod(1); a.setForecastDays(3); @@ -190,32 +190,32 @@ void MyMoneyForecastTest::testDoForecast() { a.doForecast(); //checking didn't have balance variations, so the forecast should be equal to the current balance - MyMoneyMoney b_checking = file->balance(a_checking.id(), TQDate::tqcurrentDate()); + MyMoneyMoney b_checking = file->balance(a_checking.id(), TQDate::currentDate()); - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(1))==b_checking); - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(2))==b_checking); - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(3))==b_checking); - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate())==b_checking); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(1))==b_checking); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(2))==b_checking); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(3))==b_checking); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate())==b_checking); //credit had a variation so the forecast should be different for each day - MyMoneyMoney b_credit = file->balance(a_credit.id(), TQDate::tqcurrentDate()); + MyMoneyMoney b_credit = file->balance(a_credit.id(), TQDate::currentDate()); CPPUNIT_ASSERT(a.forecastBalance(a_credit, 0) == b_credit); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1)) == (b_credit+(moT2-moT1))); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(2)) == (b_credit+((moT2-moT1)*2))); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(3)) == b_credit+((moT2-moT1)*3)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(1)) == (b_credit+(moT2-moT1))); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(2)) == (b_credit+((moT2-moT1)*2))); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(3)) == b_credit+((moT2-moT1)*3)); a.setHistoryMethod(1); //weighted moving average a.doForecast(); CPPUNIT_ASSERT(a.forecastBalance(a_credit, 0) == b_credit); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1)) == (b_credit+(moT2-moT1))); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(2)) == (b_credit+((moT2-moT1)*2))); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(3)) == b_credit+((moT2-moT1)*3)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(1)) == (b_credit+(moT2-moT1))); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(2)) == (b_credit+((moT2-moT1)*2))); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(3)) == b_credit+((moT2-moT1)*3)); //insert transactions outside the forecast period. The calculation should be the same. - TransactionHelper t4( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); - TransactionHelper t5( TQDate::tqcurrentDate().addDays(-10), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); - TransactionHelper t6( TQDate::tqcurrentDate().addDays(-3), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); + TransactionHelper t4( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); + TransactionHelper t5( TQDate::currentDate().addDays(-10), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); + TransactionHelper t6( TQDate::currentDate().addDays(-3), MyMoneySplit::ActionDeposit, -moT2, acCredit, acParent ); a.setForecastMethod(1); a.setForecastDays(3); @@ -225,14 +225,14 @@ void MyMoneyForecastTest::testDoForecast() { a.setHistoryMethod(0); //moving average a.doForecast(); //check forecast - b_credit = file->balance(a_credit.id(), TQDate::tqcurrentDate()); + b_credit = file->balance(a_credit.id(), TQDate::currentDate()); MyMoneyMoney b_credit_1_exp = (b_credit+((moT2-moT1))); - MyMoneyMoney b_credit_2 = a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(2)); + MyMoneyMoney b_credit_2 = a.forecastBalance(a_credit, TQDate::currentDate().addDays(2)); MyMoneyMoney b_credit_2_exp = (b_credit+((moT2-moT1)*2)); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate())==file->balance(a_credit.id(), TQDate::tqcurrentDate())); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1))==b_credit+(moT2-moT1)); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(2))==b_credit+((moT2-moT1)*2)); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(3))==b_credit+((moT2-moT1)*3)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate())==file->balance(a_credit.id(), TQDate::currentDate())); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(1))==b_credit+(moT2-moT1)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(2))==b_credit+((moT2-moT1)*2)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(3))==b_credit+((moT2-moT1)*3)); //test weighted moving average a.setForecastMethod(1); @@ -244,7 +244,7 @@ void MyMoneyForecastTest::testDoForecast() { a.doForecast(); CPPUNIT_ASSERT(a.forecastBalance(a_credit, 0) == b_credit); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1)) == (b_credit+(((moT2-moT1)*3+moT2*2+moT2)/MyMoneyMoney(6,1)))); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(1)) == (b_credit+(((moT2-moT1)*3+moT2*2+moT2)/MyMoneyMoney(6,1)))); } @@ -265,7 +265,7 @@ void MyMoneyForecastTest::testGetForecastAccountList() void MyMoneyForecastTest::testCalculateAccountTrend() { //set up environment - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-3), MyMoneySplit::ActionDeposit, -moT2, acChecking, acSolo ); + TransactionHelper t1( TQDate::currentDate().addDays(-3), MyMoneySplit::ActionDeposit, -moT2, acChecking, acSolo ); MyMoneyAccount a_checking = file->account(acChecking); //test invalid arguments @@ -296,8 +296,8 @@ void MyMoneyForecastTest::testCalculateAccountTrend() //test that it does not take into account the transactions of the opening date of the account MyMoneyAccount a_cash = file->account(acCash); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent ); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, moT1, acCash, acParent ); + TransactionHelper t2( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent ); + TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, moT1, acCash, acParent ); CPPUNIT_ASSERT(MyMoneyForecast::calculateAccountTrend(a_cash,3) == -moT1); } @@ -307,9 +307,9 @@ void MyMoneyForecastTest::testGetForecastBalance() //set up environment MyMoneyForecast a; - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); + TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); + TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); a.setForecastMethod(1); a.setForecastDays(3); @@ -322,23 +322,23 @@ void MyMoneyForecastTest::testGetForecastBalance() MyMoneyAccount a_credit = file->account(acCredit); //test invalid arguments - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(-1))==MyMoneyMoney(0,1)); - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(-10))==MyMoneyMoney(0,1)); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(-1))==MyMoneyMoney(0,1)); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(-10))==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, -1)==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, -100)==MyMoneyMoney(0,1)); //test a date outside the forecast days - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(4))==MyMoneyMoney(0,1)); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(4))==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, 4)==MyMoneyMoney(0,1)); - CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::tqcurrentDate().addDays(10))==MyMoneyMoney(0,1)); + CPPUNIT_ASSERT(a.forecastBalance(a_checking, TQDate::currentDate().addDays(10))==MyMoneyMoney(0,1)); CPPUNIT_ASSERT(a.forecastBalance(a_checking, 10)==MyMoneyMoney(0,1)); //test it returns valid results - MyMoneyMoney b_credit = file->balance(a_credit.id(), TQDate::tqcurrentDate()); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate())==file->balance(a_credit.id(), TQDate::tqcurrentDate())); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(1))==b_credit+(moT2-moT1)); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(2))==b_credit+((moT2-moT1)*2)); - CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::tqcurrentDate().addDays(3))==b_credit+((moT2-moT1)*3)); + MyMoneyMoney b_credit = file->balance(a_credit.id(), TQDate::currentDate()); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate())==file->balance(a_credit.id(), TQDate::currentDate())); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(1))==b_credit+(moT2-moT1)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(2))==b_credit+((moT2-moT1)*2)); + CPPUNIT_ASSERT(a.forecastBalance(a_credit, TQDate::currentDate().addDays(3))==b_credit+((moT2-moT1)*3)); } void MyMoneyForecastTest::testIsForecastAccount() @@ -364,10 +364,10 @@ void MyMoneyForecastTest::testDoFutureScheduledForecast() MyMoneyForecast a; MyMoneyAccount a_cash = file->account(acCash); - TransactionHelper t1( TQDate::tqcurrentDate().addDays(1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent ); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionDeposit, -moT2, acCash, acParent ); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(3), MyMoneySplit::ActionDeposit, -moT3, acCash, acParent ); - TransactionHelper t4( TQDate::tqcurrentDate().addDays(10), MyMoneySplit::ActionDeposit, -moT4, acCash, acParent ); + TransactionHelper t1( TQDate::currentDate().addDays(1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent ); + TransactionHelper t2( TQDate::currentDate().addDays(2), MyMoneySplit::ActionDeposit, -moT2, acCash, acParent ); + TransactionHelper t3( TQDate::currentDate().addDays(3), MyMoneySplit::ActionDeposit, -moT3, acCash, acParent ); + TransactionHelper t4( TQDate::currentDate().addDays(10), MyMoneySplit::ActionDeposit, -moT4, acCash, acParent ); a.setForecastMethod(0); a.setForecastDays(3); @@ -375,13 +375,13 @@ void MyMoneyForecastTest::testDoFutureScheduledForecast() a.setForecastCycles(1); a.doForecast(); - MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::tqcurrentDate()); + MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::currentDate()); //test valid results - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate())==b_cash); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1))==b_cash+moT1); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(2))==b_cash+moT1+moT2); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(3))==b_cash+moT1+moT2+moT3); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate())==b_cash); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(1))==b_cash+moT1); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(2))==b_cash+moT1+moT2); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(3))==b_cash+moT1+moT2+moT3); } void MyMoneyForecastTest::testScheduleForecast() @@ -395,14 +395,14 @@ void MyMoneyForecastTest::testScheduleForecast() MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::STYPE_DIRECTDEBIT, - TQDate::tqcurrentDate().addDays(1), + TQDate::currentDate().addDays(1), TQDate(), true, true); MyMoneyTransaction t; - t.setPostDate(TQDate::tqcurrentDate().addDays(1)); - t.setEntryDate(TQDate::tqcurrentDate().addDays(1)); + t.setPostDate(TQDate::currentDate().addDays(1)); + t.setEntryDate(TQDate::currentDate().addDays(1)); //t.setId("T000000000000000001"); t.setBankID("BID"); t.setMemo("Wohnung:Miete"); @@ -437,18 +437,18 @@ void MyMoneyForecastTest::testScheduleForecast() MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::STYPE_DIRECTDEBIT, - TQDate::tqcurrentDate().addDays(5), + TQDate::currentDate().addDays(5), TQDate(), true, true); - //sch.setLastPayment(TQDate::tqcurrentDate()); - //sch.recordPayment(TQDate::tqcurrentDate().addDays(1)); + //sch.setLastPayment(TQDate::currentDate()); + //sch.recordPayment(TQDate::currentDate().addDays(1)); //sch.setId("SCH0001"); MyMoneyTransaction t3; - t3.setPostDate(TQDate::tqcurrentDate().addDays(5)); - t3.setEntryDate(TQDate::tqcurrentDate().addDays(5)); + t3.setPostDate(TQDate::currentDate().addDays(5)); + t3.setEntryDate(TQDate::currentDate().addDays(5)); //t.setId("T000000000000000001"); t3.setBankID("BID"); t3.setMemo("Wohnung:Miete"); @@ -484,18 +484,18 @@ void MyMoneyForecastTest::testScheduleForecast() MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::STYPE_DIRECTDEBIT, - TQDate::tqcurrentDate().addDays(2), + TQDate::currentDate().addDays(2), TQDate(), true, true); - //sch.setLastPayment(TQDate::tqcurrentDate()); - //sch.recordPayment(TQDate::tqcurrentDate().addDays(1)); + //sch.setLastPayment(TQDate::currentDate()); + //sch.recordPayment(TQDate::currentDate().addDays(1)); //sch.setId("SCH0001"); MyMoneyTransaction t2; - t2.setPostDate(TQDate::tqcurrentDate().addDays(2)); - t2.setEntryDate(TQDate::tqcurrentDate().addDays(2)); + t2.setPostDate(TQDate::currentDate().addDays(2)); + t2.setEntryDate(TQDate::currentDate().addDays(2)); //t.setId("T000000000000000001"); t2.setBankID("BID"); t2.setMemo("Wohnung:Miete"); @@ -535,13 +535,13 @@ void MyMoneyForecastTest::testScheduleForecast() a.doForecast(); //check result for single schedule - MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::tqcurrentDate()); - MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1)); + MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::currentDate()); + MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(1)); //test valid results - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate())==b_cash); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1))==b_cash-moT2); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(2))==b_cash-moT2-moT1); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate())==b_cash); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(1))==b_cash-moT2); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(2))==b_cash-moT2-moT1); } @@ -555,10 +555,10 @@ void MyMoneyForecastTest::testDaysToMinimumBalance() MyMoneyAccount a_parent = file->account(acParent); a_cash.setValue("minBalanceAbsolute", "50"); a_credit.setValue("minBalanceAbsolute", "50"); - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent ); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent ); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, -moT1, acCredit, acParent ); - TransactionHelper t4( TQDate::tqcurrentDate().addDays(4), MyMoneySplit::ActionWithdrawal, moT5, acCredit, acParent ); + TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -moT1, acCash, acParent ); + TransactionHelper t2( TQDate::currentDate().addDays(2), MyMoneySplit::ActionDeposit, moT2, acCash, acParent ); + TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, -moT1, acCredit, acParent ); + TransactionHelper t4( TQDate::currentDate().addDays(4), MyMoneySplit::ActionWithdrawal, moT5, acCredit, acParent ); a.setForecastMethod(0); a.setForecastDays(3); @@ -588,9 +588,9 @@ void MyMoneyForecastTest::testDaysToZeroBalance() MyMoneyAccount a_Credit = file->account(acCredit); //MyMoneyFileTransaction ft; - TransactionHelper t1( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionWithdrawal, -moT1, acChecking, acSolo ); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionTransfer, (moT5), acCash, acCredit ); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(2), MyMoneySplit::ActionWithdrawal, (moT5*100), acCredit, acParent ); + TransactionHelper t1( TQDate::currentDate().addDays(2), MyMoneySplit::ActionWithdrawal, -moT1, acChecking, acSolo ); + TransactionHelper t2( TQDate::currentDate().addDays(2), MyMoneySplit::ActionTransfer, (moT5), acCash, acCredit ); + TransactionHelper t3( TQDate::currentDate().addDays(2), MyMoneySplit::ActionWithdrawal, (moT5*100), acCredit, acParent ); //ft.commit(); MyMoneyForecast a; @@ -618,7 +618,7 @@ void MyMoneyForecastTest::testDaysToZeroBalance() //test it warns when inside the forecast period - MyMoneyMoney fCash = a.forecastBalance(a_Cash, TQDate::tqcurrentDate().addDays(2)); + MyMoneyMoney fCash = a.forecastBalance(a_Cash, TQDate::currentDate().addDays(2)); CPPUNIT_ASSERT(a.daysToZeroBalance(a_Cash) == 2); @@ -631,8 +631,8 @@ void MyMoneyForecastTest::testSkipOpeningDate() //set up environment MyMoneyForecast a; - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); + TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); a.setForecastMethod(1); a.setForecastDays(3); @@ -644,12 +644,12 @@ void MyMoneyForecastTest::testSkipOpeningDate() MyMoneyAccount a_cash = file->account(acCash); //test it has no variation because it skipped the variation of the opening date - MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::tqcurrentDate()); + MyMoneyMoney b_cash = file->balance(a_cash.id(), TQDate::currentDate()); CPPUNIT_ASSERT(a.skipOpeningDate() == true); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate())==b_cash); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1))==b_cash); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(2))==b_cash-moT2); - CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(3))==b_cash-moT2); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate())==b_cash); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(1))==b_cash); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(2))==b_cash-moT2); + CPPUNIT_ASSERT(a.forecastBalance(a_cash, TQDate::currentDate().addDays(3))==b_cash-moT2); } void MyMoneyForecastTest::testAccountMinimumBalanceDateList() { @@ -657,15 +657,15 @@ void MyMoneyForecastTest::testAccountMinimumBalanceDateList() { //set up environment MyMoneyForecast a; - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); + TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); a.setForecastMethod(1); a.setForecastDays(6); a.setAccountsCycle(2); a.setForecastCycles(3); a.setHistoryMethod(0); - a.setBeginForecastDay(TQDate::tqcurrentDate().addDays(1).day()); + a.setBeginForecastDay(TQDate::currentDate().addDays(1).day()); a.doForecast(); MyMoneyAccount a_cash = file->account(acCash); @@ -678,13 +678,13 @@ void MyMoneyForecastTest::testAccountMinimumBalanceDateList() { TQDate minDate = *it; - CPPUNIT_ASSERT(minDate==TQDate::tqcurrentDate().addDays(2)); + CPPUNIT_ASSERT(minDate==TQDate::currentDate().addDays(2)); it++; minDate = *it; - CPPUNIT_ASSERT(minDate==TQDate::tqcurrentDate().addDays(4)); + CPPUNIT_ASSERT(minDate==TQDate::currentDate().addDays(4)); it++; minDate = *it; - CPPUNIT_ASSERT(minDate==TQDate::tqcurrentDate().addDays(6)); + CPPUNIT_ASSERT(minDate==TQDate::currentDate().addDays(6)); } @@ -692,15 +692,15 @@ void MyMoneyForecastTest::testAccountMaximumBalanceDateList() { //set up environment MyMoneyForecast a; - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); + TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); a.setForecastMethod(1); a.setForecastDays(6); a.setAccountsCycle(2); a.setForecastCycles(3); a.setHistoryMethod(0); - a.setBeginForecastDay(TQDate::tqcurrentDate().addDays(1).day()); + a.setBeginForecastDay(TQDate::currentDate().addDays(1).day()); a.doForecast(); MyMoneyAccount a_cash = file->account(acCash); @@ -713,13 +713,13 @@ void MyMoneyForecastTest::testAccountMaximumBalanceDateList() { TQDate maxDate = *it; - CPPUNIT_ASSERT(maxDate==TQDate::tqcurrentDate().addDays(1)); + CPPUNIT_ASSERT(maxDate==TQDate::currentDate().addDays(1)); it++; maxDate = *it; - CPPUNIT_ASSERT(maxDate==TQDate::tqcurrentDate().addDays(3)); + CPPUNIT_ASSERT(maxDate==TQDate::currentDate().addDays(3)); it++; maxDate = *it; - CPPUNIT_ASSERT(maxDate==TQDate::tqcurrentDate().addDays(5)); + CPPUNIT_ASSERT(maxDate==TQDate::currentDate().addDays(5)); } @@ -728,8 +728,8 @@ void MyMoneyForecastTest::testAccountAverageBalance() { //set up environment MyMoneyForecast a; - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); + TransactionHelper t1( TQDate::currentDate().addDays(-2), MyMoneySplit::ActionWithdrawal, this->moT1, acCash, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT2, acCash, acSolo); a.setForecastMethod(1); a.setForecastDays(3); @@ -741,9 +741,9 @@ void MyMoneyForecastTest::testAccountAverageBalance() { MyMoneyAccount a_cash = file->account(acCash); //test - MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(1)); - MyMoneyMoney b_cash2 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(2)); - MyMoneyMoney b_cash3 = a.forecastBalance(a_cash, TQDate::tqcurrentDate().addDays(3)); + MyMoneyMoney b_cash1 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(1)); + MyMoneyMoney b_cash2 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(2)); + MyMoneyMoney b_cash3 = a.forecastBalance(a_cash, TQDate::currentDate().addDays(3)); MyMoneyMoney average = (b_cash1 + b_cash2 +b_cash3)/MyMoneyMoney(3,1); @@ -765,7 +765,7 @@ void MyMoneyForecastTest::testBeginForecastDate() { a.doForecast(); //test when using old method without begin day - CPPUNIT_ASSERT(TQDate::tqcurrentDate() == a.beginForecastDate()); + CPPUNIT_ASSERT(TQDate::currentDate() == a.beginForecastDate()); //setup begin to last day of month a.setBeginForecastDay(31); @@ -773,22 +773,22 @@ void MyMoneyForecastTest::testBeginForecastDate() { a.doForecast(); //test - if(TQDate::tqcurrentDate().day() < beginDay) + if(TQDate::currentDate().day() < beginDay) { - if(TQDate::tqcurrentDate().daysInMonth() < beginDay) - beginDay = TQDate::tqcurrentDate().daysInMonth(); + if(TQDate::currentDate().daysInMonth() < beginDay) + beginDay = TQDate::currentDate().daysInMonth(); - beginDate = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), beginDay); + beginDate = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), beginDay); CPPUNIT_ASSERT(beginDate == a.beginForecastDate()); } //setup begin day to same date - a.setBeginForecastDay(TQDate::tqcurrentDate().day()); + a.setBeginForecastDay(TQDate::currentDate().day()); beginDay = a.beginForecastDay(); a.doForecast(); - CPPUNIT_ASSERT(TQDate::tqcurrentDate() == a.beginForecastDate()); + CPPUNIT_ASSERT(TQDate::currentDate() == a.beginForecastDate()); //setup to first day of month with small interval a.setBeginForecastDay(1); @@ -797,14 +797,14 @@ void MyMoneyForecastTest::testBeginForecastDate() { a.doForecast(); //test - if(TQDate::tqcurrentDate() == a.beginForecastDate()) { - CPPUNIT_ASSERT(TQDate::tqcurrentDate() == a.beginForecastDate()); + if(TQDate::currentDate() == a.beginForecastDate()) { + CPPUNIT_ASSERT(TQDate::currentDate() == a.beginForecastDate()); } else { - beginDay = ((((TQDate::tqcurrentDate().day() - beginDay)/a.accountsCycle()) + 1) * a.accountsCycle()) + beginDay; - if(beginDay > TQDate::tqcurrentDate().daysInMonth()) - beginDay = TQDate::tqcurrentDate().daysInMonth(); - beginDate = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), beginDay); - if(TQDate::tqcurrentDate().day() == TQDate::tqcurrentDate().daysInMonth() ) { + beginDay = ((((TQDate::currentDate().day() - beginDay)/a.accountsCycle()) + 1) * a.accountsCycle()) + beginDay; + if(beginDay > TQDate::currentDate().daysInMonth()) + beginDay = TQDate::currentDate().daysInMonth(); + beginDate = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), beginDay); + if(TQDate::currentDate().day() == TQDate::currentDate().daysInMonth() ) { std::cout << std::endl << "testBeginForecastDate(): test of first day of month with small interval skipped because it is the last day of month" << std::endl; } else { CPPUNIT_ASSERT(beginDate == a.beginForecastDate()); @@ -813,9 +813,9 @@ void MyMoneyForecastTest::testBeginForecastDate() { //setup to test when current date plus cycle equals begin day a.setAccountsCycle(14); - beginDay = TQDate::tqcurrentDate().addDays(14).day(); + beginDay = TQDate::currentDate().addDays(14).day(); a.setBeginForecastDay(beginDay); - beginDate = TQDate::tqcurrentDate().addDays(14); + beginDate = TQDate::currentDate().addDays(14); a.doForecast(); //test @@ -826,10 +826,10 @@ void MyMoneyForecastTest::testBeginForecastDate() { a.setAccountsCycle(40); a.doForecast(); - beginDate = TQDate(TQDate::tqcurrentDate().addMonths(1).year(), TQDate::tqcurrentDate().addMonths(1).month(), 1); + beginDate = TQDate(TQDate::currentDate().addMonths(1).year(), TQDate::currentDate().addMonths(1).month(), 1); //test - if(TQDate::tqcurrentDate().day() > 1) { + if(TQDate::currentDate().day() > 1) { CPPUNIT_ASSERT(beginDate == a.beginForecastDate()); } else { //test is not valid if today is 1st of month @@ -841,8 +841,8 @@ void MyMoneyForecastTest::testBeginForecastDate() { { MyMoneyForecast a; - CPPUNIT_ASSERT(a.historyStartDate() == TQDate::tqcurrentDate().addDays(-a.forecastCycles()*a.accountsCycle()) ); - CPPUNIT_ASSERT(a.historyEndDate() == TQDate::tqcurrentDate().addDays(-1) ); + CPPUNIT_ASSERT(a.historyStartDate() == TQDate::currentDate().addDays(-a.forecastCycles()*a.accountsCycle()) ); + CPPUNIT_ASSERT(a.historyEndDate() == TQDate::currentDate().addDays(-1) ); CPPUNIT_ASSERT(a.historyDays() == a.forecastCycles()*a.accountsCycle()); a.setForecastMethod(1); @@ -852,9 +852,9 @@ void MyMoneyForecastTest::testBeginForecastDate() { a.setBeginForecastDay(0); a.doForecast(); - CPPUNIT_ASSERT(a.historyStartDate() == TQDate::tqcurrentDate().addDays(-14*3) ); + CPPUNIT_ASSERT(a.historyStartDate() == TQDate::currentDate().addDays(-14*3) ); CPPUNIT_ASSERT(a.historyDays() == (14*3)); - CPPUNIT_ASSERT(a.historyEndDate() == (TQDate::tqcurrentDate().addDays(-1)) ); + CPPUNIT_ASSERT(a.historyEndDate() == (TQDate::currentDate().addDays(-1)) ); } void MyMoneyForecastTest::testCreateBudget() @@ -910,14 +910,14 @@ void MyMoneyForecastTest::testCreateBudget() MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_MONTHLY, 1, MyMoneySchedule::STYPE_DIRECTDEBIT, - TQDate::tqcurrentDate(), + TQDate::currentDate(), TQDate(), true, true); MyMoneyTransaction t10; - t10.setPostDate(TQDate::tqcurrentDate().addMonths(1)); - t10.setEntryDate(TQDate::tqcurrentDate().addMonths(1)); + t10.setPostDate(TQDate::currentDate().addMonths(1)); + t10.setEntryDate(TQDate::currentDate().addMonths(1)); //t.setId("T000000000000000001"); t10.setBankID("BID"); t10.setMemo("Wohnung:Miete"); @@ -951,12 +951,12 @@ void MyMoneyForecastTest::testCreateBudget() MyMoneyForecast c; c.setForecastMethod(0); c.setForecastCycles(1); - c.createBudget(budget, TQDate::tqcurrentDate().addYears(-2), TQDate::tqcurrentDate().addYears(-1), TQDate::tqcurrentDate().addMonths(-2), TQDate::tqcurrentDate().addMonths(6), true); + c.createBudget(budget, TQDate::currentDate().addYears(-2), TQDate::currentDate().addYears(-1), TQDate::currentDate().addMonths(-2), TQDate::currentDate().addMonths(6), true); - MyMoneyMoney c_parent = c.forecastBalance(a_parent, TQDate(TQDate::tqcurrentDate().addMonths(1).year(), TQDate::tqcurrentDate().addMonths(1).month(), 1) ); + MyMoneyMoney c_parent = c.forecastBalance(a_parent, TQDate(TQDate::currentDate().addMonths(1).year(), TQDate::currentDate().addMonths(1).month(), 1) ); //test valid results - CPPUNIT_ASSERT(c.forecastBalance(a_parent, TQDate(TQDate::tqcurrentDate().addMonths(1).year(), TQDate::tqcurrentDate().addMonths(1).month(), 1) ) == (moT2)); + CPPUNIT_ASSERT(c.forecastBalance(a_parent, TQDate(TQDate::currentDate().addMonths(1).year(), TQDate::currentDate().addMonths(1).month(), 1) ) == (moT2)); } void MyMoneyForecastTest::testLinearRegression() { @@ -967,9 +967,9 @@ void MyMoneyForecastTest::testLinearRegression() { MyMoneyAccount a_credit = file->account(acCredit); //setup some transactions - TransactionHelper t1( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); - TransactionHelper t2( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); - TransactionHelper t3( TQDate::tqcurrentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); + TransactionHelper t1( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionWithdrawal, this->moT1, acChecking, acSolo); + TransactionHelper t2( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionDeposit, -(this->moT2), acCredit, acParent); + TransactionHelper t3( TQDate::currentDate().addDays(-1), MyMoneySplit::ActionTransfer, this->moT1, acCredit, acChecking); //TODO Add tests specific for linear regression diff --git a/kmymoney2/mymoney/mymoneyinstitution.cpp b/kmymoney2/mymoney/mymoneyinstitution.cpp index 6e5b102..1576cf3 100644 --- a/kmymoney2/mymoney/mymoneyinstitution.cpp +++ b/kmymoney2/mymoney/mymoneyinstitution.cpp @@ -72,7 +72,7 @@ MyMoneyInstitution::MyMoneyInstitution(const TQDomElement& node) : TQDomNodeList nodeList = node.elementsByTagName("ADDRESS"); if(nodeList.count() == 0) { - TQString msg = TQString("No ADDRESS in institution %1").tqarg(m_name); + TQString msg = TQString("No ADDRESS in institution %1").arg(m_name); throw new MYMONEYEXCEPTION(msg); } @@ -177,6 +177,6 @@ bool MyMoneyInstitution::hasReferenceTo(const TQString& /* id */) const } TQPixmap MyMoneyInstitution::pixmap() const { - return TQPixmap(KGlobal::dirs()->findResource("appdata",TQString( "icons/hicolor/22x22/actions/%1.png").tqarg("bank"))); + return TQPixmap(KGlobal::dirs()->findResource("appdata",TQString( "icons/hicolor/22x22/actions/%1.png").arg("bank"))); } diff --git a/kmymoney2/mymoney/mymoneymoney.cpp b/kmymoney2/mymoney/mymoneymoney.cpp index 5a8b562..2d380d3 100644 --- a/kmymoney2/mymoney/mymoneymoney.cpp +++ b/kmymoney2/mymoney/mymoneymoney.cpp @@ -145,7 +145,7 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount) // a) numeric // b) _decimalSeparator // c) negative indicator - TQString validChars = TQString("\\d%1").tqarg(TQChar(decimalSeparator())); + TQString validChars = TQString("\\d%1").arg(TQChar(decimalSeparator())); // we need to escape the minus sign here, because later on it will be // part of "\d,-()" and that does not work. It needs to be "\d,\-()" // And we need two of them, because we're in C @@ -158,11 +158,11 @@ MyMoneyMoney::MyMoneyMoney(const TQString& pszAmount) validChars += negChars; // qDebug("0: '%s'", validChars.data()); - TQRegExp invChars(TQString("[^%1]").tqarg(validChars)); + TQRegExp invChars(TQString("[^%1]").arg(validChars)); // qDebug("1: '%s'", res.data()); res.remove(invChars); - TQRegExp negCharSet(TQString("[%1]").tqarg(negChars)); + TQRegExp negCharSet(TQString("[%1]").arg(negChars)); bool isNegative = false; if(res.find(negCharSet) != -1) { isNegative = true; @@ -243,12 +243,12 @@ TQString MyMoneyMoney::formatMoney(const TQString& currency, const int prec, boo // TQString.sprintf("%Ld") did not work :-(, so I had to // do it the old ugly way. while(tmp) { - res.insert(0, TQString("%1").tqarg(static_cast<int>(tmp % 10))); + res.insert(0, TQString("%1").arg(static_cast<int>(tmp % 10))); tmp /= 10; } } else - res = TQString("%1").tqarg((long)left); + res = TQString("%1").arg((long)left); if(showThousandSeparator) { int pos = res.length(); @@ -262,13 +262,13 @@ TQString MyMoneyMoney::formatMoney(const TQString& currency, const int prec, boo // using // - // res += TQString("%1").tqarg(right).rightJustify(prec, '0', true); + // res += TQString("%1").arg(right).rightJustify(prec, '0', true); // // caused some weird results if right was rather large. Eg: right being // 666600000 should have appended a 0, but instead it prepended a 0. With // res being "2," the result wasn't "2,6666000000" as expected, but rather // "2,0666600000" which was not usable. The code below works for me. - TQString rs = TQString("%1").tqarg(right); + TQString rs = TQString("%1").arg(right); if(prec != -1) rs = rs.rightJustify(prec, '0', true); else { @@ -325,7 +325,7 @@ const TQString MyMoneyMoney::toString(void) const // TQString.sprintf("%Ld") did not work :-(, so I had to // do it the old ugly way. while(tmp) { - res.prepend(TQString("%1").tqarg(static_cast<int>(tmp % 10))); + res.prepend(TQString("%1").arg(static_cast<int>(tmp % 10))); tmp /= 10; } if(res.isEmpty()) @@ -336,7 +336,7 @@ const TQString MyMoneyMoney::toString(void) const tmp = m_denom; while(tmp) { - resf.prepend(TQString("%1").tqarg(static_cast<int>(tmp % 10))); + resf.prepend(TQString("%1").arg(static_cast<int>(tmp % 10))); tmp /= 10; } return res + "/" + resf; diff --git a/kmymoney2/mymoney/mymoneypayee.cpp b/kmymoney2/mymoney/mymoneypayee.cpp index b2eab64..b37b111 100644 --- a/kmymoney2/mymoney/mymoneypayee.cpp +++ b/kmymoney2/mymoney/mymoneypayee.cpp @@ -91,7 +91,7 @@ MyMoneyPayee::MyMoneyPayee(const TQDomElement& node) : TQDomNodeList nodeList = node.elementsByTagName("ADDRESS"); if(nodeList.count() == 0) { - TQString msg = TQString("No ADDRESS in payee %1").tqarg(m_name); + TQString msg = TQString("No ADDRESS in payee %1").arg(m_name); throw new MYMONEYEXCEPTION(msg); } diff --git a/kmymoney2/mymoney/mymoneyprice.cpp b/kmymoney2/mymoney/mymoneyprice.cpp index df43221..77054b5 100644 --- a/kmymoney2/mymoney/mymoneyprice.cpp +++ b/kmymoney2/mymoney/mymoneyprice.cpp @@ -88,7 +88,7 @@ const MyMoneyMoney MyMoneyPrice::rate(const TQString& id) const if(id == m_fromSecurity) return m_invRate; - TQString msg = TQString("Unknown security id %1 for price info %2/%3.").tqarg(id).tqarg(m_fromSecurity).tqarg(m_toSecurity); + TQString msg = TQString("Unknown security id %1 for price info %2/%3.").arg(id).arg(m_fromSecurity).arg(m_toSecurity); throw new MYMONEYEXCEPTION(msg); } diff --git a/kmymoney2/mymoney/mymoneyreport.cpp b/kmymoney2/mymoney/mymoneyreport.cpp index 2904ed5..432a352 100644 --- a/kmymoney2/mymoney/mymoneyreport.cpp +++ b/kmymoney2/mymoney/mymoneyreport.cpp @@ -201,8 +201,8 @@ void MyMoneyReport::validDateRange ( TQDate& _db, TQDate& _de ) tmpBegin = list.front().postDate(); tmpEnd = list.back().postDate(); } else { - tmpBegin = TQDate ( TQDate::tqcurrentDate().year(), 1, 1 ); // the first date in the file - tmpEnd = TQDate ( TQDate::tqcurrentDate().year(), 12, 31 );// the last date in the file + tmpBegin = TQDate ( TQDate::currentDate().year(), 1, 1 ); // the first date in the file + tmpEnd = TQDate ( TQDate::currentDate().year(), 12, 31 );// the last date in the file } if ( !_db.isValid() ) _db = tmpBegin; diff --git a/kmymoney2/mymoney/mymoneyreport.h b/kmymoney2/mymoney/mymoneyreport.h index a04573f..a7bfc98 100644 --- a/kmymoney2/mymoney/mymoneyreport.h +++ b/kmymoney2/mymoney/mymoneyreport.h @@ -45,8 +45,8 @@ class TQDomDocument; * A report is a transactionfilter, so any report can specify which * transactions it's interested down to the most minute level of detail. * It extends the transactionfilter by providing identification (name, - * comments, group type, etc) as well as tqlayout information (what kind - * of tqlayout should be used, how the rows & columns should be presented, + * comments, group type, etc) as well as layout information (what kind + * of layout should be used, how the rows & columns should be presented, * currency converted, etc.) * * As noted above, this class only provides a report DEFINITION. The diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp index 594bc69..a2eb6dd 100644 --- a/kmymoney2/mymoney/mymoneyscheduled.cpp +++ b/kmymoney2/mymoney/mymoneyscheduled.cpp @@ -680,7 +680,7 @@ bool MyMoneySchedule::isOverdue() const if (isFinished()) return false; - if(adjustedNextDueDate() >= TQDate::tqcurrentDate()) + if(adjustedNextDueDate() >= TQDate::currentDate()) return false; return true; @@ -843,14 +843,14 @@ TQString MyMoneySchedule::occurenceToString(int mult, occurenceE type) switch (mult) { case 1: occurenceString = I18N_NOOP("Once"); break; - default: occurenceString = I18N_NOOP(static_cast<TQString>("%1 times").tqarg(mult)); + default: occurenceString = I18N_NOOP(static_cast<TQString>("%1 times").arg(mult)); } else if(type == MyMoneySchedule::OCCUR_DAILY) switch (mult) { case 1: occurenceString = I18N_NOOP("Daily"); break; case 30: occurenceString = I18N_NOOP("Every thirty days"); break; - default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 days").tqarg(mult)); + default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 days").arg(mult)); } else if(type == MyMoneySchedule::OCCUR_WEEKLY) switch (mult) @@ -860,13 +860,13 @@ TQString MyMoneySchedule::occurenceToString(int mult, occurenceE type) case 3: occurenceString = I18N_NOOP("Every three weeks"); break; case 4: occurenceString = I18N_NOOP("Every four weeks"); break; case 8: occurenceString = I18N_NOOP("Every eight weeks"); break; - default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 weeks").tqarg(mult)); + default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 weeks").arg(mult)); } else if(type == MyMoneySchedule::OCCUR_EVERYHALFMONTH) switch (mult) { case 1: occurenceString = I18N_NOOP("Every half month"); break; - default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 half months").tqarg(mult)); + default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 half months").arg(mult)); } else if(type == MyMoneySchedule::OCCUR_MONTHLY) switch (mult) @@ -876,14 +876,14 @@ TQString MyMoneySchedule::occurenceToString(int mult, occurenceE type) case 3: occurenceString = I18N_NOOP("Every three months"); break; case 4: occurenceString = I18N_NOOP("Every four months"); break; case 6: occurenceString = I18N_NOOP("Twice yearly"); break; - default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 months").tqarg(mult)); + default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 months").arg(mult)); } else if(type == MyMoneySchedule::OCCUR_YEARLY) switch (mult) { case 1: occurenceString = I18N_NOOP("Yearly"); break; case 2: occurenceString = I18N_NOOP("Every other year"); break; - default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 years").tqarg(mult)); + default: occurenceString = I18N_NOOP(static_cast<TQString>("Every %1 years").arg(mult)); } return occurenceString; } @@ -1008,7 +1008,7 @@ void MyMoneySchedule::setVariation(int var) #if 0 deletePair("kmm-variation"); if(var != 0) - setValue("kmm-variation", TQString("%1").tqarg(var)); + setValue("kmm-variation", TQString("%1").arg(var)); #endif } diff --git a/kmymoney2/mymoney/mymoneyscheduled.h b/kmymoney2/mymoney/mymoneyscheduled.h index cf5cb07..9f8fedd 100644 --- a/kmymoney2/mymoney/mymoneyscheduled.h +++ b/kmymoney2/mymoney/mymoneyscheduled.h @@ -409,7 +409,7 @@ public: * are no more payments then an empty/invalid TQDate() will * be returned. */ - TQDate adjustedNextPayment(const TQDate& refDate = TQDate::tqcurrentDate()) const; + TQDate adjustedNextPayment(const TQDate& refDate = TQDate::currentDate()) const; /** * Calculates the date of the next payment. @@ -422,7 +422,7 @@ public: * if there is no more payments then an empty/invalid TQDate() * will be returned. */ - TQDate nextPayment(const TQDate& refDate = TQDate::tqcurrentDate()) const; + TQDate nextPayment(const TQDate& refDate = TQDate::currentDate()) const; /** * Calculates the dates of the payment over a certain period of time. diff --git a/kmymoney2/mymoney/mymoneyscheduletest.cpp b/kmymoney2/mymoney/mymoneyscheduletest.cpp index 07b3cc6..3fe6afe 100644 --- a/kmymoney2/mymoney/mymoneyscheduletest.cpp +++ b/kmymoney2/mymoney/mymoneyscheduletest.cpp @@ -55,7 +55,7 @@ void MyMoneyScheduleTest::testConstructor() { MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 1, MyMoneySchedule::STYPE_DIRECTDEBIT, - TQDate::tqcurrentDate(), + TQDate::currentDate(), TQDate(), true, true); @@ -82,8 +82,8 @@ void MyMoneyScheduleTest::testSetFunctions() { s.setType(MyMoneySchedule::TYPE_BILL); CPPUNIT_ASSERT(s.type() == MyMoneySchedule::TYPE_BILL); - s.setEndDate(TQDate::tqcurrentDate()); - CPPUNIT_ASSERT(s.endDate() == TQDate::tqcurrentDate()); + s.setEndDate(TQDate::currentDate()); + CPPUNIT_ASSERT(s.endDate() == TQDate::currentDate()); CPPUNIT_ASSERT(s.willEnd() == true); } @@ -229,16 +229,16 @@ void MyMoneyScheduleTest::testOverdue() MyMoneySchedule sch_overdue; MyMoneySchedule sch_intime; - // the following checks only work correctly, if tqcurrentDate() is + // the following checks only work correctly, if currentDate() is // between the 1st and 27th. If it is between 28th and 31st // we don't perform them. Note: this should be fixed. - if(TQDate::tqcurrentDate().day() > 27 || TQDate::tqcurrentDate().day() == 1) { + if(TQDate::currentDate().day() > 27 || TQDate::currentDate().day() == 1) { std::cout << std::endl << "testOverdue() skipped because current day is between 28th and 2nd" << std::endl; return; } - TQDate startDate = TQDate::tqcurrentDate().addDays(-1).addMonths(-23); - TQDate lastPaymentDate = TQDate::tqcurrentDate().addDays(-1).addMonths(-1); + TQDate startDate = TQDate::currentDate().addDays(-1).addMonths(-23); + TQDate lastPaymentDate = TQDate::currentDate().addDays(-1).addMonths(-1); TQString ref = TQString( "<!DOCTYPE TEST>\n" @@ -258,13 +258,13 @@ void MyMoneyScheduleTest::testOverdue() " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n"); - TQString ref_overdue = ref.tqarg(startDate.toString(Qt::ISODate)) - .tqarg(lastPaymentDate.toString(Qt::ISODate)) - .tqarg(lastPaymentDate.toString(Qt::ISODate)); + TQString ref_overdue = ref.arg(startDate.toString(Qt::ISODate)) + .arg(lastPaymentDate.toString(Qt::ISODate)) + .arg(lastPaymentDate.toString(Qt::ISODate)); - TQString ref_intime = ref.tqarg(startDate.addDays(1).toString(Qt::ISODate)) - .tqarg(lastPaymentDate.addDays(1).toString(Qt::ISODate)) - .tqarg(lastPaymentDate.addDays(1).toString(Qt::ISODate)); + TQString ref_intime = ref.arg(startDate.addDays(1).toString(Qt::ISODate)) + .arg(lastPaymentDate.addDays(1).toString(Qt::ISODate)) + .arg(lastPaymentDate.addDays(1).toString(Qt::ISODate)); TQDomDocument doc; TQDomElement node; @@ -1010,13 +1010,13 @@ void MyMoneyScheduleTest::testWriteXML() { MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 123, MyMoneySchedule::STYPE_DIRECTDEBIT, - TQDate::tqcurrentDate(), + TQDate::currentDate(), TQDate(), true, true); - sch.setLastPayment(TQDate::tqcurrentDate()); - sch.recordPayment(TQDate::tqcurrentDate()); + sch.setLastPayment(TQDate::currentDate()); + sch.recordPayment(TQDate::currentDate()); sch.setId("SCH0001"); MyMoneyTransaction t; @@ -1070,9 +1070,9 @@ void MyMoneyScheduleTest::testWriteXML() { " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n" - ).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + ).arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)); CPPUNIT_ASSERT(doc.toString() == ref); } @@ -1098,9 +1098,9 @@ void MyMoneyScheduleTest::testReadXML() { " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n" - ).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + ).arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)); // diff to ref_ok1 is that we now have an empty entrydate // in the transaction parameters @@ -1122,9 +1122,9 @@ void MyMoneyScheduleTest::testReadXML() { " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n" - ).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + ).arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)); TQString ref_false = TQString( "<!DOCTYPE TEST>\n" @@ -1144,9 +1144,9 @@ void MyMoneyScheduleTest::testReadXML() { " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n" - ).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + ).arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)); TQDomDocument doc; TQDomElement node; @@ -1167,13 +1167,13 @@ void MyMoneyScheduleTest::testReadXML() { try { sch = MyMoneySchedule(node); CPPUNIT_ASSERT(sch.id() == "SCH0002"); - CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::tqcurrentDate().addDays(7)); - CPPUNIT_ASSERT(sch.startDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::currentDate().addDays(7)); + CPPUNIT_ASSERT(sch.startDate() == TQDate::currentDate()); CPPUNIT_ASSERT(sch.endDate() == TQDate()); CPPUNIT_ASSERT(sch.autoEnter() == true); CPPUNIT_ASSERT(sch.isFixed() == true); CPPUNIT_ASSERT(sch.weekendOption() == MyMoneySchedule::MoveNothing); - CPPUNIT_ASSERT(sch.lastPayment() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(sch.lastPayment() == TQDate::currentDate()); CPPUNIT_ASSERT(sch.paymentType() == MyMoneySchedule::STYPE_DIRECTDEBIT); CPPUNIT_ASSERT(sch.type() == MyMoneySchedule::TYPE_BILL); CPPUNIT_ASSERT(sch.name() == "A Name"); @@ -1181,7 +1181,7 @@ void MyMoneyScheduleTest::testReadXML() { CPPUNIT_ASSERT(sch.occurenceMultiplier() == 1); CPPUNIT_ASSERT(sch.nextDueDate() == sch.lastPayment().addDays(7)); CPPUNIT_ASSERT(sch.recordedPayments().count() == 1); - CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::currentDate()); } catch(MyMoneyException *e) { delete e; CPPUNIT_FAIL("Unexpected exception"); @@ -1194,13 +1194,13 @@ void MyMoneyScheduleTest::testReadXML() { try { sch = MyMoneySchedule(node); CPPUNIT_ASSERT(sch.id() == "SCH0002"); - CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::tqcurrentDate().addDays(7)); - CPPUNIT_ASSERT(sch.startDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(sch.nextDueDate() == TQDate::currentDate().addDays(7)); + CPPUNIT_ASSERT(sch.startDate() == TQDate::currentDate()); CPPUNIT_ASSERT(sch.endDate() == TQDate()); CPPUNIT_ASSERT(sch.autoEnter() == true); CPPUNIT_ASSERT(sch.isFixed() == true); CPPUNIT_ASSERT(sch.weekendOption() == MyMoneySchedule::MoveNothing); - CPPUNIT_ASSERT(sch.lastPayment() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(sch.lastPayment() == TQDate::currentDate()); CPPUNIT_ASSERT(sch.paymentType() == MyMoneySchedule::STYPE_DIRECTDEBIT); CPPUNIT_ASSERT(sch.type() == MyMoneySchedule::TYPE_BILL); CPPUNIT_ASSERT(sch.name() == "A Name"); @@ -1208,7 +1208,7 @@ void MyMoneyScheduleTest::testReadXML() { CPPUNIT_ASSERT(sch.occurenceMultiplier() == 1); CPPUNIT_ASSERT(sch.nextDueDate() == sch.lastPayment().addDays(7)); CPPUNIT_ASSERT(sch.recordedPayments().count() == 1); - CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(sch.recordedPayments()[0] == TQDate::currentDate()); } catch(MyMoneyException *e) { delete e; CPPUNIT_FAIL("Unexpected exception"); @@ -1236,9 +1236,9 @@ void MyMoneyScheduleTest::testHasReferenceTo() " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n" - ).tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)) - .tqarg(TQDate::tqcurrentDate().toString(Qt::ISODate)); + ).arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)) + .arg(TQDate::currentDate().toString(Qt::ISODate)); TQDomDocument doc; TQDomElement node; @@ -1872,7 +1872,7 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime() // https://bugs.kde.org/show_bug.cgi?id=231029 MyMoneySchedule sch; - TQDate paymentInFuture = TQDate::tqcurrentDate().addDays(7); + TQDate paymentInFuture = TQDate::currentDate().addDays(7); TQString ref_ok = TQString( "<!DOCTYPE TEST>\n" @@ -1887,9 +1887,9 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime() " </TRANSACTION>\n" " </SCHEDULED_TX>\n" "</SCHEDULE-CONTAINER>\n" - ).tqarg(paymentInFuture.toString(Qt::ISODate)) - .tqarg(paymentInFuture.toString(Qt::ISODate)) - .tqarg(paymentInFuture.toString(Qt::ISODate)); + ).arg(paymentInFuture.toString(Qt::ISODate)) + .arg(paymentInFuture.toString(Qt::ISODate)) + .arg(paymentInFuture.toString(Qt::ISODate)); TQDomDocument doc; TQDomElement node; @@ -1900,7 +1900,7 @@ void MyMoneyScheduleTest::testPaidEarlyOneTime() sch = MyMoneySchedule(node); CPPUNIT_ASSERT(sch.isFinished() == true); CPPUNIT_ASSERT(sch.occurencePeriod() == MyMoneySchedule::OCCUR_MONTHLY); - CPPUNIT_ASSERT(sch.paymentDates(TQDate::tqcurrentDate(), TQDate::tqcurrentDate().addDays(21)).count() == 0); + CPPUNIT_ASSERT(sch.paymentDates(TQDate::currentDate(), TQDate::currentDate().addDays(21)).count() == 0); } catch (MyMoneyException *e) { delete e; CPPUNIT_FAIL("Unexpected exception"); diff --git a/kmymoney2/mymoney/mymoneystatement.cpp b/kmymoney2/mymoney/mymoneystatement.cpp index 14df720..6e92d8b 100644 --- a/kmymoney2/mymoney/mymoneystatement.cpp +++ b/kmymoney2/mymoney/mymoneystatement.cpp @@ -27,7 +27,7 @@ #include <tqdom.h> #include <tqstringlist.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // Project Includes @@ -245,7 +245,7 @@ void MyMoneyStatement::writeXMLFile( const MyMoneyStatement& _s, const TQString& static unsigned filenum = 1; TQString filename = _filename; if ( filename.isEmpty() ) { - filename = TQString("statement-%1%2.xml").tqarg((filenum<10)?"0":"").tqarg(filenum); + filename = TQString("statement-%1%2.xml").arg((filenum<10)?"0":"").arg(filenum); filenum++; } diff --git a/kmymoney2/mymoney/mymoneytransaction.cpp b/kmymoney2/mymoney/mymoneytransaction.cpp index 79f4fd9..a46bb79 100644 --- a/kmymoney2/mymoney/mymoneytransaction.cpp +++ b/kmymoney2/mymoney/mymoneytransaction.cpp @@ -39,7 +39,7 @@ MyMoneyTransaction::MyMoneyTransaction(const TQString id, const MyMoneyTransacti *this = transaction; m_id = id; if(m_entryDate == TQDate()) - m_entryDate = TQDate::tqcurrentDate(); + m_entryDate = TQDate::currentDate(); TQValueList<MyMoneySplit>::Iterator it; for(it = m_splits.begin(); it != m_splits.end(); ++it) { @@ -188,7 +188,7 @@ void MyMoneyTransaction::modifySplit(MyMoneySplit& split) return; } } - throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").tqarg(split.id())); + throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").arg(split.id())); } void MyMoneyTransaction::removeSplit(const MyMoneySplit& split) @@ -202,7 +202,7 @@ void MyMoneyTransaction::removeSplit(const MyMoneySplit& split) } } if(it == m_splits.end()) - throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").tqarg(split.id())); + throw new MYMONEYEXCEPTION(TQString("Invalid split id '%1'").arg(split.id())); } void MyMoneyTransaction::removeSplits(void) @@ -219,7 +219,7 @@ const MyMoneySplit& MyMoneyTransaction::splitByPayee(const TQString& payeeId) co if((*it).payeeId() == payeeId) return *it; } - throw new MYMONEYEXCEPTION(TQString("Split not found for payee '%1'").tqarg(TQString(payeeId))); + throw new MYMONEYEXCEPTION(TQString("Split not found for payee '%1'").arg(TQString(payeeId))); } const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQString& accountId, const bool match) const @@ -232,7 +232,7 @@ const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQString& accountId if(match == false && (*it).accountId() != accountId) return *it; } - throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%2").tqarg(match?"":"!").tqarg(TQString(accountId))); + throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%2").arg(match?"":"!").arg(TQString(accountId))); } const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQStringList& accountIds, const bool match) const @@ -245,7 +245,7 @@ const MyMoneySplit& MyMoneyTransaction::splitByAccount(const TQStringList& accou if(match == false && !accountIds.contains((*it).accountId())) return *it; } - throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%1...%2").tqarg(match?"":"!").tqarg(accountIds.front(),accountIds.back())); + throw new MYMONEYEXCEPTION(TQString("Split not found for account %1%1...%2").arg(match?"":"!").arg(accountIds.front(),accountIds.back())); } const MyMoneySplit& MyMoneyTransaction::splitById(const TQString& splitId) const @@ -256,7 +256,7 @@ const MyMoneySplit& MyMoneyTransaction::splitById(const TQString& splitId) const if((*it).id() == splitId) return *it; } - throw new MYMONEYEXCEPTION(TQString("Split not found for id '%1'").tqarg(TQString(splitId))); + throw new MYMONEYEXCEPTION(TQString("Split not found for id '%1'").arg(TQString(splitId))); } const TQString MyMoneyTransaction::nextSplitID() @@ -334,7 +334,7 @@ unsigned long MyMoneyTransaction::hash(const TQString& txt, unsigned long h) unsigned long g; for(unsigned i=0; i < txt.length(); ++i) { - unsigned short uc = txt[i].tqunicode(); + unsigned short uc = txt[i].unicode(); for(unsigned j = 0; j < 2; ++j) { unsigned char c = uc & 0xff; // if either the cell or the row of the Unicode char is 0, stop processing @@ -467,7 +467,7 @@ TQString MyMoneyTransaction::accountSignature(bool includeSplitCount) const rc += "-"; rc += it_a.key(); if(includeSplitCount) - rc += TQString("*%1").tqarg(*it_a); + rc += TQString("*%1").arg(*it_a); } return rc; } diff --git a/kmymoney2/mymoney/mymoneytransactionfilter.cpp b/kmymoney2/mymoney/mymoneytransactionfilter.cpp index 7998051..d80b8ac 100644 --- a/kmymoney2/mymoney/mymoneytransactionfilter.cpp +++ b/kmymoney2/mymoney/mymoneytransactionfilter.cpp @@ -711,9 +711,9 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, { bool rc = true; int yr, mon, day; - yr = TQDate::tqcurrentDate().year(); - mon = TQDate::tqcurrentDate().month(); - day = TQDate::tqcurrentDate().day(); + yr = TQDate::currentDate().year(); + mon = TQDate::currentDate().month(); + day = TQDate::currentDate().day(); TQDate tmp; switch(id) { @@ -723,7 +723,7 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, break; case MyMoneyTransactionFilter::asOfToday: start = TQDate(); - end = TQDate::tqcurrentDate(); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::currentMonth: start = TQDate(yr,mon,1); @@ -735,11 +735,11 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, break; case MyMoneyTransactionFilter::monthToDate: start = TQDate(yr,mon,1); - end = TQDate::tqcurrentDate(); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::yearToDate: start = TQDate(yr,1,1); - end = TQDate::tqcurrentDate(); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::yearToMonth: start = TQDate(yr,1,1); @@ -754,56 +754,56 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, end = TQDate(yr,12,31).addYears(-1); break; case MyMoneyTransactionFilter::last7Days: - start = TQDate::tqcurrentDate().addDays(-7); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addDays(-7); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last30Days: - start = TQDate::tqcurrentDate().addDays(-30); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addDays(-30); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last3Months: - start = TQDate::tqcurrentDate().addMonths(-3); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addMonths(-3); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last6Months: - start = TQDate::tqcurrentDate().addMonths(-6); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addMonths(-6); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::last11Months: start = TQDate(yr,mon,1).addMonths(-12); end = TQDate(yr,mon,1).addDays(-1); break; case MyMoneyTransactionFilter::last12Months: - start = TQDate::tqcurrentDate().addMonths(-12); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate().addMonths(-12); + end = TQDate::currentDate(); break; case MyMoneyTransactionFilter::next7Days: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addDays(7); + start = TQDate::currentDate(); + end = TQDate::currentDate().addDays(7); break; case MyMoneyTransactionFilter::next30Days: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addDays(30); + start = TQDate::currentDate(); + end = TQDate::currentDate().addDays(30); break; case MyMoneyTransactionFilter::next3Months: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addMonths(3); + start = TQDate::currentDate(); + end = TQDate::currentDate().addMonths(3); break; case MyMoneyTransactionFilter::next6Months: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addMonths(6); + start = TQDate::currentDate(); + end = TQDate::currentDate().addMonths(6); break; case MyMoneyTransactionFilter::next12Months: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate().addMonths(12); + start = TQDate::currentDate(); + end = TQDate::currentDate().addMonths(12); break; case MyMoneyTransactionFilter::userDefined: start = TQDate(); end = TQDate(); break; case MyMoneyTransactionFilter::last3ToNext3Months: - start = TQDate::tqcurrentDate().addMonths(-3); - end = TQDate::tqcurrentDate().addMonths(3); + start = TQDate::currentDate().addMonths(-3); + end = TQDate::currentDate().addMonths(3); break; case MyMoneyTransactionFilter::currentQuarter: start = TQDate(yr, mon - ((mon-1) % 3), 1); @@ -818,21 +818,21 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, end = start.addMonths(3).addDays(-1); break; case MyMoneyTransactionFilter::currentFiscalYear: - start = TQDate(TQDate::tqcurrentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); - if(TQDate::tqcurrentDate() < start) + start = TQDate(TQDate::currentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); + if(TQDate::currentDate() < start) start = start.addYears(-1); end = start.addYears(1).addDays(-1); break; case MyMoneyTransactionFilter::lastFiscalYear: - start = TQDate(TQDate::tqcurrentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); - if(TQDate::tqcurrentDate() < start) + start = TQDate(TQDate::currentDate().year(), fiscalYearStartMonth, fiscalYearStartDay); + if(TQDate::currentDate() < start) start = start.addYears(-1); start = start.addYears(-1); end = start.addYears(1).addDays(-1); break; case MyMoneyTransactionFilter::today: - start = TQDate::tqcurrentDate(); - end = TQDate::tqcurrentDate(); + start = TQDate::currentDate(); + end = TQDate::currentDate(); break; default: qFatal("Unknown date identifier %d in MyMoneyTransactionFilter::translateDateRange()", id); @@ -845,13 +845,13 @@ bool MyMoneyTransactionFilter::translateDateRange(dateOptionE id, TQDate& start, void MyMoneyTransactionFilter::removeReference(const TQString& id) { if(m_accounts.find(id)) { - qDebug("%s", (TQString("Remove account '%1' from report").tqarg(id)).data()); + qDebug("%s", (TQString("Remove account '%1' from report").arg(id)).data()); m_accounts.remove(id); } else if(m_categories.find(id)) { - qDebug("%s", (TQString("Remove category '%1' from report").tqarg(id)).data()); + qDebug("%s", (TQString("Remove category '%1' from report").arg(id)).data()); m_categories.remove(id); } else if(m_payees.find(id)) { - qDebug("%s", (TQString("Remove payee '%1' from report").tqarg(id)).data()); + qDebug("%s", (TQString("Remove payee '%1' from report").arg(id)).data()); m_payees.remove(id); } } diff --git a/kmymoney2/mymoney/mymoneytransactiontest.cpp b/kmymoney2/mymoney/mymoneytransactiontest.cpp index 155dfe0..b69ade8 100644 --- a/kmymoney2/mymoney/mymoneytransactiontest.cpp +++ b/kmymoney2/mymoney/mymoneytransactiontest.cpp @@ -49,7 +49,7 @@ void MyMoneyTransactionTest::testConstructor() { MyMoneyTransaction a("ID", *m); CPPUNIT_ASSERT(a.id() == "ID"); - CPPUNIT_ASSERT(a.entryDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(a.entryDate() == TQDate::currentDate()); CPPUNIT_ASSERT(a.memo() == "Memo"); CPPUNIT_ASSERT(a.postDate() == TQDate(1,2,3)); } @@ -62,7 +62,7 @@ void MyMoneyTransactionTest::testCopyConstructor() { MyMoneyTransaction n(a); CPPUNIT_ASSERT(n.id() == "ID"); - CPPUNIT_ASSERT(n.entryDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(n.entryDate() == TQDate::currentDate()); CPPUNIT_ASSERT(n.memo() == "Memo"); CPPUNIT_ASSERT(n.postDate() == TQDate(1,2,3)); CPPUNIT_ASSERT(n.value("Key") == "Value"); @@ -78,7 +78,7 @@ void MyMoneyTransactionTest::testAssignmentConstructor() { n = a; CPPUNIT_ASSERT(n.id() == "ID"); - CPPUNIT_ASSERT(n.entryDate() == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(n.entryDate() == TQDate::currentDate()); CPPUNIT_ASSERT(n.memo() == "Memo"); CPPUNIT_ASSERT(n.postDate() == TQDate(1,2,3)); CPPUNIT_ASSERT(n.value("Key") == "Value"); diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index a80d5af..6324d4c 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -26,8 +26,8 @@ #define PASS } catch (MyMoneyException *e) { throw; } MyMoneyDatabaseMgr::MyMoneyDatabaseMgr() : -m_creationDate (TQDate::tqcurrentDate ()), -m_lastModificationDate (TQDate::tqcurrentDate ()), +m_creationDate (TQDate::currentDate ()), +m_lastModificationDate (TQDate::currentDate ()), m_sql (0) { } @@ -220,7 +220,7 @@ void MyMoneyDatabaseMgr::removePayee(const MyMoneyPayee& payee) TQMap<TQString, MyMoneyTransaction> transactionList = m_sql->fetchTransactions(); // make sure they're all here for(it_t = transactionList.begin(); it_t != transactionList.end(); ++it_t) { if((*it_t).hasReferenceTo(payee.id())) { - throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("transaction")); + throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("transaction")); } } @@ -228,7 +228,7 @@ void MyMoneyDatabaseMgr::removePayee(const MyMoneyPayee& payee) TQMap<TQString, MyMoneySchedule> scheduleList = m_sql->fetchSchedules(); // make sure they're all here for(it_s = scheduleList.begin(); it_s != scheduleList.end(); ++it_s) { if((*it_s).hasReferenceTo(payee.id())) { - throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("schedule")); + throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("schedule")); } } // remove any reference to report and/or budget @@ -532,7 +532,7 @@ void MyMoneyDatabaseMgr::modifyAccount(const MyMoneyAccount& account, const bool // update information in account list //m_accountList.modify(account.id(), account); - // tqinvalidate cached balance + // invalidate cached balance //FIXME: invalidateBalanceCache(account.id()); // mark file as changed @@ -913,7 +913,7 @@ const MyMoneyMoney MyMoneyDatabaseMgr::balance(const TQString& id, const TQDate& //DEBUG TQDate date_ (date); - //if (date_ == TQDate()) date_ = TQDate::tqcurrentDate(); + //if (date_ == TQDate()) date_ = TQDate::currentDate(); // END DEBUG MyMoneyMoney result(0); @@ -1278,7 +1278,7 @@ const TQValueList<MyMoneySchedule> MyMoneyDatabaseMgr::scheduleList(const TQStri TQDate nextPayment = (*pos).nextPayment((*pos).lastPayment()); if(!nextPayment.isValid()) continue; - if(nextPayment >= TQDate::tqcurrentDate()) + if(nextPayment >= TQDate::currentDate()) continue; */ } @@ -1344,7 +1344,7 @@ void MyMoneyDatabaseMgr::addCurrency(const MyMoneySecurity& currency) it = currencyList.find(currency.id()); if(it != currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").tqarg(currency.id())); + throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").arg(currency.id())); } m_sql->addCurrency(currency); @@ -1358,7 +1358,7 @@ void MyMoneyDatabaseMgr::modifyCurrency(const MyMoneySecurity& currency) it = currencyList.find(currency.id()); if(it == currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").tqarg(currency.id())); + throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").arg(currency.id())); } m_sql->modifyCurrency(currency); @@ -1373,7 +1373,7 @@ void MyMoneyDatabaseMgr::removeCurrency(const MyMoneySecurity& currency) it = currencyList.find(currency.id()); if(it == currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").tqarg(currency.id())); + throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").arg(currency.id())); } m_sql->removeCurrency(currency); @@ -1389,7 +1389,7 @@ const MyMoneySecurity MyMoneyDatabaseMgr::currency(const TQString& id) const it = currencyList.find(id); if(it == currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").tqarg(id)); + throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").arg(id)); } return *it; diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index d0d2065..30fe093 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -70,7 +70,7 @@ void MyMoneyDatabaseMgrTest::testEmptyConstructor() CPPUNIT_ASSERT(m->payeeList().count() == 0); CPPUNIT_ASSERT(m->scheduleList().count() == 0); - CPPUNIT_ASSERT(m->m_creationDate == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(m->m_creationDate == TQDate::currentDate()); } void MyMoneyDatabaseMgrTest::testCreateDb() { @@ -118,8 +118,8 @@ void MyMoneyDatabaseMgrTest::testAttachDb() { MyMoneyFile::instance()->detachStorage(); KSharedPtr <MyMoneyStorageSql> sql = m->connectToDatabase(m_url); CPPUNIT_ASSERT(sql); - int opentqStatus = sql->open(m_url, IO_ReadWrite); - CPPUNIT_ASSERT(0 == opentqStatus); + int openStatus = sql->open(m_url, IO_ReadWrite); + CPPUNIT_ASSERT(0 == openStatus); MyMoneyFile::instance()->attachStorage(m); m->startTransaction(); m_dbAttached = true; @@ -717,7 +717,7 @@ void MyMoneyDatabaseMgrTest::testAddBudget() { MyMoneyBudget budget; budget.setName("TestBudget"); - budget.setBudgetStart(TQDate::tqcurrentDate(TQt::LocalTime)); + budget.setBudgetStart(TQDate::currentDate(TQt::LocalTime)); m->addBudget(budget); @@ -742,7 +742,7 @@ void MyMoneyDatabaseMgrTest::testCopyBudget() { MyMoneyBudget newBudget = oldBudget; newBudget.clearId(); - newBudget.setName(TQString("Copy of %1").tqarg(oldBudget.name())); + newBudget.setName(TQString("Copy of %1").arg(oldBudget.name())); m->addBudget(newBudget); CPPUNIT_ASSERT(m->budgetList().count() == 2); @@ -773,7 +773,7 @@ void MyMoneyDatabaseMgrTest::testModifyBudget() { MyMoneyBudget budget = m->budgetByName("TestBudget"); - budget.setBudgetStart(TQDate::tqcurrentDate(TQt::LocalTime).addDays(-1)); + budget.setBudgetStart(TQDate::currentDate(TQt::LocalTime).addDays(-1)); m->modifyBudget(budget); @@ -1650,7 +1650,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() { // put some accounts in the db, so the tests don't break testReparentAccount(); - TQDate testDate = TQDate::tqcurrentDate(); + TQDate testDate = TQDate::currentDate(); TQDate notOverdue = testDate.addDays(2); TQDate overdue = testDate.addDays(-2); diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index ef4c3a9..3ab0b72 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -44,7 +44,7 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr() m_nextBudgetID = 0; m_user = MyMoneyPayee(); m_dirty = false; - m_creationDate = TQDate::tqcurrentDate(); + m_creationDate = TQDate::currentDate(); // setup standard accounts MyMoneyAccount acc_l; @@ -225,14 +225,14 @@ void MyMoneySeqAccessMgr::removePayee(const MyMoneyPayee& payee) // scan all transactions to check if the payee is still referenced for(it_t = m_transactionList.begin(); it_t != m_transactionList.end(); ++it_t) { if((*it_t).hasReferenceTo(payee.id())) { - throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("transaction")); + throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("transaction")); } } // check referential integrity in schedules for(it_s = m_scheduleList.begin(); it_s != m_scheduleList.end(); ++it_s) { if((*it_s).hasReferenceTo(payee.id())) { - throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").tqarg("schedule")); + throw new MYMONEYEXCEPTION(TQString("Cannot remove payee that is still referenced to a %1").arg("schedule")); } } @@ -448,7 +448,7 @@ void MyMoneySeqAccessMgr::addTransaction(MyMoneyTransaction& transaction, const void MyMoneySeqAccessMgr::touch(void) { m_dirty = true; - m_lastModificationDate = TQDate::tqcurrentDate(); + m_lastModificationDate = TQDate::currentDate(); } bool MyMoneySeqAccessMgr::hasActiveSplits(const TQString& id) const @@ -503,7 +503,7 @@ void MyMoneySeqAccessMgr::modifyAccount(const MyMoneyAccount& account, const boo // update information in account list m_accountList.modify(account.id(), account); - // tqinvalidate cached balance + // invalidate cached balance invalidateBalanceCache(account.id()); } else @@ -817,14 +817,14 @@ const MyMoneyTransaction MyMoneySeqAccessMgr::transaction(const TQString& id) co // get the full key of this transaction, throw exception // if it's invalid (unknown) if(!m_transactionKeys.contains(id)) { - TQString msg = TQString("Invalid transaction id '%1'").tqarg(id); + TQString msg = TQString("Invalid transaction id '%1'").arg(id); throw new MYMONEYEXCEPTION(msg); } // check if this key is in the list, throw exception if not TQString key = m_transactionKeys[id]; if(!m_transactionList.contains(key)) { - TQString msg = TQString("Invalid transaction key '%1'").tqarg(key); + TQString msg = TQString("Invalid transaction key '%1'").arg(key); throw new MYMONEYEXCEPTION(msg); } @@ -1446,7 +1446,7 @@ void MyMoneySeqAccessMgr::addCurrency(const MyMoneySecurity& currency) it = m_currencyList.find(currency.id()); if(it != m_currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").tqarg(currency.id())); + throw new MYMONEYEXCEPTION(TQString("Cannot add currency with existing id %1").arg(currency.id())); } m_currencyList.insert(currency.id(), currency); @@ -1458,7 +1458,7 @@ void MyMoneySeqAccessMgr::modifyCurrency(const MyMoneySecurity& currency) it = m_currencyList.find(currency.id()); if(it == m_currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").tqarg(currency.id())); + throw new MYMONEYEXCEPTION(TQString("Cannot modify currency with unknown id %1").arg(currency.id())); } m_currencyList.modify(currency.id(), currency); @@ -1472,7 +1472,7 @@ void MyMoneySeqAccessMgr::removeCurrency(const MyMoneySecurity& currency) it = m_currencyList.find(currency.id()); if(it == m_currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").tqarg(currency.id())); + throw new MYMONEYEXCEPTION(TQString("Cannot remove currency with unknown id %1").arg(currency.id())); } m_currencyList.remove(currency.id()); @@ -1487,7 +1487,7 @@ const MyMoneySecurity MyMoneySeqAccessMgr::currency(const TQString& id) const it = m_currencyList.find(id); if(it == m_currencyList.end()) { - throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").tqarg(id)); + throw new MYMONEYEXCEPTION(TQString("Cannot retrieve currency with unknown id '%1'").arg(id)); } return *it; @@ -1731,7 +1731,7 @@ const MyMoneyPrice MyMoneySeqAccessMgr::price(const TQString& fromId, const TQSt // If no valid date is passed, we use today's date. if(!date.isValid()) - date = TQDate::tqcurrentDate(); + date = TQDate::currentDate(); // If the caller selected an exact entry, we can search for // it using the date as the key diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h index 0aebe23..d92d94e 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h @@ -939,7 +939,7 @@ public: /** * This method retrieves a price from the price list. - * If @p date is inValid, TQDate::tqcurrentDate() is assumed. + * If @p date is inValid, TQDate::currentDate() is assumed. */ const MyMoneyPrice price(const TQString& fromId, const TQString& toId, const TQDate& date, const bool exactDate) const; @@ -997,7 +997,7 @@ private: void touch(void); /** - * This method is used to tqinvalidate the cached balance for + * This method is used to invalidate the cached balance for * the selected account and all it's parents. * * @param id id of the account in question diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp index 94d98f5..9c36204 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp @@ -63,7 +63,7 @@ void MyMoneySeqAccessMgrTest::testEmptyConstructor() CPPUNIT_ASSERT(m->m_scheduleList.count() == 0); CPPUNIT_ASSERT(m->m_dirty == false); - CPPUNIT_ASSERT(m->m_creationDate == TQDate::tqcurrentDate()); + CPPUNIT_ASSERT(m->m_creationDate == TQDate::currentDate()); CPPUNIT_ASSERT(m->liability().name() == "Liability"); CPPUNIT_ASSERT(m->asset().name() == "Asset"); @@ -1302,7 +1302,7 @@ void MyMoneySeqAccessMgrTest::testRemoveSchedule() { } void MyMoneySeqAccessMgrTest::testScheduleList() { - TQDate testDate = TQDate::tqcurrentDate(); + TQDate testDate = TQDate::currentDate(); TQDate notOverdue = testDate.addDays(2); TQDate overdue = testDate.addDays(-2); diff --git a/kmymoney2/mymoney/storage/mymoneystorageanon.cpp b/kmymoney2/mymoney/storage/mymoneystorageanon.cpp index db35647..3b2ce54 100644 --- a/kmymoney2/mymoney/storage/mymoneystorageanon.cpp +++ b/kmymoney2/mymoney/storage/mymoneystorageanon.cpp @@ -152,7 +152,7 @@ void MyMoneyStorageANON::fakeTransaction(MyMoneyTransaction& tx) TQValueList<MyMoneySplit>::ConstIterator it_s; for(it_s = tx.splits().begin(); it_s != tx.splits().end(); ++it_s) { MyMoneySplit s = (*it_s); - s.setMemo(TQString("%1/%2").tqarg(tn.id()).tqarg(s.id())); + s.setMemo(TQString("%1/%2").arg(tn.id()).arg(s.id())); if(s.value() != MyMoneyMoney::autoCalc) { s.setValue((s.value() * m_factor)); diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index 8f6a4f3..e14f79e 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -60,11 +60,11 @@ MyMoneySqlQuery::MyMoneySqlQuery (MyMoneyStorageSql* db) } bool MyMoneySqlQuery::exec () { - TRACE(TQString("start sql - %1").tqarg(lastQuery())); + TRACE(TQString("start sql - %1").arg(lastQuery())); bool rc = TQSqlQuery::exec(); TQString msg("end sql\n%1\n***Query returned %2, row count %3"); - TRACE (msg.tqarg(TQSqlQuery::executedQuery()).tqarg(rc).tqarg(numRowsAffected())); - //DBG (TQString("%1\n***Query returned %2, row count %3").tqarg(TQSqlQuery::executedQuery()).tqarg(rc).tqarg(size())); + TRACE (msg.arg(TQSqlQuery::executedQuery()).arg(rc).arg(numRowsAffected())); + //DBG (TQString("%1\n***Query returned %2, row count %3").arg(TQSqlQuery::executedQuery()).arg(rc).arg(size())); return (rc); } @@ -97,7 +97,7 @@ databaseTypeE MyMoneyDbDrivers::driverToType (const TQString& driver) const { else if (driver == "QPSQL7") return(Postgresql); else if (driver == "QTDS7") return(Sybase); else if (driver == "QSQLITE3") return(Sqlite3); - else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").tqarg(driver)); + else throw new MYMONEYEXCEPTION (TQString("Unknown database driver type").arg(driver)); } bool MyMoneyDbDrivers::isTested (databaseTypeE dbType) const { @@ -118,7 +118,7 @@ MyMoneyStorageSql::MyMoneyStorageSql (IMyMoneySerialize *storage, const KURL& ur DBG("*** Entering MyMoneyStorageSql::MyMoneyStorageSql"); m_dbVersion = 0; m_progressCallback = 0; - m_displaytqStatus = false; + m_displayStatus = false; m_storage = storage; m_storagePtr = dynamic_cast<IMyMoneyStorage*>(storage); m_newDatabase = false; @@ -182,7 +182,7 @@ try { } break; default: - qFatal("%s", TQString("%1 - unknown open mode %2").tqarg(__func__).tqarg(openMode).data()); + qFatal("%s", TQString("%1 - unknown open mode %2").arg(__func__).arg(openMode).data()); } if (rc != 0) return (rc); // bypass logon check if we are creating a database @@ -192,15 +192,15 @@ try { if (!m_logonUser.isEmpty() && (!m_override)) { m_error = TQString (i18n("Database apparently in use\nOpened by %1 on %2 at %3.\nOpen anyway?")) - .tqarg(m_logonUser) - .tqarg(m_logonAt.date().toString(Qt::ISODate)) - .tqarg(m_logonAt.time().toString("hh.mm.ss")); + .arg(m_logonUser) + .arg(m_logonAt.date().toString(Qt::ISODate)) + .arg(m_logonAt.time().toString("hh.mm.ss")); qDebug("%s", m_error.data()); close(false); rc = -1; } else { m_logonUser = url.user() + "@" + url.host(); - m_logonAt = TQDateTime::tqcurrentDateTime(); + m_logonAt = TQDateTime::currentDateTime(); writeFileInfo(); } return(rc); @@ -229,7 +229,7 @@ int MyMoneyStorageSql::createDatabase (const KURL& url) { if (m_dbType == Sqlite3) return(0); // not needed for sqlite if (!m_dbType == Mysql) { m_error = - TQString(i18n("Cannot currently create database for driver %1; please create manually")).tqarg(driverName()); + TQString(i18n("Cannot currently create database for driver %1; please create manually")).arg(driverName()); return (1); } // create the database (only works for mysql at present) @@ -241,10 +241,10 @@ int MyMoneyStorageSql::createDatabase (const KURL& url) { maindb->setPassword (url.pass()); maindb->open(); TQSqlQuery qm(maindb); - TQString qs = TQString("CREATE DATABASE %1;").tqarg(dbName); + TQString qs = TQString("CREATE DATABASE %1;").arg(dbName); qm.prepare (qs); if (!qm.exec()) { - buildError (qm, __func__, TQString(i18n("Error in create database %1; do you have create permissions?")).tqarg(dbName)); + buildError (qm, __func__, TQString(i18n("Error in create database %1; do you have create permissions?")).arg(dbName)); return (1); } TQSqlDatabase::removeDatabase (maindb); @@ -325,7 +325,7 @@ int MyMoneyStorageSql::upgradeDb() { } } // write updated version to DB - //setVersion(TQString("%1.%2").tqarg(m_dbVersion).tqarg(m_minorVersion)); + //setVersion(TQString("%1.%2").arg(m_dbVersion).arg(m_minorVersion)); q.prepare (TQString("UPDATE kmmFileInfo SET version = :version;")); q.bindValue(":version", m_dbVersion); if (!q.exec()) { @@ -363,12 +363,12 @@ bool MyMoneyStorageSql::addColumn TQSqlQuery q(this); TQString afterString = ";"; if (!after.isEmpty()) - afterString = TQString("AFTER %1;").tqarg(after); + afterString = TQString("AFTER %1;").arg(after); q.prepare("ALTER TABLE " + t.name() + " ADD COLUMN " + c.generateDDL(m_dbType) + afterString); if (!q.exec()) { buildError (q, __func__, - TQString("Error adding column %1 to table %2").tqarg(c.name()).tqarg(t.name())); + TQString("Error adding column %1 to table %2").arg(c.name()).arg(t.name())); return (false); } return (true); @@ -392,7 +392,7 @@ bool MyMoneyStorageSql::dropColumn + col + ";"); if (!q.exec()) { buildError (q, __func__, - TQString("Error dropping column %1 from table %2").tqarg(col).tqarg(t.name())); + TQString("Error dropping column %1 from table %2").arg(col).arg(t.name())); return (false); } return (true); @@ -657,7 +657,7 @@ int MyMoneyStorageSql::upgradeToV6() { // upgrade Mysql to InnoDB transaction-safe engine if (m_dbType == Mysql) { for (TQMapConstIterator<TQString, MyMoneyDbTable> tt = m_db.tableBegin(); tt != m_db.tableEnd(); ++tt) { - q.prepare(TQString("ALTER TABLE %1 ENGINE = InnoDB;").tqarg(tt.data().name())); + q.prepare(TQString("ALTER TABLE %1 ENGINE = InnoDB;").arg(tt.data().name())); if (!q.exec()) { buildError (q, __func__, "Error updating to InnoDB"); return (1); @@ -737,7 +737,7 @@ bool MyMoneyStorageSql::sqliteAlterTable(const MyMoneyDbTable& t) { long unsigned MyMoneyStorageSql::getRecCount (const TQString& table) const { DBG("*** Entering MyMoneyStorageSql::getRecCount"); MyMoneySqlQuery q(const_cast <MyMoneyStorageSql*> (this)); - q.prepare(TQString("SELECT COUNT(*) FROM %1;").tqarg(table)); + q.prepare(TQString("SELECT COUNT(*) FROM %1;").arg(table)); if ((!q.exec()) || (!q.next())) { buildError (q, __func__, "error retrieving record count"); qFatal("Error retrieving record count"); // definitely shouldn't happen @@ -763,7 +763,7 @@ int MyMoneyStorageSql::createTables () { for (TQMapConstIterator<TQString, MyMoneyDbView> tt = m_db.viewBegin(); tt != m_db.viewEnd(); ++tt) { if (!lowerTables.contains(tt.key().lower())) { q.prepare (tt.data().createString()); - if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating view %1").tqarg(tt.key()))); + if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating view %1").arg(tt.key()))); } } @@ -780,7 +780,7 @@ void MyMoneyStorageSql::createTable (const MyMoneyDbTable& t) { MyMoneySqlQuery q(this); for (unsigned int i = 0; i < ql.count(); ++i) { q.prepare (ql[i]); - if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating table/index %1").tqarg(t.name()))); + if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("creating table/index %1").arg(t.name()))); } } @@ -791,7 +791,7 @@ int MyMoneyStorageSql::isEmpty () { int recordCount = 0; MyMoneySqlQuery q(this); while ((tt != m_db.tableEnd()) && (recordCount == 0)) { - q.prepare (TQString("select count(*) from %1;").tqarg((*tt).name())); + q.prepare (TQString("select count(*) from %1;").arg((*tt).name())); if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, "getting record count")); if (!q.next()) throw new MYMONEYEXCEPTION(buildError (q, __func__, "retrieving record count")); recordCount += q.value(0).toInt(); @@ -811,7 +811,7 @@ void MyMoneyStorageSql::clean() { TQMapConstIterator<TQString, MyMoneyDbTable> it = m_db.tableBegin(); MyMoneySqlQuery q(this); while (it != m_db.tableEnd()) { - q.prepare(TQString("DELETE from %1;").tqarg(it.key())); + q.prepare(TQString("DELETE from %1;").arg(it.key())); if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString ("cleaning database"))); ++it; } @@ -821,7 +821,7 @@ void MyMoneyStorageSql::clean() { bool MyMoneyStorageSql::readFile(void) { DBG("*** Entering MyMoneyStorageSql::readFile"); - m_displaytqStatus = true; + m_displayStatus = true; try { readFileInfo(); readInstitutions(); @@ -860,7 +860,7 @@ bool MyMoneyStorageSql::readFile(void) { // FIXME?? if (m_mode == 0) m_storage = NULL; // make sure the progress bar is not shown any longer signalProgress(-1, -1); - m_displaytqStatus = false; + m_displayStatus = false; //MyMoneySqlQuery::traceOn(); return true; } catch (TQString& s) { @@ -876,7 +876,7 @@ bool MyMoneyStorageSql::writeFile(void) { = m_securities = m_prices = m_currencies = m_schedules = m_reports = m_kvps = m_budgets = 0; m_hiIdInstitutions = m_hiIdPayees = m_hiIdAccounts = m_hiIdTransactions = m_hiIdSchedules = m_hiIdSecurities = m_hiIdReports = m_hiIdBudgets = 0; - m_displaytqStatus = true; + m_displayStatus = true; try{ startCommitUnit(__func__); writeInstitutions (); @@ -897,7 +897,7 @@ bool MyMoneyStorageSql::writeFile(void) { endCommitUnit(__func__); // make sure the progress bar is not shown any longer signalProgress(-1, -1); - m_displaytqStatus = false; + m_displayStatus = false; return true; } catch (TQString& s) { return false; @@ -921,7 +921,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) { // as value of this method. bool rc = true; if (callingFunction != m_commitUnitStack.top()) - qDebug("%s", TQString("%1 - %2 s/be %3").tqarg(__func__).tqarg(callingFunction).tqarg(m_commitUnitStack.top()).data()); + qDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); m_commitUnitStack.pop(); if (m_commitUnitStack.isEmpty()) { if (!commit()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "ending commit unit")); @@ -932,7 +932,7 @@ bool MyMoneyStorageSql::endCommitUnit (const TQString& callingFunction) { void MyMoneyStorageSql::cancelCommitUnit (const TQString& callingFunction) { DBG("*** Entering MyMoneyStorageSql::cancelCommitUnit"); if (callingFunction != m_commitUnitStack.top()) - qDebug("%s", TQString("%1 - %2 s/be %3").tqarg(__func__).tqarg(callingFunction).tqarg(m_commitUnitStack.top()).data()); + qDebug("%s", TQString("%1 - %2 s/be %3").arg(__func__).arg(callingFunction).arg(m_commitUnitStack.top()).data()); if (m_commitUnitStack.isEmpty()) return; m_commitUnitStack.clear(); if (!rollback()) throw new MYMONEYEXCEPTION(buildError (MyMoneySqlQuery(), __func__, "cancelling commit unit")); @@ -1973,9 +1973,9 @@ void MyMoneyStorageSql::writeCurrency(const MyMoneySecurity& currency, MyMoneySq // writing the symbol as three short ints is a PITA, but the // problem is that database drivers have incompatible ways of declaring UTF8 TQString symbol = currency.tradingSymbol() + " "; - q.bindValue(":symbol1", symbol.mid(0,1).tqunicode()->tqunicode()); - q.bindValue(":symbol2", symbol.mid(1,1).tqunicode()->tqunicode()); - q.bindValue(":symbol3", symbol.mid(2,1).tqunicode()->tqunicode()); + q.bindValue(":symbol1", symbol.mid(0,1).unicode()->unicode()); + q.bindValue(":symbol2", symbol.mid(1,1).unicode()->unicode()); + q.bindValue(":symbol3", symbol.mid(2,1).unicode()->unicode()); q.bindValue(":symbolString", symbol); q.bindValue(":partsPerUnit", currency.partsPerUnit()); q.bindValue(":smallestCashFraction", currency.smallestCashFraction()); @@ -2167,7 +2167,7 @@ void MyMoneyStorageSql::writeFileInfo() { q.bindValue(":fixLevel", m_storage->fileFixVersion()); q.bindValue(":created", TQString(m_storage->creationDate().toString(Qt::ISODate))); //q.bindValue(":lastModified", m_storage->lastModificationDate().toString(Qt::ISODate)); - q.bindValue(":lastModified", TQString(TQDate::tqcurrentDate().toString(Qt::ISODate))); + q.bindValue(":lastModified", TQString(TQDate::currentDate().toString(Qt::ISODate))); q.bindValue(":baseCurrency", m_storage->pairs()["kmm-baseCurrency"]); q.bindValue(":institutions", (unsigned long long) m_institutions); q.bindValue(":accounts", (unsigned long long) m_accounts); @@ -2239,7 +2239,7 @@ void MyMoneyStorageSql::deleteKeyValuePairs (const TQString& kvpType, const TQSt q.prepare ("DELETE FROM kmmKeyValuePairs WHERE kvpType = :kvpType AND kvpId = :kvpId;"); q.bindValue(":kvpType", kvpType); q.bindValue(":kvpId", kvpId); - if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("deleting kvp for %1 %2").tqarg(kvpType).tqarg(kvpId))); + if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("deleting kvp for %1 %2").arg(kvpType).arg(kvpId))); m_kvps -= q.numRowsAffected(); } @@ -2410,7 +2410,7 @@ void MyMoneyStorageSql::readPayees(const TQValueList<TQString> pid) { const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStringList& idList, bool /*forUpdate*/) const { DBG("*** Entering MyMoneyStorageSql::readPayees"); - if (m_displaytqStatus) { + if (m_displayStatus) { signalProgress(0, m_payees, TQObject::tr("Loading payees...")); } else { // if (m_payeeListRead) return; @@ -2428,7 +2428,7 @@ const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStri TQString itemConnector = ""; TQStringList::ConstIterator it; for (it = idList.begin(); it != idList.end(); ++it) { - whereClause.append(TQString("%1id = '%2'").tqarg(itemConnector).tqarg(*it)); + whereClause.append(TQString("%1id = '%2'").arg(itemConnector).arg(*it)); itemConnector = " or "; } whereClause += ")"; @@ -2472,7 +2472,7 @@ const TQMap<TQString, MyMoneyPayee> MyMoneyStorageSql::fetchPayees (const TQStri //if(id > lastId) // lastId = id; } - if (m_displaytqStatus) signalProgress(++progress, 0); + if (m_displayStatus) signalProgress(++progress, 0); } return pList; } @@ -2623,7 +2623,7 @@ const TQMap<TQString, MyMoneyMoney> MyMoneyStorageSql::fetchBalance(const TQStri // the <= operator misbehave when the date matches. To avoid this, add a day to the // requested date and use the < operator. if (date.isValid() && !date.isNull()) - queryString += TQString(" AND postDate < '%1'").tqarg(date.addDays(1).toString(Qt::ISODate)); + queryString += TQString(" AND postDate < '%1'").arg(date.addDays(1).toString(Qt::ISODate)); DBG (queryString); q.prepare(queryString); @@ -2666,7 +2666,7 @@ void MyMoneyStorageSql::readTransactions(const MyMoneyTransactionFilter& filter) const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions (const TQString& tidList, const TQString& dateClause, bool /*forUpdate*/) const { DBG("*** Entering MyMoneyStorageSql::readTransactions"); // if (m_transactionListRead) return; // all list already in memory - if (m_displaytqStatus) signalProgress(0, m_transactions, TQObject::tr("Loading transactions...")); + if (m_displayStatus) signalProgress(0, m_transactions, TQObject::tr("Loading transactions...")); int progress = 0; // m_payeeList.clear(); TQString whereClause; @@ -2748,7 +2748,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions ( i != txMapEnd; ++i) { i.data().setPairs(kvpMap[i.data().id()].pairs()); - if (m_displaytqStatus) signalProgress(++progress, 0); + if (m_displayStatus) signalProgress(++progress, 0); } if ((tidList.isEmpty()) && (dateClause.isEmpty())) { @@ -2866,7 +2866,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions ( TQStringList::const_iterator it; for (it = payees.begin(); it != payees.end(); ++it) { payeesClause.append(TQString("%1'%2'") - .tqarg(itemConnector).tqarg(*it)); + .arg(itemConnector).arg(*it)); itemConnector = ", "; } if (!payeesClause.isEmpty()) { @@ -2885,7 +2885,7 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions ( for (it = accounts.begin(); it != accounts.end(); ++it) { // if (m_accountsLoaded.find(*it) == m_accountsLoaded.end()) { accountsClause.append(TQString("%1 '%2'") - .tqarg(itemConnector).tqarg(*it)); + .arg(itemConnector).arg(*it)); itemConnector = ", "; //if (accountsOnlyFilter) m_accountsLoaded.append(*it); // a bit premature... // } @@ -2904,8 +2904,8 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions ( TQString statesClause = ""; for (TQValueList<int>::ConstIterator it = splitStates.begin(); it != splitStates.end(); ++it) { statesClause.append(TQString(" %1 '%2'") - .tqarg(itemConnector) - .tqarg(splitState(MyMoneyTransactionFilter::stateOptionE(*it)))); + .arg(itemConnector) + .arg(splitState(MyMoneyTransactionFilter::stateOptionE(*it)))); itemConnector = ","; } if (!statesClause.isEmpty()) { @@ -2941,19 +2941,19 @@ const TQMap<TQString, MyMoneyTransaction> MyMoneyStorageSql::fetchTransactions ( TQString dateClause; TQString connector = ""; if (end != TQDate()) { - dateClause = TQString("(postDate < '%1')").tqarg(end.addDays(1).toString(Qt::ISODate)); + dateClause = TQString("(postDate < '%1')").arg(end.addDays(1).toString(Qt::ISODate)); connector = " and "; } if (start != TQDate()) { - dateClause += TQString("%1 (postDate >= '%2')").tqarg(connector).tqarg(start.toString(Qt::ISODate)); + dateClause += TQString("%1 (postDate >= '%2')").arg(connector).arg(start.toString(Qt::ISODate)); } // now get a list of transaction ids // if we have only a date filter, we need to build the list from the tx table // otherwise we need to build from the split table if (splitFilterActive) { - inQuery = TQString("(select distinct transactionId from kmmSplits %1)").tqarg(whereClause); + inQuery = TQString("(select distinct transactionId from kmmSplits %1)").arg(whereClause); } else { - inQuery = TQString("(select distinct id from kmmTransactions where %1)").tqarg(dateClause); + inQuery = TQString("(select distinct id from kmmTransactions where %1)").arg(dateClause); txFilterActive = false; // kill off the date filter now } @@ -3245,7 +3245,7 @@ const MyMoneyPrice MyMoneyStorageSql::fetchSinglePrice (const TQString& fromIdL TQDate date (date_); if(!date.isValid()) - date = TQDate::tqcurrentDate(); + date = TQDate::currentDate(); q.bindValue(":fromId", fromIdList); q.bindValue(":toId", toIdList); @@ -3522,8 +3522,8 @@ const MyMoneyKeyValueContainer MyMoneyStorageSql::readKeyValuePairs (const TQStr q.prepare ("SELECT kvpKey, kvpData from kmmKeyValuePairs where kvpType = :type and kvpId = :id;"); q.bindValue(":type", kvpType); q.bindValue(":id", kvpId); - if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp for %1 %2").tqarg(kvpType) - .tqarg(kvpId))); + if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp for %1 %2").arg(kvpType) + .arg(kvpId))); while (q.next()) list.setValue(q.value(0).toString(), q.value(1).toString()); return (list); } @@ -3542,7 +3542,7 @@ const TQMap<TQString, MyMoneyKeyValueContainer> MyMoneyStorageSql::readKeyValueP query += " order by kvpId;"; q.prepare (query); q.bindValue(":type", kvpType); - if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp List for %1").tqarg(kvpType))); + if (!q.exec()) throw new MYMONEYEXCEPTION(buildError (q, __func__, TQString("reading Kvp List for %1").arg(kvpType))); while (q.next()) { retval [q.value(0).toString()].setValue(q.value(1).toString(), q.value(2).toString()); } @@ -3786,15 +3786,15 @@ void MyMoneyStorageSql::signalProgress(int current, int total, const TQString& m // **************************** Error display routine ******************************* TQString& MyMoneyStorageSql::buildError (const TQSqlQuery& q, const TQString& function, const TQString& message) const { - TQString s = TQString("Error in function %1 : %2").tqarg(function).tqarg(message); + TQString s = TQString("Error in function %1 : %2").arg(function).arg(message); TQSqlError e = lastError(); s += TQString ("\nDriver = %1, Host = %2, User = %3, Database = %4") - .tqarg(driverName()).tqarg(hostName()).tqarg(userName()).tqarg(databaseName()); - s += TQString ("\nDriver Error: %1").tqarg(e.driverText()); - s += TQString ("\nDatabase Error No %1: %2").tqarg(e.number()).tqarg(e.databaseText()); + .arg(driverName()).arg(hostName()).arg(userName()).arg(databaseName()); + s += TQString ("\nDriver Error: %1").arg(e.driverText()); + s += TQString ("\nDatabase Error No %1: %2").arg(e.number()).arg(e.databaseText()); e = q.lastError(); - s += TQString ("\nExecuted: %1").tqarg(q.executedQuery()); - s += TQString ("\nQuery error No %1: %2").tqarg(e.number()).tqarg(e.text()); + s += TQString ("\nExecuted: %1").arg(q.executedQuery()); + s += TQString ("\nQuery error No %1: %2").arg(e.number()).arg(e.text()); const_cast <MyMoneyStorageSql*> (this)->m_error = s; qDebug("%s", s.ascii()); @@ -4131,9 +4131,9 @@ const TQString MyMoneyDbDef::generateSQL (const TQString& driver) const { replace = TQString::number (MyMoneyFile::instance()->storage()->currentFixVersion()); if ((*fit)->name() == "created") - replace = TQDate::tqcurrentDate().toString(Qt::ISODate); + replace = TQDate::currentDate().toString(Qt::ISODate); if ((*fit)->name() == "lastModified") - replace = TQDate::tqcurrentDate().toString(Qt::ISODate); + replace = TQDate::currentDate().toString(Qt::ISODate); if ((*fit)->name() == "updateInProgress") replace = enclose("N"); qs.replace(toReplace, replace); @@ -4188,12 +4188,12 @@ void MyMoneyDbTable::addIndex(const TQString& name, const TQStringList& columns, void MyMoneyDbTable::buildSQLStrings (void) { // build fixed SQL strings for this table // build the insert string with placeholders for each field - TQString qs = TQString("INSERT INTO %1 (").tqarg(name()); + TQString qs = TQString("INSERT INTO %1 (").arg(name()); TQString ws = ") VALUES ("; field_iterator ft = m_fields.begin(); while (ft != m_fields.end()) { - qs += TQString("%1, ").tqarg((*ft)->name()); - ws += TQString(":%1, ").tqarg((*ft)->name()); + qs += TQString("%1, ").arg((*ft)->name()); + ws += TQString(":%1, ").arg((*ft)->name()); ++ft; } qs = qs.left(qs.length() - 2); @@ -4210,9 +4210,9 @@ void MyMoneyDbTable::buildSQLStrings (void) { while (ft != m_fields.end()) { if ((*ft)->isPrimaryKey()) { if (!ws.isEmpty()) ws += " AND "; - ws += TQString("%1 = :%2").tqarg((*ft)->name()).tqarg((*ft)->name()); + ws += TQString("%1 = :%2").arg((*ft)->name()).arg((*ft)->name()); } else { - qs += TQString("%1 = :%2, ").tqarg((*ft)->name()).tqarg((*ft)->name()); + qs += TQString("%1 = :%2, ").arg((*ft)->name()).arg((*ft)->name()); } ++ft; } @@ -4230,14 +4230,14 @@ const TQString MyMoneyDbTable::columnList() const { TQString qs; ft = m_fields.begin(); while (ft != m_fields.end()) { - qs += TQString("%1, ").tqarg((*ft)->name()); + qs += TQString("%1, ").arg((*ft)->name()); ++ft; } return (qs.left(qs.length() - 2)); } const TQString MyMoneyDbTable::generateCreateSQL (databaseTypeE dbType) const { - TQString qs = TQString("CREATE TABLE %1 (").tqarg(name()); + TQString qs = TQString("CREATE TABLE %1 (").arg(name()); TQString pkey; for (field_iterator it = m_fields.begin(); it != m_fields.end(); ++it) { qs += (*it)->generateDDL (dbType) + ", "; diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.h b/kmymoney2/mymoney/storage/mymoneystoragesql.h index 4250256..eb7b5a3 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.h +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.h @@ -402,7 +402,7 @@ public: private: const TQString enclose(const TQString& text) const {return (TQString("'" + text + "'"));}; - static unsigned int m_currentVersion; // The current version of the database tqlayout + static unsigned int m_currentVersion; // The current version of the database layout MyMoneyDbDrivers m_drivers; #define TABLE(name) void name(); #define VIEW(name) void name(); @@ -747,7 +747,7 @@ private: * initial data load and final write */ - bool m_displaytqStatus; + bool m_displayStatus; /** * On occasions, e.g. after a complex transaction search, or for populating a * payee popup list, it becomes necessary to load all data into memory. The diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp index 4e6fd19..da3ca93 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragexml.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragexml.cpp @@ -119,19 +119,19 @@ bool MyMoneyXmlContentHandler::endDocument(void) bool MyMoneyXmlContentHandler::skippedEntity (const TQString & /* name */) { - // qDebug(TQString("Skipped entity '%1'").tqarg(name)); + // qDebug(TQString("Skipped entity '%1'").arg(name)); return true; } bool MyMoneyXmlContentHandler::startPrefixMapping (const TQString& /*prefix */, const TQString & /* uri */) { - // qDebug(TQString("start prefix '%1', '%2'").tqarg(prefix).tqarg(uri)); + // qDebug(TQString("start prefix '%1', '%2'").arg(prefix).arg(uri)); return true; } bool MyMoneyXmlContentHandler::endPrefixMapping (const TQString& /* prefix */) { - // qDebug(TQString("end prefix '%1'").tqarg(prefix)); + // qDebug(TQString("end prefix '%1'").arg(prefix)); return true; } @@ -265,13 +265,13 @@ bool MyMoneyXmlContentHandler::endElement(const TQString& /* namespaceURI */, co MyMoneyPrice p(m_reader->d->m_fromSecurity, m_reader->d->m_toSecurity, m_baseNode); m_reader->d->prList[MyMoneySecurityPair(m_reader->d->m_fromSecurity, m_reader->d->m_toSecurity)][p.date()] = p; } else { - m_errMsg = i18n("Unknown XML tag %1 found in line %2").tqarg(qName).tqarg(m_loc->lineNumber()); + m_errMsg = i18n("Unknown XML tag %1 found in line %2").arg(qName).arg(m_loc->lineNumber()); kdWarning() << m_errMsg << endl; rc = false; } m_reader->signalProgress(++m_elementCount, 0); } catch(MyMoneyException* e) { - m_errMsg = i18n("Exception while creating a %1 element: %2").tqarg(s).tqarg(e->what()); + m_errMsg = i18n("Exception while creating a %1 element: %2").arg(s).arg(e->what()); kdWarning() << m_errMsg << endl; delete e; rc = false; diff --git a/kmymoney2/mymoney/storage/mymoneystoragexml.h b/kmymoney2/mymoney/storage/mymoneystoragexml.h index b74626d..666fc6b 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragexml.h +++ b/kmymoney2/mymoney/storage/mymoneystoragexml.h @@ -61,7 +61,7 @@ protected: * This method returns the version of the underlying file. It * is used by the MyMoney objects contained in a MyMoneyStorageBin object (e.g. * MyMoneyAccount, MyMoneyInstitution, MyMoneyTransaction, etc.) to - * determine the tqlayout used when reading/writing a persistant file. + * determine the layout used when reading/writing a persistant file. * A parameter is used to determine the direction. * * @param dir information about the direction (reading/writing). The diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp index 398f369..e06de07 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqdir.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -88,7 +88,7 @@ void KOfxDirectConnectDlg::init(void) TQDir homeDir(TQDir::home()); if(homeDir.exists("ofxlog.txt")) { - d->m_fpTrace.setName(TQString("%1/ofxlog.txt").tqarg(TQDir::homeDirPath())); + d->m_fpTrace.setName(TQString("%1/ofxlog.txt").arg(TQDir::homeDirPath())); d->m_fpTrace.open(IO_WriteOnly | IO_Append); } @@ -113,12 +113,12 @@ void KOfxDirectConnectDlg::init(void) connect(m_job,TQT_SIGNAL(data(KIO::Job*, const TQByteArray&)),this,TQT_SLOT(slotOfxData(KIO::Job*,const TQByteArray&))); connect(m_job,TQT_SIGNAL(connected(KIO::Job*)),this,TQT_SLOT(slotOfxConnected(KIO::Job*))); - settqStatus(TQString("Contacting %1...").tqarg(m_connector.url())); + setStatus(TQString("Contacting %1...").arg(m_connector.url())); kProgress1->setTotalSteps(3); kProgress1->setProgress(1); } -void KOfxDirectConnectDlg::settqStatus(const TQString& _status) +void KOfxDirectConnectDlg::setStatus(const TQString& _status) { textLabel1->setText(_status); kdDebug(2) << "STATUS: " << _status << endl; @@ -133,13 +133,13 @@ void KOfxDirectConnectDlg::slotOfxConnected(KIO::Job*) { if ( m_tmpfile ) { -// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").tqarg(m_tmpfile->name())); +// throw new MYMONEYEXCEPTION(TQString("Already connected, using %1.").arg(m_tmpfile->name())); kdDebug(2) << "Already connected, using " << m_tmpfile->name() << endl; delete m_tmpfile; //delete otherwise we mem leak } m_tmpfile = new KTempFile(); - settqStatus("Connection established, retrieving data..."); - setDetails(TQString("Downloading data to %1...").tqarg(m_tmpfile->name())); + setStatus("Connection established, retrieving data..."); + setDetails(TQString("Downloading data to %1...").arg(m_tmpfile->name())); kProgress1->advance(1); } @@ -154,13 +154,13 @@ void KOfxDirectConnectDlg::slotOfxData(KIO::Job*,const TQByteArray& _ba) d->m_fpTrace.writeBlock(_ba, _ba.size()); } - setDetails(TQString("Got %1 bytes").tqarg(_ba.size())); + setDetails(TQString("Got %1 bytes").arg(_ba.size())); } void KOfxDirectConnectDlg::slotOfxFinished(KIO::Job* /* e */) { kProgress1->advance(1); - settqStatus("Completed."); + setStatus("Completed."); if(d->m_fpTrace.isOpen()) { d->m_fpTrace.writeBlock("\nCompleted\n\n\n\n", 14); diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h index b07e191..1227a90 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlg.h @@ -70,7 +70,7 @@ protected slots: virtual void reject(void); protected: - void settqStatus(const TQString& _status); + void setStatus(const TQString& _status); void setDetails(const TQString& _details); KTempFile* m_tmpfile; diff --git a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui index a7d73e4..57cb5b1 100644 --- a/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/kofxdirectconnectdlgdecl.ui @@ -37,7 +37,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -84,7 +84,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui index a6bd384..100cbd1 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupdecl.ui @@ -58,7 +58,7 @@ <property name="text"> <string>Please select your financial institution from the list below...</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -111,7 +111,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>90</height> @@ -212,7 +212,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <grid> <property name="name"> @@ -228,7 +228,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>120</width> <height>21</height> @@ -348,7 +348,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout29</cstring> + <cstring>layout29</cstring> </property> <vbox> <property name="name"> @@ -361,7 +361,7 @@ <property name="text"> <string>Please select the account from your financial institution from the list below which matches this account.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> @@ -448,7 +448,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -461,7 +461,7 @@ <property name="text"> <string>Congratulations! You have successfully set up your bank for online banking via OFX.</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter</set> </property> </widget> diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp index 7287c6a..bafde2e 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingsetupwizard.cpp @@ -22,10 +22,10 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqtextbrowser.h> +#include <textbrowser.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqregexp.h> #include <tqcheckbox.h> #include <tqtabwidget.h> @@ -134,7 +134,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) { TQString bank = item->text(0); m_textDetails->clear(); - m_textDetails->append(TQString("<p>Details for %1:</p>").tqarg(bank)); + m_textDetails->append(TQString("<p>Details for %1:</p>").arg(bank)); TQStringList fipids = OfxPartner::FipidForBank(bank); TQStringList::const_iterator it_fipid = fipids.begin(); while ( it_fipid != fipids.end() ) @@ -143,14 +143,14 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) info = OfxPartner::ServiceInfo(*it_fipid); // Print them to the text browser - TQString message = TQString("<p>Fipid: %1<br>").tqarg(*it_fipid); + TQString message = TQString("<p>Fipid: %1<br>").arg(*it_fipid); // If the bank supports retrieving statements if ( info.accountlist ) { m_bankInfo.push_back(info); - message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").tqarg(info.url,info.org,info.fid); + message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").arg(info.url,info.org,info.fid); if ( info.statements ) message += i18n("Supports online statements<br>"); if ( info.investments ) @@ -180,7 +180,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) } m_textDetails->clear(); - m_textDetails->append(TQString("<p>Details for %1:</p>").tqarg(m_bankName->text())); + m_textDetails->append(TQString("<p>Details for %1:</p>").arg(m_bankName->text())); memset(&info, 0, sizeof(OfxFiServiceInfo)); strncpy(info.fid, m_fid->text().ascii(), OFX_FID_LENGTH-1); @@ -194,7 +194,7 @@ bool KOnlineBankingSetupWizard::finishFiPage(void) m_bankInfo.push_back(info); TQString message; - message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").tqarg(info.url,info.org,info.fid); + message += TQString("URL: %1<br>Org: %2<br>Fid: %3<br>").arg(info.url,info.org,info.fid); if ( info.statements ) message += i18n("Supports online statements<br>"); if ( info.investments ) @@ -248,7 +248,7 @@ bool KOnlineBankingSetupWizard::finishLoginPage(void) // who owns this memory?!?! char* request = libofx_request_accountinfo( &fi ); - KURL filename(TQString("%1response.ofx").tqarg(locateLocal("appdata", ""))); + KURL filename(TQString("%1response.ofx").arg(locateLocal("appdata", ""))); TQByteArray req; req.setRawData(request, strlen(request)); OfxHttpsRequest("POST", (*m_it_info).url, req, TQMap<TQString, TQString>(), filename, true); @@ -360,7 +360,7 @@ int KOnlineBankingSetupWizard::ofxAccountCallback(struct OfxAccountData data, vo if(/* !kvps.value("bankid").isEmpty() && */ !kvps.value("uniqueId").isEmpty()) { - kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").tqarg(kvps.value("bankid"), kvps.value("uniqueId"))); + kvps.setValue("kmmofx-acc-ref", TQString("%1-%2").arg(kvps.value("bankid"), kvps.value("uniqueId"))); } else { qDebug("Cannot setup kmmofx-acc-ref for '%s'", kvps.value("bankname").data()); } @@ -379,11 +379,11 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void if(data.code_valid==true) { - message += TQString("#%1 %2: \"%3\"\n").tqarg(data.code).tqarg(data.name,data.description); + message += TQString("#%1 %2: \"%3\"\n").arg(data.code).arg(data.name,data.description); } if(data.server_message_valid==true){ - message += i18n("Server message: %1\n").tqarg(data.server_message); + message += i18n("Server message: %1\n").arg(data.server_message); } if(data.severity_valid==true){ @@ -391,10 +391,10 @@ int KOnlineBankingSetupWizard::ofxStatusCallback(struct OfxStatusData data, void case OfxStatusData::INFO : break; case OfxStatusData::WARN : - KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").tqarg(message) ); + KMessageBox::detailedError( pthis, i18n("Your bank returned warnings when signing on"), i18n("WARNING %1").arg(message) ); break; case OfxStatusData::ERROR : - KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").tqarg(message) ); + KMessageBox::detailedError( pthis, i18n("Error signing onto your bank"), i18n("ERROR %1").arg(message) ); break; default: break; diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp index d2b9880..084d73c 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.cpp @@ -48,22 +48,22 @@ #include <libofx/libofx.h> #include "mymoneyofxconnector.h" -KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) : +KOnlineBankingStatus::KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent, const char *name) : KOnlineBankingStatusDecl(parent,name), m_appId(0) { - m_ledOnlinetqStatus->off(); + m_ledOnlineStatus->off(); // Set up online banking settings if applicable MyMoneyKeyValueContainer settings = acc.onlineBankingSettings(); - m_textOnlinetqStatus->setText(i18n("Enabled & configured")); - m_ledOnlinetqStatus->on(); + m_textOnlineStatus->setText(i18n("Enabled & configured")); + m_ledOnlineStatus->on(); 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); @@ -83,25 +83,25 @@ KOnlineBankingtqStatus::KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidg if (!specificDate.isEmpty()) m_specificDate->setDate(TQDate::fromString(specificDate)); else - m_specificDate->setDate(TQDate::tqcurrentDate()); - m_specificDate->setMaxValue(TQDate::tqcurrentDate()); + m_specificDate->setDate(TQDate::currentDate()); + m_specificDate->setMaxValue(TQDate::currentDate()); m_payeeidRB->setChecked(settings.value("kmmofx-preferPayeeid").isEmpty() || settings.value("kmmofx-preferPayeeid").toInt() != 0); m_nameRB->setChecked(!settings.value("kmmofx-preferName").isEmpty() && settings.value("kmmofx-preferName").toInt() != 0); } -KOnlineBankingtqStatus::~KOnlineBankingtqStatus() +KOnlineBankingStatus::~KOnlineBankingStatus() { delete m_appId; } -const TQString& KOnlineBankingtqStatus::appId(void) const +const TQString& KOnlineBankingStatus::appId(void) const { if(m_appId) return m_appId->appId(); return TQString(); } -TQString KOnlineBankingtqStatus::headerVersion(void) const +TQString KOnlineBankingStatus::headerVersion(void) const { if(m_headerVersion) return m_headerVersion->headerVersion(); diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h index 52e43ee..3b04903 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatus.h @@ -41,13 +41,13 @@ class OfxHeaderVersion; * @author Thomas Baumgart */ -class KOnlineBankingtqStatus : public KOnlineBankingStatusDecl +class KOnlineBankingStatus : public KOnlineBankingStatusDecl { Q_OBJECT TQ_OBJECT public: - KOnlineBankingtqStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0); - ~KOnlineBankingtqStatus(); + KOnlineBankingStatus(const MyMoneyAccount& acc, TQWidget *parent=0, const char *name=0); + ~KOnlineBankingStatus(); const TQString& appId(void) const; TQString headerVersion(void) const; private: diff --git a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui index 5f3af99..e7d5cec 100644 --- a/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui +++ b/kmymoney2/plugins/ofximport/dialogs/konlinebankingstatusdecl.ui @@ -79,7 +79,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -87,7 +87,7 @@ </property> <widget class="KLed"> <property name="name"> - <cstring>m_ledOnlinetqStatus</cstring> + <cstring>m_ledOnlineStatus</cstring> </property> <property name="state"> <enum>Off</enum> @@ -95,7 +95,7 @@ </widget> <widget class="TQLabel"> <property name="name"> - <cstring>m_textOnlinetqStatus</cstring> + <cstring>m_textOnlineStatus</cstring> </property> <property name="sizePolicy"> <sizepolicy> @@ -119,7 +119,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>21</height> @@ -159,7 +159,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -188,7 +188,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>150</width> <height>21</height> @@ -229,7 +229,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -237,7 +237,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -274,7 +274,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <hbox> <property name="name"> @@ -300,7 +300,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -346,7 +346,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -368,7 +368,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -435,7 +435,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>20</height> @@ -456,7 +456,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>50</height> diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp index 28f9e29..36a05b5 100644 --- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp @@ -145,7 +145,7 @@ TQString MyMoneyOfxConnector::url(void) const { return m_fiSettings.value("url") TQDate MyMoneyOfxConnector::statementStartDate(void) const { if ((m_fiSettings.value("kmmofx-todayMinus").toInt() != 0) && !m_fiSettings.value("kmmofx-numRequestDays").isEmpty()) { - return TQDate::tqcurrentDate().addDays(-m_fiSettings.value("kmmofx-numRequestDays").toInt()); + return TQDate::currentDate().addDays(-m_fiSettings.value("kmmofx-numRequestDays").toInt()); } else if ((m_fiSettings.value("kmmofx-lastUpdate").toInt() != 0) && !m_account.value("lastImportedTransactionDate").isEmpty()) { @@ -155,7 +155,7 @@ TQDate MyMoneyOfxConnector::statementStartDate(void) const { { return TQDate::fromString(m_fiSettings.value("kmmofx-specificDate")); } - return TQDate::tqcurrentDate().addMonths(-2); + return TQDate::currentDate().addMonths(-2); } #if LIBOFX_IS_VERSION(0,9,0) @@ -356,7 +356,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::message(const TQString& _msgType, MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentRequest(void) const { - TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); return message("INVSTMT","INVSTMT",Tag("INVSTMTRQ") @@ -387,7 +387,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardRequest(const TQDate& _d MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOn(void) const { - TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); Tag fi("FI"); fi.element("ORG",fiorg()); @@ -416,13 +416,13 @@ 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) { static int id = 1; - return TQDateTime::tqcurrentDateTime().toString("yyyyMMdd-hhmmsszzz-") + TQString::number(id++); + return TQDateTime::currentDateTime().toString("yyyyMMdd-hhmmsszzz-") + TQString::number(id++); } // @@ -456,7 +456,7 @@ const TQByteArray MyMoneyOfxConnector::statementResponse(const TQDate& _dtstart) MyMoneyOfxConnector::Tag MyMoneyOfxConnector::signOnResponse(void) const { - TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); Tag sonrs("SONRS"); sonrs @@ -495,12 +495,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::bankStatementResponse(const TQDate MyMoneyFile* file = MyMoneyFile::instance(); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); - TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString transactionlist; MyMoneyTransactionFilter filter; - filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); + filter.setDateFilter(_dtstart,TQDate::currentDate()); filter.addAccount(m_account.id()); TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter); TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin(); @@ -522,12 +522,12 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::creditCardStatementResponse(const MyMoneyFile* file = MyMoneyFile::instance(); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); - TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString transactionlist; MyMoneyTransactionFilter filter; - filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); + filter.setDateFilter(_dtstart,TQDate::currentDate()); filter.addAccount(m_account.id()); TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter); TQValueList<MyMoneyTransaction>::const_iterator it_transaction = transactions.begin(); @@ -549,12 +549,12 @@ TQString MyMoneyOfxConnector::investmentStatementResponse(const TQDate& _dtstart MyMoneyFile* file = MyMoneyFile::instance(); TQString dtstart_string = _dtstart.toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); - TQString dtnow_string = TQDateTime::tqcurrentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); + TQString dtnow_string = TQDateTime::currentDateTime().toString(Qt::ISODate).remove(TQRegExp("[^0-9]")); TQString transactionlist; MyMoneyTransactionFilter filter; - filter.setDateFilter(_dtstart,TQDate::tqcurrentDate()); + filter.setDateFilter(_dtstart,TQDate::currentDate()); filter.addAccount(m_account.id()); filter.addAccount(m_account.accountList()); TQValueList<MyMoneyTransaction> transactions = file->transactionList(filter); diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp index 7755dc8..390edaf 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.cpp +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.cpp @@ -19,7 +19,7 @@ // QT Includes #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqradiobutton.h> #include <tqspinbox.h> #include <tqdatetimeedit.h> @@ -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){ @@ -578,7 +578,7 @@ void OfxImporterPlugin::protocols(TQStringList& protocolList) const TQWidget* OfxImporterPlugin::accountConfigTab(const MyMoneyAccount& acc, TQString& name) { name = i18n("Online settings"); - m_statusDlg = new KOnlineBankingtqStatus(acc, 0, 0); + m_statusDlg = new KOnlineBankingStatus(acc, 0, 0); return m_statusDlg; } @@ -636,7 +636,7 @@ bool OfxImporterPlugin::updateAccount(const MyMoneyAccount& acc, bool moreAccoun dlg.exec(); } } catch (MyMoneyException *e) { - KMessageBox::information(0 ,i18n("Error connecting to bank: %1").tqarg(e->what())); + KMessageBox::information(0 ,i18n("Error connecting to bank: %1").arg(e->what())); delete e; } @@ -647,7 +647,7 @@ void OfxImporterPlugin::slotImportFile(const TQString& url) { if(!import(url)) { - KMessageBox::error( 0, TQString("<qt>%1</qt>").tqarg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:<p>%2").tqarg(url, lastError())), i18n("Importing error")); + KMessageBox::error( 0, TQString("<qt>%1</qt>").arg(i18n("Unable to import %1 using the OFX importer plugin. The plugin returned the following error:<p>%2").arg(url, lastError())), i18n("Importing error")); } } diff --git a/kmymoney2/plugins/ofximport/ofximporterplugin.h b/kmymoney2/plugins/ofximport/ofximporterplugin.h index 2103ccb..04a4892 100644 --- a/kmymoney2/plugins/ofximport/ofximporterplugin.h +++ b/kmymoney2/plugins/ofximport/ofximporterplugin.h @@ -35,7 +35,7 @@ // Project Includes #include "../kmymoneyplugin.h" -class KOnlineBankingtqStatus; +class KOnlineBankingStatus; /** @author Ace Jones @@ -140,7 +140,7 @@ private: TQStringList m_infos; TQStringList m_warnings; TQStringList m_errors; - KOnlineBankingtqStatus* m_statusDlg; + KOnlineBankingStatus* m_statusDlg; }; #endif diff --git a/kmymoney2/plugins/ofximport/ofxpartner.cpp b/kmymoney2/plugins/ofximport/ofxpartner.cpp index 804b542..29765f4 100644 --- a/kmymoney2/plugins/ofximport/ofxpartner.cpp +++ b/kmymoney2/plugins/ofximport/ofxpartner.cpp @@ -31,7 +31,7 @@ #include <tqdom.h> #include <tqregexp.h> #include <tqdir.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -67,7 +67,7 @@ void setDirectory(const TQString& dir) bool needReload(const TQFileInfo& i) { return ((!i.isReadable()) - || (i.lastModified().addDays(7) < TQDateTime::tqcurrentDateTime()) + || (i.lastModified().addDays(7) < TQDateTime::currentDateTime()) || (i.size() < 1024)); } @@ -233,15 +233,15 @@ 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). // Increasing to VER=9 solved the problem. This may happen again in the // future. TQFileInfo i(guidFile.path()); - if(!i.isReadable() || i.lastModified().addDays(7) < TQDateTime::tqcurrentDateTime()) - 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); + 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).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/plugins/pluginloader.cpp b/kmymoney2/plugins/pluginloader.cpp index 5e1dcc6..1ffb8bb 100644 --- a/kmymoney2/plugins/pluginloader.cpp +++ b/kmymoney2/plugins/pluginloader.cpp @@ -20,7 +20,7 @@ #include <tqstringlist.h> #include <tqcheckbox.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes diff --git a/kmymoney2/plugins/viewinterface.h b/kmymoney2/plugins/viewinterface.h index 620cef1..06b7d9d 100644 --- a/kmymoney2/plugins/viewinterface.h +++ b/kmymoney2/plugins/viewinterface.h @@ -68,7 +68,7 @@ public: virtual KMyMoneyViewBase* addPage(const TQString& item, const TQString& icon) = 0; /** - * This method adds a widget to the tqlayout of the view + * This method adds a widget to the layout of the view * created with addPage() * * @param view pointer to view widget diff --git a/kmymoney2/reports/kreportchartview.cpp b/kmymoney2/reports/kreportchartview.cpp index 79a5b5d..208089f 100644 --- a/kmymoney2/reports/kreportchartview.cpp +++ b/kmymoney2/reports/kreportchartview.cpp @@ -95,7 +95,7 @@ KReportChartView::KReportChartView( TQWidget* parent, const char* name ): KDChar // mouse tracking on will force the mouseMoveEvent() method to be called from TQt label->setMouseTracking( true ); label->setFrameStyle( TQFrame::PopupPanel | TQFrame::Raised ); - label->tqsetAlignment( AlignRight ); + label->setAlignment( AlignRight ); label->setAutoResize( true ); } @@ -151,17 +151,17 @@ void KReportChartView::mouseMoveEvent( TQMouseEvent* event ) { // set the tooltip text label->setText(TQString("<h2>%1</h2><strong>%2</strong><br>(%3\%)") - .tqarg(this->params()->legendText( dataset )) - .tqarg(value, 0, 'f', 2) - .tqarg(pivot_sum, 0, 'f', 2) + .arg(this->params()->legendText( dataset )) + .arg(value, 0, 'f', 2) + .arg(pivot_sum, 0, 'f', 2) ); } else // if there is only one dataset, don't show percentage { // set the tooltip text label->setText(TQString("<h2>%1</h2><strong>%2</strong>") - .tqarg(this->params()->legendText( dataset )) - .tqarg(value, 0, 'f', 2) + .arg(this->params()->legendText( dataset )) + .arg(value, 0, 'f', 2) ); } diff --git a/kmymoney2/reports/listtable.cpp b/kmymoney2/reports/listtable.cpp index 481b6b2..acfe365 100644 --- a/kmymoney2/reports/listtable.cpp +++ b/kmymoney2/reports/listtable.cpp @@ -21,7 +21,7 @@ // QT Includes #include <tqvaluelist.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -157,11 +157,11 @@ namespace reports { //actual dates of the report result += TQString("<div class=\"subtitle\">"); if(!m_config.fromDate().isNull()) { - result += i18n("Report date range", "%1 through %2").tqarg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).tqarg(KGlobal::locale()->formatDate(m_config.toDate(), true)); + result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true)); result += TQString("</div>\n"); result += TQString("<div class=\"gap\"> </div>\n"); - csv += i18n("Report date range", "%1 through %2").tqarg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).tqarg(KGlobal::locale()->formatDate(m_config.toDate(), true)); + csv += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config.toDate(), true)); csv += TQString("\n"); } diff --git a/kmymoney2/reports/objectinfotable.cpp b/kmymoney2/reports/objectinfotable.cpp index 37dfecc..cd7b795 100644 --- a/kmymoney2/reports/objectinfotable.cpp +++ b/kmymoney2/reports/objectinfotable.cpp @@ -21,7 +21,7 @@ // QT Includes #include <tqvaluelist.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -157,7 +157,7 @@ void ObjectInfoTable::constructScheduleTable ( void ) //convert to base currency if needed MyMoneyMoney xr = MyMoneyMoney(1,1); if (m_config.isConvertCurrency() && account.isForeignCurrency()) { - xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce(); + xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce(); } // help for sort and render functions @@ -274,7 +274,7 @@ void ObjectInfoTable::constructAccountTable ( void ) //convert to base currency if needed if (m_config.isConvertCurrency() && account.isForeignCurrency()) { - MyMoneyMoney xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce(); + MyMoneyMoney xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce(); value = value * xr; } accountRow["currentbalance"] = value.toString(); @@ -306,7 +306,7 @@ void ObjectInfoTable::constructAccountLoanTable ( void ) //convert to base currency if needed MyMoneyMoney xr = MyMoneyMoney(1,1); if (m_config.isConvertCurrency() && account.isForeignCurrency()) { - xr = account.baseCurrencyPrice(TQDate::tqcurrentDate()).reduce(); + xr = account.baseCurrencyPrice(TQDate::currentDate()).reduce(); } accountRow["rank"] = "0"; @@ -321,7 +321,7 @@ void ObjectInfoTable::constructAccountLoanTable ( void ) accountRow["currencyname"] = (file->currency(account.currencyId())).name(); accountRow["payee"] = file->payee(loan.payee()).name(); accountRow["loanamount"] = (loan.loanAmount() * xr).toString(); - accountRow["interestrate"] = (loan.interestRate(TQDate::tqcurrentDate())/MyMoneyMoney(100,1)*xr).toString(); + accountRow["interestrate"] = (loan.interestRate(TQDate::currentDate())/MyMoneyMoney(100,1)*xr).toString(); accountRow["nextinterestchange"] = loan.nextInterestChange().toString( Qt::ISODate ); accountRow["periodicpayment"] = (loan.periodicPayment() * xr).toString(); accountRow["finalpayment"] = (loan.finalPayment() * xr).toString(); @@ -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/pivotgrid.cpp b/kmymoney2/reports/pivotgrid.cpp index 6a3f773..223b86c 100644 --- a/kmymoney2/reports/pivotgrid.cpp +++ b/kmymoney2/reports/pivotgrid.cpp @@ -18,11 +18,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqregexp.h> #include <tqdragobject.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqapplication.h> #include <tqprinter.h> #include <tqpainter.h> diff --git a/kmymoney2/reports/pivottable.cpp b/kmymoney2/reports/pivottable.cpp index bf048cb..be8c05d 100644 --- a/kmymoney2/reports/pivottable.cpp +++ b/kmymoney2/reports/pivottable.cpp @@ -19,11 +19,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqregexp.h> #include <tqdragobject.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqapplication.h> #include <tqprinter.h> #include <tqpainter.h> @@ -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 @@ -230,8 +230,8 @@ void PivotTable::init(void) while ( it_date != paymentDates.end() ) { //if the payment occurs in the past, enter it tomorrow - if(TQDate::tqcurrentDate() >= *it_date) { - tx.setPostDate(TQDate::tqcurrentDate().addDays(1)); + if(TQDate::currentDate() >= *it_date) { + tx.setPostDate(TQDate::currentDate().addDays(1)); } else { tx.setPostDate(*it_date); } @@ -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; } @@ -286,8 +286,8 @@ void PivotTable::init(void) TQDate dueDate = sched.nextDueDate(); //if the payment is overdue, use current date - if(dueDate < TQDate::tqcurrentDate()) - dueDate = TQDate::tqcurrentDate(); + if(dueDate < TQDate::currentDate()) + dueDate = TQDate::currentDate(); //get the balance from the file for the date loanBalances[splitAccount.id()] = file->balance(splitAccount.id(), dueDate.addDays(-1)); @@ -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<MyMoneyTransaction> transactions = file->transactionList(filter); //if a closed account has no transactions in that timeframe, do not include it if(transactions.size() == 0 ) { - DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").tqarg(account.name())); + DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").arg(account.name())); ++it_account; continue; } } - DEBUG_OUTPUT(TQString("Includes account %1").tqarg(account.name())); + DEBUG_OUTPUT(TQString("Includes account %1").arg(account.name())); // the row group is the account class (major account type) TQString outergroup = KMyMoneyUtils::accountTypeToString(account.accountGroup()); @@ -699,7 +699,7 @@ void PivotTable::calculateOpeningBalances( void ) } else { - DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").tqarg(account.name())); + DEBUG_OUTPUT(TQString("DOES NOT INCLUDE account %1").arg(account.name())); } ++it_account; @@ -713,7 +713,7 @@ void PivotTable::calculateRunningSums( PivotInnerGroup::iterator& it_row) while ( column < m_numColumns ) { if ( it_row.data()[eActual].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").tqarg(column).tqarg(it_row.data()[eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").arg(column).arg(it_row.data()[eActual].count())); runningsum = it_row.data()[eActual][column].calculateRunningSum(runningsum); @@ -742,7 +742,7 @@ void PivotTable::calculateRunningSums( void ) while ( column < m_numColumns ) { if ( it_row.data()[eActual].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").tqarg(column).tqarg(it_row.data()[eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateRunningSums").arg(column).arg(it_row.data()[eActual].count())); runningsum = ( it_row.data()[eActual][column] += runningsum ); @@ -787,9 +787,9 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc TQString innergroup( row.topParentName() ); if ( m_numColumns <= _column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::cellBalance").tqarg(_column).tqarg(m_numColumns)); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::cellBalance").arg(_column).arg(m_numColumns)); if ( m_grid[outergroup][innergroup][row][eActual].count() <= _column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").tqarg(_column).tqarg(m_grid[outergroup][innergroup][row][eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").arg(_column).arg(m_grid[outergroup][innergroup][row][eActual].count())); MyMoneyMoney balance; if ( budget ) @@ -801,7 +801,7 @@ MyMoneyMoney PivotTable::cellBalance(const TQString& outergroup, const ReportAcc while ( column < _column) { if ( m_grid[outergroup][innergroup][row][eActual].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").tqarg(column).tqarg(m_grid[outergroup][innergroup][row][eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::cellBalance").arg(column).arg(m_grid[outergroup][innergroup][row][eActual].count())); balance = m_grid[outergroup][innergroup][row][eActual][column].cellBalance(balance); @@ -831,7 +831,7 @@ void PivotTable::calculateBudgetMapping( void ) TQValueList<MyMoneyBudget>::const_iterator budgets_it = budgets.begin(); while( budgets_it != budgets.end() ) { //pick the first budget that matches the report start year - if( (*budgets_it).budgetStart().year() == TQDate::tqcurrentDate().year() ) { + if( (*budgets_it).budgetStart().year() == TQDate::currentDate().year() ) { budget = file->budget( (*budgets_it).id()); break; } @@ -1009,7 +1009,7 @@ void PivotTable::convertToBaseCurrency( void ) while ( column < m_numColumns ) { if ( it_row.data()[eActual].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToBaseCurrency").tqarg(column).tqarg(it_row.data()[eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToBaseCurrency").arg(column).arg(it_row.data()[eActual].count())); TQDate valuedate = columnDate(column); @@ -1025,7 +1025,7 @@ void PivotTable::convertToBaseCurrency( void ) //convert to lowest fraction it_row.data()[ m_rowTypeList[i] ][column] = PivotCell(value.convert(fraction)); - DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").tqarg(conversionfactor).tqarg(DEBUG_SENSITIVE(oldval)).tqarg(DEBUG_SENSITIVE(it_row.data()[m_rowTypeList[i]][column].toDouble()))); + DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").arg(conversionfactor).arg(DEBUG_SENSITIVE(oldval)).arg(DEBUG_SENSITIVE(it_row.data()[m_rowTypeList[i]][column].toDouble()))); } } @@ -1058,7 +1058,7 @@ void PivotTable::convertToDeepCurrency( void ) while ( column < m_numColumns ) { if ( it_row.data()[eActual].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToDeepCurrency").tqarg(column).tqarg(it_row.data()[eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::convertToDeepCurrency").arg(column).arg(it_row.data()[eActual].count())); TQDate valuedate = columnDate(column); @@ -1085,7 +1085,7 @@ void PivotTable::convertToDeepCurrency( void ) it_row.data()[ePrice][column] = PivotCell(priceValue.convert(10000)); } - DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").tqarg(conversionfactor).tqarg(DEBUG_SENSITIVE(oldval)).tqarg(DEBUG_SENSITIVE(it_row.data()[eActual][column].toDouble()))); + DEBUG_OUTPUT_IF(conversionfactor != MyMoneyMoney(1,1) ,TQString("Factor of %1, value was %2, now %3").arg(conversionfactor).arg(DEBUG_SENSITIVE(oldval)).arg(DEBUG_SENSITIVE(it_row.data()[eActual][column].toDouble()))); ++column; } @@ -1139,9 +1139,9 @@ void PivotTable::calculateTotals( void ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { if ( it_row.data()[ m_rowTypeList[i] ].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, row columns").tqarg(column).tqarg(it_row.data()[ m_rowTypeList[i] ].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, row columns").arg(column).arg(it_row.data()[ m_rowTypeList[i] ].count())); if ( (*it_innergroup).m_total[ m_rowTypeList[i] ].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); //calculate total MyMoneyMoney value = it_row.data()[ m_rowTypeList[i] ][column]; @@ -1162,9 +1162,9 @@ void PivotTable::calculateTotals( void ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { if ( (*it_innergroup).m_total[ m_rowTypeList[i] ].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, inner group totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); if ( (*it_outergroup).m_total[ m_rowTypeList[i] ].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, outer group totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, outer group totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); //calculate totals MyMoneyMoney value = (*it_innergroup).m_total[ m_rowTypeList[i] ][column]; @@ -1187,7 +1187,7 @@ void PivotTable::calculateTotals( void ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { if ( m_grid.m_total[ m_rowTypeList[i] ].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").tqarg(column).tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").arg(column).arg((*it_innergroup).m_total[ m_rowTypeList[i] ].count())); //calculate actual totals MyMoneyMoney value = (*it_outergroup).m_total[ m_rowTypeList[i] ][column]; @@ -1215,7 +1215,7 @@ void PivotTable::calculateTotals( void ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { if ( m_grid.m_total[ m_rowTypeList[i] ].count() <= totalcolumn ) - throw new MYMONEYEXCEPTION(TQString("Total column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").tqarg(totalcolumn).tqarg(m_grid.m_total[ m_rowTypeList[i] ].count())); + throw new MYMONEYEXCEPTION(TQString("Total column %1 out of grid range (%2) in PivotTable::calculateTotals, grid totals").arg(totalcolumn).arg(m_grid.m_total[ m_rowTypeList[i] ].count())); //calculate actual totals MyMoneyMoney value = m_grid.m_total[ m_rowTypeList[i] ][totalcolumn]; @@ -1228,7 +1228,7 @@ void PivotTable::calculateTotals( void ) void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _row, unsigned column, MyMoneyMoney value, bool budget, bool stockSplit ) { DEBUG_ENTER(__PRETTY_FUNCTION__); - DEBUG_OUTPUT(TQString("Parameters: %1,%2,%3,%4,%5").tqarg(outergroup).tqarg(_row.debugName()).tqarg(column).tqarg(DEBUG_SENSITIVE(value.toDouble())).tqarg(budget)); + DEBUG_OUTPUT(TQString("Parameters: %1,%2,%3,%4,%5").arg(outergroup).arg(_row.debugName()).arg(column).arg(DEBUG_SENSITIVE(value.toDouble())).arg(budget)); // for budget reports, if this is the actual value, map it to the account which // holds its budget @@ -1252,9 +1252,9 @@ void PivotTable::assignCell( const TQString& outergroup, const ReportAccount& _r TQString innergroup( row.topParentName() ); if ( m_numColumns <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::assignCell").tqarg(column).tqarg(m_numColumns)); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of m_numColumns range (%2) in PivotTable::assignCell").arg(column).arg(m_numColumns)); if ( m_grid[outergroup][innergroup][row][eActual].count() <= column ) - throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::assignCell").tqarg(column).tqarg(m_grid[outergroup][innergroup][row][eActual].count())); + throw new MYMONEYEXCEPTION(TQString("Column %1 out of grid range (%2) in PivotTable::assignCell").arg(column).arg(m_grid[outergroup][innergroup][row][eActual].count())); if(!stockSplit) { // Determine whether the value should be inverted before being placed in the row @@ -1281,19 +1281,19 @@ void PivotTable::createRow( const TQString& outergroup, const ReportAccount& row if ( ! m_grid.contains(outergroup) ) { - DEBUG_OUTPUT(TQString("Adding group [%1]").tqarg(outergroup)); + DEBUG_OUTPUT(TQString("Adding group [%1]").arg(outergroup)); m_grid[outergroup] = PivotOuterGroup(m_numColumns); } if ( ! m_grid[outergroup].contains(innergroup) ) { - DEBUG_OUTPUT(TQString("Adding group [%1][%2]").tqarg(outergroup).tqarg(innergroup)); + DEBUG_OUTPUT(TQString("Adding group [%1][%2]").arg(outergroup).arg(innergroup)); m_grid[outergroup][innergroup] = PivotInnerGroup(m_numColumns); } if ( ! m_grid[outergroup][innergroup].contains(row) ) { - DEBUG_OUTPUT(TQString("Adding row [%1][%2][%3]").tqarg(outergroup).tqarg(innergroup).tqarg(row.debugName())); + DEBUG_OUTPUT(TQString("Adding row [%1][%2][%3]").arg(outergroup).arg(innergroup).arg(row.debugName())); m_grid[outergroup][innergroup][row] = PivotGridRowSet(m_numColumns); if ( recursive && !row.isTopLevel() ) @@ -1325,11 +1325,11 @@ TQString PivotTable::renderCSV( void ) const // Report Title // - TQString result = TQString("\"Report: %1\"\n").tqarg(m_config_f.name()); + TQString result = TQString("\"Report: %1\"\n").arg(m_config_f.name()); if ( m_config_f.isConvertCurrency() ) - result += i18n("All currencies converted to %1\n").tqarg(MyMoneyFile::instance()->baseCurrency().name()); + result += i18n("All currencies converted to %1\n").arg(MyMoneyFile::instance()->baseCurrency().name()); else - result += i18n("All values shown in %1 unless otherwise noted\n").tqarg(MyMoneyFile::instance()->baseCurrency().name()); + result += i18n("All values shown in %1 unless otherwise noted\n").arg(MyMoneyFile::instance()->baseCurrency().name()); // // Table Header @@ -1339,10 +1339,10 @@ TQString PivotTable::renderCSV( void ) const unsigned column = 1; while ( column < m_numColumns ) - result += TQString(",%1").tqarg(TQString(m_columnHeadings[column++])); + result += TQString(",%1").arg(TQString(m_columnHeadings[column++])); if ( m_config_f.isShowingRowTotals() ) - result += TQString(",%1").tqarg(i18n("Total")); + result += TQString(",%1").arg(i18n("Total")); result += "\n"; @@ -1396,14 +1396,14 @@ TQString PivotTable::renderCSV( void ) const //show columns for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { isUsed |= it_row.data()[ m_rowTypeList[i] ][column].isUsed(); - rowdata += TQString(",\"%1\"").tqarg(it_row.data()[ m_rowTypeList[i] ][column].formatMoney(fraction, false)); + rowdata += TQString(",\"%1\"").arg(it_row.data()[ m_rowTypeList[i] ][column].formatMoney(fraction, false)); } column++; } if ( m_config_f.isShowingRowTotals() ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) - rowdata += TQString(",\"%1\"").tqarg((*it_row)[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); + rowdata += TQString(",\"%1\"").arg((*it_row)[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); } // @@ -1417,7 +1417,7 @@ TQString PivotTable::renderCSV( void ) const // current row contains a foreign currency, then we append the currency // to the name of the account if (!m_config_f.isConvertCurrency() && rowname.isForeignCurrency() ) - innergroupdata += TQString(" (%1)").tqarg(rowname.currencyId()); + innergroupdata += TQString(" (%1)").arg(rowname.currencyId()); innergroupdata += "\""; @@ -1461,7 +1461,7 @@ TQString PivotTable::renderCSV( void ) const finalRow = "\"" + TQString().fill(' ',rowname.hierarchyDepth() - 1) + rowname.name(); if (!m_config_f.isConvertCurrency() && rowname.isForeignCurrency() ) - finalRow += TQString(" (%1)").tqarg(rowname.currencyId()); + finalRow += TQString(" (%1)").arg(rowname.currencyId()); finalRow += "\""; } @@ -1477,14 +1477,14 @@ TQString PivotTable::renderCSV( void ) const { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { isUsed |= (*it_innergroup).m_total[ m_rowTypeList[i] ][column].isUsed(); - finalRow += TQString(",\"%1\"").tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false)); + finalRow += TQString(",\"%1\"").arg((*it_innergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false)); } column++; } if ( m_config_f.isShowingRowTotals() ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) - finalRow += TQString(",\"%1\"").tqarg((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); + finalRow += TQString(",\"%1\"").arg((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); } finalRow += "\n"; @@ -1504,18 +1504,18 @@ TQString PivotTable::renderCSV( void ) const if ( m_config_f.isShowingColumnTotals() ) { - result += TQString("%1 %2").tqarg(i18n("Total")).tqarg(it_outergroup.key()); + result += TQString("%1 %2").arg(i18n("Total")).arg(it_outergroup.key()); unsigned column = 1; while ( column < m_numColumns ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) - result += TQString(",\"%1\"").tqarg((*it_outergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false)); + result += TQString(",\"%1\"").arg((*it_outergroup).m_total[ m_rowTypeList[i] ][column].formatMoney(fraction, false)); column++; } if ( m_config_f.isShowingRowTotals() ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) - result += TQString(",\"%1\"").tqarg((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); + result += TQString(",\"%1\"").arg((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); } result += "\n"; @@ -1533,14 +1533,14 @@ TQString PivotTable::renderCSV( void ) const unsigned totalcolumn = 1; while ( totalcolumn < m_numColumns ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) - result += TQString(",\"%1\"").tqarg(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn].formatMoney(fraction, false)); + result += TQString(",\"%1\"").arg(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn].formatMoney(fraction, false)); totalcolumn++; } if ( m_config_f.isShowingRowTotals() ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) - result += TQString(",\"%1\"").tqarg(m_grid.m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); + result += TQString(",\"%1\"").arg(m_grid.m_total[ m_rowTypeList[i] ].m_total.formatMoney(fraction, false)); } result += "\n"; @@ -1553,26 +1553,26 @@ TQString PivotTable::renderHTML( void ) const { DEBUG_ENTER(__PRETTY_FUNCTION__); - TQString colspan = TQString(" colspan=\"%1\"").tqarg(m_numColumns + 1 + (m_config_f.isShowingRowTotals() ? 1 : 0) ); + TQString colspan = TQString(" colspan=\"%1\"").arg(m_numColumns + 1 + (m_config_f.isShowingRowTotals() ? 1 : 0) ); // // Report Title // - TQString result = TQString("<h2 class=\"report\">%1</h2>\n").tqarg(m_config_f.name()); + TQString result = TQString("<h2 class=\"report\">%1</h2>\n").arg(m_config_f.name()); //actual dates of the report result += TQString("<div class=\"subtitle\">"); - result += i18n("Report date range", "%1 through %2").tqarg(KGlobal::locale()->formatDate(m_config_f.fromDate(), true)).tqarg(KGlobal::locale()->formatDate(m_config_f.toDate(), true)); + result += i18n("Report date range", "%1 through %2").arg(KGlobal::locale()->formatDate(m_config_f.fromDate(), true)).arg(KGlobal::locale()->formatDate(m_config_f.toDate(), true)); result += TQString("</div>\n"); result += TQString("<div class=\"gap\"> </div>\n"); //currency conversion message result += TQString("<div class=\"subtitle\">"); if ( m_config_f.isConvertCurrency() ) - result += i18n("All currencies converted to %1").tqarg(MyMoneyFile::instance()->baseCurrency().name()); + result += i18n("All currencies converted to %1").arg(MyMoneyFile::instance()->baseCurrency().name()); else - result += i18n("All values shown in %1 unless otherwise noted").tqarg(MyMoneyFile::instance()->baseCurrency().name()); + result += i18n("All values shown in %1 unless otherwise noted").arg(MyMoneyFile::instance()->baseCurrency().name()); result += TQString("</div>\n"); result += TQString("<div class=\"gap\"> </div>\n"); @@ -1585,19 +1585,19 @@ TQString PivotTable::renderHTML( void ) const // Table Header // result += TQString("\n\n<table class=\"report\" cellspacing=\"0\">\n" - "<thead><tr class=\"itemheader\">\n<th>%1</th>").tqarg(i18n("Account")); + "<thead><tr class=\"itemheader\">\n<th>%1</th>").arg(i18n("Account")); TQString headerspan; int span = m_rowTypeList.size(); - headerspan = TQString(" colspan=\"%1\"").tqarg(span); + headerspan = TQString(" colspan=\"%1\"").arg(span); unsigned column = 1; while ( column < m_numColumns ) - result += TQString("<th%1>%2</th>").tqarg(headerspan,TQString(m_columnHeadings[column++]).replace(TQRegExp(" "),"<br>")); + result += TQString("<th%1>%2</th>").arg(headerspan,TQString(m_columnHeadings[column++]).replace(TQRegExp(" "),"<br>")); if ( m_config_f.isShowingRowTotals() ) - result += TQString("<th%1>%2</th>").tqarg(headerspan).tqarg(i18n("Total")); + result += TQString("<th%1>%2</th>").arg(headerspan).arg(i18n("Total")); result += "</tr></thead>\n"; @@ -1617,16 +1617,16 @@ TQString PivotTable::renderHTML( void ) const for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { result += TQString("<td%2>%1</td>") - .tqarg(i18n( m_columnTypeHeaderList[i] )) - .tqarg(i == 0 ? lb : TQString() ); + .arg(i18n( m_columnTypeHeaderList[i] )) + .arg(i == 0 ? lb : TQString() ); } column++; } if ( m_config_f.isShowingRowTotals() ) { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { result += TQString("<td%2>%1</td>") - .tqarg(i18n( m_columnTypeHeaderList[i] )) - .tqarg(i == 0 ? leftborder : TQString() ); + .arg(i18n( m_columnTypeHeaderList[i] )) + .arg(i == 0 ? leftborder : TQString() ); } } result += "</tr>"; @@ -1667,7 +1667,7 @@ TQString PivotTable::renderHTML( void ) const // Outer Group Header // - result += TQString("<tr class=\"sectionheader\"><td class=\"left\"%1>%2</td></tr>\n").tqarg(colspan).tqarg((*it_outergroup).m_displayName); + result += TQString("<tr class=\"sectionheader\"><td class=\"left\"%1>%2</td></tr>\n").arg(colspan).arg((*it_outergroup).m_displayName); // Skip the inner groups if the report only calls for outer group totals to be shown if ( m_config_f.detailLevel() != MyMoneyReport::eDetailGroup ) @@ -1704,8 +1704,8 @@ TQString PivotTable::renderHTML( void ) const for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { rowdata += TQString("<td%2>%1</td>") - .tqarg(coloredAmount(it_row.data()[ m_rowTypeList[i] ][column])) - .tqarg(i == 0 ? lb : TQString()); + .arg(coloredAmount(it_row.data()[ m_rowTypeList[i] ][column])) + .arg(i == 0 ? lb : TQString()); isUsed |= it_row.data()[ m_rowTypeList[i] ][column].isUsed(); } @@ -1717,8 +1717,8 @@ TQString PivotTable::renderHTML( void ) const { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { rowdata += TQString("<td%2>%1</td>") - .tqarg(coloredAmount(it_row.data()[ m_rowTypeList[i] ].m_total)) - .tqarg(i == 0 ? leftborder : TQString()); + .arg(coloredAmount(it_row.data()[ m_rowTypeList[i] ].m_total)) + .arg(i == 0 ? leftborder : TQString()); } } @@ -1731,12 +1731,12 @@ TQString PivotTable::renderHTML( void ) const // don't show closed accounts if they have not been used if(!rowname.isClosed() || isUsed) { innergroupdata += TQString("<tr class=\"row-%1\"%2><td%3 class=\"left\" style=\"text-indent: %4.0em\">%5%6</td>") - .tqarg(rownum & 0x01 ? "even" : "odd") - .tqarg(rowname.isTopLevel() ? " id=\"topparent\"" : "") - .tqarg("") //.tqarg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank - .tqarg(rowname.hierarchyDepth() - 1) - .tqarg(rowname.name().replace(TQRegExp(" "), " ")) - .tqarg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").tqarg(rowname.currency().id())); + .arg(rownum & 0x01 ? "even" : "odd") + .arg(rowname.isTopLevel() ? " id=\"topparent\"" : "") + .arg("") //.arg((*it_row).m_total.isZero() ? colspan : "") // colspan the distance if this row will be blank + .arg(rowname.hierarchyDepth() - 1) + .arg(rowname.name().replace(TQRegExp(" "), " ")) + .arg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").arg(rowname.currency().id())); // Don't print this row if it's going to be all zeros // TODO: Uncomment this, and deal with the case where the data @@ -1766,8 +1766,8 @@ TQString PivotTable::renderHTML( void ) const { // Start the TOTALS row finalRow = TQString("<tr class=\"row-%1\" id=\"subtotal\"><td class=\"left\"> %2</td>") - .tqarg(rownum & 0x01 ? "even" : "odd") - .tqarg(i18n("Total")); + .arg(rownum & 0x01 ? "even" : "odd") + .arg(i18n("Total")); // don't suppress display of totals isUsed = true; } @@ -1788,11 +1788,11 @@ TQString PivotTable::renderHTML( void ) const ReportAccount rowname = (*it_innergroup).begin().key(); isUsed |= !rowname.isClosed(); finalRow = TQString("<tr class=\"row-%1\"%2><td class=\"left\" style=\"text-indent: %3.0em;\">%5%6</td>") - .tqarg(rownum & 0x01 ? "even" : "odd") - .tqarg( m_config_f.detailLevel() == MyMoneyReport::eDetailAll ? "id=\"solo\"" : "" ) - .tqarg(rowname.hierarchyDepth() - 1) - .tqarg(rowname.name().replace(TQRegExp(" "), " ")) - .tqarg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").tqarg(rowname.currency().id())); + .arg(rownum & 0x01 ? "even" : "odd") + .arg( m_config_f.detailLevel() == MyMoneyReport::eDetailAll ? "id=\"solo\"" : "" ) + .arg(rowname.hierarchyDepth() - 1) + .arg(rowname.name().replace(TQRegExp(" "), " ")) + .arg((m_config_f.isConvertCurrency() || !rowname.isForeignCurrency() )?TQString():TQString(" (%1)").arg(rowname.currency().id())); } // Finish the row started above, unless told not to @@ -1808,8 +1808,8 @@ TQString PivotTable::renderHTML( void ) const for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { finalRow += TQString("<td%2>%1</td>") - .tqarg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ][column])) - .tqarg(i == 0 ? lb : TQString()); + .arg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ][column])) + .arg(i == 0 ? lb : TQString()); isUsed |= (*it_innergroup).m_total[ m_rowTypeList[i] ][column].isUsed(); } @@ -1820,8 +1820,8 @@ TQString PivotTable::renderHTML( void ) const { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { finalRow += TQString("<td%2>%1</td>") - .tqarg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total)) - .tqarg(i == 0 ? leftborder : TQString()); + .arg(coloredAmount((*it_innergroup).m_total[ m_rowTypeList[i] ].m_total)) + .arg(i == 0 ? leftborder : TQString()); } } @@ -1844,7 +1844,7 @@ TQString PivotTable::renderHTML( void ) const if ( m_config_f.isShowingColumnTotals() ) { - result += TQString("<tr class=\"sectionfooter\"><td class=\"left\">%1 %2</td>").tqarg(i18n("Total")).tqarg((*it_outergroup).m_displayName); + result += TQString("<tr class=\"sectionfooter\"><td class=\"left\">%1 %2</td>").arg(i18n("Total")).arg((*it_outergroup).m_displayName); unsigned column = 1; while ( column < m_numColumns ) { @@ -1854,8 +1854,8 @@ TQString PivotTable::renderHTML( void ) const for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { result += TQString("<td%2>%1</td>") - .tqarg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ][column])) - .tqarg(i == 0 ? lb : TQString()); + .arg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ][column])) + .arg(i == 0 ? lb : TQString()); } column++; @@ -1865,8 +1865,8 @@ TQString PivotTable::renderHTML( void ) const { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { result += TQString("<td%2>%1</td>") - .tqarg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total)) - .tqarg(i == 0 ? leftborder : TQString()); + .arg(coloredAmount((*it_outergroup).m_total[ m_rowTypeList[i] ].m_total)) + .arg(i == 0 ? leftborder : TQString()); } } result += "</tr>\n"; @@ -1885,7 +1885,7 @@ TQString PivotTable::renderHTML( void ) const if ( m_config_f.isShowingColumnTotals() ) { result += TQString("<tr class=\"spacer\"><td> </td></tr>\n"); - result += TQString("<tr class=\"reportfooter\"><td class=\"left\">%1</td>").tqarg(i18n("Grand Total")); + result += TQString("<tr class=\"reportfooter\"><td class=\"left\">%1</td>").arg(i18n("Grand Total")); unsigned totalcolumn = 1; while ( totalcolumn < m_numColumns ) { @@ -1895,8 +1895,8 @@ TQString PivotTable::renderHTML( void ) const for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { result += TQString("<td%2>%1</td>") - .tqarg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn])) - .tqarg(i == 0 ? lb : TQString()); + .arg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ][totalcolumn])) + .arg(i == 0 ? lb : TQString()); } totalcolumn++; @@ -1906,8 +1906,8 @@ TQString PivotTable::renderHTML( void ) const { for(unsigned i = 0; i < m_rowTypeList.size(); ++i) { result += TQString("<td%2>%1</td>") - .tqarg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ].m_total)) - .tqarg(i == 0 ? leftborder : TQString()); + .arg(coloredAmount(m_grid.m_total[ m_rowTypeList[i] ].m_total)) + .arg(i == 0 ? leftborder : TQString()); } } @@ -2213,7 +2213,7 @@ void PivotTable::drawChart( KReportChartView& _view ) const { // the first column of report which represents a date in the future, or one past the // last column if all columns are in the present day. Only relevant when accountSeries==true - unsigned futurecolumn = columnValue(TQDate::tqcurrentDate()) - columnValue(m_beginDate) + 1; + unsigned futurecolumn = columnValue(TQDate::currentDate()) - columnValue(m_beginDate) + 1; // kdDebug(2) << "futurecolumn: " << futurecolumn << endl; // kdDebug(2) << "m_numColumns: " << m_numColumns << endl; @@ -2275,9 +2275,9 @@ TQString PivotTable::coloredAmount(const MyMoneyMoney& amount, const TQString& c TQString result; if( amount.isNegative() ) result += TQString("<font color=\"rgb(%1,%2,%3)\">") - .tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().red()) - .tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().green()) - .tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().blue()); + .arg(KMyMoneyGlobalSettings::listNegativeValueColor().red()) + .arg(KMyMoneyGlobalSettings::listNegativeValueColor().green()) + .arg(KMyMoneyGlobalSettings::listNegativeValueColor().blue()); result += amount.formatMoney(currencySymbol, prec); if( amount.isNegative() ) result += TQString("</font>"); @@ -2335,10 +2335,10 @@ void PivotTable::calculateForecast(void) forecast.setIncludeUnusedAccounts(true); //setup forecast dates - if(m_endDate > TQDate::tqcurrentDate()) { + if(m_endDate > TQDate::currentDate()) { forecast.setForecastEndDate(m_endDate); - forecast.setForecastStartDate(TQDate::tqcurrentDate()); - forecast.setForecastDays(TQDate::tqcurrentDate().daysTo(m_endDate)); + forecast.setForecastStartDate(TQDate::currentDate()); + forecast.setForecastDays(TQDate::currentDate().daysTo(m_endDate)); } else { forecast.setForecastStartDate(m_beginDate); forecast.setForecastEndDate(m_endDate); @@ -2346,7 +2346,7 @@ void PivotTable::calculateForecast(void) } //adjust history dates if beginning date is before today - if(m_beginDate < TQDate::tqcurrentDate()) { + if(m_beginDate < TQDate::currentDate()) { forecast.setHistoryEndDate(m_beginDate.addDays(-1)); forecast.setHistoryStartDate(forecast.historyEndDate().addDays(-forecast.accountsCycle()*forecast.forecastCycles())); } diff --git a/kmymoney2/reports/pivottabletest.cpp b/kmymoney2/reports/pivottabletest.cpp index d1a6586..e9fb8b2 100644 --- a/kmymoney2/reports/pivottabletest.cpp +++ b/kmymoney2/reports/pivottabletest.cpp @@ -1003,7 +1003,7 @@ void PivotTableTest::testBudget(void) // - Totals for D, D:1, D:2 show up. D:2:a and D:2:b do not // - D actuals (only) compare against D budget // - Ditto for D:1 - // - D:2 acutals and tqchildren compare against D:2 budget + // - D:2 acutals and children compare against D:2 budget // 5. Budget on E, no transactions on E { diff --git a/kmymoney2/reports/querytable.cpp b/kmymoney2/reports/querytable.cpp index 8257ce3..f296303 100644 --- a/kmymoney2/reports/querytable.cpp +++ b/kmymoney2/reports/querytable.cpp @@ -27,7 +27,7 @@ // QT Includes #include <tqvaluelist.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -59,7 +59,7 @@ namespace reports { // // **************************************************************************** -TQDate CashFlowListItem::m_sToday = TQDate::tqcurrentDate(); +TQDate CashFlowListItem::m_sToday = TQDate::currentDate(); MyMoneyMoney CashFlowListItem::NPV( double _rate ) const { @@ -432,8 +432,8 @@ void QueryTable::constructTransactionTable(void) qA["commodity"] = qS["commodity"] = (* it_transaction).commodity(); pd = (* it_transaction).postDate(); - qA["month"] = qS["month"] = i18n("Month of %1").tqarg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate)); - qA["week"] = qS["week"] = i18n("Week of %1").tqarg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate)); + qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate)); + qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate)); qA["currency"] = qS["currency"] = ""; @@ -671,7 +671,7 @@ void QueryTable::constructTransactionTable(void) //--- default case includes all transaction details else { - //this is when the splits are going to be shown as tqchildren of the main split + //this is when the splits are going to be shown as children of the main split if ((splits.count() > 2) && use_summary) { qA["value"] = ""; @@ -693,8 +693,8 @@ void QueryTable::constructTransactionTable(void) if (! splitAcc.isIncomeExpense()) { qA["category"] = ((*it_split).shares().isNegative()) ? - i18n("Transfer from %1").tqarg(splitAcc.fullName()) - : i18n("Transfer to %1").tqarg(splitAcc.fullName()); + i18n("Transfer from %1").arg(splitAcc.fullName()) + : i18n("Transfer to %1").arg(splitAcc.fullName()); qA["topcategory"] = splitAcc.topParentName(); qA["categorytype"] = i18n("Transfer"); } @@ -735,8 +735,8 @@ void QueryTable::constructTransactionTable(void) qS["topaccount"] = splitAcc.topParentName(); qS["category"] = ((*it_split).shares().isNegative()) - ? i18n("Transfer to %1").tqarg(a_fullname) - : i18n("Transfer from %1").tqarg(a_fullname); + ? i18n("Transfer to %1").arg(a_fullname) + : i18n("Transfer from %1").arg(a_fullname); qS["institution"] = institution.isEmpty() ? i18n("No Institution") @@ -1209,8 +1209,8 @@ void QueryTable::constructSplitsTable(void) qA["commodity"] = qS["commodity"] = (* it_transaction).commodity(); pd = (* it_transaction).postDate(); - qA["month"] = qS["month"] = i18n("Month of %1").tqarg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate)); - qA["week"] = qS["week"] = i18n("Week of %1").tqarg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate)); + qA["month"] = qS["month"] = i18n("Month of %1").arg(TQDate(pd.year(),pd.month(),1).toString(Qt::ISODate)); + qA["week"] = qS["week"] = i18n("Week of %1").arg(pd.addDays(1-pd.dayOfWeek()).toString(Qt::ISODate)); qA["currency"] = qS["currency"] = ""; @@ -1364,8 +1364,8 @@ void QueryTable::constructSplitsTable(void) //fill in account information if (! splitAcc.isIncomeExpense() && it_split != myBegin) { qA["account"] = ((*it_split).shares().isNegative()) ? - i18n("Transfer to %1").tqarg(myBeginAcc.fullName()) - : i18n("Transfer from %1").tqarg(myBeginAcc.fullName()); + i18n("Transfer to %1").arg(myBeginAcc.fullName()) + : i18n("Transfer from %1").arg(myBeginAcc.fullName()); } else if (it_split == myBegin ) { //handle the main split if((splits.count() > 2)) { @@ -1383,8 +1383,8 @@ void QueryTable::constructSplitsTable(void) ReportAccount tempSplitAcc = (*tempSplit).accountId(); if (! tempSplitAcc.isIncomeExpense()) { qA["account"] = ((*it_split).shares().isNegative()) ? - i18n("Transfer to %1").tqarg(tempSplitAcc.fullName()) - : i18n("Transfer from %1").tqarg(tempSplitAcc.fullName()); + i18n("Transfer to %1").arg(tempSplitAcc.fullName()) + : i18n("Transfer from %1").arg(tempSplitAcc.fullName()); } else { qA["account"] = tempSplitAcc.fullName(); } diff --git a/kmymoney2/reports/reportaccount.cpp b/kmymoney2/reports/reportaccount.cpp index cdc8097..477580d 100644 --- a/kmymoney2/reports/reportaccount.cpp +++ b/kmymoney2/reports/reportaccount.cpp @@ -56,7 +56,7 @@ ReportAccount::ReportAccount( const TQString& accountid ): MyMoneyAccount( MyMoneyFile::instance()->account(accountid) ) { DEBUG_ENTER(__PRETTY_FUNCTION__); - DEBUG_OUTPUT(TQString("Account %1").tqarg(accountid)); + DEBUG_OUTPUT(TQString("Account %1").arg(accountid)); calculateAccountHierarchy(); } @@ -64,7 +64,7 @@ ReportAccount::ReportAccount( const MyMoneyAccount& account ): MyMoneyAccount( account ) { DEBUG_ENTER(__PRETTY_FUNCTION__); - DEBUG_OUTPUT(TQString("Account %1").tqarg(account.id())); + DEBUG_OUTPUT(TQString("Account %1").arg(account.id())); calculateAccountHierarchy(); } @@ -112,17 +112,17 @@ MyMoneyMoney ReportAccount::deepCurrencyPrice( const TQDate& date ) const result = price.rate(undersecurity.tradingCurrency()); DEBUG_OUTPUT(TQString("Converting under %1 to deep %2, price on %3 is %4") - .tqarg(undersecurity.name()) - .tqarg(file->security(undersecurity.tradingCurrency()).name()) - .tqarg(date.toString()) - .tqarg(result.toDouble())); + .arg(undersecurity.name()) + .arg(file->security(undersecurity.tradingCurrency()).name()) + .arg(date.toString()) + .arg(result.toDouble())); } else { DEBUG_OUTPUT(TQString("No price to convert under %1 to deep %2 on %3") - .tqarg(undersecurity.name()) - .tqarg(file->security(undersecurity.tradingCurrency()).name()) - .tqarg(date.toString())); + .arg(undersecurity.name()) + .arg(file->security(undersecurity.tradingCurrency()).name()) + .arg(date.toString())); } } @@ -181,17 +181,17 @@ MyMoneyMoney ReportAccount::foreignCurrencyPrice( const TQString foreignCurrency { result = price.rate(tradingCurrency); DEBUG_OUTPUT(TQString("Converting deep %1 to currency %2, price on %3 is %4") - .tqarg(file->currency(currency().id()).name()) - .tqarg(file->currency(foreignCurrency).name()) - .tqarg(date.toString()) - .tqarg(result.toDouble())); + .arg(file->currency(currency().id()).name()) + .arg(file->currency(foreignCurrency).name()) + .arg(date.toString()) + .arg(result.toDouble())); } else { DEBUG_OUTPUT(TQString("No price to convert deep %1 to currency %2 on %3") - .tqarg(file->currency(currency().id()).name()) - .tqarg(file->currency(foreignCurrency).name()) - .tqarg(date.toString())); + .arg(file->currency(currency().id()).name()) + .arg(file->currency(foreignCurrency).name()) + .arg(date.toString())); } } return result; @@ -265,7 +265,7 @@ bool ReportAccount::operator<(const ReportAccount& second) const if ( !haveresult && ( it_second != second.m_nameHierarchy.end() ) ) result = true; -// DEBUG_OUTPUT(TQString("%1 < %2 is %3").tqarg(debugName(),second.debugName()).tqarg(result)); +// DEBUG_OUTPUT(TQString("%1 < %2 is %3").arg(debugName(),second.debugName()).arg(result)); return result; } diff --git a/kmymoney2/reports/reportstestcommon.cpp b/kmymoney2/reports/reportstestcommon.cpp index eac6193..44f90df 100644 --- a/kmymoney2/reports/reportstestcommon.cpp +++ b/kmymoney2/reports/reportstestcommon.cpp @@ -319,7 +319,7 @@ void writeTabletoHTML( const PivotTable& table, const TQString& _filename ) TQString filename = _filename; if ( filename.isEmpty() ) { - filename = TQString("report-%1%2.html").tqarg((filenumber<10)?"0":"").tqarg(filenumber); + filename = TQString("report-%1%2.html").arg((filenumber<10)?"0":"").arg(filenumber); ++filenumber; } @@ -336,7 +336,7 @@ void writeTabletoHTML( const QueryTable& table, const TQString& _filename ) TQString filename = _filename; if ( filename.isEmpty() ) { - filename = TQString("report-%1%2.html").tqarg((filenumber<10)?"0":"").tqarg(filenumber); + filename = TQString("report-%1%2.html").arg((filenumber<10)?"0":"").arg(filenumber); ++filenumber; } @@ -352,7 +352,7 @@ void writeTabletoCSV( const PivotTable& table, const TQString& _filename ) TQString filename = _filename; if ( filename.isEmpty() ) { - filename = TQString("report-%1%2.csv").tqarg((filenumber<10)?"0":"").tqarg(filenumber); + filename = TQString("report-%1%2.csv").arg((filenumber<10)?"0":"").arg(filenumber); ++filenumber; } @@ -369,7 +369,7 @@ void writeTabletoCSV( const QueryTable& table, const TQString& _filename ) TQString filename = _filename; if ( filename.isEmpty() ) { - filename = TQString("qreport-%1%2.csv").tqarg((filenumber<10)?"0":"").tqarg(filenumber); + filename = TQString("qreport-%1%2.csv").arg((filenumber<10)?"0":"").arg(filenumber); ++filenumber; } @@ -385,7 +385,7 @@ void writeRCFtoXML( const MyMoneyReport& filter, const TQString& _filename ) static unsigned filenum = 1; TQString filename = _filename; if ( filename.isEmpty() ) { - filename = TQString("report-%1%2.xml").tqarg(TQString::number(filenum).rightJustify(2, '0')); + filename = TQString("report-%1%2.xml").arg(TQString::number(filenum).rightJustify(2, '0')); ++filenum; } @@ -481,7 +481,7 @@ void XMLandback( MyMoneyReport& filter ) MyMoneyMoney searchHTML(const TQString& _html, const TQString& _search) { - TQRegExp re(TQString("%1[<>/td]*([\\-.0-9,]*)").tqarg(_search)); + TQRegExp re(TQString("%1[<>/td]*([\\-.0-9,]*)").arg(_search)); re.search(_html); TQString found = re.cap(1); found.remove(','); diff --git a/kmymoney2/views/kaccountsview.cpp b/kmymoney2/views/kaccountsview.cpp index 8de2b20..9c2959b 100644 --- a/kmymoney2/views/kaccountsview.cpp +++ b/kmymoney2/views/kaccountsview.cpp @@ -20,7 +20,7 @@ #include <tqlabel.h> #include <tqtabwidget.h> #include <tqpixmap.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -74,11 +74,11 @@ KAccountsView::KAccountsView(TQWidget *parent, const char *name) : m_liabilityItem(0) { // create the searchline widget - // and insert it into the existing tqlayout + // and insert it into the existing layout m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); - TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->tqlayout()); - if(tqlayout) { - tqlayout->insertWidget(0, m_searchWidget); + TQVBoxLayout* layout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->layout()); + if(layout) { + layout->insertWidget(0, m_searchWidget); } // setup icons for collapse and expand button @@ -241,7 +241,7 @@ void KAccountsView::loadIconView(void) file->accountList(alist); TQValueList<MyMoneyAccount>::const_iterator it_a; for(it_a = alist.begin(); it_a != alist.end(); ++it_a) { - accountMap[TQString("%1-%2").tqarg((*it_a).name()).tqarg((*it_a).id())] = *it_a; + accountMap[TQString("%1-%2").arg((*it_a).name()).arg((*it_a).id())] = *it_a; } bool showClosedAccounts = kmymoney2->toggleAction("view_show_all_accounts")->isChecked() @@ -583,7 +583,7 @@ void KAccountsView::slotOpenObject(TQIconViewItem* item) TQString KAccountsView::point(const TQPoint& val) const { - return TQString("%1;%2").tqarg(val.x()).tqarg(val.y()); + return TQString("%1;%2").arg(val.x()).arg(val.y()); } TQPoint KAccountsView::point(const TQString& val) const diff --git a/kmymoney2/views/kaccountsview.h b/kmymoney2/views/kaccountsview.h index a8498fb..9ed197b 100644 --- a/kmymoney2/views/kaccountsview.h +++ b/kmymoney2/views/kaccountsview.h @@ -104,8 +104,8 @@ public slots: void show(void); /** - * Override the base class behaviour to restore the tqlayout. Do not - * do this in show() because show() itself may change the tqlayout + * Override the base class behaviour to restore the layout. Do not + * do this in show() because show() itself may change the layout * in undesired ways. */ void polish(void); diff --git a/kmymoney2/views/kaccountsviewdecl.ui b/kmymoney2/views/kaccountsviewdecl.ui index 9b975f2..a8182a5 100644 --- a/kmymoney2/views/kaccountsviewdecl.ui +++ b/kmymoney2/views/kaccountsviewdecl.ui @@ -47,7 +47,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -85,7 +85,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>515</width> <height>20</height> @@ -137,7 +137,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -153,7 +153,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>367</width> <height>20</height> @@ -164,7 +164,7 @@ <property name="name"> <cstring>m_totalProfitsLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -176,7 +176,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> diff --git a/kmymoney2/views/kbudgetview.cpp b/kmymoney2/views/kbudgetview.cpp index 9002ceb..6cc6aa4 100644 --- a/kmymoney2/views/kbudgetview.cpp +++ b/kmymoney2/views/kbudgetview.cpp @@ -66,7 +66,7 @@ KBudgetListItem::KBudgetListItem(KListView *parent, const MyMoneyBudget& budget) m_budget(budget) { setText(0, budget.name()); - setText(1, TQString("%1").tqarg(budget.budgetStart().year())); + setText(1, TQString("%1").arg(budget.budgetStart().year())); // allow in column rename setRenameEnabled(0, true); @@ -230,7 +230,7 @@ void KBudgetView::loadBudgets(void) m_budgetValue->clear(); // add the correct years to the drop down list - TQDate date = TQDate::tqcurrentDate(Qt::LocalTime); + TQDate date = TQDate::currentDate(Qt::LocalTime); int iStartYear = date.year() - m_iBudgetYearsBack; m_yearList.clear(); @@ -485,8 +485,8 @@ void KBudgetView::askSave(void) // check if the content of a currently selected budget was modified // and ask to store the data if (m_updateButton->isEnabled()) { - if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").tqarg( - i18n("Do you want to save the changes for <b>%1</b>").tqarg(m_budget.name())), + if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").arg( + i18n("Do you want to save the changes for <b>%1</b>").arg(m_budget.name())), i18n("Save changes")) == KMessageBox::Yes) { m_inSelection = true; slotUpdateBudget(); @@ -609,7 +609,7 @@ void KBudgetView::slotRenameBudget(TQListViewItem* p , int /*col*/, const TQStri if (KMessageBox::questionYesNo(this, i18n("A budget with the name '%1' already exists. It is not advisable to have " "multiple budgets with the same identification name. Are you sure you would like " - "to rename the budget?").tqarg(new_name)) != KMessageBox::Yes) + "to rename the budget?").arg(new_name)) != KMessageBox::Yes) { p->setText(0,pBudget->budget().name()); return; @@ -633,7 +633,7 @@ void KBudgetView::slotRenameBudget(TQListViewItem* p , int /*col*/, const TQStri } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to modify budget"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } @@ -734,7 +734,7 @@ void KBudgetView::slotResetBudget(void) loadAccounts(); } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to reset budget"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } @@ -748,7 +748,7 @@ void KBudgetView::slotUpdateBudget(void) slotRefreshHideUnusedButton(); } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to modify budget"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } diff --git a/kmymoney2/views/kbudgetview.h b/kmymoney2/views/kbudgetview.h index ee89007..b7b4267 100644 --- a/kmymoney2/views/kbudgetview.h +++ b/kmymoney2/views/kbudgetview.h @@ -86,8 +86,8 @@ public: void show(); /** - * Override the base class behaviour to restore the tqlayout. Do not - * do this in show() because show() itself may change the tqlayout + * Override the base class behaviour to restore the layout. Do not + * do this in show() because show() itself may change the layout * in undesired ways. */ void polish(void); diff --git a/kmymoney2/views/kbudgetviewdecl.ui b/kmymoney2/views/kbudgetviewdecl.ui index 90172ff..f4c30e0 100644 --- a/kmymoney2/views/kbudgetviewdecl.ui +++ b/kmymoney2/views/kbudgetviewdecl.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -59,7 +59,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -165,7 +165,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -213,7 +213,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -283,7 +283,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <hbox> <property name="name"> @@ -304,7 +304,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> diff --git a/kmymoney2/views/kcategoriesview.cpp b/kmymoney2/views/kcategoriesview.cpp index 6bfbbea..4c1e725 100644 --- a/kmymoney2/views/kcategoriesview.cpp +++ b/kmymoney2/views/kcategoriesview.cpp @@ -24,7 +24,7 @@ // QT Includes #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -53,11 +53,11 @@ KCategoriesView::KCategoriesView(TQWidget *parent, const char *name ) : m_needReload(false) { // create the searchline widget - // and insert it into the existing tqlayout + // and insert it into the existing layout m_searchWidget = new KListViewSearchLineWidget(m_accountTree, m_accountTree->parentWidget()); - TQVBoxLayout* tqlayout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->tqlayout()); - if(tqlayout) { - tqlayout->insertWidget(0, m_searchWidget); + TQVBoxLayout* layout = dynamic_cast<TQVBoxLayout*>(m_accountTree->parentWidget()->layout()); + if(layout) { + layout->insertWidget(0, m_searchWidget); } // setup icons for collapse and expand button diff --git a/kmymoney2/views/kcategoriesview.h b/kmymoney2/views/kcategoriesview.h index 77fb5d7..9b39091 100644 --- a/kmymoney2/views/kcategoriesview.h +++ b/kmymoney2/views/kcategoriesview.h @@ -45,7 +45,7 @@ class KListViewSearchLineWidget; * @author Michael Edwardes, Thomas Baumgart * * While named "categories view", this view actually displays all accounts - * that are tqchildren of the global "Income" and "Expense" accounts. Even though + * that are children of the global "Income" and "Expense" accounts. Even though * categories are internally just accounts as well, the distinction between * categories and accounts in the user interface is done for better * usability and clarity. @@ -79,8 +79,8 @@ public slots: void show(void); /** - * Override the base class behaviour to restore the tqlayout. Do not - * do this in show() because show() itself may change the tqlayout + * Override the base class behaviour to restore the layout. Do not + * do this in show() because show() itself may change the layout * in undesired ways. */ void polish(void); diff --git a/kmymoney2/views/kcategoriesviewdecl.ui b/kmymoney2/views/kcategoriesviewdecl.ui index 019080c..c62c6bb 100644 --- a/kmymoney2/views/kcategoriesviewdecl.ui +++ b/kmymoney2/views/kcategoriesviewdecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5_2</cstring> + <cstring>layout5_2</cstring> </property> <hbox> <property name="name"> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>515</width> <height>20</height> @@ -86,7 +86,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -102,7 +102,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>310</width> <height>16</height> @@ -113,7 +113,7 @@ <property name="name"> <cstring>m_totalProfitsLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -125,7 +125,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> diff --git a/kmymoney2/views/kforecastview.cpp b/kmymoney2/views/kforecastview.cpp index d636ec4..9ea9f80 100644 --- a/kmymoney2/views/kforecastview.cpp +++ b/kmymoney2/views/kforecastview.cpp @@ -21,8 +21,8 @@ #include <tqspinbox.h> #include <tqlabel.h> #include <tqbuttongroup.h> -#include <tqtextedit.h> -#include <tqlayout.h> +#include <textedit.h> +#include <layout.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -68,7 +68,7 @@ KForecastView::KForecastView(TQWidget *parent, const char *name) : m_advancedList->setAllColumnsShowFocus(true); m_forecastChart = new KReportChartView(m_tabChart, "forecastChart" ); - m_forecastChart->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_forecastChart->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); loadForecastSettings(); @@ -292,13 +292,13 @@ void KForecastView::loadSummaryView(void) case -1: break; case 0: - msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); - msg += i18n("The balance of %2 is below the minimum balance %3 today.").tqarg(acc.name()).tqarg(minBalance.formatMoney(acc, currency)); + msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); + msg += i18n("The balance of %2 is below the minimum balance %3 today.").arg(acc.name()).arg(minBalance.formatMoney(acc, currency)); msg += TQString("</font>"); break; default: - msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); - msg += i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").tqarg(acc.name()).tqarg(minBalance.formatMoney(acc, currency)).tqarg(dropMinimum-1); + msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); + msg += i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").arg(acc.name()).arg(minBalance.formatMoney(acc, currency)).arg(dropMinimum-1); msg += TQString("</font>"); } @@ -314,25 +314,25 @@ void KForecastView::loadSummaryView(void) break; case 0: if(acc.accountGroup() == MyMoneyAccount::Asset) { - msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); - msg += i18n("The balance of %1 is below %2 today.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency)); + msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); + msg += i18n("The balance of %1 is below %2 today.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency)); msg += TQString("</font>"); break; } if(acc.accountGroup() == MyMoneyAccount::Liability) { - msg = i18n("The balance of %1 is above %2 today.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency)); + msg = i18n("The balance of %1 is above %2 today.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency)); break; } break; default: if(acc.accountGroup() == MyMoneyAccount::Asset) { - msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); - msg += i18n("The balance of %1 will drop below %2 in %3 days.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency)).tqarg(dropZero); + msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); + msg += i18n("The balance of %1 will drop below %2 in %3 days.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency)).arg(dropZero); msg += TQString("</font>"); break; } if(acc.accountGroup() == MyMoneyAccount::Liability) { - msg = i18n("The balance of %1 will raise above %2 in %3 days.").tqarg(acc.name()).tqarg(MyMoneyMoney().formatMoney(acc, currency)).tqarg(dropZero); + msg = i18n("The balance of %1 will raise above %2 in %3 days.").arg(acc.name()).arg(MyMoneyMoney().formatMoney(acc, currency)).arg(dropZero); break; } } @@ -344,8 +344,8 @@ void KForecastView::loadSummaryView(void) msg = TQString(); MyMoneyMoney accCycleVariation = forecast.accountCycleVariation(acc); if (accCycleVariation < MyMoneyMoney(0, 1)) { - msg = TQString("<font color=\"%1\">").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); - msg += i18n("The account %1 is decreasing %2 per cycle.").tqarg(acc.name()).tqarg(accCycleVariation.formatMoney(acc, currency)); + msg = TQString("<font color=\"%1\">").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name()); + msg += i18n("The account %1 is decreasing %2 per cycle.").arg(acc.name()).arg(accCycleVariation.formatMoney(acc, currency)); msg += TQString("</font>"); } @@ -393,22 +393,22 @@ void KForecastView::loadAdvancedView(void) int accountColumn = m_advancedList->addColumn(i18n("Account"), -1); //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle - if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { - daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); + if(TQDate::currentDate() < forecast.beginForecastDate()) { + daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate()); } else { daysToBeginDay = forecast.accountsCycle(); } //add columns for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) { - int col = m_advancedList->addColumn(i18n("Min Bal %1").tqarg(i), -1); + int col = m_advancedList->addColumn(i18n("Min Bal %1").arg(i), -1); m_advancedList->setColumnAlignment(col, TQt::AlignRight); - m_advancedList->addColumn(i18n("Min Date %1").tqarg(i), -1); + m_advancedList->addColumn(i18n("Min Date %1").arg(i), -1); } for(int i = 1; ((i * forecast.accountsCycle()) + daysToBeginDay) <= forecast.forecastDays(); ++i) { - int col = m_advancedList->addColumn(i18n("Max Bal %1").tqarg(i), -1); + int col = m_advancedList->addColumn(i18n("Max Bal %1").arg(i), -1); m_advancedList->setColumnAlignment(col, TQt::AlignRight); - m_advancedList->addColumn(i18n("Max Date %1").tqarg(i), -1); + m_advancedList->addColumn(i18n("Max Date %1").arg(i), -1); } int col = m_advancedList->addColumn(i18n("Average"), -1); m_advancedList->setColumnAlignment(col, TQt::AlignRight); @@ -486,10 +486,10 @@ void KForecastView::loadBudgetView(void) m_budgetList->setBaseCurrency(file->baseCurrency()); //get the settings from current page and calculate this year based on last year - TQDate historyEndDate = TQDate(TQDate::tqcurrentDate().year()-1, 12, 31); + TQDate historyEndDate = TQDate(TQDate::currentDate().year()-1, 12, 31); TQDate historyStartDate = historyEndDate.addDays(-m_accountsCycle->value() * m_forecastCycles->value()); - TQDate forecastStartDate = TQDate(TQDate::tqcurrentDate().year(), 1, 1); - TQDate forecastEndDate = TQDate::tqcurrentDate().addDays(m_forecastDays->value()); + TQDate forecastStartDate = TQDate(TQDate::currentDate().year(), 1, 1); + TQDate forecastEndDate = TQDate::currentDate().addDays(m_forecastDays->value()); forecast.setHistoryMethod(m_historyMethod->selectedId()); MyMoneyBudget budget; @@ -658,7 +658,7 @@ void KForecastView::loadChartView(void) reportCfg.setColumnsAreDays( true ); reportCfg.setConvertCurrency( true ); reportCfg.setIncludingForecast( true ); - reportCfg.setDateFilter(TQDate::tqcurrentDate(),TQDate::tqcurrentDate().addDays(m_forecastDays->value())); + reportCfg.setDateFilter(TQDate::currentDate(),TQDate::currentDate().addDays(m_forecastDays->value())); reports::PivotTable table(reportCfg); diff --git a/kmymoney2/views/kforecastviewdecl.ui b/kmymoney2/views/kforecastviewdecl.ui index 79aa702..0562f15 100644 --- a/kmymoney2/views/kforecastviewdecl.ui +++ b/kmymoney2/views/kforecastviewdecl.ui @@ -32,7 +32,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout16</cstring> + <cstring>layout16</cstring> </property> <grid> <property name="name"> @@ -189,7 +189,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>16</width> <height>31</height> @@ -198,7 +198,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout76</cstring> + <cstring>layout76</cstring> </property> <vbox> <property name="name"> @@ -206,7 +206,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -312,7 +312,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>6</height> @@ -321,7 +321,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout75</cstring> + <cstring>layout75</cstring> </property> <hbox> <property name="name"> @@ -345,7 +345,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>31</width> <height>21</height> diff --git a/kmymoney2/views/kgloballedgerview.cpp b/kmymoney2/views/kgloballedgerview.cpp index 87f8890..e9a758e 100644 --- a/kmymoney2/views/kgloballedgerview.cpp +++ b/kmymoney2/views/kgloballedgerview.cpp @@ -21,7 +21,7 @@ // QT Includes #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> // ---------------------------------------------------------------------------- @@ -176,14 +176,14 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) //m_toolbar->setMaximumSize(50,20); m_toolbar->alignItemRight(1); #endif - m_toolbar->tqsetSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); - tqlayout()->addWidget(m_toolbarFrame); + m_toolbar->setSizePolicy(TQSizePolicy::Minimum, TQSizePolicy::Fixed); + layout()->addWidget(m_toolbarFrame); // create the register frame m_registerFrame = new TQFrame(this); TQVBoxLayout* registerFrameLayout = new TQVBoxLayout(m_registerFrame, 0, 0); - tqlayout()->addWidget(m_registerFrame); - tqlayout()->setStretchFactor(m_registerFrame, 2); + layout()->addWidget(m_registerFrame); + layout()->setStretchFactor(m_registerFrame, 2); m_register = new KMyMoneyRegister::Register(m_registerFrame); registerFrameLayout->addWidget(m_register); m_register->installEventFilter(this); @@ -210,12 +210,12 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) spacer = new TQSpacerItem( 20, 1, TQSizePolicy::Expanding, TQSizePolicy::Minimum ); summaryFrameLayout->addItem(spacer); summaryFrameLayout->addWidget(m_rightSummaryLabel); - tqlayout()->addWidget(m_summaryFrame); + layout()->addWidget(m_summaryFrame); // create the button frame m_buttonFrame = new TQFrame(this); TQVBoxLayout* buttonLayout = new TQVBoxLayout(m_buttonFrame, 0, 0); - tqlayout()->addWidget(m_buttonFrame); + layout()->addWidget(m_buttonFrame); m_buttonbar = new KToolBar(m_buttonFrame, 0, true); m_buttonbar->setIconText(KToolBar::IconTextRight); buttonLayout->addWidget(m_buttonbar); @@ -236,7 +236,7 @@ KGlobalLedgerView::KGlobalLedgerView(TQWidget *parent, const char *name ) frameLayout->addWidget(m_form); m_formFrame->setFrameShape( TQFrame::Panel ); m_formFrame->setFrameShadow( TQFrame::Raised ); - tqlayout()->addWidget(m_formFrame); + layout()->addWidget(m_formFrame); connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadView())); connect(m_register, TQT_SIGNAL(focusChanged(KMyMoneyRegister::Transaction*)), m_form, TQT_SLOT(slotSetTransaction(KMyMoneyRegister::Transaction*))); @@ -448,7 +448,7 @@ void KGlobalLedgerView::loadView(void) // show scheduled transactions which have a scheduled postdate // within the next 'period' days. In reconciliation mode, the // period starts on the statement date. - TQDate endDate = TQDate::tqcurrentDate().addDays(period); + TQDate endDate = TQDate::currentDate().addDays(period); if(isReconciliationAccount()) endDate = reconciliationDate.addDays(period); TQValueList<MyMoneySchedule> scheduleList = MyMoneyFile::instance()->scheduleList(m_account.id()); @@ -464,7 +464,7 @@ void KGlobalLedgerView::loadView(void) // certainly be posted in the past. So we take todays date // as the alternative if(s.isOverdue()) - t.setPostDate(TQDate::tqcurrentDate()); + t.setPostDate(TQDate::currentDate()); else t.setPostDate(s.adjustedNextDueDate()); const TQValueList<MyMoneySplit>& splits = t.splits(); @@ -476,7 +476,7 @@ void KGlobalLedgerView::loadView(void) } // keep track of this payment locally (not in the engine) if(s.isOverdue()) - s.setLastPayment(TQDate::tqcurrentDate()); + s.setLastPayment(TQDate::currentDate()); else s.setLastPayment(s.nextDueDate()); @@ -629,7 +629,7 @@ void KGlobalLedgerView::loadView(void) } } - if(t->transaction().postDate() > TQDate::tqcurrentDate()) { + if(t->transaction().postDate() > TQDate::currentDate()) { tracer.printf("Reducing actual balance by %s because %s/%s(%s) is in the future", (split.shares() * factor).formatMoney("", 2).data(), t->transaction().id().data(), split.id().data(), t->transaction().postDate().toString(Qt::ISODate).data()); actBalance[split.accountId()] -= split.shares() * factor; } @@ -652,11 +652,11 @@ void KGlobalLedgerView::loadView(void) arg(paymentAmount[m_account.id()].abs().formatMoney(m_account.fraction())) ); } if(pStatement) { - pStatement->setText(i18n("%1 payments (%2)").tqarg(payments[m_account.id()]). + pStatement->setText(i18n("%1 payments (%2)").arg(payments[m_account.id()]). arg(paymentAmount[m_account.id()].abs().formatMoney(m_account.fraction())) ); } if(dStatement) { - dStatement->setText(i18n("%1 deposits (%2)").tqarg(deposits[m_account.id()]). + dStatement->setText(i18n("%1 deposits (%2)").arg(deposits[m_account.id()]). arg(depositAmount[m_account.id()].abs().formatMoney(m_account.fraction())) ); } @@ -724,24 +724,24 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& a if(isReconciliationAccount()) { if(m_account.accountType() != MyMoneyAccount::Investment) { - m_leftSummaryLabel->setText(i18n("Statement: %1").tqarg(d->m_endingBalance.formatMoney("", d->m_precision))); - m_centerSummaryLabel->setText(i18n("Cleared: %1").tqarg(clearedBalance[m_account.id()].formatMoney("", d->m_precision))); - m_rightSummaryLabel->setText(i18n("Difference: %1").tqarg((clearedBalance[m_account.id()] - d->m_endingBalance).formatMoney("", d->m_precision))); + m_leftSummaryLabel->setText(i18n("Statement: %1").arg(d->m_endingBalance.formatMoney("", d->m_precision))); + m_centerSummaryLabel->setText(i18n("Cleared: %1").arg(clearedBalance[m_account.id()].formatMoney("", d->m_precision))); + m_rightSummaryLabel->setText(i18n("Difference: %1").arg((clearedBalance[m_account.id()] - d->m_endingBalance).formatMoney("", d->m_precision))); } } else { // update summary line in normal mode TQDate reconcileDate = m_account.lastReconciliationDate(); if(reconcileDate.isValid()) { - m_leftSummaryLabel->setText(i18n("Last reconciled: %1").tqarg(KGlobal::locale()->formatDate(reconcileDate, true))); + m_leftSummaryLabel->setText(i18n("Last reconciled: %1").arg(KGlobal::locale()->formatDate(reconcileDate, true))); } else { m_leftSummaryLabel->setText(i18n("Never reconciled")); } m_rightSummaryLabel->setPaletteForegroundColor(m_leftSummaryLabel->paletteForegroundColor()); if(m_account.accountType() != MyMoneyAccount::Investment) { - m_centerSummaryLabel->setText(i18n("Cleared: %1").tqarg(clearedBalance[m_account.id()].formatMoney("", d->m_precision))); - m_rightSummaryLabel->setText(i18n("Balance: %1").tqarg(actBalance[m_account.id()].formatMoney("", d->m_precision))); + m_centerSummaryLabel->setText(i18n("Cleared: %1").arg(clearedBalance[m_account.id()].formatMoney("", d->m_precision))); + m_rightSummaryLabel->setText(i18n("Balance: %1").arg(actBalance[m_account.id()].formatMoney("", d->m_precision))); bool showNegative = actBalance[m_account.id()].isNegative(); if(m_account.accountGroup() == MyMoneyAccount::Liability && !actBalance[m_account.id()].isZero()) showNegative = !showNegative; @@ -775,7 +775,7 @@ void KGlobalLedgerView::updateSummaryLine(const TQMap<TQString, MyMoneyMoney>& a } balance += ((*it_b) * rate).convert(base.smallestAccountFraction()); } - m_rightSummaryLabel->setText(i18n("Investment value: %1%2").tqarg(approx ? "~" : "").tqarg(balance.formatMoney(base.tradingSymbol(), d->m_precision))); + m_rightSummaryLabel->setText(i18n("Investment value: %1%2").arg(approx ? "~" : "").arg(balance.formatMoney(base.tradingSymbol(), d->m_precision))); } } } @@ -1149,12 +1149,12 @@ TransactionEditor* KGlobalLedgerView::startEdit(const KMyMoneyRegister::Selected // Check if the editor has some preference on where to set the focus // If not, set the focus to the first widget in the tab order - TQWidget* tqfocusWidget = editor->firstWidget(); - if(!tqfocusWidget) - tqfocusWidget = m_tabOrderWidgets.first(); + TQWidget* focusWidget = editor->firstWidget(); + if(!focusWidget) + focusWidget = m_tabOrderWidgets.first(); // for some reason, this only works reliably if delayed a bit - TQTimer::singleShot(10, tqfocusWidget, TQT_SLOT(setFocus())); + TQTimer::singleShot(10, focusWidget, TQT_SLOT(setFocus())); // preset to 'I have no idea which type to create' for the next round. d->m_action = KMyMoneyRegister::ActionNone; @@ -1207,7 +1207,7 @@ bool KGlobalLedgerView::focusNextPrevChild(bool next) TQWidget *w = 0; TQWidget *currentWidget; - w = tqApp->tqfocusWidget(); + w = tqApp->focusWidget(); while(w && m_tabOrderWidgets.find(w) == -1) { // qDebug("'%s' not in list, use parent", w->className()); w = w->parentWidget(); diff --git a/kmymoney2/views/khomeview.cpp b/kmymoney2/views/khomeview.cpp index ba6af3a..e96744f 100644 --- a/kmymoney2/views/khomeview.cpp +++ b/kmymoney2/views/khomeview.cpp @@ -23,14 +23,14 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqapplication.h> #include <dom/dom_element.h> #include <dom/dom_doc.h> #include <dom/dom_text.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqtimer.h> #include <tqbuffer.h> @@ -101,10 +101,10 @@ void KHomeView::Private::addNameIndex(TQMap<TQString, MyMoneyAccount> &idx, cons } else if(idx[key].id() != account.id()) { key = account.name() + "[%1]"; int dup = 2; - while(!idx[key.tqarg(dup)].id().isEmpty() - && idx[key.tqarg(dup)].id() != account.id()) + while(!idx[key.arg(dup)].id().isEmpty() + && idx[key.arg(dup)].id() != account.id()) ++dup; - idx[key.tqarg(dup)] = account; + idx[key.arg(dup)] = account; } } @@ -215,7 +215,7 @@ void KHomeView::loadView(void) m_forecast.setForecastDone(false); TQString filename = KGlobal::dirs()->findResource("appdata", "html/kmymoney2.css"); - TQString header = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\n").tqarg(filename); + TQString header = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">\n").arg(filename); header += KMyMoneyUtils::variableCSS(); @@ -226,7 +226,7 @@ void KHomeView::loadView(void) m_part->begin(); m_part->write(header); - m_part->write(TQString("<div id=\"summarytitle\">%1</div>").tqarg(i18n("Your Financial Summary"))); + m_part->write(TQString("<div id=\"summarytitle\">%1</div>").arg(i18n("Your Financial Summary"))); TQStringList settings = KMyMoneyGlobalSettings::itemList(); @@ -291,7 +291,7 @@ void KHomeView::loadView(void) void KHomeView::showNetWorthGraph(void) { #ifdef HAVE_KDCHART - m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\"> </div>\n").tqarg(i18n("Networth Forecast"))); + m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\"> </div>\n").arg(i18n("Networth Forecast"))); MyMoneyReport reportCfg = MyMoneyReport( MyMoneyReport::eAssetLiability, @@ -311,7 +311,7 @@ void KHomeView::showNetWorthGraph(void) reportCfg.setColumnsAreDays( true ); reportCfg.setConvertCurrency( true ); reportCfg.setIncludingForecast( true ); - reportCfg.setDateFilter(TQDate::tqcurrentDate(),TQDate::tqcurrentDate().addDays(+90)); + reportCfg.setDateFilter(TQDate::currentDate(),TQDate::currentDate().addDays(+90)); reports::PivotTable table(reportCfg); @@ -361,7 +361,7 @@ void KHomeView::showNetWorthGraph(void) m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >"); m_part->write("<tr>"); - m_part->write(TQString("<td><center><IMG SRC=\"data:image/png;base64,%1\" ALT=\"Networth\"></center></td>").tqarg(TQString(KCodecs::base64Encode(ba)))); + m_part->write(TQString("<td><center><IMG SRC=\"data:image/png;base64,%1\" ALT=\"Networth\"></center></td>").arg(TQString(KCodecs::base64Encode(ba)))); m_part->write("</tr>"); m_part->write("</table></div></div>"); @@ -383,8 +383,8 @@ void KHomeView::showPayments(void) schedule = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY, - TQDate::tqcurrentDate(), - TQDate::tqcurrentDate().addMonths(1)); + TQDate::currentDate(), + TQDate::currentDate().addMonths(1)); overdues = file->scheduleList("", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, MyMoneySchedule::STYPE_ANY, @@ -422,7 +422,7 @@ void KHomeView::showPayments(void) } m_part->write("<div class=\"shadow\"><div class=\"displayblock\">"); - m_part->write(TQString("<div class=\"summaryheader\">%1</div>\n").tqarg(i18n("Payments"))); + m_part->write(TQString("<div class=\"summaryheader\">%1</div>\n").arg(i18n("Payments"))); if(overdues.count() > 0) { m_part->write("<div class=\"gap\"> </div>\n"); @@ -432,7 +432,7 @@ void KHomeView::showPayments(void) TQValueList<MyMoneySchedule>::Iterator it_f; m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >"); - m_part->write(TQString("<tr class=\"itemtitle warningtitle\" ><td colspan=\"5\">%1</td></tr>\n").tqarg(showColoredAmount(i18n("Overdue payments"), true))); + m_part->write(TQString("<tr class=\"itemtitle warningtitle\" ><td colspan=\"5\">%1</td></tr>\n").arg(showColoredAmount(i18n("Overdue payments"), true))); m_part->write("<tr class=\"item warning\">"); m_part->write("<td class=\"left\" width=\"10%\">"); m_part->write(i18n("Date")); @@ -455,7 +455,7 @@ void KHomeView::showPayments(void) // determine number of overdue payments TQDate nextDate = (*it).adjustedNextDueDate(); int cnt = 0; - while(nextDate.isValid() && nextDate < TQDate::tqcurrentDate()) { + while(nextDate.isValid() && nextDate < TQDate::currentDate()) { ++cnt; nextDate = (*it).nextPayment(nextDate); // for single occurence nextDate will not change, so we @@ -464,7 +464,7 @@ void KHomeView::showPayments(void) break; } - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); showPaymentEntry(*it, cnt); m_part->write("</tr>"); // make sure to not repeat overdues later again @@ -486,12 +486,12 @@ void KHomeView::showPayments(void) TQValueList<MyMoneySchedule> todays; TQValueList<MyMoneySchedule>::Iterator t_it; for (t_it=schedule.begin(); t_it!=schedule.end();) { - if ((*t_it).nextDueDate() == TQDate::tqcurrentDate()) { + if ((*t_it).nextDueDate() == TQDate::currentDate()) { todays.append(*t_it); (*t_it).setNextDueDate((*t_it).nextPayment((*t_it).nextDueDate())); - //if nextDueDate is still tqcurrentDate then remove it from scheduled payments - if ((*t_it).nextDueDate() == TQDate::tqcurrentDate()) { + //if nextDueDate is still currentDate then remove it from scheduled payments + if ((*t_it).nextDueDate() == TQDate::currentDate()) { t_it = schedule.remove(t_it); continue; } @@ -502,7 +502,7 @@ void KHomeView::showPayments(void) if (todays.count() > 0) { m_part->write("<div class=\"gap\"> </div>\n"); m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >"); - m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").tqarg(i18n("Today's payments"))); + m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").arg(i18n("Today's payments"))); m_part->write("<tr class=\"item\">"); m_part->write("<td class=\"left\" width=\"10%\">"); m_part->write(i18n("Date")); @@ -522,7 +522,7 @@ void KHomeView::showPayments(void) m_part->write("</tr>"); for(t_it = todays.begin(); t_it != todays.end(); ++t_it) { - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); showPaymentEntry(*t_it); m_part->write("</tr>"); } @@ -536,7 +536,7 @@ void KHomeView::showPayments(void) TQValueList<MyMoneySchedule>::Iterator it; m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >"); - m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").tqarg(i18n("Future payments"))); + m_part->write(TQString("<tr class=\"itemtitle\"><td class=\"left\" colspan=\"5\">%1</td></tr>\n").arg(i18n("Future payments"))); m_part->write("<tr class=\"item\">"); m_part->write("<td class=\"left\" width=\"10%\">"); m_part->write(i18n("Date")); @@ -560,7 +560,7 @@ void KHomeView::showPayments(void) cnt = (m_showAllSchedules) ? -1 : 6; bool needMoreLess = m_showAllSchedules; - TQDate lastDate = TQDate::tqcurrentDate().addMonths(1); + TQDate lastDate = TQDate::currentDate().addMonths(1); qBubbleSort(schedule); do { it = schedule.begin(); @@ -585,7 +585,7 @@ void KHomeView::showPayments(void) if(cnt > 0) --cnt; - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); showPaymentEntry(*it); m_part->write("</tr>"); @@ -602,12 +602,12 @@ void KHomeView::showPayments(void) while(1); if (needMoreLess) { - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); m_part->write("<td>"); if(m_showAllSchedules) { - m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").tqarg("reduced")) + i18n("Less...") + linkend()); + m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").arg("reduced")) + i18n("Less...") + linkend()); } else { - m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").tqarg("full")) + i18n("More...") + linkend()); + m_part->write(link(VIEW_SCHEDULE, TQString("?mode=%1").arg("full")) + i18n("More...") + linkend()); } m_part->write("</td><td></td><td></td><td></td><td></td>"); m_part->write("</tr>"); @@ -642,16 +642,16 @@ void KHomeView::showPaymentEntry(const MyMoneySchedule& sched, int cnt) KGlobal::locale()->formatDate(sched.adjustedNextDueDate(), true) + "</td><td>"; if(pathEnter.length() > 0) - tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=enter").tqarg(sched.id()), i18n("Enter schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").tqarg(pathEnter) + linkend(); + tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=enter").arg(sched.id()), i18n("Enter schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").arg(pathEnter) + linkend(); if(pathSkip.length() > 0) - tmp += " " + link(VIEW_SCHEDULE, TQString("?id=%1&mode=skip").tqarg(sched.id()), i18n("Skip schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").tqarg(pathSkip) + linkend(); + tmp += " " + link(VIEW_SCHEDULE, TQString("?id=%1&mode=skip").arg(sched.id()), i18n("Skip schedule")) + TQString("<img src=\"file://%1\" border=\"0\"></a>").arg(pathSkip) + linkend(); tmp += TQString(" "); - tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=edit").tqarg(sched.id()), i18n("Edit schedule")) + sched.name() + linkend(); + tmp += link(VIEW_SCHEDULE, TQString("?id=%1&mode=edit").arg(sched.id()), i18n("Edit schedule")) + sched.name() + linkend(); //show quantity of payments overdue if any if(cnt > 1) - tmp += i18n(" (%1 payments)").tqarg(cnt); + tmp += i18n(" (%1 payments)").arg(cnt); //show account of the main split tmp += "</td><td>"; @@ -788,7 +788,7 @@ void KHomeView::showAccounts(KHomeView::paymentTypeE type, const TQString& heade TQMap<TQString, MyMoneyAccount>::const_iterator it_m; for(it_m = nameIdx.begin(); it_m != nameIdx.end(); ++it_m) { - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); showAccountEntry(*it_m); m_part->write("</tr>"); } @@ -812,7 +812,7 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc) showAccountEntry(acc, value, MyMoneyMoney(), showLimit); } else { //get balance for normal accounts - value = file->balance(acc.id(), TQDate::tqcurrentDate()); + value = file->balance(acc.id(), TQDate::currentDate()); //if credit card or checkings account, show maximum credit if( acc.accountType() == MyMoneyAccount::CreditCard || @@ -846,10 +846,10 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc, const MyMoneyMoney& } tmp = TQString("<td>") + - link(VIEW_LEDGER, TQString("?id=%1").tqarg(acc.id())) + acc.name() + linkend() + "</td>"; + link(VIEW_LEDGER, TQString("?id=%1").arg(acc.id())) + acc.name() + linkend() + "</td>"; //show account balance - tmp += TQString("<td class=\"right\">%1</td>").tqarg(showColoredAmount(amount, value.isNegative())); + tmp += TQString("<td class=\"right\">%1</td>").arg(showColoredAmount(amount, value.isNegative())); //show minimum balance column if requested if(showMinBal) { @@ -858,7 +858,7 @@ void KHomeView::showAccountEntry(const MyMoneyAccount& acc, const MyMoneyMoney& tmp += TQString("<td class=\"right\"> </td>"); } else { //show minimum balance entry - tmp += TQString("<td class=\"right\">%1</td>").tqarg(showColoredAmount(amountToMinBal, valueToMinBal.isNegative())); + tmp += TQString("<td class=\"right\">%1</td>").arg(showColoredAmount(amountToMinBal, valueToMinBal.isNegative())); } } // qDebug("accountEntry = '%s'", tmp.latin1()); @@ -886,7 +886,7 @@ MyMoneyMoney KHomeView::investmentBalance(const MyMoneyAccount& acc) val = val.convert(acc.fraction()); value += val; } catch(MyMoneyException* e) { - qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").tqarg(stock.name(), e->what())).data()); + qWarning("%s", (TQString("cannot convert stock balance of %1 to base currency: %2").arg(stock.name(), e->what())).data()); delete e; } } @@ -906,7 +906,7 @@ void KHomeView::showFavoriteReports(void) { if ( (*it_report).isFavorite() ) { if(firstTime) { - m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\"> </div>\n").tqarg(i18n("Favorite Reports"))); + m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\"> </div>\n").arg(i18n("Favorite Reports"))); m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >"); m_part->write("<tr class=\"item\"><td class=\"left\" width=\"40%\">"); m_part->write(i18n("Report")); @@ -917,11 +917,11 @@ void KHomeView::showFavoriteReports(void) } m_part->write(TQString("<tr class=\"row-%1\"><td>%2%3%4</td><td align=\"left\">%5</td></tr>") - .tqarg(row++ & 0x01 ? "even" : "odd") - .tqarg(link(VIEW_REPORTS, TQString("?id=%1").tqarg((*it_report).id()))) - .tqarg((*it_report).name()) - .tqarg(linkend()) - .tqarg((*it_report).comment()) + .arg(row++ & 0x01 ? "even" : "odd") + .arg(link(VIEW_REPORTS, TQString("?id=%1").arg((*it_report).id()))) + .arg((*it_report).name()) + .arg(linkend()) + .arg((*it_report).comment()) ); } @@ -955,22 +955,22 @@ void KHomeView::showForecast(void) int colspan = 1; // get begin day - int beginDay = TQDate::tqcurrentDate().daysTo(m_forecast.beginForecastDate()); + int beginDay = TQDate::currentDate().daysTo(m_forecast.beginForecastDate()); // if begin day is today skip to next cycle if(beginDay == 0) beginDay = m_forecast.accountsCycle(); // Now output header - m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\"> </div>\n").tqarg(i18n("%1 Day Forecast").tqarg(m_forecast.forecastDays()))); + m_part->write(TQString("<div class=\"shadow\"><div class=\"displayblock\"><div class=\"summaryheader\">%1</div>\n<div class=\"gap\"> </div>\n").arg(i18n("%1 Day Forecast").arg(m_forecast.forecastDays()))); m_part->write("<table width=\"100%\" cellspacing=\"0\" cellpadding=\"2\" class=\"summarytable\" >"); m_part->write("<tr class=\"item\"><td class=\"left\" width=\"40%\">"); m_part->write(i18n("Account")); m_part->write("</td>"); int colWidth = 55/ (m_forecast.forecastDays() / m_forecast.accountsCycle()); for(i = 0; (i*m_forecast.accountsCycle() + beginDay) <= m_forecast.forecastDays(); ++i) { - m_part->write(TQString("<td width=\"%1%\" class=\"right\">").tqarg(colWidth)); + m_part->write(TQString("<td width=\"%1%\" class=\"right\">").arg(colWidth)); - m_part->write(i18n("%1 days").tqarg(i*m_forecast.accountsCycle() + beginDay)); + m_part->write(i18n("%1 days").arg(i*m_forecast.accountsCycle() + beginDay)); m_part->write("</td>"); colspan++; } @@ -983,9 +983,9 @@ void KHomeView::showForecast(void) for(it_account = nameIdx.begin(); it_account != nameIdx.end(); ++it_account) { //MyMoneyAccount acc = (*it_n); - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); m_part->write(TQString("<td width=\"40%\">") + - link(VIEW_LEDGER, TQString("?id=%1").tqarg((*it_account).id())) + (*it_account).name() + linkend() + "</td>"); + link(VIEW_LEDGER, TQString("?id=%1").arg((*it_account).id())) + (*it_account).name() + linkend() + "</td>"); int dropZero = -1; //account dropped below zero int dropMinimum = -1; //account dropped below minimum balance @@ -1003,12 +1003,12 @@ void KHomeView::showForecast(void) } for (int f = beginDay; f <= m_forecast.forecastDays(); f += m_forecast.accountsCycle()) { - forecastBalance = m_forecast.forecastBalance(*it_account, TQDate::tqcurrentDate().addDays(f)); + forecastBalance = m_forecast.forecastBalance(*it_account, TQDate::currentDate().addDays(f)); TQString amount; amount = forecastBalance.formatMoney( *it_account, currency); amount.replace(" "," "); - m_part->write(TQString("<td width=\"%1%\" align=\"right\">").tqarg(colWidth)); - m_part->write(TQString("%1</td>").tqarg(showColoredAmount(amount, forecastBalance.isNegative()))); + m_part->write(TQString("<td width=\"%1%\" align=\"right\">").arg(colWidth)); + m_part->write(TQString("%1</td>").arg(showColoredAmount(amount, forecastBalance.isNegative()))); } m_part->write("</tr>"); @@ -1036,17 +1036,17 @@ void KHomeView::showForecast(void) case -1: break; case 0: - msg = i18n("The balance of %1 is below the minimum balance %2 today.").tqarg((*it_account).name()).tqarg(minBalance.formatMoney(*it_account, currency)); + msg = i18n("The balance of %1 is below the minimum balance %2 today.").arg((*it_account).name()).arg(minBalance.formatMoney(*it_account, currency)); msg = showColoredAmount(msg, true); break; default: - msg = i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").tqarg((*it_account).name()).tqarg(minBalance.formatMoney(*it_account, currency)).tqarg(dropMinimum-1); + msg = i18n("The balance of %1 will drop below the minimum balance %2 in %3 days.").arg((*it_account).name()).arg(minBalance.formatMoney(*it_account, currency)).arg(dropMinimum-1); msg = showColoredAmount(msg, true); break; } if(!msg.isEmpty()) { - m_part->write(TQString("<tr class=\"warning\" style=\"font-weight: normal;\" ><td colspan=%2 align=\"center\" >%1</td></tr>").tqarg(msg).tqarg(colspan)); + m_part->write(TQString("<tr class=\"warning\" style=\"font-weight: normal;\" ><td colspan=%2 align=\"center\" >%1</td></tr>").arg(msg).arg(colspan)); } } // a drop below zero is always shown @@ -1056,28 +1056,28 @@ void KHomeView::showForecast(void) break; case 0: if((*it_account).accountGroup() == MyMoneyAccount::Asset) { - msg = i18n("The balance of %1 is below %2 today.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency)); + msg = i18n("The balance of %1 is below %2 today.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency)); msg = showColoredAmount(msg, true); break; } if((*it_account).accountGroup() == MyMoneyAccount::Liability) { - msg = i18n("The balance of %1 is above %2 today.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency)); + msg = i18n("The balance of %1 is above %2 today.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency)); break; } break; default: if((*it_account).accountGroup() == MyMoneyAccount::Asset) { - msg = i18n("The balance of %1 will drop below %2 in %3 days.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency)).tqarg(dropZero); + msg = i18n("The balance of %1 will drop below %2 in %3 days.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency)).arg(dropZero); msg = showColoredAmount(msg, true); break; } if((*it_account).accountGroup() == MyMoneyAccount::Liability) { - msg = i18n("The balance of %1 will raise above %2 in %3 days.").tqarg((*it_account).name()).tqarg(MyMoneyMoney().formatMoney(*it_account, currency)).tqarg(dropZero); + msg = i18n("The balance of %1 will raise above %2 in %3 days.").arg((*it_account).name()).arg(MyMoneyMoney().formatMoney(*it_account, currency)).arg(dropZero); break; } } if(!msg.isEmpty()) { - m_part->write(TQString("<tr class=\"warning\"><td colspan=%2 align=\"center\" ><b>%1</b></td></tr>").tqarg(msg).tqarg(colspan)); + m_part->write(TQString("<tr class=\"warning\"><td colspan=%2 align=\"center\" ><b>%1</b></td></tr>").arg(msg).arg(colspan)); } } m_part->write("</table></div></div>"); @@ -1090,9 +1090,9 @@ const TQString KHomeView::link(const TQString& view, const TQString& query, cons TQString titlePart; TQString title(_title); if(!title.isEmpty()) - titlePart = TQString(" title=\"%1\"").tqarg(title.replace(" ", " ")); + titlePart = TQString(" title=\"%1\"").arg(title.replace(" ", " ")); - return TQString("<a href=\"/%1%2\"%3>").tqarg(view, query, titlePart); + return TQString("<a href=\"/%1%2\"%3>").arg(view, query, titlePart); } const TQString KHomeView::linkend(void) const @@ -1260,7 +1260,7 @@ void KHomeView::showAssetsLiabilities(void) TQMap<TQString, MyMoneyAccount>::const_iterator asset_it = nameAssetsIdx.begin(); TQMap<TQString,MyMoneyAccount>::const_iterator liabilities_it = nameLiabilitiesIdx.begin(); for(; asset_it != nameAssetsIdx.end() || liabilities_it != nameLiabilitiesIdx.end();) { - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); //write an asset account if we still have any if(asset_it != nameAssetsIdx.end()) { MyMoneyMoney value; @@ -1268,12 +1268,12 @@ void KHomeView::showAssetsLiabilities(void) if( (*asset_it).accountType() == MyMoneyAccount::Investment) { value = investmentBalance(*asset_it); } else { - value = MyMoneyFile::instance()->balance((*asset_it).id(), TQDate::tqcurrentDate()); + value = MyMoneyFile::instance()->balance((*asset_it).id(), TQDate::currentDate()); } //calculate balance for foreign currency accounts if((*asset_it).currencyId() != file->baseCurrency().id()) { ReportAccount repAcc = ReportAccount((*asset_it).id()); - MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); + MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate()); MyMoneyMoney baseValue = value * curPrice; baseValue = baseValue.convert(10000); netAssets += baseValue; @@ -1294,11 +1294,11 @@ void KHomeView::showAssetsLiabilities(void) //write a liability account if(liabilities_it != nameLiabilitiesIdx.end()) { MyMoneyMoney value; - value = MyMoneyFile::instance()->balance((*liabilities_it).id(), TQDate::tqcurrentDate()); + value = MyMoneyFile::instance()->balance((*liabilities_it).id(), TQDate::currentDate()); //calculate balance if foreign currency if((*liabilities_it).currencyId() != file->baseCurrency().id()) { ReportAccount repAcc = ReportAccount((*liabilities_it).id()); - MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); + MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate()); MyMoneyMoney baseValue = value * curPrice; baseValue = baseValue.convert(10000); netLiabilities += baseValue; @@ -1325,23 +1325,23 @@ void KHomeView::showAssetsLiabilities(void) amountLiabilities.replace(" "," "); amountNetWorth.replace(" "," "); - m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").arg(i++ & 0x01 ? "even" : "odd")); //print total for assets - m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").tqarg(i18n("Total Assets")).tqarg(showColoredAmount(amountAssets, netAssets.isNegative()))); + m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").arg(i18n("Total Assets")).arg(showColoredAmount(amountAssets, netAssets.isNegative()))); //leave the intermediate column empty m_part->write("<td class=\"setcolor\"></td>"); //print total liabilities - m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").tqarg(i18n("Total Liabilities")).tqarg(showColoredAmount(amountLiabilities, netLiabilities.isNegative()))); + m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").arg(i18n("Total Liabilities")).arg(showColoredAmount(amountLiabilities, netLiabilities.isNegative()))); m_part->write("</tr>"); //print net worth - m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").arg(i++ & 0x01 ? "even" : "odd")); m_part->write("<td></td><td></td><td class=\"setcolor\"></td>"); - m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").tqarg(i18n("Net Worth")).tqarg(showColoredAmount(amountNetWorth, netWorth.isNegative() ))); + m_part->write(TQString("<td class=\"left\">%1</td><td align=\"right\">%2</td>").arg(i18n("Net Worth")).arg(showColoredAmount(amountNetWorth, netWorth.isNegative() ))); m_part->write("</tr>"); m_part->write("</table>"); @@ -1402,9 +1402,9 @@ void KHomeView::showBudget(void) TQString totalActualAmount = totalActualValue.formatMoney(file->baseCurrency().tradingSymbol(), prec); TQString totalBudgetDiffAmount = totalBudgetDiffValue.formatMoney(file->baseCurrency().tradingSymbol(), prec); - m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(totalBudgetAmount, totalBudgetValue.isNegative()))); - m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(totalActualAmount, totalActualValue.isNegative()))); - m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(totalBudgetDiffAmount, totalBudgetDiffValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(totalBudgetAmount, totalBudgetValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(totalActualAmount, totalActualValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(totalBudgetDiffAmount, totalBudgetDiffValue.isNegative()))); m_part->write("</tr>"); m_part->write("</table>"); @@ -1448,10 +1448,10 @@ void KHomeView::showBudget(void) //write the outergroup if it is the first row of outergroup being shown if(i == 0) { m_part->write("<tr style=\"font-weight:bold;\">"); - m_part->write(TQString("<td class=\"left\" colspan=\"4\">%1</td>").tqarg(KMyMoneyUtils::accountTypeToString( rowname.accountType()))); + m_part->write(TQString("<td class=\"left\" colspan=\"4\">%1</td>").arg(KMyMoneyUtils::accountTypeToString( rowname.accountType()))); m_part->write("</tr>"); } - m_part->write(TQString("<tr class=\"row-%1\">").tqarg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<tr class=\"row-%1\">").arg(i++ & 0x01 ? "even" : "odd")); //get values from grid MyMoneyMoney actualValue = it_row.data()[eActual][1]; @@ -1464,12 +1464,12 @@ void KHomeView::showBudget(void) TQString budgetDiffAmount = budgetDiffValue.formatMoney(file->baseCurrency().tradingSymbol(), prec); //account name - m_part->write(TQString("<td>") + link(VIEW_LEDGER, TQString("?id=%1").tqarg(rowname.id())) + rowname.name() + linkend() + "</td>"); + m_part->write(TQString("<td>") + link(VIEW_LEDGER, TQString("?id=%1").arg(rowname.id())) + rowname.name() + linkend() + "</td>"); //show amounts - m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(budgetAmount, budgetValue.isNegative()))); - m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(actualAmount, actualValue.isNegative()))); - m_part->write(TQString("<td align=\"right\">%1</td>").tqarg(showColoredAmount(budgetDiffAmount, budgetDiffValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(budgetAmount, budgetValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(actualAmount, actualValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%1</td>").arg(showColoredAmount(budgetDiffAmount, budgetDiffValue.isNegative()))); m_part->write("</tr>"); } ++it_row; @@ -1481,8 +1481,8 @@ void KHomeView::showBudget(void) //if no negative differences are found, then inform that if(i == 0) { - m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").tqarg(i++ & 0x01 ? "even" : "odd")); - m_part->write(TQString("<td class=\"center\" colspan=\"4\">%1</td>").tqarg(i18n("No Budget Categories have been overrun"))); + m_part->write(TQString("<tr class=\"row-%1\" style=\"font-weight:bold;\">").arg(i++ & 0x01 ? "even" : "odd")); + m_part->write(TQString("<td class=\"center\" colspan=\"4\">%1</td>").arg(i18n("No Budget Categories have been overrun"))); m_part->write("</tr>"); } m_part->write("</table></div></div>"); @@ -1493,7 +1493,7 @@ TQString KHomeView::showColoredAmount(const TQString& amount, bool isNegative) { if(isNegative) { //if negative, get the settings for negative numbers - return TQString("<font color=\"%1\">%2</font>").tqarg(KMyMoneyGlobalSettings::listNegativeValueColor().name(), amount); + return TQString("<font color=\"%1\">%2</font>").arg(KMyMoneyGlobalSettings::listNegativeValueColor().name(), amount); } //if positive, return the same string @@ -1518,16 +1518,16 @@ void KHomeView::doForecast(void) MyMoneyMoney KHomeView::forecastPaymentBalance(const MyMoneyAccount& acc, const MyMoneyMoney& payment, TQDate& paymentDate) { - //if paymentDate before or equal to tqcurrentDate set it to current date plus 1 + //if paymentDate before or equal to currentDate set it to current date plus 1 //so we get to accumulate forecast balance correctly - if(paymentDate <= TQDate::tqcurrentDate()) - paymentDate = TQDate::tqcurrentDate().addDays(1); + if(paymentDate <= TQDate::currentDate()) + paymentDate = TQDate::currentDate().addDays(1); //check if the account is already there if(m_accountList.find(acc.id()) == m_accountList.end() || m_accountList[acc.id()].find(paymentDate) == m_accountList[acc.id()].end()) { - if(paymentDate == TQDate::tqcurrentDate()) { + if(paymentDate == TQDate::currentDate()) { m_accountList[acc.id()][paymentDate] = m_forecast.forecastBalance(acc, paymentDate); } else { m_accountList[acc.id()][paymentDate] = m_forecast.forecastBalance(acc, paymentDate.addDays(-1)); @@ -1547,8 +1547,8 @@ void KHomeView::showCashFlowSummary() int prec = MyMoneyMoney::denomToPrec(file->baseCurrency().smallestAccountFraction()); //set start and end of month dates - TQDate startOfMonth = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), 1); - TQDate endOfMonth = TQDate(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), TQDate::tqcurrentDate().daysInMonth()); + TQDate startOfMonth = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), 1); + TQDate endOfMonth = TQDate(TQDate::currentDate().year(), TQDate::currentDate().month(), TQDate::currentDate().daysInMonth()); //Add total income and expenses for this month //get transactions for current month @@ -1660,8 +1660,8 @@ void KHomeView::showCashFlowSummary() MyMoneyAccount acc = file->account((*it_s).accountId()); // collect all overdues on the first day TQDate schedDate = nextDate; - if(TQDate::tqcurrentDate() >= nextDate) - schedDate = TQDate::tqcurrentDate().addDays(1); + if(TQDate::currentDate() >= nextDate) + schedDate = TQDate::currentDate().addDays(1); balanceMap[acc.id()] += file->balance(acc.id()); } @@ -1680,7 +1680,7 @@ void KHomeView::showCashFlowSummary() //convert to foreign currency if needed if(repSplitAcc.currencyId() != file->baseCurrency().id()) { - MyMoneyMoney curPrice = repSplitAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); + MyMoneyMoney curPrice = repSplitAcc.baseCurrencyPrice(TQDate::currentDate()); value = value * curPrice; value = value.convert(10000); } @@ -1733,11 +1733,11 @@ void KHomeView::showCashFlowSummary() case MyMoneyAccount::Savings: case MyMoneyAccount::Cash: { - MyMoneyMoney value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::tqcurrentDate()); + MyMoneyMoney value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::currentDate()); //calculate balance for foreign currency accounts if((*account_it).currencyId() != file->baseCurrency().id()) { ReportAccount repAcc = ReportAccount((*account_it).id()); - MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); + MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate()); MyMoneyMoney baseValue = value * curPrice; liquidAssets += baseValue; liquidAssets = liquidAssets.convert(10000); @@ -1750,11 +1750,11 @@ void KHomeView::showCashFlowSummary() case MyMoneyAccount::CreditCard: { MyMoneyMoney value; - value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::tqcurrentDate()); + value = MyMoneyFile::instance()->balance((*account_it).id(), TQDate::currentDate()); //calculate balance if foreign currency if((*account_it).currencyId() != file->baseCurrency().id()) { ReportAccount repAcc = ReportAccount((*account_it).id()); - MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::tqcurrentDate()); + MyMoneyMoney curPrice = repAcc.baseCurrencyPrice(TQDate::currentDate()); MyMoneyMoney baseValue = value * curPrice; liquidLiabilities += baseValue; liquidLiabilities = liquidLiabilities.convert(10000); @@ -1810,16 +1810,16 @@ void KHomeView::showCashFlowSummary() m_part->write(TQString("<tr class=\"row-even\" style=\"font-weight:bold;\">")); //print current income - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountIncome, incomeValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountIncome, incomeValue.isNegative()))); //print the scheduled income - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledIncome, scheduledIncome.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledIncome, scheduledIncome.isNegative()))); //print current expenses - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountExpense, expenseValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountExpense, expenseValue.isNegative()))); //print the scheduled expenses - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledExpense, scheduledExpense.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledExpense, scheduledExpense.isNegative()))); m_part->write("</tr>"); m_part->write("</table>"); @@ -1852,16 +1852,16 @@ void KHomeView::showCashFlowSummary() m_part->write(TQString("<tr class=\"row-even\" style=\"font-weight:bold;\">")); //print current liquid assets - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountLiquidAssets, liquidAssets.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountLiquidAssets, liquidAssets.isNegative()))); //print the scheduled transfers - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledLiquidTransfer, scheduledLiquidTransfer.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledLiquidTransfer, scheduledLiquidTransfer.isNegative()))); //print current liabilities - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountLiquidLiabilities, liquidLiabilities.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountLiquidLiabilities, liquidLiabilities.isNegative()))); //print the scheduled transfers - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountScheduledOtherTransfer, scheduledOtherTransfer.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountScheduledOtherTransfer, scheduledOtherTransfer.isNegative()))); m_part->write("</tr>"); @@ -1909,13 +1909,13 @@ void KHomeView::showCashFlowSummary() m_part->write("<td> </td>"); //print expected assets - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountExpectedAsset, expectedAsset.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountExpectedAsset, expectedAsset.isNegative()))); //print expected liabilities - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountExpectedLiabilities, expectedLiabilities.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountExpectedLiabilities, expectedLiabilities.isNegative()))); //print expected profit - m_part->write(TQString("<td align=\"right\">%2</td>").tqarg(showColoredAmount(amountProfit, profitValue.isNegative()))); + m_part->write(TQString("<td align=\"right\">%2</td>").arg(showColoredAmount(amountProfit, profitValue.isNegative()))); m_part->write("</tr>"); diff --git a/kmymoney2/views/kinstitutionsview.h b/kmymoney2/views/kinstitutionsview.h index 6293f35..b604ae9 100644 --- a/kmymoney2/views/kinstitutionsview.h +++ b/kmymoney2/views/kinstitutionsview.h @@ -59,8 +59,8 @@ public slots: void show(void); /** - * Override the base class behaviour to restore the tqlayout. Do not - * do this in show() because show() itself may change the tqlayout + * Override the base class behaviour to restore the layout. Do not + * do this in show() because show() itself may change the layout * in undesired ways. */ void polish(void); diff --git a/kmymoney2/views/kinstitutionsviewdecl.ui b/kmymoney2/views/kinstitutionsviewdecl.ui index 1134e3b..1fc2890 100644 --- a/kmymoney2/views/kinstitutionsviewdecl.ui +++ b/kmymoney2/views/kinstitutionsviewdecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -56,7 +56,7 @@ <property name="name"> <cstring>m_totalProfitsLabel</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -68,7 +68,7 @@ <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignVCenter|AlignRight</set> </property> <property name="hAlign" stdset="0"> diff --git a/kmymoney2/views/kinvestmentlistitem.cpp b/kmymoney2/views/kinvestmentlistitem.cpp index b7617d8..d13f5d3 100644 --- a/kmymoney2/views/kinvestmentlistitem.cpp +++ b/kmymoney2/views/kinvestmentlistitem.cpp @@ -130,7 +130,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi else { bool bFoundCurrent = false, bFoundComparison = false; - TQDate tempDate, comparisonDate = TQDate::tqcurrentDate(); + TQDate tempDate, comparisonDate = TQDate::currentDate(); if(YTD) { @@ -147,7 +147,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi //find the current value, or closest to the current value. equity_price_history::ConstIterator itToday = history.end(); - for(tempDate = TQDate::tqcurrentDate(); tempDate >= comparisonDate; ) + for(tempDate = TQDate::currentDate(); tempDate >= comparisonDate; ) { itToday = history.find(tempDate); if(itToday != history.end()) @@ -169,7 +169,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi //should already be sorted earliest to latest. for(equity_price_history::ConstIterator it = history.begin(); it != history.end(); ++it) { - if(it.key() >= comparisonDate && it.key() < TQDate::tqcurrentDate()) + if(it.key() >= comparisonDate && it.key() < TQDate::currentDate()) { comparisonDate = it.key(); comparisonValue = it.data(); @@ -195,7 +195,7 @@ const TQString KInvestmentListItem::calculateGain(const equity_price_history& hi bNegative = true; } - TQString ds = TQString("%1%").tqarg(result, 0, 'f', 3); + TQString ds = TQString("%1%").arg(result, 0, 'f', 3); return ds; /*MyMoneyMoney result = (currentValue / comparisonValue); diff --git a/kmymoney2/views/kinvestmentviewdecl.ui b/kmymoney2/views/kinvestmentviewdecl.ui index 7c4a028..f681c7a 100644 --- a/kmymoney2/views/kinvestmentviewdecl.ui +++ b/kmymoney2/views/kinvestmentviewdecl.ui @@ -24,7 +24,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>280</width> <height>20</height> diff --git a/kmymoney2/views/kmymoneyview.cpp b/kmymoney2/views/kmymoneyview.cpp index eba2a82..e557aab 100644 --- a/kmymoney2/views/kmymoneyview.cpp +++ b/kmymoney2/views/kmymoneyview.cpp @@ -27,14 +27,14 @@ #include <tqlabel.h> #include <tqfile.h> -#include <tqtextstream.h> +#include <textstream.h> #include <tqprogressdialog.h> -#include <tqtextcodec.h> +#include <textcodec.h> #include <tqstatusbar.h> #include <tqcursor.h> #include <tqregexp.h> -#include <tqlayout.h> +#include <layout.h> #include <tqobjectlist.h> // ---------------------------------------------------------------------------- @@ -583,7 +583,7 @@ bool KMyMoneyView::readFile(const KURL& url) } else { if(!KIO::NetAccess::download(url, filename, NULL)) { KMessageBox::detailedError(this, - i18n("Error while loading file '%1'!").tqarg(url.url()), + i18n("Error while loading file '%1'!").arg(url.url()), KIO::NetAccess::lastErrorString(), i18n("File access error")); return false; @@ -595,7 +595,7 @@ bool KMyMoneyView::readFile(const KURL& url) TQFile file(filename); TQFileInfo info(file); if(!info.isFile()) { - TQString msg=i18n("<b>%1</b> is not a KMyMoney file.").tqarg(filename); + TQString msg=i18n("<b>%1</b> is not a KMyMoney file.").arg(filename); KMessageBox::error(this, TQString("<p>")+msg, i18n("Filetype Error")); return false; } @@ -636,7 +636,7 @@ bool KMyMoneyView::readFile(const KURL& url) haveAt = false; isEncrypted = true; } else { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("GPG is not available for decryption of file <b>%1</b>").tqarg(filename))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("GPG is not available for decryption of file <b>%1</b>").arg(filename))); qfile = TQT_TQIODEVICE(new TQFile(file.name())); } } else { @@ -714,18 +714,18 @@ bool KMyMoneyView::readFile(const KURL& url) ::timetrace("done reading to memory"); } else { if(m_fileType == KmmBinary) { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains the old binary format used by KMyMoney. Please use an older version of KMyMoney (0.8.x) that still supports this format to convert it to the new XML based format.").tqarg(filename))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains the old binary format used by KMyMoney. Please use an older version of KMyMoney (0.8.x) that still supports this format to convert it to the new XML based format.").arg(filename))); } else { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains an unknown file format!").tqarg(filename))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> contains an unknown file format!").arg(filename))); } rc = false; } } else { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot read from file <b>%1</b>!").tqarg(filename))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot read from file <b>%1</b>!").arg(filename))); rc = false; } } catch (MyMoneyException *e) { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot load file <b>%1</b>. Reason: %2").tqarg(filename, e->what()))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("Cannot load file <b>%1</b>. Reason: %2").arg(filename, e->what()))); delete e; rc = false; } @@ -735,13 +735,13 @@ bool KMyMoneyView::readFile(const KURL& url) } qfile->close(); } else { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").tqarg(filename))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").arg(filename))); rc = false; } delete qfile; } } else { - KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").tqarg(filename))); + KMessageBox::sorry(this, TQString("<qt>%1</qt>"). arg(i18n("File <b>%1</b> not found!").arg(filename))); rc = false; } @@ -805,7 +805,7 @@ bool KMyMoneyView::openDatabase (const KURL& url) { retry = false; break; case 1: // permanent error - KMessageBox::detailedError (this, i18n("Can't open database %1\n").tqarg(dbURL.prettyURL()), reader->lastError()); + KMessageBox::detailedError (this, i18n("Can't open database %1\n").arg(dbURL.prettyURL()), reader->lastError()); if (pDBMgr) { removeStorage(); delete pDBMgr; @@ -911,7 +911,7 @@ bool KMyMoneyView::initializeStorage() // Check if we have to modify the file before we allow to work with it IMyMoneyStorage* s = MyMoneyFile::instance()->storage(); while (s->fileFixVersion() < s->currentFixVersion()) { - qDebug("%s", (TQString("testing fileFixVersion %1 < %2").tqarg(s->fileFixVersion()).tqarg(s->currentFixVersion())).data()); + qDebug("%s", (TQString("testing fileFixVersion %1 < %2").arg(s->fileFixVersion()).arg(s->currentFixVersion())).data()); switch (s->fileFixVersion()) { case 0: fixFile_0(); @@ -984,7 +984,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter if(KMyMoneyGlobalSettings::encryptRecover()) { encryptRecover = true; if(!KGPGFile::keyAvailable(TQString(RECOVER_KEY_ID))) { - KMessageBox::sorry(this, TQString("<p>")+i18n("You have selected to encrypt your data also with the KMyMoney recover key, but the key with id</p><p><center><b>%1</b></center></p>has not been found in your keyring at this time. Please make sure to import this key into your keyring. You can find it on the <a href=\"http://kmymoney2.sourceforge.net/\">KMyMoney web-site</a>. This time your data will not be encrypted with the KMyMoney recover key.").tqarg(RECOVER_KEY_ID), i18n("GPG-Key not found")); + KMessageBox::sorry(this, TQString("<p>")+i18n("You have selected to encrypt your data also with the KMyMoney recover key, but the key with id</p><p><center><b>%1</b></center></p>has not been found in your keyring at this time. Please make sure to import this key into your keyring. You can find it on the <a href=\"http://kmymoney2.sourceforge.net/\">KMyMoney web-site</a>. This time your data will not be encrypted with the KMyMoney recover key.").arg(RECOVER_KEY_ID), i18n("GPG-Key not found")); encryptRecover = false; } } @@ -993,7 +993,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter TQStringList::const_iterator it_s; for(it_s = keys.begin(); it_s != keys.begin(); ++it_s) { if(!KGPGFile::keyAvailable(*it_s)) { - KMessageBox::sorry(this, TQString("<p>")+i18n("You have specified to encrypt your data for the user-id</p><p><center><b>%1</b>.</center></p>Unfortunately, a valid key for this user-id was not found in your keyring. Please make sure to import a valid key for this user-id. This time, encryption is disabled.").tqarg(*it_s), i18n("GPG-Key not found")); + KMessageBox::sorry(this, TQString("<p>")+i18n("You have specified to encrypt your data for the user-id</p><p><center><b>%1</b>.</center></p>Unfortunately, a valid key for this user-id was not found in your keyring. Please make sure to import a valid key for this user-id. This time, encryption is disabled.").arg(*it_s), i18n("GPG-Key not found")); encryptedOk = false; } } @@ -1031,7 +1031,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter if(!dev || !dev->open(IO_WriteOnly)) { MyMoneyFile::instance()->blockSignals(blocked); delete dev; - throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").tqarg(qfile->name())); + throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").arg(qfile->name())); } } else if(!plaintext) { @@ -1045,7 +1045,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter if(!dev || !dev->open(IO_WriteOnly)) { MyMoneyFile::instance()->blockSignals(blocked); delete dev; - throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").tqarg(qfile->name())); + throw new MYMONEYEXCEPTION(i18n("Unable to open file '%1' for writing.").arg(qfile->name())); } statusDevice = base->device(); } @@ -1054,11 +1054,11 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter ft.commit(); pWriter->setProgressCallback(&KMyMoneyView::progressCallback); - dev->resetqStatus(); + dev->reseStatus(); pWriter->writeFile(dev, dynamic_cast<IMyMoneySerialize*> (MyMoneyFile::instance()->storage())); MyMoneyFile::instance()->blockSignals(blocked); if(statusDevice->status() != IO_Ok) { - throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").tqarg(qfile->name())); + throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").arg(qfile->name())); } pWriter->setProgressCallback(0); @@ -1067,7 +1067,7 @@ void KMyMoneyView::saveToLocalFile(TQFile* qfile, IMyMoneyStorageFormat* pWriter dev->close(); if(statusDevice->status() != IO_Ok) { delete dev; - throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").tqarg(qfile->name())); + throw new MYMONEYEXCEPTION(i18n("Failure while writing to '%1'").arg(qfile->name())); } delete dev; } else @@ -1115,7 +1115,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList) bool rc = true; try { if(! url.isValid()) { - throw new MYMONEYEXCEPTION(i18n("Malformed URL '%1'").tqarg(url.url())); + throw new MYMONEYEXCEPTION(i18n("Malformed URL '%1'").arg(url.url())); } if(url.isLocalFile()) { @@ -1144,10 +1144,10 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList) } catch (MyMoneyException* e) { qfile.abort(); delete e; - throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename)); + throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename)); } } else { - throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").tqarg(filename)); + throw new MYMONEYEXCEPTION(i18n("Unable to write changes to '%1'").arg(filename)); } } chown(filename, static_cast<uid_t>(-1), gid); @@ -1155,7 +1155,7 @@ bool KMyMoneyView::saveFile(const KURL& url, const TQString& keyList) KTempFile tmpfile; saveToLocalFile(tmpfile.file(), pWriter, plaintext, keyList); if(!KIO::NetAccess::upload(tmpfile.name(), url, NULL)) - throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").tqarg(url.url())); + throw new MYMONEYEXCEPTION(i18n("Unable to upload to '%1'").arg(url.url())); tmpfile.unlink(); } m_fileType = KmmXML; @@ -1210,7 +1210,7 @@ bool KMyMoneyView::saveAsDatabase(const KURL& url) KMessageBox::detailedError (this, i18n("Can't open or create database %1\n" "Retry SaveAsDatabase and click Help" - " for further info").tqarg(url.prettyURL()), writer->lastError()); + " for further info").arg(url.prettyURL()), writer->lastError()); } delete writer; return (rc); @@ -1268,7 +1268,7 @@ void KMyMoneyView::slotSetBaseCurrency(const MyMoneySecurity& baseCurrency) MyMoneyFile::instance()->setBaseCurrency(baseCurrency); ft.commit(); } catch(MyMoneyException *e) { - KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").tqarg(baseCurrency.name()).tqarg(e->what()), i18n("Set base currency")); + KMessageBox::sorry(this, i18n("Cannot set %1 as base currency: %2").arg(baseCurrency.name()).arg(e->what()), i18n("Set base currency")); delete e; } } @@ -1568,7 +1568,7 @@ void KMyMoneyView::loadAncientCurrencies(void) // Source: http://www.focus.de/finanzen/news/malta-und-zypern_aid_66058.html loadAncientCurrency("MTL", i18n("Maltese Lira"), "MTL", TQDate(2008,1,1), MyMoneyMoney(429300,1000000), "EUR"); - loadAncientCurrency("CYP", i18n("Cyprus Pound"), TQString("C%1").tqarg(TQChar(0x00A3)), TQDate(2008,1,1), MyMoneyMoney(585274,1000000), "EUR"); + loadAncientCurrency("CYP", i18n("Cyprus Pound"), TQString("C%1").arg(TQChar(0x00A3)), TQDate(2008,1,1), MyMoneyMoney(585274,1000000), "EUR"); // Source: http://www.focus.de/finanzen/news/waehrungszone-slowakei-ist-neuer-euro-staat_aid_359025.html loadAncientCurrency("SKK", i18n("Slovak Koruna"), "SKK", TQDate(2008,12,31), MyMoneyMoney(1000,30126), "EUR"); @@ -1884,7 +1884,7 @@ void KMyMoneyView::fixLoanAccount_0(MyMoneyAccount acc) i18n("The account \"%1\" was previously created as loan account but some information " "is missing. The new loan wizard will be started to collect all relevant " "information. Please use a KMyMoney version >= 0.8.7 and < 0.9 to correct the problem." - ).tqarg(acc.name()), + ).arg(acc.name()), i18n("Account problem")); throw new MYMONEYEXCEPTION("Fix LoanAccount0 not supported anymore"); @@ -2189,7 +2189,7 @@ KMyMoneyViewBase* KMyMoneyView::addPage(const TQString& title, const TQString& i // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqvbox.h> // ---------------------------------------------------------------------------- @@ -2240,7 +2240,7 @@ void KMyMoneyViewBase::addWidget(TQWidget* w) d->m_viewLayout->addWidget(w); } -TQVBoxLayout* KMyMoneyViewBase::tqlayout(void) const +TQVBoxLayout* KMyMoneyViewBase::layout(void) const { return d->m_viewLayout; } diff --git a/kmymoney2/views/kmymoneyview.h b/kmymoney2/views/kmymoneyview.h index 2c1cd38..d542110 100644 --- a/kmymoney2/views/kmymoneyview.h +++ b/kmymoney2/views/kmymoneyview.h @@ -605,7 +605,7 @@ public: virtual ~KMyMoneyViewBase(); void setTitle(const TQString& title); - TQVBoxLayout* tqlayout(void) const; + TQVBoxLayout* layout(void) const; void addWidget(TQWidget* w); /** diff --git a/kmymoney2/views/kpayeesview.cpp b/kmymoney2/views/kpayeesview.cpp index 6fa22ee..ef07db6 100644 --- a/kmymoney2/views/kpayeesview.cpp +++ b/kmymoney2/views/kpayeesview.cpp @@ -29,7 +29,7 @@ #include <tqcombobox.h> #include <tqlineedit.h> #include <tqlabel.h> -#include <tqlayout.h> +#include <layout.h> #include <tqmultilineedit.h> #include <tqpixmap.h> #include <tqtabwidget.h> @@ -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) @@ -323,9 +323,9 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : m_inSelection(false) { // create the searchline widget - // and insert it into the existing tqlayout + // and insert it into the existing layout m_searchWidget = new KListViewSearchLineWidget(m_payeesList, this); - m_searchWidget->tqsetSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); + m_searchWidget->setSizePolicy(TQSizePolicy(TQSizePolicy::Preferred, TQSizePolicy::Fixed)); KPayeesViewDeclLayout->insertWidget(0, m_searchWidget); m_splitter = new TQSplitter(this); @@ -333,7 +333,7 @@ KPayeesView::KPayeesView(TQWidget *parent, const char *name ) : m_tabWidget->reparent(m_splitter, TQPoint(0, 0), true); m_splitter->setResizeMode(m_tabWidget, TQSplitter::Stretch); m_splitter->setOpaqueResize(); - tqlayout10->addWidget(m_splitter); + layout10->addWidget(m_splitter); // use the size settings of the last run (if any) KConfig *config = KGlobal::config(); @@ -495,7 +495,7 @@ void KPayeesView::slotRenamePayee(TQListViewItem* p , int /* col */, const TQStr if (KMessageBox::questionYesNo(this, i18n("A payee with the name '%1' already exists. It is not advisable to have " "multiple payees with the same identification name. Are you sure you would like " - "to rename the payee?").tqarg(new_name)) != KMessageBox::Yes) + "to rename the payee?").arg(new_name)) != KMessageBox::Yes) { p->setText(0,m_payee.name()); return; @@ -521,7 +521,7 @@ void KPayeesView::slotRenamePayee(TQListViewItem* p , int /* col */, const TQStr } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to modify payee"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } @@ -565,8 +565,8 @@ void KPayeesView::slotSelectPayee(void) // check if the content of a currently selected payee was modified // and ask to store the data if (m_updateButton->isEnabled()) { - if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").tqarg( - i18n("Do you want to save the changes for <b>%1</b>?").tqarg(m_newName)), + if (KMessageBox::questionYesNo(this, TQString("<qt>%1</qt>").arg( + i18n("Do you want to save the changes for <b>%1</b>?").arg(m_newName)), i18n("Save changes")) == KMessageBox::Yes) { m_inSelection = true; slotUpdatePayee(); @@ -664,7 +664,7 @@ void KPayeesView::showTransactions(void) m_transactionView->clear(); if(m_payee.id().isEmpty() || !m_tabWidget->isEnabled()) { - m_balanceLabel->setText(i18n("Balance: %1").tqarg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction()))); + m_balanceLabel->setText(i18n("Balance: %1").arg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction()))); return; } @@ -727,24 +727,24 @@ void KPayeesView::showTransactions(void) if(s.action() == MyMoneySplit::ActionAmortization) { if(acc.accountType() == MyMoneyAccount::Loan) { if(s.value().isPositive()) { - txt = i18n("Amortization of %1").tqarg(acc.name()); + txt = i18n("Amortization of %1").arg(acc.name()); } else { - txt = i18n("Payment to %1").tqarg(acc.name()); + txt = i18n("Payment to %1").arg(acc.name()); } } else if(acc.accountType() == MyMoneyAccount::AssetLoan) { if(s.value().isNegative()) { - txt = i18n("Amortization of %1").tqarg(acc.name()); + txt = i18n("Amortization of %1").arg(acc.name()); } else { - txt = i18n("Payment to %1").tqarg(acc.name()); + txt = i18n("Payment to %1").arg(acc.name()); } } else { - txt = i18n("Loan payment from %1").tqarg(acc.name()); + txt = i18n("Loan payment from %1").arg(acc.name()); } } else if (file->isTransfer(*t)) { if(!s.value().isNegative()) { - txt = i18n("Transfer to %1").tqarg(acc.name()); + txt = i18n("Transfer to %1").arg(acc.name()); } else { - txt = i18n("Transfer from %1").tqarg(acc.name()); + txt = i18n("Transfer from %1").arg(acc.name()); } } else if(t->splitCount() > 2) { txt = i18n("Split transaction (category replacement)", "Split transaction"); @@ -755,7 +755,7 @@ void KPayeesView::showTransactions(void) item->setText(2, txt); item->setText(3, s.value().formatMoney(acc.fraction())); } - m_balanceLabel->setText(i18n("Balance: %1").tqarg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction()))); + m_balanceLabel->setText(i18n("Balance: %1").arg(balance.formatMoney(MyMoneyFile::instance()->baseCurrency().smallestAccountFraction()))); // Trick: it seems, that the initial sizing of the view does // not work correctly. At least, the columns do not get displayed @@ -872,7 +872,7 @@ void KPayeesView::slotUpdatePayee(void) } catch(MyMoneyException *e) { KMessageBox::detailedSorry(0, i18n("Unable to modify payee"), - (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").tqarg(e->line())); + (e->what() + " " + i18n("thrown in") + " " + e->file()+ ":%1").arg(e->line())); delete e; } } @@ -913,7 +913,7 @@ void KPayeesView::show(void) m_needReload = false; } - // fixup the tqlayout + // fixup the layout TQTimer::singleShot(0, this, TQT_SLOT(rearrange())); // don't forget base class implementation 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 05e8e09..8d3a7b8 100644 --- a/kmymoney2/views/kpayeesviewdecl.ui +++ b/kmymoney2/views/kpayeesviewdecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -168,7 +168,7 @@ <property name="text"> <string>Balance: </string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -218,7 +218,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -240,7 +240,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -262,7 +262,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -284,7 +284,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -293,7 +293,7 @@ <property name="text"> <string>Notes</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> </widget> @@ -350,7 +350,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>90</width> <height>0</height> @@ -359,7 +359,7 @@ <property name="text"> <string>Address:</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop|AlignLeft</set> </property> </widget> @@ -375,7 +375,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>20</height> @@ -516,7 +516,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> @@ -547,7 +547,7 @@ new transactions with this payee</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <grid> <property name="name"> @@ -586,7 +586,7 @@ new transactions with this payee</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> @@ -600,7 +600,7 @@ new transactions with this payee</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -632,7 +632,7 @@ new transactions with this payee</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>260</width> <height>21</height> diff --git a/kmymoney2/views/kreportsview.cpp b/kmymoney2/views/kreportsview.cpp index 8fdcbd7..9a942e4 100755 --- a/kmymoney2/views/kreportsview.cpp +++ b/kmymoney2/views/kreportsview.cpp @@ -30,11 +30,11 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqdatetime.h> #include <tqregexp.h> #include <tqdragobject.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqapplication.h> #include <tqprinter.h> #include <tqpainter.h> @@ -91,7 +91,7 @@ KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& re m_part( new KHTMLPart( this, "reporttabpart" ) ), m_chartView( new KReportChartView( this, "reportchart" ) ), m_control( new kMyMoneyReportControlDecl( this, "reportcontrol" ) ), - m_layout( new TQVBoxLayout( this, 11, 6, "reporttabtqlayout" ) ), + m_layout( new TQVBoxLayout( this, 11, 6, "reporttablayout" ) ), m_report( report ), m_deleteMe( false ), m_showingChart( false ), @@ -105,7 +105,7 @@ KReportsView::KReportTab::KReportTab(KTabWidget* parent, const MyMoneyReport& re m_control->buttonChart->hide(); } - m_chartView->tqsetSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); + m_chartView->setSizePolicy( TQSizePolicy::Expanding, TQSizePolicy::Expanding ); m_chartView->hide(); m_layout->addWidget( m_control ); //, 0, TQt::AlignTop ); m_layout->addWidget( m_part->view() ); @@ -141,7 +141,7 @@ void KReportsView::KReportTab::copyToClipboard(void) { TQTextDrag* pdrag = new TQTextDrag( createTable() ); pdrag->setSubtype("html"); - TQApplication::tqclipboard()->setData(pdrag); + TQApplication::clipboard()->setData(pdrag); } void KReportsView::KReportTab::saveAs( const TQString& filename, bool includeCSS ) @@ -156,7 +156,7 @@ void KReportsView::KReportTab::saveAs( const TQString& filename, bool includeCSS else { TQTextStream stream(&file); - TQRegExp exp(TQString("(.*)(<link.*css\" href=)\"(.*)\">(<meta.*%1\" />)(.*)").tqarg(KGlobal::locale()->encoding())); + TQRegExp exp(TQString("(.*)(<link.*css\" href=)\"(.*)\">(<meta.*%1\" />)(.*)").arg(KGlobal::locale()->encoding())); TQString table = createTable(); if(exp.search(table) != -1 && includeCSS) { TQFile cssFile(exp.cap(3)); @@ -234,13 +234,13 @@ TQString KReportsView::KReportTab::createTable(const TQString& links) { TQString filename; if(!MyMoneyFile::instance()->value("reportstylesheet").isEmpty()) - filename = KGlobal::dirs()->findResource("appdata", TQString("html/%1").tqarg(MyMoneyFile::instance()->value("reportstylesheet"))); + filename = KGlobal::dirs()->findResource("appdata", TQString("html/%1").arg(MyMoneyFile::instance()->value("reportstylesheet"))); if(filename.isEmpty()) filename = KGlobal::dirs()->findResource("appdata", "html/kmymoney2.css"); TQString header = TQString("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\">\n") + - TQString("<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">").tqarg(filename); + TQString("<html><head><link rel=\"stylesheet\" type=\"text/css\" href=\"%1\">").arg(filename); - header += TQString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").tqarg(KGlobal::locale()->encoding()); + header += TQString("<meta http-equiv=\"Content-Type\" content=\"text/html; charset=%1\" />").arg(KGlobal::locale()->encoding()); header += KMyMoneyUtils::variableCSS(); header += "</head><body>\n"; @@ -260,7 +260,7 @@ TQString KReportsView::KReportTab::createTable(const TQString& links) { kdDebug(2) << "KReportsView::KReportTab::createTable(): ERROR " << e->what() << endl; - TQString error = TQString(i18n("There was an error creating your report: \"%1\".\nPlease report this error to the developer's list: [email protected]")).tqarg(e->what()); + TQString error = TQString(i18n("There was an error creating your report: \"%1\".\nPlease report this error to the developer's list: [email protected]")).arg(e->what()); KMessageBox::error(this, error, i18n("Critical Error")); @@ -394,7 +394,7 @@ KReportsView::KReportGroupListItem::KReportGroupListItem(KListView* parent, cons void KReportsView::KReportGroupListItem::setNr(const int nr) { m_nr = nr; - setText(0, TQString("%1. %2").tqarg(nr).tqarg(m_name)); + setText(0, TQString("%1. %2").arg(nr).arg(m_name)); } void KReportsView::loadView(void) @@ -583,8 +583,8 @@ void KReportsView::slotSaveView(void) // adjust to our local needs (filetypes etc.) and // enhanced to show the m_saveEncrypted combo box KFileDialog dlg( ":kmymoney-export", - TQString("%1|%2\n").tqarg("*.csv").tqarg(i18n("CSV (Filefilter)", "CSV files")) + - TQString("%1|%2\n").tqarg("*.html").tqarg(i18n("HTML (Filefilter)", "HTML files")), + TQString("%1|%2\n").arg("*.csv").arg(i18n("CSV (Filefilter)", "CSV files")) + + TQString("%1|%2\n").arg("*.html").arg(i18n("HTML (Filefilter)", "HTML files")), this, "filedialog", true, vbox); connect(&dlg, TQT_SIGNAL(filterChanged(const TQString&)), this, TQT_SLOT(slotSaveFilterChanged(const TQString&))); @@ -657,7 +657,7 @@ void KReportsView::slotDuplicate(void) if(tab) { MyMoneyReport dupe = tab->report(); - dupe.setName( TQString(i18n("Copy of %1")).tqarg(dupe.name()) ); + dupe.setName( TQString(i18n("Copy of %1")).arg(dupe.name()) ); if ( dupe.comment() == i18n("Default Report") ) dupe.setComment( i18n("Custom Report") ); dupe.clearId(); @@ -688,7 +688,7 @@ void KReportsView::slotDelete(void) MyMoneyReport report = tab->report(); if ( ! report.id().isEmpty() ) { - if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, TQString("<qt>")+i18n("Are you sure you want to delete report <b>%1</b>? There is no way to recover it!").tqarg(report.name())+TQString("</qt>"), i18n("Delete Report?"))) + if ( KMessageBox::Continue == KMessageBox::warningContinueCancel(this, TQString("<qt>")+i18n("Are you sure you want to delete report <b>%1</b>? There is no way to recover it!").arg(report.name())+TQString("</qt>"), i18n("Delete Report?"))) { // close the tab and then remove the report so that it is not // generated again during the following loadView() call @@ -700,7 +700,7 @@ void KReportsView::slotDelete(void) } } else - KMessageBox::information(this, TQString("<qt>")+i18n("Sorry, <b>%1</b> is a default report. You may not delete it.").tqarg(report.name())+TQString("</qt>"), i18n("Delete Report?")); + KMessageBox::information(this, TQString("<qt>")+i18n("Sorry, <b>%1</b> is a default report. You may not delete it.").arg(report.name())+TQString("</qt>"), i18n("Delete Report?")); } } @@ -1350,7 +1350,7 @@ void KReportsView::defaultReports(TQValueList<ReportGroup>& groups) list.back().setShowingRowTotals(true); list.back().setBudget("Any",true); // in case we're in January, we show the last year - if(TQDate::tqcurrentDate().month() == 1) { + if(TQDate::currentDate().month() == 1) { list.back().setDateFilter(MyMoneyTransactionFilter::lastYear); } 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..e23ba54 100644 --- a/kmymoney2/views/kscheduledview.cpp +++ b/kmymoney2/views/kscheduledview.cpp @@ -27,7 +27,7 @@ #include <tqtoolbutton.h> #include <tqcombobox.h> #include <tqtabwidget.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtimer.h> // ---------------------------------------------------------------------------- @@ -63,7 +63,7 @@ KScheduledView::KScheduledView(TQWidget *parent, const char *name ) : m_openLoans(true) { // create the searchline widget - // and insert it into the existing tqlayout + // and insert it into the existing layout m_searchWidget = new KListViewSearchLineWidget(m_qlistviewScheduled, m_listTab); m_listTabLayout->insertWidget(0, m_searchWidget); @@ -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/views/kscheduledviewdecl.ui b/kmymoney2/views/kscheduledviewdecl.ui index f101b52..925dc19 100644 --- a/kmymoney2/views/kscheduledviewdecl.ui +++ b/kmymoney2/views/kscheduledviewdecl.ui @@ -21,7 +21,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout2</cstring> + <cstring>layout2</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>80</width> <height>20</height> 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/kaccounttemplateselectordecl.cpp b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp index 75f3d16..c37a269 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.cpp +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.cpp @@ -21,7 +21,7 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); } #include <klistview.h> #include <tqgroupbox.h> #include <ktextedit.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -39,7 +39,7 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co m_groupList = new KListView( this, "m_groupList" ); m_groupList->addColumn( kmm_i18n( "Account Types" ) ); m_groupList->addColumn( kmm_i18n( "Description" ) ); - m_groupList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_groupList->sizePolicy().hasHeightForWidth() ) ); + m_groupList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 0, m_groupList->sizePolicy().hasHeightForWidth() ) ); m_groupList->setMinimumSize( TQSize( 0, 150 ) ); m_groupList->setProperty( "selectionMode", "Extended" ); m_groupList->setAllColumnsShowFocus( TRUE ); @@ -47,43 +47,43 @@ KAccountTemplateSelectorDecl::KAccountTemplateSelectorDecl( TQWidget* parent, co m_groupList->setFullWidth( TRUE ); KAccountTemplateSelectorDeclLayout->addWidget( m_groupList ); - tqlayout3 = new TQHBoxLayout( 0, 0, 6, "tqlayout3"); + layout3 = new TQHBoxLayout( 0, 0, 6, "layout3"); groupBox1 = new TQGroupBox( this, "groupBox1" ); - groupBox1->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, groupBox1->sizePolicy().hasHeightForWidth() ) ); + groupBox1->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 0, 2, groupBox1->sizePolicy().hasHeightForWidth() ) ); groupBox1->setColumnLayout(0, Qt::Vertical ); - groupBox1->tqlayout()->setSpacing( 6 ); - groupBox1->tqlayout()->setMargin( 11 ); - groupBox1Layout = new TQVBoxLayout( groupBox1->tqlayout() ); - groupBox1Layout->tqsetAlignment( TQt::AlignTop ); + groupBox1->layout()->setSpacing( 6 ); + groupBox1->layout()->setMargin( 11 ); + groupBox1Layout = new TQVBoxLayout( groupBox1->layout() ); + groupBox1Layout->setAlignment( TQt::AlignTop ); m_description = new KTextEdit( groupBox1, "m_description" ); - m_description->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_description->sizePolicy().hasHeightForWidth() ) ); + m_description->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_description->sizePolicy().hasHeightForWidth() ) ); m_description->setReadOnly( TRUE ); groupBox1Layout->addWidget( m_description ); - tqlayout3->addWidget( groupBox1 ); + layout3->addWidget( groupBox1 ); groupBox2 = new TQGroupBox( this, "groupBox2" ); - groupBox2->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 2, groupBox2->sizePolicy().hasHeightForWidth() ) ); + groupBox2->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)5, 1, 2, groupBox2->sizePolicy().hasHeightForWidth() ) ); groupBox2->setColumnLayout(0, Qt::Vertical ); - groupBox2->tqlayout()->setSpacing( 6 ); - groupBox2->tqlayout()->setMargin( 11 ); - groupBox2Layout = new TQVBoxLayout( groupBox2->tqlayout() ); - groupBox2Layout->tqsetAlignment( TQt::AlignTop ); + groupBox2->layout()->setSpacing( 6 ); + groupBox2->layout()->setMargin( 11 ); + groupBox2Layout = new TQVBoxLayout( groupBox2->layout() ); + groupBox2Layout->setAlignment( TQt::AlignTop ); m_accountList = new KListView( groupBox2, "m_accountList" ); m_accountList->addColumn( kmm_i18n( "Name" ) ); - m_accountList->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_accountList->sizePolicy().hasHeightForWidth() ) ); + m_accountList->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)7, (TQSizePolicy::SizeType)7, 0, 3, m_accountList->sizePolicy().hasHeightForWidth() ) ); m_accountList->setMinimumSize( TQSize( 0, 150 ) ); m_accountList->setProperty( "selectionMode", "NoSelection" ); m_accountList->setAllColumnsShowFocus( TRUE ); m_accountList->setRootIsDecorated( TRUE ); m_accountList->setFullWidth( TRUE ); groupBox2Layout->addWidget( m_accountList ); - tqlayout3->addWidget( groupBox2 ); - KAccountTemplateSelectorDeclLayout->addLayout( tqlayout3 ); + layout3->addWidget( groupBox2 ); + KAccountTemplateSelectorDeclLayout->addLayout( layout3 ); languageChange(); - resize( TQSize(546, 346).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(546, 346).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); } diff --git a/kmymoney2/widgets/kaccounttemplateselectordecl.ui b/kmymoney2/widgets/kaccounttemplateselectordecl.ui index deb37ab..cc5b9da 100644 --- a/kmymoney2/widgets/kaccounttemplateselectordecl.ui +++ b/kmymoney2/widgets/kaccounttemplateselectordecl.ui @@ -53,7 +53,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>150</height> @@ -74,7 +74,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -159,7 +159,7 @@ <verstretch>3</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>150</height> 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("<qt>")+i18n("You have entered budget values using a different base which would result in a monthly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a monthly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { m_amountMonthly->setValue(newValue); } } @@ -203,7 +203,7 @@ void KBudgetValues::slotChangePeriod(int id) newValue += m_field[i]->value(); } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a yearly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").tqarg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in a yearly budget of <b>%1</b>. Should this value be used to fill the monthly budget?").arg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { m_amountYearly->setValue(newValue); } } @@ -222,7 +222,7 @@ void KBudgetValues::slotChangePeriod(int id) } if(!newValue.isZero()) { - if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of <b>%1</b>. Should this value be used to fill the monthly budgets?").tqarg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { + if(KMessageBox::questionYesNo(this, TQString("<qt>")+i18n("You have entered budget values using a different base which would result in an individual monthly budget of <b>%1</b>. Should this value be used to fill the monthly budgets?").arg(newValue.formatMoney("", 2))+TQString("</qt>"), i18n("Auto assignment (caption)", "Auto assignment"), KStdGuiItem::yes(), KStdGuiItem::no(), "use_previous_budget_values") == KMessageBox::Yes) { for(int i=0; i < 12; ++i) m_field[i]->setValue(newValue); } diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.cpp b/kmymoney2/widgets/kbudgetvaluesdecl.cpp index 385cbfa..7bd47e6 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.cpp +++ b/kmymoney2/widgets/kbudgetvaluesdecl.cpp @@ -23,7 +23,7 @@ inline TQString kmm_i18n(const char* msg) { return i18n(msg); } #include <kpushbutton.h> #include <tqbuttongroup.h> #include <tqradiobutton.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtooltip.h> #include <tqwhatsthis.h> @@ -169,21 +169,21 @@ KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags KBudgetValuesDeclLayout->addWidget( m_firstItemStack, 0, 3 ); - tqlayout12 = new TQVBoxLayout( 0, 0, 6, "tqlayout12"); + layout12 = new TQVBoxLayout( 0, 0, 6, "layout12"); m_clearButton = new KPushButton( this, "m_clearButton" ); - tqlayout12->addWidget( m_clearButton ); + layout12->addWidget( m_clearButton ); spacer7 = new TQSpacerItem( 20, 21, TQSizePolicy::Minimum, TQSizePolicy::Expanding ); - tqlayout12->addItem( spacer7 ); + layout12->addItem( spacer7 ); - KBudgetValuesDeclLayout->addMultiCellLayout( tqlayout12, 0, 5, 1, 1 ); + KBudgetValuesDeclLayout->addMultiCellLayout( layout12, 0, 5, 1, 1 ); m_periodGroup = new TQButtonGroup( this, "m_periodGroup" ); m_periodGroup->setColumnLayout(0, Qt::Vertical ); - m_periodGroup->tqlayout()->setSpacing( 6 ); - m_periodGroup->tqlayout()->setMargin( 11 ); - m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->tqlayout() ); - m_periodGroupLayout->tqsetAlignment( TQt::AlignTop ); + m_periodGroup->layout()->setSpacing( 6 ); + m_periodGroup->layout()->setMargin( 11 ); + m_periodGroupLayout = new TQVBoxLayout( m_periodGroup->layout() ); + m_periodGroupLayout->setAlignment( TQt::AlignTop ); m_monthlyButton = new TQRadioButton( m_periodGroup, "m_monthlyButton" ); m_periodGroupLayout->addWidget( m_monthlyButton ); @@ -198,7 +198,7 @@ KBudgetValuesDecl::KBudgetValuesDecl( TQWidget* parent, const char* name, WFlags KBudgetValuesDeclLayout->addMultiCellWidget( m_periodGroup, 0, 5, 0, 0 ); languageChange(); - resize( TQSize(553, 188).expandedTo(tqminimumSizeHint()) ); + resize( TQSize(553, 188).expandedTo(minimumSizeHint()) ); clearWState( WState_Polished ); // tab order diff --git a/kmymoney2/widgets/kbudgetvaluesdecl.ui b/kmymoney2/widgets/kbudgetvaluesdecl.ui index 0eb9cb7..7f0ea54 100644 --- a/kmymoney2/widgets/kbudgetvaluesdecl.ui +++ b/kmymoney2/widgets/kbudgetvaluesdecl.ui @@ -282,7 +282,7 @@ </widget> <widget class="TQLayoutWidget" row="0" column="1" rowspan="6" colspan="1"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <vbox> <property name="name"> @@ -306,7 +306,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> @@ -360,7 +360,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kmymoney2/widgets/kguiutils.cpp b/kmymoney2/widgets/kguiutils.cpp index 1b17ac6..e8e8d3f 100644 --- a/kmymoney2/widgets/kguiutils.cpp +++ b/kmymoney2/widgets/kguiutils.cpp @@ -96,7 +96,7 @@ void kMandatoryFieldGroup::add(TQWidget *widget) void kMandatoryFieldGroup::remove(TQWidget *widget) { - widget->setPaletteBackgroundColor(widget->tqcolorGroup().background()); + widget->setPaletteBackgroundColor(widget->colorGroup().background()); widgets.remove(widget); changed(); } @@ -164,7 +164,7 @@ void kMandatoryFieldGroup::clear(void) { TQValueList<TQWidget *>::Iterator i; for (i = widgets.begin(); i != widgets.end(); ++i) - (*i)->setPaletteBackgroundColor((*i)->tqcolorGroup().background()); + (*i)->setPaletteBackgroundColor((*i)->colorGroup().background()); widgets.clear(); if (okButton) { okButton->setEnabled(true); diff --git a/kmymoney2/widgets/klistviewsearchline.cpp b/kmymoney2/widgets/klistviewsearchline.cpp index 8c01629..b2d554c 100644 --- a/kmymoney2/widgets/klistviewsearchline.cpp +++ b/kmymoney2/widgets/klistviewsearchline.cpp @@ -147,7 +147,7 @@ void KListViewSearchLine::updateSearch(const TQString &s) it.current() && !currentItem; ++it) { - if(d->listView->tqitemRect(it.current()).isValid()) + if(d->listView->itemRect(it.current()).isValid()) currentItem = it.current(); } } @@ -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..b28a39f 100644 --- a/kmymoney2/widgets/kmymoneyaccountselector.cpp +++ b/kmymoney2/widgets/kmymoneyaccountselector.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqlabel.h> #include <tqtimer.h> @@ -182,7 +182,7 @@ bool kMyMoneyAccountSelector::contains(const TQString& txt) const i18n("Security"); while((it_v = it.current()) != 0) { - TQRegExp exp(TQString("^(?:%1):%2$").tqarg(baseName).tqarg(TQRegExp::escape(txt))); + TQRegExp exp(TQString("^(?:%1):%2$").arg(baseName).arg(TQRegExp::escape(txt))); if(it_v->rtti() == 1) { KMyMoneyCheckListItem* it_c = dynamic_cast<KMyMoneyCheckListItem*>(it_v); if(exp.search(it_c->key(1, true)) != -1) { @@ -346,28 +346,28 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) TQListViewItem* after = 0; // create the favorite section first and sort it to the beginning - key = TQString("A%1").tqarg(i18n("Favorites")); + key = TQString("A%1").arg(i18n("Favorites")); m_favorites = selector->newItem(i18n("Favorites"), key); for(int mask = 0x01; mask != KMyMoneyUtils::last; mask <<= 1) { TQListViewItem* item = 0; if((typeMask & mask & KMyMoneyUtils::asset) != 0) { ++m_count; - key = TQString("B%1").tqarg(i18n("Asset")); + key = TQString("B%1").arg(i18n("Asset")); item = selector->newItem(i18n("Asset accounts"), key); list = m_file->asset().accountList(); } if((typeMask & mask & KMyMoneyUtils::liability) != 0) { ++m_count; - key = TQString("C%1").tqarg(i18n("Liability")); + key = TQString("C%1").arg(i18n("Liability")); item = selector->newItem(i18n("Liability accounts"), key); list = m_file->liability().accountList(); } if((typeMask & mask & KMyMoneyUtils::income) != 0) { ++m_count; - key = TQString("D%1").tqarg(i18n("Income")); + key = TQString("D%1").arg(i18n("Income")); item = selector->newItem(i18n("Income categories"), key); list = m_file->income().accountList(); if(selector->selectionMode() == TQListView::Multi) { @@ -377,7 +377,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) if((typeMask & mask & KMyMoneyUtils::expense) != 0) { ++m_count; - key = TQString("E%1").tqarg(i18n("Expense")); + key = TQString("E%1").arg(i18n("Expense")); item = selector->newItem(i18n("Expense categories"), key); list = m_file->expense().accountList(); if(selector->selectionMode() == TQListView::Multi) { @@ -387,7 +387,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector) if((typeMask & mask & KMyMoneyUtils::equity) != 0) { ++m_count; - key = TQString("F%1").tqarg(i18n("Equity")); + key = TQString("F%1").arg(i18n("Equity")); item = selector->newItem(i18n("Equity accounts"), key); list = m_file->equity().accountList(); } @@ -470,7 +470,7 @@ int AccountSet::load(kMyMoneyAccountSelector* selector, const TQString& baseName continue; TQString tmpKey; // the first character must be preset. Since we don't know any sort order here, we just use A - tmpKey = TQString("A%1%2%3").tqarg(baseName, MyMoneyFile::AccountSeperator, acc.name()); + tmpKey = TQString("A%1%2%3").arg(baseName, MyMoneyFile::AccountSeperator, acc.name()); selector->newItem(item, acc.name(), tmpKey, acc.id()); ++m_count; ++count; 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 48ecd28..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); } @@ -238,7 +238,7 @@ bool KMyMoneyAccountTreeBase::acceptDrag(TQDropEvent* event) const if((rc = (acceptDrops()) && (event->source() == viewport()))) { rc = false; KMyMoneyAccountTreeBaseItem* to = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(itemAt( contentsToViewport(event->pos()) )); - TQString fromId(event->tqencodedData("text/plain")); + TQString fromId(event->encodedData("text/plain")); const KMyMoneyAccountTreeBaseItem* from = findItem(fromId); // we can only move accounts around @@ -296,7 +296,7 @@ void KMyMoneyAccountTreeBase::slotObjectDropped(TQDropEvent* event, TQListViewIt KMyMoneyAccountTreeBaseItem* newParent = dynamic_cast<KMyMoneyAccountTreeBaseItem*>(m_dropItem); if(newParent) { - TQString fromId(event->tqencodedData("text/plain")); + TQString fromId(event->encodedData("text/plain")); const KMyMoneyAccountTreeBaseItem* from = findItem(fromId); // we can only move accounts around @@ -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); } } @@ -514,7 +514,7 @@ void KMyMoneyAccountTreeBase::viewportPaintEvent(TQPaintEvent* e) TQPainter painter(viewport()); // This is where we actually draw the drop-highlighter - tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, tqcolorGroup(), + tqstyle().tqdrawPrimitive(TQStyle::PE_FocusRect, &painter, m_lastDropHighlighter, colorGroup(), TQStyle::Style_FocusAtBorder); } } @@ -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..25113de 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreebase.h +++ b/kmymoney2/widgets/kmymoneyaccounttreebase.h @@ -74,10 +74,10 @@ public: void emitValueChanged(void) { emit valueChanged(); }; /** - * restores the tqlayout from the config file + * restores the layout from the config file * @param group the group to be used from the config file. * At destruction time, we will use this group name to save - * the tqlayout. + * the layout. */ void restoreLayout(const TQString& group); @@ -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 950200e..d7584c5 100644 --- a/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp +++ b/kmymoney2/widgets/kmymoneyaccounttreeforecast.cpp @@ -57,14 +57,14 @@ void KMyMoneyAccountTreeForecast::showSummary(MyMoneyForecast& forecast) addColumn(i18n("Current"), -1); //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle - if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { - daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); + if(TQDate::currentDate() < forecast.beginForecastDate()) { + daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate()); } else { daysToBeginDay = forecast.accountsCycle(); } 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); } @@ -84,7 +84,7 @@ void KMyMoneyAccountTreeForecast::showDetailed(MyMoneyForecast& forecast) addColumn(i18n("Current"), -1); for(int i = 1; i <= forecast.forecastDays(); ++i) { - TQDate forecastDate = TQDate::tqcurrentDate().addDays(i); + TQDate forecastDate = TQDate::currentDate().addDays(i); TQString columnName = KGlobal::locale()->formatDate(forecastDate, true); addColumn(columnName, -1); } @@ -103,22 +103,22 @@ void KMyMoneyAccountTreeForecast::showAdvanced(MyMoneyForecast& forecast) int daysToBeginDay; //if beginning of forecast is today, set the begin day to next cycle to avoid repeating the first cycle - if(TQDate::tqcurrentDate() < forecast.beginForecastDate()) { - daysToBeginDay = TQDate::tqcurrentDate().daysTo(forecast.beginForecastDate()); + if(TQDate::currentDate() < forecast.beginForecastDate()) { + daysToBeginDay = TQDate::currentDate().daysTo(forecast.beginForecastDate()); } else { daysToBeginDay = forecast.accountsCycle(); } //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); @@ -205,8 +205,8 @@ void KMyMoneyAccountTreeForecastItem::updateSummary() MyMoneyFile* file = MyMoneyFile::instance(); int daysToBeginDay; - if(TQDate::tqcurrentDate() < m_forecast.beginForecastDate()) { - daysToBeginDay = TQDate::tqcurrentDate().daysTo(m_forecast.beginForecastDate()); + if(TQDate::currentDate() < m_forecast.beginForecastDate()) { + daysToBeginDay = TQDate::currentDate().daysTo(m_forecast.beginForecastDate()); } else { daysToBeginDay = m_forecast.accountsCycle(); } @@ -221,7 +221,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary() //add current balance column - TQDate summaryDate = TQDate::tqcurrentDate(); + TQDate summaryDate = TQDate::currentDate(); amountMM = m_forecast.forecastBalance(m_account, summaryDate); //calculate the balance in base currency for the total row @@ -231,7 +231,7 @@ void KMyMoneyAccountTreeForecastItem::updateSummary() it_c++; //iterate through all other columns - for(TQDate summaryDate = TQDate::tqcurrentDate().addDays(daysToBeginDay); summaryDate <= m_forecast.forecastEndDate();summaryDate = summaryDate.addDays(m_forecast.accountsCycle()), ++it_c) { + for(TQDate summaryDate = TQDate::currentDate().addDays(daysToBeginDay); summaryDate <= m_forecast.forecastEndDate();summaryDate = summaryDate.addDays(m_forecast.accountsCycle()), ++it_c) { amountMM = m_forecast.forecastBalance(m_account, summaryDate); //calculate the balance in base currency for the total row @@ -263,7 +263,7 @@ void KMyMoneyAccountTreeForecastItem::updateDetailed() int it_c = 1; // iterator for the columns of the listview - for(TQDate forecastDate = TQDate::tqcurrentDate(); forecastDate <= m_forecast.forecastEndDate(); ++it_c, forecastDate = forecastDate.addDays(1)) { + for(TQDate forecastDate = TQDate::currentDate(); forecastDate <= m_forecast.forecastEndDate(); ++it_c, forecastDate = forecastDate.addDays(1)) { MyMoneyMoney amountMM = m_forecast.forecastBalance(m_account, forecastDate); //calculate the balance in base currency for the total row @@ -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 a3e3a5f..d77287b 100644 --- a/kmymoney2/widgets/kmymoneybriefschedule.cpp +++ b/kmymoney2/widgets/kmymoneybriefschedule.cpp @@ -25,7 +25,7 @@ #include <tqlabel.h> #include <tqlineedit.h> -#include <tqtextedit.h> +#include <textedit.h> #include <tqtoolbutton.h> // ---------------------------------------------------------------------------- @@ -47,8 +47,8 @@ KMyMoneyBriefSchedule::KMyMoneyBriefSchedule(TQWidget *parent, const char *name : kScheduleBriefWidget(parent,name, WStyle_Customize | WStyle_NoBorder) { KIconLoader *ic = KGlobal::iconLoader(); - m_nextButton->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); - m_prevButton->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); + m_nextButton->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); + m_prevButton->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); connect(m_prevButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotPrevClicked())); connect(m_nextButton, TQT_SIGNAL(clicked()), this, TQT_SLOT(slotNextClicked())); @@ -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,18 +107,18 @@ 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::tqcurrentDate()) + if (m_date < TQDate::currentDate()) { if (sched.isOverdue()) { @@ -129,13 +129,13 @@ void KMyMoneyBriefSchedule::loadSchedule() if (m_date.isValid()) startD = m_date; - int days = startD.daysTo(TQDate::tqcurrentDate()); - int transactions = sched.paymentDates(startD, TQDate::tqcurrentDate()).count(); + int days = startD.daysTo(TQDate::currentDate()); + int transactions = sched.paymentDates(startD, TQDate::currentDate()).count(); text += "<br><font color=red>"; text += i18n("%1 days overdue (%2 occurences).") - .tqarg(TQString::number(days)) - .tqarg(TQString::number(transactions)); + .arg(TQString::number(days)) + .arg(TQString::number(transactions)); text += "</color>"; } } diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index 1a117fa..47d45ed 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -50,7 +50,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) display->setBackgroundColor(TQColor("#BDFFB4")); display->setFrameStyle( TQFrame::Panel | TQFrame::Sunken ); - display->tqsetAlignment(TQt::AlignRight | TQt::AlignVCenter); + display->setAlignment(TQt::AlignRight | TQt::AlignVCenter); grid->addMultiCellWidget(display, 0, 0, 0, 4); buttons[0] = new KPushButton("0", this); @@ -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/kmymoneycalculator.h b/kmymoney2/widgets/kmymoneycalculator.h index c015da3..5e6d1ad 100644 --- a/kmymoney2/widgets/kmymoneycalculator.h +++ b/kmymoney2/widgets/kmymoneycalculator.h @@ -28,7 +28,7 @@ #include <tqwidget.h> #include <tqframe.h> -#include <tqlayout.h> +#include <layout.h> #include <tqgrid.h> #include <tqlcdnumber.h> #include <tqlineedit.h> diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 664548d..61b91fd 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -138,10 +138,10 @@ void kMyMoneyCalendar::init( const TQDate &dt ) setFontSize(10); line->setValidator(val); line->installEventFilter( this ); - yearForward->setPixmap(BarIcon(TQString::tqfromLatin1("2rightarrow"))); - yearBackward->setPixmap(BarIcon(TQString::tqfromLatin1("2leftarrow"))); - monthForward->setPixmap(BarIcon(TQString::tqfromLatin1("1rightarrow"))); - monthBackward->setPixmap(BarIcon(TQString::tqfromLatin1("1leftarrow"))); + yearForward->setPixmap(BarIcon(TQString::fromLatin1("2rightarrow"))); + yearBackward->setPixmap(BarIcon(TQString::fromLatin1("2leftarrow"))); + monthForward->setPixmap(BarIcon(TQString::fromLatin1("1rightarrow"))); + monthBackward->setPixmap(BarIcon(TQString::fromLatin1("1leftarrow"))); setDate(dt); // set button texts connect(table, TQT_SIGNAL(dateChanged(TQDate)), TQT_SLOT(dateChangedSlot(TQDate))); connect(table, TQT_SIGNAL(tableClicked()), TQT_SLOT(tableClickedSlot())); @@ -200,7 +200,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*) // ----- calculate button row height: for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) { // closeButton may be 0L - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); buttonHeight=TQMAX(buttonHeight, sizes[count].height()); } else @@ -211,7 +211,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*) for(count=0; count<NoOfButtons; ++count) { if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin))); + sizes[count].setWidth(TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin))); } } // ----- place the buttons: @@ -245,7 +245,7 @@ kMyMoneyCalendar::resizeEvent(TQResizeEvent*) } // ----- place the line edit for direct input: - sizes[0]=line->tqsizeHint(); + sizes[0]=line->sizeHint(); int week_width=d->selectWeek->fontMetrics().width(i18n("Week XX"))+((d->closeButton != 0L) ? 50 : 20); line->setGeometry(0, height()-sizes[0].height(), width()-week_width, sizes[0].height()); d->selectWeek->setGeometry(width()-week_width, height()-sizes[0].height(), week_width, sizes[0].height()); @@ -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); @@ -341,7 +341,7 @@ kMyMoneyCalendar::selectWeekClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalWeekSelector* picker = new KDateInternalWeekSelector(/*fontsize, */popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -380,7 +380,7 @@ kMyMoneyCalendar::selectMonthClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalMonthPicker* picker = new KDateInternalMonthPicker(/*fontsize, */popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); picker->setFocus(); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); @@ -412,7 +412,7 @@ kMyMoneyCalendar::selectYearClicked() KPopupFrame* popup = new KPopupFrame(this); KDateInternalYearSelector* picker = new KDateInternalYearSelector(fontsize, popup); // ----- - picker->resize(picker->tqsizeHint()); + picker->resize(picker->sizeHint()); popup->setMainWidget(picker); connect(picker, TQT_SIGNAL(closeMe(int)), popup, TQT_SLOT(close(int))); picker->setFocus(); @@ -470,9 +470,9 @@ kMyMoneyCalendar::lineEnterPressed() } TQSize -kMyMoneyCalendar::tqsizeHint() const +kMyMoneyCalendar::sizeHint() const { - TQSize tableSize=table->tqsizeHint(); + TQSize tableSize=table->sizeHint(); TQWidget *buttons[]={ styleControl, yearBackward, @@ -492,14 +492,14 @@ kMyMoneyCalendar::tqsizeHint() const for(count=0; count<NoOfButtons; ++count) { if ( buttons[count] ) - sizes[count]=buttons[count]->tqsizeHint(); + sizes[count]=buttons[count]->sizeHint(); else sizes[count] = TQSize(0,0); if(buttons[count]==selectMonth) { TQSize metricBound = tqstyle().tqsizeFromContents(TQStyle::CT_ToolButton, selectMonth, maxMonthRect); - cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().tqpixelMetric(TQStyle::PM_ButtonMargin)); + cx+=TQMAX(metricBound.width(), maxMonthRect.width()+2*TQApplication::tqstyle().pixelMetric(TQStyle::PM_ButtonMargin)); } else { cx+=sizes[count].width(); } @@ -508,7 +508,7 @@ kMyMoneyCalendar::tqsizeHint() const // ----- calculate width hint: cx=TQMAX(cx, tableSize.width()); // line edit ignored // ----- calculate height hint: - cy+=tableSize.height()+line->tqsizeHint().height(); + cy+=tableSize.height()+line->sizeHint().height(); return TQSize(cx, cy); } @@ -540,7 +540,7 @@ kMyMoneyCalendar::setFontSize(int s) } TQFontMetrics metrics(selectMonth->fontMetrics()); for(int i=1; i <= 12; ++i) - { // maxMonthRect is used by tqsizeHint() + { // maxMonthRect is used by sizeHint() r=metrics.boundingRect(MONTH_NAME(i, 2000, false)); maxMonthRect.setWidth(TQMAX(r.width(), maxMonthRect.width())); maxMonthRect.setHeight(TQMAX(r.height(), maxMonthRect.height())); @@ -560,7 +560,7 @@ kMyMoneyCalendar::setCloseButton( bool enable ) TQToolTip::add(d->closeButton, i18n("Close")); d->closeButton->setPixmap( SmallIcon("remove") ); connect( d->closeButton, TQT_SIGNAL( clicked() ), - tqtopLevelWidget(), TQT_SLOT( close() ) ); + topLevelWidget(), TQT_SLOT( close() ) ); } else { delete d->closeButton; diff --git a/kmymoney2/widgets/kmymoneycalendar.h b/kmymoney2/widgets/kmymoneycalendar.h index 4b6f32d..a96a7c8 100644 --- a/kmymoney2/widgets/kmymoneycalendar.h +++ b/kmymoney2/widgets/kmymoneycalendar.h @@ -105,7 +105,7 @@ public: * size hint, try adding 28 to each of the reported numbers of * pixels. **/ - TQSize tqsizeHint() const; + TQSize sizeHint() const; /** * Sets the date. @@ -144,7 +144,7 @@ public: /** * By calling this method with @p enable = true, KDatePicker will show * a little close-button in the upper button-row. Clicking the - * close-button will cause the KDatePicker's tqtopLevelWidget()'s close() + * close-button will cause the KDatePicker's topLevelWidget()'s close() * method being called. This is mostly useful for toplevel datepickers * without a window manager decoration. * @see #hasCloseButton diff --git a/kmymoney2/widgets/kmymoneycategory.cpp b/kmymoney2/widgets/kmymoneycategory.cpp index 3e74bd3..1b33294 100644 --- a/kmymoney2/widgets/kmymoneycategory.cpp +++ b/kmymoney2/widgets/kmymoneycategory.cpp @@ -20,8 +20,8 @@ #include <tqrect.h> #include <tqpainter.h> -#include <tqpalette.h> -#include <tqlayout.h> +#include <palette.h> +#include <layout.h> #include <tqtimer.h> // ---------------------------------------------------------------------------- @@ -60,7 +60,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl if(splitButton) { d->frame = new TQFrame(0); d->frame->setFocusProxy(this); - TQHBoxLayout* tqlayout = new TQHBoxLayout(d->frame); + TQHBoxLayout* layout = new TQHBoxLayout(d->frame); // make sure not to use our own overridden version of reparent() here KMyMoneyCombo::reparent(d->frame, getWFlags() & ~WType_Mask, TQPoint(0, 0), true); if(parent) @@ -72,8 +72,8 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl KIcon::SizeSmall)), "", ""); d->splitButton = new KPushButton(splitButtonItem, d->frame, "splitButton"); - tqlayout->addWidget(this, 5); - tqlayout->addWidget(d->splitButton); + layout->addWidget(this, 5); + layout->addWidget(d->splitButton); } m_completion = new kMyMoneyAccountCompletion(this, 0); @@ -83,7 +83,7 @@ KMyMoneyCategory::KMyMoneyCategory(TQWidget* parent, const char * name, bool spl KMyMoneyCategory::~KMyMoneyCategory() { - // make sure to wipe out the frame, button and tqlayout + // make sure to wipe out the frame, button and layout if(d->frame && !d->frame->parentWidget()) d->frame->deleteLater(); diff --git a/kmymoney2/widgets/kmymoneycategory.h b/kmymoney2/widgets/kmymoneycategory.h index fa2975c..34b5d14 100644 --- a/kmymoney2/widgets/kmymoneycategory.h +++ b/kmymoney2/widgets/kmymoneycategory.h @@ -79,7 +79,7 @@ public: * @code * KMyMoneyCategory* category = new KMyMoneyCategory; * category->reparent(newParent); - * tqlayout->addWidget(category); + * layout->addWidget(category); * table->setCellWidget(category); * @endcode * @@ -88,7 +88,7 @@ public: * @code * KMyMoneyCategory* category = new KMyMoneyCategory(0, 0, true); * category->reparent(newParent); - * tqlayout->addWidget(category->parentWidget()); + * layout->addWidget(category->parentWidget()); * table->setCellWidget(category->parentWidget()); * @endcode */ 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 0d8ce4d..37f4517 100644 --- a/kmymoney2/widgets/kmymoneycombo.cpp +++ b/kmymoney2/widgets/kmymoneycombo.cpp @@ -131,12 +131,12 @@ void KMyMoneyCombo::paintEvent(TQPaintEvent* ev) // is that length 1 is the blank case so no need to do painting if(str.length() > 1) { TQPainter p( this ); - const TQColorGroup & g = tqcolorGroup(); + const TQColorGroup & g = colorGroup(); p.setPen(g.text()); TQRect re = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxEditField ); - re = TQStyle::tqvisualRect(re, this); + re = TQStyle::visualRect(re, this); p.setClipRect( re ); p.save(); p.setFont(font()); @@ -182,7 +182,7 @@ bool KMyMoneyCombo::isInArrowArea(const TQPoint& pos) const { TQRect arrowRect = tqstyle().querySubControlMetrics( TQStyle::CC_ComboBox, this, TQStyle::SC_ComboBoxArrow); - arrowRect = TQStyle::tqvisualRect(arrowRect, this); + arrowRect = TQStyle::visualRect(arrowRect, this); // Correction for motif style, where arrow is smaller // and thus has a rect that doesn't fit the button. @@ -267,7 +267,7 @@ void KMyMoneyCombo::focusOutEvent(TQFocusEvent* e) m_id = TQString(); if(!id.isEmpty()) emit itemSelected(m_id); - tqrepaint(); + repaint(); } m_inFocusOutEvent = false; } @@ -305,9 +305,9 @@ void KMyMoneyCombo::setSelectedItem(const TQString& id) update(); } -TQSize KMyMoneyCombo::tqsizeHint() const +TQSize KMyMoneyCombo::sizeHint() const { - return KComboBox::tqsizeHint(); + return KComboBox::sizeHint(); // I wanted to use the code below to adjust the size of the combo box // according to the largest item in the selector list. Apparently that @@ -325,11 +325,11 @@ TQSize KMyMoneyCombo::tqsizeHint() const if ( w > maxW ) maxW = w; - TQSize tqsizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, + TQSize sizeHint = (style().sizeFromContents(TQStyle::CT_ComboBox, this, TQSize(maxW, maxH)). expandedTo(TQApplication::globalStrut())); - return tqsizeHint; + return sizeHint; #endif } diff --git a/kmymoney2/widgets/kmymoneycombo.h b/kmymoney2/widgets/kmymoneycombo.h index 32f4ec5..7581002 100644 --- a/kmymoney2/widgets/kmymoneycombo.h +++ b/kmymoney2/widgets/kmymoneycombo.h @@ -143,7 +143,7 @@ public: /** * Overridden to support our own completion box */ - TQSize tqsizeHint() const; + TQSize sizeHint() const; protected slots: virtual void slotItemSelected(const TQString& id); diff --git a/kmymoney2/widgets/kmymoneycompletion.cpp b/kmymoney2/widgets/kmymoneycompletion.cpp index fbcc8a5..41fa082 100644 --- a/kmymoney2/widgets/kmymoneycompletion.cpp +++ b/kmymoney2/widgets/kmymoneycompletion.cpp @@ -76,7 +76,7 @@ void kMyMoneyCompletion::adjustSize(void) void kMyMoneyCompletion::adjustSize(const int count) { - int w = m_widget->tqsizeHint().width(); + int w = m_widget->sizeHint().width(); if(m_parent && w < m_parent->width()) w = m_parent->width(); 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 37db28b..59c838c 100644 --- a/kmymoney2/widgets/kmymoneydateinput.cpp +++ b/kmymoney2/widgets/kmymoneydateinput.cpp @@ -24,7 +24,7 @@ #include <tqvalidator.h> #include <tqtimer.h> #include <tqstyle.h> -#include <tqlayout.h> +#include <layout.h> #include <tqapplication.h> #include <tqdesktopwidget.h> #include <tqpixmap.h> @@ -72,12 +72,12 @@ bool KMyMoneyDateEdit::event(TQEvent* e) kMyMoneyDateInput::kMyMoneyDateInput(TQWidget *parent, const char *name, TQt::AlignmentFlags flags) : TQHBox(parent,name) { - m_qttqalignment = flags; - m_date = TQDate::tqcurrentDate(); + m_qtalignment = flags; + m_date = TQDate::currentDate(); dateEdit = new KMyMoneyDateEdit(m_date, this, "dateEdit"); setFocusProxy(dateEdit); - tqfocusWidget()->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events + focusWidget()->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events dateEdit->installEventFilter(this); // To get dateEdit's FocusIn/Out and some KeyPress events m_datePopup = new KPassivePopup(dateEdit, "datePopup"); @@ -165,13 +165,13 @@ void kMyMoneyDateInput::show(void) void kMyMoneyDateInput::fixSize(void) { - // According to a hint in the documentation of KDatePicker::tqsizeHint() + // According to a hint in the documentation of KDatePicker::sizeHint() // 28 pixels should be added in each direction to obtain a better // display of the month button. I decided, (22,14) is good // enough and save some space on the screen (ipwizard) - m_dateFrame->setFixedSize(m_datePicker->tqsizeHint() + TQSize(22, 14)); + m_dateFrame->setFixedSize(m_datePicker->sizeHint() + TQSize(22, 14)); - dateEdit->setMinimumWidth(dateEdit->tqminimumSizeHint().width() + 6); + dateEdit->setMinimumWidth(dateEdit->minimumSizeHint().width() + 6); } kMyMoneyDateInput::~kMyMoneyDateInput() @@ -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); @@ -217,7 +217,7 @@ void kMyMoneyDateInput::toggleDatePicker() } else { - m_datePicker->setDate(TQDate::tqcurrentDate()); + m_datePicker->setDate(TQDate::currentDate()); } m_dateFrame->show(); } @@ -255,14 +255,14 @@ void kMyMoneyDateInput::keyPressEvent(TQKeyEvent * k) default: if(today.contains(KKey(k)) || k->key() == Key_T) { - slotDateChosen(TQDate::tqcurrentDate()); + slotDateChosen(TQDate::currentDate()); } break; } } /** - * This function receives all events that are sent to tqfocusWidget(). + * This function receives all events that are sent to focusWidget(). * Some KeyPress events are intercepted and passed to keyPressEvent. * Otherwise they would be consumed by TQDateEdit. */ @@ -337,7 +337,7 @@ void kMyMoneyDateInput::resetDate(void) setDate(m_prevDate); } -TQWidget* kMyMoneyDateInput::tqfocusWidget(void) const +TQWidget* kMyMoneyDateInput::focusWidget(void) const { TQWidget* w = dateEdit; while(w->focusProxy()) diff --git a/kmymoney2/widgets/kmymoneydateinput.h b/kmymoney2/widgets/kmymoneydateinput.h index 2b72936..d3c3f33 100644 --- a/kmymoney2/widgets/kmymoneydateinput.h +++ b/kmymoney2/widgets/kmymoneydateinput.h @@ -77,7 +77,7 @@ public: void setDate(TQDate date); void loadDate(const TQDate& date); void resetDate(void); - TQWidget* tqfocusWidget(void) const; + TQWidget* focusWidget(void) const; virtual void setRange(const TQDate & min, const TQDate & max) { dateEdit->setRange(min, max); } void markAsBadDate(bool bad = false, const TQColor& = TQColor()); @@ -98,7 +98,7 @@ protected: void keyPressEvent(TQKeyEvent * k); void resizeEvent(TQResizeEvent*); - /** To intercept events sent to tqfocusWidget() */ + /** To intercept events sent to focusWidget() */ bool eventFilter(TQObject *o, TQEvent *e); protected slots: @@ -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 ccff3c6..37d1311 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -80,7 +80,7 @@ kMyMoneyDateTbl::kMyMoneyDateTbl(TQWidget *parent, TQDate date_, const char* nam if(!date_.isValid()) { kdDebug() << "kMyMoneyDateTbl ctor: WARNING: Given date is invalid, using current date." << endl; - date_=TQDate::tqcurrentDate(); + date_=TQDate::currentDate(); } setFocusPolicy( TQ_StrongFocus ); @@ -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); @@ -307,7 +307,7 @@ kMyMoneyDateTbl::keyPressEvent( TQKeyEvent *e ) return; } if ( e->key() == TQt::Key_N ) { - setDate(TQDate::tqcurrentDate()); + setDate(TQDate::currentDate()); return; } @@ -352,7 +352,7 @@ kMyMoneyDateTbl::setFontSize(int size) } // ----- compare with a real wide number and add some space: - rect=metrics.boundingRect(TQString::tqfromLatin1("88")); + rect=metrics.boundingRect(TQString::fromLatin1("88")); maxCell.setWidth(TQMAX(maxCell.width()+2, rect.width())); maxCell.setHeight(TQMAX(maxCell.height()+4, rect.height())); } @@ -517,14 +517,14 @@ void kMyMoneyDateTbl::focusOutEvent( TQFocusEvent *e ) } TQSize -kMyMoneyDateTbl::tqsizeHint() const +kMyMoneyDateTbl::sizeHint() const { if (maxCell.height()>0 && maxCell.width()>0) { return TQSize(maxCell.width()*numCols()+2*frameWidth(), (maxCell.height()+2)*numRows()+2*frameWidth()); } else { - kdDebug() << "kMyMoneyDateTbl::tqsizeHint: obscure failure - " << endl; + kdDebug() << "kMyMoneyDateTbl::sizeHint: obscure failure - " << endl; return TQSize(-1, -1); } } diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index 96e57ee..7de402d 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -75,16 +75,16 @@ public: * The constructor. */ kMyMoneyDateTbl(TQWidget *parent=0, - TQDate date=TQDate::tqcurrentDate(), + TQDate date=TQDate::currentDate(), const char* name=0, WFlags f=0); /** * Returns a recommended size for the widget. * To save some time, the size of the largest used cell content is * calculated in each paintCell() call, since all calculations have * to be done there anyway. The size is stored in maxCell. The - * tqsizeHint() simply returns a multiple of maxCell. + * sizeHint() simply returns a multiple of maxCell. */ - virtual TQSize tqsizeHint() const; + virtual TQSize sizeHint() const; /** * Set the font size of the date table. */ diff --git a/kmymoney2/widgets/kmymoneyedit.cpp b/kmymoney2/widgets/kmymoneyedit.cpp index 2cbb6b3..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 @@ -211,7 +211,7 @@ void kMyMoneyEdit::init(void) // Yes, just a simple double validator ! kMyMoneyMoneyValidator *validator = new kMyMoneyMoneyValidator(TQT_TQOBJECT(this)); m_edit->setValidator(validator); - m_edit->tqsetAlignment(AlignRight | AlignVCenter); + m_edit->setAlignment(AlignRight | AlignVCenter); m_calculatorFrame = new TQVBox(this, 0, WType_Popup); @@ -223,15 +223,15 @@ void kMyMoneyEdit::init(void) m_calculatorFrame->hide(); m_calcButton = new KPushButton(TQIconSet(TQPixmap(KGlobal::iconLoader()->iconPath("kcalc", -KIcon::SizeSmall))), TQString(""), this); - m_calcButton->setFixedWidth( m_calcButton->tqsizeHint().width() ); - m_calcButton->setFixedHeight(m_edit->tqsizeHint().height()); + m_calcButton->setFixedWidth( m_calcButton->sizeHint().width() ); + m_calcButton->setFixedHeight(m_edit->sizeHint().height()); m_calcButton->setFocusProxy(m_edit); TQPixmap pixmap; pixmap.loadFromData(resetButtonImage, sizeof(resetButtonImage), "PNG", 0); m_resetButton = new KPushButton(TQIconSet(pixmap), TQString(""), this); - m_resetButton->setFixedWidth( m_resetButton->tqsizeHint().width() ); - m_resetButton->setFixedHeight(m_edit->tqsizeHint().height()); + m_resetButton->setFixedWidth( m_resetButton->sizeHint().width() ); + m_resetButton->setFixedHeight(m_edit->sizeHint().height()); m_resetButton->setEnabled(false); m_resetButton->setFocusProxy(m_edit); @@ -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(); @@ -496,7 +496,7 @@ void kMyMoneyEdit::slotCalculatorResult(void) } } -TQWidget* kMyMoneyEdit::tqfocusWidget(void) const +TQWidget* kMyMoneyEdit::focusWidget(void) const { TQWidget* w = m_edit; while(w->focusProxy()) diff --git a/kmymoney2/widgets/kmymoneyedit.h b/kmymoney2/widgets/kmymoneyedit.h index 3aaacd1..2aeea47 100644 --- a/kmymoney2/widgets/kmymoneyedit.h +++ b/kmymoney2/widgets/kmymoneyedit.h @@ -184,7 +184,7 @@ public: */ int precision(void) { return m_prec; }; - TQWidget* tqfocusWidget(void) const; + TQWidget* focusWidget(void) const; /** * This method allows to modify the behavior of the widget diff --git a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp index 75f3491..f9e5c6d 100644 --- a/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneyforecastlistviewitem.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqpalette.h> +#include <palette.h> #include <tqpen.h> #include <tqcolor.h> #include <tqpainter.h> @@ -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 fd8efbc..359e04c 100644 --- a/kmymoney2/widgets/kmymoneygpgconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneygpgconfigdecl.ui @@ -53,13 +53,13 @@ The <i>Recovery encryption</i> group is only accessible, if the nece <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <hbox> <property name="name"> @@ -109,7 +109,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -133,7 +133,7 @@ The <i>Recovery encryption</i> group is only accessible, if the nece <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -168,7 +168,7 @@ This mechanism is provided for the case that you have lost your key and cannot a <property name="textFormat"> <enum>RichText</enum> </property> - <property name="tqalignment"> + <property name="alignment"> <set>WordBreak|AlignTop</set> </property> </widget> @@ -184,7 +184,7 @@ This mechanism is provided for the case that you have lost your key and cannot a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>16</height> diff --git a/kmymoney2/widgets/kmymoneylineedit.cpp b/kmymoney2/widgets/kmymoneylineedit.cpp index 2250c30..254d400 100644 --- a/kmymoney2/widgets/kmymoneylineedit.cpp +++ b/kmymoney2/widgets/kmymoneylineedit.cpp @@ -22,7 +22,7 @@ #include <tqrect.h> #include <tqpainter.h> -#include <tqpalette.h> +#include <palette.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -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) { - tqsetAlignment(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) @@ -141,7 +141,7 @@ void kMyMoneyLineEdit::drawContents( TQPainter *p) f.setItalic(true); f.setWeight(TQFont::Light); p->setFont(f); - p->setPen(tqpalette().disabled().text()); + p->setPen(palette().disabled().text()); p->drawText(topLeft, m_hint); diff --git a/kmymoney2/widgets/kmymoneylineedit.h b/kmymoney2/widgets/kmymoneylineedit.h index e97205d..f0331f6 100644 --- a/kmymoney2/widgets/kmymoneylineedit.h +++ b/kmymoney2/widgets/kmymoneylineedit.h @@ -51,11 +51,11 @@ public: * @param w pointer to parent * @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. + * value and does not follow the keyboard layout (default: @p false) + * @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(); /** @@ -91,7 +91,7 @@ protected: * out the currently selected monetary decimal symbol instead of the * key defined by the keymap. * - * Example: If you have set the keymap (keyboard tqlayout) as English, then + * Example: If you have set the keymap (keyboard layout) as English, then * the numeric keypad will send a period but if you have set the keymap to * be German, the same key will send a comma. * @@ -104,7 +104,7 @@ protected: * out the currently selected monetary decimal symbol instead of the * key defined by the keymap. * - * Example: If you have set the keymap (keyboard tqlayout) as English, then + * Example: If you have set the keymap (keyboard layout) as English, then * the numeric keypad will send a period but if you have set the keymap to * be German, the same key will send a comma. * diff --git a/kmymoney2/widgets/kmymoneylistviewitem.cpp b/kmymoney2/widgets/kmymoneylistviewitem.cpp index 2ed4377..492ec9d 100644 --- a/kmymoney2/widgets/kmymoneylistviewitem.cpp +++ b/kmymoney2/widgets/kmymoneylistviewitem.cpp @@ -23,7 +23,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqpalette.h> +#include <palette.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -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/kmymoneyonlinequoteconfigdecl.ui b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui index 2392f80..88f95f7 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfigdecl.ui @@ -12,7 +12,7 @@ <height>487</height> </rect> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -71,7 +71,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -174,7 +174,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout15</cstring> + <cstring>layout15</cstring> </property> <hbox> <property name="name"> @@ -206,7 +206,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>240</width> <height>20</height> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui index 4a84ee7..a023c37 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab1decl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout35</cstring> + <cstring>layout35</cstring> </property> <hbox> <property name="name"> @@ -53,7 +53,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout36</cstring> + <cstring>layout36</cstring> </property> <hbox> <property name="name"> @@ -110,7 +110,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui index 04b6e71..ef5ea58 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab2decl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -226,7 +226,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>94</width> <height>21</height> @@ -269,7 +269,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui b/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui index 6b23280..7c4c06f 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtab3decl.ui @@ -35,7 +35,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout11</cstring> + <cstring>layout11</cstring> </property> <hbox> <property name="name"> @@ -125,7 +125,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>358</width> <height>16</height> @@ -136,7 +136,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -174,7 +174,7 @@ <property name="name"> <cstring>m_checkMemo</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -235,7 +235,7 @@ <property name="name"> <cstring>m_checkNumber</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -252,7 +252,7 @@ <property name="name"> <cstring>m_checkPayee</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -269,7 +269,7 @@ <property name="name"> <cstring>m_checkCategory</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>0</width> <height>0</height> @@ -316,7 +316,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>205</width> <height>20</height> @@ -327,7 +327,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <grid> <property name="name"> @@ -386,7 +386,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui b/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui index 452e69c..9e1fda3 100644 --- a/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui +++ b/kmymoney2/widgets/kmymoneyreportconfigtabchartdecl.ui @@ -27,7 +27,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -92,7 +92,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -136,7 +136,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <hbox> <property name="name"> @@ -182,7 +182,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>121</width> <height>20</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/widgets/kmymoneyreportcontroldecl.ui b/kmymoney2/widgets/kmymoneyreportcontroldecl.ui index 00ba7e0..d13da36 100644 --- a/kmymoney2/widgets/kmymoneyreportcontroldecl.ui +++ b/kmymoney2/widgets/kmymoneyreportcontroldecl.ui @@ -29,7 +29,7 @@ <property name="name"> <cstring>buttonChart</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> @@ -46,7 +46,7 @@ <property name="name"> <cstring>buttonConfigure</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> @@ -63,7 +63,7 @@ <property name="name"> <cstring>buttonNew</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> @@ -80,7 +80,7 @@ <property name="name"> <cstring>buttonCopy</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> @@ -97,7 +97,7 @@ <property name="name"> <cstring>buttonExport</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>buttonDelete</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> @@ -131,7 +131,7 @@ <property name="name"> <cstring>buttonClose</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>75</width> <height>0</height> diff --git a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp index 4599eb5..9f6d131 100644 --- a/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp +++ b/kmymoney2/widgets/kmymoneyscheduledcalendar.cpp @@ -59,7 +59,7 @@ kMyMoneyScheduledCalendar::kMyMoneyScheduledCalendar(TQWidget *parent, const cha setUserButton1(true, pb1); - init( TQDate::tqcurrentDate() ); + init( TQDate::currentDate() ); connect(m_scheduledDateTable, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&)), this, TQT_SIGNAL(enterClicked(const MyMoneySchedule&, const TQDate&))); diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index 5562d31..f15773c 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -176,7 +176,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=schedules.begin(); iter!=schedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::tqcurrentDate()) + if (theDate < TQDate::currentDate()) { if (schedule.isOverdue()) { @@ -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())); } } } @@ -286,7 +286,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=transferSchedules.begin(); iter!=transferSchedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::tqcurrentDate()) + if (theDate < TQDate::currentDate()) { if (schedule.isOverdue()) { @@ -301,7 +301,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=depositSchedules.begin(); iter!=depositSchedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::tqcurrentDate()) + if (theDate < TQDate::currentDate()) { if (schedule.isOverdue()) { @@ -316,7 +316,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, for (iter=billSchedules.begin(); iter!=billSchedules.end(); ++iter) { MyMoneySchedule schedule = *iter; - if (theDate < TQDate::tqcurrentDate()) + if (theDate < TQDate::currentDate()) { if (schedule.isOverdue()) { diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.h b/kmymoney2/widgets/kmymoneyscheduleddatetbl.h index e607ad0..f2b9c27 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.h +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.h @@ -46,7 +46,7 @@ class kMyMoneyScheduledDateTbl : public kMyMoneyDateTbl TQ_OBJECT public: kMyMoneyScheduledDateTbl(TQWidget *parent=0, - TQDate date=TQDate::tqcurrentDate(), + TQDate date=TQDate::currentDate(), const char* name=0, WFlags f=0); ~kMyMoneyScheduledDateTbl(); diff --git a/kmymoney2/widgets/kmymoneyselector.cpp b/kmymoney2/widgets/kmymoneyselector.cpp index 17428ce..cd110ed 100644 --- a/kmymoney2/widgets/kmymoneyselector.cpp +++ b/kmymoney2/widgets/kmymoneyselector.cpp @@ -18,7 +18,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqheader.h> #include <tqtimer.h> #include <tqstyle.h> @@ -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; } @@ -661,7 +661,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p KMyMoneyCheckListItem* it_c = static_cast<KMyMoneyCheckListItem*>(it_v); if(it_c->type() == TQCheckListItem::CheckBox) { // the following is copied from TQCheckListItem::activate() et al - int boxsize = m_listView->tqstyle().tqpixelMetric(TQStyle::PM_CheckListButtonSize, m_listView); + int boxsize = m_listView->tqstyle().pixelMetric(TQStyle::PM_CheckListButtonSize, m_listView); int align = m_listView->columnAlignment( 0 ); int marg = m_listView->itemMargin(); int y = 0; @@ -675,7 +675,7 @@ void KMyMoneySelector::slotListRightMouse(TQListViewItem* it_v, const TQPoint& p // columns might have been swapped r.moveBy( m_listView->header()->sectionPos( 0 ), 0 ); - TQPoint topLeft = m_listView->tqitemRect(it_v).topLeft(); //### inefficient? + TQPoint topLeft = m_listView->itemRect(it_v).topLeft(); //### inefficient? TQPoint p = m_listView->mapFromGlobal( pos ) - topLeft; int xdepth = m_listView->treeStepSize() * (it_v->depth() + (m_listView->rootIsDecorated() ? 1 : 0)) diff --git a/kmymoney2/widgets/kmymoneytitlelabel.cpp b/kmymoney2/widgets/kmymoneytitlelabel.cpp index db3dba2..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(), tqcolorGroup(), 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 0c038bc..220bc2e 100644 --- a/kmymoney2/widgets/kmymoneywizard.cpp +++ b/kmymoney2/widgets/kmymoneywizard.cpp @@ -17,7 +17,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqlayout.h> +#include <layout.h> #include <tqlabel.h> #include <tqpoint.h> #include <tqfont.h> @@ -132,7 +132,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_helpButton->setIconSet( SmallIconSet( "help" ) ); } - // create button tqlayout + // create button layout m_buttonLayout = new TQHBoxLayout; m_buttonLayout->addWidget(m_helpButton); m_buttonLayout->addStretch(1); @@ -141,21 +141,21 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_buttonLayout->addWidget(m_finishButton); m_buttonLayout->addWidget(m_cancelButton); - // create wizard tqlayout + // create wizard layout m_wizardLayout = new TQVBoxLayout(this, 6, 0, "wizardLayout"); m_titleLabel = new KMyMoneyTitleLabel(this, "titleLabel"); m_wizardLayout->addWidget(m_titleLabel); TQHBoxLayout* hboxLayout = new TQHBoxLayout(0, 0, 6, "hboxLayout"); - // create stage tqlayout and frame + // create stage layout and frame m_stepFrame = new TQFrame(this, "stepFrame"); m_stepFrame->setPaletteBackgroundColor(KGlobalSettings::highlightColor()); m_stepLayout = new TQVBoxLayout(m_stepFrame, 11, 6, "stepLayout"); m_stepLayout->addWidget(new TQLabel("", m_stepFrame)); m_stepLayout->addItem(new TQSpacerItem(20, 20, TQSizePolicy::Minimum, TQSizePolicy::Expanding)); m_stepLabel = new TQLabel(m_stepFrame, "stepLabel"); - m_stepLabel->tqsetAlignment(TQt::AlignHCenter); + m_stepLabel->setAlignment(TQt::AlignHCenter); m_stepLayout->addWidget(m_stepLabel); hboxLayout->addWidget(m_stepFrame); @@ -169,7 +169,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W m_stepPalette.setColor( TQPalette::Disabled, role, color ); m_stepLabel->setPalette(m_stepPalette); - // create page tqlayout + // create page layout m_pageLayout = new TQVBoxLayout(0, 0, 6, "pageLayout"); // the page will be inserted later dynamically above this line @@ -183,7 +183,7 @@ KMyMoneyWizard::KMyMoneyWizard(TQWidget *parent, const char *name, bool modal, W hboxLayout->addLayout(m_pageLayout); m_wizardLayout->addLayout(hboxLayout); - resize(TQSize(770, 520).expandedTo(tqminimumSizeHint())); + resize(TQSize(770, 520).expandedTo(minimumSizeHint())); clearWState(WState_Polished); m_titleLabel->setText("No Title specified"); @@ -207,7 +207,7 @@ void KMyMoneyWizard::addStep(const TQString& text) { TQLabel* step = new TQLabel(text, m_stepFrame); step->setFrameStyle(TQFrame::Panel | TQFrame::Raised); - step->tqsetAlignment(TQt::AlignHCenter); + step->setAlignment(TQt::AlignHCenter); step->setFrameStyle(TQFrame::Box | TQFrame::Sunken); step->setMargin(2); step->setPalette( m_stepPalette ); @@ -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/kmymoneywizard.h b/kmymoney2/widgets/kmymoneywizard.h index 803061e..7e12d48 100644 --- a/kmymoney2/widgets/kmymoneywizard.h +++ b/kmymoney2/widgets/kmymoneywizard.h @@ -22,7 +22,7 @@ #include <tqdialog.h> #include <tqvaluelist.h> -#include <tqpalette.h> +#include <palette.h> class TQVBoxLayout; class TQHBoxLayout; class TQLabel; @@ -289,7 +289,7 @@ protected: * @author Thomas Baumgart (C) 2006 * * This is a base class for implementation of the KMyMoneyWizard. It provides - * the following tqlayout of a wizard: + * the following layout of a wizard: * * @code * +-wizardLayout-----------------------------------------------+ diff --git a/kmymoney2/widgets/kschedulebriefwidget.ui b/kmymoney2/widgets/kschedulebriefwidget.ui index 209e727..fff3bef 100644 --- a/kmymoney2/widgets/kschedulebriefwidget.ui +++ b/kmymoney2/widgets/kschedulebriefwidget.ui @@ -56,7 +56,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -86,7 +86,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>0</height> @@ -111,7 +111,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>70</width> <height>0</height> @@ -130,7 +130,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout7</cstring> + <cstring>layout7</cstring> </property> <grid> <property name="name"> @@ -140,13 +140,13 @@ <property name="name"> <cstring>textLabel1</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -160,13 +160,13 @@ <property name="name"> <cstring>textLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> </size> </property> - <property name="tqmaximumSize"> + <property name="maximumSize"> <size> <width>60</width> <height>32767</height> @@ -221,7 +221,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>60</width> <height>0</height> @@ -274,7 +274,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>35</width> <height>0</height> @@ -334,7 +334,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>43</width> <height>0</height> diff --git a/kmymoney2/widgets/register.cpp b/kmymoney2/widgets/register.cpp index b01513e..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); @@ -1292,9 +1292,9 @@ void Register::resize(int col) kMyMoneyEdit* valField = new kMyMoneyEdit; dateField->setFont(KMyMoneyGlobalSettings::listCellFont()); - setColumnWidth(DateColumn, dateField->tqminimumSizeHint().width()); + setColumnWidth(DateColumn, dateField->minimumSizeHint().width()); valField->setMinimumWidth(ewidth); - ewidth = valField->tqminimumSizeHint().width(); + ewidth = valField->minimumSizeHint().width(); if(swidth > 0) { swidth = columnWidth(SecurityColumn) + 40; @@ -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); } @@ -2265,7 +2265,7 @@ void Register::addGroupMarkers(void) switch(primarySortKey()) { case KMyMoneyRegister::PostDateSort: case KMyMoneyRegister::EntryDateSort: - today = TQDate::tqcurrentDate(); + today = TQDate::currentDate(); thisMonth.setYMD(today.year(), today.month(), 1); lastMonth = thisMonth.addMonths(-1); yesterday = today.addDays(-1); @@ -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); } @@ -2309,9 +2309,9 @@ void Register::addGroupMarkers(void) new KMyMoneyRegister::SimpleDateGroupMarker(this, today.addDays(1), i18n("Future transactions")); } if(KMyMoneyGlobalSettings::showFiscalMarker()) { - TQDate currentFiscalYear(TQDate::tqcurrentDate().year(), KMyMoneyGlobalSettings::firstFiscalMonth(), KMyMoneyGlobalSettings::firstFiscalDay()); + TQDate currentFiscalYear(TQDate::currentDate().year(), KMyMoneyGlobalSettings::firstFiscalMonth(), KMyMoneyGlobalSettings::firstFiscalDay()); - if(TQDate::tqcurrentDate() < currentFiscalYear) + if(TQDate::currentDate() < currentFiscalYear) currentFiscalYear = currentFiscalYear.addYears(-1); TQDate previousFiscalYear = currentFiscalYear.addYears(-1); new KMyMoneyRegister::FiscalYearGroupMarker(this, currentFiscalYear, i18n("Current fiscal year")); diff --git a/kmymoney2/widgets/scheduledtransaction.cpp b/kmymoney2/widgets/scheduledtransaction.cpp index c954b85..cb47fdb 100644 --- a/kmymoney2/widgets/scheduledtransaction.cpp +++ b/kmymoney2/widgets/scheduledtransaction.cpp @@ -44,7 +44,7 @@ StdTransactionScheduled::StdTransactionScheduled(Register *parent, const MyMoney bool StdTransactionScheduled::paintRegisterCellSetup(TQPainter* painter, int& row, int& col, TQRect& cellRect, TQRect& textRect, TQColorGroup& cg, TQBrush& brush) { TQRect r(cellRect); - cg = m_parent->tqpalette().disabled(); + cg = m_parent->palette().disabled(); bool rc = Transaction::paintRegisterCellSetup(painter, row, col, cellRect, textRect, cg, brush); return rc; 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/stdtransactionmatched.h b/kmymoney2/widgets/stdtransactionmatched.h index 2340c68..fbcb694 100644 --- a/kmymoney2/widgets/stdtransactionmatched.h +++ b/kmymoney2/widgets/stdtransactionmatched.h @@ -20,7 +20,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqbrush.h> +#include <brush.h> // ---------------------------------------------------------------------------- // KDE Includes diff --git a/kmymoney2/widgets/transaction.cpp b/kmymoney2/widgets/transaction.cpp index 5811a8c..b4ac7cd 100644 --- a/kmymoney2/widgets/transaction.cpp +++ b/kmymoney2/widgets/transaction.cpp @@ -243,7 +243,7 @@ void Transaction::markAsErronous(TQPainter* painter, int /* row */, int /* col * bool Transaction::paintRegisterCellSetup(TQPainter* painter, int& row, int& col, TQRect& cellRect, TQRect& textRect, TQColorGroup& cg, TQBrush& brush) { if(m_reducedIntensity) - cg = m_parent->tqpalette().disabled(); + cg = m_parent->palette().disabled(); if(m_alternate) cg.setColor(TQColorGroup::Base, KMyMoneyGlobalSettings::listColor()); @@ -508,7 +508,7 @@ int Transaction::formRowHeight(void) const kMyMoneyDateInput dateInput; KMyMoneyCategory category(0,0,true); - return TQMAX(dateInput.tqsizeHint().height(), category.tqsizeHint().height()); + return TQMAX(dateInput.sizeHint().height(), category.sizeHint().height()); } return m_formRowHeight; } @@ -598,7 +598,7 @@ void Transaction::setupRegisterPalette(TQMap<TQString, TQWidget*>& editWidgets) setupPalette(palette, editWidgets); } -TQWidget* Transaction::tqfocusWidget(TQWidget* w) const +TQWidget* Transaction::focusWidget(TQWidget* w) const { if(w) { while(w->focusProxy()) @@ -664,10 +664,10 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS // qDebug("p is in r = %d", r.contains(cpos)); if(r.contains(cpos) && m_erronous) { if(m_transaction.splits().count() < 2) { - msg = TQString("<qt>%1</qt>").tqarg(i18n("Transaction is missing a category assignment.")); + msg = TQString("<qt>%1</qt>").arg(i18n("Transaction is missing a category assignment.")); } else { const MyMoneySecurity& sec = MyMoneyFile::instance()->security(m_account.currencyId()); - msg = TQString("<qt>%1</qt>").tqarg(i18n("The transaction has a missing assignment of <b>%1</b>.").tqarg(m_transaction.splitSum().abs().formatMoney(m_account, sec))); + msg = TQString("<qt>%1</qt>").arg(i18n("The transaction has a missing assignment of <b>%1</b>.").arg(m_transaction.splitSum().abs().formatMoney(m_account, sec))); } return true; } @@ -690,9 +690,9 @@ bool Transaction::maybeTip(const TQPoint& cpos, int row, int col, TQRect& r, TQS TQString category = file->accountToCategory(acc.id()); TQString amount = ((*it_s).value() * factor).formatMoney(acc, sec); - txt += TQString("<tr><td><nobr>%1</nobr></td><td align=right><nobr>%2</nobr></td></tr>").tqarg(category, amount); + txt += TQString("<tr><td><nobr>%1</nobr></td><td align=right><nobr>%2</nobr></td></tr>").arg(category, amount); } - msg = TQString("<table>%1</table>").tqarg(txt); + msg = TQString("<table>%1</table>").arg(txt); return true; } @@ -880,7 +880,7 @@ StdTransaction::StdTransaction(Register *parent, const MyMoneyTransaction& trans addon = i18n("Yield"); } if(!addon.isEmpty()) { - m_payee += TQString(" (%1)").tqarg(addon); + m_payee += TQString(" (%1)").arg(addon); } m_payeeHeader = i18n("Activity"); m_category = i18n("Investment transaction"); @@ -1253,34 +1253,34 @@ void StdTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const TQWidget* w; while(it_s != taborder.constEnd()) { if(*it_s == "account") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn1))); } else if(*it_s == "cashflow") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, LabelColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, LabelColumn1))); } else if(*it_s == "payee") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn1))); } else if(*it_s == "category") { // make sure to have the category field and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... w = m_form->cellWidget(2, ValueColumn1); - tabOrderWidgets.append(tqfocusWidget(w)); + tabOrderWidgets.append(focusWidget(w)); w = dynamic_cast<TQWidget*>(w->child("splitButton")); if(w) tabOrderWidgets.append(w); } else if(*it_s == "memo") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(3, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(3, ValueColumn1))); } else if(*it_s == "number") { if(haveNumberField()) { - if((w = tqfocusWidget(m_form->cellWidget(1, ValueColumn2)))) + if((w = focusWidget(m_form->cellWidget(1, ValueColumn2)))) tabOrderWidgets.append(w); } } else if(*it_s == "date") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn2))); } else if(*it_s == "amount") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(3, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(3, ValueColumn2))); } else if(*it_s == "state") { - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn2))); } ++it_s; } @@ -1315,31 +1315,31 @@ void StdTransaction::tabOrderInRegister(TQWidgetList& tabOrderWidgets) const while(it_s != taborder.constEnd()) { if(*it_s == "number") { if(haveNumberField()) { - if((w = tqfocusWidget(m_parent->cellWidget(m_startRow + 0, NumberColumn)))) + if((w = focusWidget(m_parent->cellWidget(m_startRow + 0, NumberColumn)))) tabOrderWidgets.append(w); } } else if(*it_s == "date") { - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); } else if(*it_s == "payee") { - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); } else if(*it_s == "category") { // make sure to have the category field and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... w = m_parent->cellWidget(m_startRow + 1, DetailColumn); - tabOrderWidgets.append(tqfocusWidget(w)); + tabOrderWidgets.append(focusWidget(w)); w = dynamic_cast<TQWidget*>(w->child("splitButton")); if(w) tabOrderWidgets.append(w); } else if(*it_s == "memo") { - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 2, DetailColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 2, DetailColumn))); } else if(*it_s == "payment") { - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, PaymentColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, PaymentColumn))); } else if(*it_s == "deposit") { - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DepositColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DepositColumn))); } else if(*it_s == "state") { - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); } ++it_s; } @@ -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; @@ -1929,54 +1929,54 @@ void InvestTransaction::arrangeWidgetsInForm(TQMap<TQString, TQWidget*>& editWid void InvestTransaction::tabOrderInForm(TQWidgetList& tabOrderWidgets) const { // activity - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn1))); // date - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(0, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(0, ValueColumn2))); // security - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn1))); // shares - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(1, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(1, ValueColumn2))); // account - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn1))); // price - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(2, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(2, ValueColumn2))); // make sure to have the fee category field and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... TQWidget* w = m_form->cellWidget(3, ValueColumn1); - tabOrderWidgets.append(tqfocusWidget(w)); + tabOrderWidgets.append(focusWidget(w)); w = dynamic_cast<TQWidget*>(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // fee amount - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(3, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(3, ValueColumn2))); // the same applies for the interest categories w = m_form->cellWidget(4, ValueColumn1); - tabOrderWidgets.append(tqfocusWidget(w)); + tabOrderWidgets.append(focusWidget(w)); w = dynamic_cast<TQWidget*>(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // interest amount - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(4, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(4, ValueColumn2))); // memo - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn1))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn1))); // total - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(5, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(5, ValueColumn2))); // state - tabOrderWidgets.append(tqfocusWidget(m_form->cellWidget(6, ValueColumn2))); + tabOrderWidgets.append(focusWidget(m_form->cellWidget(6, ValueColumn2))); } void InvestTransaction::arrangeWidgetsInRegister(TQMap<TQString, TQWidget*>& editWidgets) @@ -2009,45 +2009,45 @@ void InvestTransaction::tabOrderInRegister(TQWidgetList& tabOrderWidgets) const TQWidget* w; // date - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DateColumn))); // security - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, SecurityColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, SecurityColumn))); // activity - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, DetailColumn))); // shares - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, QuantityColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, QuantityColumn))); // price - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 0, PriceColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 0, PriceColumn))); // asset account - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 1, DetailColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 1, DetailColumn))); // make sure to have the category fields and the split button as seperate tab order widgets // ok, we have to have some internal knowledge about the KMyMoneyCategory object, but // it's one of our own widgets, so we actually don't care. Just make sure, that we don't // go haywire when someone changes the KMyMoneyCategory object ... w = m_parent->cellWidget(m_startRow + 2, DetailColumn); // interest account - tabOrderWidgets.append(tqfocusWidget(w)); + tabOrderWidgets.append(focusWidget(w)); w = dynamic_cast<TQWidget*>(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // interest amount - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 2, QuantityColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 2, QuantityColumn))); w = m_parent->cellWidget(m_startRow + 3, DetailColumn); // fee account - tabOrderWidgets.append(tqfocusWidget(w)); + tabOrderWidgets.append(focusWidget(w)); w = dynamic_cast<TQWidget*>(w->child("splitButton")); if(w) tabOrderWidgets.append(w); // fee amount - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 3, QuantityColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 3, QuantityColumn))); // memo - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 4, DetailColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 4, DetailColumn))); // status - tabOrderWidgets.append(tqfocusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); + tabOrderWidgets.append(focusWidget(m_parent->cellWidget(m_startRow + 1, DateColumn))); } int InvestTransaction::numRowsRegister(bool expanded) const diff --git a/kmymoney2/widgets/transaction.h b/kmymoney2/widgets/transaction.h index a24c864..6e266c7 100644 --- a/kmymoney2/widgets/transaction.h +++ b/kmymoney2/widgets/transaction.h @@ -21,7 +21,7 @@ // ---------------------------------------------------------------------------- // QT Includes -#include <tqpalette.h> +#include <palette.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -183,7 +183,7 @@ public: virtual KMyMoneyRegister::Action actionType(void) const = 0; - TQWidget* tqfocusWidget(TQWidget*) const; + TQWidget* focusWidget(TQWidget*) const; void arrangeWidget(TQTable* tbl, int row, int col, TQWidget* w) const; bool haveNumberField(void) const; diff --git a/kmymoney2/widgets/transactionform.cpp b/kmymoney2/widgets/transactionform.cpp index b1d55cd..3b05e30 100644 --- a/kmymoney2/widgets/transactionform.cpp +++ b/kmymoney2/widgets/transactionform.cpp @@ -22,9 +22,9 @@ #include <tqpainter.h> #include <tqtimer.h> #include <tqapplication.h> -#include <tqlayout.h> +#include <layout.h> #include <tqtabbar.h> -#include <tqpalette.h> +#include <palette.h> // ---------------------------------------------------------------------------- // KDE Includes @@ -237,8 +237,8 @@ void TransactionForm::slotSetTransaction(KMyMoneyRegister::Transaction* transact kMyMoneyDateInput dateInput(0, "editDate"); KMyMoneyCategory category(0, "category", true); - // extract the maximal tqsizeHint height - int height = TQMAX(dateInput.tqsizeHint().height(), category.tqsizeHint().height()); + // extract the maximal sizeHint height + int height = TQMAX(dateInput.sizeHint().height(), category.sizeHint().height()); for(int row = 0; row < numRows(); ++row) { if(!transaction || transaction->showRowInForm(row)) { @@ -273,7 +273,7 @@ TabBar* TransactionForm::tabBar(TQWidget* parent) // create the tab bar m_tabBar = new TabBar( parent ); m_tabBar->setSignalEmission(TabBar::SignalAlways); - m_tabBar->tqsetSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, m_tabBar->sizePolicy().hasHeightForWidth() ) ); + m_tabBar->setSizePolicy( TQSizePolicy( (TQSizePolicy::SizeType)5, (TQSizePolicy::SizeType)0, 0, 0, m_tabBar->sizePolicy().hasHeightForWidth() ) ); connect(m_tabBar, TQT_SIGNAL(tabSelected(int)), this, TQT_SLOT(slotActionSelected(int))); } return m_tabBar; @@ -387,9 +387,9 @@ TQSize TransactionForm::tableSize(void) const rowPos(numRows()-1) + rowHeight(numRows()-1) + 10); } -TQSize TransactionForm::tqsizeHint(void) const +TQSize TransactionForm::sizeHint(void) const { - // I've taken this from qtable.cpp, TQTable::tqsizeHint() + // I've taken this from qtable.cpp, TQTable::sizeHint() int vmargin = TQApplication::reverseLayout() ? rightMargin() : leftMargin(); return TQSize(tableSize().width() + vmargin + 5, tableSize().height() + topMargin() + 10); } @@ -403,7 +403,7 @@ void TransactionForm::adjustColumn(Column col) if(col == ValueColumn2) { kMyMoneyDateInput dateInput; kMyMoneyEdit valInput; - w = TQMAX(dateInput.tqsizeHint().width(), valInput.tqsizeHint().width()); + w = TQMAX(dateInput.sizeHint().width(), valInput.sizeHint().width()); } if(m_transaction) { @@ -416,7 +416,7 @@ void TransactionForm::adjustColumn(Column col) m_transaction->formCellText(txt, align, i, static_cast<int>(col), 0); TQWidget* cw = cellWidget(i, col); if(cw) { - w = TQMAX(w, cw->tqsizeHint().width()+10); + w = TQMAX(w, cw->sizeHint().width()+10); } w = TQMAX(w, fontMetrics.width(txt)+10); } diff --git a/kmymoney2/widgets/transactionform.h b/kmymoney2/widgets/transactionform.h index f07a1e4..2884439 100644 --- a/kmymoney2/widgets/transactionform.h +++ b/kmymoney2/widgets/transactionform.h @@ -24,7 +24,7 @@ #include <tqtable.h> #include <tqvaluelist.h> #include <tqvaluevector.h> -#include <tqpalette.h> +#include <palette.h> #include <tqwidgetlist.h> #include <tqtabbar.h> @@ -135,7 +135,7 @@ public: void paintFocus(TQPainter* /*p*/, const TQRect& /*cr*/ ) {} TQSize tableSize(void) const; - TQSize tqsizeHint(void) const; + TQSize sizeHint(void) const; void adjustColumn(Column col); void clear(void); diff --git a/kmymoney2/widgets/transactionsortoption.ui b/kmymoney2/widgets/transactionsortoption.ui index fc91754..393e0bc 100644 --- a/kmymoney2/widgets/transactionsortoption.ui +++ b/kmymoney2/widgets/transactionsortoption.ui @@ -22,7 +22,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <vbox> <property name="name"> @@ -57,7 +57,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <vbox> <property name="name"> @@ -73,7 +73,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>67</height> @@ -106,7 +106,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>67</height> @@ -117,7 +117,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <vbox> <property name="name"> @@ -152,7 +152,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout6</cstring> + <cstring>layout6</cstring> </property> <vbox> <property name="name"> @@ -168,7 +168,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>67</height> @@ -201,7 +201,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>67</height> diff --git a/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui index c6c7469..e21d8fd 100644 --- a/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kaccounttypepagedecl.ui @@ -31,7 +31,7 @@ Enter the date the account was opened and its currency.</string> </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -73,7 +73,7 @@ Enter the date the account was opened and its currency.</string> <property name="name"> <cstring>m_openingBalance</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>150</width> <height>0</height> @@ -216,7 +216,7 @@ Use the liability account type to manage any type of liability except amortizati <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>231</width> <height>20</height> @@ -257,7 +257,7 @@ Use the liability account type to manage any type of liability except amortizati <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -276,7 +276,7 @@ Use the liability account type to manage any type of liability except amortizati <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui index a2dd327..551e79d 100644 --- a/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kbrokeragepagedecl.ui @@ -61,7 +61,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <grid> <property name="name"> @@ -126,7 +126,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>30</width> <height>20</height> @@ -145,7 +145,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>21</width> <height>30</height> diff --git a/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui b/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui index 9025c77..e9b1c7e 100644 --- a/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kgeneralloaninfopagedecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout14</cstring> + <cstring>layout14</cstring> </property> <hbox> <property name="name"> @@ -37,7 +37,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout13</cstring> + <cstring>layout13</cstring> </property> <grid> <property name="name"> @@ -252,7 +252,7 @@ Enter the due date of the first payment in the current year</string> </widget> <widget class="TQLayoutWidget" row="9" column="1"> <property name="name"> - <cstring>tqlayout48</cstring> + <cstring>layout48</cstring> </property> <hbox> <property name="name"> @@ -324,7 +324,7 @@ Enter the due date of the first payment in the current year</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>29</width> <height>20</height> @@ -343,7 +343,7 @@ Enter the due date of the first payment in the current year</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui b/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui index 1380be1..be3c91c 100644 --- a/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/khierarchypagedecl.ui @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui index 9beae8a..2b7b089 100644 --- a/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kinstitutionpagedecl.ui @@ -33,7 +33,7 @@ Enter the account number used by the institution to identify the account.</strin </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -41,7 +41,7 @@ Enter the account number used by the institution to identify the account.</strin </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <grid> <property name="name"> @@ -124,7 +124,7 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>132</width> <height>20</height> @@ -143,7 +143,7 @@ KMyMoney keeps this field only for documentation purposes and does not use it ot <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>40</height> diff --git a/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui index 2f5fb63..03fbaee 100644 --- a/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloandetailspagedecl.ui @@ -37,7 +37,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>70</height> @@ -46,7 +46,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout10</cstring> + <cstring>layout10</cstring> </property> <hbox> <property name="name"> @@ -54,7 +54,7 @@ </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout9</cstring> + <cstring>layout9</cstring> </property> <grid> <property name="name"> @@ -128,7 +128,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1" rowspan="1" colspan="3"> <property name="name"> - <cstring>tqlayout8</cstring> + <cstring>layout8</cstring> </property> <hbox> <property name="name"> @@ -186,7 +186,7 @@ </widget> <widget class="TQLayoutWidget" row="6" column="1"> <property name="name"> - <cstring>tqlayout53</cstring> + <cstring>layout53</cstring> </property> <hbox> <property name="name"> @@ -202,7 +202,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>71</width> <height>20</height> @@ -235,7 +235,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -254,7 +254,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>27</width> <height>21</height> @@ -273,7 +273,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui index 8d2deaf..328696e 100644 --- a/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloanpaymentpagedecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout4</cstring> + <cstring>layout4</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>63</width> <height>21</height> @@ -54,7 +54,7 @@ </spacer> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <grid> <property name="name"> @@ -80,7 +80,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -112,7 +112,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -136,7 +136,7 @@ <property name="text"> <string>xxx</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignVCenter|AlignRight</set> </property> </widget> @@ -152,7 +152,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>62</width> <height>21</height> @@ -171,7 +171,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui index a955845..3385f6e 100644 --- a/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloanpayoutpagedecl.ui @@ -135,7 +135,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>40</width> <height>20</height> @@ -159,7 +159,7 @@ If this loan is a 'consumer loan' (money to use however you want), you can use a <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui index f99fe17..1ce9f1e 100644 --- a/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kloanschedulepagedecl.ui @@ -30,7 +30,7 @@ If you selected to record all payments this date has already been supplied. If y </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout54</cstring> + <cstring>layout54</cstring> </property> <hbox> <property name="name"> @@ -38,7 +38,7 @@ If you selected to record all payments this date has already been supplied. If y </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout53</cstring> + <cstring>layout53</cstring> </property> <grid> <property name="name"> @@ -86,7 +86,7 @@ If you selected to record all payments this date has already been supplied. If y </widget> <widget class="TQLayoutWidget" row="2" column="1"> <property name="name"> - <cstring>tqlayout52</cstring> + <cstring>layout52</cstring> </property> <hbox> <property name="name"> @@ -102,7 +102,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -128,7 +128,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Preferred</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>41</width> <height>20</height> @@ -147,7 +147,7 @@ If you selected to record all payments this date has already been supplied. If y <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>21</height> diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp index b4c481b..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 @@ -790,7 +790,7 @@ void GeneralLoanInfoPage::enterPage(void) { if(m_firstTime) { // setup default dates to last of this month and one year on top - TQDate firstDay(TQDate::tqcurrentDate().year(), TQDate::tqcurrentDate().month(), 1); + TQDate firstDay(TQDate::currentDate().year(), TQDate::currentDate().month(), 1); m_firstPaymentDate->setDate(firstDay.addMonths(1).addDays(-1)); m_interestChangeDateEdit->setDate(m_firstPaymentDate->date().addYears(1));; m_firstTime = false; @@ -959,14 +959,14 @@ void LoanDetailsPage::slotCalculate(void) val = calc.presentValue(); m_loanAmount->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", m_wizard->precision())); result = i18n("KMyMoney has calculated the amount of the loan as %1.") - .tqarg(m_loanAmount->lineedit()->text()); + .arg(m_loanAmount->lineedit()->text()); } else if(m_interestRate->lineedit()->text().isEmpty()) { // calculate the interest rate out of the other information val = calc.interestRate(); m_interestRate->loadText(MyMoneyMoney(static_cast<double>(val)).abs().formatMoney("", 3)); result = i18n("KMyMoney has calculated the interest rate to %1%.") - .tqarg(m_interestRate->lineedit()->text()); + .arg(m_interestRate->lineedit()->text()); } else if(m_paymentAmount->lineedit()->text().isEmpty()) { // calculate the periodical amount of the payment out of the other information @@ -979,7 +979,7 @@ void LoanDetailsPage::slotCalculate(void) calc.setPmt(val); result = i18n("KMyMoney has calculated a periodic payment of %1 to cover principal and interest.") - .tqarg(m_paymentAmount->lineedit()->text()); + .arg(m_paymentAmount->lineedit()->text()); val = calc.futureValue(); if((moneyBorrowed && val < 0 && fabsl(val) >= fabsl(calc.payment())) @@ -991,7 +991,7 @@ void LoanDetailsPage::slotCalculate(void) m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision())); result += TQString(" "); result += i18n("The number of payments has been decremented and the balloon payment has been modified to %1.") - .tqarg(m_balloonAmount->lineedit()->text()); + .arg(m_balloonAmount->lineedit()->text()); } else if((moneyBorrowed && val < 0 && fabsl(val) < fabsl(calc.payment())) || (moneyLend && val > 0 && fabs(val) < fabs(calc.payment()))) { m_balloonAmount->loadText(MyMoneyMoney(0,1).formatMoney("", m_wizard->precision())); @@ -999,7 +999,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyMoney refVal(static_cast<double>(val)); m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision())); result += i18n("The balloon payment has been modified to %1.") - .tqarg(m_balloonAmount->lineedit()->text()); + .arg(m_balloonAmount->lineedit()->text()); } } else if(m_termAmount->value() == 0) { @@ -1011,7 +1011,7 @@ void LoanDetailsPage::slotCalculate(void) // if the number of payments has a fractional part, then we // round it to the smallest integer and calculate the balloon payment result = i18n("KMyMoney has calculated the term of your loan as %1. ") - .tqarg(updateTermWidgets(floorl(val))); + .arg(updateTermWidgets(floorl(val))); if(val != floorl(val)) { calc.setNpp(floorl(val)); @@ -1019,7 +1019,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyMoney refVal(static_cast<double>(val)); m_balloonAmount->loadText(refVal.abs().formatMoney("", m_wizard->precision())); result += i18n("The balloon payment has been modified to %1.") - .tqarg(m_balloonAmount->lineedit()->text()); + .arg(m_balloonAmount->lineedit()->text()); } } else { @@ -1050,7 +1050,7 @@ void LoanDetailsPage::slotCalculate(void) MyMoneyMoney refVal(static_cast<double>(val)); result = i18n("KMyMoney has calculated a balloon payment of %1 for this loan.") - .tqarg(refVal.abs().formatMoney("", m_wizard->precision())); + .arg(refVal.abs().formatMoney("", m_wizard->precision())); if(!m_balloonAmount->lineedit()->text().isEmpty()) { if((m_balloonAmount->value().abs() - refVal.abs()).abs().toDouble() > 1) { @@ -1626,7 +1626,7 @@ void AccountSummaryPage::enterPage(void) if(m_wizard->m_brokeragepage->m_createBrokerageButton->isChecked()) { group = new KMyMoneyCheckListItem(m_dataList, group, i18n("Brokerage Account"), TQString(), TQString(), TQCheckListItem::RadioButtonController); group->setOpen(true); - p = new KListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").tqarg(acc.name())); + p = new KListViewItem(group, p, i18n("Name"), TQString("%1 (Brokerage)").arg(acc.name())); p = new KListViewItem(group, p, i18n("Currency"), m_wizard->m_brokeragepage->m_brokerageCurrency->security().name()); if(m_wizard->m_brokeragepage->m_accountNumber->isEnabled() && !m_wizard->m_brokeragepage->m_accountNumber->text().isEmpty()) p = new KListViewItem(group, p, i18n("Number"), m_wizard->m_brokeragepage->m_accountNumber->text()); @@ -1644,7 +1644,7 @@ void AccountSummaryPage::enterPage(void) } else { p = new KListViewItem(group, p, i18n("Amount lent"), m_wizard->m_loanDetailsPage->m_loanAmount->value().formatMoney(m_wizard->currency().tradingSymbol(), m_wizard->precision())); } - p = new KListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").tqarg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1))); + p = new KListViewItem(group, p, i18n("Interest rate"), TQString("%1 %").arg(m_wizard->m_loanDetailsPage->m_interestRate->value().formatMoney("", -1))); p = new KListViewItem(group, p, i18n("Interest rate is"), m_wizard->m_generalLoanInfoPage->m_interestType->currentText()); p = new KListViewItem(group, p, i18n("Principal and interest"), m_wizard->m_loanDetailsPage->m_paymentAmount->value().formatMoney(acc, sec)); p = new KListViewItem(group, p, i18n("Additional fees"), m_wizard->m_loanPaymentPage->additionalFees().formatMoney(acc, sec)); diff --git a/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui b/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui index 8cd1194..aca76e6 100644 --- a/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui +++ b/kmymoney2/wizards/newaccountwizard/kschedulepagedecl.ui @@ -64,7 +64,7 @@ <verstretch>0</verstretch> </sizepolicy> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>180</width> <height>0</height> @@ -132,7 +132,7 @@ <string>Payment should be made from account</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignTop</set> </property> </widget> @@ -166,7 +166,7 @@ from account</string> <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui index 76ce9f9..725aa31 100644 --- a/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kaccountpagedecl.ui @@ -110,7 +110,7 @@ </widget> <widget class="TQLayoutWidget" row="3" column="1"> <property name="name"> - <cstring>tqlayout3</cstring> + <cstring>layout3</cstring> </property> <hbox> <property name="name"> @@ -134,7 +134,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>81</width> <height>20</height> @@ -169,7 +169,7 @@ </widget> <widget class="TQLayoutWidget" row="4" column="1"> <property name="name"> - <cstring>tqlayout5</cstring> + <cstring>layout5</cstring> </property> <hbox> <property name="name"> @@ -204,7 +204,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>200</width> <height>20</height> @@ -236,7 +236,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> diff --git a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui index dd20dc0..a0c4b90 100644 --- a/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kcurrencypagedecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout19</cstring> + <cstring>layout19</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>21</height> @@ -67,7 +67,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>21</height> diff --git a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui index 8a39942..316902a 100644 --- a/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kfilepagedecl.ui @@ -42,7 +42,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>30</height> diff --git a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui index 5483233..2cd041b 100644 --- a/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kgeneralpagedecl.ui @@ -28,7 +28,7 @@ This information will be seen and used only by you. The information is used to p </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout18</cstring> + <cstring>layout18</cstring> </property> <hbox> <property name="name"> @@ -38,7 +38,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>frame8</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>25</width> <height>0</height> @@ -53,7 +53,7 @@ This information will be seen and used only by you. The information is used to p </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout17</cstring> + <cstring>layout17</cstring> </property> <vbox> <property name="name"> @@ -61,7 +61,7 @@ This information will be seen and used only by you. The information is used to p </property> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout20</cstring> + <cstring>layout20</cstring> </property> <grid> <property name="name"> @@ -71,7 +71,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -100,7 +100,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -119,7 +119,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -141,7 +141,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -155,7 +155,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -174,7 +174,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -198,7 +198,7 @@ This information will be seen and used only by you. The information is used to p </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout12</cstring> + <cstring>layout12</cstring> </property> <hbox> <property name="name"> @@ -222,7 +222,7 @@ This information will be seen and used only by you. The information is used to p <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>61</width> <height>20</height> @@ -237,7 +237,7 @@ This information will be seen and used only by you. The information is used to p <property name="name"> <cstring>frame8_2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>25</width> <height>0</height> diff --git a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui index 810f0b7..df1d9aa 100644 --- a/kmymoney2/wizards/newuserwizard/kintropagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kintropagedecl.ui @@ -29,7 +29,7 @@ <property name="text"> <string>Welcome to KMyMoney!</string> </property> - <property name="tqalignment"> + <property name="alignment"> <set>AlignCenter</set> </property> </widget> @@ -53,7 +53,7 @@ On the next few pages you will be guided through the steps necessary to setup th <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>41</height> diff --git a/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp b/kmymoney2/wizards/newuserwizard/knewuserwizard.cpp index c1159d9..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() ); @@ -279,7 +279,7 @@ AccountPage::AccountPage(Wizard* wizard, const char* name) : connect(m_mandatoryGroup, TQT_SIGNAL(stateChanged()), object(), TQT_SIGNAL(completeStateChanged())); connect(m_haveCheckingAccountButton, TQT_SIGNAL(toggled(bool)), object(), TQT_SIGNAL(completeStateChanged())); m_accountNameEdit->setFocus(); - m_openingDateEdit->setDate(TQDate(TQDate::tqcurrentDate().year(),1,1)); + m_openingDateEdit->setDate(TQDate(TQDate::currentDate().year(),1,1)); } KMyMoneyWizardPage* AccountPage::nextPage(void) const @@ -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/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui index 01634fc..c623436 100644 --- a/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui +++ b/kmymoney2/wizards/newuserwizard/kpreferencepagedecl.ui @@ -29,7 +29,7 @@ </widget> <widget class="TQLayoutWidget"> <property name="name"> - <cstring>tqlayout1</cstring> + <cstring>layout1</cstring> </property> <hbox> <property name="name"> @@ -45,7 +45,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>51</width> <height>20</height> @@ -72,7 +72,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kmymoney2/wizards/wizardpages/accountsdecl.ui b/kmymoney2/wizards/wizardpages/accountsdecl.ui index 93006e1..3420185 100644 --- a/kmymoney2/wizards/wizardpages/accountsdecl.ui +++ b/kmymoney2/wizards/wizardpages/accountsdecl.ui @@ -39,7 +39,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>20</height> diff --git a/kmymoney2/wizards/wizardpages/currencydecl.ui b/kmymoney2/wizards/wizardpages/currencydecl.ui index 6da646a..d4893d5 100644 --- a/kmymoney2/wizards/wizardpages/currencydecl.ui +++ b/kmymoney2/wizards/wizardpages/currencydecl.ui @@ -83,7 +83,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>31</height> diff --git a/kmymoney2/wizards/wizardpages/userinfodecl.ui b/kmymoney2/wizards/wizardpages/userinfodecl.ui index d42e8ac..33648f1 100644 --- a/kmymoney2/wizards/wizardpages/userinfodecl.ui +++ b/kmymoney2/wizards/wizardpages/userinfodecl.ui @@ -38,7 +38,7 @@ <property name="name"> <cstring>TextLabel3</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -52,7 +52,7 @@ <property name="name"> <cstring>TextLabel4</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -66,7 +66,7 @@ <property name="name"> <cstring>TextLabel2</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -100,7 +100,7 @@ <property name="name"> <cstring>TextLabel7</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -114,7 +114,7 @@ <property name="name"> <cstring>TextLabel6</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> @@ -134,7 +134,7 @@ </widget> <widget class="TQLayoutWidget" row="7" column="0" rowspan="1" colspan="4"> <property name="name"> - <cstring>tqlayout22</cstring> + <cstring>layout22</cstring> </property> <hbox> <property name="name"> @@ -158,7 +158,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>305</width> <height>21</height> @@ -177,7 +177,7 @@ <property name="sizeType"> <enum>Expanding</enum> </property> - <property name="tqsizeHint"> + <property name="sizeHint"> <size> <width>20</width> <height>16</height> @@ -193,7 +193,7 @@ <property name="name"> <cstring>TextLabel5</cstring> </property> - <property name="tqminimumSize"> + <property name="minimumSize"> <size> <width>100</width> <height>0</height> |