From 2943dd3424f5363483d65eb10d0cae34bd2051c7 Mon Sep 17 00:00:00 2001 From: Darrell Anderson Date: Fri, 13 Apr 2012 02:20:30 -0500 Subject: [PATCH] Fix inadvertent "TQ" changes. --- kmymoney2/converter/mymoneygncreader.cpp | 6 ++-- kmymoney2/converter/webpricequote.h | 6 ++-- kmymoney2/dialogs/keditequityentrydlg.h | 4 +-- kmymoney2/dialogs/keditscheduledlg.cpp | 8 ++--- kmymoney2/dialogs/kenterscheduledlg.cpp | 2 +- kmymoney2/dialogs/kequitypriceupdatedlg.h | 4 +-- kmymoney2/dialogs/knewequityentrydlg.h | 4 +-- kmymoney2/dialogs/knewloanwizard.cpp | 2 +- .../dialogs/konlinequoteconfigurationdlg.h | 4 +-- .../dialogs/settings/ksettingsonlinequotes.h | 4 +-- kmymoney2/mymoney/mymoneyfile.cpp | 2 +- kmymoney2/mymoney/mymoneyscheduled.cpp | 14 ++++----- kmymoney2/mymoney/mymoneyscheduled.h | 4 +-- kmymoney2/mymoney/mymoneyscheduletest.cpp | 30 +++++++++---------- kmymoney2/mymoney/mymoneysecurity.cpp | 2 +- kmymoney2/mymoney/storage/imymoneystorage.h | 2 +- .../mymoney/storage/mymoneydatabasemgr.cpp | 4 +-- .../storage/mymoneydatabasemgrtest.cpp | 4 +-- .../mymoney/storage/mymoneyseqaccessmgr.cpp | 8 ++--- .../mymoney/storage/mymoneyseqaccessmgr.h | 4 +-- .../storage/mymoneyseqaccessmgrtest.cpp | 2 +- .../mymoney/storage/mymoneystoragesql.cpp | 4 +-- .../ofximport/dialogs/mymoneyofxconnector.cpp | 12 ++++---- kmymoney2/reports/objectinfotable.h | 2 +- kmymoney2/reports/querytable.h | 6 ++-- kmymoney2/reports/querytabletest.h | 4 +-- kmymoney2/widgets/kmymoneycalculator.cpp | 14 ++++----- kmymoney2/widgets/kmymoneycalculator.h | 4 +-- kmymoney2/widgets/kmymoneycalendar.cpp | 2 +- kmymoney2/widgets/kmymoneydatetbl.cpp | 12 ++++---- kmymoney2/widgets/kmymoneydatetbl.h | 2 +- kmymoney2/widgets/kmymoneyonlinequoteconfig.h | 4 +-- .../widgets/kmymoneyscheduleddatetbl.cpp | 4 +-- .../newaccountwizard/knewaccountwizard.cpp | 2 +- 34 files changed, 96 insertions(+), 96 deletions(-) diff --git a/kmymoney2/converter/mymoneygncreader.cpp b/kmymoney2/converter/mymoneygncreader.cpp index 0c3981e..4211ed9 100644 --- a/kmymoney2/converter/mymoneygncreader.cpp +++ b/kmymoney2/converter/mymoneygncreader.cpp @@ -1207,7 +1207,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { # Feb 2006: A RELAX NG Compact schema for gnucash "v2" XML files. # Copyright (C) 2006 Joshua Sled "NO_TYPE" "BANK" "CASH" "CREDIT" "ASSET" "LIABILITY" "STOCK" "MUTUAL" "CURRENCY" -"INCOME" "EXPENSE" "ETQUITY" "RECEIVABLE" "PAYABLE" "CHECKING" "SAVINGS" "MONEYMRKT" "CREDITLINE" +"INCOME" "EXPENSE" "EQUITY" "RECEIVABLE" "PAYABLE" "CHECKING" "SAVINGS" "MONEYMRKT" "CREDITLINE" Some don't seem to be used in practice. Not sure what CREDITLINE s/be converted as. */ if ("BANK" == gac->type() || "CHECKING" == gac->type()) { @@ -1230,7 +1230,7 @@ void MyMoneyGncReader::convertAccount (const GncAccount* gac) { } else { acc.setAccountType(MyMoneyAccount::Stock); } - } else if ("ETQUITY" == gac->type()) { + } else if ("EQUITY" == gac->type()) { acc.setAccountType(MyMoneyAccount::Equity); } else if ("LIABILITY" == gac->type()) { acc.setAccountType(MyMoneyAccount::Liability); @@ -1765,7 +1765,7 @@ void MyMoneyGncReader::convertSchedule (const GncSchedule *gsc) { {"monthly", 'm', 1, MyMoneySchedule::OCCUR_MONTHLY, MyMoneySchedule::MoveNothing }, {"two-monthly", 'm', 2, MyMoneySchedule::OCCUR_EVERYOTHERMONTH, MyMoneySchedule::MoveNothing }, - {"quarterly", 'm', 3, MyMoneySchedule::OCCUR_TQUARTERLY, MyMoneySchedule::MoveNothing }, + {"quarterly", 'm', 3, MyMoneySchedule::OCCUR_QUARTERLY, MyMoneySchedule::MoveNothing }, {"tri_annually", 'm', 4, MyMoneySchedule::OCCUR_EVERYFOURMONTHS, MyMoneySchedule::MoveNothing }, {"semi_yearly", 'm', 6, MyMoneySchedule::OCCUR_TWICEYEARLY, MyMoneySchedule::MoveNothing }, {"yearly", 'y', 1, MyMoneySchedule::OCCUR_YEARLY, MyMoneySchedule::MoveNothing }, diff --git a/kmymoney2/converter/webpricequote.h b/kmymoney2/converter/webpricequote.h index ac4402d..08a1aec 100644 --- a/kmymoney2/converter/webpricequote.h +++ b/kmymoney2/converter/webpricequote.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef WEBPRICETQUOTE_H -#define WEBPRICETQUOTE_H +#ifndef WEBPRICEQUOTE_H +#define WEBPRICEQUOTE_H // ---------------------------------------------------------------------------- // QT Headers @@ -251,6 +251,6 @@ public: } // end namespace convertertest -#endif // WEBPRICETQUOTE_H +#endif // WEBPRICEQUOTE_H // vim:cin:si:ai:et:ts=2:sw=2: diff --git a/kmymoney2/dialogs/keditequityentrydlg.h b/kmymoney2/dialogs/keditequityentrydlg.h index c72cebf..57473d2 100644 --- a/kmymoney2/dialogs/keditequityentrydlg.h +++ b/kmymoney2/dialogs/keditequityentrydlg.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef KEDITETQUITYENTRYDLG_H -#define KEDITETQUITYENTRYDLG_H +#ifndef KEDITEQUITYENTRYDLG_H +#define KEDITEQUITYENTRYDLG_H // ---------------------------------------------------------------------------- diff --git a/kmymoney2/dialogs/keditscheduledlg.cpp b/kmymoney2/dialogs/keditscheduledlg.cpp index 1ee14db..8f961f8 100644 --- a/kmymoney2/dialogs/keditscheduledlg.cpp +++ b/kmymoney2/dialogs/keditscheduledlg.cpp @@ -111,7 +111,7 @@ KEditScheduleDlg::KEditScheduleDlg(const MyMoneySchedule& schedule, TQWidget *pa m_paymentMethodEdit->insertItem(i18n("Direct debit"), MyMoneySchedule::STYPE_DIRECTDEBIT); m_paymentMethodEdit->insertItem(i18n("Standing order"), MyMoneySchedule::STYPE_STANDINGORDER); m_paymentMethodEdit->insertItem(i18n("Bank transfer"), MyMoneySchedule::STYPE_BANKTRANSFER); - m_paymentMethodEdit->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHETQUE); + m_paymentMethodEdit->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHEQUE); m_paymentMethodEdit->insertItem(i18n("Other"), MyMoneySchedule::STYPE_OTHER); MyMoneySchedule::paymentTypeE method = d->m_schedule.paymentType(); @@ -241,7 +241,7 @@ TransactionEditor* KEditScheduleDlg::startEdit(void) // if it's not a check, then we need to clear // a possibly assigned check number - if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHETQUE) { + if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHEQUE) { TQWidget* w = editor->haveWidget("number"); if(w) dynamic_cast(w)->loadText(TQString()); @@ -475,13 +475,13 @@ void KEditScheduleDlg::slotSetPaymentMethod(int item) { kMyMoneyLineEdit* dateEdit = dynamic_cast(d->m_editor->haveWidget("number")); if(dateEdit) { - dateEdit->setShown(item == MyMoneySchedule::STYPE_WRITECHETQUE); + dateEdit->setShown(item == MyMoneySchedule::STYPE_WRITECHEQUE); // hiding the label does not work, because the label underneath will shine // through. So we either write the label or a blank TQLabel* label = dynamic_cast(d->m_editor->haveWidget("number-label")); if(label) { - label->setText((item == MyMoneySchedule::STYPE_WRITECHETQUE) ? i18n("Number") : " "); + label->setText((item == MyMoneySchedule::STYPE_WRITECHEQUE) ? i18n("Number") : " "); } } } diff --git a/kmymoney2/dialogs/kenterscheduledlg.cpp b/kmymoney2/dialogs/kenterscheduledlg.cpp index 79616cb..596ba6d 100644 --- a/kmymoney2/dialogs/kenterscheduledlg.cpp +++ b/kmymoney2/dialogs/kenterscheduledlg.cpp @@ -245,7 +245,7 @@ TransactionEditor* KEnterScheduleDlg::startEdit(void) // if it's not a check, then we need to clear // a possibly assigned check number - if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHETQUE) { + if(d->m_schedule.paymentType() != MyMoneySchedule::STYPE_WRITECHEQUE) { TQWidget* w = editor->haveWidget("number"); if(w) dynamic_cast(w)->loadText(TQString()); diff --git a/kmymoney2/dialogs/kequitypriceupdatedlg.h b/kmymoney2/dialogs/kequitypriceupdatedlg.h index 9205380..97447db 100644 --- a/kmymoney2/dialogs/kequitypriceupdatedlg.h +++ b/kmymoney2/dialogs/kequitypriceupdatedlg.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef KETQUITYPRICEUPDATEDIALOG_H -#define KETQUITYPRICEUPDATEDIALOG_H +#ifndef KEQUITYPRICEUPDATEDIALOG_H +#define KEQUITYPRICEUPDATEDIALOG_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/dialogs/knewequityentrydlg.h b/kmymoney2/dialogs/knewequityentrydlg.h index 7ab9cf3..1a92614 100644 --- a/kmymoney2/dialogs/knewequityentrydlg.h +++ b/kmymoney2/dialogs/knewequityentrydlg.h @@ -20,8 +20,8 @@ * * ***************************************************************************/ -#ifndef KNEWETQUITYENTRY_H -#define KNEWETQUITYENTRY_H +#ifndef KNEWEQUITYENTRY_H +#define KNEWEQUITYENTRY_H #include #include diff --git a/kmymoney2/dialogs/knewloanwizard.cpp b/kmymoney2/dialogs/knewloanwizard.cpp index 105e2d3..1bd2767 100644 --- a/kmymoney2/dialogs/knewloanwizard.cpp +++ b/kmymoney2/dialogs/knewloanwizard.cpp @@ -626,7 +626,7 @@ void KNewLoanWizard::loadComboBoxes(void) m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_MONTHLY))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH))); - m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TQUARTERLY))); + m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_QUARTERLY))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY))); m_paymentFrequencyUnitEdit->insertItem(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY))); diff --git a/kmymoney2/dialogs/konlinequoteconfigurationdlg.h b/kmymoney2/dialogs/konlinequoteconfigurationdlg.h index 360fe6f..e272b72 100644 --- a/kmymoney2/dialogs/konlinequoteconfigurationdlg.h +++ b/kmymoney2/dialogs/konlinequoteconfigurationdlg.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KONLINETQUOTECONFIGURATIONDIALOG_H -#define KONLINETQUOTECONFIGURATIONDIALOG_H +#ifndef KONLINEQUOTECONFIGURATIONDIALOG_H +#define KONLINEQUOTECONFIGURATIONDIALOG_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h index 2514a55..ab8586c 100644 --- a/kmymoney2/dialogs/settings/ksettingsonlinequotes.h +++ b/kmymoney2/dialogs/settings/ksettingsonlinequotes.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KSETTINGSONLINETQUOTES_H -#define KSETTINGSONLINETQUOTES_H +#ifndef KSETTINGSONLINEQUOTES_H +#define KSETTINGSONLINEQUOTES_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/mymoney/mymoneyfile.cpp b/kmymoney2/mymoney/mymoneyfile.cpp index 2b7fdbc..bd8eb15 100644 --- a/kmymoney2/mymoney/mymoneyfile.cpp +++ b/kmymoney2/mymoney/mymoneyfile.cpp @@ -1055,7 +1055,7 @@ const MyMoneyAccount& MyMoneyFile::equity(void) const { checkStorage(); - return d->m_cache.account (STD_ACC_ETQUITY); + return d->m_cache.account (STD_ACC_EQUITY); } unsigned int MyMoneyFile::transactionCount(const TQString& account) const diff --git a/kmymoney2/mymoney/mymoneyscheduled.cpp b/kmymoney2/mymoney/mymoneyscheduled.cpp index 745160c..32584f1 100644 --- a/kmymoney2/mymoney/mymoneyscheduled.cpp +++ b/kmymoney2/mymoney/mymoneyscheduled.cpp @@ -373,7 +373,7 @@ void MyMoneySchedule::validate(bool id_check) const break; case TYPE_DEPOSIT: - if (m_paymentType == STYPE_DIRECTDEBIT || m_paymentType == STYPE_WRITECHETQUE) + if (m_paymentType == STYPE_DIRECTDEBIT || m_paymentType == STYPE_WRITECHEQUE) throw new MYMONEYEXCEPTION("Invalid payment type for deposits"); break; @@ -822,7 +822,7 @@ TQString MyMoneySchedule::occurenceToString(occurenceE occurence) occurenceString = I18N_NOOP("Every two months"); else if(occurence == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) occurenceString = I18N_NOOP("Every three months"); - else if(occurence == MyMoneySchedule::OCCUR_TQUARTERLY) + else if(occurence == MyMoneySchedule::OCCUR_QUARTERLY) occurenceString = I18N_NOOP("Quarterly"); else if(occurence == MyMoneySchedule::OCCUR_EVERYFOURMONTHS) occurenceString = I18N_NOOP("Every four months"); @@ -949,7 +949,7 @@ TQString MyMoneySchedule::paymentMethodToString(MyMoneySchedule::paymentTypeE pa case MyMoneySchedule::STYPE_OTHER: text = I18N_NOOP("Other"); break; - case MyMoneySchedule::STYPE_WRITECHETQUE: + case MyMoneySchedule::STYPE_WRITECHEQUE: text = I18N_NOOP("Write check"); break; case MyMoneySchedule::STYPE_STANDINGORDER: @@ -1049,7 +1049,7 @@ int MyMoneySchedule::eventsPerYear(MyMoneySchedule::occurenceE occurence) rc = 6; break; case MyMoneySchedule::OCCUR_EVERYTHREEMONTHS: - case MyMoneySchedule::OCCUR_TQUARTERLY: + case MyMoneySchedule::OCCUR_QUARTERLY: rc = 4; break; case MyMoneySchedule::OCCUR_EVERYFOURMONTHS: @@ -1107,7 +1107,7 @@ int MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::occurenceE occurence) rc = 60; break; case MyMoneySchedule::OCCUR_EVERYTHREEMONTHS: - case MyMoneySchedule::OCCUR_TQUARTERLY: + case MyMoneySchedule::OCCUR_QUARTERLY: rc = 90; break; case MyMoneySchedule::OCCUR_EVERYFOURMONTHS: @@ -1216,7 +1216,7 @@ MyMoneySchedule::occurenceE MyMoneySchedule::stringToOccurence(const TQString& t else if(tmp == i18n("Every three months").lower()) occurence = MyMoneySchedule::OCCUR_EVERYTHREEMONTHS; else if(tmp == i18n("Quarterly").lower()) - occurence = MyMoneySchedule::OCCUR_TQUARTERLY; + occurence = MyMoneySchedule::OCCUR_QUARTERLY; else if(tmp == i18n("Every four months").lower()) occurence = MyMoneySchedule::OCCUR_EVERYFOURMONTHS; else if(tmp == i18n("Twice yearly").lower()) @@ -1279,7 +1279,7 @@ void MyMoneySchedule::simpleToCompoundOccurence(int& multiplier,occurenceE& occu newMulti = 2; } else if(occurence == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS || - occurence == MyMoneySchedule::OCCUR_TQUARTERLY ) + occurence == MyMoneySchedule::OCCUR_QUARTERLY ) { newOcc = MyMoneySchedule::OCCUR_MONTHLY; newMulti = 3; diff --git a/kmymoney2/mymoney/mymoneyscheduled.h b/kmymoney2/mymoney/mymoneyscheduled.h index 9f8fedd..1258b00 100644 --- a/kmymoney2/mymoney/mymoneyscheduled.h +++ b/kmymoney2/mymoney/mymoneyscheduled.h @@ -68,7 +68,7 @@ public: OCCUR_MONTHLY=32, OCCUR_EVERYFOURWEEKS=64, OCCUR_EVERYEIGHTWEEKS=126, OCCUR_EVERYOTHERMONTH=128, OCCUR_EVERYTHREEMONTHS=256, - OCCUR_TWICEYEARLY=1024, OCCUR_EVERYOTHERYEAR=2048, OCCUR_TQUARTERLY=4096, + OCCUR_TWICEYEARLY=1024, OCCUR_EVERYOTHERYEAR=2048, OCCUR_QUARTERLY=4096, OCCUR_EVERYFOURMONTHS=8192, OCCUR_YEARLY=16384 }; @@ -82,7 +82,7 @@ public: */ enum paymentTypeE { STYPE_ANY=0, STYPE_DIRECTDEBIT=1, STYPE_DIRECTDEPOSIT=2, STYPE_MANUALDEPOSIT=4, STYPE_OTHER=8, - STYPE_WRITECHETQUE=16, + STYPE_WRITECHEQUE=16, STYPE_STANDINGORDER=32, STYPE_BANKTRANSFER=64 }; diff --git a/kmymoney2/mymoney/mymoneyscheduletest.cpp b/kmymoney2/mymoney/mymoneyscheduletest.cpp index 3fe6afe..8287f1f 100644 --- a/kmymoney2/mymoney/mymoneyscheduletest.cpp +++ b/kmymoney2/mymoney/mymoneyscheduletest.cpp @@ -168,7 +168,7 @@ void MyMoneyScheduleTest::testAddSchedule() MyMoneySchedule s3( "s3", MyMoneySchedule::TYPE_TRANSFER, MyMoneySchedule::OCCUR_YEARLY, 1, - MyMoneySchedule::STYPE_WRITECHETQUE, + MyMoneySchedule::STYPE_WRITECHEQUE, TQDate(2001, 3, 1), false, true, @@ -216,7 +216,7 @@ void MyMoneyScheduleTest::testAnyScheduled() MyMoneySchedule::STYPE_MANUALDEPOSIT)); CPPUNIT_ASSERT(m->anyScheduled("A000001", MyMoneySchedule::TYPE_ANY, MyMoneySchedule::OCCUR_ANY, - MyMoneySchedule::STYPE_WRITECHETQUE)); + MyMoneySchedule::STYPE_WRITECHEQUE)); // Failures CPPUNIT_ASSERT(m->anyScheduled("A000001", MyMoneySchedule::TYPE_BILL, @@ -855,8 +855,8 @@ void MyMoneyScheduleTest::testPaymentDates() CPPUNIT_ASSERT(list[2] == TQDate(2012, 5,15)); CPPUNIT_ASSERT(list[3] == TQDate(2012, 8,15)); CPPUNIT_ASSERT(list[4] == TQDate(2012,11,15)); - // MyMoneySchedule::OCCUR_TQUARTERLY - sch.setOccurence(MyMoneySchedule::OCCUR_TQUARTERLY); + // MyMoneySchedule::OCCUR_QUARTERLY + sch.setOccurence(MyMoneySchedule::OCCUR_QUARTERLY); startDate.setYMD(2012,11,20); endDate.setYMD(2013,11,23); sch.setStartDate(startDate); @@ -1339,7 +1339,7 @@ void MyMoneyScheduleTest::testDaysBetweenEvents() CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == 56); CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == 60); CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == 90); - CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_TQUARTERLY) == 90); + CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_QUARTERLY) == 90); CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == 120); CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_TWICEYEARLY) == 180); CPPUNIT_ASSERT(MyMoneySchedule::daysBetweenEvents(MyMoneySchedule::OCCUR_YEARLY) == 360); @@ -1361,7 +1361,7 @@ void MyMoneyScheduleTest::testStringToOccurence() CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every eight weeks")) == MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS ); CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every two months")) == MyMoneySchedule::OCCUR_EVERYOTHERMONTH ); CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every three months")) == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS ); - CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Quarterly")) == MyMoneySchedule::OCCUR_TQUARTERLY ); + CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Quarterly")) == MyMoneySchedule::OCCUR_QUARTERLY ); CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Every four months")) == MyMoneySchedule::OCCUR_EVERYFOURMONTHS ); CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Twice yearly")) == MyMoneySchedule::OCCUR_TWICEYEARLY ); CPPUNIT_ASSERT( MyMoneySchedule::stringToOccurence(i18n("Yearly")) == MyMoneySchedule::OCCUR_YEARLY ); @@ -1382,7 +1382,7 @@ void MyMoneyScheduleTest::testStringToOccurence() CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS))) ); CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYOTHERMONTH == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH))) ); CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYTHREEMONTHS == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS))) ); - CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_TQUARTERLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TQUARTERLY))) ); + CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_QUARTERLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_QUARTERLY))) ); CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_EVERYFOURMONTHS == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS))) ); CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_TWICEYEARLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY))) ); CPPUNIT_ASSERT( MyMoneySchedule::OCCUR_YEARLY == MyMoneySchedule::stringToOccurence(i18n(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY))) ); @@ -1403,7 +1403,7 @@ void MyMoneyScheduleTest::testEventsPerYear() CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == 6); CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == 6); CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == 4); - CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_TQUARTERLY) == 4); + CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_QUARTERLY) == 4); CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == 3); CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_TWICEYEARLY) == 2); CPPUNIT_ASSERT(MyMoneySchedule::eventsPerYear(MyMoneySchedule::OCCUR_YEARLY) == 1); @@ -1426,7 +1426,7 @@ void MyMoneyScheduleTest::testOccurenceToString() CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == "Every eight weeks" ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == "Every two months" ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == "Every three months" ); - CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TQUARTERLY) == "Quarterly" ); + CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_QUARTERLY) == "Quarterly" ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == "Every four months" ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY) == "Twice yearly" ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY) == "Yearly" ); @@ -1451,7 +1451,7 @@ void MyMoneyScheduleTest::testOccurenceToString() s.setOccurence(MyMoneySchedule::OCCUR_EVERYOTHERMONTH); CPPUNIT_ASSERT(s.occurenceToString() == "Every two months" ); s.setOccurence(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS); CPPUNIT_ASSERT(s.occurenceToString() == "Every three months" ); // Quarterly no longer used. Every three months used instead - s.setOccurence(MyMoneySchedule::OCCUR_TQUARTERLY); CPPUNIT_ASSERT(s.occurenceToString() == "Every three months" ); + s.setOccurence(MyMoneySchedule::OCCUR_QUARTERLY); CPPUNIT_ASSERT(s.occurenceToString() == "Every three months" ); s.setOccurence(MyMoneySchedule::OCCUR_EVERYFOURMONTHS); CPPUNIT_ASSERT(s.occurenceToString() == "Every four months" ); s.setOccurence(MyMoneySchedule::OCCUR_TWICEYEARLY); CPPUNIT_ASSERT(s.occurenceToString() == "Twice yearly" ); s.setOccurence(MyMoneySchedule::OCCUR_YEARLY); CPPUNIT_ASSERT(s.occurenceToString() == "Yearly" ); @@ -1471,7 +1471,7 @@ void MyMoneyScheduleTest::testOccurenceToString() CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == MyMoneySchedule::occurenceToString(8,MyMoneySchedule::OCCUR_WEEKLY) ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == MyMoneySchedule::occurenceToString(2,MyMoneySchedule::OCCUR_MONTHLY) ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == MyMoneySchedule::occurenceToString(3,MyMoneySchedule::OCCUR_MONTHLY) ); - // OCCUR_TQUARTERLY will no longer be used: only Every Three Months + // OCCUR_QUARTERLY will no longer be used: only Every Three Months CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == MyMoneySchedule::occurenceToString(4,MyMoneySchedule::OCCUR_MONTHLY) ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_TWICEYEARLY) == MyMoneySchedule::occurenceToString(6,MyMoneySchedule::OCCUR_MONTHLY) ); CPPUNIT_ASSERT(MyMoneySchedule::occurenceToString(MyMoneySchedule::OCCUR_YEARLY) == MyMoneySchedule::occurenceToString(1,MyMoneySchedule::OCCUR_YEARLY) ); @@ -1545,7 +1545,7 @@ void MyMoneyScheduleTest::testOccurencePeriodToString() CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYEIGHTWEEKS) == "Any" ); CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYOTHERMONTH) == "Any" ); CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYTHREEMONTHS) == "Any" ); - CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_TQUARTERLY) == "Any" ); + CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_QUARTERLY) == "Any" ); CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYFOURMONTHS) == "Any" ); CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_TWICEYEARLY) == "Any" ); CPPUNIT_ASSERT(MyMoneySchedule::occurencePeriodToString(MyMoneySchedule::OCCUR_EVERYOTHERYEAR) == "Any" ); @@ -1730,7 +1730,7 @@ void MyMoneyScheduleTest::testOccurencePeriod() CPPUNIT_ASSERT(s.occurencePeriod() == MyMoneySchedule::OCCUR_MONTHLY); CPPUNIT_ASSERT(s.occurenceMultiplier() == 3); // Quarterly no longer used. Every three months used instead - s.setOccurence(MyMoneySchedule::OCCUR_TQUARTERLY); + s.setOccurence(MyMoneySchedule::OCCUR_QUARTERLY); CPPUNIT_ASSERT(s.occurence() == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS); CPPUNIT_ASSERT(s.occurencePeriod() == MyMoneySchedule::OCCUR_MONTHLY); CPPUNIT_ASSERT(s.occurenceMultiplier() == 3); @@ -1798,7 +1798,7 @@ void MyMoneyScheduleTest::testSimpleToFromCompoundOccurence() occ = MyMoneySchedule::OCCUR_EVERYTHREEMONTHS; mult = 1; MyMoneySchedule::simpleToCompoundOccurence(mult, occ); CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_MONTHLY && mult == 3 ); - occ = MyMoneySchedule::OCCUR_TQUARTERLY; mult = 1; + occ = MyMoneySchedule::OCCUR_QUARTERLY; mult = 1; MyMoneySchedule::simpleToCompoundOccurence(mult, occ); CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_MONTHLY && mult == 3 ); occ = MyMoneySchedule::OCCUR_EVERYFOURMONTHS; mult = 1; @@ -1851,7 +1851,7 @@ void MyMoneyScheduleTest::testSimpleToFromCompoundOccurence() occ = MyMoneySchedule::OCCUR_MONTHLY; mult = 3; MyMoneySchedule::compoundToSimpleOccurence(mult, occ); CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_EVERYTHREEMONTHS && mult == 1 ); - // MyMoneySchedule::OCCUR_TQUARTERLY not converted back + // MyMoneySchedule::OCCUR_QUARTERLY not converted back occ = MyMoneySchedule::OCCUR_MONTHLY; mult = 4; MyMoneySchedule::compoundToSimpleOccurence(mult, occ); CPPUNIT_ASSERT( occ == MyMoneySchedule::OCCUR_EVERYFOURMONTHS && mult == 1 ); diff --git a/kmymoney2/mymoney/mymoneysecurity.cpp b/kmymoney2/mymoney/mymoneysecurity.cpp index 027441c..7b42b84 100644 --- a/kmymoney2/mymoney/mymoneysecurity.cpp +++ b/kmymoney2/mymoney/mymoneysecurity.cpp @@ -72,7 +72,7 @@ MyMoneySecurity::MyMoneySecurity(const TQDomElement& node) : MyMoneyKeyValueContainer(node.elementsByTagName("KEYVALUEPAIRS").item(0).toElement()) { if(("SECURITY" != node.tagName()) - && ("ETQUITY" != node.tagName()) + && ("EQUITY" != node.tagName()) && ("CURRENCY" != node.tagName())) throw new MYMONEYEXCEPTION("Node was not SECURITY or CURRENCY"); diff --git a/kmymoney2/mymoney/storage/imymoneystorage.h b/kmymoney2/mymoney/storage/imymoneystorage.h index 02e53c2..1053e6b 100644 --- a/kmymoney2/mymoney/storage/imymoneystorage.h +++ b/kmymoney2/mymoney/storage/imymoneystorage.h @@ -96,7 +96,7 @@ public: #define STD_ACC_ASSET "AStd::Asset" #define STD_ACC_EXPENSE "AStd::Expense" #define STD_ACC_INCOME "AStd::Income" -#define STD_ACC_ETQUITY "AStd::Equity" +#define STD_ACC_EQUITY "AStd::Equity" IMyMoneyStorage(); virtual ~IMyMoneyStorage(); diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp index d4de685..8767b61 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgr.cpp @@ -268,7 +268,7 @@ bool MyMoneyDatabaseMgr::isStandardAccount(const TQString& id) const || id == STD_ACC_ASSET || id == STD_ACC_EXPENSE || id == STD_ACC_INCOME - || id == STD_ACC_ETQUITY; + || id == STD_ACC_EQUITY; } void MyMoneyDatabaseMgr::setAccountName(const TQString& id, const TQString& name) @@ -1052,7 +1052,7 @@ const MyMoneyAccount MyMoneyDatabaseMgr::income(void) const { return MyMoneyFile::instance()->account(STD_ACC_INCOME); } const MyMoneyAccount MyMoneyDatabaseMgr::equity(void) const -{ return MyMoneyFile::instance()->account(STD_ACC_ETQUITY); } +{ return MyMoneyFile::instance()->account(STD_ACC_EQUITY); } void MyMoneyDatabaseMgr::addSecurity(MyMoneySecurity& security) { diff --git a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp index a171431..d80c348 100644 --- a/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneydatabasemgrtest.cpp @@ -202,7 +202,7 @@ void MyMoneyDatabaseMgrTest::testIsStandardAccount() CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_ASSET) == true); CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_EXPENSE) == true); CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_INCOME) == true); - CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_ETQUITY) == true); + CPPUNIT_ASSERT(m->isStandardAccount(STD_ACC_EQUITY) == true); CPPUNIT_ASSERT(m->isStandardAccount("A0002") == false); } @@ -1717,7 +1717,7 @@ void MyMoneyDatabaseMgrTest::testScheduleList() { MyMoneySchedule schedule4("Schedule 4", MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 1, - MyMoneySchedule::STYPE_WRITECHETQUE, + MyMoneySchedule::STYPE_WRITECHEQUE, TQDate(), notOverdue.addDays(31), false, diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp index 6ebea3c..35122e3 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.cpp @@ -70,14 +70,14 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr() MyMoneyAccount acc_q; acc_q.setAccountType(MyMoneyAccount::Equity); acc_q.setName("Equity"); - MyMoneyAccount equity(STD_ACC_ETQUITY, acc_q); + MyMoneyAccount equity(STD_ACC_EQUITY, acc_q); TQMap map; map[STD_ACC_ASSET] = asset; map[STD_ACC_LIABILITY] = liability; map[STD_ACC_INCOME] = income; map[STD_ACC_EXPENSE] = expense; - map[STD_ACC_ETQUITY] = equity; + map[STD_ACC_EQUITY] = equity; // load account list with inital accounts m_accountList = map; @@ -89,7 +89,7 @@ MyMoneySeqAccessMgr::MyMoneySeqAccessMgr() m_balanceCache[STD_ACC_ASSET] = balance; m_balanceCache[STD_ACC_EXPENSE] = balance; m_balanceCache[STD_ACC_INCOME] = balance; - m_balanceCache[STD_ACC_ETQUITY] = balance; + m_balanceCache[STD_ACC_EQUITY] = balance; // initialize for file fixes (see kmymoneyview.cpp) m_currentFixVersion = 2; @@ -121,7 +121,7 @@ bool MyMoneySeqAccessMgr::isStandardAccount(const TQString& id) const || id == STD_ACC_ASSET || id == STD_ACC_EXPENSE || id == STD_ACC_INCOME - || id == STD_ACC_ETQUITY; + || id == STD_ACC_EQUITY; } void MyMoneySeqAccessMgr::setAccountName(const TQString& id, const TQString& name) diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h index d92d94e..5689e73 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgr.h @@ -145,7 +145,7 @@ public: * @li STD_ACC_ASSET * @li STD_ACC_EXPENSE * @li STD_ACC_INCOME - * @li STD_ACC_ETQUITY + * @li STD_ACC_EQUITY * * @param name TQString reference to the name to be set * @@ -526,7 +526,7 @@ public: * This method is used to return the standard equity account * @return MyMoneyAccount equity account(group) */ - const MyMoneyAccount equity(void) const { return account(STD_ACC_ETQUITY); }; + const MyMoneyAccount equity(void) const { return account(STD_ACC_EQUITY); }; virtual void loadAccounts(const TQMap& acc); virtual void loadTransactions(const TQMap& map); diff --git a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp index af05e16..e64e0b5 100644 --- a/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp +++ b/kmymoney2/mymoney/storage/mymoneyseqaccessmgrtest.cpp @@ -1370,7 +1370,7 @@ void MyMoneySeqAccessMgrTest::testScheduleList() { MyMoneySchedule schedule4("Schedule 4", MyMoneySchedule::TYPE_BILL, MyMoneySchedule::OCCUR_WEEKLY, 1, - MyMoneySchedule::STYPE_WRITECHETQUE, + MyMoneySchedule::STYPE_WRITECHEQUE, TQDate(), notOverdue.addDays(31), false, diff --git a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp index fe8ac87..6868e64 100644 --- a/kmymoney2/mymoney/storage/mymoneystoragesql.cpp +++ b/kmymoney2/mymoney/storage/mymoneystoragesql.cpp @@ -1208,7 +1208,7 @@ void MyMoneyStorageSql::writeAccounts() { MyMoneyAccount acc_q; acc_q.setAccountType(MyMoneyAccount::Equity); acc_q.setName("Equity"); - MyMoneyAccount equity(STD_ACC_ETQUITY, acc_q); + MyMoneyAccount equity(STD_ACC_EQUITY, acc_q); writeAccount(asset, q); ++m_accounts; writeAccount(expense, q); ++m_accounts; @@ -4297,7 +4297,7 @@ const TQString MyMoneyDbIndex::generateDDL (databaseTypeE dbType) const TQString qs = "CREATE "; if (m_unique) - qs += "UNITQUE "; + qs += "UNIQUE "; qs += "INDEX " + m_table + "_" + m_name + "_idx ON " + m_table + " ("; diff --git a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp index 7408a38..60a3aae 100644 --- a/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp +++ b/kmymoney2/plugins/ofximport/dialogs/mymoneyofxconnector.cpp @@ -575,8 +575,8 @@ TQString MyMoneyOfxConnector::investmentStatementResponse(const TQDate& _dtstart securitylist.subtag(Tag("STOCKINFO") .subtag(Tag("SECINFO") .subtag(Tag("SECID") - .element("UNITQUEID",equity.id()) - .element("UNITQUEIDTYPE","KMYMONEY")) + .element("UNIQUEID",equity.id()) + .element("UNIQUEIDTYPE","KMYMONEY")) .element("SECNAME",equity.name()) .element("TICKER",equity.tradingSymbol()) .element("FIID",equity.id()))); @@ -653,7 +653,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentTransaction(const MyMone return Tag("SELLSTOCK") .subtag(Tag("INVSELL") .subtag(invtran) - .subtag(Tag("SECID").element("UNITQUEID",stockid).element("UNITQUEIDTYPE","KMYMONEY")) + .subtag(Tag("SECID").element("UNIQUEID",stockid).element("UNIQUEIDTYPE","KMYMONEY")) .element("UNITS",TQString(((s.shares())).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.\\-]"))) .element("UNITPRICE",TQString((s.value()/s.shares()).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.]"))) .element("TOTAL",TQString((-s.value()).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.\\-]"))) @@ -666,7 +666,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentTransaction(const MyMone return Tag("BUYSTOCK") .subtag(Tag("INVBUY") .subtag(invtran) - .subtag(Tag("SECID").element("UNITQUEID",stockid).element("UNITQUEIDTYPE","KMYMONEY")) + .subtag(Tag("SECID").element("UNIQUEID",stockid).element("UNIQUEIDTYPE","KMYMONEY")) .element("UNITS",TQString((s.shares()).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.\\-]"))) .element("UNITPRICE",TQString((s.value()/s.shares()).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.]"))) .element("TOTAL",TQString((-(s.value())).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.\\-]"))) @@ -682,7 +682,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentTransaction(const MyMone return Tag("REINVEST") .subtag(invtran) - .subtag(Tag("SECID").element("UNITQUEID",stockid).element("UNITQUEIDTYPE","KMYMONEY")) + .subtag(Tag("SECID").element("UNIQUEID",stockid).element("UNIQUEIDTYPE","KMYMONEY")) .element("INCOMETYPE","DIV") .element("TOTAL",TQString((-s.value()).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9.\\-]"))) .element("SUBACCTSEC","CASH") @@ -710,7 +710,7 @@ MyMoneyOfxConnector::Tag MyMoneyOfxConnector::investmentTransaction(const MyMone if ( found ) return Tag("INCOME") .subtag(invtran) - .subtag(Tag("SECID").element("UNITQUEID",stockid).element("UNITQUEIDTYPE","KMYMONEY")) + .subtag(Tag("SECID").element("UNIQUEID",stockid).element("UNIQUEIDTYPE","KMYMONEY")) .element("INCOMETYPE","DIV") .element("TOTAL",TQString((-(*it_split).value()).formatMoney(TQString(),2)).remove(TQRegExp("[^0-9\\.\\-]"))) .element("SUBACCTSEC","CASH") diff --git a/kmymoney2/reports/objectinfotable.h b/kmymoney2/reports/objectinfotable.h index 69489df..9e8a4f3 100644 --- a/kmymoney2/reports/objectinfotable.h +++ b/kmymoney2/reports/objectinfotable.h @@ -72,4 +72,4 @@ private: } -#endif // TQUERYREPORT_H +#endif // QUERYREPORT_H diff --git a/kmymoney2/reports/querytable.h b/kmymoney2/reports/querytable.h index e1b3918..3203a06 100644 --- a/kmymoney2/reports/querytable.h +++ b/kmymoney2/reports/querytable.h @@ -23,8 +23,8 @@ * * ***************************************************************************/ -#ifndef TQUERYTABLE_H -#define TQUERYTABLE_H +#ifndef QUERYTABLE_H +#define QUERYTABLE_H // ---------------------------------------------------------------------------- // QT Includes @@ -139,4 +139,4 @@ class CashFlowList: public TQValueList } -#endif // TQUERYREPORT_H +#endif // QUERYREPORT_H diff --git a/kmymoney2/reports/querytabletest.h b/kmymoney2/reports/querytabletest.h index af5ae4b..36f3075 100644 --- a/kmymoney2/reports/querytabletest.h +++ b/kmymoney2/reports/querytabletest.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef TQUERYTABLETEST_H -#define TQUERYTABLETEST_H +#ifndef QUERYTABLETEST_H +#define QUERYTABLETEST_H #include #include "../mymoney/mymoneyfile.h" diff --git a/kmymoney2/widgets/kmymoneycalculator.cpp b/kmymoney2/widgets/kmymoneycalculator.cpp index 47d45ed..e3b72a4 100644 --- a/kmymoney2/widgets/kmymoneycalculator.cpp +++ b/kmymoney2/widgets/kmymoneycalculator.cpp @@ -67,7 +67,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) buttons[MINUS] = new KPushButton("-", this); buttons[STAR] = new KPushButton("X", this); buttons[COMMA] = new KPushButton(m_comma, this); - buttons[ETQUAL] = new KPushButton("=", this); + buttons[EQUAL] = new KPushButton("=", this); buttons[SLASH] = new KPushButton("/", this); buttons[CLEAR] = new KPushButton("C", this); buttons[CLEARALL] = new KPushButton("AC", this); @@ -90,13 +90,13 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) grid->addWidget(buttons[MINUS], 4, 3); grid->addWidget(buttons[STAR], 3, 4); grid->addWidget(buttons[SLASH], 4, 4); - grid->addWidget(buttons[ETQUAL], 4, 2); + grid->addWidget(buttons[EQUAL], 4, 2); grid->addWidget(buttons[PLUSMINUS], 2, 3); grid->addWidget(buttons[PERCENT], 2, 4); grid->addWidget(buttons[CLEAR], 1, 3); grid->addWidget(buttons[CLEARALL], 1, 4); - buttons[ETQUAL]->setFocus(); + buttons[EQUAL]->setFocus(); op1 = 0.0; stackedOp = op = 0; @@ -113,7 +113,7 @@ kMyMoneyCalculator::kMyMoneyCalculator(TQWidget* parent, const char *name) // connect the calculation operations through another mapper mapper = new TQSignalMapper(TQT_TQOBJECT(this)); - for(int i = PLUS; i <= ETQUAL; ++i) { + for(int i = PLUS; i <= EQUAL; ++i) { mapper->setMapping(TQT_TQOBJECT(buttons[i]), i); connect(buttons[i], TQT_SIGNAL(clicked()), mapper, TQT_SLOT(map())); } @@ -184,7 +184,7 @@ void kMyMoneyCalculator::plusminusClicked(void) void kMyMoneyCalculator::calculationClicked(int button) { - if(operand.length() == 0 && op != 0 && button == ETQUAL) { + if(operand.length() == 0 && op != 0 && button == EQUAL) { op = 0; m_result = normalizeString(op1); changeDisplay(m_result); @@ -249,7 +249,7 @@ void kMyMoneyCalculator::calculationClicked(int button) changeDisplay(m_result); } - if(button != ETQUAL) { + if(button != EQUAL) { op = button; } else { op = 0; @@ -396,7 +396,7 @@ void kMyMoneyCalculator::keyPressEvent(TQKeyEvent* ev) case TQt::Key_Return: case TQt::Key_Enter: case TQt::Key_Equal: - button = ETQUAL; + button = EQUAL; break; case TQt::Key_Escape: button = CLEARALL; diff --git a/kmymoney2/widgets/kmymoneycalculator.h b/kmymoney2/widgets/kmymoneycalculator.h index 3eaf055..a73b13a 100644 --- a/kmymoney2/widgets/kmymoneycalculator.h +++ b/kmymoney2/widgets/kmymoneycalculator.h @@ -222,7 +222,7 @@ private: /* 0-9 are used by digits */ COMMA = 10, /* - * make sure, that PLUS through ETQUAL remain in + * make sure, that PLUS through EQUAL remain in * the order they are. Otherwise, check the calculation * signal mapper */ @@ -230,7 +230,7 @@ private: MINUS, SLASH, STAR, - ETQUAL, + EQUAL, PLUSMINUS, PERCENT, CLEAR, diff --git a/kmymoney2/widgets/kmymoneycalendar.cpp b/kmymoney2/widgets/kmymoneycalendar.cpp index 7aae4ad..28ee506 100644 --- a/kmymoney2/widgets/kmymoneycalendar.cpp +++ b/kmymoney2/widgets/kmymoneycalendar.cpp @@ -623,7 +623,7 @@ void kMyMoneyCalendar::slotSetStyleMonthly() void kMyMoneyCalendar::slotSetStyleQuarterly() { - setType(kMyMoneyDateTbl::TQUARTERLY); + setType(kMyMoneyDateTbl::QUARTERLY); } void kMyMoneyCalendar::setUserButton1(bool enable, TQPushButton* pb) diff --git a/kmymoney2/widgets/kmymoneydatetbl.cpp b/kmymoney2/widgets/kmymoneydatetbl.cpp index 37d1311..2a51307 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.cpp +++ b/kmymoney2/widgets/kmymoneydatetbl.cpp @@ -178,7 +178,7 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) if(rect.height()>maxCell.height()) maxCell.setHeight(rect.height()); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { int athird = width()/3; @@ -253,7 +253,7 @@ kMyMoneyDateTbl::paintCell(TQPainter *painter, int row, int col) drawDate = date.addDays(diff); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } @@ -444,7 +444,7 @@ kMyMoneyDateTbl::contentsMouseReleaseEvent(TQMouseEvent *e) setDate(date.addDays(diff)); updateCell(dayOfWeek, 0); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } @@ -538,11 +538,11 @@ void kMyMoneyDateTbl::setType(calendarType type) m_colCount = 1; m_type = WEEKLY; } - else if (type == TQUARTERLY) + else if (type == QUARTERLY) { m_rowCount = 7; m_colCount = 21; - m_type = TQUARTERLY; + m_type = QUARTERLY; } else // default to monthly { @@ -628,7 +628,7 @@ void kMyMoneyDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) drawDate = date.addDays(diff); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } diff --git a/kmymoney2/widgets/kmymoneydatetbl.h b/kmymoney2/widgets/kmymoneydatetbl.h index 015e2cc..21da84d 100644 --- a/kmymoney2/widgets/kmymoneydatetbl.h +++ b/kmymoney2/widgets/kmymoneydatetbl.h @@ -68,7 +68,7 @@ class kMyMoneyDateTbl : public TQGridView { public: enum calendarType { WEEKLY, MONTHLY, - TQUARTERLY }; + QUARTERLY }; public: /** diff --git a/kmymoney2/widgets/kmymoneyonlinequoteconfig.h b/kmymoney2/widgets/kmymoneyonlinequoteconfig.h index 069b664..1fdc1db 100644 --- a/kmymoney2/widgets/kmymoneyonlinequoteconfig.h +++ b/kmymoney2/widgets/kmymoneyonlinequoteconfig.h @@ -15,8 +15,8 @@ * * ***************************************************************************/ -#ifndef KMYMONEYONLINETQUOTECONFIG_H -#define KMYMONEYONLINETQUOTECONFIG_H +#ifndef KMYMONEYONLINEQUOTECONFIG_H +#define KMYMONEYONLINEQUOTECONFIG_H // ---------------------------------------------------------------------------- // QT Includes diff --git a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp index f15773c..ad96947 100644 --- a/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp +++ b/kmymoney2/widgets/kmymoneyscheduleddatetbl.cpp @@ -337,7 +337,7 @@ void kMyMoneyScheduledDateTbl::drawCellContents(TQPainter *painter, int /*row*/, painter->drawText(0, 0, w, h, AlignCenter, text, -1, &rect); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { painter->setBrush(KGlobalSettings::baseColor()); @@ -434,7 +434,7 @@ void kMyMoneyScheduledDateTbl::contentsMouseMoveEvent(TQMouseEvent* e) drawDate = date.addDays(diff); } - else if (m_type == TQUARTERLY) + else if (m_type == QUARTERLY) { } diff --git a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp index 6d3bcdc..d15c001 100644 --- a/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp +++ b/kmymoney2/wizards/newaccountwizard/knewaccountwizard.cpp @@ -677,7 +677,7 @@ CreditCardSchedulePage::CreditCardSchedulePage(Wizard* wizard, const char* name) connect(MyMoneyFile::instance(), TQT_SIGNAL(dataChanged()), this, TQT_SLOT(slotLoadWidgets())); - m_method->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHETQUE); + m_method->insertItem(i18n("Write check"), MyMoneySchedule::STYPE_WRITECHEQUE); #if 0 m_method->insertItem(i18n("Direct debit"), MyMoneySchedule::STYPE_DIRECTDEBIT); m_method->insertItem(i18n("Bank transfer"), MyMoneySchedule::STYPE_BANKTRANSFER);